Skip to content

Commit 85df55b

Browse files
Bugfix #15982 : (#15984)
- Use 'orElse' instead of 'get' to avoid Exception for non required headers - Update samples
1 parent 0bb9088 commit 85df55b

13 files changed

Lines changed: 15 additions & 15 deletions

File tree

modules/openapi-generator/src/main/resources/JavaPlayFramework/newApiController.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ public class {{classname}}Controller extends Controller {
196196
}
197197
{{/collectionFormat}}
198198
{{^collectionFormat}}
199-
String value{{paramName}} = request.header("{{baseName}}").get();
199+
String value{{paramName}} = request.header("{{baseName}}").orElse(null);
200200
{{{dataType}}} {{paramName}};
201201
if (value{{paramName}} != null) {
202202
{{paramName}} = {{>conversionBegin}}value{{paramName}}{{>conversionEnd}};

samples/server/petstore/java-play-framework-api-package-override/app/com/puppies/store/apis/PetApiController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public Result addPet(Http.Request request) throws Exception {
5555

5656
@ApiAction
5757
public Result deletePet(Http.Request request, Long petId) throws Exception {
58-
String valueapiKey = request.header("api_key").get();
58+
String valueapiKey = request.header("api_key").orElse(null);
5959
String apiKey;
6060
if (valueapiKey != null) {
6161
apiKey = valueapiKey;

samples/server/petstore/java-play-framework-async/app/controllers/PetApiController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public CompletionStage<Result> addPet(Http.Request request) throws Exception {
5858

5959
@ApiAction
6060
public CompletionStage<Result> deletePet(Http.Request request, Long petId) throws Exception {
61-
String valueapiKey = request.header("api_key").get();
61+
String valueapiKey = request.header("api_key").orElse(null);
6262
String apiKey;
6363
if (valueapiKey != null) {
6464
apiKey = valueapiKey;

samples/server/petstore/java-play-framework-controller-only/app/controllers/PetApiController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public Result addPet(Http.Request request) throws Exception {
5353

5454
@ApiAction
5555
public Result deletePet(Http.Request request, Long petId) throws Exception {
56-
String valueapiKey = request.header("api_key").get();
56+
String valueapiKey = request.header("api_key").orElse(null);
5757
String apiKey;
5858
if (valueapiKey != null) {
5959
apiKey = valueapiKey;

samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiController.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ public Result testEnumParameters(Http.Request request) throws Exception {
327327
enumHeaderStringArray.add(curParam);
328328
}
329329
}
330-
String valueenumHeaderString = request.header("enum_header_string").get();
330+
String valueenumHeaderString = request.header("enum_header_string").orElse(null);
331331
String enumHeaderString;
332332
if (valueenumHeaderString != null) {
333333
enumHeaderString = valueenumHeaderString;
@@ -367,14 +367,14 @@ public Result testGroupParameters(Http.Request request) throws Exception {
367367
} else {
368368
int64Group = null;
369369
}
370-
String valuerequiredBooleanGroup = request.header("required_boolean_group").get();
370+
String valuerequiredBooleanGroup = request.header("required_boolean_group").orElse(null);
371371
Boolean requiredBooleanGroup;
372372
if (valuerequiredBooleanGroup != null) {
373373
requiredBooleanGroup = Boolean.valueOf(valuerequiredBooleanGroup);
374374
} else {
375375
throw new IllegalArgumentException("'required_boolean_group' parameter is required");
376376
}
377-
String valuebooleanGroup = request.header("boolean_group").get();
377+
String valuebooleanGroup = request.header("boolean_group").orElse(null);
378378
Boolean booleanGroup;
379379
if (valuebooleanGroup != null) {
380380
booleanGroup = Boolean.valueOf(valuebooleanGroup);

samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/PetApiController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public Result addPet(Http.Request request) throws Exception {
5656

5757
@ApiAction
5858
public Result deletePet(Http.Request request, Long petId) throws Exception {
59-
String valueapiKey = request.header("api_key").get();
59+
String valueapiKey = request.header("api_key").orElse(null);
6060
String apiKey;
6161
if (valueapiKey != null) {
6262
apiKey = valueapiKey;

samples/server/petstore/java-play-framework-no-bean-validation/app/controllers/PetApiController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public Result addPet(Http.Request request) throws Exception {
4848

4949
@ApiAction
5050
public Result deletePet(Http.Request request, Long petId) throws Exception {
51-
String valueapiKey = request.header("api_key").get();
51+
String valueapiKey = request.header("api_key").orElse(null);
5252
String apiKey;
5353
if (valueapiKey != null) {
5454
apiKey = valueapiKey;

samples/server/petstore/java-play-framework-no-exception-handling/app/controllers/PetApiController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public Result addPet(Http.Request request) throws IOException {
5656

5757
@ApiAction
5858
public Result deletePet(Http.Request request, Long petId) {
59-
String valueapiKey = request.header("api_key").get();
59+
String valueapiKey = request.header("api_key").orElse(null);
6060
String apiKey;
6161
if (valueapiKey != null) {
6262
apiKey = valueapiKey;

samples/server/petstore/java-play-framework-no-interface/app/controllers/PetApiController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public Result addPet(Http.Request request) throws Exception {
6464

6565
@ApiAction
6666
public Result deletePet(Http.Request request, Long petId) throws Exception {
67-
String valueapiKey = request.header("api_key").get();
67+
String valueapiKey = request.header("api_key").orElse(null);
6868
String apiKey;
6969
if (valueapiKey != null) {
7070
apiKey = valueapiKey;

samples/server/petstore/java-play-framework-no-nullable/app/controllers/PetApiController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public Result addPet(Http.Request request) throws Exception {
5555

5656
@ApiAction
5757
public Result deletePet(Http.Request request, Long petId) throws Exception {
58-
String valueapiKey = request.header("api_key").get();
58+
String valueapiKey = request.header("api_key").orElse(null);
5959
String apiKey;
6060
if (valueapiKey != null) {
6161
apiKey = valueapiKey;

0 commit comments

Comments
 (0)