Skip to content

Commit 50d778f

Browse files
HugoMarioHugoMario
authored
Merge pull request #8630 from swagger-api/codegen_pojos_changes
added methods to match mustache templates.
2 parents a75a526 + 1c6ed43 commit 50d778f

File tree

7 files changed

+303
-39
lines changed

7 files changed

+303
-39
lines changed

‎modules/swagger-codegen/src/main/java/io/swagger/codegen/v3/CodegenModel.java‎

Lines changed: 29 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import java.util.Set;
1212
import java.util.TreeSet;
1313

14-
public class CodegenModel implements VendorExtendable {
14+
public class CodegenModel extends CodegenObject {
1515

1616
public String parent, parentSchema;
1717
public List<String> interfaces;
@@ -44,8 +44,6 @@ public class CodegenModel implements VendorExtendable {
4444
public boolean emptyVars;
4545
public ExternalDocumentation externalDocumentation;
4646

47-
public Map<String, Object> vendorExtensions = new HashMap<>();
48-
4947
//The type of the value from additional properties. Used in map like objects.
5048
public String additionalPropertiesType;
5149

@@ -56,6 +54,34 @@ public class CodegenModel implements VendorExtendable {
5654
allMandatory = mandatory;
5755
}
5856

57+
public Boolean getHasVars() {
58+
return getBooleanValue(CodegenConstants.HAS_VARS_EXT_NAME);
59+
}
60+
61+
public Boolean getHasOnlyReadOnly() {
62+
return getBooleanValue(CodegenConstants.HAS_ONLY_READ_ONLY_EXT_NAME);
63+
}
64+
65+
public Boolean getHasMoreModels() {
66+
return getBooleanValue(CodegenConstants.HAS_MORE_MODELS_EXT_NAME);
67+
}
68+
69+
public Boolean getHasEnums() {
70+
return getBooleanValue(CodegenConstants.HAS_ENUMS_EXT_NAME);
71+
}
72+
73+
public Boolean getHasRequired() {
74+
return getBooleanValue(CodegenConstants.HAS_REQUIRED_PARAMS_EXT_NAME);
75+
}
76+
77+
public Boolean getHasOptional() {
78+
return getBooleanValue(CodegenConstants.HAS_OPTIONAL_EXT_NAME);
79+
}
80+
81+
public Boolean getHasChildren() {
82+
return getBooleanValue(CodegenConstants.HAS_CHILDREN_EXT_NAME);
83+
}
84+
5985
@Override
6086
public String toString() {
6187
return String.format("%s(%s)", name, classname);
@@ -438,14 +464,6 @@ public void setExternalDocumentation(ExternalDocumentation externalDocumentation
438464
this.externalDocumentation = externalDocumentation;
439465
}
440466

441-
public Map<String, Object> getVendorExtensions() {
442-
return vendorExtensions;
443-
}
444-
445-
public void setVendorExtensions(Map<String, Object> vendorExtensions) {
446-
this.vendorExtensions = vendorExtensions;
447-
}
448-
449467
public String getAdditionalPropertiesType() {
450468
return additionalPropertiesType;
451469
}

‎modules/swagger-codegen/src/main/java/io/swagger/codegen/v3/CodegenObject.java‎

Lines changed: 145 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,145 @@
1+
package io.swagger.codegen.v3;
2+
3+
import java.util.HashMap;
4+
import java.util.Map;
5+
6+
public abstract class CodegenObject implements VendorExtendable {
7+
8+
public Map<String, Object> vendorExtensions = new HashMap<>();
9+
10+
@Override
11+
public Map<String, Object> getVendorExtensions() {
12+
return vendorExtensions;
13+
}
14+
15+
public void setVendorExtensions(Map<String, Object> vendorExtensions) {
16+
this.vendorExtensions = vendorExtensions;
17+
}
18+
19+
public Boolean getHasHeaders() {
20+
return getBooleanValue(CodegenConstants.HAS_HEADERS_EXT_NAME);
21+
}
22+
23+
public Boolean getIsString() {
24+
return getBooleanValue(CodegenConstants.IS_STRING_EXT_NAME);
25+
}
26+
27+
public Boolean getIsNumeric() {
28+
return getBooleanValue(CodegenConstants.IS_NUMERIC_EXT_NAME);
29+
}
30+
31+
public Boolean getIsInteger() {
32+
return getBooleanValue(CodegenConstants.IS_INTEGER_EXT_NAME);
33+
}
34+
35+
public Boolean getIsLong() {
36+
return getBooleanValue(CodegenConstants.IS_LONG_EXT_NAME);
37+
}
38+
39+
public Boolean getIsNumber() {
40+
return getBooleanValue(CodegenConstants.IS_NUMBER_EXT_NAME);
41+
}
42+
43+
public Boolean getIsFloat() {
44+
return getBooleanValue(CodegenConstants.IS_FLOAT_EXT_NAME);
45+
}
46+
47+
public Boolean getIsDouble() {
48+
return getBooleanValue(CodegenConstants.IS_DOUBLE_EXT_NAME);
49+
}
50+
51+
public Boolean getIsByteArray() {
52+
return getBooleanValue(CodegenConstants.IS_BYTE_ARRAY_EXT_NAME);
53+
}
54+
55+
public Boolean getIsBoolean() {
56+
return getBooleanValue(CodegenConstants.IS_BOOLEAN_EXT_NAME);
57+
}
58+
59+
public Boolean getIsDate() {
60+
return getBooleanValue(CodegenConstants.IS_DATE_EXT_NAME);
61+
}
62+
63+
public Boolean getIsDateTime() {
64+
return getBooleanValue(CodegenConstants.IS_DATE_TIME_EXT_NAME);
65+
}
66+
67+
public Boolean getIsUuid() {
68+
return getBooleanValue(CodegenConstants.IS_UUID_EXT_NAME);
69+
}
70+
71+
public Boolean getIsDefault() {
72+
return getBooleanValue(CodegenConstants.IS_DEFAULT_EXT_NAME);
73+
}
74+
75+
public Boolean getIsMapContainer() {
76+
return getBooleanValue(CodegenConstants.IS_MAP_CONTAINER_EXT_NAME);
77+
}
78+
79+
public Boolean getIsListContainer() {
80+
return getBooleanValue(CodegenConstants.IS_LIST_CONTAINER_EXT_NAME);
81+
}
82+
83+
public Boolean getIsMultipart() {
84+
return getBooleanValue(CodegenConstants.IS_MULTIPART_EXT_NAME);
85+
}
86+
87+
public Boolean getIsResponseBinary() {
88+
return getBooleanValue(CodegenConstants.IS_RESPONSE_BINARY_EXT_NAME);
89+
}
90+
91+
public Boolean getIsResponseFile() {
92+
return getBooleanValue(CodegenConstants.IS_RESPONSE_FILE_EXT_NAME);
93+
}
94+
95+
public Boolean getIsBinary() {
96+
return getBooleanValue(CodegenConstants.IS_BINARY_EXT_NAME);
97+
}
98+
99+
public Boolean getIsFile() {
100+
return getBooleanValue(CodegenConstants.IS_FILE_EXT_NAME);
101+
}
102+
103+
public Boolean getIsEnum() {
104+
return getBooleanValue(CodegenConstants.IS_ENUM_EXT_NAME);
105+
}
106+
107+
public Boolean getIsArrayModel() {
108+
return getBooleanValue(CodegenConstants.IS_ARRAY_MODEL_EXT_NAME);
109+
}
110+
111+
public Boolean getIsAlias() {
112+
return getBooleanValue(CodegenConstants.IS_ALIAS_EXT_NAME);
113+
}
114+
115+
public Boolean getIsPrimitiveType() {
116+
return getBooleanValue(CodegenConstants.IS_PRIMITIVE_TYPE_EXT_NAME);
117+
}
118+
119+
public Boolean getIsContainer() {
120+
return getBooleanValue(CodegenConstants.IS_CONTAINER_EXT_NAME);
121+
}
122+
123+
public Boolean getIsNotContainer() {
124+
return getBooleanValue(CodegenConstants.IS_NOT_CONTAINER_EXT_NAME);
125+
}
126+
127+
public Boolean getIsReadOnly() {
128+
return getBooleanValue(CodegenConstants.IS_READ_ONLY_EXT_NAME);
129+
}
130+
131+
public Boolean getIsCollectionFormatMulti() {
132+
return getBooleanValue(CodegenConstants.IS_COLLECTION_FORMAT_MULTI_EXT_NAME);
133+
}
134+
135+
public Boolean getHasMore() {
136+
return getBooleanValue(CodegenConstants.HAS_MORE_EXT_NAME);
137+
}
138+
139+
public Boolean getBooleanValue(Object key) {
140+
if (vendorExtensions.get(key) == null) {
141+
return Boolean.FALSE;
142+
}
143+
return Boolean.parseBoolean(vendorExtensions.get(key).toString());
144+
}
145+
}

‎modules/swagger-codegen/src/main/java/io/swagger/codegen/v3/CodegenOperation.java‎

Lines changed: 55 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import java.util.Set;
1515
import java.util.Arrays;
1616

17-
public class CodegenOperation implements VendorExtendable {
17+
public class CodegenOperation extends CodegenObject {
1818
public final List<CodegenProperty> responseHeaders = new ArrayList<CodegenProperty>();
1919
public boolean returnTypeIsPrimitive, returnSimpleType, subresourceOperation;
2020
public String path, operationId, returnType, httpMethod, returnBaseType,
@@ -458,8 +458,59 @@ public String getOperationIdSnakeCase() {
458458
return operationIdSnakeCase;
459459
}
460460

461-
@Override
462-
public Map<String, Object> getVendorExtensions() {
463-
return this.vendorExtensions;
461+
public Boolean getIsRestfulIndex() {
462+
return getBooleanValue(CodegenConstants.IS_RESTFUL_INDEX_EXT_NAME);
463+
}
464+
465+
public Boolean getIsRestfulShow() {
466+
return getBooleanValue(CodegenConstants.IS_RESTFUL_SHOW_EXT_NAME);
467+
}
468+
469+
public Boolean getIsRestfulCreate() {
470+
return getBooleanValue(CodegenConstants.IS_RESTFUL_CREATE_EXT_NAME);
471+
}
472+
473+
public Boolean getIsRestfulUpdate() {
474+
return getBooleanValue(CodegenConstants.IS_RESTFUL_UPDATE_EXT_NAME);
475+
}
476+
477+
public Boolean getIsRestfulDestroy() {
478+
return getBooleanValue(CodegenConstants.IS_RESTFUL_UPDATE_EXT_NAME);
479+
}
480+
481+
public Boolean getIsRestful() {
482+
return getBooleanValue(CodegenConstants.IS_RESTFUL_EXT_NAME);
483+
}
484+
485+
public Boolean getIsDeprecated() {
486+
return getBooleanValue(CodegenConstants.IS_DEPRECATED_EXT_NAME);
487+
}
488+
489+
public Boolean getHasAuthMethods() {
490+
return getBooleanValue(CodegenConstants.HAS_AUTH_METHODS_EXT_NAME);
491+
}
492+
493+
public Boolean getHasConsumes() {
494+
return getBooleanValue(CodegenConstants.HAS_CONSUMES_EXT_NAME);
495+
}
496+
497+
public Boolean getHasProduces() {
498+
return getBooleanValue(CodegenConstants.HAS_PRODUCES_EXT_NAME);
499+
}
500+
501+
public Boolean getHasParams() {
502+
return getBooleanValue(CodegenConstants.HAS_PARAMS_EXT_NAME);
503+
}
504+
505+
public Boolean getHasOptionalParams() {
506+
return getBooleanValue(CodegenConstants.HAS_OPTIONAL_PARAMS_EXT_NAME);
507+
}
508+
509+
public Boolean getHasRequiredParams() {
510+
return getBooleanValue(CodegenConstants.HAS_REQUIRED_PARAMS_EXT_NAME);
511+
}
512+
513+
public Boolean getHasReference() {
514+
return getBooleanValue(CodegenConstants.HAS_REFERENCE_EXT_NAME);
464515
}
465516
}

‎modules/swagger-codegen/src/main/java/io/swagger/codegen/v3/CodegenParameter.java‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import java.util.Map;
66
import java.util.List;
77

8-
public class CodegenParameter implements VendorExtendable {
8+
public class CodegenParameter extends CodegenObject {
99
public boolean secondaryParam, notFile;
1010
public String baseName, paramName, dataType, datatypeWithEnum, dataFormat,
1111
collectionFormat, description, unescapedDescription, baseType, defaultValue, enumName;
@@ -68,6 +68,30 @@ public class CodegenParameter implements VendorExtendable {
6868
* See http://json-schema.org/latest/json-schema-validation.html#anchor14
6969
*/
7070
public Number multipleOf;
71+
72+
public Boolean getIsFormParam() {
73+
return getBooleanValue(CodegenConstants.IS_FORM_PARAM_EXT_NAME);
74+
}
75+
76+
public Boolean getIsQueryParam() {
77+
return getBooleanValue(CodegenConstants.IS_QUERY_PARAM_EXT_NAME);
78+
}
79+
80+
public Boolean getIsPathParam() {
81+
return getBooleanValue(CodegenConstants.IS_PATH_PARAM_EXT_NAME);
82+
}
83+
84+
public Boolean getIsHeaderParam() {
85+
return getBooleanValue(CodegenConstants.IS_HEADER_PARAM_EXT_NAME);
86+
}
87+
88+
public Boolean getIsCookieParam() {
89+
return getBooleanValue(CodegenConstants.IS_COOKIE_PARAM_EXT_NAME);
90+
}
91+
92+
public Boolean getIsBodyParam() {
93+
return getBooleanValue(CodegenConstants.IS_BODY_PARAM_EXT_NAME);
94+
}
7195

7296
public CodegenParameter copy() {
7397
CodegenParameter output = new CodegenParameter();

‎modules/swagger-codegen/src/main/java/io/swagger/codegen/v3/CodegenProperty.java‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import java.util.Map;
77
import java.util.Objects;
88

9-
public class CodegenProperty implements Cloneable, VendorExtendable {
9+
public class CodegenProperty extends CodegenObject implements Cloneable {
1010
public String baseName, complexType, getter, setter, description, datatype,
1111
datatypeWithEnum, dataFormat, name, min, max, defaultValue, defaultValueWithParam,
1212
baseType, containerType, title;
@@ -41,7 +41,6 @@ public class CodegenProperty implements Cloneable, VendorExtendable {
4141
public List<String> _enum;
4242
public Map<String, Object> allowableValues;
4343
public CodegenProperty items;
44-
public Map<String, Object> vendorExtensions = new HashMap<>();
4544
public String discriminatorValue;
4645

4746
public String nameInCamelCase; // property name in camel case
@@ -304,14 +303,6 @@ public void setItems(CodegenProperty items) {
304303
this.items = items;
305304
}
306305

307-
public Map<String, Object> getVendorExtensions() {
308-
return vendorExtensions;
309-
}
310-
311-
public void setVendorExtensions(Map<String, Object> vendorExtensions) {
312-
this.vendorExtensions = vendorExtensions;
313-
}
314-
315306
public String getNameInCamelCase() {
316307
return nameInCamelCase;
317308
}
@@ -368,6 +359,10 @@ public void setXmlNamespace(String xmlNamespace) {
368359
this.xmlNamespace = xmlNamespace;
369360
}
370361

362+
public Boolean getMoreNonReadOnly() {
363+
return getBooleanValue(CodegenConstants.HAS_MORE_NON_READ_ONLY_EXT_NAME);
364+
}
365+
371366
@Override
372367
public String toString() {
373368
return String.format("%s(%s)", baseName, datatype);

0 commit comments

Comments
 (0)