Skip to content
This repository was archived by the owner on Oct 14, 2021. It is now read-only.

Add static-libs as recognized ImageType for upstream #192

Merged
merged 1 commit into from
Apr 30, 2020
Merged

Add static-libs as recognized ImageType for upstream #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AssetsResourceFeatureReleasePathTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
3 changes: 2 additions & 1 deletion ...jdk-api-v3-frontend/src/test/kotlin/net/adoptopenjdk/api/AssetsResourceVersionPathTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
4 changes: 2 additions & 2 deletions adoptopenjdk-api-v3-models/src/main/kotlin/net/adoptopenjdk/api/v3/models/ImageType.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<String>

Expand Down
2 changes: 1 addition & 1 deletion ...-updater/src/main/kotlin/net/adoptopenjdk/api/v3/mapping/upstream/UpstreamBinaryMapper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<GHAsset>): List<Binary> {
return assets
Expand Down
6 changes: 4 additions & 2 deletions adoptopenjdk-api-v3-updater/src/test/kotlin/net/adoptopenjdk/api/UpstreamBinaryMapperTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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)
}
}

Expand Down