Add tip version to available versions. Fixes #221

adoptopenjdk-api-v3-frontend/src/main/kotlin/net/adoptopenjdk/api/v3/routes/info/AvailableReleasesResource.kt

@@ -2,7 +2,6 @@ package net.adoptopenjdk.api.v3.routes.info
 
 import net.adoptopenjdk.api.v3.dataSources.APIDataStore
 import net.adoptopenjdk.api.v3.models.ReleaseInfo
-import net.adoptopenjdk.api.v3.models.ReleaseType
 import org.eclipse.microprofile.openapi.annotations.Operation
 import org.eclipse.microprofile.openapi.annotations.tags.Tag
 import javax.ws.rs.GET
@@ -14,54 +13,10 @@ import javax.ws.rs.core.MediaType
 @Path("/v3/info/")
 @Produces(MediaType.APPLICATION_JSON)
 class AvailableReleasesResource {
-
-    private var releaseInfo: ReleaseInfo = formReleaseInfo()
-
     @GET
     @Path("/available_releases/")
     @Operation(summary = "Returns information about available releases")
     fun get(): ReleaseInfo {
-        return releaseInfo
-    }
-
-    final fun formReleaseInfo(): ReleaseInfo {
-        val gaReleases = APIDataStore.getAdoptRepos()
-            .allReleases
-            .getReleases()
-            .filter { it.release_type == ReleaseType.ga }
-            .toList()
-
-        val availableReleases = gaReleases
-            .map { it.version_data.major }
-            .distinct()
-            .sorted()
-            .toList()
-            .toTypedArray()
-        val mostRecentFeatureRelease: Int = availableReleases.last()
-
-        val availableLtsReleases: Array<Int> = gaReleases
-            .filter { APIDataStore.variants.ltsVersions.contains(it.version_data.major) }
-            .map { it.version_data.major }
-            .distinct()
-            .sorted()
-            .toList()
-            .toTypedArray()
-        val mostRecentLts = availableLtsReleases.last()
-
-        val mostRecentFeatureVersion: Int = APIDataStore.getAdoptRepos()
-            .allReleases
-            .getReleases()
-            .map { it.version_data.major }
-            .distinct()
-            .sorted()
-            .last()
-
-        return ReleaseInfo(
-            availableReleases,
-            availableLtsReleases,
-            mostRecentLts,
-            mostRecentFeatureRelease,
-            mostRecentFeatureVersion
-        )
+        return APIDataStore.getReleaseInfo()
     }
 }

adoptopenjdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AvailableReleasesPathTest.kt

@@ -3,15 +3,10 @@ package net.adoptopenjdk.api
 import io.quarkus.test.junit.QuarkusTest
 import io.restassured.RestAssured
 import kotlinx.coroutines.runBlocking
-import net.adoptopenjdk.api.v3.AdoptReposBuilder
 import net.adoptopenjdk.api.v3.JsonMapper
 import net.adoptopenjdk.api.v3.dataSources.APIDataStore
 import net.adoptopenjdk.api.v3.dataSources.ApiPersistenceFactory
-import net.adoptopenjdk.api.v3.dataSources.models.AdoptRepos
-import net.adoptopenjdk.api.v3.dataSources.models.FeatureRelease
-import net.adoptopenjdk.api.v3.dataSources.models.Releases
 import net.adoptopenjdk.api.v3.models.ReleaseInfo
-import net.adoptopenjdk.api.v3.models.ReleaseType
 import org.hamcrest.Description
 import org.hamcrest.TypeSafeMatcher
 import org.junit.jupiter.api.BeforeEach
