From 8dd25be474558385569bf10c721c1dea03424f10 Mon Sep 17 00:00:00 2001 From: Johannes Brodwall Date: Sun, 25 Aug 2024 18:11:51 +0200 Subject: [PATCH] make Query.toUrlEncoded more compact --- .../openapi/bigExample/api/DefaultApi.java | 20 ++--- .../openapi/example/api/DefaultApi.java | 20 ++--- .../infectionTracker/api/ExposuresApi.java | 8 +- .../api/IdentityClientApi.java | 16 +--- .../api/IdentityProviderApi.java | 76 +++++-------------- .../jhannes/openapi/petstore/api/PetApi.java | 24 ++---- .../openapi/petstore/api/StoreApi.java | 4 +- .../jhannes/openapi/petstore/api/UserApi.java | 8 +- .../openapi/readOnly/api/DefaultApi.java | 20 ++--- .../openapi/reqres_in/api/DefaultApi.java | 8 +- src/main/resources/JavaLombok/api.handlebars | 8 +- 11 files changed, 53 insertions(+), 159 deletions(-) diff --git a/snapshotTests/snapshot/bigExample/src/main/java/io/github/jhannes/openapi/bigExample/api/DefaultApi.java b/snapshotTests/snapshot/bigExample/src/main/java/io/github/jhannes/openapi/bigExample/api/DefaultApi.java index 21ded1e..40cabe3 100644 --- a/snapshotTests/snapshot/bigExample/src/main/java/io/github/jhannes/openapi/bigExample/api/DefaultApi.java +++ b/snapshotTests/snapshot/bigExample/src/main/java/io/github/jhannes/openapi/bigExample/api/DefaultApi.java @@ -41,12 +41,8 @@ class AddPetWithFormForm { public String toUrlEncoded() { List parameters = new ArrayList<>(); - if (name != null) { - parameters.add("name=" + encode(name.toString(), UTF_8)); - } - if (status != null) { - parameters.add("status=" + encode(status.toString(), UTF_8)); - } + if (name != null) parameters.add("name=" + encode(name.toString(), UTF_8)); + if (status != null) parameters.add("status=" + encode(status.toString(), UTF_8)); return String.join("&", parameters); } } @@ -77,15 +73,9 @@ class ListPetsQuery { public String toUrlEncoded() { List parameters = new ArrayList<>(); - if (status != null) { - parameters.add("status=" + encode(status.toString(), UTF_8)); - } - if (tags != null) { - parameters.add("tags=" + encode(tags.toString(), UTF_8)); - } - if (bornAfter != null) { - parameters.add("bornAfter=" + encode(bornAfter.toString(), UTF_8)); - } + if (status != null) parameters.add("status=" + encode(status.toString(), UTF_8)); + if (tags != null) parameters.add("tags=" + encode(tags.toString(), UTF_8)); + if (bornAfter != null) parameters.add("bornAfter=" + encode(bornAfter.toString(), UTF_8)); return String.join("&", parameters); } } diff --git a/snapshotTests/snapshot/example/src/main/java/io/github/jhannes/openapi/example/api/DefaultApi.java b/snapshotTests/snapshot/example/src/main/java/io/github/jhannes/openapi/example/api/DefaultApi.java index c31d1af..4f948ec 100644 --- a/snapshotTests/snapshot/example/src/main/java/io/github/jhannes/openapi/example/api/DefaultApi.java +++ b/snapshotTests/snapshot/example/src/main/java/io/github/jhannes/openapi/example/api/DefaultApi.java @@ -41,12 +41,8 @@ class AddPetWithFormForm { public String toUrlEncoded() { List parameters = new ArrayList<>(); - if (name != null) { - parameters.add("name=" + encode(name.toString(), UTF_8)); - } - if (status != null) { - parameters.add("status=" + encode(status.toString(), UTF_8)); - } + if (name != null) parameters.add("name=" + encode(name.toString(), UTF_8)); + if (status != null) parameters.add("status=" + encode(status.toString(), UTF_8)); return String.join("&", parameters); } } @@ -72,15 +68,9 @@ class ListPetsQuery { public String toUrlEncoded() { List parameters = new ArrayList<>(); - if (status != null) { - parameters.add("status=" + encode(status.toString(), UTF_8)); - } - if (tags != null) { - parameters.add("tags=" + encode(tags.toString(), UTF_8)); - } - if (bornAfter != null) { - parameters.add("bornAfter=" + encode(bornAfter.toString(), UTF_8)); - } + if (status != null) parameters.add("status=" + encode(status.toString(), UTF_8)); + if (tags != null) parameters.add("tags=" + encode(tags.toString(), UTF_8)); + if (bornAfter != null) parameters.add("bornAfter=" + encode(bornAfter.toString(), UTF_8)); return String.join("&", parameters); } } diff --git a/snapshotTests/snapshot/infectionTracker/src/main/java/io/github/jhannes/openapi/infectionTracker/api/ExposuresApi.java b/snapshotTests/snapshot/infectionTracker/src/main/java/io/github/jhannes/openapi/infectionTracker/api/ExposuresApi.java index 64337ce..1cfea88 100644 --- a/snapshotTests/snapshot/infectionTracker/src/main/java/io/github/jhannes/openapi/infectionTracker/api/ExposuresApi.java +++ b/snapshotTests/snapshot/infectionTracker/src/main/java/io/github/jhannes/openapi/infectionTracker/api/ExposuresApi.java @@ -32,12 +32,8 @@ class ListExposuresQuery { public String toUrlEncoded() { List parameters = new ArrayList<>(); - if (exposureDate != null) { - parameters.add("exposureDate=" + encode(exposureDate.toString(), UTF_8)); - } - if (maxCount != null) { - parameters.add("maxCount=" + encode(maxCount.toString(), UTF_8)); - } + if (exposureDate != null) parameters.add("exposureDate=" + encode(exposureDate.toString(), UTF_8)); + if (maxCount != null) parameters.add("maxCount=" + encode(maxCount.toString(), UTF_8)); return String.join("&", parameters); } } diff --git a/snapshotTests/snapshot/openid-configuration/src/main/java/io/github/jhannes/openapi/openid_configuration/api/IdentityClientApi.java b/snapshotTests/snapshot/openid-configuration/src/main/java/io/github/jhannes/openapi/openid_configuration/api/IdentityClientApi.java index 0cb48f0..80b1268 100644 --- a/snapshotTests/snapshot/openid-configuration/src/main/java/io/github/jhannes/openapi/openid_configuration/api/IdentityClientApi.java +++ b/snapshotTests/snapshot/openid-configuration/src/main/java/io/github/jhannes/openapi/openid_configuration/api/IdentityClientApi.java @@ -40,18 +40,10 @@ class HandleCallbackQuery { public String toUrlEncoded() { List parameters = new ArrayList<>(); - if (state != null) { - parameters.add("state=" + encode(state.toString(), UTF_8)); - } - if (code != null) { - parameters.add("code=" + encode(code.toString(), UTF_8)); - } - if (error != null) { - parameters.add("error=" + encode(error.toString(), UTF_8)); - } - if (errorDescription != null) { - parameters.add("error_description=" + encode(errorDescription.toString(), UTF_8)); - } + if (state != null) parameters.add("state=" + encode(state.toString(), UTF_8)); + if (code != null) parameters.add("code=" + encode(code.toString(), UTF_8)); + if (error != null) parameters.add("error=" + encode(error.toString(), UTF_8)); + if (errorDescription != null) parameters.add("error_description=" + encode(errorDescription.toString(), UTF_8)); return String.join("&", parameters); } } diff --git a/snapshotTests/snapshot/openid-configuration/src/main/java/io/github/jhannes/openapi/openid_configuration/api/IdentityProviderApi.java b/snapshotTests/snapshot/openid-configuration/src/main/java/io/github/jhannes/openapi/openid_configuration/api/IdentityProviderApi.java index cf21631..d0d478c 100644 --- a/snapshotTests/snapshot/openid-configuration/src/main/java/io/github/jhannes/openapi/openid_configuration/api/IdentityProviderApi.java +++ b/snapshotTests/snapshot/openid-configuration/src/main/java/io/github/jhannes/openapi/openid_configuration/api/IdentityProviderApi.java @@ -61,39 +61,17 @@ class AuthorizationQuery { public String toUrlEncoded() { List parameters = new ArrayList<>(); - if (responseType != null) { - parameters.add("response_type=" + encode(responseType.toString(), UTF_8)); - } - if (responseMode != null) { - parameters.add("response_mode=" + encode(responseMode.toString(), UTF_8)); - } - if (clientId != null) { - parameters.add("client_id=" + encode(clientId.toString(), UTF_8)); - } - if (state != null) { - parameters.add("state=" + encode(state.toString(), UTF_8)); - } - if (redirectUri != null) { - parameters.add("redirect_uri=" + encode(redirectUri.toString(), UTF_8)); - } - if (scope != null) { - parameters.add("scope=" + encode(scope.toString(), UTF_8)); - } - if (loginHint != null) { - parameters.add("login_hint=" + encode(loginHint.toString(), UTF_8)); - } - if (prompt != null) { - parameters.add("prompt=" + encode(prompt.toString(), UTF_8)); - } - if (acrValues != null) { - parameters.add("acr_values=" + encode(acrValues.toString(), UTF_8)); - } - if (nonce != null) { - parameters.add("nonce=" + encode(nonce.toString(), UTF_8)); - } - if (display != null) { - parameters.add("display=" + encode(display.toString(), UTF_8)); - } + if (responseType != null) parameters.add("response_type=" + encode(responseType.toString(), UTF_8)); + if (responseMode != null) parameters.add("response_mode=" + encode(responseMode.toString(), UTF_8)); + if (clientId != null) parameters.add("client_id=" + encode(clientId.toString(), UTF_8)); + if (state != null) parameters.add("state=" + encode(state.toString(), UTF_8)); + if (redirectUri != null) parameters.add("redirect_uri=" + encode(redirectUri.toString(), UTF_8)); + if (scope != null) parameters.add("scope=" + encode(scope.toString(), UTF_8)); + if (loginHint != null) parameters.add("login_hint=" + encode(loginHint.toString(), UTF_8)); + if (prompt != null) parameters.add("prompt=" + encode(prompt.toString(), UTF_8)); + if (acrValues != null) parameters.add("acr_values=" + encode(acrValues.toString(), UTF_8)); + if (nonce != null) parameters.add("nonce=" + encode(nonce.toString(), UTF_8)); + if (display != null) parameters.add("display=" + encode(display.toString(), UTF_8)); return String.join("&", parameters); } } @@ -139,30 +117,14 @@ class FetchTokenForm { public String toUrlEncoded() { List parameters = new ArrayList<>(); - if (grantType != null) { - parameters.add("grant_type=" + encode(grantType.toString(), UTF_8)); - } - if (clientId != null) { - parameters.add("client_id=" + encode(clientId.toString(), UTF_8)); - } - if (clientSecret != null) { - parameters.add("client_secret=" + encode(clientSecret.toString(), UTF_8)); - } - if (redirectUri != null) { - parameters.add("redirect_uri=" + encode(redirectUri.toString(), UTF_8)); - } - if (code != null) { - parameters.add("code=" + encode(code.toString(), UTF_8)); - } - if (refreshToken != null) { - parameters.add("refresh_token=" + encode(refreshToken.toString(), UTF_8)); - } - if (subjectToken != null) { - parameters.add("subject_token=" + encode(subjectToken.toString(), UTF_8)); - } - if (audience != null) { - parameters.add("audience=" + encode(audience.toString(), UTF_8)); - } + if (grantType != null) parameters.add("grant_type=" + encode(grantType.toString(), UTF_8)); + if (clientId != null) parameters.add("client_id=" + encode(clientId.toString(), UTF_8)); + if (clientSecret != null) parameters.add("client_secret=" + encode(clientSecret.toString(), UTF_8)); + if (redirectUri != null) parameters.add("redirect_uri=" + encode(redirectUri.toString(), UTF_8)); + if (code != null) parameters.add("code=" + encode(code.toString(), UTF_8)); + if (refreshToken != null) parameters.add("refresh_token=" + encode(refreshToken.toString(), UTF_8)); + if (subjectToken != null) parameters.add("subject_token=" + encode(subjectToken.toString(), UTF_8)); + if (audience != null) parameters.add("audience=" + encode(audience.toString(), UTF_8)); return String.join("&", parameters); } } diff --git a/snapshotTests/snapshot/petstore/src/main/java/io/github/jhannes/openapi/petstore/api/PetApi.java b/snapshotTests/snapshot/petstore/src/main/java/io/github/jhannes/openapi/petstore/api/PetApi.java index 507cc9b..2306c5a 100644 --- a/snapshotTests/snapshot/petstore/src/main/java/io/github/jhannes/openapi/petstore/api/PetApi.java +++ b/snapshotTests/snapshot/petstore/src/main/java/io/github/jhannes/openapi/petstore/api/PetApi.java @@ -60,9 +60,7 @@ class FindPetsByStatusQuery { public String toUrlEncoded() { List parameters = new ArrayList<>(); - if (status != null) { - parameters.add("status=" + encode(status.toString(), UTF_8)); - } + if (status != null) parameters.add("status=" + encode(status.toString(), UTF_8)); return String.join("&", parameters); } } @@ -84,9 +82,7 @@ class FindPetsByTagsQuery { public String toUrlEncoded() { List parameters = new ArrayList<>(); - if (tags != null) { - parameters.add("tags=" + encode(tags.toString(), UTF_8)); - } + if (tags != null) parameters.add("tags=" + encode(tags.toString(), UTF_8)); return String.join("&", parameters); } } @@ -125,12 +121,8 @@ class UpdatePetWithFormForm { public String toUrlEncoded() { List parameters = new ArrayList<>(); - if (name != null) { - parameters.add("name=" + encode(name.toString(), UTF_8)); - } - if (status != null) { - parameters.add("status=" + encode(status.toString(), UTF_8)); - } + if (name != null) parameters.add("name=" + encode(name.toString(), UTF_8)); + if (status != null) parameters.add("status=" + encode(status.toString(), UTF_8)); return String.join("&", parameters); } } @@ -153,12 +145,8 @@ class UploadFileForm { public String toUrlEncoded() { List parameters = new ArrayList<>(); - if (additionalMetadata != null) { - parameters.add("additionalMetadata=" + encode(additionalMetadata.toString(), UTF_8)); - } - if (_file != null) { - parameters.add("file=" + encode(_file.toString(), UTF_8)); - } + if (additionalMetadata != null) parameters.add("additionalMetadata=" + encode(additionalMetadata.toString(), UTF_8)); + if (_file != null) parameters.add("file=" + encode(_file.toString(), UTF_8)); return String.join("&", parameters); } } diff --git a/snapshotTests/snapshot/petstore/src/main/java/io/github/jhannes/openapi/petstore/api/StoreApi.java b/snapshotTests/snapshot/petstore/src/main/java/io/github/jhannes/openapi/petstore/api/StoreApi.java index d8ce268..c59169b 100644 --- a/snapshotTests/snapshot/petstore/src/main/java/io/github/jhannes/openapi/petstore/api/StoreApi.java +++ b/snapshotTests/snapshot/petstore/src/main/java/io/github/jhannes/openapi/petstore/api/StoreApi.java @@ -39,9 +39,7 @@ class GetInventoryQuery { public String toUrlEncoded() { List parameters = new ArrayList<>(); - if (effectiveDateTime != null) { - parameters.add("effectiveDateTime=" + encode(effectiveDateTime.toString(), UTF_8)); - } + if (effectiveDateTime != null) parameters.add("effectiveDateTime=" + encode(effectiveDateTime.toString(), UTF_8)); return String.join("&", parameters); } } diff --git a/snapshotTests/snapshot/petstore/src/main/java/io/github/jhannes/openapi/petstore/api/UserApi.java b/snapshotTests/snapshot/petstore/src/main/java/io/github/jhannes/openapi/petstore/api/UserApi.java index 1e9ab09..1dc8850 100644 --- a/snapshotTests/snapshot/petstore/src/main/java/io/github/jhannes/openapi/petstore/api/UserApi.java +++ b/snapshotTests/snapshot/petstore/src/main/java/io/github/jhannes/openapi/petstore/api/UserApi.java @@ -71,12 +71,8 @@ class LoginUserQuery { public String toUrlEncoded() { List parameters = new ArrayList<>(); - if (username != null) { - parameters.add("username=" + encode(username.toString(), UTF_8)); - } - if (password != null) { - parameters.add("password=" + encode(password.toString(), UTF_8)); - } + if (username != null) parameters.add("username=" + encode(username.toString(), UTF_8)); + if (password != null) parameters.add("password=" + encode(password.toString(), UTF_8)); return String.join("&", parameters); } } diff --git a/snapshotTests/snapshot/readOnly/src/main/java/io/github/jhannes/openapi/readOnly/api/DefaultApi.java b/snapshotTests/snapshot/readOnly/src/main/java/io/github/jhannes/openapi/readOnly/api/DefaultApi.java index 5fb3007..c385dd8 100644 --- a/snapshotTests/snapshot/readOnly/src/main/java/io/github/jhannes/openapi/readOnly/api/DefaultApi.java +++ b/snapshotTests/snapshot/readOnly/src/main/java/io/github/jhannes/openapi/readOnly/api/DefaultApi.java @@ -41,12 +41,8 @@ class AddPetWithFormForm { public String toUrlEncoded() { List parameters = new ArrayList<>(); - if (name != null) { - parameters.add("name=" + encode(name.toString(), UTF_8)); - } - if (status != null) { - parameters.add("status=" + encode(status.toString(), UTF_8)); - } + if (name != null) parameters.add("name=" + encode(name.toString(), UTF_8)); + if (status != null) parameters.add("status=" + encode(status.toString(), UTF_8)); return String.join("&", parameters); } } @@ -72,15 +68,9 @@ class ListPetsQuery { public String toUrlEncoded() { List parameters = new ArrayList<>(); - if (status != null) { - parameters.add("status=" + encode(status.toString(), UTF_8)); - } - if (tags != null) { - parameters.add("tags=" + encode(tags.toString(), UTF_8)); - } - if (bornAfter != null) { - parameters.add("bornAfter=" + encode(bornAfter.toString(), UTF_8)); - } + if (status != null) parameters.add("status=" + encode(status.toString(), UTF_8)); + if (tags != null) parameters.add("tags=" + encode(tags.toString(), UTF_8)); + if (bornAfter != null) parameters.add("bornAfter=" + encode(bornAfter.toString(), UTF_8)); return String.join("&", parameters); } } diff --git a/snapshotTests/snapshot/reqres-in/src/main/java/io/github/jhannes/openapi/reqres_in/api/DefaultApi.java b/snapshotTests/snapshot/reqres-in/src/main/java/io/github/jhannes/openapi/reqres_in/api/DefaultApi.java index 2cd2d22..2ecbd7c 100644 --- a/snapshotTests/snapshot/reqres-in/src/main/java/io/github/jhannes/openapi/reqres_in/api/DefaultApi.java +++ b/snapshotTests/snapshot/reqres-in/src/main/java/io/github/jhannes/openapi/reqres_in/api/DefaultApi.java @@ -54,12 +54,8 @@ class UsersGetQuery { public String toUrlEncoded() { List parameters = new ArrayList<>(); - if (page != null) { - parameters.add("page=" + encode(page.toString(), UTF_8)); - } - if (perPage != null) { - parameters.add("per_page=" + encode(perPage.toString(), UTF_8)); - } + if (page != null) parameters.add("page=" + encode(page.toString(), UTF_8)); + if (perPage != null) parameters.add("per_page=" + encode(perPage.toString(), UTF_8)); return String.join("&", parameters); } } diff --git a/src/main/resources/JavaLombok/api.handlebars b/src/main/resources/JavaLombok/api.handlebars index 0cca701..bd40b9a 100644 --- a/src/main/resources/JavaLombok/api.handlebars +++ b/src/main/resources/JavaLombok/api.handlebars @@ -65,9 +65,7 @@ public interface {{classname}} { public String toUrlEncoded() { List parameters = new ArrayList<>(); {{#queryParams}} - if ({{paramName}} != null) { - parameters.add("{{baseName}}=" + encode({{paramName}}.toString(), UTF_8)); - } + if ({{paramName}} != null) parameters.add("{{baseName}}=" + encode({{paramName}}.toString(), UTF_8)); {{/queryParams}} return String.join("&", parameters); } @@ -84,9 +82,7 @@ public interface {{classname}} { public String toUrlEncoded() { List parameters = new ArrayList<>(); {{#formParams}} - if ({{paramName}} != null) { - parameters.add("{{baseName}}=" + encode({{paramName}}.toString(), UTF_8)); - } + if ({{paramName}} != null) parameters.add("{{baseName}}=" + encode({{paramName}}.toString(), UTF_8)); {{/formParams}} return String.join("&", parameters); }