better handling of NPE in k6 client generator (#13236)

This commit is contained in:
William Cheng 2022-08-20 15:14:34 +08:00 committed by GitHub
parent 344d6b19b2
commit 2feaf0510b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -592,7 +592,7 @@ public class K6ClientCodegen extends DefaultCodegen implements CodegenConfig {
String responseType = getDoubleQuotedString(accepts); String responseType = getDoubleQuotedString(accepts);
try { try {
if (operation != null && operation.getParameters() != null) {
for (io.swagger.v3.oas.models.parameters.Parameter parameter : operation.getParameters()) { for (io.swagger.v3.oas.models.parameters.Parameter parameter : operation.getParameters()) {
switch (parameter.getIn()) { switch (parameter.getIn()) {
case "header": case "header":
@ -625,6 +625,7 @@ public class K6ClientCodegen extends DefaultCodegen implements CodegenConfig {
break; break;
} }
} }
}
} catch (NullPointerException e) { } catch (NullPointerException e) {
LOGGER.error(e.getMessage(), e); LOGGER.error(e.getMessage(), e);
} }
@ -1005,13 +1006,13 @@ public class K6ClientCodegen extends DefaultCodegen implements CodegenConfig {
if (cgOperation.getHasVendorExtensions() && cgOperation.vendorExtensions.containsKey(X_OPERATION_GROUPING) if (cgOperation.getHasVendorExtensions() && cgOperation.vendorExtensions.containsKey(X_OPERATION_GROUPING)
&& cgOperation.vendorExtensions.get(X_OPERATION_GROUPING) instanceof java.util.Map) { && cgOperation.vendorExtensions.get(X_OPERATION_GROUPING) instanceof java.util.Map) {
Map.Entry<?, ?> operationGroupingEntry = ((Map<?, ?>) cgOperation.vendorExtensions Map.Entry<?, ?> operationGroupingEntry = ((Map<?, ?>) cgOperation.vendorExtensions
.get(X_OPERATION_GROUPING)).entrySet().stream().findFirst().orElse(null); .get(X_OPERATION_GROUPING)).entrySet().stream().findFirst().orElse(null);
if (operationGroupingEntry != null) {
return Optional.of(new OperationGrouping(String.valueOf(operationGroupingEntry.getKey()), return Optional.of(new OperationGrouping(String.valueOf(operationGroupingEntry.getKey()),
Integer.parseInt(String.valueOf(operationGroupingEntry.getValue())))); Integer.parseInt(String.valueOf(operationGroupingEntry.getValue()))));
} }
}
return operationGrouping; return operationGrouping;
} }
@ -1123,6 +1124,7 @@ public class K6ClientCodegen extends DefaultCodegen implements CodegenConfig {
} }
// //
/** /**
* Any variables not defined yet but used for subsequent data extraction must be * Any variables not defined yet but used for subsequent data extraction must be
* initialized * initialized
@ -1147,5 +1149,7 @@ public class K6ClientCodegen extends DefaultCodegen implements CodegenConfig {
} }
@Override @Override
public GeneratorLanguage generatorLanguage() { return GeneratorLanguage.K_SIX; } public GeneratorLanguage generatorLanguage() {
return GeneratorLanguage.K_SIX;
}
} }