Skip to content

Commit f579fce

Browse files
authored
Merge pull request #1264 from swagger-api/issue-1243
check schema types independently in order to fix issue
2 parents 6e82ee2 + 3965cf9 commit f579fce

File tree

1 file changed

+22
-13
lines changed

1 file changed

+22
-13
lines changed

src/main/java/io/swagger/codegen/v3/generators/DefaultCodegenConfig.java

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2354,34 +2354,43 @@ public CodegenResponse fromResponse(String responseCode, ApiResponse response) {
23542354

23552355
if (getBooleanValue(codegenProperty, CodegenConstants.IS_STRING_EXT_NAME)) {
23562356
codegenResponse.getVendorExtensions().put(CodegenConstants.IS_STRING_EXT_NAME, Boolean.TRUE);
2357-
} else if (getBooleanValue(codegenProperty, CodegenConstants.IS_BOOLEAN_EXT_NAME)) {
2357+
}
2358+
if (getBooleanValue(codegenProperty, CodegenConstants.IS_BOOLEAN_EXT_NAME)) {
23582359
codegenResponse.getVendorExtensions().put(CodegenConstants.IS_BOOLEAN_EXT_NAME, Boolean.TRUE);
2359-
} else if (getBooleanValue(codegenProperty, CodegenConstants.IS_LONG_EXT_NAME)) {
2360+
}
2361+
if (getBooleanValue(codegenProperty, CodegenConstants.IS_LONG_EXT_NAME)) {
23602362
codegenResponse.getVendorExtensions().put(CodegenConstants.IS_LONG_EXT_NAME, Boolean.TRUE);
23612363
codegenResponse.getVendorExtensions().put(CodegenConstants.IS_NUMERIC_EXT_NAME, Boolean.TRUE);
2362-
} else if (getBooleanValue(codegenProperty, CodegenConstants.IS_INTEGER_EXT_NAME)) {
2364+
}
2365+
if (getBooleanValue(codegenProperty, CodegenConstants.IS_INTEGER_EXT_NAME)) {
23632366
codegenResponse.getVendorExtensions().put(CodegenConstants.IS_INTEGER_EXT_NAME, Boolean.TRUE);
23642367
codegenResponse.getVendorExtensions().put(CodegenConstants.IS_NUMERIC_EXT_NAME, Boolean.TRUE);
2365-
} else if (getBooleanValue(codegenProperty, CodegenConstants.IS_DOUBLE_EXT_NAME)) {
2368+
}
2369+
if (getBooleanValue(codegenProperty, CodegenConstants.IS_DOUBLE_EXT_NAME)) {
23662370
codegenResponse.getVendorExtensions().put(CodegenConstants.IS_DOUBLE_EXT_NAME, Boolean.TRUE);
23672371
codegenResponse.getVendorExtensions().put(CodegenConstants.IS_NUMERIC_EXT_NAME, Boolean.TRUE);
2368-
} else if (getBooleanValue(codegenProperty, CodegenConstants.IS_FLOAT_EXT_NAME)) {
2372+
}
2373+
if (getBooleanValue(codegenProperty, CodegenConstants.IS_FLOAT_EXT_NAME)) {
23692374
codegenResponse.getVendorExtensions().put(CodegenConstants.IS_FLOAT_EXT_NAME, Boolean.TRUE);
23702375
codegenResponse.getVendorExtensions().put(CodegenConstants.IS_NUMERIC_EXT_NAME, Boolean.TRUE);
2371-
} else if (getBooleanValue(codegenProperty, CodegenConstants.IS_BYTE_ARRAY_EXT_NAME)) {
2376+
}
2377+
if (getBooleanValue(codegenProperty, CodegenConstants.IS_BYTE_ARRAY_EXT_NAME)) {
23722378
codegenResponse.getVendorExtensions().put(CodegenConstants.IS_BYTE_ARRAY_EXT_NAME, Boolean.TRUE);
2373-
} else if (getBooleanValue(codegenProperty, CodegenConstants.IS_BINARY_EXT_NAME)) {
2379+
}
2380+
if (getBooleanValue(codegenProperty, CodegenConstants.IS_BINARY_EXT_NAME)) {
23742381
codegenResponse.getVendorExtensions().put(CodegenConstants.IS_BINARY_EXT_NAME, Boolean.TRUE);
2375-
} else if (getBooleanValue(codegenProperty, CodegenConstants.IS_FILE_EXT_NAME)) {
2382+
}
2383+
if (getBooleanValue(codegenProperty, CodegenConstants.IS_FILE_EXT_NAME)) {
23762384
codegenResponse.getVendorExtensions().put(CodegenConstants.IS_FILE_EXT_NAME, Boolean.TRUE);
2377-
} else if (getBooleanValue(codegenProperty, CodegenConstants.IS_DATE_EXT_NAME)) {
2385+
}
2386+
if (getBooleanValue(codegenProperty, CodegenConstants.IS_DATE_EXT_NAME)) {
23782387
codegenResponse.getVendorExtensions().put(CodegenConstants.IS_DATE_EXT_NAME, Boolean.TRUE);
2379-
} else if (getBooleanValue(codegenProperty, CodegenConstants.IS_DATE_TIME_EXT_NAME)) {
2388+
}
2389+
if (getBooleanValue(codegenProperty, CodegenConstants.IS_DATE_TIME_EXT_NAME)) {
23802390
codegenResponse.getVendorExtensions().put(CodegenConstants.IS_DATE_TIME_EXT_NAME, Boolean.TRUE);
2381-
} else if (getBooleanValue(codegenProperty, CodegenConstants.IS_UUID_EXT_NAME)) {
2391+
}
2392+
if (getBooleanValue(codegenProperty, CodegenConstants.IS_UUID_EXT_NAME)) {
23822393
codegenResponse.getVendorExtensions().put(CodegenConstants.IS_UUID_EXT_NAME, Boolean.TRUE);
2383-
} else {
2384-
LOGGER.debug("Property type is not primitive: " + codegenProperty.datatype);
23852394
}
23862395

23872396
if (getBooleanValue(codegenProperty, CodegenConstants.IS_CONTAINER_EXT_NAME)) {

0 commit comments

Comments
 (0)