loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-12-08 08:06:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix #15982 : (#15984)

Browse Source 
- Use 'orElse' instead of 'get' to avoid Exception for non required headers
- Update samples
This commit is contained in:
AntoineDuComptoirDesPharmacies
2023-07-04 17:30:21 +02:00
committed by GitHub
parent 0bb9088f3e
commit 85df55b20e
13 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/openapi-generator/src/main/resources/JavaPlayFramework/newApiController.mustache vendored
View File

@@ -196,7 +196,7 @@ public class {{classname}}Controller extends Controller {
} }
{{/collectionFormat}} {{/collectionFormat}}
{{^collectionFormat}} {{^collectionFormat}}
String value{{paramName}} = request.header("{{baseName}}").get(); String value{{paramName}} = request.header("{{baseName}}").orElse(null);
{{{dataType}}} {{paramName}}; {{{dataType}}} {{paramName}};
if (value{{paramName}} != null) { if (value{{paramName}} != null) {
{{paramName}} = {{>conversionBegin}}value{{paramName}}{{>conversionEnd}}; {{paramName}} = {{>conversionBegin}}value{{paramName}}{{>conversionEnd}};

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

@@ -55,7 +55,7 @@ public class PetApiController extends Controller {
@ApiAction @ApiAction
public Result deletePet(Http.Request request, Long petId) 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; String apiKey;
if (valueapiKey != null) { if (valueapiKey != null) {
apiKey = valueapiKey; apiKey = valueapiKey;

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

@@ -58,7 +58,7 @@ public class PetApiController extends Controller {
@ApiAction @ApiAction
public CompletionStage<Result> deletePet(Http.Request request, Long petId) throws Exception { 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; String apiKey;
if (valueapiKey != null) { if (valueapiKey != null) {
apiKey = valueapiKey; apiKey = valueapiKey;

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

@@ -53,7 +53,7 @@ public class PetApiController extends Controller {
@ApiAction @ApiAction
public Result deletePet(Http.Request request, Long petId) 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; String apiKey;
if (valueapiKey != null) { if (valueapiKey != null) {
apiKey = valueapiKey; apiKey = valueapiKey;

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

@@ -327,7 +327,7 @@ public class FakeApiController extends Controller {
enumHeaderStringArray.add(curParam); enumHeaderStringArray.add(curParam);
} }
} }
String valueenumHeaderString = request.header("enum_header_string").get(); String valueenumHeaderString = request.header("enum_header_string").orElse(null);
String enumHeaderString; String enumHeaderString;
if (valueenumHeaderString != null) { if (valueenumHeaderString != null) {
enumHeaderString = valueenumHeaderString; enumHeaderString = valueenumHeaderString;
@@ -367,14 +367,14 @@ public class FakeApiController extends Controller {
} else { } else {
int64Group = null; int64Group = null;
} }
String valuerequiredBooleanGroup = request.header("required_boolean_group").get(); String valuerequiredBooleanGroup = request.header("required_boolean_group").orElse(null);
Boolean requiredBooleanGroup; Boolean requiredBooleanGroup;
if (valuerequiredBooleanGroup != null) { if (valuerequiredBooleanGroup != null) {
requiredBooleanGroup = Boolean.valueOf(valuerequiredBooleanGroup); requiredBooleanGroup = Boolean.valueOf(valuerequiredBooleanGroup);
} else { } else {
throw new IllegalArgumentException("'required_boolean_group' parameter is required"); 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; Boolean booleanGroup;
if (valuebooleanGroup != null) { if (valuebooleanGroup != null) {
booleanGroup = Boolean.valueOf(valuebooleanGroup); booleanGroup = Boolean.valueOf(valuebooleanGroup);

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

@@ -56,7 +56,7 @@ public class PetApiController extends Controller {
@ApiAction @ApiAction
public Result deletePet(Http.Request request, Long petId) 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; String apiKey;
if (valueapiKey != null) { if (valueapiKey != null) {
apiKey = valueapiKey; apiKey = valueapiKey;

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

@@ -48,7 +48,7 @@ public class PetApiController extends Controller {
@ApiAction @ApiAction
public Result deletePet(Http.Request request, Long petId) 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; String apiKey;
if (valueapiKey != null) { if (valueapiKey != null) {
apiKey = valueapiKey; apiKey = valueapiKey;

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

@@ -56,7 +56,7 @@ public class PetApiController extends Controller {
@ApiAction @ApiAction
public Result deletePet(Http.Request request, Long petId) { 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; String apiKey;
if (valueapiKey != null) { if (valueapiKey != null) {
apiKey = valueapiKey; apiKey = valueapiKey;

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

@@ -64,7 +64,7 @@ public class PetApiController extends Controller {
@ApiAction @ApiAction
public Result deletePet(Http.Request request, Long petId) 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; String apiKey;
if (valueapiKey != null) { if (valueapiKey != null) {
apiKey = valueapiKey; apiKey = valueapiKey;

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

@@ -55,7 +55,7 @@ public class PetApiController extends Controller {
@ApiAction @ApiAction
public Result deletePet(Http.Request request, Long petId) 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; String apiKey;
if (valueapiKey != null) { if (valueapiKey != null) {
apiKey = valueapiKey; apiKey = valueapiKey;

2
samples/server/petstore/java-play-framework-no-swagger-ui/app/controllers/PetApiController.java
View File

@@ -55,7 +55,7 @@ public class PetApiController extends Controller {
@ApiAction @ApiAction
public Result deletePet(Http.Request request, Long petId) 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; String apiKey;
if (valueapiKey != null) { if (valueapiKey != null) {
apiKey = valueapiKey; apiKey = valueapiKey;

2
samples/server/petstore/java-play-framework-no-wrap-calls/app/controllers/PetApiController.java
View File

@@ -54,7 +54,7 @@ public class PetApiController extends Controller {
public Result deletePet(Http.Request request, Long petId) 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; String apiKey;
if (valueapiKey != null) { if (valueapiKey != null) {
apiKey = valueapiKey; apiKey = valueapiKey;

2
samples/server/petstore/java-play-framework/app/controllers/PetApiController.java
View File

@@ -55,7 +55,7 @@ public class PetApiController extends Controller {
@ApiAction @ApiAction
public Result deletePet(Http.Request request, Long petId) 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; String apiKey;
if (valueapiKey != null) { if (valueapiKey != null) {
apiKey = valueapiKey; apiKey = valueapiKey;