Merge pull request #485 from swagger-api/pr_453_regresion_fix

validate ref schema as objects.

Author: HugoMario

src/main/java/io/swagger/codegen/v3/generators/DefaultCodegenConfig.java

@@ -4133,16 +4133,23 @@ else if (Parameter.StyleEnum.SPACEDELIMITED.equals(parameter.getStyle())) {
         }
     }
 
-    private boolean isObjectSchema (Schema schema) {
+    public boolean isObjectSchema (Schema schema) {
         if (schema instanceof ObjectSchema ||schema instanceof ComposedSchema) {
             return true;
         }
-        if (SchemaTypeUtil.OBJECT_TYPE.equals(schema.getType()) && !(schema instanceof MapSchema)) {
+        if (SchemaTypeUtil.OBJECT_TYPE.equalsIgnoreCase(schema.getType()) && !(schema instanceof MapSchema)) {
             return true;
         }
         if (schema.getType() == null && schema.getProperties() != null && !schema.getProperties().isEmpty()) {
             return true;
         }
+        if (StringUtils.isNotBlank(schema.get$ref())) {
+            Schema refSchema = OpenAPIUtil.getSchemaFromRefSchema(schema, openAPI);
+            if (refSchema != null) {
+                return isObjectSchema(refSchema);
+            }
+        }
+
         return false;
     }
 

src/main/java/io/swagger/codegen/v3/generators/SchemaHandler.java

@@ -184,8 +184,7 @@ private void configureModel(CodegenModel codegenModel, String name) {
 
     private boolean hasNonObjectSchema(List<Schema> schemas) {
         for  (Schema schema : schemas) {
-            boolean hasNonObjectSchema = (!(schema instanceof ObjectSchema)) ||  (schema.getProperties() != null && !schema.getProperties().isEmpty());
-            if (hasNonObjectSchema) {
+            if (!codegenConfig.isObjectSchema(schema)) {
                 return true;
             }
         }

src/main/java/io/swagger/codegen/v3/generators/util/OpenAPIUtil.java

@@ -4,6 +4,7 @@
 import io.swagger.codegen.v3.CodegenProperty;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.media.Schema;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.Map;
 
@@ -34,4 +35,23 @@ public static String getSimpleRef(String ref) {
         }
         return ref;
     }
+
+    public static Schema getSchemaFromName(String name, OpenAPI openAPI) {
+        if (openAPI.getComponents() == null) {
+            return null;
+        }
+        final Map<String, Schema> mapSchema = openAPI.getComponents().getSchemas();
+        if (mapSchema == null || mapSchema.isEmpty()) {
+            return null;
+        }
+        return mapSchema.get(name);
+    }
+
+    public static Schema getSchemaFromRefSchema(Schema refSchema, OpenAPI openAPI) {
+        if (StringUtils.isBlank(refSchema.get$ref())) {
+            return null;
+        }
+        final String name = getSimpleRef(refSchema.get$ref());
+        return getSchemaFromName(name, openAPI);
+    }
 }