Added vendorExtensions.x-isPrimitive. #7991
Conversation
Switch template for constructFromObject.
|
Could you review this PR? |
|
Have not commit the change made by |
| @@ -795,6 +795,11 @@ public CodegenModel fromModel(String name, Model model, Map<String, Model> allDe | |||
| if (mm.getAdditionalProperties() != null) { | |||
| codegenModel.vendorExtensions.put("x-isMap", true); | |||
| codegenModel.vendorExtensions.put("x-itemType", getSwaggerType(mm.getAdditionalProperties())); | |||
| } else { | |||
| String type = mm.getType(); | |||
| if (type != null && (type.equals("number") || type.equals("integer") || type.equals("string") || type.equals("boolean") || type.equals("null"))) { | |||
There was a problem hiding this comment.
To reduce cyclomatic complexity, could this line perhaps be replace with something like:
String[] PRIMITIVE_TYPES = new String[] {"number", "integer","string","boolean", "null"};
Arrays.asList(PRIMITIVE_TYPES).contains(type)
There was a problem hiding this comment.
Fixed. It also improves readability.
|
@cliffano Hi. I have fixed review indication. Just would like to send a reminder in case you haven't noticed yet. |
|
@satoshikumano Thanks for that. Overall I don't have any objection, but I was just wondering if it's worth having the primitive types array consistent to What do you think @wing328 ? Does Swagger CodeGen have any preference/standard? If not, I'm fine with it. |
|
Can we merge this in, to test in a nightly build? |
|
@satoshikumano thanks for the PR, which has been merged into master. @cliffano we don't enforce a standard on this and I agree declaring the array on the top seems more consistent with the overall code. |
Switch template for constructFromObject.
PR checklist
./bin/to update Petstore sample so that CIs can verify the change. (For instance, only need to run./bin/{LANG}-petstore.shand./bin/security/{LANG}-petstore.shif updating the {LANG} (e.g. php, ruby, python, etc) code generator or {LANG} client's mustache templates). Windows batch files can be found in.\bin\windows\.3.0.0branch for changes related to OpenAPI spec 3.0. Default:master.Description of the PR
(details of the change, additional tests that have been done, reference to the issue for tracking, etc)
When
$refis used to reference primitive types, The value is always empty object.This forces users to modify the Swagger file even if the API definition is valid.
Reported in #4973