fix linter failures (AdoptOpenJDK#163)

* fix linter failures * add newline * add more coverage * add more coverage
johnoliver · Apr 9, 2020 · c3160a8 · c3160a8
1 parent 98145cf
commit c3160a8
Show file tree

Hide file tree

Showing 28 changed files with 161 additions and 80 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -3,8 +3,8 @@ charset = utf-8
 end_of_line = lf
 indent_size = 4
 indent_style = space
-insert_final_newline = false
-max_line_length = 120
+insert_final_newline = true
+max_line_length = false
 tab_width = 4
 ij_continuation_indent_size = 8
 ij_formatter_off_tag = @formatter:off

diff --git a/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/JsonSerialiserConfig.kt b/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/JsonSerialiserConfig.kt
@@ -12,4 +12,4 @@ class JsonSerialiserConfig : ContextResolver<Jsonb> {
     override fun getContext(objectType: Class<*>?): Jsonb {
         return jsonb
     }
-}
+}
diff --git a/...topenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/AssetsResource.kt b/...topenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/AssetsResource.kt
@@ -42,7 +42,7 @@ class AssetsResource {
     @GET
     @Path("/feature_releases/{feature_version}/{release_type}")
     @Operation(summary = "Returns release information",
-               description = "List of information about builds that match the current query"
+            description = "List of information about builds that match the current query"
     )
     @APIResponses(value = [
         APIResponse(responseCode = "200", description = "search results matching criteria",
@@ -133,7 +133,7 @@ class AssetsResource {
     @GET
     @Path("/version/{version}")
     @Operation(summary = "Returns release information about the specified version.",
-               description = "List of information about builds that match the current query "
+            description = "List of information about builds that match the current query "
     )
     @APIResponses(value = [
         APIResponse(responseCode = "200", description = "search results matching criteria",

diff --git a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AssetsPathTest.kt b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AssetsPathTest.kt
@@ -51,7 +51,12 @@ abstract class AssetsPathTest : BaseTest() {
         return runFilterTest("heap_size", HeapSize.values())
     }
 
-    protected fun <T> createTest(values: Array<T>, path: String, filterParamName: String, exclude: (element: T) -> Boolean = { false }): List<DynamicTest> {
+    protected fun <T> createTest(
+        values: Array<T>,
+        path: String,
+        filterParamName: String,
+        exclude: (element: T) -> Boolean = { false }
+    ): List<DynamicTest> {
         return values
                 .filter { !exclude(it) }
                 .map { value ->

diff --git a/...jdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AssetsResourceVersionPathTest.kt b/...jdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AssetsResourceVersionPathTest.kt
@@ -25,10 +25,10 @@ class AssetsResourceVersionPathTest : AssetsPathTest() {
     @TestFactory
     fun filtersLts(): Stream<DynamicTest> {
         return listOf(
-                Pair("${getPath()}/${JAVA8_212}?lts=true", 200),
-                Pair("${getPath()}/${JAVA8_212}?lts=false", 404),
-                Pair("${getPath()}/${ABOVE_8}?lts=false", 200),
-                Pair("${getPath()}/${ABOVE_8}?lts=false", 200)
+                Pair("${getPath()}/$JAVA8_212?lts=true", 200),
+                Pair("${getPath()}/$JAVA8_212?lts=false", 404),
+                Pair("${getPath()}/$ABOVE_8?lts=false", 200),
+                Pair("${getPath()}/$ABOVE_8?lts=false", 200)
         ).map { request ->
             DynamicTest.dynamicTest(request.first) {
                 val response = RestAssured.given()

diff --git a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/BinaryPathTest.kt b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/BinaryPathTest.kt
@@ -12,6 +12,7 @@ import net.adoptopenjdk.api.v3.models.HeapSize
 import net.adoptopenjdk.api.v3.models.ImageType
 import net.adoptopenjdk.api.v3.models.JvmImpl
 import net.adoptopenjdk.api.v3.models.OperatingSystem
+import net.adoptopenjdk.api.v3.models.Project
 import net.adoptopenjdk.api.v3.models.ReleaseType
 import net.adoptopenjdk.api.v3.models.Vendor
 import org.hamcrest.Matchers
@@ -38,33 +39,35 @@ class BinaryPathTest : BaseTest() {
     val path = "/v3/binary"
 
     fun getLatestPath(
-            featureVersion: Int,
-            releaseType: ReleaseType,
-            os: OperatingSystem,
-            arch: Architecture,
-            imageType: ImageType,
-            jvmImpl: JvmImpl,
-            heapSize: HeapSize,
-            vendor: Vendor
+        featureVersion: Int,
+        releaseType: ReleaseType,
+        os: OperatingSystem,
+        arch: Architecture,
+        imageType: ImageType,
+        jvmImpl: JvmImpl,
+        heapSize: HeapSize,
+        vendor: Vendor,
+        project: Project
     ): String {
-        return "$path/latest/$featureVersion/$releaseType/$os/$arch/$imageType/$jvmImpl/$heapSize/$vendor"
+        return "$path/latest/$featureVersion/$releaseType/$os/$arch/$imageType/$jvmImpl/$heapSize/$vendor?project=$project"
     }
 
     fun getVersionPath(
-            releaseName: String,
-            os: OperatingSystem,
-            arch: Architecture,
-            imageType: ImageType,
-            jvmImpl: JvmImpl,
-            heapSize: HeapSize,
-            vendor: Vendor
+        releaseName: String,
+        os: OperatingSystem,
+        arch: Architecture,
+        imageType: ImageType,
+        jvmImpl: JvmImpl,
+        heapSize: HeapSize,
+        vendor: Vendor,
+        project: Project
     ): String {
-        return "$path/version/$releaseName/$os/$arch/$imageType/$jvmImpl/$heapSize/$vendor"
+        return "$path/version/$releaseName/$os/$arch/$imageType/$jvmImpl/$heapSize/$vendor?project=$project"
     }
 
     @Test
     fun latestDoesRedirectToBinary() {
-        val path = getLatestPath(8, ReleaseType.ga, OperatingSystem.linux, Architecture.x64, ImageType.jdk, JvmImpl.hotspot, HeapSize.normal, Vendor.adoptopenjdk)
+        val path = getLatestPath(8, ReleaseType.ga, OperatingSystem.linux, Architecture.x64, ImageType.jdk, JvmImpl.hotspot, HeapSize.normal, Vendor.adoptopenjdk, Project.jdk)
         performRequest(path)
                 .then()
                 .statusCode(307)
@@ -73,15 +76,15 @@ class BinaryPathTest : BaseTest() {
 
     @Test
     fun noExistantLatestRequestGives404() {
-        val path = getLatestPath(4, ReleaseType.ga, OperatingSystem.linux, Architecture.x64, ImageType.jdk, JvmImpl.hotspot, HeapSize.normal, Vendor.adoptopenjdk)
+        val path = getLatestPath(4, ReleaseType.ga, OperatingSystem.linux, Architecture.x64, ImageType.jdk, JvmImpl.hotspot, HeapSize.normal, Vendor.adoptopenjdk, Project.jdk)
         performRequest(path)
                 .then()
                 .statusCode(404)
     }
 
     @Test
     fun nonExistantVersionRequestRedirects() {
-        val path = getVersionPath("jdk8u212-b04", OperatingSystem.linux, Architecture.x64, ImageType.jdk, JvmImpl.hotspot, HeapSize.normal, Vendor.adoptopenjdk)
+        val path = getVersionPath("jdk8u212-b04", OperatingSystem.linux, Architecture.x64, ImageType.jdk, JvmImpl.hotspot, HeapSize.normal, Vendor.adoptopenjdk, Project.jdk)
         performRequest(path)
                 .then()
                 .statusCode(307)
@@ -90,7 +93,7 @@ class BinaryPathTest : BaseTest() {
 
     @Test
     fun nonExistantVersionRequestGives404() {
-        val path = getVersionPath("fooBar", OperatingSystem.linux, Architecture.x64, ImageType.jdk, JvmImpl.hotspot, HeapSize.normal, Vendor.adoptopenjdk)
+        val path = getVersionPath("fooBar", OperatingSystem.linux, Architecture.x64, ImageType.jdk, JvmImpl.hotspot, HeapSize.normal, Vendor.adoptopenjdk, Project.jdk)
         performRequest(path)
                 .then()
                 .statusCode(404)

diff --git a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/JsonSerializationTest.kt b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/JsonSerializationTest.kt
@@ -31,6 +31,4 @@ class JsonSerializationTest : BaseTest() {
                 .statusCode(200)
                 .body(PrettyPrintMatcher())
     }
-
 }
-
diff --git a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/ReleaseNamesPathTest.kt b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/ReleaseNamesPathTest.kt
@@ -16,6 +16,16 @@ class ReleaseNamesPathTest : BaseTest() {
                 .statusCode(200)
     }
 
+    @Test
+    fun releaseNamesSortOrder() {
+
+        RestAssured.given()
+                .`when`()
+                .get("/v3/info/release_names?sort_order=DESC")
+                .then()
+                .statusCode(200)
+    }
+
     @Test
     fun releaseVersions() {
 
@@ -25,4 +35,14 @@ class ReleaseNamesPathTest : BaseTest() {
                 .then()
                 .statusCode(200)
     }
+
+    @Test
+    fun releaseVersionsSortOrder() {
+
+        RestAssured.given()
+                .`when`()
+                .get("/v3/info/release_versions?sort_order=ASC")
+                .then()
+                .statusCode(200)
+    }
 }
diff --git a/...dk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/models/AdoptRepos.kt b/...dk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/models/AdoptRepos.kt
@@ -46,7 +46,12 @@ class AdoptRepos {
         return allReleases.getReleases(releaseFilter, sortOrder)
     }
 
-    fun getFilteredReleases(version: Int, releaseFilter: Predicate<Release>, binaryFilter: Predicate<Binary>, sortOrder: SortOrder): Sequence<Release> {
+    fun getFilteredReleases(
+        version: Int,
+        releaseFilter: Predicate<Release>,
+        binaryFilter: Predicate<Binary>,
+        sortOrder: SortOrder
+    ): Sequence<Release> {
         val featureRelease = getFeatureRelease(version) ?: return emptySequence()
 
         return getFilteredReleases(featureRelease.releases.getReleases(releaseFilter, sortOrder), binaryFilter)

diff --git a/...njdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/models/GithubId.kt b/...njdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/models/GithubId.kt
@@ -8,8 +8,9 @@ class GithubId {
 
     @JsonCreator
     constructor(
-            @JsonProperty("githubId")
-            githubId: String) {
+        @JsonProperty("githubId")
+        githubId: String
+    ) {
         this.githubId = githubId.split("\\.")[0]
     }
 
@@ -27,6 +28,4 @@ class GithubId {
     override fun hashCode(): Int {
         return githubId.hashCode()
     }
-
-
 }
diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Installer.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Installer.kt
@@ -1,3 +1,11 @@
 package net.adoptopenjdk.api.v3.models
 
-class Installer(name: String, link: String, size: Long, checksum: String?, checksum_link: String?, download_count: Long, signature_link: String? = null) : Asset(name, link, size, checksum, checksum_link, signature_link, download_count)
+class Installer(
+    name: String,
+    link: String,
+    size: Long,
+    checksum: String?,
+    checksum_link: String?,
+    download_count: Long,
+    signature_link: String? = null
+) : Asset(name, link, size, checksum, checksum_link, signature_link, download_count)
diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Package.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Package.kt
@@ -1,3 +1,11 @@
 package net.adoptopenjdk.api.v3.models
 
-class Package(name: String, link: String, size: Long, checksum: String?, checksum_link: String?, download_count: Long, signature_link: String? = null) : Asset(name, link, size, checksum, checksum_link, signature_link, download_count)
+class Package(
+    name: String,
+    link: String,
+    size: Long,
+    checksum: String?,
+    checksum_link: String?,
+    download_count: Long,
+    signature_link: String? = null
+) : Asset(name, link, size, checksum, checksum_link, signature_link, download_count)
diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Release.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Release.kt
@@ -7,7 +7,6 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema
 import java.time.ZonedDateTime
 import java.util.function.Predicate
 
-
 class Release {
 
     @Schema(example = "VXNlci0xMA==")

diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/ReleaseInfo.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/ReleaseInfo.kt
@@ -16,7 +16,12 @@ class ReleaseInfo {
     @Schema(example = "13")
     val most_recent_feature_release: Int
 
-    constructor(available_releases: Array<Int>, available_lts_releases: Array<Int>, most_recent_lts: Int, most_recent_feature_release: Int) {
+    constructor(
+        available_releases: Array<Int>,
+        available_lts_releases: Array<Int>,
+        most_recent_lts: Int,
+        most_recent_feature_release: Int
+    ) {
         this.available_releases = available_releases
         this.available_lts_releases = available_lts_releases
         this.most_recent_lts = most_recent_lts

diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/VersionData.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/VersionData.kt
@@ -18,7 +18,17 @@ class VersionData : Comparable<VersionData> {
     val build: Int
     val optional: String?
 
-    constructor(major: Int, minor: Int, security: Int, pre: String?, adopt_build_number: Int?, build: Int, optional: String?, openjdk_version: String, semver: String? = null) {
+    constructor(
+        major: Int,
+        minor: Int,
+        security: Int,
+        pre: String?,
+        adopt_build_number: Int?,
+        build: Int,
+        optional: String?,
+        openjdk_version: String,
+        semver: String? = null
+    ) {
         this.major = major
         this.minor = minor
         this.security = security

diff --git a/...njdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/DownloadStatsInterface.kt b/...njdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/DownloadStatsInterface.kt
@@ -57,7 +57,13 @@ class DownloadStatsInterface(
         return calculateDailyDiff(stats, periodStart, periodEnd, days)
     }
 
-    private suspend fun getStats(start: ZonedDateTime, end: ZonedDateTime, featureVersion: Int?, dockerRepo: String?, statsSource: StatsSource): Collection<StatEntry> {
+    private suspend fun getStats(
+        start: ZonedDateTime,
+        end: ZonedDateTime,
+        featureVersion: Int?,
+        dockerRepo: String?,
+        statsSource: StatsSource
+    ): Collection<StatEntry> {
         val githubGrouped = getGithubDownloadStatsByDate(start, end, featureVersion)
         val dockerGrouped = getDockerDownloadStatsByDate(start, end, dockerRepo)
 
@@ -69,7 +75,12 @@ class DownloadStatsInterface(
         return stats
     }
 
-    private fun calculateDailyDiff(stats: Collection<StatEntry>, periodStart: ZonedDateTime, periodEnd: ZonedDateTime, days: Int?): List<DownloadDiff> {
+    private fun calculateDailyDiff(
+        stats: Collection<StatEntry>,
+        periodStart: ZonedDateTime,
+        periodEnd: ZonedDateTime,
+        days: Int?
+    ): List<DownloadDiff> {
         return stats
                 .groupBy { it.dateTime.toLocalDate() }
                 .map { grouped ->

diff --git a/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/JsonMapper.kt b/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/JsonMapper.kt
@@ -11,7 +11,6 @@ import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
 import com.fasterxml.jackson.datatype.jsr310.deser.InstantDeserializer
 import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer
 import com.fasterxml.jackson.module.kotlin.KotlinModule
-import java.time.ZoneId
 import java.time.ZonedDateTime
 
 class ZonedTimeUpgrader : SimpleModule() {

diff --git a/...k-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/UpdaterHtmlClient.kt b/...k-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/UpdaterHtmlClient.kt
@@ -49,7 +49,11 @@ class DefaultUpdaterHtmlClient : UpdaterHtmlClient {
         }
     }
 
-    class ResponseHandler(val client: DefaultUpdaterHtmlClient, private val continuation: Continuation<HttpResponse>, val request: UrlRequest?) : FutureCallback<HttpResponse> {
+    class ResponseHandler(
+        val client: DefaultUpdaterHtmlClient,
+        private val continuation: Continuation<HttpResponse>,
+        val request: UrlRequest?
+    ) : FutureCallback<HttpResponse> {
         override fun cancelled() {
             continuation.resumeWithException(Exception("cancelled"))
         }

diff --git a/...k-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/UpdaterJsonMapper.kt b/...k-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/UpdaterJsonMapper.kt
@@ -13,7 +13,6 @@ import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer
 import com.fasterxml.jackson.datatype.jsr353.JSR353Module
 import com.fasterxml.jackson.module.kotlin.KotlinModule
 import net.adoptopenjdk.api.v3.TimeSource
-import java.time.ZoneId
 import java.time.ZonedDateTime
 
 class ZonedTimeUpgrader : SimpleModule() {

diff --git a/...tlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/clients/GraphQLGitHubInterface.kt b/...tlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/clients/GraphQLGitHubInterface.kt
@@ -152,7 +152,11 @@ open class GraphQLGitHubInterface() {
         }
     }
 
-    protected suspend fun <F : HasRateLimit> queryApi(requestEntityBuilder: GraphQLRequestEntity.RequestBuilder, cursor: String?, clazz: Class<F>): GraphQLResponseEntity<F> {
+    protected suspend fun <F : HasRateLimit> queryApi(
+        requestEntityBuilder: GraphQLRequestEntity.RequestBuilder,
+        cursor: String?,
+        clazz: Class<F>
+    ): GraphQLResponseEntity<F> {
 
         requestEntityBuilder.variables(Variable("cursorPointer", cursor))
         val query = requestEntityBuilder.build()

diff --git a/.../kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/GithubIdDeserializer.kt b/.../kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/GithubIdDeserializer.kt
@@ -9,4 +9,4 @@ object GithubIdDeserializer : JsonDeserializer<GithubId>() {
     override fun deserialize(parser: JsonParser, context: DeserializationContext?): GithubId {
         return GithubId(parser.valueAsString)
     }
-}
+}
diff --git a/...lin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/summary/GHReleaseSummary.kt b/...lin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/summary/GHReleaseSummary.kt
@@ -10,20 +10,20 @@ import net.adoptopenjdk.api.v3.mapping.ReleaseMapper
 import java.time.ZonedDateTime
 
 data class GHReleasesSummary @JsonCreator constructor(
-        @JsonProperty("nodes") val releases: List<GHReleaseSummary>,
-        @JsonProperty("pageInfo") val pageInfo: PageInfo
+    @JsonProperty("nodes") val releases: List<GHReleaseSummary>,
+    @JsonProperty("pageInfo") val pageInfo: PageInfo
 ) {
     fun getIds(): List<GithubId> {
         return releases.map { it.id }
     }
 }
 
 data class GHReleaseSummary @JsonCreator constructor(
-        @JsonProperty("id")
-        @JsonDeserialize(using = GithubIdDeserializer::class)
-        val id: GithubId,
-        @JsonProperty("publishedAt") val publishedAt: String,
-        @JsonProperty("updatedAt") val updatedAt: String
+    @JsonProperty("id")
+    @JsonDeserialize(using = GithubIdDeserializer::class)
+    val id: GithubId,
+    @JsonProperty("publishedAt") val publishedAt: String,
+    @JsonProperty("updatedAt") val updatedAt: String
 ) {
 
     fun getUpdatedTime(): ZonedDateTime {