From 38c67cbbfe6852920b49b0f56f40672842b4249f Mon Sep 17 00:00:00 2001 From: Justin Black Date: Mon, 21 Nov 2022 08:42:16 -0800 Subject: [PATCH] Adds refModule --- .../java/org/openapitools/codegen/CodegenModel.java | 9 ++++++++- .../org/openapitools/codegen/CodegenParameter.java | 11 ++++++++++- .../org/openapitools/codegen/CodegenProperty.java | 12 +++++++++++- .../org/openapitools/codegen/CodegenResponse.java | 12 ++++++++++-- 4 files changed, 39 insertions(+), 5 deletions(-) diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/CodegenModel.java b/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/CodegenModel.java index ed75cbe4517..5f6e9e1000d 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/CodegenModel.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/CodegenModel.java @@ -173,6 +173,7 @@ public class CodegenModel implements JsonSchema { private boolean isUuid; private Map requiredVarsMap; private String ref; + private String refModule; public String getAdditionalPropertiesType() { return additionalPropertiesType; @@ -242,6 +243,10 @@ public void setRef(String ref) { this.ref = ref; } + public String getRefModule() { return refModule; } + + public void setRefModule(String refModule) { this.refModule=refModule; } + @Override public boolean getSchemaIsFromAdditionalProperties() { return schemaIsFromAdditionalProperties; @@ -1023,6 +1028,7 @@ public boolean equals(Object o) { Objects.equals(format, that.getFormat()) && Objects.equals(uniqueItemsBoolean, that.getUniqueItemsBoolean()) && Objects.equals(ref, that.getRef()) && + Objects.equals(refModule, that.getRefModule()) && Objects.equals(requiredVarsMap, that.getRequiredVarsMap()) && Objects.equals(composedSchemas, that.composedSchemas) && Objects.equals(parent, that.parent) && @@ -1098,7 +1104,7 @@ hasChildren, isMap, isDeprecated, hasOnlyReadOnly, getExternalDocumentation(), g getAdditionalPropertiesIsAnyType(), hasDiscriminatorWithNonEmptyMapping, isAnyType, getComposedSchemas(), hasMultipleTypes, isDecimal, isUuid, requiredVarsMap, ref, uniqueItemsBoolean, schemaIsFromAdditionalProperties, isBooleanSchemaTrue, isBooleanSchemaFalse, - format, dependentRequired, contains); + format, dependentRequired, contains, refModule); } @Override @@ -1198,6 +1204,7 @@ public String toString() { sb.append(", isUUID=").append(isUuid); sb.append(", requiredVarsMap=").append(requiredVarsMap); sb.append(", ref=").append(ref); + sb.append(", refModule=").append(refModule); sb.append(", schemaIsFromAdditionalProperties=").append(schemaIsFromAdditionalProperties); sb.append(", isBooleanSchemaTrue=").append(isBooleanSchemaTrue); sb.append(", isBooleanSchemaFalse=").append(isBooleanSchemaFalse); diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/CodegenParameter.java b/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/CodegenParameter.java index 2e4be8f6fcf..578bed1ecd9 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/CodegenParameter.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/CodegenParameter.java @@ -46,6 +46,7 @@ public class CodegenParameter { private boolean hasMultipleTypes = false; private LinkedHashMap content; private String ref; + private String refModule; public CodegenParameter copy() { CodegenParameter output = new CodegenParameter(); @@ -75,6 +76,9 @@ public CodegenParameter copy() { if (this.ref != null) { output.setRef(this.ref); } + if (this.refModule != null) { + output.setRefModule(this.refModule); + } output.isDeprecated = this.isDeprecated; output.isExplode = this.isExplode; output.style = this.style; @@ -86,7 +90,7 @@ public CodegenParameter copy() { @Override public int hashCode() { - return Objects.hash(isFormParam, isQueryParam, isPathParam, isHeaderParam, isCookieParam, isBodyParam, isExplode, baseName, paramName, description, unescapedDescription, style, isDeepObject, isAllowEmptyValue, example, jsonSchema, vendorExtensions, isDeprecated, required, hasMultipleTypes, schema, content, ref); + return Objects.hash(isFormParam, isQueryParam, isPathParam, isHeaderParam, isCookieParam, isBodyParam, isExplode, baseName, paramName, description, unescapedDescription, style, isDeepObject, isAllowEmptyValue, example, jsonSchema, vendorExtensions, isDeprecated, required, hasMultipleTypes, schema, content, ref, refModule); } @Override @@ -104,6 +108,7 @@ public boolean equals(Object o) { isDeprecated == that.isDeprecated && required == that.required && Objects.equals(ref, that.getRef()) && + Objects.equals(refModule, that.getRefModule()) && Objects.equals(content, that.getContent()) && Objects.equals(schema, that.getSchema()) && Objects.equals(baseName, that.baseName) && @@ -144,6 +149,7 @@ public String toString() { sb.append(", schema=").append(schema); sb.append(", content=").append(content); sb.append(", ref=").append(ref); + sb.append(", refModule=").append(refModule); sb.append('}'); return sb.toString(); } @@ -169,5 +175,8 @@ public void setContent(LinkedHashMap content) { public void setRef(String ref) { this.ref=ref; } + public String getRefModule() { return refModule; } + + public void setRefModule(String refModule) { this.refModule=refModule; } } diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java b/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java index 6778c3a558c..9791dd2807a 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/CodegenProperty.java @@ -197,6 +197,7 @@ public class CodegenProperty implements Cloneable, JsonSchema { private boolean hasMultipleTypes = false; private Map requiredVarsMap; private String ref; + private String refModule; private boolean schemaIsFromAdditionalProperties; private boolean isBooleanSchemaTrue; private boolean isBooleanSchemaFalse; @@ -780,6 +781,9 @@ public CodegenProperty clone() { if (this.contains != null) { cp.setContains(this.contains); } + if (this.getRefModule() != null) { + cp.setRefClass(this.refModule); + } return cp; } catch (CloneNotSupportedException e) { @@ -973,6 +977,10 @@ public void setHasMultipleTypes(boolean hasMultipleTypes) { @Override public void setRequiredVarsMap(Map requiredVarsMap) { this.requiredVarsMap=requiredVarsMap; } + public String getRefModule() { return refModule; } + + public void setRefModule(String refModule) { this.refModule=refModule; } + @Override public String toString() { final StringBuilder sb = new StringBuilder("CodegenProperty{"); @@ -1075,6 +1083,7 @@ public String toString() { sb.append(", hasMultipleTypes=").append(hasMultipleTypes); sb.append(", requiredVarsMap=").append(requiredVarsMap); sb.append(", ref=").append(ref); + sb.append(", refModule=").append(refModule); sb.append(", schemaIsFromAdditionalProperties=").append(schemaIsFromAdditionalProperties); sb.append(", isBooleanSchemaTrue=").append(isBooleanSchemaTrue); sb.append(", isBooleanSchemaFalse=").append(isBooleanSchemaFalse); @@ -1147,6 +1156,7 @@ public boolean equals(Object o) { Objects.equals(format, that.getFormat()) && Objects.equals(uniqueItemsBoolean, that.getUniqueItemsBoolean()) && Objects.equals(ref, that.getRef()) && + Objects.equals(refModule, that.getRefModule()) && Objects.equals(requiredVarsMap, that.getRequiredVarsMap()) && Objects.equals(composedSchemas, that.composedSchemas) && Objects.equals(openApiType, that.openApiType) && @@ -1213,6 +1223,6 @@ public int hashCode() { xmlNamespace, isXmlWrapped, isNull, additionalPropertiesIsAnyType, hasVars, hasRequired, hasDiscriminatorWithNonEmptyMapping, composedSchemas, hasMultipleTypes, requiredVarsMap, ref, uniqueItemsBoolean, schemaIsFromAdditionalProperties, isBooleanSchemaTrue, isBooleanSchemaFalse, - format, dependentRequired, contains); + format, dependentRequired, contains, refModule); } } diff --git a/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/CodegenResponse.java b/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/CodegenResponse.java index 41e8468b04f..7ab198a967d 100644 --- a/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/CodegenResponse.java +++ b/modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/CodegenResponse.java @@ -37,6 +37,7 @@ public class CodegenResponse { private LinkedHashMap content; private String ref; public Set imports = new TreeSet<>(); + private String refModule; @Override public int hashCode() { @@ -44,7 +45,7 @@ public int hashCode() { jsonSchema, vendorExtensions, is1xx, is2xx, is3xx, is4xx, is5xx, isDefault, responseHeaders, content, - ref, imports); + ref, imports, refModule); } @Override @@ -68,7 +69,8 @@ public boolean equals(Object o) { Objects.equals(message, that.message) && Objects.equals(examples, that.examples) && Objects.equals(jsonSchema, that.jsonSchema) && - Objects.equals(vendorExtensions, that.vendorExtensions); + Objects.equals(vendorExtensions, that.vendorExtensions) && + Objects.equals(refModule, that.getRefModule()); } @@ -107,6 +109,7 @@ public String toString() { sb.append(", responseHeaders=").append(responseHeaders); sb.append(", content=").append(content); sb.append(", ref=").append(ref); + sb.append(", refModule=").append(refModule); sb.append(", imports=").append(imports); sb.append('}'); return sb.toString(); @@ -132,4 +135,9 @@ public boolean isRange() { public String getRef() { return ref; } public void setRef(String ref) { this.ref=ref; } + + public String getRefModule() { return refModule; } + + public void setRefModule(String refModule) { this.refModule=refModule; } + }