Merge pull request #525 from johnoliver/merge-adoptium-3

Bring in upstream changes

Author: karianna

adoptopenjdk-frontend-parent/adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/SwaggerUiRoute.kt

@@ -5,6 +5,7 @@ import org.eclipse.microprofile.openapi.annotations.media.Schema
 import java.net.URI
 import javax.ws.rs.GET
 import javax.ws.rs.Path
+import javax.ws.rs.PathParam
 import javax.ws.rs.Produces
 import javax.ws.rs.core.MediaType
 import javax.ws.rs.core.Response
@@ -13,14 +14,14 @@ import javax.ws.rs.core.Response
 @Schema(hidden = true)
 @Produces(MediaType.TEXT_PLAIN)
 class SwaggerUiRoute {
-
     @GET
     @Schema(hidden = true)
-    @Path("/swagger-ui")
+    @Path("/{path:openapi|swagger-ui}")
     @Operation(hidden = true)
-    fun redirect(): Response = Response
-        .status(Response.Status.FOUND)
-        .location(URI("/q/swagger-ui"))
-        .build()
-
+    fun redirectOpenAPIPaths(@PathParam("path") path: String): Response {
+        return Response
+            .status(Response.Status.FOUND)
+            .location(URI("/q/${path}"))
+            .build()
+    }
 }

adoptopenjdk-updater-parent/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/stats/StatsInterface.kt

@@ -1,14 +1,16 @@
 package net.adoptopenjdk.api.v3.stats
 
 import net.adoptopenjdk.api.v3.dataSources.models.AdoptRepos
+import net.adoptopenjdk.api.v3.stats.dockerstats.DockerStatsInterfaceFactory
 import javax.inject.Inject
 
 class StatsInterface @Inject constructor(
     private val gitHubDownloadStatsCalculator: GitHubDownloadStatsCalculator,
-    private val dockerStatsInterface: DockerStatsInterface
+    dockerStatsInterfaceFactory: DockerStatsInterfaceFactory
 ) {
+    private val dockerStats = dockerStatsInterfaceFactory.get()
     suspend fun update(repos: AdoptRepos) {
         gitHubDownloadStatsCalculator.saveStats(repos)
-        dockerStatsInterface.updateDb()
+        dockerStats.updateDb()
     }
 }

adoptopenjdk-updater-parent/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/stats/DockerStatsInterface.kt renamed to adoptopenjdk-updater-parent/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/stats/dockerstats/DockerStatsInterface.kt

@@ -1,21 +1,47 @@
-package net.adoptopenjdk.api.v3.stats
+package net.adoptopenjdk.api.v3.stats.dockerstats
 
 import kotlinx.coroutines.runBlocking
-import net.adoptopenjdk.api.v3.TimeSource
+import net.adoptopenjdk.api.v3.config.Ecosystem
 import net.adoptopenjdk.api.v3.dataSources.UpdaterHtmlClient
-
 import net.adoptopenjdk.api.v3.dataSources.UpdaterJsonMapper
 import net.adoptopenjdk.api.v3.dataSources.persitence.ApiPersistence
 import net.adoptopenjdk.api.v3.models.DockerDownloadStatsDbEntry
-import net.adoptopenjdk.api.v3.models.JvmImpl
 import org.slf4j.LoggerFactory
+import javax.enterprise.inject.Produces
 import javax.inject.Inject
+import javax.inject.Singleton
 import javax.json.JsonObject
 
