Fix NPE when passing null in a formData that is not required. (#12028)

This commit is contained in:
Jean-François Côté
2022-04-02 00:09:27 -04:00
committed by GitHub
parent 9aaf30e0f2
commit 48aae8eb4b
13 changed files with 102 additions and 102 deletions

View File

@@ -163,10 +163,10 @@ public class {{classname}}Controller extends Controller {
}
{{/collectionFormat}}
{{^collectionFormat}}
String value{{paramName}} = (request.body().asMultipartFormData().asFormUrlEncoded().get("{{baseName}}"))[0];
String[] value{{paramName}} = request.body().asMultipartFormData().asFormUrlEncoded().get("{{baseName}}");
{{{dataType}}} {{paramName}};
if (value{{paramName}} != null) {
{{paramName}} = {{>conversionBegin}}value{{paramName}}{{>conversionEnd}};
{{paramName}} = {{>conversionBegin}}value{{paramName}}[0]{{>conversionEnd}};
} else {
{{#required}}
throw new IllegalArgumentException("'{{baseName}}' parameter is required");

View File

@@ -121,17 +121,17 @@ public class PetApiController extends Controller {
@ApiAction
public Result updatePetWithForm(Http.Request request, Long petId) throws Exception {
String valuename = (request.body().asMultipartFormData().asFormUrlEncoded().get("name"))[0];
String[] valuename = request.body().asMultipartFormData().asFormUrlEncoded().get("name");
String name;
if (valuename != null) {
name = valuename;
name = valuename[0];
} else {
name = null;
}
String valuestatus = (request.body().asMultipartFormData().asFormUrlEncoded().get("status"))[0];
String[] valuestatus = request.body().asMultipartFormData().asFormUrlEncoded().get("status");
String status;
if (valuestatus != null) {
status = valuestatus;
status = valuestatus[0];
} else {
status = null;
}
@@ -140,10 +140,10 @@ public class PetApiController extends Controller {
@ApiAction
public Result uploadFile(Http.Request request, Long petId) throws Exception {
String valueadditionalMetadata = (request.body().asMultipartFormData().asFormUrlEncoded().get("additionalMetadata"))[0];
String[] valueadditionalMetadata = request.body().asMultipartFormData().asFormUrlEncoded().get("additionalMetadata");
String additionalMetadata;
if (valueadditionalMetadata != null) {
additionalMetadata = valueadditionalMetadata;
additionalMetadata = valueadditionalMetadata[0];
} else {
additionalMetadata = null;
}

View File

@@ -124,17 +124,17 @@ public class PetApiController extends Controller {
@ApiAction
public CompletionStage<Result> updatePetWithForm(Http.Request request, Long petId) throws Exception {
String valuename = (request.body().asMultipartFormData().asFormUrlEncoded().get("name"))[0];
String[] valuename = request.body().asMultipartFormData().asFormUrlEncoded().get("name");
String name;
if (valuename != null) {
name = valuename;
name = valuename[0];
} else {
name = null;
}
String valuestatus = (request.body().asMultipartFormData().asFormUrlEncoded().get("status"))[0];
String[] valuestatus = request.body().asMultipartFormData().asFormUrlEncoded().get("status");
String status;
if (valuestatus != null) {
status = valuestatus;
status = valuestatus[0];
} else {
status = null;
}
@@ -143,10 +143,10 @@ public class PetApiController extends Controller {
@ApiAction
public CompletionStage<Result> uploadFile(Http.Request request, Long petId) throws Exception {
String valueadditionalMetadata = (request.body().asMultipartFormData().asFormUrlEncoded().get("additionalMetadata"))[0];
String[] valueadditionalMetadata = request.body().asMultipartFormData().asFormUrlEncoded().get("additionalMetadata");
String additionalMetadata;
if (valueadditionalMetadata != null) {
additionalMetadata = valueadditionalMetadata;
additionalMetadata = valueadditionalMetadata[0];
} else {
additionalMetadata = null;
}

View File

@@ -119,17 +119,17 @@ public class PetApiController extends Controller {
@ApiAction
public Result updatePetWithForm(Http.Request request, Long petId) throws Exception {
String valuename = (request.body().asMultipartFormData().asFormUrlEncoded().get("name"))[0];
String[] valuename = request.body().asMultipartFormData().asFormUrlEncoded().get("name");
String name;
if (valuename != null) {
name = valuename;
name = valuename[0];
} else {
name = null;
}
String valuestatus = (request.body().asMultipartFormData().asFormUrlEncoded().get("status"))[0];
String[] valuestatus = request.body().asMultipartFormData().asFormUrlEncoded().get("status");
String status;
if (valuestatus != null) {
status = valuestatus;
status = valuestatus[0];
} else {
status = null;
}
@@ -138,10 +138,10 @@ public class PetApiController extends Controller {
@ApiAction
public Result uploadFile(Http.Request request, Long petId) throws Exception {
String valueadditionalMetadata = (request.body().asMultipartFormData().asFormUrlEncoded().get("additionalMetadata"))[0];
String[] valueadditionalMetadata = request.body().asMultipartFormData().asFormUrlEncoded().get("additionalMetadata");
String additionalMetadata;
if (valueadditionalMetadata != null) {
additionalMetadata = valueadditionalMetadata;
additionalMetadata = valueadditionalMetadata[0];
} else {
additionalMetadata = null;
}

View File

@@ -174,96 +174,96 @@ public class FakeApiController extends Controller {
@ApiAction
public Result testEndpointParameters(Http.Request request) throws Exception {
String valueinteger = (request.body().asMultipartFormData().asFormUrlEncoded().get("integer"))[0];
String[] valueinteger = request.body().asMultipartFormData().asFormUrlEncoded().get("integer");
Integer integer;
if (valueinteger != null) {
integer = Integer.parseInt(valueinteger);
integer = Integer.parseInt(valueinteger[0]);
} else {
integer = null;
}
String valueint32 = (request.body().asMultipartFormData().asFormUrlEncoded().get("int32"))[0];
String[] valueint32 = request.body().asMultipartFormData().asFormUrlEncoded().get("int32");
Integer int32;
if (valueint32 != null) {
int32 = Integer.parseInt(valueint32);
int32 = Integer.parseInt(valueint32[0]);
} else {
int32 = null;
}
String valueint64 = (request.body().asMultipartFormData().asFormUrlEncoded().get("int64"))[0];
String[] valueint64 = request.body().asMultipartFormData().asFormUrlEncoded().get("int64");
Long int64;
if (valueint64 != null) {
int64 = Long.parseLong(valueint64);
int64 = Long.parseLong(valueint64[0]);
} else {
int64 = null;
}
String valuenumber = (request.body().asMultipartFormData().asFormUrlEncoded().get("number"))[0];
String[] valuenumber = request.body().asMultipartFormData().asFormUrlEncoded().get("number");
BigDecimal number;
if (valuenumber != null) {
number = new BigDecimal(valuenumber);
number = new BigDecimal(valuenumber[0]);
} else {
throw new IllegalArgumentException("'number' parameter is required");
}
String value_float = (request.body().asMultipartFormData().asFormUrlEncoded().get("float"))[0];
String[] value_float = request.body().asMultipartFormData().asFormUrlEncoded().get("float");
Float _float;
if (value_float != null) {
_float = Float.parseFloat(value_float);
_float = Float.parseFloat(value_float[0]);
} else {
_float = null;
}
String value_double = (request.body().asMultipartFormData().asFormUrlEncoded().get("double"))[0];
String[] value_double = request.body().asMultipartFormData().asFormUrlEncoded().get("double");
Double _double;
if (value_double != null) {
_double = Double.parseDouble(value_double);
_double = Double.parseDouble(value_double[0]);
} else {
throw new IllegalArgumentException("'double' parameter is required");
}
String valuestring = (request.body().asMultipartFormData().asFormUrlEncoded().get("string"))[0];
String[] valuestring = request.body().asMultipartFormData().asFormUrlEncoded().get("string");
String string;
if (valuestring != null) {
string = valuestring;
string = valuestring[0];
} else {
string = null;
}
String valuepatternWithoutDelimiter = (request.body().asMultipartFormData().asFormUrlEncoded().get("pattern_without_delimiter"))[0];
String[] valuepatternWithoutDelimiter = request.body().asMultipartFormData().asFormUrlEncoded().get("pattern_without_delimiter");
String patternWithoutDelimiter;
if (valuepatternWithoutDelimiter != null) {
patternWithoutDelimiter = valuepatternWithoutDelimiter;
patternWithoutDelimiter = valuepatternWithoutDelimiter[0];
} else {
throw new IllegalArgumentException("'pattern_without_delimiter' parameter is required");
}
String value_byte = (request.body().asMultipartFormData().asFormUrlEncoded().get("byte"))[0];
String[] value_byte = request.body().asMultipartFormData().asFormUrlEncoded().get("byte");
byte[] _byte;
if (value_byte != null) {
_byte = value_byte.getBytes();
_byte = value_byte[0].getBytes();
} else {
throw new IllegalArgumentException("'byte' parameter is required");
}
Http.MultipartFormData<TemporaryFile> bodybinary = request.body().asMultipartFormData();
Http.MultipartFormData.FilePart<TemporaryFile> binary = bodybinary.getFile("binary");
String valuedate = (request.body().asMultipartFormData().asFormUrlEncoded().get("date"))[0];
String[] valuedate = request.body().asMultipartFormData().asFormUrlEncoded().get("date");
LocalDate date;
if (valuedate != null) {
date = LocalDate.parse(valuedate);
date = LocalDate.parse(valuedate[0]);
} else {
date = null;
}
String valuedateTime = (request.body().asMultipartFormData().asFormUrlEncoded().get("dateTime"))[0];
String[] valuedateTime = request.body().asMultipartFormData().asFormUrlEncoded().get("dateTime");
OffsetDateTime dateTime;
if (valuedateTime != null) {
dateTime = OffsetDateTime.parse(valuedateTime);
dateTime = OffsetDateTime.parse(valuedateTime[0]);
} else {
dateTime = null;
}
String valuepassword = (request.body().asMultipartFormData().asFormUrlEncoded().get("password"))[0];
String[] valuepassword = request.body().asMultipartFormData().asFormUrlEncoded().get("password");
String password;
if (valuepassword != null) {
password = valuepassword;
password = valuepassword[0];
} else {
password = null;
}
String valueparamCallback = (request.body().asMultipartFormData().asFormUrlEncoded().get("callback"))[0];
String[] valueparamCallback = request.body().asMultipartFormData().asFormUrlEncoded().get("callback");
String paramCallback;
if (valueparamCallback != null) {
paramCallback = valueparamCallback;
paramCallback = valueparamCallback[0];
} else {
paramCallback = null;
}
@@ -311,10 +311,10 @@ public class FakeApiController extends Controller {
enumFormStringArray.add(curParam);
}
}
String valueenumFormString = (request.body().asMultipartFormData().asFormUrlEncoded().get("enum_form_string"))[0];
String[] valueenumFormString = request.body().asMultipartFormData().asFormUrlEncoded().get("enum_form_string");
String enumFormString;
if (valueenumFormString != null) {
enumFormString = valueenumFormString;
enumFormString = valueenumFormString[0];
} else {
enumFormString = "-efg";
}
@@ -403,17 +403,17 @@ public class FakeApiController extends Controller {
@ApiAction
public Result testJsonFormData(Http.Request request) throws Exception {
String valueparam = (request.body().asMultipartFormData().asFormUrlEncoded().get("param"))[0];
String[] valueparam = request.body().asMultipartFormData().asFormUrlEncoded().get("param");
String param;
if (valueparam != null) {
param = valueparam;
param = valueparam[0];
} else {
throw new IllegalArgumentException("'param' parameter is required");
}
String valueparam2 = (request.body().asMultipartFormData().asFormUrlEncoded().get("param2"))[0];
String[] valueparam2 = request.body().asMultipartFormData().asFormUrlEncoded().get("param2");
String param2;
if (valueparam2 != null) {
param2 = valueparam2;
param2 = valueparam2[0];
} else {
throw new IllegalArgumentException("'param2' parameter is required");
}

View File

@@ -122,17 +122,17 @@ public class PetApiController extends Controller {
@ApiAction
public Result updatePetWithForm(Http.Request request, Long petId) throws Exception {
String valuename = (request.body().asMultipartFormData().asFormUrlEncoded().get("name"))[0];
String[] valuename = request.body().asMultipartFormData().asFormUrlEncoded().get("name");
String name;
if (valuename != null) {
name = valuename;
name = valuename[0];
} else {
name = null;
}
String valuestatus = (request.body().asMultipartFormData().asFormUrlEncoded().get("status"))[0];
String[] valuestatus = request.body().asMultipartFormData().asFormUrlEncoded().get("status");
String status;
if (valuestatus != null) {
status = valuestatus;
status = valuestatus[0];
} else {
status = null;
}
@@ -141,10 +141,10 @@ public class PetApiController extends Controller {
@ApiAction
public Result uploadFile(Http.Request request, Long petId) throws Exception {
String valueadditionalMetadata = (request.body().asMultipartFormData().asFormUrlEncoded().get("additionalMetadata"))[0];
String[] valueadditionalMetadata = request.body().asMultipartFormData().asFormUrlEncoded().get("additionalMetadata");
String additionalMetadata;
if (valueadditionalMetadata != null) {
additionalMetadata = valueadditionalMetadata;
additionalMetadata = valueadditionalMetadata[0];
} else {
additionalMetadata = null;
}
@@ -155,10 +155,10 @@ public class PetApiController extends Controller {
@ApiAction
public Result uploadFileWithRequiredFile(Http.Request request, Long petId) throws Exception {
String valueadditionalMetadata = (request.body().asMultipartFormData().asFormUrlEncoded().get("additionalMetadata"))[0];
String[] valueadditionalMetadata = request.body().asMultipartFormData().asFormUrlEncoded().get("additionalMetadata");
String additionalMetadata;
if (valueadditionalMetadata != null) {
additionalMetadata = valueadditionalMetadata;
additionalMetadata = valueadditionalMetadata[0];
} else {
additionalMetadata = null;
}

View File

@@ -111,17 +111,17 @@ public class PetApiController extends Controller {
@ApiAction
public Result updatePetWithForm(Http.Request request, Long petId) throws Exception {
String valuename = (request.body().asMultipartFormData().asFormUrlEncoded().get("name"))[0];
String[] valuename = request.body().asMultipartFormData().asFormUrlEncoded().get("name");
String name;
if (valuename != null) {
name = valuename;
name = valuename[0];
} else {
name = null;
}
String valuestatus = (request.body().asMultipartFormData().asFormUrlEncoded().get("status"))[0];
String[] valuestatus = request.body().asMultipartFormData().asFormUrlEncoded().get("status");
String status;
if (valuestatus != null) {
status = valuestatus;
status = valuestatus[0];
} else {
status = null;
}
@@ -130,10 +130,10 @@ public class PetApiController extends Controller {
@ApiAction
public Result uploadFile(Http.Request request, Long petId) throws Exception {
String valueadditionalMetadata = (request.body().asMultipartFormData().asFormUrlEncoded().get("additionalMetadata"))[0];
String[] valueadditionalMetadata = request.body().asMultipartFormData().asFormUrlEncoded().get("additionalMetadata");
String additionalMetadata;
if (valueadditionalMetadata != null) {
additionalMetadata = valueadditionalMetadata;
additionalMetadata = valueadditionalMetadata[0];
} else {
additionalMetadata = null;
}

View File

@@ -122,17 +122,17 @@ public class PetApiController extends Controller {
@ApiAction
public Result updatePetWithForm(Http.Request request, Long petId) {
String valuename = (request.body().asMultipartFormData().asFormUrlEncoded().get("name"))[0];
String[] valuename = request.body().asMultipartFormData().asFormUrlEncoded().get("name");
String name;
if (valuename != null) {
name = valuename;
name = valuename[0];
} else {
name = null;
}
String valuestatus = (request.body().asMultipartFormData().asFormUrlEncoded().get("status"))[0];
String[] valuestatus = request.body().asMultipartFormData().asFormUrlEncoded().get("status");
String status;
if (valuestatus != null) {
status = valuestatus;
status = valuestatus[0];
} else {
status = null;
}
@@ -141,10 +141,10 @@ public class PetApiController extends Controller {
@ApiAction
public Result uploadFile(Http.Request request, Long petId) {
String valueadditionalMetadata = (request.body().asMultipartFormData().asFormUrlEncoded().get("additionalMetadata"))[0];
String[] valueadditionalMetadata = request.body().asMultipartFormData().asFormUrlEncoded().get("additionalMetadata");
String additionalMetadata;
if (valueadditionalMetadata != null) {
additionalMetadata = valueadditionalMetadata;
additionalMetadata = valueadditionalMetadata[0];
} else {
additionalMetadata = null;
}

View File

@@ -181,17 +181,17 @@ public class PetApiController extends Controller {
@ApiAction
public Result updatePetWithForm(Http.Request request, Long petId) throws Exception {
String valuename = (request.body().asMultipartFormData().asFormUrlEncoded().get("name"))[0];
String[] valuename = request.body().asMultipartFormData().asFormUrlEncoded().get("name");
String name;
if (valuename != null) {
name = valuename;
name = valuename[0];
} else {
name = null;
}
String valuestatus = (request.body().asMultipartFormData().asFormUrlEncoded().get("status"))[0];
String[] valuestatus = request.body().asMultipartFormData().asFormUrlEncoded().get("status");
String status;
if (valuestatus != null) {
status = valuestatus;
status = valuestatus[0];
} else {
status = null;
}
@@ -206,10 +206,10 @@ public class PetApiController extends Controller {
@ApiAction
public Result uploadFile(Http.Request request, Long petId) throws Exception {
String valueadditionalMetadata = (request.body().asMultipartFormData().asFormUrlEncoded().get("additionalMetadata"))[0];
String[] valueadditionalMetadata = request.body().asMultipartFormData().asFormUrlEncoded().get("additionalMetadata");
String additionalMetadata;
if (valueadditionalMetadata != null) {
additionalMetadata = valueadditionalMetadata;
additionalMetadata = valueadditionalMetadata[0];
} else {
additionalMetadata = null;
}

View File

@@ -121,17 +121,17 @@ public class PetApiController extends Controller {
@ApiAction
public Result updatePetWithForm(Http.Request request, Long petId) throws Exception {
String valuename = (request.body().asMultipartFormData().asFormUrlEncoded().get("name"))[0];
String[] valuename = request.body().asMultipartFormData().asFormUrlEncoded().get("name");
String name;
if (valuename != null) {
name = valuename;
name = valuename[0];
} else {
name = null;
}
String valuestatus = (request.body().asMultipartFormData().asFormUrlEncoded().get("status"))[0];
String[] valuestatus = request.body().asMultipartFormData().asFormUrlEncoded().get("status");
String status;
if (valuestatus != null) {
status = valuestatus;
status = valuestatus[0];
} else {
status = null;
}
@@ -140,10 +140,10 @@ public class PetApiController extends Controller {
@ApiAction
public Result uploadFile(Http.Request request, Long petId) throws Exception {
String valueadditionalMetadata = (request.body().asMultipartFormData().asFormUrlEncoded().get("additionalMetadata"))[0];
String[] valueadditionalMetadata = request.body().asMultipartFormData().asFormUrlEncoded().get("additionalMetadata");
String additionalMetadata;
if (valueadditionalMetadata != null) {
additionalMetadata = valueadditionalMetadata;
additionalMetadata = valueadditionalMetadata[0];
} else {
additionalMetadata = null;
}

View File

@@ -121,17 +121,17 @@ public class PetApiController extends Controller {
@ApiAction
public Result updatePetWithForm(Http.Request request, Long petId) throws Exception {
String valuename = (request.body().asMultipartFormData().asFormUrlEncoded().get("name"))[0];
String[] valuename = request.body().asMultipartFormData().asFormUrlEncoded().get("name");
String name;
if (valuename != null) {
name = valuename;
name = valuename[0];
} else {
name = null;
}
String valuestatus = (request.body().asMultipartFormData().asFormUrlEncoded().get("status"))[0];
String[] valuestatus = request.body().asMultipartFormData().asFormUrlEncoded().get("status");
String status;
if (valuestatus != null) {
status = valuestatus;
status = valuestatus[0];
} else {
status = null;
}
@@ -140,10 +140,10 @@ public class PetApiController extends Controller {
@ApiAction
public Result uploadFile(Http.Request request, Long petId) throws Exception {
String valueadditionalMetadata = (request.body().asMultipartFormData().asFormUrlEncoded().get("additionalMetadata"))[0];
String[] valueadditionalMetadata = request.body().asMultipartFormData().asFormUrlEncoded().get("additionalMetadata");
String additionalMetadata;
if (valueadditionalMetadata != null) {
additionalMetadata = valueadditionalMetadata;
additionalMetadata = valueadditionalMetadata[0];
} else {
additionalMetadata = null;
}

View File

@@ -120,17 +120,17 @@ public class PetApiController extends Controller {
public Result updatePetWithForm(Http.Request request, Long petId) throws Exception {
String valuename = (request.body().asMultipartFormData().asFormUrlEncoded().get("name"))[0];
String[] valuename = request.body().asMultipartFormData().asFormUrlEncoded().get("name");
String name;
if (valuename != null) {
name = valuename;
name = valuename[0];
} else {
name = null;
}
String valuestatus = (request.body().asMultipartFormData().asFormUrlEncoded().get("status"))[0];
String[] valuestatus = request.body().asMultipartFormData().asFormUrlEncoded().get("status");
String status;
if (valuestatus != null) {
status = valuestatus;
status = valuestatus[0];
} else {
status = null;
}
@@ -139,10 +139,10 @@ public class PetApiController extends Controller {
public Result uploadFile(Http.Request request, Long petId) throws Exception {
String valueadditionalMetadata = (request.body().asMultipartFormData().asFormUrlEncoded().get("additionalMetadata"))[0];
String[] valueadditionalMetadata = request.body().asMultipartFormData().asFormUrlEncoded().get("additionalMetadata");
String additionalMetadata;
if (valueadditionalMetadata != null) {
additionalMetadata = valueadditionalMetadata;
additionalMetadata = valueadditionalMetadata[0];
} else {
additionalMetadata = null;
}

View File

@@ -121,17 +121,17 @@ public class PetApiController extends Controller {
@ApiAction
public Result updatePetWithForm(Http.Request request, Long petId) throws Exception {
String valuename = (request.body().asMultipartFormData().asFormUrlEncoded().get("name"))[0];
String[] valuename = request.body().asMultipartFormData().asFormUrlEncoded().get("name");
String name;
if (valuename != null) {
name = valuename;
name = valuename[0];
} else {
name = null;
}
String valuestatus = (request.body().asMultipartFormData().asFormUrlEncoded().get("status"))[0];
String[] valuestatus = request.body().asMultipartFormData().asFormUrlEncoded().get("status");
String status;
if (valuestatus != null) {
status = valuestatus;
status = valuestatus[0];
} else {
status = null;
}
@@ -140,10 +140,10 @@ public class PetApiController extends Controller {
@ApiAction
public Result uploadFile(Http.Request request, Long petId) throws Exception {
String valueadditionalMetadata = (request.body().asMultipartFormData().asFormUrlEncoded().get("additionalMetadata"))[0];
String[] valueadditionalMetadata = request.body().asMultipartFormData().asFormUrlEncoded().get("additionalMetadata");
String additionalMetadata;
if (valueadditionalMetadata != null) {
additionalMetadata = valueadditionalMetadata;
additionalMetadata = valueadditionalMetadata[0];
} else {
additionalMetadata = null;
}