Skip to content

Commit 2447412

Browse files
abaruniwing328
authored andcommitted
Issue 4742 (#4763)
* add boolean datatype flags to CodegenResponse and logic to set them in DefaultCodegen * use Boolean.TRUE.equals to check for isResponseBinary or isResponseFile
1 parent ee23f8e commit 2447412

File tree

2 files changed

+30
-4
lines changed

2 files changed

+30
-4
lines changed

modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenResponse.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ public class CodegenResponse {
1010
public boolean hasMore;
1111
public List<Map<String, Object>> examples;
1212
public String dataType, baseType, containerType;
13+
public boolean isString, isInteger, isLong, isFloat, isDouble, isByteArray, isBoolean, isDate, isDateTime;
1314
public boolean isDefault;
1415
public boolean simpleType;
1516
public boolean primitiveType;

modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java

Lines changed: 29 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2046,10 +2046,10 @@ public CodegenOperation fromOperation(String path,
20462046
}
20472047
r.isDefault = response == methodResponse;
20482048
op.responses.add(r);
2049-
if (r.isBinary && r.isDefault){
2049+
if (Boolean.TRUE.equals(r.isBinary) && Boolean.TRUE.equals(r.isDefault)){
20502050
op.isResponseBinary = Boolean.TRUE;
20512051
}
2052-
if (r.isFile && r.isDefault){
2052+
if (Boolean.TRUE.equals(r.isFile) && Boolean.TRUE.equals(r.isDefault)){
20532053
op.isResponseFile = Boolean.TRUE;
20542054
}
20552055
}
@@ -2249,8 +2249,33 @@ public CodegenResponse fromResponse(String responseCode, Response response) {
22492249
}
22502250
}
22512251
r.dataType = cm.datatype;
2252-
r.isBinary = isDataTypeBinary(cm.datatype);
2253-
r.isFile = isDataTypeFile(cm.datatype);
2252+
2253+
if (Boolean.TRUE.equals(cm.isString)) {
2254+
r.isString = true;
2255+
} else if (Boolean.TRUE.equals(cm.isBoolean)) {
2256+
r.isBoolean = true;
2257+
} else if (Boolean.TRUE.equals(cm.isLong)) {
2258+
r.isLong = true;
2259+
} else if (Boolean.TRUE.equals(cm.isInteger)) {
2260+
r.isInteger = true;
2261+
} else if (Boolean.TRUE.equals(cm.isDouble)) {
2262+
r.isDouble = true;
2263+
} else if (Boolean.TRUE.equals(cm.isFloat)) {
2264+
r.isFloat = true;
2265+
} else if (Boolean.TRUE.equals(cm.isByteArray)) {
2266+
r.isByteArray = true;
2267+
} else if (Boolean.TRUE.equals(cm.isBinary)) {
2268+
r.isBinary = true;
2269+
} else if (Boolean.TRUE.equals(cm.isFile)) {
2270+
r.isFile = true;
2271+
} else if (Boolean.TRUE.equals(cm.isDate)) {
2272+
r.isDate = true;
2273+
} else if (Boolean.TRUE.equals(cm.isDateTime)) {
2274+
r.isDateTime = true;
2275+
} else {
2276+
LOGGER.debug("Property type is not primitive: " + cm.datatype);
2277+
}
2278+
22542279
if (cm.isContainer) {
22552280
r.simpleType = false;
22562281
r.containerType = cm.containerType;

0 commit comments

Comments
 (0)