Replace Response<T> workaround with new generator param (#508)

Author: gabrielfeo

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

@@ -19,7 +19,6 @@ class PostProcessGeneratedApiTest {
 
     /**
      * - Fixes missing model imports by replacing all with a wildcard (OpenAPITools/openapi-generator#14871)
-     * - Replaces return types of Response<X> for X, for more idiomatic usage with coroutines
      * - Adds @JvmSuppressWildcards to avoid square/retrofit#3275
      */
     @Test
@@ -30,7 +29,6 @@ class PostProcessGeneratedApiTest {
 
             import com.gabrielfeo.develocity.api.internal.infrastructure.CollectionFormats.*
             import retrofit2.http.*
-            import retrofit2.Response
             import okhttp3.RequestBody
             import com.squareup.moshi.Json
 
@@ -67,15 +65,14 @@ class PostProcessGeneratedApiTest {
                  * @return [Build]
                  */
                 @GET("api/builds/{id}")
-                suspend fun getBuild(@Path("id") id: kotlin.String, @Query("models") models: kotlin.collections.List<BuildModelName>? = null, @Query("availabilityWaitTimeoutSecs") availabilityWaitTimeoutSecs: kotlin.Int? = null): Response<Build>
+                suspend fun getBuild(@Path("id") id: kotlin.String, @Query("models") models: kotlin.collections.List<BuildModelName>? = null, @Query("availabilityWaitTimeoutSecs") availabilityWaitTimeoutSecs: kotlin.Int? = null): Build
         """.trimIndent(),
         outputPath = "src/main/kotlin/com/gabrielfeo/develocity/api/BuildsApi.kt",
         outputContent = """
             package com.gabrielfeo.develocity.api
 
             import com.gabrielfeo.develocity.api.internal.infrastructure.CollectionFormats.*
             import retrofit2.http.*
-            import retrofit2.Response
             import okhttp3.RequestBody
             import com.squareup.moshi.Json
 

build-logic/src/main/kotlin/com/gabrielfeo/develocity-api-code-generation.gradle.kts

@@ -45,6 +45,7 @@ openApiGenerate {
     additionalProperties.put("library", "jvm-retrofit2")
     additionalProperties.put("useCoroutines", true)
     additionalProperties.put("enumPropertyNaming", "camelCase")
+    additionalProperties.put("useResponseAsReturnType", false)
     cleanupOutput = true
 }
 

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

@@ -38,13 +38,6 @@ abstract class PostProcessGeneratedApi @Inject constructor(
     }
 
     private fun postProcess(srcDir: File, modelsPackage: String) {
-        // Replace Response<X> with X in every method return type of DevelocityApi.kt
-        replaceAll(
-            match = ": Response<(.*?)>$",
-            replace = """: \1""",
-            dir = srcDir,
-            includes = "com/gabrielfeo/develocity/api/*Api.kt",
-        )
         // Add @JvmSuppressWildcards to avoid square/retrofit#3275
         replaceAll(
             match = "interface",