Skip to content

Commit

Permalink
make Query.toUrlEncoded more compact
Browse files Browse the repository at this point in the history
  • Loading branch information
@jhannes
jhannes committed Aug 25, 2024
1 parent d5cfa3d commit 8dd25be
Show file tree
Hide file tree
Showing 11 changed files with 53 additions and 159 deletions.
20 changes: 5 additions & 15 deletions ...napshot/bigExample/src/main/java/io/github/jhannes/openapi/bigExample/api/DefaultApi.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,8 @@ class AddPetWithFormForm {

public String toUrlEncoded() {
List<String> 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);
}
}
Expand Down Expand Up @@ -77,15 +73,9 @@ class ListPetsQuery {

public String toUrlEncoded() {
List<String> 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);
}
}
Expand Down
20 changes: 5 additions & 15 deletions ...ests/snapshot/example/src/main/java/io/github/jhannes/openapi/example/api/DefaultApi.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,8 @@ class AddPetWithFormForm {

public String toUrlEncoded() {
List<String> 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);
}
}
Expand All @@ -72,15 +68,9 @@ class ListPetsQuery {

public String toUrlEncoded() {
List<String> 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);
}
}
Expand Down
8 changes: 2 additions & 6 deletions ...ionTracker/src/main/java/io/github/jhannes/openapi/infectionTracker/api/ExposuresApi.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,8 @@ class ListExposuresQuery {

public String toUrlEncoded() {
List<String> 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);
}
}
Expand Down
16 changes: 4 additions & 12 deletions ...n/src/main/java/io/github/jhannes/openapi/openid_configuration/api/IdentityClientApi.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,18 +40,10 @@ class HandleCallbackQuery {

public String toUrlEncoded() {
List<String> 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);
}
}
Expand Down
76 changes: 19 additions & 57 deletions ...src/main/java/io/github/jhannes/openapi/openid_configuration/api/IdentityProviderApi.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,39 +61,17 @@ class AuthorizationQuery {

public String toUrlEncoded() {
List<String> 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);
}
}
Expand Down Expand Up @@ -139,30 +117,14 @@ class FetchTokenForm {

public String toUrlEncoded() {
List<String> 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);
}
}
Expand Down
24 changes: 6 additions & 18 deletions ...tTests/snapshot/petstore/src/main/java/io/github/jhannes/openapi/petstore/api/PetApi.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,7 @@ class FindPetsByStatusQuery {

public String toUrlEncoded() {
List<String> 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);
}
}
Expand All @@ -84,9 +82,7 @@ class FindPetsByTagsQuery {

public String toUrlEncoded() {
List<String> 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);
}
}
Expand Down Expand Up @@ -125,12 +121,8 @@ class UpdatePetWithFormForm {

public String toUrlEncoded() {
List<String> 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);
}
}
Expand All @@ -153,12 +145,8 @@ class UploadFileForm {

public String toUrlEncoded() {
List<String> 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);
}
}
Expand Down
4 changes: 1 addition & 3 deletions ...ests/snapshot/petstore/src/main/java/io/github/jhannes/openapi/petstore/api/StoreApi.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,7 @@ class GetInventoryQuery {

public String toUrlEncoded() {
List<String> 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);
}
}
Expand Down
8 changes: 2 additions & 6 deletions ...Tests/snapshot/petstore/src/main/java/io/github/jhannes/openapi/petstore/api/UserApi.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,8 @@ class LoginUserQuery {

public String toUrlEncoded() {
List<String> 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);
}
}
Expand Down
20 changes: 5 additions & 15 deletions ...ts/snapshot/readOnly/src/main/java/io/github/jhannes/openapi/readOnly/api/DefaultApi.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,8 @@ class AddPetWithFormForm {

public String toUrlEncoded() {
List<String> 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);
}
}
Expand All @@ -72,15 +68,9 @@ class ListPetsQuery {

public String toUrlEncoded() {
List<String> 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);
}
}
Expand Down
8 changes: 2 additions & 6 deletions .../snapshot/reqres-in/src/main/java/io/github/jhannes/openapi/reqres_in/api/DefaultApi.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,8 @@ class UsersGetQuery {

public String toUrlEncoded() {
List<String> 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);
}
}
Expand Down
8 changes: 2 additions & 6 deletions src/main/resources/JavaLombok/api.handlebars
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,7 @@ public interface {{classname}} {
public String toUrlEncoded() {
List<String> 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);
}
Expand All @@ -84,9 +82,7 @@ public interface {{classname}} {
public String toUrlEncoded() {
List<String> 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);
}
Expand Down

0 comments on commit 8dd25be

Please sign in to comment.