Skip to content

Fix parsing artifact metadata with a modelVersion #147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
martinbonnin merged 1 commit into from
Jul 6, 2025
Merged

Fix parsing artifact metadata with a modelVersion #147

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
4 changes: 4 additions & 0 deletions nmcp/src/main/kotlin/nmcp/internal/task/metadata.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ import nl.adaptivity.xmlutil.serialization.XmlChildrenName
import nl.adaptivity.xmlutil.serialization.XmlElement
import nl.adaptivity.xmlutil.serialization.XmlSerialName

/**
* See https://maven.apache.org/xsd/repository-metadata-1.1.0.xsd
*/
@Serializable
@XmlSerialName("metadata")
internal data class VersionMetadata(
Expand Down Expand Up @@ -55,6 +58,7 @@ internal data class VersionMetadata(
@Serializable
@XmlSerialName("metadata")
internal data class ArtifactMetadata(
val modelVersion: String = "1.1.0",
@XmlElement
val groupId: String,
@XmlElement
Expand Down
93 changes: 28 additions & 65 deletions nmcp/src/test/kotlin/MetadataTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import java.io.File
import kotlin.test.Test
import kotlin.test.assertEquals
import kotlin.test.assertNull
Expand All @@ -8,27 +9,14 @@ import nmcp.transport.encodeToXml
import nmcp.internal.task.xml

class MetadataTest {

@Test
fun artifactMetadataIsDecodedSuccessfully() {
// language=xml
val xmlData = """
<?xml version="1.0" encoding="UTF-8"?>
<metadata>
<groupId>com.apollographql.apollo</groupId>
<artifactId>apollo-api-jvm</artifactId>
<versioning>
<latest>5.0.0-SNAPSHOT</latest>
<release/>
<versions>
<version>4.1.2-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
</versions>
<lastUpdated>20250618175334</lastUpdated>
</versioning>
</metadata>
""".trimIndent()
fun apolloArtifactMetadataIsDecodedSuccessfully() {
val xmlData = testData("apollo-artifact-metadata.xml")

xml.decodeFromString<ArtifactMetadata>(xmlData).apply {
// The metadata doesn't have modelVersion but it is initialized to the default
assertEquals("1.1.0", modelVersion)
assertEquals("com.apollographql.apollo", groupId)
assertEquals("apollo-api-jvm", artifactId)
versioning.apply {
Expand All @@ -55,7 +43,7 @@ class MetadataTest {
// language=xml
val xmlData = """
<?xml version="1.0" encoding="UTF-8"?>
<metadata>
<metadata modelVersion="1.1.0">
<groupId>com.apollographql.apollo</groupId>
<artifactId>apollo-api-jvm</artifactId>
<versioning>
Expand Down Expand Up @@ -89,52 +77,8 @@ class MetadataTest {
}

@Test
fun versionMetadataIsDecodedSuccessfully() {
// language=xml
val metadata = """
<?xml version="1.0" encoding="UTF-8"?>
<metadata modelVersion="1.1.0">
<groupId>com.apollographql.apollo</groupId>
<artifactId>apollo-api-jvm</artifactId>
<versioning>
<lastUpdated>20250618175232</lastUpdated>
<snapshot>
<timestamp>20250618.175232</timestamp>
<buildNumber>62</buildNumber>
</snapshot>
<snapshotVersions>
<snapshotVersion>
<extension>jar</extension>
<value>5.0.0-20250618.175232-62</value>
<updated>20250618175232</updated>
</snapshotVersion>
<snapshotVersion>
<extension>module</extension>
<value>5.0.0-20250618.175232-62</value>
<updated>20250618175232</updated>
</snapshotVersion>
<snapshotVersion>
<extension>pom</extension>
<value>5.0.0-20250618.175232-62</value>
<updated>20250618175232</updated>
</snapshotVersion>
<snapshotVersion>
<classifier>javadoc</classifier>
<extension>jar</extension>
<value>5.0.0-20250618.175232-62</value>
<updated>20250618175232</updated>
</snapshotVersion>
<snapshotVersion>
<classifier>sources</classifier>
<extension>jar</extension>
<value>5.0.0-20250618.175232-62</value>
<updated>20250618175232</updated>
</snapshotVersion>
</snapshotVersions>
</versioning>
<version>5.0.0-SNAPSHOT</version>
</metadata>
""".trimIndent()
fun apolloVersionMetadataIsDecodedSuccessfully() {
val metadata = testData("apollo-version-metadata.xml")

xml.decodeFromString<VersionMetadata>(metadata).apply {
assertEquals("com.apollographql.apollo", groupId)
Expand Down Expand Up @@ -252,4 +196,23 @@ class MetadataTest {
val data = xml.decodeFromString<ArtifactMetadata>(xmlData)
assertNull(data.versioning.release)
}

@Test
fun sealedObjectInstanceArtifactMetadataIsDecodedSuccessfully() {
testData("sealed-object-instances-artifact-metadata.xml").let {
xml.decodeFromString<ArtifactMetadata>(it)
}
}

@Test
fun sealedObjectInstanceVersionMetadataIsDecodedSuccessfully() {
testData("sealed-object-instances-version-metadata.xml").let {
xml.decodeFromString<VersionMetadata>(it)
}
}
}


private fun testData(name: String): String {
return File("test-data").resolve(name).readText()
}
14 changes: 14 additions & 0 deletions nmcp/test-data/apollo-artifact-metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<metadata>
<groupId>com.apollographql.apollo</groupId>
<artifactId>apollo-api-jvm</artifactId>
<versioning>
<latest>5.0.0-SNAPSHOT</latest>
<release/>
<versions>
<version>4.1.2-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
</versions>
<lastUpdated>20250618175334</lastUpdated>
</versioning>
</metadata>
42 changes: 42 additions & 0 deletions nmcp/test-data/apollo-version-metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<?xml version="1.0" encoding="UTF-8"?>
<metadata modelVersion="1.1.0">
<groupId>com.apollographql.apollo</groupId>
<artifactId>apollo-api-jvm</artifactId>
<versioning>
<lastUpdated>20250618175232</lastUpdated>
<snapshot>
<timestamp>20250618.175232</timestamp>
<buildNumber>62</buildNumber>
</snapshot>
<snapshotVersions>
<snapshotVersion>
<extension>jar</extension>
<value>5.0.0-20250618.175232-62</value>
<updated>20250618175232</updated>
</snapshotVersion>
<snapshotVersion>
<extension>module</extension>
<value>5.0.0-20250618.175232-62</value>
<updated>20250618175232</updated>
</snapshotVersion>
<snapshotVersion>
<extension>pom</extension>
<value>5.0.0-20250618.175232-62</value>
<updated>20250618175232</updated>
</snapshotVersion>
<snapshotVersion>
<classifier>javadoc</classifier>
<extension>jar</extension>
<value>5.0.0-20250618.175232-62</value>
<updated>20250618175232</updated>
</snapshotVersion>
<snapshotVersion>
<classifier>sources</classifier>
<extension>jar</extension>
<value>5.0.0-20250618.175232-62</value>
<updated>20250618175232</updated>
</snapshotVersion>
</snapshotVersions>
</versioning>
<version>5.0.0-SNAPSHOT</version>
</metadata>
13 changes: 13 additions & 0 deletions nmcp/test-data/sealed-object-instances-artifact-metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<metadata modelVersion="1.1.0">
<groupId>fr.smarquis.sealed</groupId>
<artifactId>sealed-object-instances</artifactId>
<versioning>
<latest>1.11.0-SNAPSHOT</latest>
<versions>
<version>1.10.0-SNAPSHOT</version>
<version>1.11.0-SNAPSHOT</version>
</versions>
<lastUpdated>20250601220426</lastUpdated>
</versioning>
</metadata>
81 changes: 81 additions & 0 deletions nmcp/test-data/sealed-object-instances-version-metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
<?xml version="1.0" encoding="UTF-8"?>
<metadata modelVersion="1.1.0">
<groupId>fr.smarquis.sealed</groupId>
<artifactId>sealed-object-instances</artifactId>
<versioning>
<lastUpdated>20250706084833</lastUpdated>
<snapshot>
<timestamp>20250706.084833</timestamp>
<buildNumber>4</buildNumber>
</snapshot>
<snapshotVersions>
<snapshotVersion>
<extension>module</extension>
<value>1.11.0-20250706.084833-1</value>
<updated>20250706084833</updated>
</snapshotVersion>
<snapshotVersion>
<classifier>html-docs</classifier>
<extension>jar.asc</extension>
<value>1.11.0-20250706.084833-1</value>
<updated>20250706084833</updated>
</snapshotVersion>
<snapshotVersion>
<classifier>javadoc</classifier>
<extension>jar.asc</extension>
<value>1.11.0-20250706.084833-1</value>
<updated>20250706084833</updated>
</snapshotVersion>
<snapshotVersion>
<extension>pom.asc</extension>
<value>1.11.0-20250706.084833-1</value>
<updated>20250706084833</updated>
</snapshotVersion>
<snapshotVersion>
<classifier>sources</classifier>
<extension>jar</extension>
<value>1.11.0-20250706.084833-1</value>
<updated>20250706084833</updated>
</snapshotVersion>
<snapshotVersion>
<classifier>html-docs</classifier>
<extension>jar</extension>
<value>1.11.0-20250706.084833-1</value>
<updated>20250706084833</updated>
</snapshotVersion>
<snapshotVersion>
<classifier>javadoc</classifier>
<extension>jar</extension>
<value>1.11.0-20250706.084833-1</value>
<updated>20250706084833</updated>
</snapshotVersion>
<snapshotVersion>
<extension>pom</extension>
<value>1.11.0-20250706.084833-1</value>
<updated>20250706084833</updated>
</snapshotVersion>
<snapshotVersion>
<classifier>sources</classifier>
<extension>jar.asc</extension>
<value>1.11.0-20250706.084833-1</value>
<updated>20250706084833</updated>
</snapshotVersion>
<snapshotVersion>
<extension>jar.asc</extension>
<value>1.11.0-20250706.084833-1</value>
<updated>20250706084833</updated>
</snapshotVersion>
<snapshotVersion>
<extension>module.asc</extension>
<value>1.11.0-20250706.084833-1</value>
<updated>20250706084833</updated>
</snapshotVersion>
<snapshotVersion>
<extension>jar</extension>
<value>1.11.0-20250706.084833-1</value>
<updated>20250706084833</updated>
</snapshotVersion>
</snapshotVersions>
</versioning>
<version>1.11.0-SNAPSHOT</version>
</metadata>