From 65d6c6ee0782eeb3be39321725d90002cc60990f Mon Sep 17 00:00:00 2001 From: George Adams Date: Thu, 9 Apr 2020 12:14:00 +0100 Subject: [PATCH 1/4] fix linter failures --- .editorconfig | 2 +- .../net/adoptopenjdk/api/v3/OpenApiDocs.kt | 2 +- .../main/kotlin/net/adoptopenjdk/api/v3/V3.kt | 2 +- .../api/v3/filters/BinaryFilter.kt | 2 +- .../api/v3/filters/ReleaseFilter.kt | 2 +- .../api/v3/filters/VersionRangeFilter.kt | 2 +- .../api/v3/routes/AssetsResource.kt | 6 ++-- .../api/v3/routes/BinaryResource.kt | 2 +- .../net/adoptopenjdk/api/v3/routes/V1Route.kt | 2 +- .../api/v3/routes/VersionResource.kt | 2 +- .../routes/info/AvailableReleasesResource.kt | 2 +- .../api/v3/routes/info/PlatformsResource.kt | 2 +- .../api/v3/routes/info/ReleaseListResource.kt | 2 +- .../api/v3/routes/info/VariantsResource.kt | 2 +- .../v3/routes/stats/DownloadStatsResource.kt | 2 +- .../net/adoptopenjdk/api/AssetsPathTest.kt | 9 ++++-- ...ResourceFeatureReleasePathSortOrderTest.kt | 2 +- .../AssetsResourceFeatureReleasePathTest.kt | 2 +- .../api/AssetsResourceVersionPathTest.kt | 10 +++--- .../api/AvailableReleasesPathTest.kt | 2 +- .../net/adoptopenjdk/api/BinaryPathTest.kt | 32 +++++++++---------- .../adoptopenjdk/api/DownloadStatsPathTest.kt | 2 +- .../adoptopenjdk/api/JsonSerializationTest.kt | 4 +-- .../adoptopenjdk/api/LatestAssetsPathTest.kt | 2 +- .../net/adoptopenjdk/api/PlatformsPathTest.kt | 2 +- .../adoptopenjdk/api/ReleaseNamesPathTest.kt | 22 ++++++++++++- .../kotlin/net/adoptopenjdk/api/TestRunner.kt | 2 +- .../net/adoptopenjdk/api/V1RouteTest.kt | 2 +- .../net/adoptopenjdk/api/VariantsPathTest.kt | 2 +- .../net/adoptopenjdk/api/VersionPathTest.kt | 2 +- .../api/v3/dataSources/SortOrder.kt | 2 +- .../api/v3/dataSources/models/AdoptRepo.kt | 2 +- .../api/v3/dataSources/models/AdoptRepos.kt | 9 ++++-- .../v3/dataSources/models/FeatureRelease.kt | 2 +- .../api/v3/dataSources/models/GithubId.kt | 9 +++--- .../api/v3/dataSources/models/Releases.kt | 2 +- .../adoptopenjdk/api/v3/models/APIError.kt | 2 +- .../api/v3/models/Architecture.kt | 2 +- .../net/adoptopenjdk/api/v3/models/Asset.kt | 2 +- .../net/adoptopenjdk/api/v3/models/Binary.kt | 2 +- .../api/v3/models/BinaryAssetView.kt | 2 +- .../api/v3/models/DbStatsEntry.kt | 2 +- .../api/v3/models/DockerDownloadStats.kt | 2 +- .../v3/models/DockerDownloadStatsDbEntry.kt | 2 +- .../api/v3/models/DownloadDiff.kt | 2 +- .../api/v3/models/DownloadStats.kt | 2 +- .../api/v3/models/FileNameMatcher.kt | 2 +- .../v3/models/GithubDownloadStatsDbEntry.kt | 2 +- .../adoptopenjdk/api/v3/models/HeapSize.kt | 2 +- .../adoptopenjdk/api/v3/models/ImageType.kt | 2 +- .../adoptopenjdk/api/v3/models/Installer.kt | 10 +++++- .../net/adoptopenjdk/api/v3/models/JvmImpl.kt | 2 +- .../api/v3/models/OperatingSystem.kt | 2 +- .../net/adoptopenjdk/api/v3/models/Package.kt | 10 +++++- .../adoptopenjdk/api/v3/models/Platforms.kt | 2 +- .../net/adoptopenjdk/api/v3/models/Project.kt | 2 +- .../net/adoptopenjdk/api/v3/models/Release.kt | 3 +- .../adoptopenjdk/api/v3/models/ReleaseInfo.kt | 9 ++++-- .../adoptopenjdk/api/v3/models/ReleaseList.kt | 2 +- .../adoptopenjdk/api/v3/models/ReleaseType.kt | 2 +- .../api/v3/models/ReleaseVersionList.kt | 2 +- .../api/v3/models/SourcePackage.kt | 2 +- .../adoptopenjdk/api/v3/models/StatsSource.kt | 2 +- .../net/adoptopenjdk/api/v3/models/Variant.kt | 2 +- .../net/adoptopenjdk/api/v3/models/Vendor.kt | 2 +- .../adoptopenjdk/api/v3/models/VersionData.kt | 14 ++++++-- .../api/v3/parser/VersionParser.kt | 2 +- .../net/adoptopenjdk/api/VersionParserTest.kt | 2 +- .../api/v3/DownloadStatsInterface.kt | 17 ++++++++-- .../net/adoptopenjdk/api/v3/JsonMapper.kt | 3 +- .../net/adoptopenjdk/api/v3/TimeSource.kt | 2 +- .../api/v3/dataSources/APIDataStore.kt | 2 +- .../v3/dataSources/ApiPersistenceFactory.kt | 2 +- .../dataSources/persitence/ApiPersistence.kt | 2 +- .../persitence/mongo/MongoApiPersistence.kt | 2 +- .../persitence/mongo/MongoClient.kt | 2 +- .../persitence/mongo/MongoInterface.kt | 2 +- .../adoptopenjdk/api/v3/AdoptReposBuilder.kt | 2 +- .../adoptopenjdk/api/v3/AdoptRepository.kt | 2 +- .../adoptopenjdk/api/v3/HttpClientFactory.kt | 2 +- .../net/adoptopenjdk/api/v3/V3Updater.kt | 2 +- .../api/v3/dataSources/UpdaterHtmlClient.kt | 8 +++-- .../api/v3/dataSources/UpdaterJsonMapper.kt | 3 +- .../api/v3/dataSources/github/GitHubApi.kt | 2 +- .../api/v3/dataSources/github/GithubAuth.kt | 2 +- .../github/graphql/GraphQLGitHubClient.kt | 2 +- .../graphql/clients/GraphQLGitHubInterface.kt | 8 +++-- .../clients/GraphQLGitHubReleaseClient.kt | 2 +- .../clients/GraphQLGitHubReleaseRequest.kt | 2 +- .../clients/GraphQLGitHubRepositoryClient.kt | 2 +- .../clients/GraphQLGitHubSummaryClient.kt | 2 +- .../github/graphql/models/GHAssetNode.kt | 2 +- .../github/graphql/models/GHAssets.kt | 2 +- .../github/graphql/models/GHMetaData.kt | 2 +- .../github/graphql/models/GHRelease.kt | 2 +- .../github/graphql/models/GHRepository.kt | 2 +- .../github/graphql/models/GraphQLQueries.kt | 2 +- .../models/summary/GHReleaseSummary.kt | 16 +++++----- .../models/summary/GHRepositorySummary.kt | 2 +- .../api/v3/dataSources/mongo/CacheDbEntry.kt | 2 +- .../mongo/CachedGithubHtmlClient.kt | 4 +-- .../v3/dataSources/mongo/InternalDbStore.kt | 2 +- .../api/v3/mapping/BinaryMapper.kt | 2 +- .../api/v3/mapping/ReleaseMapper.kt | 2 +- .../api/v3/mapping/adopt/AdoptBinaryMapper.kt | 2 +- .../v3/mapping/adopt/AdoptReleaseMapper.kt | 22 +++++++++---- .../mapping/upstream/UpstreamBinaryMapper.kt | 2 +- .../mapping/upstream/UpstreamReleaseMapper.kt | 2 +- .../api/v3/stats/DockerStatsInterface.kt | 2 +- .../v3/stats/GithubDownloadStatsCalculator.kt | 2 +- .../api/v3/stats/StatsInterface.kt | 6 ++-- .../net/adoptopenjdk/api/APIDataStoreTest.kt | 2 +- .../adoptopenjdk/api/AdoptBinaryMapperTest.kt | 2 +- .../api/AdoptMetadataVersionParsingTest.kt | 2 +- .../api/AdoptReleaseMapperTest.kt | 22 ++++++------- .../adoptopenjdk/api/AdoptReposBuilderTest.kt | 2 +- .../net/adoptopenjdk/api/AdoptReposTest.kt | 2 +- .../kotlin/net/adoptopenjdk/api/BaseTest.kt | 2 +- .../api/DockerStatsInterfaceTest.kt | 3 +- .../api/MetadataSerializationTest.kt | 2 +- .../adoptopenjdk/api/TestResourceGenerator.kt | 2 +- .../net/adoptopenjdk/api/UpdateRunner.kt | 2 +- .../api/UpstreamBinaryMapperTest.kt | 2 +- .../api/UpstreamReleaseMapperTest.kt | 5 ++- 124 files changed, 270 insertions(+), 192 deletions(-) diff --git a/.editorconfig b/.editorconfig index 767bf510..14c604f0 100644 --- a/.editorconfig +++ b/.editorconfig @@ -4,7 +4,7 @@ end_of_line = lf indent_size = 4 indent_style = space insert_final_newline = false -max_line_length = 120 +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/OpenApiDocs.kt b/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/OpenApiDocs.kt index 61eac71b..cb2b066b 100644 --- a/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/OpenApiDocs.kt +++ b/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/OpenApiDocs.kt @@ -36,4 +36,4 @@ object OpenApiDocs { const val RELEASE_TYPE = """

Type of release. Either a release version, known as General Availability(ga) or an Early Access(ea)

""" -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/V3.kt b/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/V3.kt index 6de66c5c..cad5e848 100644 --- a/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/V3.kt +++ b/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/V3.kt @@ -76,4 +76,4 @@ class V3 : Application() { override fun getClasses(): Set> { return resourceClasses } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/filters/BinaryFilter.kt b/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/filters/BinaryFilter.kt index b6a35809..053189e3 100644 --- a/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/filters/BinaryFilter.kt +++ b/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/filters/BinaryFilter.kt @@ -42,4 +42,4 @@ class BinaryFilter : Predicate { (heapSize == null || binary.heap_size == heapSize) && (binary.project == project) } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/filters/ReleaseFilter.kt b/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/filters/ReleaseFilter.kt index de6c97bb..868f4e22 100644 --- a/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/filters/ReleaseFilter.kt +++ b/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/filters/ReleaseFilter.kt @@ -30,4 +30,4 @@ class ReleaseFilter( (versionRange == null || versionRange.test(release.version_data)) && ltsFilter } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/filters/VersionRangeFilter.kt b/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/filters/VersionRangeFilter.kt index efffc078..fec8c428 100644 --- a/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/filters/VersionRangeFilter.kt +++ b/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/filters/VersionRangeFilter.kt @@ -35,4 +35,4 @@ class VersionRangeFilter(range: String?) : Predicate { return true } } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/AssetsResource.kt b/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/AssetsResource.kt index 08b38a1c..a694b4a9 100644 --- a/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/AssetsResource.kt +++ b/adoptopenjdk-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", @@ -275,4 +275,4 @@ class AssetsResource { .map { BinaryAssetView(it.first.release_name, it.second, it.first.version_data) } .toList() } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/BinaryResource.kt b/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/BinaryResource.kt index 588fdc0f..c0d65dee 100644 --- a/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/BinaryResource.kt +++ b/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/BinaryResource.kt @@ -185,4 +185,4 @@ class BinaryResource { .entity(JsonMapper.mapper.writeValueAsString(APIError(message))) .build() } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/V1Route.kt b/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/V1Route.kt index 3c4525de..7d973a1a 100644 --- a/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/V1Route.kt +++ b/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/V1Route.kt @@ -32,4 +32,4 @@ class V1Route { .entity("REMOVED: V1 has now been removed, please see https://api.adoptopenjdk.net for the latest version") .build() } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/VersionResource.kt b/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/VersionResource.kt index 83caaa35..b810eb0e 100644 --- a/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/VersionResource.kt +++ b/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/VersionResource.kt @@ -42,4 +42,4 @@ class VersionResource { throw BadRequestException("Unable to parse version") } } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/info/AvailableReleasesResource.kt b/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/info/AvailableReleasesResource.kt index ddd52ff1..310dc0f8 100644 --- a/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/info/AvailableReleasesResource.kt +++ b/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/info/AvailableReleasesResource.kt @@ -25,4 +25,4 @@ class AvailableReleasesResource { APIDataStore.variants.latestVersion ) } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/info/PlatformsResource.kt b/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/info/PlatformsResource.kt index a172eb69..c174b6d1 100644 --- a/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/info/PlatformsResource.kt +++ b/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/info/PlatformsResource.kt @@ -21,4 +21,4 @@ class PlatformsResource { fun get(): Platforms { return APIDataStore.platforms } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/info/ReleaseListResource.kt b/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/info/ReleaseListResource.kt index 48941291..90e4bfb2 100644 --- a/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/info/ReleaseListResource.kt +++ b/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/info/ReleaseListResource.kt @@ -114,4 +114,4 @@ class ReleaseListResource { .getAdoptRepos() .getReleases(releaseFilter, sortOrder) } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/info/VariantsResource.kt b/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/info/VariantsResource.kt index 2d017356..4c24c89c 100644 --- a/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/info/VariantsResource.kt +++ b/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/info/VariantsResource.kt @@ -21,4 +21,4 @@ class VariantsResource { fun get(): Variants { return APIDataStore.variants } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/stats/DownloadStatsResource.kt b/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/stats/DownloadStatsResource.kt index 4420a8e3..d779806c 100644 --- a/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/stats/DownloadStatsResource.kt +++ b/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/stats/DownloadStatsResource.kt @@ -166,4 +166,4 @@ class DownloadStatsResource { return future } -} +} \ No newline at end of file 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 index 2a3bb2e7..84c8847d 100644 --- 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 createTest(values: Array, path: String, filterParamName: String, exclude: (element: T) -> Boolean = { false }): List { + protected fun createTest( + values: Array, + path: String, + filterParamName: String, + exclude: (element: T) -> Boolean = { false } + ): List { return values .filter { !exclude(it) } .map { value -> @@ -67,4 +72,4 @@ abstract class AssetsPathTest : BaseTest() { } } } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AssetsResourceFeatureReleasePathSortOrderTest.kt b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AssetsResourceFeatureReleasePathSortOrderTest.kt index d417944e..0043e066 100644 --- a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AssetsResourceFeatureReleasePathSortOrderTest.kt +++ b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AssetsResourceFeatureReleasePathSortOrderTest.kt @@ -80,4 +80,4 @@ class AssetsResourceFeatureReleasePathSortOrderTest : BaseTest() { assertEquals("bar", releases.get(1).id) } } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AssetsResourceFeatureReleasePathTest.kt b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AssetsResourceFeatureReleasePathTest.kt index 366d3976..5fcc0bdf 100644 --- a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AssetsResourceFeatureReleasePathTest.kt +++ b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AssetsResourceFeatureReleasePathTest.kt @@ -119,4 +119,4 @@ class AssetsResourceFeatureReleasePathTest : AssetsPathTest() { return JsonMapper.mapper.readValue(releasesStr, JsonMapper.mapper.getTypeFactory().constructCollectionType(MutableList::class.java, Release::class.java)) } } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AssetsResourceVersionPathTest.kt b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AssetsResourceVersionPathTest.kt index 61ecb459..f744539f 100644 --- a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AssetsResourceVersionPathTest.kt +++ b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AssetsResourceVersionPathTest.kt @@ -25,10 +25,10 @@ class AssetsResourceVersionPathTest : AssetsPathTest() { @TestFactory fun filtersLts(): Stream { 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() @@ -80,4 +80,4 @@ class AssetsResourceVersionPathTest : AssetsPathTest() { versionRange.equals(JAVA11) && element == ImageType.testimage || element == ImageType.debugimage } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AvailableReleasesPathTest.kt b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AvailableReleasesPathTest.kt index e84cc454..c85209da 100644 --- a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AvailableReleasesPathTest.kt +++ b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AvailableReleasesPathTest.kt @@ -15,4 +15,4 @@ class AvailableReleasesPathTest : BaseTest() { .then() .statusCode(200) } -} +} \ No newline at end of file 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 index ca5e4319..598dafe1 100644 --- 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 @@ -38,26 +38,26 @@ 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 ): String { return "$path/latest/$featureVersion/$releaseType/$os/$arch/$imageType/$jvmImpl/$heapSize/$vendor" } 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 ): String { return "$path/version/$releaseName/$os/$arch/$imageType/$jvmImpl/$heapSize/$vendor" } @@ -102,4 +102,4 @@ class BinaryPathTest : BaseTest() { .redirects().follow(false) .get(path) } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/DownloadStatsPathTest.kt b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/DownloadStatsPathTest.kt index 61189a12..4cd08f19 100644 --- a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/DownloadStatsPathTest.kt +++ b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/DownloadStatsPathTest.kt @@ -300,4 +300,4 @@ class DownloadStatsPathTest : BaseTest() { }) } } -} +} \ No newline at end of file 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 index dc71de3f..fdf96788 100644 --- 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()) } - -} - +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/LatestAssetsPathTest.kt b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/LatestAssetsPathTest.kt index 5976490d..93854dc1 100644 --- a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/LatestAssetsPathTest.kt +++ b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/LatestAssetsPathTest.kt @@ -66,4 +66,4 @@ class LatestAssetsPathTest : BaseTest() { .count() > 0 return hasEntry } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/PlatformsPathTest.kt b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/PlatformsPathTest.kt index f1db5608..c17a0e94 100644 --- a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/PlatformsPathTest.kt +++ b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/PlatformsPathTest.kt @@ -15,4 +15,4 @@ class PlatformsPathTest : BaseTest() { .then() .statusCode(200) } -} +} \ No newline at end of file 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 index 003c9ec5..005ad611 100644 --- 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) + } +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/TestRunner.kt b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/TestRunner.kt index b5f49da6..82de9c68 100644 --- a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/TestRunner.kt +++ b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/TestRunner.kt @@ -34,4 +34,4 @@ class TestRunner : BaseTest() { fun run() { Awaitility.await().atMost(Long.MAX_VALUE, TimeUnit.NANOSECONDS).until({ 4 === 5 }) } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/V1RouteTest.kt b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/V1RouteTest.kt index 5ba1be32..9044fcd7 100644 --- a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/V1RouteTest.kt +++ b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/V1RouteTest.kt @@ -21,4 +21,4 @@ class V1RouteTest : BaseTest() { .statusCode(Response.Status.GONE.statusCode) }) } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/VariantsPathTest.kt b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/VariantsPathTest.kt index 1f23c7ed..8e0e89fc 100644 --- a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/VariantsPathTest.kt +++ b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/VariantsPathTest.kt @@ -15,4 +15,4 @@ class VariantsPathTest : BaseTest() { .then() .statusCode(200) } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/VersionPathTest.kt b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/VersionPathTest.kt index 9145e1de..a26a13cf 100644 --- a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/VersionPathTest.kt +++ b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/VersionPathTest.kt @@ -58,4 +58,4 @@ class VersionPathTest { .then() .statusCode(400) } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/SortOrder.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/SortOrder.kt index c364a476..c4d8a0af 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/SortOrder.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/SortOrder.kt @@ -7,4 +7,4 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema enum class SortOrder { ASC, DESC; -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/models/AdoptRepo.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/models/AdoptRepo.kt index 510f77f6..2b6929cd 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/models/AdoptRepo.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/models/AdoptRepo.kt @@ -2,4 +2,4 @@ package net.adoptopenjdk.api.v3.dataSources.models import net.adoptopenjdk.api.v3.models.Release -class AdoptRepo(val releases: List) +class AdoptRepo(val releases: List) \ No newline at end of file diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/models/AdoptRepos.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/models/AdoptRepos.kt index ad49d92e..41c3b5a1 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/models/AdoptRepos.kt +++ b/adoptopenjdk-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, binaryFilter: Predicate, sortOrder: SortOrder): Sequence { + fun getFilteredReleases( + version: Int, + releaseFilter: Predicate, + binaryFilter: Predicate, + sortOrder: SortOrder + ): Sequence { val featureRelease = getFeatureRelease(version) ?: return emptySequence() return getFilteredReleases(featureRelease.releases.getReleases(releaseFilter, sortOrder), binaryFilter) @@ -89,4 +94,4 @@ class AdoptRepos { result = 31 * result + allReleases.hashCode() return result } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/models/FeatureRelease.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/models/FeatureRelease.kt index 00eb23ed..9d9bfe81 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/models/FeatureRelease.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/models/FeatureRelease.kt @@ -54,4 +54,4 @@ class FeatureRelease { result = 31 * result + releases.hashCode() return result } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/models/GithubId.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/models/GithubId.kt index 7fafc18f..2ffe3194 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/models/GithubId.kt +++ b/adoptopenjdk-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() } - - -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/models/Releases.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/models/Releases.kt index 357c8ed9..3cd8cdf3 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/models/Releases.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/models/Releases.kt @@ -107,4 +107,4 @@ class Releases { .thenComparing { release: Release -> release.release_name } .thenComparing { release: Release -> release.id } } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/APIError.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/APIError.kt index 0ae217a5..eba0d454 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/APIError.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/APIError.kt @@ -1,3 +1,3 @@ package net.adoptopenjdk.api.v3.models -class APIError(val errorMessage: String) +class APIError(val errorMessage: String) \ No newline at end of file diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Architecture.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Architecture.kt index 142d07a5..df10b69f 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Architecture.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Architecture.kt @@ -31,4 +31,4 @@ enum class Architecture : FileNameMatcher { .first() } } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Asset.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Asset.kt index f3f2d1e8..1823d7b2 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Asset.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Asset.kt @@ -68,4 +68,4 @@ open class Asset { result = 31 * result + (signature_link?.hashCode() ?: 0) return result } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Binary.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Binary.kt index a463a61b..0a5125e9 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Binary.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Binary.kt @@ -99,4 +99,4 @@ class Binary { result = 31 * result + project.hashCode() return result } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/BinaryAssetView.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/BinaryAssetView.kt index ac9ee772..89b44dd7 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/BinaryAssetView.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/BinaryAssetView.kt @@ -23,4 +23,4 @@ class BinaryAssetView { this.binary = binary this.version = version } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/DbStatsEntry.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/DbStatsEntry.kt index ce2481c4..4570e09c 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/DbStatsEntry.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/DbStatsEntry.kt @@ -7,4 +7,4 @@ abstract class DbStatsEntry( ) { abstract fun getMetric(): Long abstract fun getId(): T -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/DockerDownloadStats.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/DockerDownloadStats.kt index 6ad33573..b72f5a62 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/DockerDownloadStats.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/DockerDownloadStats.kt @@ -5,4 +5,4 @@ class DockerDownloadStats( val downloads: Map, val total_daily_downloads: Long, val daily_downloads: Map -) +) \ No newline at end of file diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/DockerDownloadStatsDbEntry.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/DockerDownloadStatsDbEntry.kt index 28a56b9e..8bc6031f 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/DockerDownloadStatsDbEntry.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/DockerDownloadStatsDbEntry.kt @@ -9,4 +9,4 @@ class DockerDownloadStatsDbEntry( ) : DbStatsEntry(date) { override fun getMetric(): Long = pulls override fun getId(): String = repo -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/DownloadDiff.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/DownloadDiff.kt index 0caeb742..72104ebb 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/DownloadDiff.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/DownloadDiff.kt @@ -6,4 +6,4 @@ class DownloadDiff( val date: ZonedDateTime, val total: Long, val daily: Long -) +) \ No newline at end of file diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/DownloadStats.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/DownloadStats.kt index d7ce519d..61af16a9 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/DownloadStats.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/DownloadStats.kt @@ -47,4 +47,4 @@ class TotalStats { this.github_downloads = github_downloads this.total = total } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/FileNameMatcher.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/FileNameMatcher.kt index 8081b8d7..40dcc714 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/FileNameMatcher.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/FileNameMatcher.kt @@ -17,4 +17,4 @@ interface FileNameMatcher { .map { it.toLowerCase() } .toList() } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/GithubDownloadStatsDbEntry.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/GithubDownloadStatsDbEntry.kt index 4ea4d224..18cdeee1 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/GithubDownloadStatsDbEntry.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/GithubDownloadStatsDbEntry.kt @@ -9,4 +9,4 @@ class GithubDownloadStatsDbEntry( ) : DbStatsEntry(date) { override fun getMetric(): Long = downloads override fun getId(): Int = feature_version -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/HeapSize.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/HeapSize.kt index a92f7438..7dab3c82 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/HeapSize.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/HeapSize.kt @@ -20,4 +20,4 @@ enum class HeapSize : FileNameMatcher { lowerCaseFileName.contains(Regex("${it}_")) } != null } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/ImageType.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/ImageType.kt index 6d1e568f..cc5fd5d4 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/ImageType.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/ImageType.kt @@ -12,4 +12,4 @@ enum class ImageType : FileNameMatcher { constructor(vararg alternativeNames: String) { setNames(name, alternativeNames.toList()) } -} +} \ No newline at end of file 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 index 8762c093..ee5ccb5b 100644 --- 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) \ No newline at end of file diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/JvmImpl.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/JvmImpl.kt index 1cbefde7..99aaa676 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/JvmImpl.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/JvmImpl.kt @@ -12,4 +12,4 @@ enum class JvmImpl : FileNameMatcher { constructor(vararg alternativeNames: String) { setNames(this.name, alternativeNames.toList()) } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/OperatingSystem.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/OperatingSystem.kt index c93a208b..7af1fc50 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/OperatingSystem.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/OperatingSystem.kt @@ -16,4 +16,4 @@ enum class OperatingSystem : FileNameMatcher { constructor(vararg alternativeNames: String) { setNames(this.name, alternativeNames.toList()) } -} +} \ No newline at end of file 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 index 45f6c494..cbd7bd2e 100644 --- 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) \ No newline at end of file diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Platforms.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Platforms.kt index cf48c491..32af73f2 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Platforms.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Platforms.kt @@ -91,4 +91,4 @@ class Platforms { ) { this.platforms = platforms } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Project.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Project.kt index a6486fa8..abf4ef7c 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Project.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Project.kt @@ -17,4 +17,4 @@ enum class Project : FileNameMatcher { constructor(vararg alternativeNames: String) { setNames(this.name, alternativeNames.toList()) } -} +} \ No newline at end of file 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 index 820d585b..9787c092 100644 --- 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==") @@ -121,4 +120,4 @@ class Release { result = 31 * result + (source?.hashCode() ?: 0) return result } -} +} \ No newline at end of file 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 index 4c63d8da..02d69dd9 100644 --- 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,10 +16,15 @@ class ReleaseInfo { @Schema(example = "13") val most_recent_feature_release: Int - constructor(available_releases: Array, available_lts_releases: Array, most_recent_lts: Int, most_recent_feature_release: Int) { + constructor( + available_releases: Array, + available_lts_releases: Array, + 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 this.most_recent_feature_release = most_recent_feature_release } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/ReleaseList.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/ReleaseList.kt index 51879200..9159e2fe 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/ReleaseList.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/ReleaseList.kt @@ -7,4 +7,4 @@ class ReleaseList { constructor(releases: Array) { this.releases = releases } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/ReleaseType.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/ReleaseType.kt index 703d1ce2..c182b0cf 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/ReleaseType.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/ReleaseType.kt @@ -7,4 +7,4 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema enum class ReleaseType { ga, ea; -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/ReleaseVersionList.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/ReleaseVersionList.kt index 7052fbdc..12010c5b 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/ReleaseVersionList.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/ReleaseVersionList.kt @@ -11,4 +11,4 @@ class ReleaseVersionList { constructor(versions: Array) { this.versions = versions } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/SourcePackage.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/SourcePackage.kt index b268b0e4..9507645c 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/SourcePackage.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/SourcePackage.kt @@ -22,4 +22,4 @@ class SourcePackage { this.link = link this.size = size } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/StatsSource.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/StatsSource.kt index 6268dd37..27d4596d 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/StatsSource.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/StatsSource.kt @@ -8,4 +8,4 @@ enum class StatsSource { github, dockerhub, all; -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Variant.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Variant.kt index 6fac5dbc..9e5a8725 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Variant.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Variant.kt @@ -75,4 +75,4 @@ class Variants { } } } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Vendor.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Vendor.kt index 910fb533..276424cb 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Vendor.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Vendor.kt @@ -7,4 +7,4 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema enum class Vendor { adoptopenjdk, openjdk // , amazon, azul, bellsoft, , sap; -} +} \ No newline at end of file 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 index b0946902..451d2e47 100644 --- 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 { 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 @@ -103,4 +113,4 @@ class VersionData : Comparable { .thenBy { it.adopt_build_number } .thenBy { it.optional } } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/parser/VersionParser.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/parser/VersionParser.kt index a6f75d7e..6cee9a3d 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/parser/VersionParser.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/parser/VersionParser.kt @@ -226,4 +226,4 @@ object VersionParser { } } -class FailedToParse(message: String) : Exception(message) +class FailedToParse(message: String) : Exception(message) \ No newline at end of file diff --git a/adoptopenjdk-api-v3-models/src/test/kotlin/net/adoptopenjdk/api/VersionParserTest.kt b/adoptopenjdk-api-v3-models/src/test/kotlin/net/adoptopenjdk/api/VersionParserTest.kt index 758944ca..7405aa55 100644 --- a/adoptopenjdk-api-v3-models/src/test/kotlin/net/adoptopenjdk/api/VersionParserTest.kt +++ b/adoptopenjdk-api-v3-models/src/test/kotlin/net/adoptopenjdk/api/VersionParserTest.kt @@ -134,4 +134,4 @@ class VersionParserTest { assertEquals(second, sorted.toList()[1]) assertEquals(third, sorted.toList()[0]) } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/DownloadStatsInterface.kt b/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/DownloadStatsInterface.kt index 84ad0906..a26c7b92 100644 --- a/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/DownloadStatsInterface.kt +++ b/adoptopenjdk-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 { + private suspend fun getStats( + start: ZonedDateTime, + end: ZonedDateTime, + featureVersion: Int?, + dockerRepo: String?, + statsSource: StatsSource + ): Collection { 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, periodStart: ZonedDateTime, periodEnd: ZonedDateTime, days: Int?): List { + private fun calculateDailyDiff( + stats: Collection, + periodStart: ZonedDateTime, + periodEnd: ZonedDateTime, + days: Int? + ): List { return stats .groupBy { it.dateTime.toLocalDate() } .map { grouped -> @@ -173,4 +184,4 @@ class DownloadStatsInterface( dataStore.getLatestGithubStatsForFeatureVersion(featureVersion) } } -} +} \ No newline at end of file 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 index 43166d6d..7a644e33 100644 --- 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() { @@ -36,4 +35,4 @@ object JsonMapper { .registerModule(KotlinModule()) .registerModule(JavaTimeModule()) .registerModule(ZonedTimeUpgrader()) -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/TimeSource.kt b/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/TimeSource.kt index 0979a690..cd5f5e5a 100644 --- a/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/TimeSource.kt +++ b/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/TimeSource.kt @@ -9,4 +9,4 @@ object TimeSource { val ZONE: ZoneId = ZoneId.of("Z") fun now(): ZonedDateTime = ZonedDateTime.now(ZONE).truncatedTo(ChronoUnit.SECONDS) fun date(): LocalDate = LocalDate.now(ZONE) -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/APIDataStore.kt b/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/APIDataStore.kt index f5261aa6..afe283e5 100644 --- a/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/APIDataStore.kt +++ b/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/APIDataStore.kt @@ -75,4 +75,4 @@ object APIDataStore { LOGGER.error("Failed to load db", e) } } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/ApiPersistenceFactory.kt b/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/ApiPersistenceFactory.kt index 65041dc4..352fcbb0 100644 --- a/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/ApiPersistenceFactory.kt +++ b/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/ApiPersistenceFactory.kt @@ -18,4 +18,4 @@ object ApiPersistenceFactory { fun set(impl: ApiPersistence?) { this.impl = impl } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/persitence/ApiPersistence.kt b/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/persitence/ApiPersistence.kt index baad2f03..dfbe5ada 100644 --- a/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/persitence/ApiPersistence.kt +++ b/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/persitence/ApiPersistence.kt @@ -18,4 +18,4 @@ interface ApiPersistence { suspend fun addDockerDownloadStatsEntries(stats: List) suspend fun getLatestAllDockerStats(): List suspend fun removeStatsBetween(start: ZonedDateTime, end: ZonedDateTime) -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/persitence/mongo/MongoApiPersistence.kt b/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/persitence/mongo/MongoApiPersistence.kt index 4619258b..16ec8a70 100644 --- a/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/persitence/mongo/MongoApiPersistence.kt +++ b/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/persitence/mongo/MongoApiPersistence.kt @@ -139,4 +139,4 @@ class MongoApiPersistence(mongoClient: MongoClient) : MongoInterface(mongoClient } private fun majorVersionMatcher(featureVersion: Int) = Document("version_data.major", featureVersion) -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/persitence/mongo/MongoClient.kt b/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/persitence/mongo/MongoClient.kt index a6f79a6f..ae4df385 100644 --- a/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/persitence/mongo/MongoClient.kt +++ b/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/persitence/mongo/MongoClient.kt @@ -52,4 +52,4 @@ class MongoClient { client = KMongo.createClient(uri).coroutine database = client.getDatabase(dbName) } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/persitence/mongo/MongoInterface.kt b/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/persitence/mongo/MongoInterface.kt index 05361bc4..49ad3e0d 100644 --- a/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/persitence/mongo/MongoInterface.kt +++ b/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/persitence/mongo/MongoInterface.kt @@ -18,4 +18,4 @@ abstract class MongoInterface(mongoClient: MongoClient) { return@runBlocking database.getCollection(collectionName) } } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/AdoptReposBuilder.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/AdoptReposBuilder.kt index b22eec8f..bbc0be67 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/AdoptReposBuilder.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/AdoptReposBuilder.kt @@ -101,4 +101,4 @@ object AdoptReposBuilder { LOGGER.info("DONE") return AdoptRepos(reposMap) } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/AdoptRepository.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/AdoptRepository.kt index 88eda397..4b05aa51 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/AdoptRepository.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/AdoptRepository.kt @@ -112,4 +112,4 @@ object AdoptRepositoryImpl : AdoptRepository { return@async releases } } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/HttpClientFactory.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/HttpClientFactory.kt index c9577065..d9e93e31 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/HttpClientFactory.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/HttpClientFactory.kt @@ -55,4 +55,4 @@ object HttpClientFactory { fun getNonRedirectHttpClient(): HttpAsyncClient { return noRedirect } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/V3Updater.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/V3Updater.kt index 70eceea3..e7397df2 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/V3Updater.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/V3Updater.kt @@ -92,4 +92,4 @@ class V3Updater { LOGGER.error("Failed to perform incremental update", e) } } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/UpdaterHtmlClient.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/UpdaterHtmlClient.kt index 9bb80030..d22c7982 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/UpdaterHtmlClient.kt +++ b/adoptopenjdk-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, val request: UrlRequest?) : FutureCallback { + class ResponseHandler( + val client: DefaultUpdaterHtmlClient, + private val continuation: Continuation, + val request: UrlRequest? + ) : FutureCallback { override fun cancelled() { continuation.resumeWithException(Exception("cancelled")) } @@ -151,4 +155,4 @@ class DefaultUpdaterHtmlClient : UpdaterHtmlClient { } class NotFoundException : Throwable() -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/UpdaterJsonMapper.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/UpdaterJsonMapper.kt index 59bc036d..e676f9eb 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/UpdaterJsonMapper.kt +++ b/adoptopenjdk-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() { @@ -39,4 +38,4 @@ object UpdaterJsonMapper { .registerModule(JavaTimeModule()) .registerModule(JSR353Module()) .registerModule(ZonedTimeUpgrader()) -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/GitHubApi.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/GitHubApi.kt index bc6740a9..f96a723a 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/GitHubApi.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/GitHubApi.kt @@ -9,4 +9,4 @@ interface GitHubApi { suspend fun getRepository(repoName: String): GHRepository suspend fun getRepositorySummary(repoName: String): GHRepositorySummary suspend fun getReleaseById(id: GithubId): GHRelease? -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/GithubAuth.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/GithubAuth.kt index 215a4892..790edd65 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/GithubAuth.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/GithubAuth.kt @@ -39,4 +39,4 @@ class GithubAuth { return token } } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/GraphQLGitHubClient.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/GraphQLGitHubClient.kt index b5bf518e..f7ed4996 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/GraphQLGitHubClient.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/GraphQLGitHubClient.kt @@ -25,4 +25,4 @@ class GraphQLGitHubClient : GitHubApi { override suspend fun getRepository(repoName: String): GHRepository { return repositoryClientClient.getRepository(repoName) } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/clients/GraphQLGitHubInterface.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/clients/GraphQLGitHubInterface.kt index f7b3536e..d269c61b 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/clients/GraphQLGitHubInterface.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/clients/GraphQLGitHubInterface.kt @@ -152,7 +152,11 @@ open class GraphQLGitHubInterface() { } } - protected suspend fun queryApi(requestEntityBuilder: GraphQLRequestEntity.RequestBuilder, cursor: String?, clazz: Class): GraphQLResponseEntity { + protected suspend fun queryApi( + requestEntityBuilder: GraphQLRequestEntity.RequestBuilder, + cursor: String?, + clazz: Class + ): GraphQLResponseEntity { requestEntityBuilder.variables(Variable("cursorPointer", cursor)) val query = requestEntityBuilder.build() @@ -186,4 +190,4 @@ open class GraphQLGitHubInterface() { LOGGER.warn("Retry limit hit $query") LOGGER.warn("Cursor $cursor") } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/clients/GraphQLGitHubReleaseClient.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/clients/GraphQLGitHubReleaseClient.kt index f69efdc0..7daaa9d7 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/clients/GraphQLGitHubReleaseClient.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/clients/GraphQLGitHubReleaseClient.kt @@ -62,4 +62,4 @@ open class GraphQLGitHubReleaseClient : GraphQLGitHubReleaseRequest() { } """) } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/clients/GraphQLGitHubReleaseRequest.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/clients/GraphQLGitHubReleaseRequest.kt index f4b9cb96..b301837c 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/clients/GraphQLGitHubReleaseRequest.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/clients/GraphQLGitHubReleaseRequest.kt @@ -59,4 +59,4 @@ open class GraphQLGitHubReleaseRequest : GraphQLGitHubInterface() { } """) } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/clients/GraphQLGitHubRepositoryClient.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/clients/GraphQLGitHubRepositoryClient.kt index a0346c6d..015928eb 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/clients/GraphQLGitHubRepositoryClient.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/clients/GraphQLGitHubRepositoryClient.kt @@ -82,4 +82,4 @@ open class GraphQLGitHubRepositoryClient : GraphQLGitHubReleaseRequest() { } """) } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/clients/GraphQLGitHubSummaryClient.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/clients/GraphQLGitHubSummaryClient.kt index 78be9c14..c6af2b1c 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/clients/GraphQLGitHubSummaryClient.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/clients/GraphQLGitHubSummaryClient.kt @@ -61,4 +61,4 @@ class GraphQLGitHubSummaryClient : GraphQLGitHubInterface() { } """) } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/GHAssetNode.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/GHAssetNode.kt index b504ffdc..0003b312 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/GHAssetNode.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/GHAssetNode.kt @@ -11,4 +11,4 @@ data class GHAsset @JsonCreator constructor( @JsonProperty("updatedAt") val updatedAt: String ) -data class GHAssetNode @JsonCreator constructor(@JsonProperty("releaseAssets") val releaseAssets: GHAssets) +data class GHAssetNode @JsonCreator constructor(@JsonProperty("releaseAssets") val releaseAssets: GHAssets) \ No newline at end of file diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/GHAssets.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/GHAssets.kt index 409e8b51..f09f3542 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/GHAssets.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/GHAssets.kt @@ -6,4 +6,4 @@ import com.fasterxml.jackson.annotation.JsonProperty data class GHAssets @JsonCreator constructor( @JsonProperty("nodes") val assets: List, @JsonProperty("pageInfo") val pageInfo: PageInfo -) +) \ No newline at end of file diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/GHMetaData.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/GHMetaData.kt index 15f85264..adeb42a0 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/GHMetaData.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/GHMetaData.kt @@ -36,4 +36,4 @@ data class GHMetaData @JsonCreator constructor( @JsonProperty("version_data") val version_data: String, @JsonProperty("binary_type") val binary_type: ImageType, @JsonProperty("sha256") val sha256: String -) +) \ No newline at end of file diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/GHRelease.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/GHRelease.kt index 779e7cea..e1176fb5 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/GHRelease.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/GHRelease.kt @@ -27,4 +27,4 @@ data class GHRelease @JsonCreator constructor( @JsonProperty("releaseAssets") val releaseAssets: GHAssets, @JsonProperty("resourcePath") val resourcePath: String, @JsonProperty("url") val url: String -) +) \ No newline at end of file diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/GHRepository.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/GHRepository.kt index 145f43b4..f6b1da65 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/GHRepository.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/GHRepository.kt @@ -9,4 +9,4 @@ data class GHRepository @JsonCreator constructor( fun getReleases(): List { return releases.releases } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/GraphQLQueries.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/GraphQLQueries.kt index 44e441ab..3a3a023f 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/GraphQLQueries.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/GraphQLQueries.kt @@ -33,4 +33,4 @@ class QuerySummaryData @JsonCreator constructor( class ReleaseQueryData @JsonCreator constructor( @JsonProperty("node") val assetNode: GHAssetNode?, @JsonProperty("rateLimit") rateLimit: RateLimit -) : HasRateLimit(rateLimit) +) : HasRateLimit(rateLimit) \ No newline at end of file diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/summary/GHReleaseSummary.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/summary/GHReleaseSummary.kt index 1a857200..e62cadea 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/summary/GHReleaseSummary.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/summary/GHReleaseSummary.kt @@ -10,8 +10,8 @@ import net.adoptopenjdk.api.v3.mapping.ReleaseMapper import java.time.ZonedDateTime data class GHReleasesSummary @JsonCreator constructor( - @JsonProperty("nodes") val releases: List, - @JsonProperty("pageInfo") val pageInfo: PageInfo + @JsonProperty("nodes") val releases: List, + @JsonProperty("pageInfo") val pageInfo: PageInfo ) { fun getIds(): List { return releases.map { it.id } @@ -19,14 +19,14 @@ data class GHReleasesSummary @JsonCreator constructor( } 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 { return ReleaseMapper.parseDate(updatedAt) } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/summary/GHRepositorySummary.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/summary/GHRepositorySummary.kt index abd7f482..f4a1503d 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/summary/GHRepositorySummary.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/summary/GHRepositorySummary.kt @@ -3,4 +3,4 @@ package net.adoptopenjdk.api.v3.dataSources.github.graphql.models.summary import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty -data class GHRepositorySummary @JsonCreator constructor(@JsonProperty("releases") val releases: GHReleasesSummary) +data class GHRepositorySummary @JsonCreator constructor(@JsonProperty("releases") val releases: GHReleasesSummary) \ No newline at end of file diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/mongo/CacheDbEntry.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/mongo/CacheDbEntry.kt index 560d5e10..ceaf8ae1 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/mongo/CacheDbEntry.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/mongo/CacheDbEntry.kt @@ -4,4 +4,4 @@ class CacheDbEntry( val url: String, val lastModified: String? = null, val data: String? -) +) \ No newline at end of file diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/mongo/CachedGithubHtmlClient.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/mongo/CachedGithubHtmlClient.kt index 3dd61c4e..87c2c807 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/mongo/CachedGithubHtmlClient.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/mongo/CachedGithubHtmlClient.kt @@ -35,7 +35,7 @@ object CachedGithubHtmlClient { return if (cachedEntry == null) { get(UrlRequest(url)) } else { - LOGGER.info("Scheduling for refresh ${url} ${cachedEntry.lastModified} ${workList.size}") + LOGGER.info("Scheduling for refresh $url ${cachedEntry.lastModified} ${workList.size}") workList.offer(UrlRequest(url, cachedEntry.lastModified)) cachedEntry.data } @@ -80,4 +80,4 @@ object CachedGithubHtmlClient { return null } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/mongo/InternalDbStore.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/mongo/InternalDbStore.kt index e0d131c6..bd18d064 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/mongo/InternalDbStore.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/mongo/InternalDbStore.kt @@ -52,4 +52,4 @@ class InternalDbStoreImpl : MongoInterface(MongoClientFactory.get()), InternalDb override suspend fun getCachedWebpage(url: String): CacheDbEntry? { return webCache.findOne(Document("url", url)) } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/mapping/BinaryMapper.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/mapping/BinaryMapper.kt index 1bee33a3..8de84a5c 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/mapping/BinaryMapper.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/mapping/BinaryMapper.kt @@ -33,4 +33,4 @@ abstract class BinaryMapper { } fun getUpdatedTime(asset: GHAsset): ZonedDateTime = ReleaseMapper.parseDate(asset.updatedAt) -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/mapping/ReleaseMapper.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/mapping/ReleaseMapper.kt index 24547209..e0b27ee2 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/mapping/ReleaseMapper.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/mapping/ReleaseMapper.kt @@ -16,4 +16,4 @@ abstract class ReleaseMapper { .atZone(TimeSource.ZONE) } } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/mapping/adopt/AdoptBinaryMapper.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/mapping/adopt/AdoptBinaryMapper.kt index 71365f82..554102c9 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/mapping/adopt/AdoptBinaryMapper.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/mapping/adopt/AdoptBinaryMapper.kt @@ -221,4 +221,4 @@ object AdoptBinaryMapper : BinaryMapper() { } return null } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/mapping/adopt/AdoptReleaseMapper.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/mapping/adopt/AdoptReleaseMapper.kt index e756e1ba..f466ec50 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/mapping/adopt/AdoptReleaseMapper.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/mapping/adopt/AdoptReleaseMapper.kt @@ -58,7 +58,7 @@ object AdoptReleaseMapper : ReleaseMapper() { } .ifEmpty { try { - //if we have no metadata resort to parsing release names + // if we have no metadata resort to parsing release names val version = parseVersionInfo(release, releaseName) val assets = release.releaseAssets.assets val id = release.id.githubId @@ -75,7 +75,7 @@ object AdoptReleaseMapper : ReleaseMapper() { } private fun generateIdForSplitRelease(version: VersionData, release: GHRelease): String { - //using a shortend hash as a suffix to keep id short, probability of clash still very low + // using a shortend hash as a suffix to keep id short, probability of clash still very low val suffix = Base64 .getEncoder() .encodeToString(MessageDigest @@ -86,12 +86,22 @@ object AdoptReleaseMapper : ReleaseMapper() { return release.id.githubId + "." + suffix } - private suspend fun toRelease(releaseName: String, assets: List, metadata: Map, id: String, release_type: ReleaseType, releaseLink: String, timestamp: ZonedDateTime, updatedAt: ZonedDateTime, vendor: Vendor, version: VersionData): Release { + private suspend fun toRelease( + releaseName: String, + assets: List, + metadata: Map, + id: String, + release_type: ReleaseType, + releaseLink: String, + timestamp: ZonedDateTime, + updatedAt: ZonedDateTime, + vendor: Vendor, + version: VersionData + ): Release { LOGGER.info("Getting binaries $releaseName") val binaries = AdoptBinaryMapper.toBinaryList(assets, metadata) LOGGER.info("Done Getting binaries $releaseName") - val downloadCount = assets .filter { asset -> BinaryMapper.BINARY_EXTENSIONS.any { asset.name.endsWith(it) } @@ -107,7 +117,7 @@ object AdoptReleaseMapper : ReleaseMapper() { val hasDate = Pattern.compile(dateMatcher).matcher(release.name) return if (release.url.matches(Regex(".*/openjdk[0-9]+-binaries/.*"))) { - //Can trust isPrerelease from -binaries repos + // Can trust isPrerelease from -binaries repos if (release.isPrerelease) { ReleaseType.ea } else { @@ -169,4 +179,4 @@ object AdoptReleaseMapper : ReleaseMapper() { private fun getFeatureVersion(release: GHRelease): VersionData { return VersionParser.parse(release.name) } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/mapping/upstream/UpstreamBinaryMapper.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/mapping/upstream/UpstreamBinaryMapper.kt index 58ccc8fe..e41d6d67 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/mapping/upstream/UpstreamBinaryMapper.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/mapping/upstream/UpstreamBinaryMapper.kt @@ -72,4 +72,4 @@ object UpstreamBinaryMapper : BinaryMapper() { asset.name == "$binary_name.sign" }?.downloadUrl } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/mapping/upstream/UpstreamReleaseMapper.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/mapping/upstream/UpstreamReleaseMapper.kt index 55a148d1..b4eaadd7 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/mapping/upstream/UpstreamReleaseMapper.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/mapping/upstream/UpstreamReleaseMapper.kt @@ -69,4 +69,4 @@ object UpstreamReleaseMapper : ReleaseMapper() { private fun getVersionData(release_name: String): VersionData { return VersionParser.parse(release_name) } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/stats/DockerStatsInterface.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/stats/DockerStatsInterface.kt index 0db895f2..bd956cba 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/stats/DockerStatsInterface.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/stats/DockerStatsInterface.kt @@ -81,4 +81,4 @@ class DockerStatsInterface { } } } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/stats/GithubDownloadStatsCalculator.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/stats/GithubDownloadStatsCalculator.kt index 27f3e472..2301fa91 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/stats/GithubDownloadStatsCalculator.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/stats/GithubDownloadStatsCalculator.kt @@ -39,4 +39,4 @@ class GithubDownloadStatsCalculator { .toList() return stats } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/stats/StatsInterface.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/stats/StatsInterface.kt index 353b3e13..5727dfc7 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/stats/StatsInterface.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/stats/StatsInterface.kt @@ -26,8 +26,8 @@ class StatsInterface { githubDownloadStatsCalculator.saveStats(repos) dockerStatsInterface.updateDb() - //TODO bring back if we need it and once we understand stats trajectory - //removeBadDownloadStats() + // TODO bring back if we need it and once we understand stats trajectory + // removeBadDownloadStats() } private suspend fun removeBadDownloadStats() { @@ -63,4 +63,4 @@ class StatsInterface { LOGGER.info("docker stat: ${stat.repo} ${stat.pulls}") } } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/APIDataStoreTest.kt b/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/APIDataStoreTest.kt index 9fef48ed..4b1b9cff 100644 --- a/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/APIDataStoreTest.kt +++ b/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/APIDataStoreTest.kt @@ -35,4 +35,4 @@ class APIDataStoreTest : BaseTest() { true) } } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/AdoptBinaryMapperTest.kt b/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/AdoptBinaryMapperTest.kt index 4e765b71..03fa754a 100644 --- a/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/AdoptBinaryMapperTest.kt +++ b/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/AdoptBinaryMapperTest.kt @@ -112,4 +112,4 @@ class AdoptBinaryMapperTest { assertEquals(JvmImpl.hotspot, binaryList.get(0).jvm_impl) assertEquals(Project.jfr, binaryList.get(0).project) } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/AdoptMetadataVersionParsingTest.kt b/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/AdoptMetadataVersionParsingTest.kt index 4ca6611d..a0d655a6 100644 --- a/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/AdoptMetadataVersionParsingTest.kt +++ b/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/AdoptMetadataVersionParsingTest.kt @@ -69,4 +69,4 @@ class AdoptMetadataVersionParsingTest { assertEquals(242, adoptRelease.first().version_data.security) } } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/AdoptReleaseMapperTest.kt b/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/AdoptReleaseMapperTest.kt index da91e25d..309e3da8 100644 --- a/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/AdoptReleaseMapperTest.kt +++ b/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/AdoptReleaseMapperTest.kt @@ -44,7 +44,7 @@ class AdoptReleaseMapperTest : BaseTest() { runBlocking { val source = GHAssets(listOf(jdk), PageInfo(false, "")) - val ghRelease = GHRelease(GithubId("1"), "OpenJDK 123244354325", true, true, "2013-02-27T19:35:32Z", "2013-02-27T19:35:32Z", source, "8", "a-url"); + val ghRelease = GHRelease(GithubId("1"), "OpenJDK 123244354325", true, true, "2013-02-27T19:35:32Z", "2013-02-27T19:35:32Z", source, "8", "a-url") try { AdoptReleaseMapper.toAdoptRelease(ghRelease) @@ -59,10 +59,9 @@ class AdoptReleaseMapperTest : BaseTest() { fun statsIgnoresNonBinaryAssets() { runBlocking { - val source = GHAssets(listOf(jdk, checksum), PageInfo(false, "")) - val ghRelease = GHRelease(GithubId("1"), "jdk9u-2018-09-27-08-50", true, true, "2013-02-27T19:35:32Z", "2013-02-27T19:35:32Z", source, "8", "https://github.com/AdoptOpenJDK/openjdk9-binaries/releases/download/jdk9u-2018-09-27-08-50/OpenJDK9U-jre_aarch64_linux_hotspot_2018-09-27-08-50.tar.gz"); + val ghRelease = GHRelease(GithubId("1"), "jdk9u-2018-09-27-08-50", true, true, "2013-02-27T19:35:32Z", "2013-02-27T19:35:32Z", source, "8", "https://github.com/AdoptOpenJDK/openjdk9-binaries/releases/download/jdk9u-2018-09-27-08-50/OpenJDK9U-jre_aarch64_linux_hotspot_2018-09-27-08-50.tar.gz") val release = AdoptReleaseMapper.toAdoptRelease(ghRelease) @@ -76,7 +75,7 @@ class AdoptReleaseMapperTest : BaseTest() { val source = GHAssets(listOf(jdk), PageInfo(false, "")) - val ghRelease = GHRelease(GithubId("1"), "jdk9u-2018-09-27-08-50", true, true, "2013-02-27T19:35:32Z", "2013-02-27T19:35:32Z", source, "8", "https://github.com/AdoptOpenJDK/openjdk9-binaries/releases/download/jdk9u-2018-09-27-08-50/OpenJDK9U-jre_aarch64_linux_hotspot_2018-09-27-08-50.tar.gz"); + val ghRelease = GHRelease(GithubId("1"), "jdk9u-2018-09-27-08-50", true, true, "2013-02-27T19:35:32Z", "2013-02-27T19:35:32Z", source, "8", "https://github.com/AdoptOpenJDK/openjdk9-binaries/releases/download/jdk9u-2018-09-27-08-50/OpenJDK9U-jre_aarch64_linux_hotspot_2018-09-27-08-50.tar.gz") val release = AdoptReleaseMapper.toAdoptRelease(ghRelease) @@ -84,7 +83,6 @@ class AdoptReleaseMapperTest : BaseTest() { } } - @Test fun copesWithMultipleVersionsInSingleRelease() { runBlocking { @@ -129,7 +127,6 @@ class AdoptReleaseMapperTest : BaseTest() { ), PageInfo(false, "")) - UpdaterHtmlClientFactory.client = object : UpdaterHtmlClient { override suspend fun get(url: String): String? { return getMetadata(url) @@ -149,10 +146,10 @@ class AdoptReleaseMapperTest : BaseTest() { "pre": null, "adopt_build_number": 1, "major": 8, - "version": "1.8.0_242-${opt}-b0${url}", - "semver": "8.0.242+${url}.1.${opt}", - "build": ${url}, - "opt": "${opt}" + "version": "1.8.0_242-$opt-b0$url", + "semver": "8.0.242+$url.1.$opt", + "build": $url, + "opt": "$opt" }, "scmRef": "", "version_data": "jdk8u", @@ -161,7 +158,6 @@ class AdoptReleaseMapperTest : BaseTest() { } """.trimIndent() .replace("\n", "") - } override suspend fun getFullResponse(request: UrlRequest): HttpResponse? { @@ -177,7 +173,7 @@ class AdoptReleaseMapperTest : BaseTest() { } } - val ghRelease = GHRelease(GithubId("1"), "jdk9u-2018-09-27-08-50", true, true, "2013-02-27T19:35:32Z", "2013-02-27T19:35:32Z", source, "8", "https://github.com/AdoptOpenJDK/openjdk9-binaries/releases/download/jdk9u-2018-09-27-08-50/OpenJDK9U-jre_aarch64_linux_hotspot_2018-09-27-08-50.tar.gz"); + val ghRelease = GHRelease(GithubId("1"), "jdk9u-2018-09-27-08-50", true, true, "2013-02-27T19:35:32Z", "2013-02-27T19:35:32Z", source, "8", "https://github.com/AdoptOpenJDK/openjdk9-binaries/releases/download/jdk9u-2018-09-27-08-50/OpenJDK9U-jre_aarch64_linux_hotspot_2018-09-27-08-50.tar.gz") val release = AdoptReleaseMapper.toAdoptRelease(ghRelease) @@ -189,4 +185,4 @@ class AdoptReleaseMapperTest : BaseTest() { assertEquals(3, release[1].download_count) } } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/AdoptReposBuilderTest.kt b/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/AdoptReposBuilderTest.kt index 4d8eea08..548e5796 100644 --- a/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/AdoptReposBuilderTest.kt +++ b/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/AdoptReposBuilderTest.kt @@ -108,4 +108,4 @@ class AdoptReposBuilderTest : BaseTest() { assertTrue { updated == repo } } } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/AdoptReposTest.kt b/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/AdoptReposTest.kt index c7f7f10a..3b0316cf 100644 --- a/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/AdoptReposTest.kt +++ b/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/AdoptReposTest.kt @@ -82,4 +82,4 @@ class AdoptReposTest : BaseTest() { )))) } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/BaseTest.kt b/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/BaseTest.kt index 9ecd6756..55e8e52a 100644 --- a/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/BaseTest.kt +++ b/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/BaseTest.kt @@ -165,4 +165,4 @@ abstract class BaseTest { protected suspend fun getInitialRepo(): AdoptRepos { return AdoptReposBuilder.incrementalUpdate(AdoptReposBuilder.build(APIDataStore.variants.versions)) } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/DockerStatsInterfaceTest.kt b/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/DockerStatsInterfaceTest.kt index 1223917b..317bc7d2 100644 --- a/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/DockerStatsInterfaceTest.kt +++ b/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/DockerStatsInterfaceTest.kt @@ -71,7 +71,6 @@ class DockerStatsInterfaceTest { stats = downloadStatsInterface.getTrackingStats(10) assertEquals(240, stats[0].total) - } } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/MetadataSerializationTest.kt b/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/MetadataSerializationTest.kt index 2df05e4b..5f7d9082 100644 --- a/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/MetadataSerializationTest.kt +++ b/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/MetadataSerializationTest.kt @@ -63,4 +63,4 @@ class MetadataSerializationTest { assertEquals(noWarning, reparsed) } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/TestResourceGenerator.kt b/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/TestResourceGenerator.kt index 2d3c9a3e..fbbb04b6 100644 --- a/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/TestResourceGenerator.kt +++ b/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/TestResourceGenerator.kt @@ -29,4 +29,4 @@ class TestResourceGenerator { } } } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/UpdateRunner.kt b/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/UpdateRunner.kt index a66350ba..80a1ffe8 100644 --- a/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/UpdateRunner.kt +++ b/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/UpdateRunner.kt @@ -37,4 +37,4 @@ class UpdateRunner : BaseTest() { V3Updater().run(false) Awaitility.await().atMost(Long.MAX_VALUE, TimeUnit.NANOSECONDS).until({ 4 == 5 }) } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/UpstreamBinaryMapperTest.kt b/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/UpstreamBinaryMapperTest.kt index 0bc9cdad..c152ece5 100644 --- a/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/UpstreamBinaryMapperTest.kt +++ b/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/UpstreamBinaryMapperTest.kt @@ -87,4 +87,4 @@ class UpstreamBinaryMapperTest { assertEquals("a-signature-link to OpenJDK11U-x64_linux_11.0.3_7.tar.gz", binaryList[0].`package`.signature_link) } } -} +} \ No newline at end of file diff --git a/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/UpstreamReleaseMapperTest.kt b/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/UpstreamReleaseMapperTest.kt index 2230d645..d63c896b 100644 --- a/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/UpstreamReleaseMapperTest.kt +++ b/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/UpstreamReleaseMapperTest.kt @@ -25,7 +25,6 @@ class UpstreamReleaseMapperTest { } } - @Test fun statsOnlyLooksAtBinaryAssets() { runBlocking { @@ -49,7 +48,7 @@ class UpstreamReleaseMapperTest { PageInfo(false, "") ) - val ghRelease = GHRelease(GithubId("1"), "OpenJDK 8u232 GA Release", true, true, "2013-02-27T19:35:32Z", "2013-02-27T19:35:32Z", source, "8", "a-url"); + val ghRelease = GHRelease(GithubId("1"), "OpenJDK 8u232 GA Release", true, true, "2013-02-27T19:35:32Z", "2013-02-27T19:35:32Z", source, "8", "a-url") return ghRelease } -} +} \ No newline at end of file From 5d51faebfc59e1b0442ba9d637bc6dc78a3f32e0 Mon Sep 17 00:00:00 2001 From: George Adams Date: Thu, 9 Apr 2020 12:30:16 +0100 Subject: [PATCH 2/4] add newline --- .editorconfig | 2 +- .../main/kotlin/net/adoptopenjdk/api/v3/JsonSerialiserConfig.kt | 2 +- .../src/main/kotlin/net/adoptopenjdk/api/v3/OpenApiDocs.kt | 2 +- .../src/main/kotlin/net/adoptopenjdk/api/v3/V3.kt | 2 +- .../main/kotlin/net/adoptopenjdk/api/v3/filters/BinaryFilter.kt | 2 +- .../kotlin/net/adoptopenjdk/api/v3/filters/ReleaseFilter.kt | 2 +- .../net/adoptopenjdk/api/v3/filters/VersionRangeFilter.kt | 2 +- .../kotlin/net/adoptopenjdk/api/v3/routes/AssetsResource.kt | 2 +- .../kotlin/net/adoptopenjdk/api/v3/routes/BinaryResource.kt | 2 +- .../src/main/kotlin/net/adoptopenjdk/api/v3/routes/V1Route.kt | 2 +- .../kotlin/net/adoptopenjdk/api/v3/routes/VersionResource.kt | 2 +- .../api/v3/routes/info/AvailableReleasesResource.kt | 2 +- .../net/adoptopenjdk/api/v3/routes/info/PlatformsResource.kt | 2 +- .../net/adoptopenjdk/api/v3/routes/info/ReleaseListResource.kt | 2 +- .../net/adoptopenjdk/api/v3/routes/info/VariantsResource.kt | 2 +- .../adoptopenjdk/api/v3/routes/stats/DownloadStatsResource.kt | 2 +- .../src/test/kotlin/net/adoptopenjdk/api/AssetsPathTest.kt | 2 +- .../api/AssetsResourceFeatureReleasePathSortOrderTest.kt | 2 +- .../adoptopenjdk/api/AssetsResourceFeatureReleasePathTest.kt | 2 +- .../net/adoptopenjdk/api/AssetsResourceVersionPathTest.kt | 2 +- .../kotlin/net/adoptopenjdk/api/AvailableReleasesPathTest.kt | 2 +- .../src/test/kotlin/net/adoptopenjdk/api/BinaryPathTest.kt | 2 +- .../test/kotlin/net/adoptopenjdk/api/DownloadStatsPathTest.kt | 2 +- .../test/kotlin/net/adoptopenjdk/api/JsonSerializationTest.kt | 2 +- .../test/kotlin/net/adoptopenjdk/api/LatestAssetsPathTest.kt | 2 +- .../src/test/kotlin/net/adoptopenjdk/api/PlatformsPathTest.kt | 2 +- .../test/kotlin/net/adoptopenjdk/api/ReleaseNamesPathTest.kt | 2 +- .../src/test/kotlin/net/adoptopenjdk/api/TestRunner.kt | 2 +- .../src/test/kotlin/net/adoptopenjdk/api/V1RouteTest.kt | 2 +- .../src/test/kotlin/net/adoptopenjdk/api/VariantsPathTest.kt | 2 +- .../src/test/kotlin/net/adoptopenjdk/api/VersionPathTest.kt | 2 +- .../kotlin/net/adoptopenjdk/api/v3/dataSources/SortOrder.kt | 2 +- .../net/adoptopenjdk/api/v3/dataSources/models/AdoptRepo.kt | 2 +- .../net/adoptopenjdk/api/v3/dataSources/models/AdoptRepos.kt | 2 +- .../adoptopenjdk/api/v3/dataSources/models/FeatureRelease.kt | 2 +- .../net/adoptopenjdk/api/v3/dataSources/models/GithubId.kt | 2 +- .../net/adoptopenjdk/api/v3/dataSources/models/Releases.kt | 2 +- .../src/main/kotlin/net/adoptopenjdk/api/v3/models/APIError.kt | 2 +- .../main/kotlin/net/adoptopenjdk/api/v3/models/Architecture.kt | 2 +- .../src/main/kotlin/net/adoptopenjdk/api/v3/models/Asset.kt | 2 +- .../src/main/kotlin/net/adoptopenjdk/api/v3/models/Binary.kt | 2 +- .../kotlin/net/adoptopenjdk/api/v3/models/BinaryAssetView.kt | 2 +- .../main/kotlin/net/adoptopenjdk/api/v3/models/DbStatsEntry.kt | 2 +- .../net/adoptopenjdk/api/v3/models/DockerDownloadStats.kt | 2 +- .../adoptopenjdk/api/v3/models/DockerDownloadStatsDbEntry.kt | 2 +- .../main/kotlin/net/adoptopenjdk/api/v3/models/DownloadDiff.kt | 2 +- .../main/kotlin/net/adoptopenjdk/api/v3/models/DownloadStats.kt | 2 +- .../kotlin/net/adoptopenjdk/api/v3/models/FileNameMatcher.kt | 2 +- .../adoptopenjdk/api/v3/models/GithubDownloadStatsDbEntry.kt | 2 +- .../src/main/kotlin/net/adoptopenjdk/api/v3/models/HeapSize.kt | 2 +- .../src/main/kotlin/net/adoptopenjdk/api/v3/models/ImageType.kt | 2 +- .../src/main/kotlin/net/adoptopenjdk/api/v3/models/Installer.kt | 2 +- .../src/main/kotlin/net/adoptopenjdk/api/v3/models/JvmImpl.kt | 2 +- .../kotlin/net/adoptopenjdk/api/v3/models/OperatingSystem.kt | 2 +- .../src/main/kotlin/net/adoptopenjdk/api/v3/models/Package.kt | 2 +- .../src/main/kotlin/net/adoptopenjdk/api/v3/models/Platforms.kt | 2 +- .../src/main/kotlin/net/adoptopenjdk/api/v3/models/Project.kt | 2 +- .../src/main/kotlin/net/adoptopenjdk/api/v3/models/Release.kt | 2 +- .../main/kotlin/net/adoptopenjdk/api/v3/models/ReleaseInfo.kt | 2 +- .../main/kotlin/net/adoptopenjdk/api/v3/models/ReleaseList.kt | 2 +- .../main/kotlin/net/adoptopenjdk/api/v3/models/ReleaseType.kt | 2 +- .../kotlin/net/adoptopenjdk/api/v3/models/ReleaseVersionList.kt | 2 +- .../main/kotlin/net/adoptopenjdk/api/v3/models/SourcePackage.kt | 2 +- .../main/kotlin/net/adoptopenjdk/api/v3/models/StatsSource.kt | 2 +- .../src/main/kotlin/net/adoptopenjdk/api/v3/models/Variant.kt | 2 +- .../src/main/kotlin/net/adoptopenjdk/api/v3/models/Vendor.kt | 2 +- .../main/kotlin/net/adoptopenjdk/api/v3/models/VersionData.kt | 2 +- .../main/kotlin/net/adoptopenjdk/api/v3/parser/VersionParser.kt | 2 +- .../src/test/kotlin/net/adoptopenjdk/api/VersionParserTest.kt | 2 +- .../kotlin/net/adoptopenjdk/api/v3/DownloadStatsInterface.kt | 2 +- .../src/main/kotlin/net/adoptopenjdk/api/v3/JsonMapper.kt | 2 +- .../src/main/kotlin/net/adoptopenjdk/api/v3/TimeSource.kt | 2 +- .../kotlin/net/adoptopenjdk/api/v3/dataSources/APIDataStore.kt | 2 +- .../adoptopenjdk/api/v3/dataSources/ApiPersistenceFactory.kt | 2 +- .../api/v3/dataSources/persitence/ApiPersistence.kt | 2 +- .../api/v3/dataSources/persitence/mongo/MongoApiPersistence.kt | 2 +- .../api/v3/dataSources/persitence/mongo/MongoClient.kt | 2 +- .../api/v3/dataSources/persitence/mongo/MongoInterface.kt | 2 +- .../main/kotlin/net/adoptopenjdk/api/v3/AdoptReposBuilder.kt | 2 +- .../src/main/kotlin/net/adoptopenjdk/api/v3/AdoptRepository.kt | 2 +- .../main/kotlin/net/adoptopenjdk/api/v3/HttpClientFactory.kt | 2 +- .../src/main/kotlin/net/adoptopenjdk/api/v3/V3Updater.kt | 2 +- .../net/adoptopenjdk/api/v3/dataSources/UpdaterHtmlClient.kt | 2 +- .../net/adoptopenjdk/api/v3/dataSources/UpdaterJsonMapper.kt | 2 +- .../net/adoptopenjdk/api/v3/dataSources/github/GitHubApi.kt | 2 +- .../net/adoptopenjdk/api/v3/dataSources/github/GithubAuth.kt | 2 +- .../api/v3/dataSources/github/graphql/GraphQLGitHubClient.kt | 2 +- .../github/graphql/clients/GraphQLGitHubInterface.kt | 2 +- .../github/graphql/clients/GraphQLGitHubReleaseClient.kt | 2 +- .../github/graphql/clients/GraphQLGitHubReleaseRequest.kt | 2 +- .../github/graphql/clients/GraphQLGitHubRepositoryClient.kt | 2 +- .../github/graphql/clients/GraphQLGitHubSummaryClient.kt | 2 +- .../api/v3/dataSources/github/graphql/models/GHAssetNode.kt | 2 +- .../api/v3/dataSources/github/graphql/models/GHAssets.kt | 2 +- .../api/v3/dataSources/github/graphql/models/GHMetaData.kt | 2 +- .../api/v3/dataSources/github/graphql/models/GHRelease.kt | 2 +- .../api/v3/dataSources/github/graphql/models/GHRepository.kt | 2 +- .../dataSources/github/graphql/models/GithubIdDeserializer.kt | 2 +- .../api/v3/dataSources/github/graphql/models/GraphQLQueries.kt | 2 +- .../github/graphql/models/summary/GHReleaseSummary.kt | 2 +- .../github/graphql/models/summary/GHRepositorySummary.kt | 2 +- .../net/adoptopenjdk/api/v3/dataSources/mongo/CacheDbEntry.kt | 2 +- .../api/v3/dataSources/mongo/CachedGithubHtmlClient.kt | 2 +- .../adoptopenjdk/api/v3/dataSources/mongo/InternalDbStore.kt | 2 +- .../main/kotlin/net/adoptopenjdk/api/v3/mapping/BinaryMapper.kt | 2 +- .../kotlin/net/adoptopenjdk/api/v3/mapping/ReleaseMapper.kt | 2 +- .../net/adoptopenjdk/api/v3/mapping/adopt/AdoptBinaryMapper.kt | 2 +- .../net/adoptopenjdk/api/v3/mapping/adopt/AdoptReleaseMapper.kt | 2 +- .../api/v3/mapping/upstream/UpstreamBinaryMapper.kt | 2 +- .../api/v3/mapping/upstream/UpstreamReleaseMapper.kt | 2 +- .../net/adoptopenjdk/api/v3/stats/DockerStatsInterface.kt | 2 +- .../adoptopenjdk/api/v3/stats/GithubDownloadStatsCalculator.kt | 2 +- .../main/kotlin/net/adoptopenjdk/api/v3/stats/StatsInterface.kt | 2 +- .../src/test/kotlin/net/adoptopenjdk/api/APIDataStoreTest.kt | 2 +- .../test/kotlin/net/adoptopenjdk/api/AdoptBinaryMapperTest.kt | 2 +- .../net/adoptopenjdk/api/AdoptMetadataVersionParsingTest.kt | 2 +- .../test/kotlin/net/adoptopenjdk/api/AdoptReleaseMapperTest.kt | 2 +- .../test/kotlin/net/adoptopenjdk/api/AdoptReposBuilderTest.kt | 2 +- .../src/test/kotlin/net/adoptopenjdk/api/AdoptReposTest.kt | 2 +- .../src/test/kotlin/net/adoptopenjdk/api/BaseTest.kt | 2 +- .../kotlin/net/adoptopenjdk/api/DockerStatsInterfaceTest.kt | 2 +- .../kotlin/net/adoptopenjdk/api/MetadataSerializationTest.kt | 2 +- .../test/kotlin/net/adoptopenjdk/api/TestResourceGenerator.kt | 2 +- .../src/test/kotlin/net/adoptopenjdk/api/UpdateRunner.kt | 2 +- .../kotlin/net/adoptopenjdk/api/UpstreamBinaryMapperTest.kt | 2 +- .../kotlin/net/adoptopenjdk/api/UpstreamReleaseMapperTest.kt | 2 +- 126 files changed, 126 insertions(+), 126 deletions(-) diff --git a/.editorconfig b/.editorconfig index 14c604f0..e9c04d2a 100644 --- a/.editorconfig +++ b/.editorconfig @@ -3,7 +3,7 @@ charset = utf-8 end_of_line = lf indent_size = 4 indent_style = space -insert_final_newline = false +insert_final_newline = true max_line_length = false tab_width = 4 ij_continuation_indent_size = 8 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 index 9e17ed67..625ae96a 100644 --- 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 { override fun getContext(objectType: Class<*>?): Jsonb { return jsonb } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/OpenApiDocs.kt b/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/OpenApiDocs.kt index cb2b066b..61eac71b 100644 --- a/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/OpenApiDocs.kt +++ b/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/OpenApiDocs.kt @@ -36,4 +36,4 @@ object OpenApiDocs { const val RELEASE_TYPE = """

Type of release. Either a release version, known as General Availability(ga) or an Early Access(ea)

""" -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/V3.kt b/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/V3.kt index cad5e848..6de66c5c 100644 --- a/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/V3.kt +++ b/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/V3.kt @@ -76,4 +76,4 @@ class V3 : Application() { override fun getClasses(): Set> { return resourceClasses } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/filters/BinaryFilter.kt b/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/filters/BinaryFilter.kt index 053189e3..b6a35809 100644 --- a/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/filters/BinaryFilter.kt +++ b/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/filters/BinaryFilter.kt @@ -42,4 +42,4 @@ class BinaryFilter : Predicate { (heapSize == null || binary.heap_size == heapSize) && (binary.project == project) } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/filters/ReleaseFilter.kt b/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/filters/ReleaseFilter.kt index 868f4e22..de6c97bb 100644 --- a/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/filters/ReleaseFilter.kt +++ b/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/filters/ReleaseFilter.kt @@ -30,4 +30,4 @@ class ReleaseFilter( (versionRange == null || versionRange.test(release.version_data)) && ltsFilter } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/filters/VersionRangeFilter.kt b/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/filters/VersionRangeFilter.kt index fec8c428..efffc078 100644 --- a/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/filters/VersionRangeFilter.kt +++ b/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/filters/VersionRangeFilter.kt @@ -35,4 +35,4 @@ class VersionRangeFilter(range: String?) : Predicate { return true } } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/AssetsResource.kt b/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/AssetsResource.kt index a694b4a9..4a494e9e 100644 --- a/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/AssetsResource.kt +++ b/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/AssetsResource.kt @@ -275,4 +275,4 @@ class AssetsResource { .map { BinaryAssetView(it.first.release_name, it.second, it.first.version_data) } .toList() } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/BinaryResource.kt b/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/BinaryResource.kt index c0d65dee..588fdc0f 100644 --- a/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/BinaryResource.kt +++ b/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/BinaryResource.kt @@ -185,4 +185,4 @@ class BinaryResource { .entity(JsonMapper.mapper.writeValueAsString(APIError(message))) .build() } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/V1Route.kt b/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/V1Route.kt index 7d973a1a..3c4525de 100644 --- a/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/V1Route.kt +++ b/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/V1Route.kt @@ -32,4 +32,4 @@ class V1Route { .entity("REMOVED: V1 has now been removed, please see https://api.adoptopenjdk.net for the latest version") .build() } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/VersionResource.kt b/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/VersionResource.kt index b810eb0e..83caaa35 100644 --- a/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/VersionResource.kt +++ b/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/VersionResource.kt @@ -42,4 +42,4 @@ class VersionResource { throw BadRequestException("Unable to parse version") } } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/info/AvailableReleasesResource.kt b/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/info/AvailableReleasesResource.kt index 310dc0f8..ddd52ff1 100644 --- a/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/info/AvailableReleasesResource.kt +++ b/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/info/AvailableReleasesResource.kt @@ -25,4 +25,4 @@ class AvailableReleasesResource { APIDataStore.variants.latestVersion ) } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/info/PlatformsResource.kt b/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/info/PlatformsResource.kt index c174b6d1..a172eb69 100644 --- a/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/info/PlatformsResource.kt +++ b/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/info/PlatformsResource.kt @@ -21,4 +21,4 @@ class PlatformsResource { fun get(): Platforms { return APIDataStore.platforms } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/info/ReleaseListResource.kt b/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/info/ReleaseListResource.kt index 90e4bfb2..48941291 100644 --- a/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/info/ReleaseListResource.kt +++ b/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/info/ReleaseListResource.kt @@ -114,4 +114,4 @@ class ReleaseListResource { .getAdoptRepos() .getReleases(releaseFilter, sortOrder) } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/info/VariantsResource.kt b/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/info/VariantsResource.kt index 4c24c89c..2d017356 100644 --- a/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/info/VariantsResource.kt +++ b/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/info/VariantsResource.kt @@ -21,4 +21,4 @@ class VariantsResource { fun get(): Variants { return APIDataStore.variants } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/stats/DownloadStatsResource.kt b/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/stats/DownloadStatsResource.kt index d779806c..4420a8e3 100644 --- a/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/stats/DownloadStatsResource.kt +++ b/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/stats/DownloadStatsResource.kt @@ -166,4 +166,4 @@ class DownloadStatsResource { return future } -} \ No newline at end of file +} 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 index 84c8847d..daf2f4ec 100644 --- 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 @@ -72,4 +72,4 @@ abstract class AssetsPathTest : BaseTest() { } } } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AssetsResourceFeatureReleasePathSortOrderTest.kt b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AssetsResourceFeatureReleasePathSortOrderTest.kt index 0043e066..d417944e 100644 --- a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AssetsResourceFeatureReleasePathSortOrderTest.kt +++ b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AssetsResourceFeatureReleasePathSortOrderTest.kt @@ -80,4 +80,4 @@ class AssetsResourceFeatureReleasePathSortOrderTest : BaseTest() { assertEquals("bar", releases.get(1).id) } } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AssetsResourceFeatureReleasePathTest.kt b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AssetsResourceFeatureReleasePathTest.kt index 5fcc0bdf..366d3976 100644 --- a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AssetsResourceFeatureReleasePathTest.kt +++ b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AssetsResourceFeatureReleasePathTest.kt @@ -119,4 +119,4 @@ class AssetsResourceFeatureReleasePathTest : AssetsPathTest() { return JsonMapper.mapper.readValue(releasesStr, JsonMapper.mapper.getTypeFactory().constructCollectionType(MutableList::class.java, Release::class.java)) } } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AssetsResourceVersionPathTest.kt b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AssetsResourceVersionPathTest.kt index f744539f..f029f466 100644 --- a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AssetsResourceVersionPathTest.kt +++ b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AssetsResourceVersionPathTest.kt @@ -80,4 +80,4 @@ class AssetsResourceVersionPathTest : AssetsPathTest() { versionRange.equals(JAVA11) && element == ImageType.testimage || element == ImageType.debugimage } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AvailableReleasesPathTest.kt b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AvailableReleasesPathTest.kt index c85209da..e84cc454 100644 --- a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AvailableReleasesPathTest.kt +++ b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AvailableReleasesPathTest.kt @@ -15,4 +15,4 @@ class AvailableReleasesPathTest : BaseTest() { .then() .statusCode(200) } -} \ No newline at end of file +} 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 index 598dafe1..80b3784e 100644 --- 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 @@ -102,4 +102,4 @@ class BinaryPathTest : BaseTest() { .redirects().follow(false) .get(path) } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/DownloadStatsPathTest.kt b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/DownloadStatsPathTest.kt index 4cd08f19..61189a12 100644 --- a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/DownloadStatsPathTest.kt +++ b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/DownloadStatsPathTest.kt @@ -300,4 +300,4 @@ class DownloadStatsPathTest : BaseTest() { }) } } -} \ No newline at end of file +} 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 index fdf96788..ba633d26 100644 --- 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,4 +31,4 @@ class JsonSerializationTest : BaseTest() { .statusCode(200) .body(PrettyPrintMatcher()) } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/LatestAssetsPathTest.kt b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/LatestAssetsPathTest.kt index 93854dc1..5976490d 100644 --- a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/LatestAssetsPathTest.kt +++ b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/LatestAssetsPathTest.kt @@ -66,4 +66,4 @@ class LatestAssetsPathTest : BaseTest() { .count() > 0 return hasEntry } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/PlatformsPathTest.kt b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/PlatformsPathTest.kt index c17a0e94..f1db5608 100644 --- a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/PlatformsPathTest.kt +++ b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/PlatformsPathTest.kt @@ -15,4 +15,4 @@ class PlatformsPathTest : BaseTest() { .then() .statusCode(200) } -} \ No newline at end of file +} 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 index 005ad611..f2e06a06 100644 --- 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 @@ -45,4 +45,4 @@ class ReleaseNamesPathTest : BaseTest() { .then() .statusCode(200) } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/TestRunner.kt b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/TestRunner.kt index 82de9c68..b5f49da6 100644 --- a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/TestRunner.kt +++ b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/TestRunner.kt @@ -34,4 +34,4 @@ class TestRunner : BaseTest() { fun run() { Awaitility.await().atMost(Long.MAX_VALUE, TimeUnit.NANOSECONDS).until({ 4 === 5 }) } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/V1RouteTest.kt b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/V1RouteTest.kt index 9044fcd7..5ba1be32 100644 --- a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/V1RouteTest.kt +++ b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/V1RouteTest.kt @@ -21,4 +21,4 @@ class V1RouteTest : BaseTest() { .statusCode(Response.Status.GONE.statusCode) }) } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/VariantsPathTest.kt b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/VariantsPathTest.kt index 8e0e89fc..1f23c7ed 100644 --- a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/VariantsPathTest.kt +++ b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/VariantsPathTest.kt @@ -15,4 +15,4 @@ class VariantsPathTest : BaseTest() { .then() .statusCode(200) } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/VersionPathTest.kt b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/VersionPathTest.kt index a26a13cf..9145e1de 100644 --- a/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/VersionPathTest.kt +++ b/adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/VersionPathTest.kt @@ -58,4 +58,4 @@ class VersionPathTest { .then() .statusCode(400) } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/SortOrder.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/SortOrder.kt index c4d8a0af..c364a476 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/SortOrder.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/SortOrder.kt @@ -7,4 +7,4 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema enum class SortOrder { ASC, DESC; -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/models/AdoptRepo.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/models/AdoptRepo.kt index 2b6929cd..510f77f6 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/models/AdoptRepo.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/models/AdoptRepo.kt @@ -2,4 +2,4 @@ package net.adoptopenjdk.api.v3.dataSources.models import net.adoptopenjdk.api.v3.models.Release -class AdoptRepo(val releases: List) \ No newline at end of file +class AdoptRepo(val releases: List) diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/models/AdoptRepos.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/models/AdoptRepos.kt index 41c3b5a1..45431f11 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/models/AdoptRepos.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/models/AdoptRepos.kt @@ -94,4 +94,4 @@ class AdoptRepos { result = 31 * result + allReleases.hashCode() return result } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/models/FeatureRelease.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/models/FeatureRelease.kt index 9d9bfe81..00eb23ed 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/models/FeatureRelease.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/models/FeatureRelease.kt @@ -54,4 +54,4 @@ class FeatureRelease { result = 31 * result + releases.hashCode() return result } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/models/GithubId.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/models/GithubId.kt index 2ffe3194..c3e82c60 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/models/GithubId.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/models/GithubId.kt @@ -28,4 +28,4 @@ class GithubId { override fun hashCode(): Int { return githubId.hashCode() } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/models/Releases.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/models/Releases.kt index 3cd8cdf3..357c8ed9 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/models/Releases.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/models/Releases.kt @@ -107,4 +107,4 @@ class Releases { .thenComparing { release: Release -> release.release_name } .thenComparing { release: Release -> release.id } } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/APIError.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/APIError.kt index eba0d454..0ae217a5 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/APIError.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/APIError.kt @@ -1,3 +1,3 @@ package net.adoptopenjdk.api.v3.models -class APIError(val errorMessage: String) \ No newline at end of file +class APIError(val errorMessage: String) diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Architecture.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Architecture.kt index df10b69f..142d07a5 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Architecture.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Architecture.kt @@ -31,4 +31,4 @@ enum class Architecture : FileNameMatcher { .first() } } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Asset.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Asset.kt index 1823d7b2..f3f2d1e8 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Asset.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Asset.kt @@ -68,4 +68,4 @@ open class Asset { result = 31 * result + (signature_link?.hashCode() ?: 0) return result } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Binary.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Binary.kt index 0a5125e9..a463a61b 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Binary.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Binary.kt @@ -99,4 +99,4 @@ class Binary { result = 31 * result + project.hashCode() return result } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/BinaryAssetView.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/BinaryAssetView.kt index 89b44dd7..ac9ee772 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/BinaryAssetView.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/BinaryAssetView.kt @@ -23,4 +23,4 @@ class BinaryAssetView { this.binary = binary this.version = version } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/DbStatsEntry.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/DbStatsEntry.kt index 4570e09c..ce2481c4 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/DbStatsEntry.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/DbStatsEntry.kt @@ -7,4 +7,4 @@ abstract class DbStatsEntry( ) { abstract fun getMetric(): Long abstract fun getId(): T -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/DockerDownloadStats.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/DockerDownloadStats.kt index b72f5a62..6ad33573 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/DockerDownloadStats.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/DockerDownloadStats.kt @@ -5,4 +5,4 @@ class DockerDownloadStats( val downloads: Map, val total_daily_downloads: Long, val daily_downloads: Map -) \ No newline at end of file +) diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/DockerDownloadStatsDbEntry.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/DockerDownloadStatsDbEntry.kt index 8bc6031f..28a56b9e 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/DockerDownloadStatsDbEntry.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/DockerDownloadStatsDbEntry.kt @@ -9,4 +9,4 @@ class DockerDownloadStatsDbEntry( ) : DbStatsEntry(date) { override fun getMetric(): Long = pulls override fun getId(): String = repo -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/DownloadDiff.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/DownloadDiff.kt index 72104ebb..0caeb742 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/DownloadDiff.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/DownloadDiff.kt @@ -6,4 +6,4 @@ class DownloadDiff( val date: ZonedDateTime, val total: Long, val daily: Long -) \ No newline at end of file +) diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/DownloadStats.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/DownloadStats.kt index 61af16a9..d7ce519d 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/DownloadStats.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/DownloadStats.kt @@ -47,4 +47,4 @@ class TotalStats { this.github_downloads = github_downloads this.total = total } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/FileNameMatcher.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/FileNameMatcher.kt index 40dcc714..8081b8d7 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/FileNameMatcher.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/FileNameMatcher.kt @@ -17,4 +17,4 @@ interface FileNameMatcher { .map { it.toLowerCase() } .toList() } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/GithubDownloadStatsDbEntry.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/GithubDownloadStatsDbEntry.kt index 18cdeee1..4ea4d224 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/GithubDownloadStatsDbEntry.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/GithubDownloadStatsDbEntry.kt @@ -9,4 +9,4 @@ class GithubDownloadStatsDbEntry( ) : DbStatsEntry(date) { override fun getMetric(): Long = downloads override fun getId(): Int = feature_version -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/HeapSize.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/HeapSize.kt index 7dab3c82..a92f7438 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/HeapSize.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/HeapSize.kt @@ -20,4 +20,4 @@ enum class HeapSize : FileNameMatcher { lowerCaseFileName.contains(Regex("${it}_")) } != null } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/ImageType.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/ImageType.kt index cc5fd5d4..6d1e568f 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/ImageType.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/ImageType.kt @@ -12,4 +12,4 @@ enum class ImageType : FileNameMatcher { constructor(vararg alternativeNames: String) { setNames(name, alternativeNames.toList()) } -} \ No newline at end of file +} 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 index ee5ccb5b..07b8b6ad 100644 --- 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 @@ -8,4 +8,4 @@ class Installer( checksum_link: String?, download_count: Long, signature_link: String? = null -) : Asset(name, link, size, checksum, checksum_link, signature_link, download_count) \ No newline at end of file +) : 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/JvmImpl.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/JvmImpl.kt index 99aaa676..1cbefde7 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/JvmImpl.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/JvmImpl.kt @@ -12,4 +12,4 @@ enum class JvmImpl : FileNameMatcher { constructor(vararg alternativeNames: String) { setNames(this.name, alternativeNames.toList()) } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/OperatingSystem.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/OperatingSystem.kt index 7af1fc50..c93a208b 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/OperatingSystem.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/OperatingSystem.kt @@ -16,4 +16,4 @@ enum class OperatingSystem : FileNameMatcher { constructor(vararg alternativeNames: String) { setNames(this.name, alternativeNames.toList()) } -} \ No newline at end of file +} 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 index cbd7bd2e..12a4de9a 100644 --- 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 @@ -8,4 +8,4 @@ class Package( checksum_link: String?, download_count: Long, signature_link: String? = null -) : Asset(name, link, size, checksum, checksum_link, signature_link, download_count) \ No newline at end of file +) : 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/Platforms.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Platforms.kt index 32af73f2..cf48c491 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Platforms.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Platforms.kt @@ -91,4 +91,4 @@ class Platforms { ) { this.platforms = platforms } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Project.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Project.kt index abf4ef7c..a6486fa8 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Project.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Project.kt @@ -17,4 +17,4 @@ enum class Project : FileNameMatcher { constructor(vararg alternativeNames: String) { setNames(this.name, alternativeNames.toList()) } -} \ No newline at end of file +} 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 index 9787c092..e9e227dd 100644 --- 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 @@ -120,4 +120,4 @@ class Release { result = 31 * result + (source?.hashCode() ?: 0) return result } -} \ No newline at end of file +} 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 index 02d69dd9..5d11ae21 100644 --- 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 @@ -27,4 +27,4 @@ class ReleaseInfo { this.most_recent_lts = most_recent_lts this.most_recent_feature_release = most_recent_feature_release } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/ReleaseList.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/ReleaseList.kt index 9159e2fe..51879200 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/ReleaseList.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/ReleaseList.kt @@ -7,4 +7,4 @@ class ReleaseList { constructor(releases: Array) { this.releases = releases } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/ReleaseType.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/ReleaseType.kt index c182b0cf..703d1ce2 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/ReleaseType.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/ReleaseType.kt @@ -7,4 +7,4 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema enum class ReleaseType { ga, ea; -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/ReleaseVersionList.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/ReleaseVersionList.kt index 12010c5b..7052fbdc 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/ReleaseVersionList.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/ReleaseVersionList.kt @@ -11,4 +11,4 @@ class ReleaseVersionList { constructor(versions: Array) { this.versions = versions } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/SourcePackage.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/SourcePackage.kt index 9507645c..b268b0e4 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/SourcePackage.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/SourcePackage.kt @@ -22,4 +22,4 @@ class SourcePackage { this.link = link this.size = size } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/StatsSource.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/StatsSource.kt index 27d4596d..6268dd37 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/StatsSource.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/StatsSource.kt @@ -8,4 +8,4 @@ enum class StatsSource { github, dockerhub, all; -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Variant.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Variant.kt index 9e5a8725..6fac5dbc 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Variant.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Variant.kt @@ -75,4 +75,4 @@ class Variants { } } } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Vendor.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Vendor.kt index 276424cb..910fb533 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Vendor.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/Vendor.kt @@ -7,4 +7,4 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema enum class Vendor { adoptopenjdk, openjdk // , amazon, azul, bellsoft, , sap; -} \ No newline at end of file +} 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 index 451d2e47..f219fd3d 100644 --- 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 @@ -113,4 +113,4 @@ class VersionData : Comparable { .thenBy { it.adopt_build_number } .thenBy { it.optional } } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/parser/VersionParser.kt b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/parser/VersionParser.kt index 6cee9a3d..a6f75d7e 100644 --- a/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/parser/VersionParser.kt +++ b/adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/parser/VersionParser.kt @@ -226,4 +226,4 @@ object VersionParser { } } -class FailedToParse(message: String) : Exception(message) \ No newline at end of file +class FailedToParse(message: String) : Exception(message) diff --git a/adoptopenjdk-api-v3-models/src/test/kotlin/net/adoptopenjdk/api/VersionParserTest.kt b/adoptopenjdk-api-v3-models/src/test/kotlin/net/adoptopenjdk/api/VersionParserTest.kt index 7405aa55..758944ca 100644 --- a/adoptopenjdk-api-v3-models/src/test/kotlin/net/adoptopenjdk/api/VersionParserTest.kt +++ b/adoptopenjdk-api-v3-models/src/test/kotlin/net/adoptopenjdk/api/VersionParserTest.kt @@ -134,4 +134,4 @@ class VersionParserTest { assertEquals(second, sorted.toList()[1]) assertEquals(third, sorted.toList()[0]) } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/DownloadStatsInterface.kt b/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/DownloadStatsInterface.kt index a26c7b92..26ace76e 100644 --- a/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/DownloadStatsInterface.kt +++ b/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/DownloadStatsInterface.kt @@ -184,4 +184,4 @@ class DownloadStatsInterface( dataStore.getLatestGithubStatsForFeatureVersion(featureVersion) } } -} \ No newline at end of file +} 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 index 7a644e33..14bd0f5a 100644 --- 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 @@ -35,4 +35,4 @@ object JsonMapper { .registerModule(KotlinModule()) .registerModule(JavaTimeModule()) .registerModule(ZonedTimeUpgrader()) -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/TimeSource.kt b/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/TimeSource.kt index cd5f5e5a..0979a690 100644 --- a/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/TimeSource.kt +++ b/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/TimeSource.kt @@ -9,4 +9,4 @@ object TimeSource { val ZONE: ZoneId = ZoneId.of("Z") fun now(): ZonedDateTime = ZonedDateTime.now(ZONE).truncatedTo(ChronoUnit.SECONDS) fun date(): LocalDate = LocalDate.now(ZONE) -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/APIDataStore.kt b/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/APIDataStore.kt index afe283e5..f5261aa6 100644 --- a/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/APIDataStore.kt +++ b/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/APIDataStore.kt @@ -75,4 +75,4 @@ object APIDataStore { LOGGER.error("Failed to load db", e) } } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/ApiPersistenceFactory.kt b/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/ApiPersistenceFactory.kt index 352fcbb0..65041dc4 100644 --- a/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/ApiPersistenceFactory.kt +++ b/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/ApiPersistenceFactory.kt @@ -18,4 +18,4 @@ object ApiPersistenceFactory { fun set(impl: ApiPersistence?) { this.impl = impl } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/persitence/ApiPersistence.kt b/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/persitence/ApiPersistence.kt index dfbe5ada..baad2f03 100644 --- a/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/persitence/ApiPersistence.kt +++ b/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/persitence/ApiPersistence.kt @@ -18,4 +18,4 @@ interface ApiPersistence { suspend fun addDockerDownloadStatsEntries(stats: List) suspend fun getLatestAllDockerStats(): List suspend fun removeStatsBetween(start: ZonedDateTime, end: ZonedDateTime) -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/persitence/mongo/MongoApiPersistence.kt b/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/persitence/mongo/MongoApiPersistence.kt index 16ec8a70..4619258b 100644 --- a/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/persitence/mongo/MongoApiPersistence.kt +++ b/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/persitence/mongo/MongoApiPersistence.kt @@ -139,4 +139,4 @@ class MongoApiPersistence(mongoClient: MongoClient) : MongoInterface(mongoClient } private fun majorVersionMatcher(featureVersion: Int) = Document("version_data.major", featureVersion) -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/persitence/mongo/MongoClient.kt b/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/persitence/mongo/MongoClient.kt index ae4df385..a6f79a6f 100644 --- a/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/persitence/mongo/MongoClient.kt +++ b/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/persitence/mongo/MongoClient.kt @@ -52,4 +52,4 @@ class MongoClient { client = KMongo.createClient(uri).coroutine database = client.getDatabase(dbName) } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/persitence/mongo/MongoInterface.kt b/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/persitence/mongo/MongoInterface.kt index 49ad3e0d..05361bc4 100644 --- a/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/persitence/mongo/MongoInterface.kt +++ b/adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/persitence/mongo/MongoInterface.kt @@ -18,4 +18,4 @@ abstract class MongoInterface(mongoClient: MongoClient) { return@runBlocking database.getCollection(collectionName) } } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/AdoptReposBuilder.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/AdoptReposBuilder.kt index bbc0be67..b22eec8f 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/AdoptReposBuilder.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/AdoptReposBuilder.kt @@ -101,4 +101,4 @@ object AdoptReposBuilder { LOGGER.info("DONE") return AdoptRepos(reposMap) } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/AdoptRepository.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/AdoptRepository.kt index 4b05aa51..88eda397 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/AdoptRepository.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/AdoptRepository.kt @@ -112,4 +112,4 @@ object AdoptRepositoryImpl : AdoptRepository { return@async releases } } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/HttpClientFactory.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/HttpClientFactory.kt index d9e93e31..c9577065 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/HttpClientFactory.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/HttpClientFactory.kt @@ -55,4 +55,4 @@ object HttpClientFactory { fun getNonRedirectHttpClient(): HttpAsyncClient { return noRedirect } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/V3Updater.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/V3Updater.kt index e7397df2..70eceea3 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/V3Updater.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/V3Updater.kt @@ -92,4 +92,4 @@ class V3Updater { LOGGER.error("Failed to perform incremental update", e) } } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/UpdaterHtmlClient.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/UpdaterHtmlClient.kt index d22c7982..2114db76 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/UpdaterHtmlClient.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/UpdaterHtmlClient.kt @@ -155,4 +155,4 @@ class DefaultUpdaterHtmlClient : UpdaterHtmlClient { } class NotFoundException : Throwable() -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/UpdaterJsonMapper.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/UpdaterJsonMapper.kt index e676f9eb..c3ce8064 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/UpdaterJsonMapper.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/UpdaterJsonMapper.kt @@ -38,4 +38,4 @@ object UpdaterJsonMapper { .registerModule(JavaTimeModule()) .registerModule(JSR353Module()) .registerModule(ZonedTimeUpgrader()) -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/GitHubApi.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/GitHubApi.kt index f96a723a..bc6740a9 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/GitHubApi.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/GitHubApi.kt @@ -9,4 +9,4 @@ interface GitHubApi { suspend fun getRepository(repoName: String): GHRepository suspend fun getRepositorySummary(repoName: String): GHRepositorySummary suspend fun getReleaseById(id: GithubId): GHRelease? -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/GithubAuth.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/GithubAuth.kt index 790edd65..215a4892 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/GithubAuth.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/GithubAuth.kt @@ -39,4 +39,4 @@ class GithubAuth { return token } } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/GraphQLGitHubClient.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/GraphQLGitHubClient.kt index f7ed4996..b5bf518e 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/GraphQLGitHubClient.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/GraphQLGitHubClient.kt @@ -25,4 +25,4 @@ class GraphQLGitHubClient : GitHubApi { override suspend fun getRepository(repoName: String): GHRepository { return repositoryClientClient.getRepository(repoName) } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/clients/GraphQLGitHubInterface.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/clients/GraphQLGitHubInterface.kt index d269c61b..80ab0850 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/clients/GraphQLGitHubInterface.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/clients/GraphQLGitHubInterface.kt @@ -190,4 +190,4 @@ open class GraphQLGitHubInterface() { LOGGER.warn("Retry limit hit $query") LOGGER.warn("Cursor $cursor") } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/clients/GraphQLGitHubReleaseClient.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/clients/GraphQLGitHubReleaseClient.kt index 7daaa9d7..f69efdc0 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/clients/GraphQLGitHubReleaseClient.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/clients/GraphQLGitHubReleaseClient.kt @@ -62,4 +62,4 @@ open class GraphQLGitHubReleaseClient : GraphQLGitHubReleaseRequest() { } """) } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/clients/GraphQLGitHubReleaseRequest.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/clients/GraphQLGitHubReleaseRequest.kt index b301837c..f4b9cb96 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/clients/GraphQLGitHubReleaseRequest.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/clients/GraphQLGitHubReleaseRequest.kt @@ -59,4 +59,4 @@ open class GraphQLGitHubReleaseRequest : GraphQLGitHubInterface() { } """) } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/clients/GraphQLGitHubRepositoryClient.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/clients/GraphQLGitHubRepositoryClient.kt index 015928eb..a0346c6d 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/clients/GraphQLGitHubRepositoryClient.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/clients/GraphQLGitHubRepositoryClient.kt @@ -82,4 +82,4 @@ open class GraphQLGitHubRepositoryClient : GraphQLGitHubReleaseRequest() { } """) } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/clients/GraphQLGitHubSummaryClient.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/clients/GraphQLGitHubSummaryClient.kt index c6af2b1c..78be9c14 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/clients/GraphQLGitHubSummaryClient.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/clients/GraphQLGitHubSummaryClient.kt @@ -61,4 +61,4 @@ class GraphQLGitHubSummaryClient : GraphQLGitHubInterface() { } """) } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/GHAssetNode.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/GHAssetNode.kt index 0003b312..b504ffdc 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/GHAssetNode.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/GHAssetNode.kt @@ -11,4 +11,4 @@ data class GHAsset @JsonCreator constructor( @JsonProperty("updatedAt") val updatedAt: String ) -data class GHAssetNode @JsonCreator constructor(@JsonProperty("releaseAssets") val releaseAssets: GHAssets) \ No newline at end of file +data class GHAssetNode @JsonCreator constructor(@JsonProperty("releaseAssets") val releaseAssets: GHAssets) diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/GHAssets.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/GHAssets.kt index f09f3542..409e8b51 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/GHAssets.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/GHAssets.kt @@ -6,4 +6,4 @@ import com.fasterxml.jackson.annotation.JsonProperty data class GHAssets @JsonCreator constructor( @JsonProperty("nodes") val assets: List, @JsonProperty("pageInfo") val pageInfo: PageInfo -) \ No newline at end of file +) diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/GHMetaData.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/GHMetaData.kt index adeb42a0..15f85264 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/GHMetaData.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/GHMetaData.kt @@ -36,4 +36,4 @@ data class GHMetaData @JsonCreator constructor( @JsonProperty("version_data") val version_data: String, @JsonProperty("binary_type") val binary_type: ImageType, @JsonProperty("sha256") val sha256: String -) \ No newline at end of file +) diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/GHRelease.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/GHRelease.kt index e1176fb5..779e7cea 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/GHRelease.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/GHRelease.kt @@ -27,4 +27,4 @@ data class GHRelease @JsonCreator constructor( @JsonProperty("releaseAssets") val releaseAssets: GHAssets, @JsonProperty("resourcePath") val resourcePath: String, @JsonProperty("url") val url: String -) \ No newline at end of file +) diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/GHRepository.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/GHRepository.kt index f6b1da65..145f43b4 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/GHRepository.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/GHRepository.kt @@ -9,4 +9,4 @@ data class GHRepository @JsonCreator constructor( fun getReleases(): List { return releases.releases } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/GithubIdDeserializer.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/GithubIdDeserializer.kt index 5be5649a..59a5540c 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/GithubIdDeserializer.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/GithubIdDeserializer.kt @@ -9,4 +9,4 @@ object GithubIdDeserializer : JsonDeserializer() { override fun deserialize(parser: JsonParser, context: DeserializationContext?): GithubId { return GithubId(parser.valueAsString) } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/GraphQLQueries.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/GraphQLQueries.kt index 3a3a023f..44e441ab 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/GraphQLQueries.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/GraphQLQueries.kt @@ -33,4 +33,4 @@ class QuerySummaryData @JsonCreator constructor( class ReleaseQueryData @JsonCreator constructor( @JsonProperty("node") val assetNode: GHAssetNode?, @JsonProperty("rateLimit") rateLimit: RateLimit -) : HasRateLimit(rateLimit) \ No newline at end of file +) : HasRateLimit(rateLimit) diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/summary/GHReleaseSummary.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/summary/GHReleaseSummary.kt index e62cadea..b6f4a7d3 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/summary/GHReleaseSummary.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/summary/GHReleaseSummary.kt @@ -29,4 +29,4 @@ data class GHReleaseSummary @JsonCreator constructor( fun getUpdatedTime(): ZonedDateTime { return ReleaseMapper.parseDate(updatedAt) } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/summary/GHRepositorySummary.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/summary/GHRepositorySummary.kt index f4a1503d..abd7f482 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/summary/GHRepositorySummary.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/github/graphql/models/summary/GHRepositorySummary.kt @@ -3,4 +3,4 @@ package net.adoptopenjdk.api.v3.dataSources.github.graphql.models.summary import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty -data class GHRepositorySummary @JsonCreator constructor(@JsonProperty("releases") val releases: GHReleasesSummary) \ No newline at end of file +data class GHRepositorySummary @JsonCreator constructor(@JsonProperty("releases") val releases: GHReleasesSummary) diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/mongo/CacheDbEntry.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/mongo/CacheDbEntry.kt index ceaf8ae1..560d5e10 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/mongo/CacheDbEntry.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/mongo/CacheDbEntry.kt @@ -4,4 +4,4 @@ class CacheDbEntry( val url: String, val lastModified: String? = null, val data: String? -) \ No newline at end of file +) diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/mongo/CachedGithubHtmlClient.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/mongo/CachedGithubHtmlClient.kt index 87c2c807..22a792de 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/mongo/CachedGithubHtmlClient.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/mongo/CachedGithubHtmlClient.kt @@ -80,4 +80,4 @@ object CachedGithubHtmlClient { return null } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/mongo/InternalDbStore.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/mongo/InternalDbStore.kt index bd18d064..e0d131c6 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/mongo/InternalDbStore.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/mongo/InternalDbStore.kt @@ -52,4 +52,4 @@ class InternalDbStoreImpl : MongoInterface(MongoClientFactory.get()), InternalDb override suspend fun getCachedWebpage(url: String): CacheDbEntry? { return webCache.findOne(Document("url", url)) } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/mapping/BinaryMapper.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/mapping/BinaryMapper.kt index 8de84a5c..1bee33a3 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/mapping/BinaryMapper.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/mapping/BinaryMapper.kt @@ -33,4 +33,4 @@ abstract class BinaryMapper { } fun getUpdatedTime(asset: GHAsset): ZonedDateTime = ReleaseMapper.parseDate(asset.updatedAt) -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/mapping/ReleaseMapper.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/mapping/ReleaseMapper.kt index e0b27ee2..24547209 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/mapping/ReleaseMapper.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/mapping/ReleaseMapper.kt @@ -16,4 +16,4 @@ abstract class ReleaseMapper { .atZone(TimeSource.ZONE) } } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/mapping/adopt/AdoptBinaryMapper.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/mapping/adopt/AdoptBinaryMapper.kt index 554102c9..71365f82 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/mapping/adopt/AdoptBinaryMapper.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/mapping/adopt/AdoptBinaryMapper.kt @@ -221,4 +221,4 @@ object AdoptBinaryMapper : BinaryMapper() { } return null } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/mapping/adopt/AdoptReleaseMapper.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/mapping/adopt/AdoptReleaseMapper.kt index f466ec50..6f5ed147 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/mapping/adopt/AdoptReleaseMapper.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/mapping/adopt/AdoptReleaseMapper.kt @@ -179,4 +179,4 @@ object AdoptReleaseMapper : ReleaseMapper() { private fun getFeatureVersion(release: GHRelease): VersionData { return VersionParser.parse(release.name) } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/mapping/upstream/UpstreamBinaryMapper.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/mapping/upstream/UpstreamBinaryMapper.kt index e41d6d67..58ccc8fe 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/mapping/upstream/UpstreamBinaryMapper.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/mapping/upstream/UpstreamBinaryMapper.kt @@ -72,4 +72,4 @@ object UpstreamBinaryMapper : BinaryMapper() { asset.name == "$binary_name.sign" }?.downloadUrl } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/mapping/upstream/UpstreamReleaseMapper.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/mapping/upstream/UpstreamReleaseMapper.kt index b4eaadd7..55a148d1 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/mapping/upstream/UpstreamReleaseMapper.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/mapping/upstream/UpstreamReleaseMapper.kt @@ -69,4 +69,4 @@ object UpstreamReleaseMapper : ReleaseMapper() { private fun getVersionData(release_name: String): VersionData { return VersionParser.parse(release_name) } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/stats/DockerStatsInterface.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/stats/DockerStatsInterface.kt index bd956cba..0db895f2 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/stats/DockerStatsInterface.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/stats/DockerStatsInterface.kt @@ -81,4 +81,4 @@ class DockerStatsInterface { } } } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/stats/GithubDownloadStatsCalculator.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/stats/GithubDownloadStatsCalculator.kt index 2301fa91..27f3e472 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/stats/GithubDownloadStatsCalculator.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/stats/GithubDownloadStatsCalculator.kt @@ -39,4 +39,4 @@ class GithubDownloadStatsCalculator { .toList() return stats } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/stats/StatsInterface.kt b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/stats/StatsInterface.kt index 5727dfc7..d46d3f22 100644 --- a/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/stats/StatsInterface.kt +++ b/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/stats/StatsInterface.kt @@ -63,4 +63,4 @@ class StatsInterface { LOGGER.info("docker stat: ${stat.repo} ${stat.pulls}") } } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/APIDataStoreTest.kt b/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/APIDataStoreTest.kt index 4b1b9cff..9fef48ed 100644 --- a/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/APIDataStoreTest.kt +++ b/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/APIDataStoreTest.kt @@ -35,4 +35,4 @@ class APIDataStoreTest : BaseTest() { true) } } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/AdoptBinaryMapperTest.kt b/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/AdoptBinaryMapperTest.kt index 03fa754a..4e765b71 100644 --- a/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/AdoptBinaryMapperTest.kt +++ b/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/AdoptBinaryMapperTest.kt @@ -112,4 +112,4 @@ class AdoptBinaryMapperTest { assertEquals(JvmImpl.hotspot, binaryList.get(0).jvm_impl) assertEquals(Project.jfr, binaryList.get(0).project) } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/AdoptMetadataVersionParsingTest.kt b/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/AdoptMetadataVersionParsingTest.kt index a0d655a6..4ca6611d 100644 --- a/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/AdoptMetadataVersionParsingTest.kt +++ b/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/AdoptMetadataVersionParsingTest.kt @@ -69,4 +69,4 @@ class AdoptMetadataVersionParsingTest { assertEquals(242, adoptRelease.first().version_data.security) } } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/AdoptReleaseMapperTest.kt b/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/AdoptReleaseMapperTest.kt index 309e3da8..96e85290 100644 --- a/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/AdoptReleaseMapperTest.kt +++ b/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/AdoptReleaseMapperTest.kt @@ -185,4 +185,4 @@ class AdoptReleaseMapperTest : BaseTest() { assertEquals(3, release[1].download_count) } } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/AdoptReposBuilderTest.kt b/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/AdoptReposBuilderTest.kt index 548e5796..4d8eea08 100644 --- a/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/AdoptReposBuilderTest.kt +++ b/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/AdoptReposBuilderTest.kt @@ -108,4 +108,4 @@ class AdoptReposBuilderTest : BaseTest() { assertTrue { updated == repo } } } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/AdoptReposTest.kt b/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/AdoptReposTest.kt index 3b0316cf..c7f7f10a 100644 --- a/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/AdoptReposTest.kt +++ b/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/AdoptReposTest.kt @@ -82,4 +82,4 @@ class AdoptReposTest : BaseTest() { )))) } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/BaseTest.kt b/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/BaseTest.kt index 55e8e52a..9ecd6756 100644 --- a/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/BaseTest.kt +++ b/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/BaseTest.kt @@ -165,4 +165,4 @@ abstract class BaseTest { protected suspend fun getInitialRepo(): AdoptRepos { return AdoptReposBuilder.incrementalUpdate(AdoptReposBuilder.build(APIDataStore.variants.versions)) } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/DockerStatsInterfaceTest.kt b/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/DockerStatsInterfaceTest.kt index 317bc7d2..b3cda3e0 100644 --- a/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/DockerStatsInterfaceTest.kt +++ b/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/DockerStatsInterfaceTest.kt @@ -73,4 +73,4 @@ class DockerStatsInterfaceTest { assertEquals(240, stats[0].total) } } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/MetadataSerializationTest.kt b/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/MetadataSerializationTest.kt index 5f7d9082..2df05e4b 100644 --- a/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/MetadataSerializationTest.kt +++ b/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/MetadataSerializationTest.kt @@ -63,4 +63,4 @@ class MetadataSerializationTest { assertEquals(noWarning, reparsed) } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/TestResourceGenerator.kt b/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/TestResourceGenerator.kt index fbbb04b6..2d3c9a3e 100644 --- a/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/TestResourceGenerator.kt +++ b/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/TestResourceGenerator.kt @@ -29,4 +29,4 @@ class TestResourceGenerator { } } } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/UpdateRunner.kt b/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/UpdateRunner.kt index 80a1ffe8..a66350ba 100644 --- a/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/UpdateRunner.kt +++ b/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/UpdateRunner.kt @@ -37,4 +37,4 @@ class UpdateRunner : BaseTest() { V3Updater().run(false) Awaitility.await().atMost(Long.MAX_VALUE, TimeUnit.NANOSECONDS).until({ 4 == 5 }) } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/UpstreamBinaryMapperTest.kt b/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/UpstreamBinaryMapperTest.kt index c152ece5..0bc9cdad 100644 --- a/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/UpstreamBinaryMapperTest.kt +++ b/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/UpstreamBinaryMapperTest.kt @@ -87,4 +87,4 @@ class UpstreamBinaryMapperTest { assertEquals("a-signature-link to OpenJDK11U-x64_linux_11.0.3_7.tar.gz", binaryList[0].`package`.signature_link) } } -} \ No newline at end of file +} diff --git a/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/UpstreamReleaseMapperTest.kt b/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/UpstreamReleaseMapperTest.kt index d63c896b..b3140f5d 100644 --- a/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/UpstreamReleaseMapperTest.kt +++ b/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/UpstreamReleaseMapperTest.kt @@ -51,4 +51,4 @@ class UpstreamReleaseMapperTest { val ghRelease = GHRelease(GithubId("1"), "OpenJDK 8u232 GA Release", true, true, "2013-02-27T19:35:32Z", "2013-02-27T19:35:32Z", source, "8", "a-url") return ghRelease } -} \ No newline at end of file +} From 7eb6e9b5e8fa536744578219888adc3ecc5ead0e Mon Sep 17 00:00:00 2001 From: George Adams Date: Thu, 9 Apr 2020 13:40:37 +0100 Subject: [PATCH 3/4] add more coverage --- .../net/adoptopenjdk/api/BinaryPathTest.kt | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) 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 index 80b3784e..776fb3b1 100644 --- 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 @@ -45,9 +46,10 @@ class BinaryPathTest : BaseTest() { imageType: ImageType, jvmImpl: JvmImpl, heapSize: HeapSize, - vendor: Vendor + 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( @@ -57,14 +59,15 @@ class BinaryPathTest : BaseTest() { imageType: ImageType, jvmImpl: JvmImpl, heapSize: HeapSize, - vendor: Vendor + 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,7 +76,7 @@ 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) @@ -81,7 +84,7 @@ class BinaryPathTest : BaseTest() { @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) From 76d7a0386ef0eccbfcba455fa270e6825b6d497e Mon Sep 17 00:00:00 2001 From: George Adams Date: Thu, 9 Apr 2020 13:40:58 +0100 Subject: [PATCH 4/4] add more coverage --- .../src/test/kotlin/net/adoptopenjdk/api/BinaryPathTest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 776fb3b1..3189f58a 100644 --- 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 @@ -67,7 +67,7 @@ class BinaryPathTest : BaseTest() { @Test fun latestDoesRedirectToBinary() { - val path = getLatestPath(8, ReleaseType.ga, OperatingSystem.linux, Architecture.x64, ImageType.jdk, JvmImpl.hotspot, HeapSize.normal, Vendor.adoptopenjdk, Project.jdk ) + 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)