update tests

Author: wing328

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

@@ -353,16 +353,20 @@ private void gatherInlineModels(Schema schema, String modelPrefix) {
                     }
                 }
             }
-        } else if (schema.getProperties() != null) {
-            // If non-object type is specified but also properties
-            LOGGER.warn("Illegal schema found with non-object type ({}) combined with properties. Properties automatically removed.", schema.getType());
-            schema.setProperties(null);
-            return;
-        } else if (schema.getAdditionalProperties() != null) {
-            // If non-object type is specified but also additionalProperties
-            LOGGER.error("Illegal schema found with non-object type ({}) combined with additionalProperties. AdditionalProperties automatically removed.", schema.getType());
-            schema.setAdditionalProperties(null);
-            return;
+        } else {
+            if (schema.getProperties() != null) {
+                // If non-object type is specified but also properties
+                LOGGER.warn("Illegal schema found with non-object type ({}) combined with properties. Properties automatically removed.", schema.getType());
+                schema.setProperties(null);
+                return;
+            }
+
+            if (schema.getAdditionalProperties() != null) {
+                // If non-object type is specified but also additionalProperties
+                LOGGER.error("Illegal schema found with non-object type ({}) combined with additionalProperties. AdditionalProperties automatically removed.", schema.getType());
+                schema.setAdditionalProperties(null);
+                return;
+            }
         }
 
         // Check array items

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

@@ -2272,8 +2272,12 @@ public void testResponseWithArray_issue12524() throws Exception {
             additionalProperties.put(RETURN_SUCCESS_CODE, "true");
             Map<String, File> files = generateFromContract("src/test/resources/bugs/issue_12524.json", SPRING_BOOT, additionalProperties);
 
-            JavaFileAssert.assertThat(files.get("API01ListOfStuff.java"))
-                    .hasImports("com.fasterxml.jackson.annotation.JsonTypeName");
+            // class extending array is no longer generated as it's automatically fixed by inline resolver
+            // by removing the properties for array type
+            //JavaFileAssert.assertThat(files.get("API01ListOfStuff.java"))
+            //        .hasImports("com.fasterxml.jackson.annotation.JsonTypeName");
+            File notExisting = files.get("API01ListOfStuff.java");
+            assertThat(notExisting).isNull();
         } finally {
             GlobalSettings.reset();
         }