v2 changes Java CodegenX.ref type from String to CodegenX (#117)

* petstore regen

* Sets response ref to CodegenResponse instance

* Endpoint test fix, petstore regen

* Updates codegenHeader

* codegenRequestBody ref update in java

* Fixes endpoint + endpoint docs fro request body, example still broken

* Fixes request body examples

* Fixes requiredVars

* Adds response_for_200 info back into endpoint docs

* Adds response_for_200 back into response header anchor links

* Fixes header component links in scomponent response

* Updates codegenParameter

* Templates updated to get ref parameters working

* Uses setLocationInfo in fromSchema

* Uses a constant and already calculated adProp for required props, reduces fromSchema calls

* Uses codegenSchemaCache.computeIfAbsent in fromSchema

* Removes unaliasing from fromSchema

* Petstore regen

* Adds JsonIgnore to fix debugging

* Sample regen

* Samples regenerated

* Points refs to component schemas, fixes java test

* Fixes java test

* Fixes testAlias

* Fixes 2 java tests

* Fixes testUnalias

* Fixes testNullableProperty

* Fixes testDeprecatedRef

* Fixes testRequestBodyContent

* Fixes testAdditionalPropertiesPresentInResponses

* Fixes testAdditionalPropertiesPresentInParameters

* Fixes testIsXPresence

* Fixes testResponseContentAndHeader

* Fixes DefaultGeneratorTests

* Fixes AbstractJavaCodegenExampleValuesTest

* Samples updated

Author: spacether

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

@@ -93,6 +93,9 @@ public String toString() {
         return sb.toString();
     }
 
+    @Override
+    public CodegenHeader getRef() { return (CodegenHeader) ref; }
+
     public CodegenSchema getSchema() {
         return schema;
     }

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

@@ -18,9 +18,9 @@
 package org.openapitools.codegen;
 
 import io.swagger.v3.oas.models.ExternalDocumentation;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 
 import java.util.*;
-import java.util.stream.Collectors;
 
 public class CodegenOperation {
     public boolean hasAuthMethods, hasConsumes, hasProduces, hasParams,
@@ -169,12 +169,19 @@ public boolean getAllResponsesAreErrors() {
      * returns a map where the key is the request body content type and the value is the current CodegenOperation
      * this is needed by templates when a different signature is needed for each request body content type
      */
+    @JsonIgnore
     public Map<String, CodegenOperation> getContentTypeToOperation() {
         LinkedHashMap<String, CodegenOperation> contentTypeToOperation = new LinkedHashMap<>();
         if (requestBody == null) {
             return null;
         }
-        LinkedHashMap<String, CodegenMediaType> content = requestBody.getContent();
+        LinkedHashMap<String, CodegenMediaType> content;
+        CodegenRequestBody ref = (CodegenRequestBody) requestBody.getRef();
+        if (ref != null) {
+            content = ref.getContent();
+        } else {
+            content = requestBody.getContent();
+        }
         for (String contentType: content.keySet()) {
             contentTypeToOperation.put(contentType, this);
         }

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

@@ -30,6 +30,8 @@ public class CodegenParameter extends CodegenHeader {
     // stores the openapi name property
     public String baseName;
 
+    public CodegenParameter getRef() { return (CodegenParameter) ref; }
+
     @Override
     public int hashCode() {
         return Objects.hash(refClass, name, isFormParam, isQueryParam, isPathParam, isHeaderParam, isCookieParam, isBodyParam, isExplode, baseName, description, unescapedDescription, style, isDeepObject, isAllowEmptyValue, example, jsonSchema, vendorExtensions, isDeprecated, required, schema, content, ref, refModule, imports, componentModule);

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

@@ -26,7 +26,7 @@ public class CodegenRequestBody implements OpenApiComponent {
      */
     protected boolean required;
     protected LinkedHashMap<String, CodegenMediaType> content;
-    protected String ref;
+    protected Object ref;
     protected String refModule;
     protected Set<String> imports = new HashSet<String>();
     protected String componentModule;
@@ -109,9 +109,9 @@ public void setContent(LinkedHashMap<String, CodegenMediaType> content) {
 
     public void setName(CodegenKey name) { this.name=name; }
 
-    public String getRef() { return ref; }
+    public CodegenRequestBody getRef() { return (CodegenRequestBody) ref; }
 
-    public void setRef(String ref) { this.ref=ref; }
+    public void setRef(Object ref) { this.ref = ref; }
 
     public String getRefModule() { return refModule; }
 

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

@@ -27,7 +27,7 @@ public class CodegenResponse implements OpenApiComponent {
     public String jsonSchema;
     public Map<String, Object> vendorExtensions = new HashMap<String, Object>();
     private LinkedHashMap<String, CodegenMediaType> content;
-    private String ref;
+    private CodegenResponse ref;
     public Set<String> imports = new TreeSet<>();
     private String refModule;
     private String refClass;
@@ -103,9 +103,9 @@ public String toString() {
         return sb.toString();
     }
 
-    public String getRef() { return ref; }
+    public CodegenResponse getRef() { return ref; }
 
-    public void setRef(String ref) { this.ref=ref; }
+    public void setRef(Object ref) { this.ref = (CodegenResponse) ref; }
 
     public String getRefModule() { return refModule; }
 

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

@@ -18,9 +18,11 @@
 package org.openapitools.codegen;
 
 import io.swagger.v3.oas.models.ExternalDocumentation;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 import java.util.*;
 
+@JsonIgnoreProperties({"ref"})
 public class CodegenSchema implements OpenApiSchema, OpenApiComponent {
     // testCases are for autogenerated tests of schemas
     public HashMap<String, SchemaTestCase> testCases = new HashMap<>();
@@ -155,7 +157,7 @@ public class CodegenSchema implements OpenApiSchema, OpenApiComponent {
     private LinkedHashMap<CodegenKey, CodegenSchema> requiredProperties;
     private LinkedHashMap<CodegenKey, CodegenSchema> properties;
     private LinkedHashMap<CodegenKey, CodegenSchema> optionalProperties;
-    private String ref;
+    private CodegenSchema ref;
     private String refModule;
     private boolean schemaIsFromAdditionalProperties;
     private boolean isBooleanSchemaTrue;
@@ -584,12 +586,12 @@ public CodegenSchema getNot() {
     }
 
     @Override
-    public void setRef(String ref) {
-        this.ref = ref;
+    public void setRef(Object ref) {
+        this.ref = (CodegenSchema) ref;
     }
 
     @Override
-    public String getRef() {
+    public CodegenSchema getRef() {
         return ref;
     }
 
@@ -942,7 +944,7 @@ public int hashCode() {
                 maxItems, minItems, isXmlAttribute, xmlPrefix, xmlName,
                 xmlNamespace, isXmlWrapped, isNull,
                 hasDiscriminatorWithNonEmptyMapping, hasMultipleTypes,
-                ref, schemaIsFromAdditionalProperties, isBooleanSchemaTrue, isBooleanSchemaFalse,
+                schemaIsFromAdditionalProperties, isBooleanSchemaTrue, isBooleanSchemaFalse,
                 format, dependentRequired, contains, refModule, allOf, anyOf, oneOf, not,
                 properties, optionalProperties, requiredProperties, externalDocumentation,
                 discriminator, imports, componentModule, testCases);