v2 schemas in modules

modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/CodegenConfig.java

@@ -31,14 +31,13 @@
 import org.openapitools.codegen.api.TemplatingEngineAdapter;
 import org.openapitools.codegen.meta.FeatureSet;
 import org.openapitools.codegen.meta.GeneratorMetadata;
-import org.openapitools.codegen.model.ModelMap;
-import org.openapitools.codegen.model.ModelsMap;
 import org.openapitools.codegen.model.OperationsMap;
 
 import java.io.File;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.TreeMap;
 
 public interface CodegenConfig {
     String getFilesMetadataFilename();
@@ -85,19 +84,19 @@ public interface CodegenConfig {
 
     String requestBodyDocFileFolder();
 
-    String headerFileFolder();
+    String headerFileFolder(String componentName);
 
     String headerDocFileFolder();
 
-    String parameterFileFolder();
+    String parameterFileFolder(String componentName);
 
     String parameterDocFileFolder();
 
     String modelPackage();
 
     String packageName();
 
-    String requestBodyFileFolder();
+    String requestBodyFileFolder(String componentName);
 
     String responseFileFolder(String componentName);
 
@@ -191,14 +190,6 @@ public interface CodegenConfig {
 
     Set<String> pathEndpointDocTemplateFiles();
 
-    Map<String, String> pathEndpointRequestBodyTemplateFiles();
-
-    Set<String> pathEndpointParameterTemplateFiles();
-
-    Map<String, String> pathEndpointResponseTemplateFiles();
-
-    Set<String> pathEndpointResponseHeaderTemplateFiles();
-
     Map<String, String> responseTemplateFiles();
 
     Map<String, String> responseDocTemplateFiles();
@@ -263,23 +254,31 @@ public interface CodegenConfig {
 
     void addOperationToGroup(String tag, String resourcePath, Operation operation, CodegenOperation co, Map<String, List<CodegenOperation>> operations);
 
-    Map<String, ModelsMap> updateAllModels(Map<String, ModelsMap> objs);
+    TreeMap<String, CodegenSchema> updateAllModels(TreeMap<String, CodegenSchema> objs);
 
     void postProcess();
 
-    Map<String, ModelsMap> postProcessAllModels(Map<String, ModelsMap> objs);
+    TreeMap<String, CodegenSchema> postProcessAllModels(TreeMap<String, CodegenSchema> schemas);
 
-    ModelsMap postProcessModels(ModelsMap objs);
+    TreeMap<String, CodegenSchema> postProcessModels(TreeMap<String, CodegenSchema> schemas);
 
-    OperationsMap postProcessOperationsWithModels(OperationsMap objs, List<ModelMap> allModels);
+    OperationsMap postProcessOperationsWithModels(OperationsMap objs, TreeMap<String, CodegenSchema> schemas);
 
     Map<String, Object> postProcessSupportingFileData(Map<String, Object> objs);
 
     void postProcessModelProperty(CodegenSchema model, CodegenSchema property);
 
     void postProcessParameter(CodegenParameter parameter);
 
-    String modelFilename(String templateName, String modelName);
+    String schemaFilename(String templateName, String jsonPath);
+
+    String headerFilename(String templateName, String jsonPath);
+
+    String parameterFilename(String templateName, String jsonPath);
+
+    String requestBodyFilename(String templateName, String jsonPath);
+
+    String responseFilename(String templateName, String jsonPath);
 
     String apiFilename(String templateName, String tag);
 

modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/CodegenHeader.java

@@ -17,6 +17,8 @@
 
 package org.openapitools.codegen;
 
+import org.openapitools.codegen.utils.ModelUtils;
+
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
@@ -92,6 +94,32 @@ public CodegenHeader copy() {
         return output;
     }
 
+    public CodegenSchema getSetSchema() {
+        if (schema != null) {
+            return schema;
+        }
+        if (content != null) {
+            for (CodegenMediaType codegenMediaType: content.values()) {
+                return codegenMediaType.getSchema();
+            }
+        }
+        return null;
+    }
+
+    public String getSetSchemaJsonPath(String jsonPath) {
+        if (schema != null) {
+            return jsonPath + "/schema";
+        }
+        if (content != null) {
+            for (Map.Entry<String, CodegenMediaType> entry: content.entrySet()) {
+                if (entry.getValue().getSchema() != null) {
+                    String contentType = entry.getKey();
+                    return jsonPath + "/content/" + ModelUtils.encodeSlashes(contentType) + "/schema";
+                }
+            }
+        }
+        return null;
+    }
     public String getComponentModule() {
         return componentModule;
     }