Skip to content

Commit ae880c9

Browse files
authored
various minor bug fixes based on sonar report (#11214)
1 parent 508da12 commit ae880c9

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppTizenClientCodegen.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ public String getTypeDeclaration(String name) {
175175
if (languageSpecificPrimitives.contains(name)) {
176176
return name;
177177
} else {
178-
return name;
178+
return super.getTypeDeclaration(name);
179179
}
180180
}
181181

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicronautClientCodegen.java

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import java.util.Arrays;
1616
import java.util.EnumSet;
1717
import java.util.HashMap;
18+
import java.util.Map;
1819

1920
import static org.openapitools.codegen.CodegenConstants.INVOKER_PACKAGE;
2021

@@ -97,18 +98,18 @@ public JavaMicronautClientCodegen() {
9798
cliOptions.add(CliOption.newBoolean(USE_BEANVALIDATION, "Use BeanValidation API annotations", useBeanValidation));
9899

99100
CliOption buildToolOption = new CliOption(OPT_BUILD, "Specify for which build tool to generate files").defaultValue(buildTool);
100-
buildToolOption.setEnum(new HashMap<String, String>() {{
101-
put(OPT_BUILD_GRADLE, "Gradle configuration is generated for the project");
102-
put(OPT_BUILD_MAVEN, "Maven configuration is generated for the project");
103-
put(OPT_BUILD_ALL, "Both Gradle and Maven configurations are generated");
104-
}});
101+
Map buildToolOptionMap = new HashMap();
102+
buildToolOptionMap.put(OPT_BUILD_GRADLE, "Gradle configuration is generated for the project");
103+
buildToolOptionMap.put(OPT_BUILD_MAVEN, "Maven configuration is generated for the project");
104+
buildToolOptionMap.put(OPT_BUILD_ALL, "Both Gradle and Maven configurations are generated");
105+
buildToolOption.setEnum(buildToolOptionMap);
105106
cliOptions.add(buildToolOption);
106107

107108
CliOption testToolOption = new CliOption(OPT_TEST, "Specify which test tool to generate files for").defaultValue(testTool);
108-
testToolOption.setEnum(new HashMap<String, String>() {{
109-
put(OPT_TEST_JUNIT, "Use JUnit as test tool");
110-
put(OPT_TEST_SPOCK, "Use Spock as test tool");
111-
}});
109+
Map testToolOptionMap = new HashMap();
110+
testToolOptionMap.put(OPT_TEST_JUNIT, "Use JUnit as test tool");
111+
testToolOptionMap.put(OPT_TEST_SPOCK, "Use Spock as test tool");
112+
testToolOption.setEnum(testToolOptionMap);
112113
cliOptions.add(testToolOption);
113114

114115
// Remove the date library option

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/K6ClientCodegen.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1041,7 +1041,7 @@ private boolean shouldHideOperationResponse(ApiResponse resp) {
10411041
Map<?, ?> respExtensions = (Map<?, ?>) resp.getExtensions().get(X_OPERATION_RESPONSE);
10421042
Entry<?, ?> entry = respExtensions.entrySet().stream().findFirst().orElse(null);
10431043

1044-
if (entry.getKey().equals(X_OPERATION_RESPONSE_HIDE)) {
1044+
if (entry != null && entry.getKey().equals(X_OPERATION_RESPONSE_HIDE)) {
10451045
return Boolean.parseBoolean(String.valueOf(entry.getValue()));
10461046
}
10471047
}

0 commit comments

Comments
 (0)