-class DockerStatsInterface @Inject constructor(
+@Singleton
+class DockerStatsInterfaceFactory @Inject constructor(
     private var database: ApiPersistence,
     private val updaterHtmlClient: UpdaterHtmlClient
 ) {
+    var cached: DockerStatsInterface? = null
+
+    @Produces
+    @Singleton
+    fun get(): DockerStatsInterface {
+        if (cached == null) {
+            cached = when (Ecosystem.CURRENT) {
+                Ecosystem.adoptopenjdk -> DockerStatsInterfaceAdoptOpenJdk(database, updaterHtmlClient)
+                Ecosystem.adoptium -> DockerStatsInterfaceAdoptium(database, updaterHtmlClient)
+            }
+        }
+
+        return cached!!
+    }
+}
+
+@Singleton
+interface DockerStatsInterface {
+    suspend fun updateDb()
+}
+
+abstract class DockerStats @Inject constructor(
+    private var database: ApiPersistence,
+    private val updaterHtmlClient: UpdaterHtmlClient
+) : DockerStatsInterface {
     companion object {
         @JvmStatic
         private val LOGGER = LoggerFactory.getLogger(this::class.java)
@@ -25,10 +51,10 @@ class DockerStatsInterface @Inject constructor(
         }
     }
 
-    private val downloadStatsUrl = "https://hub.docker.com/v2/repositories/adoptopenjdk/"
-    private val officialStatsUrl = "https://hub.docker.com/v2/repositories/library/adoptopenjdk/"
+    abstract fun getDownloadStats(): List<DockerDownloadStatsDbEntry>
+    abstract fun pullOfficalStats(): DockerDownloadStatsDbEntry
 
-    suspend fun updateDb() {
+    override suspend fun updateDb() {
         try {
             val stats = mutableListOf<DockerDownloadStatsDbEntry>()
 
@@ -42,29 +68,7 @@ class DockerStatsInterface @Inject constructor(
         }
     }
 
-    private fun getDownloadStats(): List<DockerDownloadStatsDbEntry> {
-        val now = TimeSource.now()
-
-        return pullAllStats()
-            .map {
-                DockerDownloadStatsDbEntry(
-                    now,
-                    it.getJsonNumber("pull_count").longValue(),
-                    it.getString("name"),
-                    getOpenjdkVersionFromString(it.getString("name")),
-                    if (it.getString("name").contains("openj9")) JvmImpl.openj9 else JvmImpl.hotspot // Will need to be updated with a new JVMImpl
-                )
-            }
-    }
-
-    private fun pullOfficalStats(): DockerDownloadStatsDbEntry {
-        val result = getStatsForUrl(officialStatsUrl)
-        val now = TimeSource.now()
-
-        return DockerDownloadStatsDbEntry(now, result.getJsonNumber("pull_count").longValue(), "official", null, null)
-    }
-
-    private fun pullAllStats(): ArrayList<JsonObject> {
+    protected fun pullAllStats(downloadStatsUrl: String): ArrayList<JsonObject> {
         var next: String? = downloadStatsUrl
 
         val results = ArrayList<JsonObject>()
@@ -76,7 +80,7 @@ class DockerStatsInterface @Inject constructor(
         return results
     }
 
-    private fun getStatsForUrl(url: String): JsonObject {
+    protected fun getStatsForUrl(url: String): JsonObject {
         return runBlocking {
             val stats = updaterHtmlClient.get(url)
             if (stats == null) {

adoptopenjdk-updater-parent/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/stats/dockerstats/DockerStatsInterfaceAdoptOpenJdk.kt

@@ -0,0 +1,39 @@
+package net.adoptopenjdk.api.v3.stats.dockerstats
+
+import net.adoptopenjdk.api.v3.TimeSource
+import net.adoptopenjdk.api.v3.dataSources.UpdaterHtmlClient
+import net.adoptopenjdk.api.v3.dataSources.persitence.ApiPersistence
+import net.adoptopenjdk.api.v3.models.DockerDownloadStatsDbEntry
+import net.adoptopenjdk.api.v3.models.JvmImpl
+import javax.inject.Inject
+
+class DockerStatsInterfaceAdoptOpenJdk @Inject constructor(
+    database: ApiPersistence,
+    updaterHtmlClient: UpdaterHtmlClient,
+) : DockerStats(database, updaterHtmlClient) {
+
+    private val downloadStatsUrl = "https://hub.docker.com/v2/repositories/adoptopenjdk/"
+    private val officialStatsUrl = "https://hub.docker.com/v2/repositories/library/adoptopenjdk/"
+
+    override fun getDownloadStats(): List<DockerDownloadStatsDbEntry> {
+        val now = TimeSource.now()
+
+        return pullAllStats(downloadStatsUrl)
+            .map {
+                DockerDownloadStatsDbEntry(
+                    now,
+                    it.getJsonNumber("pull_count").longValue(),
+                    it.getString("name"),
+                    getOpenjdkVersionFromString(it.getString("name")),
+                    if (it.getString("name").contains("openj9")) JvmImpl.openj9 else JvmImpl.hotspot // Will need to be updated with a new JVMImpl
+                )
+            }
+    }
+
+    override fun pullOfficalStats(): DockerDownloadStatsDbEntry {
+        val result = getStatsForUrl(officialStatsUrl)
+        val now = TimeSource.now()
+
+        return DockerDownloadStatsDbEntry(now, result.getJsonNumber("pull_count").longValue(), "official", null, null)
+    }
+}

adoptopenjdk-updater-parent/adoptopenjdk-api-v3-updater/src/main/kotlin/net/adoptopenjdk/api/v3/stats/dockerstats/DockerStatsInterfaceAdoptium.kt

@@ -0,0 +1,26 @@
+package net.adoptopenjdk.api.v3.stats.dockerstats
+
+import net.adoptopenjdk.api.v3.TimeSource
+import net.adoptopenjdk.api.v3.dataSources.UpdaterHtmlClient
+import net.adoptopenjdk.api.v3.dataSources.persitence.ApiPersistence
+import net.adoptopenjdk.api.v3.models.DockerDownloadStatsDbEntry
+import javax.inject.Inject
+
+class DockerStatsInterfaceAdoptium @Inject constructor(
+    database: ApiPersistence,
+    updaterHtmlClient: UpdaterHtmlClient
+) : DockerStats(database, updaterHtmlClient) {
+
+    private val officialStatsUrl = "https://hub.docker.com/v2/repositories/library/eclipse-temurin/"
+
+    override fun getDownloadStats(): List<DockerDownloadStatsDbEntry> {
+        return emptyList()
+    }
+
+    override fun pullOfficalStats(): DockerDownloadStatsDbEntry {
+        val result = getStatsForUrl(officialStatsUrl)
+        val now = TimeSource.now()
+
+        return DockerDownloadStatsDbEntry(now, result.getJsonNumber("pull_count").longValue(), "eclipse-temurin", null, null)
+    }
+}

adoptopenjdk-updater-parent/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/DockerStatsInterfaceTest.kt

@@ -13,7 +13,9 @@ import net.adoptopenjdk.api.v3.models.DockerDownloadStatsDbEntry
 import net.adoptopenjdk.api.v3.models.GitHubDownloadStatsDbEntry
 import net.adoptopenjdk.api.v3.models.JvmImpl
 import net.adoptopenjdk.api.v3.models.StatsSource
-import net.adoptopenjdk.api.v3.stats.DockerStatsInterface
+import net.adoptopenjdk.api.v3.stats.dockerstats.DockerStats
+import net.adoptopenjdk.api.v3.stats.dockerstats.DockerStatsInterface
+import net.adoptopenjdk.api.v3.stats.dockerstats.DockerStatsInterfaceFactory
 import org.jboss.weld.junit5.auto.AddPackages
 import org.junit.Assert
 import org.junit.jupiter.api.Test
@@ -26,7 +28,7 @@ class DockerStatsInterfaceTest : BaseTest() {
     fun dbEntryIsCreated(defaultUpdaterHtmlClient: DefaultUpdaterHtmlClient) {
         runBlocking {
             val apiPersistence = InMemoryApiPersistence(adoptRepos)
-            val dockerStatsInterface = DockerStatsInterface(apiPersistence, defaultUpdaterHtmlClient)
+            val dockerStatsInterface = DockerStatsInterfaceFactory(apiPersistence, defaultUpdaterHtmlClient).get()
 
             dockerStatsInterface.updateDb()
 
@@ -90,12 +92,12 @@ class DockerStatsInterfaceTest : BaseTest() {
     @Test
     fun testGetOpenjdkVersionFromString() {
         runBlocking {
-            assertEquals(11, DockerStatsInterface.getOpenjdkVersionFromString("openjdk11"))
-            assertEquals(8, DockerStatsInterface.getOpenjdkVersionFromString("openjdk8-openj9"))
-            assertEquals(12, DockerStatsInterface.getOpenjdkVersionFromString("maven-openjdk12"))
-            assertEquals(14, DockerStatsInterface.getOpenjdkVersionFromString("maven-openjdk14-openj9"))
+            assertEquals(11, DockerStats.getOpenjdkVersionFromString("openjdk11"))
+            assertEquals(8, DockerStats.getOpenjdkVersionFromString("openjdk8-openj9"))
+            assertEquals(12, DockerStats.getOpenjdkVersionFromString("maven-openjdk12"))
+            assertEquals(14, DockerStats.getOpenjdkVersionFromString("maven-openjdk14-openj9"))
 
-            assertEquals(null, DockerStatsInterface.getOpenjdkVersionFromString("official"))
+            assertEquals(null, DockerStats.getOpenjdkVersionFromString("official"))
         }
     }
 }

adoptopenjdk-updater-parent/adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/StatsCalculatorTest.kt

@@ -20,8 +20,8 @@ import net.adoptopenjdk.api.v3.models.Release
 import net.adoptopenjdk.api.v3.models.ReleaseType
 import net.adoptopenjdk.api.v3.models.Vendor
 import net.adoptopenjdk.api.v3.models.VersionData
-import net.adoptopenjdk.api.v3.stats.DockerStatsInterface
 import net.adoptopenjdk.api.v3.stats.GitHubDownloadStatsCalculator
+import net.adoptopenjdk.api.v3.stats.dockerstats.DockerStats
 import org.junit.jupiter.api.Test
 
 class StatsCalculatorTest : BaseTest() {
@@ -41,10 +41,10 @@ class StatsCalculatorTest : BaseTest() {
 
     @Test
     fun testDockerVersionNumber() {
-        assert(DockerStatsInterface.getOpenjdkVersionFromString("openjdk11") == 11)
-        assert(DockerStatsInterface.getOpenjdkVersionFromString("openjdk7") == 7)
-        assert(DockerStatsInterface.getOpenjdkVersionFromString("openjdk") == null)
-        assert(DockerStatsInterface.getOpenjdkVersionFromString("blah") == null)
+        assert(DockerStats.getOpenjdkVersionFromString("openjdk11") == 11)
+        assert(DockerStats.getOpenjdkVersionFromString("openjdk7") == 7)
+        assert(DockerStats.getOpenjdkVersionFromString("openjdk") == null)
+        assert(DockerStats.getOpenjdkVersionFromString("blah") == null)
     }
 
     private fun generateFeatureRelease(): FeatureRelease {

adoptopenjdk-updater-parent/adoptopenjdk-mappers-parent/adopt-mappers/src/main/kotlin/net/adoptopenjdk/api/v3/mapping/adopt/AdoptReleaseMapper.kt

@@ -120,7 +120,7 @@ private class AdoptReleaseMapper constructor(
 
         return if (release.release_type == ReleaseType.ea) {
             // remove all 14.0.1+7.1 and 15.0.0+24.1 nightlies - https://github.com/AdoptOpenJDK/openjdk-api-v3/issues/213
-            // also ignore jdk-2021-01-13-07-01 - https://github.com/AdoptOpenJDK/openjdk-api-v3/issues/449
+            // also ignore jdk-2021-01-13-07-01
             if (release.version_data.semver.startsWith("14.0.1+7.1.") ||
                 release.version_data.semver.startsWith("15.0.0+24.1.") ||
                 release.release_name == "jdk-2021-01-13-07-01"