From 85df55b20e2af75e2ce35f3f8e2286bc31e1af7e Mon Sep 17 00:00:00 2001 From: AntoineDuComptoirDesPharmacies <104082030+AntoineDuComptoirDesPharmacies@users.noreply.github.com> Date: Tue, 4 Jul 2023 17:30:21 +0200 Subject: [PATCH] Bugfix #15982 : (#15984) - Use 'orElse' instead of 'get' to avoid Exception for non required headers - Update samples --- .../resources/JavaPlayFramework/newApiController.mustache | 2 +- .../app/com/puppies/store/apis/PetApiController.java | 2 +- .../app/controllers/PetApiController.java | 2 +- .../app/controllers/PetApiController.java | 2 +- .../app/controllers/FakeApiController.java | 6 +++--- .../app/controllers/PetApiController.java | 2 +- .../app/controllers/PetApiController.java | 2 +- .../app/controllers/PetApiController.java | 2 +- .../app/controllers/PetApiController.java | 2 +- .../app/controllers/PetApiController.java | 2 +- .../app/controllers/PetApiController.java | 2 +- .../app/controllers/PetApiController.java | 2 +- .../app/controllers/PetApiController.java | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApiController.mustache b/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApiController.mustache index 9aabde2f28da..f9c14cbde1cf 100644 --- a/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApiController.mustache +++ b/modules/openapi-generator/src/main/resources/JavaPlayFramework/newApiController.mustache @@ -196,7 +196,7 @@ public class {{classname}}Controller extends Controller { } {{/collectionFormat}} {{^collectionFormat}} - String value{{paramName}} = request.header("{{baseName}}").get(); + String value{{paramName}} = request.header("{{baseName}}").orElse(null); {{{dataType}}} {{paramName}}; if (value{{paramName}} != null) { {{paramName}} = {{>conversionBegin}}value{{paramName}}{{>conversionEnd}}; diff --git a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiController.java b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiController.java index d7fb41eb1f9d..55ff3e6b7952 100644 --- a/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiController.java +++ b/samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiController.java @@ -55,7 +55,7 @@ public Result addPet(Http.Request request) throws Exception { @ApiAction public Result deletePet(Http.Request request, Long petId) throws Exception { - String valueapiKey = request.header("api_key").get(); + String valueapiKey = request.header("api_key").orElse(null); String apiKey; if (valueapiKey != null) { apiKey = valueapiKey; diff --git a/samples/server/petstore/java-play-framework-async/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-async/app/controllers/PetApiController.java index 23694debaaeb..093fa1b2a6ce 100644 --- a/samples/server/petstore/java-play-framework-async/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework-async/app/controllers/PetApiController.java @@ -58,7 +58,7 @@ public CompletionStage addPet(Http.Request request) throws Exception { @ApiAction public CompletionStage deletePet(Http.Request request, Long petId) throws Exception { - String valueapiKey = request.header("api_key").get(); + String valueapiKey = request.header("api_key").orElse(null); String apiKey; if (valueapiKey != null) { apiKey = valueapiKey; diff --git a/samples/server/petstore/java-play-framework-controller-only/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-controller-only/app/controllers/PetApiController.java index adf8e0c4b02b..a477bbba24ea 100644 --- a/samples/server/petstore/java-play-framework-controller-only/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework-controller-only/app/controllers/PetApiController.java @@ -53,7 +53,7 @@ public Result addPet(Http.Request request) throws Exception { @ApiAction public Result deletePet(Http.Request request, Long petId) throws Exception { - String valueapiKey = request.header("api_key").get(); + String valueapiKey = request.header("api_key").orElse(null); String apiKey; if (valueapiKey != null) { apiKey = valueapiKey; diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiController.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiController.java index 43ff6b75acce..8cc88003ee33 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiController.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiController.java @@ -327,7 +327,7 @@ public Result testEnumParameters(Http.Request request) throws Exception { enumHeaderStringArray.add(curParam); } } - String valueenumHeaderString = request.header("enum_header_string").get(); + String valueenumHeaderString = request.header("enum_header_string").orElse(null); String enumHeaderString; if (valueenumHeaderString != null) { enumHeaderString = valueenumHeaderString; @@ -367,14 +367,14 @@ public Result testGroupParameters(Http.Request request) throws Exception { } else { int64Group = null; } - String valuerequiredBooleanGroup = request.header("required_boolean_group").get(); + String valuerequiredBooleanGroup = request.header("required_boolean_group").orElse(null); Boolean requiredBooleanGroup; if (valuerequiredBooleanGroup != null) { requiredBooleanGroup = Boolean.valueOf(valuerequiredBooleanGroup); } else { throw new IllegalArgumentException("'required_boolean_group' parameter is required"); } - String valuebooleanGroup = request.header("boolean_group").get(); + String valuebooleanGroup = request.header("boolean_group").orElse(null); Boolean booleanGroup; if (valuebooleanGroup != null) { booleanGroup = Boolean.valueOf(valuebooleanGroup); diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiController.java index 6ef40b879b47..700be254347a 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiController.java @@ -56,7 +56,7 @@ public Result addPet(Http.Request request) throws Exception { @ApiAction public Result deletePet(Http.Request request, Long petId) throws Exception { - String valueapiKey = request.header("api_key").get(); + String valueapiKey = request.header("api_key").orElse(null); String apiKey; if (valueapiKey != null) { apiKey = valueapiKey; diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiController.java index 9f90782b4489..0867c0e1e36a 100644 --- a/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiController.java @@ -48,7 +48,7 @@ public Result addPet(Http.Request request) throws Exception { @ApiAction public Result deletePet(Http.Request request, Long petId) throws Exception { - String valueapiKey = request.header("api_key").get(); + String valueapiKey = request.header("api_key").orElse(null); String apiKey; if (valueapiKey != null) { apiKey = valueapiKey; diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiController.java index 893717c9e2ee..e52afb643a2b 100644 --- a/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiController.java @@ -56,7 +56,7 @@ public Result addPet(Http.Request request) throws IOException { @ApiAction public Result deletePet(Http.Request request, Long petId) { - String valueapiKey = request.header("api_key").get(); + String valueapiKey = request.header("api_key").orElse(null); String apiKey; if (valueapiKey != null) { apiKey = valueapiKey; diff --git a/samples/server/petstore/java-play-framework-no-interface/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-no-interface/app/controllers/PetApiController.java index 472f237a5bb2..f43290fb2124 100644 --- a/samples/server/petstore/java-play-framework-no-interface/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework-no-interface/app/controllers/PetApiController.java @@ -64,7 +64,7 @@ public Result addPet(Http.Request request) throws Exception { @ApiAction public Result deletePet(Http.Request request, Long petId) throws Exception { - String valueapiKey = request.header("api_key").get(); + String valueapiKey = request.header("api_key").orElse(null); String apiKey; if (valueapiKey != null) { apiKey = valueapiKey; diff --git a/samples/server/petstore/java-play-framework-no-nullable/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-no-nullable/app/controllers/PetApiController.java index 9b4ea3e85f1f..1ddc6c1eecf9 100644 --- a/samples/server/petstore/java-play-framework-no-nullable/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework-no-nullable/app/controllers/PetApiController.java @@ -55,7 +55,7 @@ public Result addPet(Http.Request request) throws Exception { @ApiAction public Result deletePet(Http.Request request, Long petId) throws Exception { - String valueapiKey = request.header("api_key").get(); + String valueapiKey = request.header("api_key").orElse(null); String apiKey; if (valueapiKey != null) { apiKey = valueapiKey; diff --git a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiController.java index 9b4ea3e85f1f..1ddc6c1eecf9 100644 --- a/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiController.java @@ -55,7 +55,7 @@ public Result addPet(Http.Request request) throws Exception { @ApiAction public Result deletePet(Http.Request request, Long petId) throws Exception { - String valueapiKey = request.header("api_key").get(); + String valueapiKey = request.header("api_key").orElse(null); String apiKey; if (valueapiKey != null) { apiKey = valueapiKey; diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiController.java index 86074165e002..617a9ad9571e 100644 --- a/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiController.java @@ -54,7 +54,7 @@ public Result addPet(Http.Request request) throws Exception { public Result deletePet(Http.Request request, Long petId) throws Exception { - String valueapiKey = request.header("api_key").get(); + String valueapiKey = request.header("api_key").orElse(null); String apiKey; if (valueapiKey != null) { apiKey = valueapiKey; diff --git a/samples/server/petstore/java-play-framework/app/controllers/PetApiController.java b/samples/server/petstore/java-play-framework/app/controllers/PetApiController.java index 9b4ea3e85f1f..1ddc6c1eecf9 100644 --- a/samples/server/petstore/java-play-framework/app/controllers/PetApiController.java +++ b/samples/server/petstore/java-play-framework/app/controllers/PetApiController.java @@ -55,7 +55,7 @@ public Result addPet(Http.Request request) throws Exception { @ApiAction public Result deletePet(Http.Request request, Long petId) throws Exception { - String valueapiKey = request.header("api_key").get(); + String valueapiKey = request.header("api_key").orElse(null); String apiKey; if (valueapiKey != null) { apiKey = valueapiKey;