From f0016d1f1f870117f95b5e240b131584a9643e57 Mon Sep 17 00:00:00 2001 From: Carlos Chacin Date: Tue, 4 Feb 2025 00:40:40 -0800 Subject: [PATCH] fix: Add static modifier to inner class --- .../Java/libraries/webclient/api.mustache | 2 +- .../codegen/java/JavaClientCodegenTest.java | 2 +- .../java/org/openapitools/client/api/FakeApi.java | 14 +++++++------- .../java/org/openapitools/client/api/PetApi.java | 8 ++++---- .../java/org/openapitools/client/api/UserApi.java | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/api.mustache index b1c395b085128..3dcfd0596748c 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/api.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/api.mustache @@ -54,7 +54,7 @@ public class {{classname}} { } {{#operation}}{{#useSingleRequestParameter}}{{#hasParams}}{{^hasSingleParam}} - public class {{#lambda.titlecase}}{{operationId}}{{/lambda.titlecase}}Request { + public static class {{#lambda.titlecase}}{{operationId}}{{/lambda.titlecase}}Request { {{#allParams}} private final {{#isFile}}{{#useAbstractionForFiles}}{{#collectionFormat}}java.util.Collection{{/collectionFormat}}{{^collectionFormat}}org.springframework.core.io.AbstractResource{{/collectionFormat}}{{/useAbstractionForFiles}}{{^useAbstractionForFiles}}{{{dataType}}}{{/useAbstractionForFiles}}{{/isFile}}{{^isFile}}{{{dataType}}}{{/isFile}} {{paramName}}; {{/allParams}} diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java index 3ce56219fb499..2d68c374a7bef 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java @@ -3259,7 +3259,7 @@ public void testDuplicatedOperationId() { TestUtils.assertFileContains( output.resolve("src/main/java/xyz/abcdef/api/PetApi.java"), - "public class DeletePetRequest {", + "public static class DeletePetRequest {", "DeletePetRequest(Long petId, String apiKey)", "Long petId()", "String apiKey()", diff --git a/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/FakeApi.java index 285ce26420426..c7dd3a26ee92c 100644 --- a/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/FakeApi.java +++ b/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/FakeApi.java @@ -191,7 +191,7 @@ public ResponseSpec fakeHealthGetWithResponseSpec() throws WebClientResponseExce return fakeHealthGetRequestCreation(); } - public class FakeHttpSignatureTestRequest { + public static class FakeHttpSignatureTestRequest { private final Pet pet; private final String query1; private final String header1; @@ -900,7 +900,7 @@ public ResponseSpec testBodyWithFileSchemaWithResponseSpec(FileSchemaTestClass f return testBodyWithFileSchemaRequestCreation(fileSchemaTestClass); } - public class TestBodyWithQueryParamsRequest { + public static class TestBodyWithQueryParamsRequest { private final String query; private final User user; @@ -1107,7 +1107,7 @@ public ResponseSpec testClientModelWithResponseSpec(Client client) throws WebCli return testClientModelRequestCreation(client); } - public class TestEndpointParametersRequest { + public static class TestEndpointParametersRequest { private final BigDecimal number; private final Double _double; private final String patternWithoutDelimiter; @@ -1389,7 +1389,7 @@ public ResponseSpec testEndpointParametersWithResponseSpec(BigDecimal number, Do return testEndpointParametersRequestCreation(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback); } - public class TestEnumParametersRequest { + public static class TestEnumParametersRequest { private final List enumHeaderStringArray; private final String enumHeaderString; private final List enumQueryStringArray; @@ -1597,7 +1597,7 @@ public ResponseSpec testEnumParametersWithResponseSpec(List enumHeaderSt return testEnumParametersRequestCreation(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString); } - public class TestGroupParametersRequest { + public static class TestGroupParametersRequest { private final Integer requiredStringGroup; private final Boolean requiredBooleanGroup; private final Long requiredInt64Group; @@ -1915,7 +1915,7 @@ public ResponseSpec testInlineFreeformAdditionalPropertiesWithResponseSpec(TestI return testInlineFreeformAdditionalPropertiesRequestCreation(testInlineFreeformAdditionalPropertiesRequest); } - public class TestJsonFormDataRequest { + public static class TestJsonFormDataRequest { private final String param; private final String param2; @@ -2120,7 +2120,7 @@ public ResponseSpec testNullableWithResponseSpec(ChildWithNullable childWithNull return testNullableRequestCreation(childWithNullable); } - public class TestQueryParameterCollectionFormatRequest { + public static class TestQueryParameterCollectionFormatRequest { private final List pipe; private final List ioutil; private final List http; diff --git a/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/PetApi.java index ab7891d0b3606..7f5d40aca6fa1 100644 --- a/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/PetApi.java +++ b/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/PetApi.java @@ -124,7 +124,7 @@ public ResponseSpec addPetWithResponseSpec(Pet pet) throws WebClientResponseExce return addPetRequestCreation(pet); } - public class DeletePetRequest { + public static class DeletePetRequest { private final Long petId; private final String apiKey; @@ -585,7 +585,7 @@ public ResponseSpec updatePetWithResponseSpec(Pet pet) throws WebClientResponseE return updatePetRequestCreation(pet); } - public class UpdatePetWithFormRequest { + public static class UpdatePetWithFormRequest { private final Long petId; private final String name; private final String status; @@ -734,7 +734,7 @@ public ResponseSpec updatePetWithFormWithResponseSpec(Long petId, String name, S return updatePetWithFormRequestCreation(petId, name, status); } - public class UploadFileRequest { + public static class UploadFileRequest { private final Long petId; private final String additionalMetadata; private final File _file; @@ -883,7 +883,7 @@ public ResponseSpec uploadFileWithResponseSpec(Long petId, String additionalMeta return uploadFileRequestCreation(petId, additionalMetadata, _file); } - public class UploadFileWithRequiredFileRequest { + public static class UploadFileWithRequiredFileRequest { private final Long petId; private final File requiredFile; private final String additionalMetadata; diff --git a/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/UserApi.java index 006f7e661bcb3..648e243add1de 100644 --- a/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/UserApi.java +++ b/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/api/UserApi.java @@ -415,7 +415,7 @@ public ResponseSpec getUserByNameWithResponseSpec(String username) throws WebCli return getUserByNameRequestCreation(username); } - public class LoginUserRequest { + public static class LoginUserRequest { private final String username; private final String password; @@ -620,7 +620,7 @@ public ResponseSpec logoutUserWithResponseSpec() throws WebClientResponseExcepti return logoutUserRequestCreation(); } - public class UpdateUserRequest { + public static class UpdateUserRequest { private final String username; private final User user;