Bump Develocity API spec version to 2025.2 (#507)

Bump spec version to 2025.2 and library version to 2025.2.0. Fix new
case of bad enum member name mapping, while adding a test ensuring the
library API contains no unfixed cases.

Author: gabrielfeo

build-logic/src/functionalTest/kotlin/com/gabrielfeo/task/PostProcessGeneratedApiTest.kt

@@ -180,6 +180,49 @@ class PostProcessGeneratedApiTest {
         """.trimIndent(),
     )
 
+    /**
+     * Fixes enum case names: mAVENEXTCLASSPATH -> mavenExtClasspath (gabrielfeo/develocity-api-kotlin#429).
+     *
+     * Occurs when API spec enum name is uppercase and generator enumPropertyNaming is camelCase.
+     */
+    @Test
+    fun mavenExtensionTypeEnumPostProcessing() = testPostProcessing(
+        inputPath = "src/main/kotlin/com/gabrielfeo/develocity/api/model/MavenExtension.kt",
+        inputContent = """
+            /**
+             * The extension application type. * `CORE` - A core extension, provided in the lib folder of the Maven installation. * `MAVEN_EXT_CLASSPATH` - A core extension provided via the -Dmaven.ext.class.path system property.   * `LIB_EXT` - A core extension, provided in the lib/ext folder of the Maven installation. * `PROJECT` - A project extension, provided via a declaration in .mvn/extensions.xml in the Maven working directory.  * `POM` - A build extension, provided via a declaration in the build section of the top level project pom.xml * `UNKNOWN` - An extension for which none of the other types match.
+             *
+             * Values: cORE,mAVENEXTCLASSPATH,lIBEXT,pROJECT,pOM,uNKNOWN
+             */
+            @JsonClass(generateAdapter = false)
+            enum class Type(val value: kotlin.String) {
+                @Json(name = "CORE") cORE("CORE"),
+                @Json(name = "MAVEN_EXT_CLASSPATH") mAVENEXTCLASSPATH("MAVEN_EXT_CLASSPATH"),
+                @Json(name = "LIB_EXT") lIBEXT("LIB_EXT"),
+                @Json(name = "PROJECT") pROJECT("PROJECT"),
+                @Json(name = "POM") pOM("POM"),
+                @Json(name = "UNKNOWN") uNKNOWN("UNKNOWN");
+            }
+        """.trimIndent(),
+        outputPath = "src/main/kotlin/com/gabrielfeo/develocity/api/model/MavenExtension.kt",
+        outputContent = """
+            /**
+             * The extension application type. * `CORE` - A core extension, provided in the lib folder of the Maven installation. * `MAVEN_EXT_CLASSPATH` - A core extension provided via the -Dmaven.ext.class.path system property.   * `LIB_EXT` - A core extension, provided in the lib/ext folder of the Maven installation. * `PROJECT` - A project extension, provided via a declaration in .mvn/extensions.xml in the Maven working directory.  * `POM` - A build extension, provided via a declaration in the build section of the top level project pom.xml * `UNKNOWN` - An extension for which none of the other types match.
+             *
+             * Values: core,mavenExtClasspath,libExt,project,pom,unknown
+             */
+            @JsonClass(generateAdapter = false)
+            enum class Type(val value: kotlin.String) {
+                @Json(name = "CORE") core("CORE"),
+                @Json(name = "MAVEN_EXT_CLASSPATH") mavenExtClasspath("MAVEN_EXT_CLASSPATH"),
+                @Json(name = "LIB_EXT") libExt("LIB_EXT"),
+                @Json(name = "PROJECT") project("PROJECT"),
+                @Json(name = "POM") pom("POM"),
+                @Json(name = "UNKNOWN") unknown("UNKNOWN");
+            }
+        """.trimIndent(),
+    )
+
     private fun testPostProcessing(
         inputPath: String,
         inputContent: String,

build-logic/src/main/kotlin/com/gabrielfeo/task/PostProcessGeneratedApi.kt

@@ -57,6 +57,19 @@ abstract class PostProcessGeneratedApi @Inject constructor(
         replaceAll("hIT", "hit", dir = srcDir, includes = file)
         replaceAll("mISS", "miss", dir = srcDir, includes = file)
         replaceAll("fAILED", "failed", dir = srcDir, includes = file)
+
+        // Fix mapping of MavenExtension.Type: lIBEXT -> core
+        val mavenExtensionFile = "com/gabrielfeo/develocity/api/model/MavenExtension.kt"
+        mapOf(
+            "cORE" to "core",
+            "mAVENEXTCLASSPATH" to "mavenExtClasspath",
+            "lIBEXT" to "libExt",
+            "pROJECT" to "project",
+            "pOM" to "pom",
+            "uNKNOWN" to "unknown",
+        ).forEach { (match, replace) ->
+            replaceAll(match, replace, dir = srcDir, includes = mavenExtensionFile)
+        }
     }
 
     private fun replaceAll(

gradle.properties

@@ -1,7 +1,7 @@
 group=com.gabrielfeo
 artifact=develocity-api-kotlin
-version=2025.1.0
-develocity.version=2025.1
+version=2025.2.0
+develocity.version=2025.2
 repo.url=https://github.com/gabrielfeo/develocity-api-kotlin
 org.gradle.parallel=true
 org.gradle.jvmargs=-Xmx5g

library/api/library.api

@@ -108,6 +108,11 @@ tasks.named("compileJava", JavaCompile::class) {
     targetCompatibility = JavaVersion.VERSION_11.majorVersion
 }
 
+tasks.processIntegrationTestResources {
+    dependsOn(tasks.apiCheck)
+    from(project.layout.projectDirectory.dir("api/library.api"))
+}
+
 tasks.named("compileKotlin", KotlinCompile::class) {
     compilerOptions {
         languageVersion = KotlinVersion.KOTLIN_1_8

library/build.gradle.kts

@@ -0,0 +1,20 @@
+package com.gabrielfeo.develocity.api
+
+import ch.qos.logback.classic.spi.ILoggingEvent
+import ch.qos.logback.core.AppenderBase
+import java.util.concurrent.CopyOnWriteArrayList
+
+class InMemoryLogRecorder : AppenderBase<ILoggingEvent>() {
+
+    val logsByLoggerName: CopyOnWriteArrayList<Pair<String, String>> = CopyOnWriteArrayList()
+
+    override fun append(eventObject: ILoggingEvent) {
+        with(eventObject) {
+            logsByLoggerName.add(loggerName to formattedMessage)
+        }
+    }
+
+    fun clear() {
+        logsByLoggerName.clear()
+    }
+}

library/src/integrationTest/kotlin/com/gabrielfeo/develocity/api/InMemoryLogRecorder.kt

@@ -0,0 +1,27 @@
+package com.gabrielfeo.develocity.api
+
+import org.junit.jupiter.api.Assertions.assertTrue
+import org.junit.jupiter.api.Test
+import java.nio.file.Files
+import java.nio.file.Paths
+
+class LibraryApiNamingTest {
+
+    /**
+     * Tests against unfixed cases of the enum member naming bug in openapi-generator.
+     * See PostProcessGeneratedApi.kt.
+     */
+    @Test
+    fun `all members are lower camel case`() {
+        val libraryApi = readLibraryApi()
+        val regex = Regex("""\b[a-z][A-Z]+\b""")
+        val matches = regex.findAll(libraryApi).toList()
+        assertTrue(matches.isEmpty(), "Lower camel case naming violations: ${matches.map { it.value }}")
+    }
+
+    private fun readLibraryApi(): String {
+        val resource = this::class.java.classLoader.getResource("library.api")
+        requireNotNull(resource) { "library.api not found in test resources" }
+        return Files.readAllLines(Paths.get(resource.toURI())).joinToString("\n")
+    }
+}

library/src/integrationTest/kotlin/com/gabrielfeo/develocity/api/LibraryApiNamingTest.kt

@@ -1,51 +1,35 @@
 package com.gabrielfeo.develocity.api
 
-import ch.qos.logback.classic.Logger as LogbackLogger
 import ch.qos.logback.classic.spi.ILoggingEvent
 import ch.qos.logback.core.AppenderBase
-import ch.qos.logback.core.ConsoleAppender
 import ch.qos.logback.classic.encoder.PatternLayoutEncoder
+import ch.qos.logback.classic.LoggerContext as LogbackLoggerContext
 import com.gabrielfeo.develocity.api.internal.*
 import kotlinx.coroutines.test.runTest
 import org.junit.jupiter.api.io.TempDir
 import org.slf4j.Logger
+import org.slf4j.Logger.ROOT_LOGGER_NAME
 import org.slf4j.LoggerFactory
 import java.io.File
 import kotlin.test.*
 
 class LoggingIntegrationTest {
 
-    private class LogRecorder : AppenderBase<ILoggingEvent>() {
-        val logsByLoggerName = mutableListOf<Pair<String, String>>()
-        override fun append(eventObject: ILoggingEvent) {
-            with(eventObject) {
-                logsByLoggerName += (loggerName to formattedMessage)
-            }
-        }
-    }
-
     @TempDir
     lateinit var tempDir: File
 
-    private val recorder = LogRecorder()
+    private val recorder: InMemoryLogRecorder by lazy {
+        val lc = LoggerFactory.getILoggerFactory() as LogbackLoggerContext
+        // The appender is attached to the com.gabrielfeo.develocity.api logger
+        val logger = lc.getLogger("com.gabrielfeo.develocity")
+        logger.getAppender("IN_MEMORY") as InMemoryLogRecorder
+    }
 
     private lateinit var api: DevelocityApi
 
     @BeforeTest
     fun setup() {
-        (LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME) as LogbackLogger).apply {
-            detachAndStopAllAppenders()
-            addAppender(recorder)
-            addAppender(ConsoleAppender<ILoggingEvent>().apply {
-                context = loggerContext
-                encoder = PatternLayoutEncoder().apply {
-                    context = loggerContext
-                    pattern = "%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n"
-                    start()
-                }
-                start()
-            })
-        }
+        // Appender is configured via logback-test.xml; ensure it's started
         recorder.start()
         val mockWebServer = okhttp3.mockwebserver.MockWebServer()
         mockWebServer.enqueue(okhttp3.mockwebserver.MockResponse().setBody("[]"))
@@ -65,6 +49,10 @@ class LoggingIntegrationTest {
 
     @AfterTest
     fun tearDown() {
+        val lc = LoggerFactory.getILoggerFactory() as LogbackLoggerContext
+        val logger = lc.getLogger("com.gabrielfeo.develocity")
+        logger.detachAppender("IN_MEMORY")
+        recorder.stop()
         api.shutdown()
     }
 

library/src/integrationTest/kotlin/com/gabrielfeo/develocity/api/LoggingIntegrationTest.kt

@@ -8,7 +8,12 @@ import kotlin.test.assertTrue
 class SmokeTest {
 
     @Test
-    fun testSuiteNotSensitiveToEnvironment() {
-        assertTrue(RealEnv.asMap().isEmpty())
+    fun testSuiteEnvironmentIsEmpty() {
+        val vars = RealEnv.asMap().toMutableMap().entries.apply {
+            // Added by either Gradle or JUnit that but irrelevant to library functionality
+            removeAll { (k, _) -> k.endsWith("CF_USER_TEXT_ENCODING") }
+            removeAll { (k, _) -> k.startsWith("JAVA_MAIN_CLASS") }
+        }
+        assertTrue(vars.isEmpty(), "Expected empty environment, found $vars")
     }
-}
+}

library/src/integrationTest/kotlin/com/gabrielfeo/develocity/api/SmokeTest.kt

@@ -1,11 +1,19 @@
 <configuration>
-    <logger name="com.gabrielfeo.develocity" level="DEBUG"/>
+
+    <logger name="com.gabrielfeo.develocity" level="DEBUG">
+        <appender-ref ref="IN_MEMORY" />
+    </logger>
+
     <root level="INFO">
-        <appender-ref ref="CONSOLE"/>
+        <appender-ref ref="CONSOLE" />
     </root>
+
+    <appender name="IN_MEMORY" class="com.gabrielfeo.develocity.api.InMemoryLogRecorder" />
+
     <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>
             <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
         </encoder>
     </appender>
+
 </configuration>