Bugfix OpenAPITools#15982 : (OpenAPITools#15984)

- Use 'orElse' instead of 'get' to avoid Exception for non required headers - Update samples
MelleD · Jul 4, 2023 · 85df55b · 85df55b
1 parent 0bb9088
commit 85df55b
Show file tree

Hide file tree

Showing 13 changed files with 15 additions and 15 deletions.
diff --git 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/...java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiController.java b/...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
@@ -58,7 +58,7 @@ public CompletionStage<Result> addPet(Http.Request request) throws Exception {
 
     @ApiAction
     public CompletionStage<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/...server/petstore/java-play-framework-controller-only/app/controllers/PetApiController.java b/...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/...server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiController.java b/...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/.../server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiController.java b/.../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/...ver/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiController.java b/...ver/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/.../petstore/java-play-framework-no-exception-handling/app/controllers/PetApiController.java b/.../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/...es/server/petstore/java-play-framework-no-interface/app/controllers/PetApiController.java b/...es/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/...les/server/petstore/java-play-framework-no-nullable/app/controllers/PetApiController.java b/...les/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/...s/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiController.java b/...s/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/...s/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiController.java b/...s/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
@@ -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;