implement feedback from CR. Add tests

Author: Picazsoo

modules/openapi-generator-gradle-plugin/src/main/kotlin/org/openapitools/generator/gradle/plugin/extensions/OpenApiGeneratorGenerateExtension.kt

@@ -23,6 +23,7 @@ import org.gradle.kotlin.dsl.listProperty
 import org.gradle.kotlin.dsl.mapProperty
 import org.gradle.kotlin.dsl.property
 import org.openapitools.generator.gradle.plugin.utils.isRemoteUri
+import java.io.File
 
 /**
  * Gradle project level extension object definition for the `generate` task
@@ -448,8 +449,10 @@ open class OpenApiGeneratorGenerateExtension(private val project: Project) {
     fun setInputSpec(path: String) {
         if (path.isRemoteUri()) {
             remoteInputSpec.set(path)
+            inputSpec.set(null as File?)  // Clear local file to prevent conflicts
         } else {
             inputSpec.set(project.layout.projectDirectory.file(path))
+            remoteInputSpec.set(null as String?)  // Clear remote URL to prevent conflicts
         }
     }
 

modules/openapi-generator-gradle-plugin/src/main/kotlin/org/openapitools/generator/gradle/plugin/extensions/OpenApiGeneratorValidateExtension.kt

@@ -21,6 +21,7 @@ import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.provider.Property
 import org.gradle.kotlin.dsl.property
 import org.openapitools.generator.gradle.plugin.utils.isRemoteUri
+import java.io.File
 
 /**
  * Gradle project level extension object definition for the generators task
@@ -58,8 +59,10 @@ open class OpenApiGeneratorValidateExtension(private val project: Project) {
     fun setInputSpec(path: String) {
         if (path.isRemoteUri()) {
             remoteInputSpec.set(path)
+            inputSpec.set(null as File?)  // Clear local file to prevent conflicts
         } else {
             inputSpec.set(project.layout.projectDirectory.file(path))
+            remoteInputSpec.set(null as String?)  // Clear remote URL to prevent conflicts
         }
     }
 

modules/openapi-generator-gradle-plugin/src/main/kotlin/org/openapitools/generator/gradle/plugin/tasks/GenerateTask.kt

@@ -38,6 +38,7 @@ import org.openapitools.codegen.config.CodegenConfigurator
 import org.openapitools.codegen.config.GlobalSettings
 import org.openapitools.codegen.config.MergedSpecBuilder
 import org.openapitools.generator.gradle.plugin.utils.isRemoteUri
+import java.io.File
 import javax.inject.Inject
 
 // =========================================================================================
@@ -983,12 +984,15 @@ abstract class GenerateTask : DefaultTask() {
     /**
      * Groovy-compatible setter for inputSpec property.
      * Accepts a String and automatically routes to remote or local file based on URI detection.
+     * Clears the opposite property to prevent stale values from taking precedence.
      */
     fun setInputSpecAsString(path: String) {
         if (path.isRemoteUri()) {
             remoteInputSpec.set(path)
+            inputSpec.set(null as File?)  // Clear local file to prevent conflicts
         } else {
             inputSpec.set(layout.projectDirectory.file(path))
+            remoteInputSpec.set(null as String?)  // Clear remote URL to prevent conflicts
         }
     }
 

modules/openapi-generator-gradle-plugin/src/main/kotlin/org/openapitools/generator/gradle/plugin/tasks/ValidateTask.kt

@@ -28,6 +28,7 @@ import org.gradle.api.tasks.options.Option
 import org.openapitools.codegen.validations.oas.OpenApiEvaluator
 import org.openapitools.codegen.validations.oas.RuleConfiguration
 import org.openapitools.generator.gradle.plugin.utils.isRemoteUri
+import java.io.File
 import javax.inject.Inject
 
 /**
@@ -188,12 +189,15 @@ abstract class ValidateTask : DefaultTask() {
     /**
      * Groovy-compatible setter for inputSpec property.
      * Accepts a String and automatically routes to remote or local file based on URI detection.
+     * Clears the opposite property to prevent stale values from taking precedence.
      */
     fun setInputSpecAsString(path: String) {
         if (path.isRemoteUri()) {
             remoteInputSpec.set(path)
+            inputSpec.set(null as File?)  // Clear local file to prevent conflicts
         } else {
             inputSpec.set(layout.projectDirectory.file(path))
+            remoteInputSpec.set(null as String?)  // Clear remote URL to prevent conflicts
         }
     }
 }

modules/openapi-generator-gradle-plugin/src/test/kotlin/GroovyBridgeMethodsTest.kt

@@ -12,6 +12,8 @@ import kotlin.test.assertTrue
  * Test class for Groovy DSL bridge methods (setPropertyNameAsString pattern).
  * These tests verify that Groovy users can use both method-style and property-style
  * syntax to set file/directory properties using String paths.
+ *
+ * Also tests the fix for stale remoteInputSpec values.
  */
 class GroovyBridgeMethodsTest : TestBase() {
     override var temp: File = createTempDirectory(javaClass.simpleName).toFile()
@@ -94,6 +96,49 @@ class GroovyBridgeMethodsTest : TestBase() {
         )
     }
 
+    @Test
+    fun `setInputSpecAsString should clear stale remoteInputSpec when setting local file`() {
+        // This test verifies the P2 bug fix: setting a local file after a remote URL
+        // should clear the remote URL to prevent it from taking precedence
+        val buildContents = """
+        plugins {
+          id 'org.openapi.generator'
+        }
+        
+        tasks.register('testGenerate', org.openapitools.generator.gradle.plugin.tasks.GenerateTask) {
+            generatorName = "kotlin"
+            // First set a remote URL (simulating previous configuration)
+            setInputSpecAsString("https://example.com/api.yaml")
+            // Then override with a local file - this should clear the remote URL
+            setInputSpecAsString("spec.yaml")
+            setOutputDirAsString("build/test-kotlin")
+            apiPackage = "org.openapitools.test.api"
+            invokerPackage = "org.openapitools.test.invoker"
+            modelPackage = "org.openapitools.test.model"
+            skipValidateSpec = true
+        }
+        """.trimIndent()
+
+        withProjectFiles(buildContents)
+
+        // Act
+        val result = GradleRunner.create()
+            .withProjectDir(temp)
+            .withArguments("testGenerate")
+            .withPluginClasspath()
+            .build()
+
+        // Assert - should use local file, not remote URL
+        assertTrue(
+            result.output.contains("Successfully generated code to"),
+            "Expected successful generation using local file (not remote URL)"
+        )
+        assertEquals(
+            TaskOutcome.SUCCESS, result.task(":testGenerate")?.outcome,
+            "Expected a successful run with local file overriding remote URL"
+        )
+    }
+
     // Helper method to create project files
     private fun withProjectFiles(buildContents: String, includeConfig: Boolean = false, includeTemplates: Boolean = false) {
         File(temp, "build.gradle").writeText(buildContents)