v2 CodegenModel cleanup

docs/debugging.md

@@ -216,7 +216,7 @@ openapi-generator generate -g go ...
 
 ...
 ...
-[main] DEBUG o.o.codegen.DefaultCodegen - debugging fromProperty for files : class Schema {
+[main] DEBUG o.o.codegen.DefaultCodegen - debugging fromSchema for files : class Schema {
     type: null
     format: null
     $ref: #/components/schemas/File

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

@@ -123,8 +123,6 @@ public interface CodegenConfig {
 
     String escapeQuotationMark(String input);
 
-    String getTypeDeclaration(Schema schema);
-
     void processOpts();
 
     List<CliOption> cliOptions();
@@ -145,7 +143,7 @@ public interface CodegenConfig {
 
     void setOutputDir(String dir);
 
-    CodegenModel fromModel(String name, Schema schema);
+    CodegenSchema fromSchema(Schema schema, String sourceJsonPath);
 
     CodegenOperation fromOperation(String resourcePath, String httpMethod, Operation operation, List<Server> servers);
 
@@ -277,7 +275,7 @@ public interface CodegenConfig {
 
     Map<String, Object> postProcessSupportingFileData(Map<String, Object> objs);
 
-    void postProcessModelProperty(CodegenModel model, CodegenProperty property);
+    void postProcessModelProperty(CodegenSchema model, CodegenSchema property);
 
     void postProcessParameter(CodegenParameter parameter);
 

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

@@ -39,7 +39,7 @@ public class CodegenHeader implements OpenapiComponent {
     public String jsonSchema;
     public Map<String, Object> vendorExtensions = new HashMap<String, Object>();
     public boolean isDeprecated;
-    protected CodegenProperty schema;
+    protected CodegenSchema schema;
     /**
      * Determines whether this parameter is mandatory. If the parameter is in "path",
      * this property is required and its value MUST be true. Otherwise, the property
@@ -156,11 +156,11 @@ public String toString() {
         return sb.toString();
     }
 
-    public CodegenProperty getSchema() {
+    public CodegenSchema getSchema() {
         return schema;
     }
 
-    public void setSchema(CodegenProperty schema) {
+    public void setSchema(CodegenSchema schema) {
         this.schema = schema;
     }
 

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

@@ -5,19 +5,19 @@
 import java.util.Objects;
 
 public class CodegenMediaType {
-    private CodegenProperty schema;
+    private CodegenSchema schema;
     private LinkedHashMap<String, CodegenEncoding> encoding;
     private HashMap<String, SchemaTestCase> testCases = new HashMap<>();
 
-    public CodegenMediaType(CodegenProperty schema, LinkedHashMap<String, CodegenEncoding> encoding, HashMap<String, SchemaTestCase> testCases) {
+    public CodegenMediaType(CodegenSchema schema, LinkedHashMap<String, CodegenEncoding> encoding, HashMap<String, SchemaTestCase> testCases) {
         this.schema = schema;
         this.encoding = encoding;
         if (testCases != null) {
             this.testCases = testCases;
         }
     }
 
-    public CodegenProperty getSchema() {
+    public CodegenSchema getSchema() {
         return schema;
     }