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 43c4bb55..34ad16db 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 @@ -104,7 +104,8 @@ class AssetsResourceFeatureReleasePathTest : AssetsPathTest() { version == 8 && element == ImageType.testimage || version == 11 && element == ImageType.testimage || version == 12 && element == ImageType.testimage || - element == ImageType.debugimage + element == ImageType.debugimage || + element == ImageType.staticlibs } companion object { 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 a6f0a273..b5d38b1a 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 @@ -81,6 +81,7 @@ class AssetsResourceVersionPathTest : AssetsPathTest() { versionRange.equals(JAVA11) && element == Architecture.sparcv9 || versionRange.equals(JAVA11) && element == ImageType.testimage || versionRange.equals(BELOW_11) && element == ImageType.testimage || - element == ImageType.debugimage + element == ImageType.debugimage || + element == ImageType.staticlibs } } 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..362778cc 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 @@ -3,9 +3,9 @@ package net.adoptopenjdk.api.v3.models import org.eclipse.microprofile.openapi.annotations.enums.SchemaType import org.eclipse.microprofile.openapi.annotations.media.Schema -@Schema(type = SchemaType.STRING, enumeration = ["jdk", "jre", "testimage", "debugimage"], example = "jdk") +@Schema(type = SchemaType.STRING, enumeration = ["jdk", "jre", "testimage", "debugimage", "static-libs"], example = "jdk") enum class ImageType : FileNameMatcher { - jdk, jre, testimage, debugimage; + jdk, jre, testimage, debugimage, staticlibs("static-libs"); override lateinit var names: List 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 847ec238..8bd8a6a3 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 @@ -20,7 +20,7 @@ object UpstreamBinaryMapper : BinaryMapper() { @JvmStatic private val LOGGER = LoggerFactory.getLogger(this::class.java) - private val EXCLUDES = listOf("static-libs", "sources", "debuginfo") + private val EXCLUDES = listOf("sources", "debuginfo") suspend fun toBinaryList(assets: List): List { return assets 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 23366eee..69824184 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 @@ -63,6 +63,7 @@ class UpstreamBinaryMapperTest { "OpenJDK11U-x64_linux_11.0.3_7.tar.gz", "OpenJDK11U-x64_windows_11.0.3_6_ea.zip", "OpenJDK11U-testimage_x64_linux_11.0.5_10.tar.gz", + "OpenJDK11U-static-libs_x64_linux_11.0.5_10.tar.gz", "OpenJDK11U-jre_aarch64_linux_11.0.5_10.tar.gz", "OpenJDK11U-jdk_aarch64_linux_11.0.5_10-debuginfo.tar.gz", "OpenJDK11U-sources_11.0.5_10.tar.gz" @@ -72,11 +73,12 @@ class UpstreamBinaryMapperTest { runBlocking { val binaryList = UpstreamBinaryMapper.toBinaryList(assets) - assertEquals(4, binaryList.size) + assertEquals(5, binaryList.size) assertEquals(ImageType.jdk, binaryList[0].image_type) assertEquals(ImageType.jdk, binaryList[1].image_type) assertEquals(ImageType.testimage, binaryList[2].image_type) - assertEquals(ImageType.jre, binaryList[3].image_type) + assertEquals(ImageType.staticlibs, binaryList[3].image_type) + assertEquals(ImageType.jre, binaryList[4].image_type) } }