Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings
This repository was archived by the owner on Dec 25, 2024. It is now read-only.

Commit 3c2611d

Browse files
Adds refModule (#88)
1 parent f3279ea commit 3c2611d

File tree

4 files changed

+39
-5
lines changed

4 files changed

+39
-5
lines changed

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@ public class CodegenModel implements JsonSchema {
173173
private boolean isUuid;
174174
private Map<String, CodegenProperty> requiredVarsMap;
175175
private String ref;
176+
private String refModule;
176177

177178
public String getAdditionalPropertiesType() {
178179
return additionalPropertiesType;
@@ -242,6 +243,10 @@ public void setRef(String ref) {
242243
this.ref = ref;
243244
}
244245

246+
public String getRefModule() { return refModule; }
247+
248+
public void setRefModule(String refModule) { this.refModule=refModule; }
249+
245250
@Override
246251
public boolean getSchemaIsFromAdditionalProperties() {
247252
return schemaIsFromAdditionalProperties;
@@ -1023,6 +1028,7 @@ public boolean equals(Object o) {
10231028
Objects.equals(format, that.getFormat()) &&
10241029
Objects.equals(uniqueItemsBoolean, that.getUniqueItemsBoolean()) &&
10251030
Objects.equals(ref, that.getRef()) &&
1031+
Objects.equals(refModule, that.getRefModule()) &&
10261032
Objects.equals(requiredVarsMap, that.getRequiredVarsMap()) &&
10271033
Objects.equals(composedSchemas, that.composedSchemas) &&
10281034
Objects.equals(parent, that.parent) &&
@@ -1098,7 +1104,7 @@ hasChildren, isMap, isDeprecated, hasOnlyReadOnly, getExternalDocumentation(), g
10981104
getAdditionalPropertiesIsAnyType(), hasDiscriminatorWithNonEmptyMapping,
10991105
isAnyType, getComposedSchemas(), hasMultipleTypes, isDecimal, isUuid, requiredVarsMap, ref,
11001106
uniqueItemsBoolean, schemaIsFromAdditionalProperties, isBooleanSchemaTrue, isBooleanSchemaFalse,
1101-
format, dependentRequired, contains);
1107+
format, dependentRequired, contains, refModule);
11021108
}
11031109

11041110
@Override
@@ -1198,6 +1204,7 @@ public String toString() {
11981204
sb.append(", isUUID=").append(isUuid);
11991205
sb.append(", requiredVarsMap=").append(requiredVarsMap);
12001206
sb.append(", ref=").append(ref);
1207+
sb.append(", refModule=").append(refModule);
12011208
sb.append(", schemaIsFromAdditionalProperties=").append(schemaIsFromAdditionalProperties);
12021209
sb.append(", isBooleanSchemaTrue=").append(isBooleanSchemaTrue);
12031210
sb.append(", isBooleanSchemaFalse=").append(isBooleanSchemaFalse);

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ public class CodegenParameter {
4646
private boolean hasMultipleTypes = false;
4747
private LinkedHashMap<String, CodegenMediaType> content;
4848
private String ref;
49+
private String refModule;
4950

5051
public CodegenParameter copy() {
5152
CodegenParameter output = new CodegenParameter();
@@ -75,6 +76,9 @@ public CodegenParameter copy() {
7576
if (this.ref != null) {
7677
output.setRef(this.ref);
7778
}
79+
if (this.refModule != null) {
80+
output.setRefModule(this.refModule);
81+
}
7882
output.isDeprecated = this.isDeprecated;
7983
output.isExplode = this.isExplode;
8084
output.style = this.style;
@@ -86,7 +90,7 @@ public CodegenParameter copy() {
8690

8791
@Override
8892
public int hashCode() {
89-
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);
93+
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);
9094
}
9195

9296
@Override
@@ -104,6 +108,7 @@ public boolean equals(Object o) {
104108
isDeprecated == that.isDeprecated &&
105109
required == that.required &&
106110
Objects.equals(ref, that.getRef()) &&
111+
Objects.equals(refModule, that.getRefModule()) &&
107112
Objects.equals(content, that.getContent()) &&
108113
Objects.equals(schema, that.getSchema()) &&
109114
Objects.equals(baseName, that.baseName) &&
@@ -144,6 +149,7 @@ public String toString() {
144149
sb.append(", schema=").append(schema);
145150
sb.append(", content=").append(content);
146151
sb.append(", ref=").append(ref);
152+
sb.append(", refModule=").append(refModule);
147153
sb.append('}');
148154
return sb.toString();
149155
}
@@ -169,5 +175,8 @@ public void setContent(LinkedHashMap<String, CodegenMediaType> content) {
169175

170176
public void setRef(String ref) { this.ref=ref; }
171177

178+
public String getRefModule() { return refModule; }
179+
180+
public void setRefModule(String refModule) { this.refModule=refModule; }
172181
}
173182

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ public class CodegenProperty implements Cloneable, JsonSchema {
197197
private boolean hasMultipleTypes = false;
198198
private Map<String, CodegenProperty> requiredVarsMap;
199199
private String ref;
200+
private String refModule;
200201
private boolean schemaIsFromAdditionalProperties;
201202
private boolean isBooleanSchemaTrue;
202203
private boolean isBooleanSchemaFalse;
@@ -780,6 +781,9 @@ public CodegenProperty clone() {
780781
if (this.contains != null) {
781782
cp.setContains(this.contains);
782783
}
784+
if (this.getRefModule() != null) {
785+
cp.setRefClass(this.refModule);
786+
}
783787

784788
return cp;
785789
} catch (CloneNotSupportedException e) {
@@ -973,6 +977,10 @@ public void setHasMultipleTypes(boolean hasMultipleTypes) {
973977
@Override
974978
public void setRequiredVarsMap(Map<String, CodegenProperty> requiredVarsMap) { this.requiredVarsMap=requiredVarsMap; }
975979

980+
public String getRefModule() { return refModule; }
981+
982+
public void setRefModule(String refModule) { this.refModule=refModule; }
983+
976984
@Override
977985
public String toString() {
978986
final StringBuilder sb = new StringBuilder("CodegenProperty{");
@@ -1075,6 +1083,7 @@ public String toString() {
10751083
sb.append(", hasMultipleTypes=").append(hasMultipleTypes);
10761084
sb.append(", requiredVarsMap=").append(requiredVarsMap);
10771085
sb.append(", ref=").append(ref);
1086+
sb.append(", refModule=").append(refModule);
10781087
sb.append(", schemaIsFromAdditionalProperties=").append(schemaIsFromAdditionalProperties);
10791088
sb.append(", isBooleanSchemaTrue=").append(isBooleanSchemaTrue);
10801089
sb.append(", isBooleanSchemaFalse=").append(isBooleanSchemaFalse);
@@ -1147,6 +1156,7 @@ public boolean equals(Object o) {
11471156
Objects.equals(format, that.getFormat()) &&
11481157
Objects.equals(uniqueItemsBoolean, that.getUniqueItemsBoolean()) &&
11491158
Objects.equals(ref, that.getRef()) &&
1159+
Objects.equals(refModule, that.getRefModule()) &&
11501160
Objects.equals(requiredVarsMap, that.getRequiredVarsMap()) &&
11511161
Objects.equals(composedSchemas, that.composedSchemas) &&
11521162
Objects.equals(openApiType, that.openApiType) &&
@@ -1213,6 +1223,6 @@ public int hashCode() {
12131223
xmlNamespace, isXmlWrapped, isNull, additionalPropertiesIsAnyType, hasVars, hasRequired,
12141224
hasDiscriminatorWithNonEmptyMapping, composedSchemas, hasMultipleTypes, requiredVarsMap,
12151225
ref, uniqueItemsBoolean, schemaIsFromAdditionalProperties, isBooleanSchemaTrue, isBooleanSchemaFalse,
1216-
format, dependentRequired, contains);
1226+
format, dependentRequired, contains, refModule);
12171227
}
12181228
}

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,15 @@ public class CodegenResponse {
3737
private LinkedHashMap<String, CodegenMediaType> content;
3838
private String ref;
3939
public Set<String> imports = new TreeSet<>();
40+
private String refModule;
4041

4142
@Override
4243
public int hashCode() {
4344
return Objects.hash(headers, code, message, examples, hasHeaders,
4445
jsonSchema, vendorExtensions,
4546
is1xx, is2xx, is3xx, is4xx, is5xx, isDefault,
4647
responseHeaders, content,
47-
ref, imports);
48+
ref, imports, refModule);
4849
}
4950

5051
@Override
@@ -68,7 +69,8 @@ public boolean equals(Object o) {
6869
Objects.equals(message, that.message) &&
6970
Objects.equals(examples, that.examples) &&
7071
Objects.equals(jsonSchema, that.jsonSchema) &&
71-
Objects.equals(vendorExtensions, that.vendorExtensions);
72+
Objects.equals(vendorExtensions, that.vendorExtensions) &&
73+
Objects.equals(refModule, that.getRefModule());
7274

7375
}
7476

@@ -107,6 +109,7 @@ public String toString() {
107109
sb.append(", responseHeaders=").append(responseHeaders);
108110
sb.append(", content=").append(content);
109111
sb.append(", ref=").append(ref);
112+
sb.append(", refModule=").append(refModule);
110113
sb.append(", imports=").append(imports);
111114
sb.append('}');
112115
return sb.toString();
@@ -132,4 +135,9 @@ public boolean isRange() {
132135
public String getRef() { return ref; }
133136

134137
public void setRef(String ref) { this.ref=ref; }
138+
139+
public String getRefModule() { return refModule; }
140+
141+
public void setRefModule(String refModule) { this.refModule=refModule; }
142+
135143
}

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /