refactored isMetadataOnlySchema to ModelUtils.java

Author: ranger-ross

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

@@ -422,7 +422,7 @@ private void gatherInlineModels(Schema schema, String modelPrefix) {
                         // For example, there may be an `description` only schema that is used to override the descrption.
                         // In these cases, we can simply discard those schemas.
                         List<Schema> nonMetadataOnlySchemas = (List<Schema>) schema.getAllOf().stream()
-                                .filter(v -> isMetadataOnlySchema((Schema) v))
+                                .filter(v -> ModelUtils.isMetadataOnlySchema((Schema) v))
                                 .collect(Collectors.toList());
 
                         if (nonMetadataOnlySchemas.size() == 1) {
@@ -485,31 +485,6 @@ private void gatherInlineModels(Schema schema, String modelPrefix) {
         }
     }
 
-    /**
-     * Returns true if a schema is only metadata and not an actual type.
-     * For example, a schema that only has a `description` without any `properties` or `$ref` defined.
-     * 
-     * @param schema the schema
-     * @return       if the schema is only metadata and not an actual type
-     */
-    boolean isMetadataOnlySchema(Schema schema) {
-        return schema.get$ref() != null ||
-                schema.getProperties() != null ||
-                schema.getType() != null ||
-                schema.getAdditionalProperties() != null ||
-                schema.getAllOf() != null ||
-                schema.getAnyOf() != null ||
-                schema.getOneOf() != null ||
-                schema.getPrefixItems() != null ||
-                schema.getItems() != null ||
-                schema.getTypes() != null ||
-                schema.getPatternProperties() != null ||
-                schema.getContains() != null ||
-                schema.get$dynamicAnchor() != null ||
-                schema.get$anchor() != null ||
-                schema.getContentSchema() != null;
-    }
-
     /**
      * Flatten inline models in content
      *

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

@@ -2312,6 +2312,32 @@ public static boolean isUnsupportedSchema(OpenAPI openAPI, Schema schema) {
         return false;
     }
 
+    /**
+     * Returns true if a schema is only metadata and not an actual type.
+     * For example, a schema that only has a `description` without any `properties` or `$ref` defined.
+     *
+     * @param schema the schema
+     * @return       if the schema is only metadata and not an actual type
+     */
+    public static boolean isMetadataOnlySchema(Schema schema) {
+        return schema.get$ref() != null ||
+                schema.getProperties() != null ||
+                schema.getType() != null ||
+                schema.getAdditionalProperties() != null ||
+                schema.getAllOf() != null ||
+                schema.getAnyOf() != null ||
+                schema.getOneOf() != null ||
+                schema.getPrefixItems() != null ||
+                schema.getItems() != null ||
+                schema.getTypes() != null ||
+                schema.getPatternProperties() != null ||
+                schema.getContains() != null ||
+                schema.get$dynamicAnchor() != null ||
+                schema.get$anchor() != null ||
+                schema.getContentSchema() != null;
+    }
+
+
     @FunctionalInterface
     private interface OpenAPISchemaVisitor {