@@ -23,18 +18,18 @@ class AvailableReleasesPathTest : BaseTest() {
     @BeforeEach
     fun initDB() {
         runBlocking {
-            val repo = AdoptReposBuilder.build(APIDataStore.variants.versions)
-
-            val releases = repo.allReleases.getReleases()
-                .filter { it.version_data.major < 13 || it.version_data.major == 13 && it.release_type == ReleaseType.ea }
-                .groupBy { it.version_data.major }
-                .toMap()
-                .map { FeatureRelease(it.key, Releases(it.value)) }
-
             // Reset connection
             ApiPersistenceFactory.set(null)
-            ApiPersistenceFactory.get().updateAllRepos(AdoptRepos(releases))
-            APIDataStore.loadDataFromDb()
+            ApiPersistenceFactory.get().setReleaseInfo(ReleaseInfo(
+                arrayOf(8, 9, 10, 11, 12),
+                arrayOf(8, 11),
+                11,
+                12,
+                13,
+                15
+            )
+            )
+            APIDataStore.loadReleaseInfo()
         }
     }
 

adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/ReleaseInfo.kt

@@ -19,17 +19,22 @@ class ReleaseInfo {
     @Schema(example = "15", description = "The highest version (LTS or not) for which we have produced a build, this may be a version that has not yet produced a ga release")
     val most_recent_feature_version: Int
 
+    @Schema(example = "15", description = "The version that is currently in development at openjdk")
+    val tip_version: Int
+
     constructor(
         available_releases: Array<Int>,
         available_lts_releases: Array<Int>,
         most_recent_lts: Int,
         most_recent_feature_release: Int,
-        most_recent_feature_version: Int
+        most_recent_feature_version: Int,
+        tip_version: 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
         this.most_recent_feature_version = most_recent_feature_version
+        this.tip_version = tip_version
     }
 }

adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/APIDataStore.kt

@@ -1,18 +1,20 @@
 package net.adoptopenjdk.api.v3.dataSources
 
 import com.google.common.annotations.VisibleForTesting
-import java.util.concurrent.Executors
-import java.util.concurrent.TimeUnit
-import kotlin.concurrent.timerTask
 import kotlinx.coroutines.runBlocking
 import net.adoptopenjdk.api.v3.JsonMapper
 import net.adoptopenjdk.api.v3.dataSources.models.AdoptRepos
 import net.adoptopenjdk.api.v3.models.Platforms
+import net.adoptopenjdk.api.v3.models.ReleaseInfo
 import net.adoptopenjdk.api.v3.models.Variants
 import org.slf4j.LoggerFactory
+import java.util.concurrent.Executors
+import java.util.concurrent.TimeUnit
+import kotlin.concurrent.timerTask
 
 object APIDataStore {
     private var binaryRepos: AdoptRepos
+    private var releaseInfo: ReleaseInfo
 
     @JvmStatic
     private val LOGGER = LoggerFactory.getLogger(this::class.java)
@@ -35,23 +37,47 @@ object APIDataStore {
             binaryRepos = AdoptRepos(listOf())
         }
 
+        releaseInfo = loadReleaseInfo()
+
         Executors
-                .newSingleThreadScheduledExecutor()
-                .scheduleWithFixedDelay(timerTask {
-                    periodicUpdate()
-                }, 0, 15, TimeUnit.MINUTES)
+            .newSingleThreadScheduledExecutor()
+            .scheduleWithFixedDelay(timerTask {
+                periodicUpdate()
+            }, 0, 15, TimeUnit.MINUTES)
+    }
+
+    fun loadReleaseInfo(): ReleaseInfo {
+        releaseInfo = runBlocking {
+            val releaseInfo = try {
+                ApiPersistenceFactory.get().getReleaseInfo()
+            } catch (e: Exception) {
+                LOGGER.error("Failed to read db", e)
+                null
+            }
+
+            // Default for first time when DB is still being populated
+            releaseInfo ?: ReleaseInfo(
+                arrayOf(8, 9, 10, 11, 12, 13, 14),
+                arrayOf(8, 11),
+                11,
+                14,
+                15,
+                15
+            )
+        }
+        return releaseInfo
     }
 
     @VisibleForTesting
     fun loadDataFromDb(): AdoptRepos {
         binaryRepos = runBlocking {
             val data = variants
-                    .versions
-                    .map { version ->
-                        ApiPersistenceFactory.get().readReleaseData(version)
-                    }
-                    .filter { it.releases.nodes.isNotEmpty() }
-                    .toList()
+                .versions
+                .map { version ->
+                    ApiPersistenceFactory.get().readReleaseData(version)
+                }
+                .filter { it.releases.nodes.isNotEmpty() }
+                .toList()
 
             AdoptRepos(data)
         }
@@ -71,8 +97,13 @@ object APIDataStore {
         // Must catch errors or may kill the scheduler
         try {
             binaryRepos = loadDataFromDb()
+            releaseInfo = loadReleaseInfo()
         } catch (e: Exception) {
             LOGGER.error("Failed to load db", e)
         }
     }
+
+    fun getReleaseInfo(): ReleaseInfo {
+        return releaseInfo
+    }
 }

adoptopenjdk-api-v3-persistance/src/main/kotlin/net/adoptopenjdk/api/v3/dataSources/persitence/ApiPersistence.kt

@@ -1,10 +1,11 @@
 package net.adoptopenjdk.api.v3.dataSources.persitence
 
-import java.time.ZonedDateTime
 import net.adoptopenjdk.api.v3.dataSources.models.AdoptRepos
 import net.adoptopenjdk.api.v3.dataSources.models.FeatureRelease
 import net.adoptopenjdk.api.v3.models.DockerDownloadStatsDbEntry
 import net.adoptopenjdk.api.v3.models.GithubDownloadStatsDbEntry
+import net.adoptopenjdk.api.v3.models.ReleaseInfo
+import java.time.ZonedDateTime
 
 interface ApiPersistence {
     suspend fun updateAllRepos(repos: AdoptRepos)
@@ -18,4 +19,6 @@ interface ApiPersistence {
     suspend fun addDockerDownloadStatsEntries(stats: List<DockerDownloadStatsDbEntry>)
     suspend fun getLatestAllDockerStats(): List<DockerDownloadStatsDbEntry>
     suspend fun removeStatsBetween(start: ZonedDateTime, end: ZonedDateTime)
+    suspend fun setReleaseInfo(version: ReleaseInfo)
+    suspend fun getReleaseInfo(): ReleaseInfo?
 }