[spring] Resolve regression on RequestParam for non-objects

Author: jimschubert

modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java

@@ -2303,8 +2303,8 @@ public CodegenProperty fromProperty(String name, Schema p) {
             //    property.baseType = getSimpleRef(p.get$ref());
             //}
             // --END of revision
-            property.isModel = ModelUtils.isModel(p);
             setNonArrayMapProperty(property, type);
+            property.isModel = ModelUtils.isObjectSchema(p) && ModelUtils.isModel(p);
         }
 
         LOGGER.debug("debugging from property return: " + property);

modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java

@@ -167,13 +167,75 @@ public void doNotGenerateRequestParamForObjectQueryParam() throws IOException {
         checkFileNotContains(generator, outputPath + "/src/main/java/org/openapitools/api/PonyApi.java",  "@RequestParam");
     }
 
+    @Test
+    public void shouldGenerateRequestParamForRefParams_3248_Regression() throws IOException {
+        File output = Files.createTempDirectory("test").toFile().getCanonicalFile();
+        output.deleteOnExit();
+        String outputPath = output.getAbsolutePath().replace('\\', '/');
+
+        OpenAPI openAPI = new OpenAPIParser()
+                .readLocation("src/test/resources/3_0/3248-regression.yaml", null, new ParseOptions()).getOpenAPI();
+
+        SpringCodegen codegen = new SpringCodegen();
+        codegen.setOutputDir(output.getAbsolutePath());
+        codegen.additionalProperties().put(CXFServerFeatures.LOAD_TEST_DATA_FROM_FILE, "true");
+
+        ClientOptInput input = new ClientOptInput();
+        input.setOpenAPI(openAPI);
+        input.setConfig(codegen);
+
+        MockDefaultGenerator generator = new MockDefaultGenerator();
+        generator.opts(input).generate();
+
+        checkFileContains(generator, outputPath + "/src/main/java/org/openapitools/api/ExampleApi.java",
+                "@RequestParam(value = \"format\"",
+                "@RequestParam(value = \"query\"");
+    }
+
+    @Test
+    public void shouldGenerateRequestParamForRefParams_3248_RegressionDates() throws IOException {
+        File output = Files.createTempDirectory("test").toFile().getCanonicalFile();
+        output.deleteOnExit();
+        String outputPath = output.getAbsolutePath().replace('\\', '/');
+
+        OpenAPI openAPI = new OpenAPIParser()
+                .readLocation("src/test/resources/3_0/3248-regression-dates.yaml", null, new ParseOptions()).getOpenAPI();
+
+        SpringCodegen codegen = new SpringCodegen();
+        codegen.setOutputDir(output.getAbsolutePath());
+        codegen.additionalProperties().put(CXFServerFeatures.LOAD_TEST_DATA_FROM_FILE, "true");
+
+        ClientOptInput input = new ClientOptInput();
+        input.setOpenAPI(openAPI);
+        input.setConfig(codegen);
+
+        MockDefaultGenerator generator = new MockDefaultGenerator();
+        generator.opts(input).generate();
+
+        checkFileContains(generator, outputPath + "/src/main/java/org/openapitools/api/ExampleApi.java",
+                "@RequestParam(value = \"start\"");
+    }
+
     private void checkFileNotContains(MockDefaultGenerator generator, String path, String... lines) {
         String file = generator.getFiles().get(path);
         assertNotNull(file);
         for (String line : lines)
             assertFalse(file.contains(line));
     }
 
+    private void checkFileContains(MockDefaultGenerator generator, String path, String... lines) {
+        String file = generator.getFiles().get(path);
+        assertNotNull(file);
+        int expectedCount = lines.length;
+        int actualCount = 0;
+        for (String line : lines) {
+            if (file.contains(line)) {
+                actualCount++;
+            }
+        }
+        assertEquals(actualCount, expectedCount, "File is missing " + (expectedCount - actualCount) + " expected lines.");
+    }
+
     @Test
     public void clientOptsUnicity() {
         SpringCodegen codegen = new SpringCodegen();

modules/openapi-generator/src/test/resources/3_0/3248-regression-dates.yaml

@@ -0,0 +1,27 @@
+openapi: 3.0.2
+info:
+  title: info
+  description: info
+  version: 0.1.0
+
+paths:
+  /example/api:
+    get:
+      summary: summary
+      description: description
+      parameters:
+        - name: start
+          in: query
+          schema:
+            type: string
+            format: date-time
+          required: true
+          description: The start time.
+      responses:
+        200:
+          description: response
+          content:
+            application/json:
+              schema:
+                type: string
+

modules/openapi-generator/src/test/resources/3_0/3248-regression.yaml

@@ -0,0 +1,47 @@
+openapi: 3.0.2
+info:
+  title: info
+  description: info
+  version: 0.1.0
+
+paths:
+  /example/api:
+    get:
+      summary: summary
+      description: description
+      parameters:
+        - $ref: '#/components/parameters/requiredQueryParam'
+        - $ref: '#/components/parameters/formatParam'
+      responses:
+        200:
+          description: response
+          content:
+            application/json:
+              schema:
+                type: string
+
+components:
+  parameters:
+    requiredQueryParam:
+      description: set query
+      in: query
+      name: query
+      required: true
+      schema:
+        type: string
+    formatParam:
+      description: set format
+      in: query
+      name: format
+      required: false
+      schema:
+        $ref: '#/components/schemas/format'
+
+  schemas:
+    format:
+      default: json
+      description: response format
+      enum:
+        - json
+        - csv
+      type: string