Correct filtration of to licenses filter. Add capability of logging i…

…n google cloud platform.

build.gradle

@@ -61,7 +61,9 @@ dependencies {
  compile("org.jetbrains.kotlin:kotlin-reflect")
  compile("org.ehcache:ehcache:3.1.3")
  compile 'org.jsoup:jsoup:1.11.3'
+
  runtime('org.postgresql:postgresql')
+ runtime('com.google.cloud:google-cloud-logging-logback:0.46.0-alpha')
 
  testCompile('org.springframework.boot:spring-boot-starter-test')
  testCompile('org.springframework.restdocs:spring-restdocs-mockmvc')

src/main/kotlin/com/github/ptosda/projectvalidationmanager/database/entities/DependencyLicense.kt

@@ -10,4 +10,16 @@ data class DependencyLicense(
  val pk: DependencyLicensePk,
 
  val source: String
-) : Serializable
+) : Serializable {
+ override fun equals(other: Any?): Boolean {
+ if (other is DependencyLicense){
+ val dependencyLicense = other as DependencyLicense?
+ return dependencyLicense!!.pk.license.spdxId.equals(this.pk.license.spdxId)
+ }
+ return false
+ }
+
+ override fun hashCode(): Int {
+ return this.pk.license.spdxId.hashCode() * 17
+ }
+}

src/main/kotlin/com/github/ptosda/projectvalidationmanager/uiController/ReportController.kt

@@ -19,13 +19,12 @@ class ReportController(val reportService: ReportService,
  val dependencyRepo: DependencyRepository,
  val vulnerabilityRepo: VulnerabilityRepository,
  val licenseRepo: LicenseRepository) {
-
  /**
  * Gets the view for the home page
  */
  @GetMapping
- fun getHome(model: HashMap<String, Any>) : String{
-
+ fun getHome(model: HashMap<String, Any>) : String
+ {
  model["page_title"] = "Home"
 
  val projects = projectRepo.findAll()

src/main/kotlin/com/github/ptosda/projectvalidationmanager/uiController/ReportFilterService.kt

@@ -4,6 +4,7 @@ import com.github.ptosda.projectvalidationmanager.database.entities.*
 import com.github.ptosda.projectvalidationmanager.database.repositories.ReportRepository
 import org.springframework.stereotype.Service
 import java.time.ZonedDateTime
+import java.util.stream.Collectors
 
 @Service
 class ReportFilterService(private val reportService: ReportService,
@@ -113,7 +114,8 @@ class ReportFilterService(private val reportService: ReportService,
  licenses.addAll(it.license)
  }
 
- model["licenses"] = licenses
+ val newLicenses = licenses.stream().distinct().collect(Collectors.toList())
+ model["licenses"] = newLicenses
  model["view_name"] = "licenses"
 
  return model
@@ -166,6 +168,4 @@ class ReportFilterService(private val reportService: ReportService,
 
  return model
  }
-
-
 }

src/main/resources/application.yml

@@ -1,10 +1,10 @@
 spring:
- profiles.active: test
+ profiles.active: local
 
 ---
 
 spring:
- profiles: test
+ profiles: local
  jpa:
  database: POSTGRESQL
  show-sql: true

src/main/resources/logback-spring.xml

@@ -0,0 +1,26 @@
+<configuration>
+ <springProfile name="local">
+ <include resource="org/springframework/boot/logging/logback/base.xml"/>
+ <logger name="org.springframework.web" level="INFO"/>
+ </springProfile>
+
+ <springProfile name="deploy">
+ <include resource="org/springframework/boot/logging/logback/base.xml"/>
+ <logger name="org.springframework.web" level="INFO"/>
+
+ <appender name="CLOUD" class="com.google.cloud.logging.logback.LoggingAppender">
+ <!-- Optional : filter logs at or above a level -->
+ <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+ <level>INFO</level>
+ </filter>
+ <log>application.log</log> <!-- Optional : default java.log -->
+ <resourceType>gae_app</resourceType> <!-- Optional : default: auto-detected, fallback: global -->
+ <enhancer>com.example.logging.logback.enhancers.ExampleEnhancer</enhancer> <!-- Optional -->
+ <flushLevel>WARN</flushLevel> <!-- Optional : default ERROR -->
+ </appender>
+
+ <root level="info">
+ <appender-ref ref="CLOUD" />
+ </root>
+ </springProfile>
+</configuration>