From 1dd84523fa41e534e1a9aa7e2cd2fc57c296cb71 Mon Sep 17 00:00:00 2001 From: Mattias-Sehlstedt <60173714+Mattias-Sehlstedt@users.noreply.github.com> Date: Thu, 10 Jul 2025 12:02:19 +0200 Subject: [PATCH 1/8] Add setting for generating the oneOf interfaces as sealed interfaces --- .../workflows/samples-java-client-jdk17.yaml | 3 + .../java-webclient-sealedInterface.yaml | 10 ++ docs/generators/java.md | 1 + .../codegen/languages/JavaClientCodegen.java | 14 +- .../Java/libraries/restclient/pojo.mustache | 2 +- .../Java/libraries/webclient/pojo.mustache | 2 +- .../Java/libraries/webclient/pom.mustache | 8 +- .../resources/Java/oneof_interface.mustache | 2 +- .../src/main/resources/Java/permits.mustache | 1 + .../src/main/resources/Java/sealed.mustache | 1 + .../codegen/java/JavaClientCodegenTest.java | 137 ++++++++++++++---- 11 files changed, 144 insertions(+), 37 deletions(-) create mode 100644 bin/configs/java-webclient-sealedInterface.yaml create mode 100644 modules/openapi-generator/src/main/resources/Java/permits.mustache create mode 100644 modules/openapi-generator/src/main/resources/Java/sealed.mustache diff --git a/.github/workflows/samples-java-client-jdk17.yaml b/.github/workflows/samples-java-client-jdk17.yaml index 4efe9ad7af5b..50b0781bbb73 100644 --- a/.github/workflows/samples-java-client-jdk17.yaml +++ b/.github/workflows/samples-java-client-jdk17.yaml @@ -6,6 +6,7 @@ on: - samples/client/petstore/java/resttemplate-jakarta/** - samples/client/petstore/java/webclient-jakarta/** - samples/client/petstore/java/restclient-*/** + - samples/client/petstore/java/webclient-sealedInterface/** - samples/client/petstore/java/webclient-useSingleRequestParameter/** - samples/client/others/java/restclient-enum-in-multipart/** pull_request: @@ -13,6 +14,7 @@ on: - samples/client/petstore/java/resttemplate-jakarta/** - samples/client/petstore/java/webclient-jakarta/** - samples/client/petstore/java/restclient-*/** + - samples/client/petstore/java/webclient-sealedInterface/** - samples/client/petstore/java/webclient-useSingleRequestParameter/** - samples/client/others/java/restclient-enum-in-multipart/** jobs: @@ -31,6 +33,7 @@ jobs: - samples/client/petstore/java/restclient-swagger2 - samples/client/petstore/java/restclient-useSingleRequestParameter - samples/client/petstore/java/restclient-useSingleRequestParameter-static + - samples/client/petstore/java/webclient-sealedInterface - samples/client/petstore/java/webclient-useSingleRequestParameter - samples/client/others/java/restclient-enum-in-multipart steps: diff --git a/bin/configs/java-webclient-sealedInterface.yaml b/bin/configs/java-webclient-sealedInterface.yaml new file mode 100644 index 000000000000..190bbebbf1cd --- /dev/null +++ b/bin/configs/java-webclient-sealedInterface.yaml @@ -0,0 +1,10 @@ +generatorName: java +outputDir: samples/client/petstore/java/webclient-sealedInterface +library: webclient +inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml +templateDir: modules/openapi-generator/src/main/resources/Java +additionalProperties: + artifactId: sealed-interface-webclient + hideGenerationTimestamp: "true" + useOneOfInterfaces: true + useSealedOneOfInterfaces: true diff --git a/docs/generators/java.md b/docs/generators/java.md index 5445a89b725d..7e0ee3f03819 100644 --- a/docs/generators/java.md +++ b/docs/generators/java.md @@ -98,6 +98,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |useJakartaEe|whether to use Jakarta EE namespace instead of javax| |false| |useOneOfDiscriminatorLookup|Use the discriminator's mapping in oneOf to speed up the model lookup. IMPORTANT: Validation (e.g. one and only one match in oneOf's schemas) will be skipped. Only jersey2, jersey3, native, okhttp-gson support this option.| |false| |useOneOfInterfaces|whether to use a java interface to describe a set of oneOf options, where each option is a class that implements the interface| |false| +|useSealedOneOfInterfaces|Generate the oneOf interfaces as sealed interfaces. Only supported for WebClient and RestClient.| |false| |usePlayWS|Use Play! Async HTTP client (Play WS API)| |false| |useReflectionEqualsHashCode|Use org.apache.commons.lang3.builder for equals and hashCode in the models. WARNING: This will fail under a security manager, unless the appropriate permissions are set up correctly and also there's potential performance impact.| |false| |useRuntimeException|Use RuntimeException instead of Exception. Only jersey2, jersey3, okhttp-gson, vertx, microprofile support this option.| |false| diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java index 232bddead082..4e439d3a5406 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java @@ -104,6 +104,13 @@ public class JavaClientCodegen extends AbstractJavaCodegen public static final String USE_ENUM_CASE_INSENSITIVE = "useEnumCaseInsensitive"; public static final String FAIL_ON_UNKNOWN_PROPERTIES = "failOnUnknownProperties"; public static final String SUPPORT_VERTX_FUTURE = "supportVertxFuture"; + public static final String USE_SEALED_ONE_OF_INTERFACES = "useSealedOneOfInterfaces"; + + // Internal configurations + public static final String SINGLE_REQUEST_PARAMETER = "singleRequestParameter"; + public static final String STATIC_REQUEST = "staticRequest"; + // TODO attempt to implement the setting similar to how it is done here https://github.com/OpenAPITools/openapi-generator/pull/20590/files + public static final String JAVA_17 = "java17"; public static final String SERIALIZATION_LIBRARY_GSON = "gson"; public static final String SERIALIZATION_LIBRARY_JACKSON = "jackson"; @@ -142,6 +149,7 @@ public class JavaClientCodegen extends AbstractJavaCodegen @Setter protected String errorObjectType; @Getter @Setter protected boolean failOnUnknownProperties = false; @Setter protected boolean supportVertxFuture = false; + @Setter protected boolean useSealedOneOfInterfaces = false; protected String authFolder; /** * Serialization library. @@ -252,6 +260,7 @@ public JavaClientCodegen() { cliOptions.add(CliOption.newBoolean(USE_ENUM_CASE_INSENSITIVE, "Use `equalsIgnoreCase` when String for enum comparison", useEnumCaseInsensitive)); cliOptions.add(CliOption.newBoolean(FAIL_ON_UNKNOWN_PROPERTIES, "Fail Jackson de-serialization on unknown properties", this.failOnUnknownProperties)); cliOptions.add(CliOption.newBoolean(SUPPORT_VERTX_FUTURE, "Also generate api methods that return a vertx Future instead of taking a callback. Only `vertx` supports this option. Requires vertx 4 or greater.", this.supportVertxFuture)); + cliOptions.add(CliOption.newBoolean(USE_SEALED_ONE_OF_INTERFACES, "Generate the oneOf interfaces as sealed interfaces", this.useSealedOneOfInterfaces)); supportedLibraries.put(JERSEY2, "HTTP client: Jersey client 2.25.1. JSON processing: Jackson 2.17.1"); supportedLibraries.put(JERSEY3, "HTTP client: Jersey client 3.1.1. JSON processing: Jackson 2.17.1"); @@ -367,8 +376,9 @@ public void processOpts() { convertPropertyToBooleanAndWriteBack(USE_RX_JAVA2, this::setUseRxJava2); } convertPropertyToStringAndWriteBack(CodegenConstants.USE_SINGLE_REQUEST_PARAMETER, this::setUseSingleRequestParameter); - writePropertyBack("singleRequestParameter", getSingleRequestParameter()); - writePropertyBack("staticRequest", getStaticRequest()); + convertPropertyToBooleanAndWriteBack(USE_SEALED_ONE_OF_INTERFACES, this::setUseSealedOneOfInterfaces); + writePropertyBack(SINGLE_REQUEST_PARAMETER, getSingleRequestParameter()); + writePropertyBack(STATIC_REQUEST, getStaticRequest()); if (!useRxJava && !useRxJava2 && !useRxJava3) { additionalProperties.put(DO_NOT_USE_RX, true); diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/restclient/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/restclient/pojo.mustache index 177c1e1658fe..70b0c615a145 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/restclient/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/restclient/pojo.mustache @@ -29,7 +29,7 @@ {{#vendorExtensions.x-class-extra-annotation}} {{{vendorExtensions.x-class-extra-annotation}}} {{/vendorExtensions.x-class-extra-annotation}} -public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtensions.x-implements}}{{#-first}}implements {{{.}}}{{/-first}}{{^-first}}, {{{.}}}{{/-first}}{{#-last}} {{/-last}}{{/vendorExtensions.x-implements}}{ +public {{>sealed}}class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtensions.x-implements}}{{#-first}}implements {{{.}}}{{/-first}}{{^-first}}, {{{.}}}{{/-first}}{{#-last}} {{/-last}}{{/vendorExtensions.x-implements}}{{>permits}}{ {{#serializableModel}} private static final long serialVersionUID = 1L; diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pojo.mustache index b4e2b6b263f8..6f8c2cbc8e60 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pojo.mustache @@ -29,7 +29,7 @@ {{#vendorExtensions.x-class-extra-annotation}} {{{vendorExtensions.x-class-extra-annotation}}} {{/vendorExtensions.x-class-extra-annotation}} -public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtensions.x-implements}}{{#-first}}implements {{{.}}}{{/-first}}{{^-first}}, {{{.}}}{{/-first}}{{#-last}} {{/-last}}{{/vendorExtensions.x-implements}}{ +public {{>sealed}}class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtensions.x-implements}}{{#-first}}implements {{{.}}}{{/-first}}{{^-first}}, {{{.}}}{{/-first}}{{#-last}} {{/-last}}{{/vendorExtensions.x-implements}}{{>permits}}{ {{#serializableModel}} private static final long serialVersionUID = 1L; diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pom.mustache index fc2164d9cfb9..4e573e42f75f 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pom.mustache @@ -45,14 +45,14 @@ maven-compiler-plugin 3.13.0 - {{#useJakartaEe}} + {{#java17}} 17 17 - {{/useJakartaEe}} - {{^useJakartaEe}} + {{/java17}} + {{^java17}} 1.8 1.8 - {{/useJakartaEe}} + {{/java17}} diff --git a/modules/openapi-generator/src/main/resources/Java/oneof_interface.mustache b/modules/openapi-generator/src/main/resources/Java/oneof_interface.mustache index d6727727460d..eadcb26b8297 100644 --- a/modules/openapi-generator/src/main/resources/Java/oneof_interface.mustache +++ b/modules/openapi-generator/src/main/resources/Java/oneof_interface.mustache @@ -1,5 +1,5 @@ {{>additionalOneOfTypeAnnotations}}{{>generatedAnnotation}}{{>typeInfoAnnotation}}{{>xmlAnnotation}} -public interface {{classname}} {{#vendorExtensions.x-implements}}{{#-first}}extends {{{.}}}{{/-first}}{{^-first}}, {{{.}}}{{/-first}}{{/vendorExtensions.x-implements}} { +public {{>sealed}}interface {{classname}} {{#vendorExtensions.x-implements}}{{#-first}}extends {{{.}}}{{/-first}}{{^-first}}, {{{.}}}{{/-first}}{{/vendorExtensions.x-implements}}{{>permits}}{ {{#discriminator}} public {{propertyType}} {{propertyGetter}}(); {{/discriminator}} diff --git a/modules/openapi-generator/src/main/resources/Java/permits.mustache b/modules/openapi-generator/src/main/resources/Java/permits.mustache new file mode 100644 index 000000000000..af0c9e6e32a3 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/Java/permits.mustache @@ -0,0 +1 @@ +{{#useSealedOneOfInterfaces}}{{#vendorExtensions.x-is-one-of-interface}}{{#permits}}{{#-first}}permits {{/-first}}{{{.}}}{{^-last}}, {{/-last}}{{#-last}} {{/-last}}{{/permits}}{{/vendorExtensions.x-is-one-of-interface}}{{/useSealedOneOfInterfaces}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/Java/sealed.mustache b/modules/openapi-generator/src/main/resources/Java/sealed.mustache new file mode 100644 index 000000000000..f2db5bac53d3 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/Java/sealed.mustache @@ -0,0 +1 @@ +{{#useSealedOneOfInterfaces}}{{#permits.0}}sealed {{/permits.0}}{{^permits.0}}{{^vendorExtensions.x-is-one-of-interface}}{{#vendorExtensions.x-implements}}final {{/vendorExtensions.x-implements}}{{/vendorExtensions.x-is-one-of-interface}}{{/permits.0}}{{/useSealedOneOfInterfaces}} \ No newline at end of file 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 4e86e24d7574..afd564ec09a0 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 @@ -67,8 +67,7 @@ import static org.assertj.core.api.Assertions.entry; import static org.assertj.core.api.InstanceOfAssertFactories.FILE; import static org.openapitools.codegen.CodegenConstants.*; -import static org.openapitools.codegen.TestUtils.newTempFolder; -import static org.openapitools.codegen.TestUtils.validateJavaSourceFiles; +import static org.openapitools.codegen.TestUtils.*; import static org.openapitools.codegen.languages.JavaClientCodegen.*; import static org.testng.Assert.*; @@ -1435,7 +1434,7 @@ public void testNativeClientWhiteSpacePathParamEncoding() { validateJavaSourceFiles(files); assertThat(files).hasSize(37); - TestUtils.assertFileContains(output.resolve("src/main/java/xyz/abcdef/ApiClient.java"), + assertFileContains(output.resolve("src/main/java/xyz/abcdef/ApiClient.java"), "public static String urlEncode(String s) { return URLEncoder.encode(s," + " UTF_8).replaceAll(\"\\\\+\", \"%20\"); }" ); @@ -1758,7 +1757,7 @@ public void testNativeClientExplodedQueryParamWithArrayProperty() { new DefaultGenerator().opts(configurator.toClientOptInput()).generate(); - TestUtils.assertFileContains( + assertFileContains( Paths.get(output + "/src/main/java/xyz/abcdef/api/DefaultApi.java"), "localVarQueryParams.addAll(ApiClient.parameterToPairs(\"multi\", \"values\"," + " queryObject.getValues()));"); @@ -2082,7 +2081,7 @@ public void testDeprecatedProperty() { List files = new DefaultGenerator().opts(configurator.toClientOptInput()).generate(); validateJavaSourceFiles(files); - TestUtils.assertFileContains( + assertFileContains( output.resolve("src/main/java/org/openapitools/client/model/BigDog.java"), "@Deprecated\n public BigDog declawed(@javax.annotation.Nullable Boolean declawed) {", // deprecated builder method "@Deprecated\n @javax.annotation.Nullable\n\n public Boolean getDeclawed() {", // deprecated getter @@ -2102,7 +2101,7 @@ public void testDeprecatedPropertyJersey3() { List files = new DefaultGenerator().opts(configurator.toClientOptInput()).generate(); validateJavaSourceFiles(files); - TestUtils.assertFileContains( + assertFileContains( output.resolve("src/main/java/org/openapitools/client/model/BigDog.java"), "@Deprecated\n public BigDog declawed(@jakarta.annotation.Nullable Boolean declawed) {", // deprecated builder method "@Deprecated\n @jakarta.annotation.Nullable\n @JsonProperty(JSON_PROPERTY_DECLAWED)\n" @@ -2174,8 +2173,8 @@ public void testRestTemplateWithGeneratedClientAsBeanEnabled() { List files = new DefaultGenerator().opts(configurator.toClientOptInput()).generate(); validateJavaSourceFiles(files); - TestUtils.assertFileContains(output.resolve("src/main/java/xyz/abcdef/ApiClient.java"), "@Component"); - TestUtils.assertFileContains(output.resolve("src/main/java/xyz/abcdef/api/PetApi.java"), "@Component"); + assertFileContains(output.resolve("src/main/java/xyz/abcdef/ApiClient.java"), "@Component"); + assertFileContains(output.resolve("src/main/java/xyz/abcdef/api/PetApi.java"), "@Component"); } @Test @@ -2192,8 +2191,8 @@ public void testRestTemplateWithUseBeanValidationEnabled() { List files = new DefaultGenerator().opts(configurator.toClientOptInput()).generate(); validateJavaSourceFiles(files); - TestUtils.assertFileContains(output.resolve("pom.xml"), "jakarta.validation-api"); - TestUtils.assertFileContains(output.resolve("src/main/java/org/openapitools/client/model/Pet.java"), "@Valid"); + assertFileContains(output.resolve("pom.xml"), "jakarta.validation-api"); + assertFileContains(output.resolve("src/main/java/org/openapitools/client/model/Pet.java"), "@Valid"); } @Test @@ -2228,7 +2227,7 @@ public void testRestTemplateWithPerformBeanValidationEnabled() { List files = new DefaultGenerator().opts(configurator.toClientOptInput()).generate(); validateJavaSourceFiles(files); - TestUtils.assertFileContains(output.resolve("pom.xml"), "hibernate-validator"); + assertFileContains(output.resolve("pom.xml"), "hibernate-validator"); TestUtils.assertFileExists(output.resolve("src/main/java/xyz/abcdef/BeanValidationException.java")); } @@ -2357,7 +2356,7 @@ public void testWebClientResponseTypeWithUseAbstractionForFiles_issue16589() { List files = new DefaultGenerator().opts(configurator.toClientOptInput()).generate(); validateJavaSourceFiles(files); - TestUtils.assertFileContains(output.resolve("src/main/java/xyz/abcdef/api/ResourceApi.java"), + assertFileContains(output.resolve("src/main/java/xyz/abcdef/api/ResourceApi.java"), "Mono resourceInResponse()", "Mono> resourceInResponseWithHttpInfo()", "ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference()" @@ -2535,7 +2534,7 @@ public void testQueryParamsExploded_whenQueryParamIsNull() { List files = new DefaultGenerator().opts(configurator.toClientOptInput()).generate(); validateJavaSourceFiles(files); - TestUtils.assertFileContains(output.resolve("src/main/java/xyz/abcdef/api/DepartmentApi.java"), "if (filter != null) {"); + assertFileContains(output.resolve("src/main/java/xyz/abcdef/api/DepartmentApi.java"), "if (filter != null) {"); } @Test @@ -2612,7 +2611,7 @@ public void testRestClientFormMultipart() { List files = new DefaultGenerator().opts(configurator.toClientOptInput()).generate(); validateJavaSourceFiles(files); - TestUtils.assertFileContains( + assertFileContains( output.resolve("src/main/java/xyz/abcdef/api/MultipartApi.java"), // multiple files "multipartArray(@jakarta.annotation.Nullable List files)", @@ -2643,7 +2642,7 @@ public void testRestClientWithUseAbstractionForFiles() { List files = new DefaultGenerator().opts(configurator.toClientOptInput()).generate(); validateJavaSourceFiles(files); - TestUtils.assertFileContains( + assertFileContains( output.resolve("src/main/java/xyz/abcdef/api/MultipartApi.java"), // multiple files "multipartArray(java.util.Collection files)", @@ -2671,7 +2670,7 @@ public void testRestClientWithFreeFormInQueryParameters() { final List files = new DefaultGenerator().opts(configurator.toClientOptInput()).generate(); validateJavaSourceFiles(files); - TestUtils.assertFileContains(output.resolve("src/main/java/xyz/abcdef/ApiClient.java"), "value instanceof Map"); + assertFileContains(output.resolve("src/main/java/xyz/abcdef/ApiClient.java"), "value instanceof Map"); } @Test @@ -2711,7 +2710,7 @@ public void testRestClientSupportListOfStringReturnType_issue7118() { List files = new DefaultGenerator().opts(configurator.toClientOptInput()).generate(); validateJavaSourceFiles(files); - TestUtils.assertFileContains( + assertFileContains( output.resolve("src/main/java/xyz/abcdef/api/UsersApi.java"), // set of string "ParameterizedTypeReference> localVarReturnType = new" @@ -2738,7 +2737,7 @@ public void testRestClientResponseTypeWithUseAbstractionForFiles_issue16589() { List files = new DefaultGenerator().opts(configurator.toClientOptInput()).generate(); validateJavaSourceFiles(files); - TestUtils.assertFileContains( + assertFileContains( output.resolve("src/main/java/xyz/abcdef/api/ResourceApi.java"), "org.springframework.core.io.Resource resourceInResponse()", "ResponseEntity resourceInResponseWithHttpInfo()", @@ -3179,7 +3178,7 @@ public void testRestClientWithXML_issue_19137() { List files = new DefaultGenerator().opts(configurator.toClientOptInput()).generate(); validateJavaSourceFiles(files); - TestUtils.assertFileContains( + assertFileContains( output.resolve("src/main/java/xyz/abcdef/ApiClient.java"), "import com.fasterxml.jackson.dataformat.xml.XmlMapper;", "import com.fasterxml.jackson.dataformat.xml.ser.ToXmlGenerator;" @@ -3201,7 +3200,7 @@ public void testRestClientWithUseSingleRequestParameter_issue_19406() { new DefaultGenerator().opts(configurator.toClientOptInput()).generate(); - TestUtils.assertFileContains( + assertFileContains( output.resolve("src/main/java/xyz/abcdef/api/PetApi.java"), "public record DeletePetRequest(@jakarta.annotation.Nonnull Long petId, @jakarta.annotation.Nullable String apiKey){}", "public void deletePet(DeletePetRequest requestParameters) throws RestClientResponseException {", @@ -3228,7 +3227,7 @@ public void testRestClientWithUseSingleRequestParameter_static_issue_20668() { new DefaultGenerator().opts(configurator.toClientOptInput()).generate(); - TestUtils.assertFileContains( + assertFileContains( output.resolve("src/main/java/xyz/abcdef/api/PetApi.java"), "public static class DeletePetRequest {", "DeletePetRequest(@jakarta.annotation.Nonnull Long petId, @jakarta.annotation.Nullable String apiKey)", @@ -3264,12 +3263,12 @@ public void testDuplicatedOperationId() { new DefaultGenerator().opts(configurator.toClientOptInput()).generate(); - TestUtils.assertFileContains( + assertFileContains( output.resolve("src/main/java/xyz/abcdef/api/PetApi.java"), " void getObject(" ); - TestUtils.assertFileContains( + assertFileContains( output.resolve("src/main/java/xyz/abcdef/api/UserApi.java"), " void getObject(" ); @@ -3300,7 +3299,7 @@ public void testWebClientWithUseSingleRequestParameter_issue_19407() { new DefaultGenerator().opts(configurator.toClientOptInput()).generate(); - TestUtils.assertFileContains( + assertFileContains( output.resolve("src/main/java/xyz/abcdef/api/PetApi.java"), "public class DeletePetRequest {", "DeletePetRequest(@javax.annotation.Nonnull Long petId, @javax.annotation.Nullable String apiKey)", @@ -3330,7 +3329,7 @@ public void testWebClientWithUseSingleRequestParameter_static() { new DefaultGenerator().opts(configurator.toClientOptInput()).generate(); - TestUtils.assertFileContains( + assertFileContains( output.resolve("src/main/java/xyz/abcdef/api/PetApi.java"), "public static class DeletePetRequest {", "DeletePetRequest(@javax.annotation.Nonnull Long petId, @javax.annotation.Nullable String apiKey)", @@ -3360,7 +3359,7 @@ public void testWebClientWithUseSingleRequestParameter_static_issue_20668() { new DefaultGenerator().opts(configurator.toClientOptInput()).generate(); - TestUtils.assertFileContains( + assertFileContains( output.resolve("src/main/java/xyz/abcdef/api/PetApi.java"), "public static class DeletePetRequest {", "DeletePetRequest(@javax.annotation.Nonnull Long petId, @javax.annotation.Nullable String apiKey)", @@ -3391,7 +3390,7 @@ public void testGenerateParameterId() { new DefaultGenerator().opts(configurator.toClientOptInput()).generate(); - TestUtils.assertFileContains( + assertFileContains( output.resolve("src/main/java/xyz/abcdef/api/ATagApi.java"), " getCall(@javax.annotation.Nonnull String pathParameter, @javax.annotation.Nullable Integer queryParameter, final ApiCallback _callback)" ); @@ -3682,7 +3681,7 @@ public void testNativeClientWithUseSingleRequestParameter() { new DefaultGenerator().opts(configurator.toClientOptInput()).generate(); - TestUtils.assertFileContains( + assertFileContains( output.resolve("src/main/java/xyz/abcdef/api/PetApi.java"), "public static final class APIDeletePetRequest {", "private APIDeletePetRequest(Builder builder) {", @@ -3724,4 +3723,86 @@ public void givenOneOfUsesInterfacesAndLibraryNotJacksonWhenGenerateThenOneOfInt TestUtils.assertValidJavaSourceCode(fileContent); TestUtils.assertFileNotContains(testModel.toPath(), "com.fasterxml.jackson"); } + + @DataProvider(name = "sealedInterfaceScenarios") + public static Object[][] sealedInterfaceScenarios() { + return new Object[][]{ + {"oneof_polymorphism_and_inheritance.yaml", Map.of( + "Foo.java", "public final class Foo extends Entity implements FooRefOrValue", + "FooRef.java", "public final class FooRef extends EntityRef implements FooRefOrValue", + "FooRefOrValue.java", "public sealed interface FooRefOrValue permits Foo, FooRef {")}, + {"oneOf_additionalProperties.yaml", Map.of( + "SchemaA.java", "public final class SchemaA implements PostRequest {", + "PostRequest.java", "public sealed interface PostRequest permits SchemaA {")}, + {"oneOf_array.yaml", Map.of( + "MyExampleGet200Response.java", "public sealed interface MyExampleGet200Response", + "OneOf1.java", "public final class OneOf1 implements MyExampleGet200Response {")}, + {"oneOf_duplicateArray.yaml", Map.of( + "Example.java", "public interface Example {")}, + {"oneOf_nonPrimitive.yaml", Map.of( + "Example.java", "public interface Example {")}, + {"oneOf_primitive.yaml", Map.of( + "Child.java", "public final class Child implements Example {", + "Example.java", "public sealed interface Example permits Child {")}, + {"oneOf_primitiveAndArray.yaml", Map.of( + "Example.java", "public interface Example {")}, + {"oneOf_reuseRef.yaml", Map.of( + "Fruit.java", "public sealed interface Fruit permits Apple, Banana {", + "Banana.java", "public final class Banana implements Fruit {", + "Apple.java", "public final class Apple implements Fruit {")}, + {"oneOf_twoPrimitives.yaml", Map.of( + "MyExamplePostRequest.java", "public interface MyExamplePostRequest {")}, + {"oneOfArrayMapImport.yaml", Map.of( + "Fruit.java", "public interface Fruit {", + "Grape.java", "public class Grape {", + "Apple.java", "public class Apple {")}, + {"oneOfDiscriminator.yaml", Map.of( + "FruitAllOfDisc.java", "public sealed interface FruitAllOfDisc permits AppleAllOfDisc, BananaAllOfDisc {", + "AppleAllOfDisc.java", "public final class AppleAllOfDisc implements FruitAllOfDisc {", + "BananaAllOfDisc.java", "public final class BananaAllOfDisc implements FruitAllOfDisc {", + "FruitReqDisc.java", "public sealed interface FruitReqDisc permits AppleReqDisc, BananaReqDisc {", + "AppleReqDisc.java", "public final class AppleReqDisc implements FruitReqDisc {", + "BananaReqDisc.java", "public final class BananaReqDisc implements FruitReqDisc {")} + }; + } + + @Test(dataProvider = "sealedInterfaceScenarios") + public void sealedInterfaceScenariosRestClient(String apiFile, Map definitions) { + final Path output = newTempFolder(); + final CodegenConfigurator configurator = new CodegenConfigurator() + .setGeneratorName("java") + .setLibrary(RESTCLIENT) + .setAdditionalProperties(Map.of( + USE_ONE_OF_INTERFACES, "true", + USE_SEALED_ONE_OF_INTERFACES, "true" + )) + .setInputSpec("src/test/resources/3_0/" + apiFile) + .setOutputDir(output.toString().replace("\\", "/")); + + new DefaultGenerator().opts(configurator.toClientOptInput()).generate(); + + definitions.forEach((file, check) -> + assertFileContains(output.resolve("src/main/java/org/openapitools/client/model/" + file), check)); + } + + @Test(dataProvider = "sealedInterfaceScenarios") + public void sealedInterfaceScenariosWebClient(String apiFile, Map definitions) { + final Path output = newTempFolder(); + final CodegenConfigurator configurator = new CodegenConfigurator() + .setGeneratorName("java") + .setLibrary(WEBCLIENT) + .setAdditionalProperties(Map.of( + USE_ONE_OF_INTERFACES, "true", + USE_SEALED_ONE_OF_INTERFACES, "true" + )) + .setInputSpec("src/test/resources/3_0/" + apiFile) + .setOutputDir(output.toString().replace("\\", "/")); + + new DefaultGenerator().opts(configurator.toClientOptInput()).generate(); + + definitions.forEach((file, check) -> + assertFileContains(output.resolve("src/main/java/org/openapitools/client/model/" + file), check)); + assertFileContains(output.resolve("pom.xml"), "17"); + assertFileNotContains(output.resolve("pom.xml"), "1.8"); + } } \ No newline at end of file From 963f58ad5ab242a1231982b73905c05fc5dc9c68 Mon Sep 17 00:00:00 2001 From: Mattias-Sehlstedt <60173714+Mattias-Sehlstedt@users.noreply.github.com> Date: Thu, 17 Jul 2025 21:24:26 +0200 Subject: [PATCH 2/8] Generate samples --- .../java-webclient-sealedInterface.yaml | 2 +- .../src/main/resources/Java/sealed.mustache | 2 +- .../.github/workflows/maven.yml | 30 + .../java/webclient-sealedInterface/.gitignore | 21 + .../.openapi-generator-ignore | 23 + .../.openapi-generator/FILES | 68 ++ .../.openapi-generator/VERSION | 1 + .../webclient-sealedInterface/.travis.yml | 22 + .../java/webclient-sealedInterface/README.md | 159 ++++ .../api/openapi.yaml | 259 ++++++ .../webclient-sealedInterface/build.gradle | 139 ++++ .../java/webclient-sealedInterface/build.sbt | 1 + .../docs/Addressable.md | 15 + .../webclient-sealedInterface/docs/Apple.md | 18 + .../webclient-sealedInterface/docs/Banana.md | 18 + .../webclient-sealedInterface/docs/Bar.md | 20 + .../webclient-sealedInterface/docs/BarApi.md | 73 ++ .../docs/BarCreate.md | 15 + .../webclient-sealedInterface/docs/BarRef.md | 16 + .../docs/BarRefOrValue.md | 10 + .../webclient-sealedInterface/docs/Entity.md | 17 + .../docs/EntityRef.md | 20 + .../docs/Extensible.md | 15 + .../webclient-sealedInterface/docs/Foo.md | 18 + .../webclient-sealedInterface/docs/FooApi.md | 134 ++++ .../webclient-sealedInterface/docs/FooRef.md | 17 + .../docs/FooRefOrValue.md | 10 + .../webclient-sealedInterface/docs/Fruit.md | 10 + .../docs/FruitType.md | 13 + .../webclient-sealedInterface/docs/Pasta.md | 13 + .../webclient-sealedInterface/docs/Pizza.md | 13 + .../docs/PizzaSpeziale.md | 13 + .../webclient-sealedInterface/git_push.sh | 57 ++ .../gradle.properties | 6 + .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43453 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 + .../java/webclient-sealedInterface/gradlew | 249 ++++++ .../webclient-sealedInterface/gradlew.bat | 92 +++ .../java/webclient-sealedInterface/pom.xml | 132 ++++ .../webclient-sealedInterface/settings.gradle | 1 + .../src/main/AndroidManifest.xml | 3 + .../org/openapitools/client/ApiClient.java | 743 ++++++++++++++++++ .../client/JavaTimeFormatter.java | 68 ++ .../client/RFC3339DateFormat.java | 58 ++ .../client/RFC3339InstantDeserializer.java | 100 +++ .../client/RFC3339JavaTimeModule.java | 32 + .../client/ServerConfiguration.java | 72 ++ .../openapitools/client/ServerVariable.java | 37 + .../org/openapitools/client/StringUtil.java | 83 ++ .../org/openapitools/client/api/BarApi.java | 124 +++ .../org/openapitools/client/api/FooApi.java | 185 +++++ .../openapitools/client/auth/ApiKeyAuth.java | 75 ++ .../client/auth/Authentication.java | 29 + .../client/auth/HttpBasicAuth.java | 51 ++ .../client/auth/HttpBearerAuth.java | 48 ++ .../client/model/Addressable.java | 137 ++++ .../org/openapitools/client/model/Apple.java | 140 ++++ .../org/openapitools/client/model/Banana.java | 140 ++++ .../org/openapitools/client/model/Bar.java | 215 +++++ .../openapitools/client/model/BarCreate.java | 184 +++++ .../org/openapitools/client/model/BarRef.java | 85 ++ .../client/model/BarRefOrValue.java | 46 ++ .../org/openapitools/client/model/Entity.java | 250 ++++++ .../openapitools/client/model/EntityRef.java | 310 ++++++++ .../openapitools/client/model/Extensible.java | 169 ++++ .../org/openapitools/client/model/Foo.java | 150 ++++ .../org/openapitools/client/model/FooRef.java | 118 +++ .../client/model/FooRefOrValue.java | 45 ++ .../org/openapitools/client/model/Fruit.java | 46 ++ .../openapitools/client/model/FruitType.java | 59 ++ .../org/openapitools/client/model/Pasta.java | 118 +++ .../org/openapitools/client/model/Pizza.java | 122 +++ .../client/model/PizzaSpeziale.java | 119 +++ .../openapitools/client/api/BarApiTest.java | 51 ++ .../openapitools/client/api/FooApiTest.java | 64 ++ .../client/model/AddressableTest.java | 55 ++ .../openapitools/client/model/AppleTest.java | 50 ++ .../openapitools/client/model/BananaTest.java | 50 ++ .../client/model/BarCreateTest.java | 84 ++ .../client/model/BarRefOrValueTest.java | 35 + .../openapitools/client/model/BarRefTest.java | 99 +++ .../openapitools/client/model/BarTest.java | 84 ++ .../client/model/EntityRefTest.java | 82 ++ .../openapitools/client/model/EntityTest.java | 82 ++ .../client/model/ExtensibleTest.java | 63 ++ .../client/model/FooRefOrValueTest.java | 34 + .../openapitools/client/model/FooRefTest.java | 99 +++ .../openapitools/client/model/FooTest.java | 83 ++ .../openapitools/client/model/FruitTest.java | 35 + .../client/model/FruitTypeTest.java | 32 + .../openapitools/client/model/PastaTest.java | 83 ++ .../client/model/PizzaSpezialeTest.java | 92 +++ .../openapitools/client/model/PizzaTest.java | 84 ++ 93 files changed, 7249 insertions(+), 2 deletions(-) create mode 100644 samples/client/petstore/java/webclient-sealedInterface/.github/workflows/maven.yml create mode 100644 samples/client/petstore/java/webclient-sealedInterface/.gitignore create mode 100644 samples/client/petstore/java/webclient-sealedInterface/.openapi-generator-ignore create mode 100644 samples/client/petstore/java/webclient-sealedInterface/.openapi-generator/FILES create mode 100644 samples/client/petstore/java/webclient-sealedInterface/.openapi-generator/VERSION create mode 100644 samples/client/petstore/java/webclient-sealedInterface/.travis.yml create mode 100644 samples/client/petstore/java/webclient-sealedInterface/README.md create mode 100644 samples/client/petstore/java/webclient-sealedInterface/api/openapi.yaml create mode 100644 samples/client/petstore/java/webclient-sealedInterface/build.gradle create mode 100644 samples/client/petstore/java/webclient-sealedInterface/build.sbt create mode 100644 samples/client/petstore/java/webclient-sealedInterface/docs/Addressable.md create mode 100644 samples/client/petstore/java/webclient-sealedInterface/docs/Apple.md create mode 100644 samples/client/petstore/java/webclient-sealedInterface/docs/Banana.md create mode 100644 samples/client/petstore/java/webclient-sealedInterface/docs/Bar.md create mode 100644 samples/client/petstore/java/webclient-sealedInterface/docs/BarApi.md create mode 100644 samples/client/petstore/java/webclient-sealedInterface/docs/BarCreate.md create mode 100644 samples/client/petstore/java/webclient-sealedInterface/docs/BarRef.md create mode 100644 samples/client/petstore/java/webclient-sealedInterface/docs/BarRefOrValue.md create mode 100644 samples/client/petstore/java/webclient-sealedInterface/docs/Entity.md create mode 100644 samples/client/petstore/java/webclient-sealedInterface/docs/EntityRef.md create mode 100644 samples/client/petstore/java/webclient-sealedInterface/docs/Extensible.md create mode 100644 samples/client/petstore/java/webclient-sealedInterface/docs/Foo.md create mode 100644 samples/client/petstore/java/webclient-sealedInterface/docs/FooApi.md create mode 100644 samples/client/petstore/java/webclient-sealedInterface/docs/FooRef.md create mode 100644 samples/client/petstore/java/webclient-sealedInterface/docs/FooRefOrValue.md create mode 100644 samples/client/petstore/java/webclient-sealedInterface/docs/Fruit.md create mode 100644 samples/client/petstore/java/webclient-sealedInterface/docs/FruitType.md create mode 100644 samples/client/petstore/java/webclient-sealedInterface/docs/Pasta.md create mode 100644 samples/client/petstore/java/webclient-sealedInterface/docs/Pizza.md create mode 100644 samples/client/petstore/java/webclient-sealedInterface/docs/PizzaSpeziale.md create mode 100644 samples/client/petstore/java/webclient-sealedInterface/git_push.sh create mode 100644 samples/client/petstore/java/webclient-sealedInterface/gradle.properties create mode 100644 samples/client/petstore/java/webclient-sealedInterface/gradle/wrapper/gradle-wrapper.jar create mode 100644 samples/client/petstore/java/webclient-sealedInterface/gradle/wrapper/gradle-wrapper.properties create mode 100644 samples/client/petstore/java/webclient-sealedInterface/gradlew create mode 100644 samples/client/petstore/java/webclient-sealedInterface/gradlew.bat create mode 100644 samples/client/petstore/java/webclient-sealedInterface/pom.xml create mode 100644 samples/client/petstore/java/webclient-sealedInterface/settings.gradle create mode 100644 samples/client/petstore/java/webclient-sealedInterface/src/main/AndroidManifest.xml create mode 100644 samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/ApiClient.java create mode 100644 samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/JavaTimeFormatter.java create mode 100644 samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/RFC3339DateFormat.java create mode 100644 samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/RFC3339InstantDeserializer.java create mode 100644 samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/RFC3339JavaTimeModule.java create mode 100644 samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/ServerConfiguration.java create mode 100644 samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/ServerVariable.java create mode 100644 samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/StringUtil.java create mode 100644 samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/api/BarApi.java create mode 100644 samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/api/FooApi.java create mode 100644 samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java create mode 100644 samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/auth/Authentication.java create mode 100644 samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java create mode 100644 samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java create mode 100644 samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Addressable.java create mode 100644 samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Apple.java create mode 100644 samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Banana.java create mode 100644 samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Bar.java create mode 100644 samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/BarCreate.java create mode 100644 samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/BarRef.java create mode 100644 samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/BarRefOrValue.java create mode 100644 samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Entity.java create mode 100644 samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/EntityRef.java create mode 100644 samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Extensible.java create mode 100644 samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Foo.java create mode 100644 samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/FooRef.java create mode 100644 samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/FooRefOrValue.java create mode 100644 samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Fruit.java create mode 100644 samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/FruitType.java create mode 100644 samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Pasta.java create mode 100644 samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Pizza.java create mode 100644 samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/PizzaSpeziale.java create mode 100644 samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/api/BarApiTest.java create mode 100644 samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/api/FooApiTest.java create mode 100644 samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/AddressableTest.java create mode 100644 samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/AppleTest.java create mode 100644 samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/BananaTest.java create mode 100644 samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/BarCreateTest.java create mode 100644 samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/BarRefOrValueTest.java create mode 100644 samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/BarRefTest.java create mode 100644 samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/BarTest.java create mode 100644 samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/EntityRefTest.java create mode 100644 samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/EntityTest.java create mode 100644 samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/ExtensibleTest.java create mode 100644 samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/FooRefOrValueTest.java create mode 100644 samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/FooRefTest.java create mode 100644 samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/FooTest.java create mode 100644 samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/FruitTest.java create mode 100644 samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/FruitTypeTest.java create mode 100644 samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/PastaTest.java create mode 100644 samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/PizzaSpezialeTest.java create mode 100644 samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/PizzaTest.java diff --git a/bin/configs/java-webclient-sealedInterface.yaml b/bin/configs/java-webclient-sealedInterface.yaml index 190bbebbf1cd..62360d7846d4 100644 --- a/bin/configs/java-webclient-sealedInterface.yaml +++ b/bin/configs/java-webclient-sealedInterface.yaml @@ -1,7 +1,7 @@ generatorName: java outputDir: samples/client/petstore/java/webclient-sealedInterface library: webclient -inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml +inputSpec: modules/openapi-generator/src/test/resources/3_0/oneof_polymorphism_and_inheritance.yaml templateDir: modules/openapi-generator/src/main/resources/Java additionalProperties: artifactId: sealed-interface-webclient diff --git a/modules/openapi-generator/src/main/resources/Java/sealed.mustache b/modules/openapi-generator/src/main/resources/Java/sealed.mustache index f2db5bac53d3..8e5076b49dd0 100644 --- a/modules/openapi-generator/src/main/resources/Java/sealed.mustache +++ b/modules/openapi-generator/src/main/resources/Java/sealed.mustache @@ -1 +1 @@ -{{#useSealedOneOfInterfaces}}{{#permits.0}}sealed {{/permits.0}}{{^permits.0}}{{^vendorExtensions.x-is-one-of-interface}}{{#vendorExtensions.x-implements}}final {{/vendorExtensions.x-implements}}{{/vendorExtensions.x-is-one-of-interface}}{{/permits.0}}{{/useSealedOneOfInterfaces}} \ No newline at end of file +{{#useSealedOneOfInterfaces}}{{#vendorExtensions.x-is-one-of-interface}}{{#permits.0}}sealed {{/permits.0}}{{/vendorExtensions.x-is-one-of-interface}}{{^permits.0}}{{#vendorExtensions.x-implements}}final {{/vendorExtensions.x-implements}}{{/permits.0}}{{/useSealedOneOfInterfaces}} \ No newline at end of file diff --git a/samples/client/petstore/java/webclient-sealedInterface/.github/workflows/maven.yml b/samples/client/petstore/java/webclient-sealedInterface/.github/workflows/maven.yml new file mode 100644 index 000000000000..4071e32979df --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/.github/workflows/maven.yml @@ -0,0 +1,30 @@ +# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time +# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven +# +# This file is auto-generated by OpenAPI Generator (https://openapi-generator.tech) + +name: Java CI with Maven + +on: + push: + branches: [ main, master ] + pull_request: + branches: [ main, master ] + +jobs: + build: + name: Build ByRefOrValue + runs-on: ubuntu-latest + strategy: + matrix: + java: [ 17, 21 ] + steps: + - uses: actions/checkout@v4 + - name: Set up JDK + uses: actions/setup-java@v4 + with: + java-version: ${{ matrix.java }} + distribution: 'temurin' + cache: maven + - name: Build with Maven + run: mvn -B package --no-transfer-progress --file pom.xml diff --git a/samples/client/petstore/java/webclient-sealedInterface/.gitignore b/samples/client/petstore/java/webclient-sealedInterface/.gitignore new file mode 100644 index 000000000000..a530464afa1b --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/.gitignore @@ -0,0 +1,21 @@ +*.class + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.ear + +# exclude jar for gradle wrapper +!gradle/wrapper/*.jar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +# build files +**/target +target +.gradle +build diff --git a/samples/client/petstore/java/webclient-sealedInterface/.openapi-generator-ignore b/samples/client/petstore/java/webclient-sealedInterface/.openapi-generator-ignore new file mode 100644 index 000000000000..7484ee590a38 --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/.openapi-generator-ignore @@ -0,0 +1,23 @@ +# OpenAPI Generator Ignore +# Generated by openapi-generator https://github.com/openapitools/openapi-generator + +# Use this file to prevent files from being overwritten by the generator. +# The patterns follow closely to .gitignore or .dockerignore. + +# As an example, the C# client generator defines ApiClient.cs. +# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line: +#ApiClient.cs + +# You can match any string of characters against a directory, file or extension with a single asterisk (*): +#foo/*/qux +# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux + +# You can recursively match patterns against a directory, file or extension with a double asterisk (**): +#foo/**/qux +# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux + +# You can also negate patterns with an exclamation (!). +# For example, you can ignore all files in a docs folder with the file extension .md: +#docs/*.md +# Then explicitly reverse the ignore rule for a single file: +#!docs/README.md diff --git a/samples/client/petstore/java/webclient-sealedInterface/.openapi-generator/FILES b/samples/client/petstore/java/webclient-sealedInterface/.openapi-generator/FILES new file mode 100644 index 000000000000..db1b84e17530 --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/.openapi-generator/FILES @@ -0,0 +1,68 @@ +.github/workflows/maven.yml +.gitignore +.travis.yml +README.md +api/openapi.yaml +build.gradle +build.sbt +docs/Addressable.md +docs/Apple.md +docs/Banana.md +docs/Bar.md +docs/BarApi.md +docs/BarCreate.md +docs/BarRef.md +docs/BarRefOrValue.md +docs/Entity.md +docs/EntityRef.md +docs/Extensible.md +docs/Foo.md +docs/FooApi.md +docs/FooRef.md +docs/FooRefOrValue.md +docs/Fruit.md +docs/FruitType.md +docs/Pasta.md +docs/Pizza.md +docs/PizzaSpeziale.md +git_push.sh +gradle.properties +gradle/wrapper/gradle-wrapper.jar +gradle/wrapper/gradle-wrapper.properties +gradlew +gradlew.bat +pom.xml +settings.gradle +src/main/AndroidManifest.xml +src/main/java/org/openapitools/client/ApiClient.java +src/main/java/org/openapitools/client/JavaTimeFormatter.java +src/main/java/org/openapitools/client/RFC3339DateFormat.java +src/main/java/org/openapitools/client/RFC3339InstantDeserializer.java +src/main/java/org/openapitools/client/RFC3339JavaTimeModule.java +src/main/java/org/openapitools/client/ServerConfiguration.java +src/main/java/org/openapitools/client/ServerVariable.java +src/main/java/org/openapitools/client/StringUtil.java +src/main/java/org/openapitools/client/api/BarApi.java +src/main/java/org/openapitools/client/api/FooApi.java +src/main/java/org/openapitools/client/auth/ApiKeyAuth.java +src/main/java/org/openapitools/client/auth/Authentication.java +src/main/java/org/openapitools/client/auth/HttpBasicAuth.java +src/main/java/org/openapitools/client/auth/HttpBearerAuth.java +src/main/java/org/openapitools/client/model/Addressable.java +src/main/java/org/openapitools/client/model/Apple.java +src/main/java/org/openapitools/client/model/Banana.java +src/main/java/org/openapitools/client/model/Bar.java +src/main/java/org/openapitools/client/model/BarCreate.java +src/main/java/org/openapitools/client/model/BarRef.java +src/main/java/org/openapitools/client/model/BarRefOrValue.java +src/main/java/org/openapitools/client/model/Entity.java +src/main/java/org/openapitools/client/model/EntityRef.java +src/main/java/org/openapitools/client/model/Extensible.java +src/main/java/org/openapitools/client/model/Foo.java +src/main/java/org/openapitools/client/model/FooRef.java +src/main/java/org/openapitools/client/model/FooRefOrValue.java +src/main/java/org/openapitools/client/model/Fruit.java +src/main/java/org/openapitools/client/model/FruitType.java +src/main/java/org/openapitools/client/model/Pasta.java +src/main/java/org/openapitools/client/model/Pizza.java +src/main/java/org/openapitools/client/model/PizzaSpeziale.java diff --git a/samples/client/petstore/java/webclient-sealedInterface/.openapi-generator/VERSION b/samples/client/petstore/java/webclient-sealedInterface/.openapi-generator/VERSION new file mode 100644 index 000000000000..fc74d6ceba8e --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/.openapi-generator/VERSION @@ -0,0 +1 @@ +7.15.0-SNAPSHOT diff --git a/samples/client/petstore/java/webclient-sealedInterface/.travis.yml b/samples/client/petstore/java/webclient-sealedInterface/.travis.yml new file mode 100644 index 000000000000..1b6741c083c7 --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/.travis.yml @@ -0,0 +1,22 @@ +# +# Generated by OpenAPI Generator: https://openapi-generator.tech +# +# Ref: https://docs.travis-ci.com/user/languages/java/ +# +language: java +jdk: + - openjdk12 + - openjdk11 + - openjdk10 + - openjdk9 + - openjdk8 +before_install: + # ensure gradlew has proper permission + - chmod a+x ./gradlew +script: + # test using maven + #- mvn test + # test using gradle + - gradle test + # test using sbt + # - sbt test diff --git a/samples/client/petstore/java/webclient-sealedInterface/README.md b/samples/client/petstore/java/webclient-sealedInterface/README.md new file mode 100644 index 000000000000..7e44bb829b7f --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/README.md @@ -0,0 +1,159 @@ +# sealed-interface-webclient + +ByRefOrValue + +- API version: 0.0.1 + +- Generator version: 7.15.0-SNAPSHOT + +This tests for a oneOf interface representation + + + +*Automatically generated by the [OpenAPI Generator](https://openapi-generator.tech)* + +## Requirements + +Building the API client library requires: + +1. Java 1.8+ +2. Maven/Gradle + +## Installation + +To install the API client library to your local Maven repository, simply execute: + +```shell +mvn clean install +``` + +To deploy it to a remote Maven repository instead, configure the settings of the repository and execute: + +```shell +mvn clean deploy +``` + +Refer to the [OSSRH Guide](http://central.sonatype.org/pages/ossrh-guide.html) for more information. + +### Maven users + +Add this dependency to your project's POM: + +```xml + + org.openapitools + sealed-interface-webclient + 0.0.1 + compile + +``` + +### Gradle users + +Add this dependency to your project's build file: + +```groovy + repositories { + mavenCentral() // Needed if the 'sealed-interface-webclient' jar has been published to maven central. + mavenLocal() // Needed if the 'sealed-interface-webclient' jar has been published to the local maven repo. + } + + dependencies { + implementation "org.openapitools:sealed-interface-webclient:0.0.1" + } +``` + +### Others + +At first generate the JAR by executing: + +```shell +mvn clean package +``` + +Then manually install the following JARs: + +- `target/sealed-interface-webclient-0.0.1.jar` +- `target/lib/*.jar` + +## Getting Started + +Please follow the [installation](#installation) instruction and execute the following Java code: + +```java + +import org.openapitools.client.*; +import org.openapitools.client.auth.*; +import org.openapitools.client.model.*; +import org.openapitools.client.api.BarApi; + +public class BarApiExample { + + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://localhost:8080"); + + BarApi apiInstance = new BarApi(defaultClient); + BarCreate barCreate = new BarCreate(); // BarCreate | + try { + Bar result = apiInstance.createBar(barCreate); + System.out.println(result); + } catch (ApiException e) { + System.err.println("Exception when calling BarApi#createBar"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } +} + +``` + +## Documentation for API Endpoints + +All URIs are relative to *http://localhost:8080* + +Class | Method | HTTP request | Description +------------ | ------------- | ------------- | ------------- +*BarApi* | [**createBar**](docs/BarApi.md#createBar) | **POST** /bar | Create a Bar +*FooApi* | [**createFoo**](docs/FooApi.md#createFoo) | **POST** /foo | Create a Foo +*FooApi* | [**getAllFoos**](docs/FooApi.md#getAllFoos) | **GET** /foo | GET all Foos + + +## Documentation for Models + + - [Addressable](docs/Addressable.md) + - [Apple](docs/Apple.md) + - [Banana](docs/Banana.md) + - [Bar](docs/Bar.md) + - [BarCreate](docs/BarCreate.md) + - [BarRef](docs/BarRef.md) + - [BarRefOrValue](docs/BarRefOrValue.md) + - [Entity](docs/Entity.md) + - [EntityRef](docs/EntityRef.md) + - [Extensible](docs/Extensible.md) + - [Foo](docs/Foo.md) + - [FooRef](docs/FooRef.md) + - [FooRefOrValue](docs/FooRefOrValue.md) + - [Fruit](docs/Fruit.md) + - [FruitType](docs/FruitType.md) + - [Pasta](docs/Pasta.md) + - [Pizza](docs/Pizza.md) + - [PizzaSpeziale](docs/PizzaSpeziale.md) + + + +## Documentation for Authorization + +Endpoints do not require authorization. + + +## Recommendation + +It's recommended to create an instance of `ApiClient` per thread in a multithreaded environment to avoid any potential issues. + +## Author + + + diff --git a/samples/client/petstore/java/webclient-sealedInterface/api/openapi.yaml b/samples/client/petstore/java/webclient-sealedInterface/api/openapi.yaml new file mode 100644 index 000000000000..c622e861cd15 --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/api/openapi.yaml @@ -0,0 +1,259 @@ +openapi: 3.0.1 +info: + description: | + This tests for a oneOf interface representation + title: ByRefOrValue + version: 0.0.1 +servers: +- url: http://localhost:8080 +tags: +- name: Foo +- name: Bar +paths: + /foo: + get: + operationId: getAllFoos + responses: + "200": + $ref: "#/components/responses/200FooArray" + summary: GET all Foos + tags: + - Foo + x-accepts: + - application/json;charset=utf-8 + post: + operationId: createFoo + requestBody: + $ref: "#/components/requestBodies/Foo" + responses: + "201": + $ref: "#/components/responses/201Foo" + summary: Create a Foo + tags: + - Foo + x-content-type: application/json;charset=utf-8 + x-accepts: + - application/json + /bar: + post: + operationId: createBar + requestBody: + content: + application/json: + schema: + $ref: "#/components/schemas/Bar_Create" + required: true + responses: + "200": + content: + application/json: + schema: + $ref: "#/components/schemas/Bar" + description: Bar created + summary: Create a Bar + tags: + - Bar + x-content-type: application/json + x-accepts: + - application/json +components: + requestBodies: + Foo: + content: + application/json;charset=utf-8: + schema: + $ref: "#/components/schemas/Foo" + description: The Foo to be created + responses: + "204": + content: {} + description: Deleted + "201Foo": + content: + application/json: + schema: + $ref: "#/components/schemas/FooRefOrValue" + description: Error + "200FooArray": + content: + application/json;charset=utf-8: + schema: + items: + $ref: "#/components/schemas/FooRefOrValue" + type: array + description: Success + schemas: + Addressable: + description: Base schema for addressable entities + properties: + href: + description: Hyperlink reference + type: string + id: + description: unique identifier + type: string + type: object + Extensible: + properties: + '@schemaLocation': + description: A URI to a JSON-Schema file that defines additional attributes + and relationships + type: string + '@baseType': + description: "When sub-classing, this defines the super-class" + type: string + '@type': + description: "When sub-classing, this defines the sub-class Extensible name" + type: string + required: + - '@type' + type: object + Entity: + allOf: + - $ref: "#/components/schemas/Addressable" + - $ref: "#/components/schemas/Extensible" + discriminator: + propertyName: '@type' + type: object + EntityRef: + allOf: + - $ref: "#/components/schemas/Addressable" + - $ref: "#/components/schemas/Extensible" + description: Entity reference schema to be use for all entityRef class. + discriminator: + propertyName: '@type' + properties: + name: + description: Name of the related entity. + type: string + '@referredType': + description: The actual type of the target instance when needed for disambiguation. + type: string + type: object + FooRefOrValue: + discriminator: + propertyName: '@type' + oneOf: + - $ref: "#/components/schemas/Foo" + - $ref: "#/components/schemas/FooRef" + type: object + x-one-of-name: FooRefOrValue + Foo: + allOf: + - $ref: "#/components/schemas/Entity" + example: + fooPropA: fooPropA + fooPropB: fooPropB + properties: + fooPropA: + type: string + fooPropB: + type: string + type: object + FooRef: + allOf: + - $ref: "#/components/schemas/EntityRef" + properties: + foorefPropA: + type: string + type: object + BarRef: + allOf: + - $ref: "#/components/schemas/EntityRef" + type: object + Bar_Create: + allOf: + - $ref: "#/components/schemas/Entity" + properties: + barPropA: + type: string + fooPropB: + type: string + foo: + $ref: "#/components/schemas/FooRefOrValue" + type: object + Bar: + allOf: + - $ref: "#/components/schemas/Entity" + example: + foo: + fooPropA: fooPropA + fooPropB: fooPropB + id: id + fooPropB: fooPropB + barPropA: barPropA + properties: + id: + type: string + barPropA: + type: string + fooPropB: + type: string + foo: + $ref: "#/components/schemas/FooRefOrValue" + required: + - id + type: object + BarRefOrValue: + oneOf: + - $ref: "#/components/schemas/Bar" + - $ref: "#/components/schemas/BarRef" + type: object + x-one-of-name: BarRefOrValue + Pizza: + allOf: + - $ref: "#/components/schemas/Entity" + properties: + pizzaSize: + type: number + type: object + Pasta: + allOf: + - $ref: "#/components/schemas/Entity" + properties: + vendor: + type: string + type: object + PizzaSpeziale: + allOf: + - $ref: "#/components/schemas/Pizza" + properties: + toppings: + type: string + type: object + FruitType: + enum: + - APPLE + - BANANA + type: string + Fruit: + discriminator: + mapping: + APPLE: "#/components/schemas/Apple" + BANANA: "#/components/schemas/Banana" + propertyName: fruitType + oneOf: + - $ref: "#/components/schemas/Apple" + - $ref: "#/components/schemas/Banana" + properties: + fruitType: + $ref: "#/components/schemas/FruitType" + required: + - fruitType + type: object + x-one-of-name: Fruit + Apple: + properties: + seeds: + type: integer + required: + - seeds + type: object + Banana: + properties: + length: + type: integer + required: + - length + type: object + diff --git a/samples/client/petstore/java/webclient-sealedInterface/build.gradle b/samples/client/petstore/java/webclient-sealedInterface/build.gradle new file mode 100644 index 000000000000..49ad139b2047 --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/build.gradle @@ -0,0 +1,139 @@ +apply plugin: 'idea' +apply plugin: 'eclipse' + +group = 'org.openapitools' +version = '0.0.1' + +buildscript { + repositories { + mavenCentral() + } + dependencies { + classpath 'com.android.tools.build:gradle:2.3.+' + classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' + } +} + +repositories { + mavenCentral() +} + +if(hasProperty('target') && target == 'android') { + + apply plugin: 'com.android.library' + apply plugin: 'com.github.dcendents.android-maven' + + android { + compileSdkVersion 25 + buildToolsVersion '25.0.2' + defaultConfig { + minSdkVersion 14 + targetSdkVersion 25 + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + // Rename the aar correctly + libraryVariants.all { variant -> + variant.outputs.each { output -> + def outputFile = output.outputFile + if (outputFile != null && outputFile.name.endsWith('.aar')) { + def fileName = "${project.name}-${variant.baseName}-${version}.aar" + output.outputFile = new File(outputFile.parent, fileName) + } + } + } + + dependencies { + provided "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" + } + } + + afterEvaluate { + android.libraryVariants.all { variant -> + def task = project.tasks.create "jar${variant.name.capitalize()}", Jar + task.description = "Create jar artifact for ${variant.name}" + task.dependsOn variant.javaCompile + task.from variant.javaCompile.destinationDirectory + task.destinationDirectory = project.file("${project.buildDir}/outputs/jar") + task.archiveFileName = "${project.name}-${variant.baseName}-${version}.jar" + artifacts.add('archives', task); + } + } + + task sourcesJar(type: Jar) { + from android.sourceSets.main.java.srcDirs + archiveClassifier = 'sources' + } + + artifacts { + archives sourcesJar + } + +} else { + + apply plugin: 'java' + apply plugin: 'maven-publish' + + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + + publishing { + publications { + maven(MavenPublication) { + artifactId = 'sealed-interface-webclient' + from components.java + } + } + } + + task execute(type:JavaExec) { + mainClass = System.getProperty('mainClass') + classpath = sourceSets.main.runtimeClasspath + } + + task sourcesJar(type: Jar, dependsOn: classes) { + archiveClassifier = 'sources' + from sourceSets.main.allSource + } + + task javadocJar(type: Jar, dependsOn: javadoc) { + archiveClassifier = 'javadoc' + from javadoc.destinationDir + } + + artifacts { + archives sourcesJar + archives javadocJar + } +} + +ext { + spring_boot_version = "2.7.17" + jakarta_annotation_version = "1.3.5" + beanvalidation_version = "2.0.2" + reactor_version = "3.4.34" + reactor_netty_version = "1.0.39" + jackson_version = "2.17.1" + jackson_databind_version = "2.17.1" + jackson_databind_nullable_version = "0.2.6" + junit_version = "5.10.2" +} + +dependencies { + implementation "com.google.code.findbugs:jsr305:3.0.2" + implementation "io.projectreactor:reactor-core:$reactor_version" + implementation "org.springframework.boot:spring-boot-starter-webflux:$spring_boot_version" + implementation "io.projectreactor.netty:reactor-netty-http:$reactor_netty_version" + implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version" + implementation "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version" + implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" + implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version" + implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" + testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version" +} diff --git a/samples/client/petstore/java/webclient-sealedInterface/build.sbt b/samples/client/petstore/java/webclient-sealedInterface/build.sbt new file mode 100644 index 000000000000..464090415c47 --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/build.sbt @@ -0,0 +1 @@ +# TODO diff --git a/samples/client/petstore/java/webclient-sealedInterface/docs/Addressable.md b/samples/client/petstore/java/webclient-sealedInterface/docs/Addressable.md new file mode 100644 index 000000000000..c7d2a76f04bf --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/docs/Addressable.md @@ -0,0 +1,15 @@ + + +# Addressable + +Base schema for addressable entities + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| +|**href** | **String** | Hyperlink reference | [optional] | +|**id** | **String** | unique identifier | [optional] | + + + diff --git a/samples/client/petstore/java/webclient-sealedInterface/docs/Apple.md b/samples/client/petstore/java/webclient-sealedInterface/docs/Apple.md new file mode 100644 index 000000000000..53e17869dc0e --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/docs/Apple.md @@ -0,0 +1,18 @@ + + +# Apple + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| +|**seeds** | **Integer** | | | +|**fruitType** | **FruitType** | | | + + +## Implemented Interfaces + +* Fruit + + diff --git a/samples/client/petstore/java/webclient-sealedInterface/docs/Banana.md b/samples/client/petstore/java/webclient-sealedInterface/docs/Banana.md new file mode 100644 index 000000000000..bb5c09552602 --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/docs/Banana.md @@ -0,0 +1,18 @@ + + +# Banana + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| +|**length** | **Integer** | | | +|**fruitType** | **FruitType** | | | + + +## Implemented Interfaces + +* Fruit + + diff --git a/samples/client/petstore/java/webclient-sealedInterface/docs/Bar.md b/samples/client/petstore/java/webclient-sealedInterface/docs/Bar.md new file mode 100644 index 000000000000..4ba742a05241 --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/docs/Bar.md @@ -0,0 +1,20 @@ + + +# Bar + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| +|**id** | **String** | | | +|**barPropA** | **String** | | [optional] | +|**fooPropB** | **String** | | [optional] | +|**foo** | [**FooRefOrValue**](FooRefOrValue.md) | | [optional] | + + +## Implemented Interfaces + +* BarRefOrValue + + diff --git a/samples/client/petstore/java/webclient-sealedInterface/docs/BarApi.md b/samples/client/petstore/java/webclient-sealedInterface/docs/BarApi.md new file mode 100644 index 000000000000..b1263248a5be --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/docs/BarApi.md @@ -0,0 +1,73 @@ +# BarApi + +All URIs are relative to *http://localhost:8080* + +| Method | HTTP request | Description | +|------------- | ------------- | -------------| +| [**createBar**](BarApi.md#createBar) | **POST** /bar | Create a Bar | + + + +## createBar + +> Bar createBar(barCreate) + +Create a Bar + +### Example + +```java +// Import classes: +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.BarApi; + +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://localhost:8080"); + + BarApi apiInstance = new BarApi(defaultClient); + BarCreate barCreate = new BarCreate(); // BarCreate | + try { + Bar result = apiInstance.createBar(barCreate); + System.out.println(result); + } catch (ApiException e) { + System.err.println("Exception when calling BarApi#createBar"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } +} +``` + +### Parameters + + +| Name | Type | Description | Notes | +|------------- | ------------- | ------------- | -------------| +| **barCreate** | [**BarCreate**](BarCreate.md)| | | + +### Return type + +[**Bar**](Bar.md) + +### Authorization + +No authorization required + +### HTTP request headers + +- **Content-Type**: application/json +- **Accept**: application/json + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **200** | Bar created | - | + diff --git a/samples/client/petstore/java/webclient-sealedInterface/docs/BarCreate.md b/samples/client/petstore/java/webclient-sealedInterface/docs/BarCreate.md new file mode 100644 index 000000000000..35f9ace74201 --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/docs/BarCreate.md @@ -0,0 +1,15 @@ + + +# BarCreate + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| +|**barPropA** | **String** | | [optional] | +|**fooPropB** | **String** | | [optional] | +|**foo** | [**FooRefOrValue**](FooRefOrValue.md) | | [optional] | + + + diff --git a/samples/client/petstore/java/webclient-sealedInterface/docs/BarRef.md b/samples/client/petstore/java/webclient-sealedInterface/docs/BarRef.md new file mode 100644 index 000000000000..05fa7f7ebd3c --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/docs/BarRef.md @@ -0,0 +1,16 @@ + + +# BarRef + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| + + +## Implemented Interfaces + +* BarRefOrValue + + diff --git a/samples/client/petstore/java/webclient-sealedInterface/docs/BarRefOrValue.md b/samples/client/petstore/java/webclient-sealedInterface/docs/BarRefOrValue.md new file mode 100644 index 000000000000..5c516a3c2df5 --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/docs/BarRefOrValue.md @@ -0,0 +1,10 @@ + + +# Interface BarRefOrValue + +## Implementing Classes + +* Bar +* BarRef + + diff --git a/samples/client/petstore/java/webclient-sealedInterface/docs/Entity.md b/samples/client/petstore/java/webclient-sealedInterface/docs/Entity.md new file mode 100644 index 000000000000..c45e13dbc591 --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/docs/Entity.md @@ -0,0 +1,17 @@ + + +# Entity + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| +|**href** | **String** | Hyperlink reference | [optional] | +|**id** | **String** | unique identifier | [optional] | +|**atSchemaLocation** | **String** | A URI to a JSON-Schema file that defines additional attributes and relationships | [optional] | +|**atBaseType** | **String** | When sub-classing, this defines the super-class | [optional] | +|**atType** | **String** | When sub-classing, this defines the sub-class Extensible name | | + + + diff --git a/samples/client/petstore/java/webclient-sealedInterface/docs/EntityRef.md b/samples/client/petstore/java/webclient-sealedInterface/docs/EntityRef.md new file mode 100644 index 000000000000..b1e3f0046ab8 --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/docs/EntityRef.md @@ -0,0 +1,20 @@ + + +# EntityRef + +Entity reference schema to be use for all entityRef class. + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| +|**name** | **String** | Name of the related entity. | [optional] | +|**atReferredType** | **String** | The actual type of the target instance when needed for disambiguation. | [optional] | +|**href** | **String** | Hyperlink reference | [optional] | +|**id** | **String** | unique identifier | [optional] | +|**atSchemaLocation** | **String** | A URI to a JSON-Schema file that defines additional attributes and relationships | [optional] | +|**atBaseType** | **String** | When sub-classing, this defines the super-class | [optional] | +|**atType** | **String** | When sub-classing, this defines the sub-class Extensible name | | + + + diff --git a/samples/client/petstore/java/webclient-sealedInterface/docs/Extensible.md b/samples/client/petstore/java/webclient-sealedInterface/docs/Extensible.md new file mode 100644 index 000000000000..e3b37076c8bb --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/docs/Extensible.md @@ -0,0 +1,15 @@ + + +# Extensible + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| +|**atSchemaLocation** | **String** | A URI to a JSON-Schema file that defines additional attributes and relationships | [optional] | +|**atBaseType** | **String** | When sub-classing, this defines the super-class | [optional] | +|**atType** | **String** | When sub-classing, this defines the sub-class Extensible name | | + + + diff --git a/samples/client/petstore/java/webclient-sealedInterface/docs/Foo.md b/samples/client/petstore/java/webclient-sealedInterface/docs/Foo.md new file mode 100644 index 000000000000..6307bab605bb --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/docs/Foo.md @@ -0,0 +1,18 @@ + + +# Foo + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| +|**fooPropA** | **String** | | [optional] | +|**fooPropB** | **String** | | [optional] | + + +## Implemented Interfaces + +* FooRefOrValue + + diff --git a/samples/client/petstore/java/webclient-sealedInterface/docs/FooApi.md b/samples/client/petstore/java/webclient-sealedInterface/docs/FooApi.md new file mode 100644 index 000000000000..adc823b49127 --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/docs/FooApi.md @@ -0,0 +1,134 @@ +# FooApi + +All URIs are relative to *http://localhost:8080* + +| Method | HTTP request | Description | +|------------- | ------------- | -------------| +| [**createFoo**](FooApi.md#createFoo) | **POST** /foo | Create a Foo | +| [**getAllFoos**](FooApi.md#getAllFoos) | **GET** /foo | GET all Foos | + + + +## createFoo + +> FooRefOrValue createFoo(foo) + +Create a Foo + +### Example + +```java +// Import classes: +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.FooApi; + +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://localhost:8080"); + + FooApi apiInstance = new FooApi(defaultClient); + Foo foo = new Foo(); // Foo | The Foo to be created + try { + FooRefOrValue result = apiInstance.createFoo(foo); + System.out.println(result); + } catch (ApiException e) { + System.err.println("Exception when calling FooApi#createFoo"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } +} +``` + +### Parameters + + +| Name | Type | Description | Notes | +|------------- | ------------- | ------------- | -------------| +| **foo** | [**Foo**](Foo.md)| The Foo to be created | [optional] | + +### Return type + +[**FooRefOrValue**](FooRefOrValue.md) + +### Authorization + +No authorization required + +### HTTP request headers + +- **Content-Type**: application/json;charset=utf-8 +- **Accept**: application/json + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **201** | Error | - | + + +## getAllFoos + +> List<FooRefOrValue> getAllFoos() + +GET all Foos + +### Example + +```java +// Import classes: +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.FooApi; + +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://localhost:8080"); + + FooApi apiInstance = new FooApi(defaultClient); + try { + List result = apiInstance.getAllFoos(); + System.out.println(result); + } catch (ApiException e) { + System.err.println("Exception when calling FooApi#getAllFoos"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } +} +``` + +### Parameters + +This endpoint does not need any parameter. + +### Return type + +[**List<FooRefOrValue>**](FooRefOrValue.md) + +### Authorization + +No authorization required + +### HTTP request headers + +- **Content-Type**: Not defined +- **Accept**: application/json;charset=utf-8 + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **200** | Success | - | + diff --git a/samples/client/petstore/java/webclient-sealedInterface/docs/FooRef.md b/samples/client/petstore/java/webclient-sealedInterface/docs/FooRef.md new file mode 100644 index 000000000000..d173a72d0edc --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/docs/FooRef.md @@ -0,0 +1,17 @@ + + +# FooRef + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| +|**foorefPropA** | **String** | | [optional] | + + +## Implemented Interfaces + +* FooRefOrValue + + diff --git a/samples/client/petstore/java/webclient-sealedInterface/docs/FooRefOrValue.md b/samples/client/petstore/java/webclient-sealedInterface/docs/FooRefOrValue.md new file mode 100644 index 000000000000..961ca653a16c --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/docs/FooRefOrValue.md @@ -0,0 +1,10 @@ + + +# Interface FooRefOrValue + +## Implementing Classes + +* Foo +* FooRef + + diff --git a/samples/client/petstore/java/webclient-sealedInterface/docs/Fruit.md b/samples/client/petstore/java/webclient-sealedInterface/docs/Fruit.md new file mode 100644 index 000000000000..95426f21aa1d --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/docs/Fruit.md @@ -0,0 +1,10 @@ + + +# Interface Fruit + +## Implementing Classes + +* Apple +* Banana + + diff --git a/samples/client/petstore/java/webclient-sealedInterface/docs/FruitType.md b/samples/client/petstore/java/webclient-sealedInterface/docs/FruitType.md new file mode 100644 index 000000000000..68e5197808c6 --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/docs/FruitType.md @@ -0,0 +1,13 @@ + + +# FruitType + +## Enum + + +* `APPLE` (value: `"APPLE"`) + +* `BANANA` (value: `"BANANA"`) + + + diff --git a/samples/client/petstore/java/webclient-sealedInterface/docs/Pasta.md b/samples/client/petstore/java/webclient-sealedInterface/docs/Pasta.md new file mode 100644 index 000000000000..2116bf4a76fc --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/docs/Pasta.md @@ -0,0 +1,13 @@ + + +# Pasta + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| +|**vendor** | **String** | | [optional] | + + + diff --git a/samples/client/petstore/java/webclient-sealedInterface/docs/Pizza.md b/samples/client/petstore/java/webclient-sealedInterface/docs/Pizza.md new file mode 100644 index 000000000000..165edb3e6233 --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/docs/Pizza.md @@ -0,0 +1,13 @@ + + +# Pizza + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| +|**pizzaSize** | **BigDecimal** | | [optional] | + + + diff --git a/samples/client/petstore/java/webclient-sealedInterface/docs/PizzaSpeziale.md b/samples/client/petstore/java/webclient-sealedInterface/docs/PizzaSpeziale.md new file mode 100644 index 000000000000..2ce45a1da0f9 --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/docs/PizzaSpeziale.md @@ -0,0 +1,13 @@ + + +# PizzaSpeziale + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| +|**toppings** | **String** | | [optional] | + + + diff --git a/samples/client/petstore/java/webclient-sealedInterface/git_push.sh b/samples/client/petstore/java/webclient-sealedInterface/git_push.sh new file mode 100644 index 000000000000..f53a75d4fabe --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/git_push.sh @@ -0,0 +1,57 @@ +#!/bin/sh +# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/ +# +# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl "minor update" "gitlab.com" + +git_user_id=$1 +git_repo_id=$2 +release_note=$3 +git_host=$4 + +if [ "$git_host" = "" ]; then + git_host="github.com" + echo "[INFO] No command line input provided. Set \$git_host to $git_host" +fi + +if [ "$git_user_id" = "" ]; then + git_user_id="GIT_USER_ID" + echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id" +fi + +if [ "$git_repo_id" = "" ]; then + git_repo_id="GIT_REPO_ID" + echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id" +fi + +if [ "$release_note" = "" ]; then + release_note="Minor update" + echo "[INFO] No command line input provided. Set \$release_note to $release_note" +fi + +# Initialize the local directory as a Git repository +git init + +# Adds the files in the local repository and stages them for commit. +git add . + +# Commits the tracked changes and prepares them to be pushed to a remote repository. +git commit -m "$release_note" + +# Sets the new remote +git_remote=$(git remote) +if [ "$git_remote" = "" ]; then # git remote not defined + + if [ "$GIT_TOKEN" = "" ]; then + echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment." + git remote add origin https://${git_host}/${git_user_id}/${git_repo_id}.git + else + git remote add origin https://${git_user_id}:"${GIT_TOKEN}"@${git_host}/${git_user_id}/${git_repo_id}.git + fi + +fi + +git pull origin master + +# Pushes (Forces) the changes in the local repository up to the remote repository +echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git" +git push origin master 2>&1 | grep -v 'To https' diff --git a/samples/client/petstore/java/webclient-sealedInterface/gradle.properties b/samples/client/petstore/java/webclient-sealedInterface/gradle.properties new file mode 100644 index 000000000000..a3408578278a --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/gradle.properties @@ -0,0 +1,6 @@ +# This file is automatically generated by OpenAPI Generator (https://github.com/openAPITools/openapi-generator). +# To include other gradle properties as part of the code generation process, please use the `gradleProperties` option. +# +# Gradle properties reference: https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties +# For example, uncomment below to build for Android +#target = android diff --git a/samples/client/petstore/java/webclient-sealedInterface/gradle/wrapper/gradle-wrapper.jar b/samples/client/petstore/java/webclient-sealedInterface/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..e6441136f3d4ba8a0da8d277868979cfbc8ad796 GIT binary patch literal 43453 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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
NnX)EH+Nua)3Y(c z&{(nX_ht=QbJ%DzAya}!&uNu!4V0xI)QE$SY__m)SAKcN0P(&JcoK*Lxr@P zY&P=}&B3*UWNlc|&$Oh{BEqwK2+N2U$4WB7Fd|aIal`FGANUa9E-O)!gV`((ZGCc$ zBJA|FFrlg~9OBp#f7aHodCe{6= zay$6vN~zj1ddMZ9gQ4p32(7wD?(dE>KA2;SOzXRmPBiBc6g`eOsy+pVcHu=;Yd8@{ zSGgXf@%sKKQz~;!J;|2fC@emm#^_rnO0esEn^QxXgJYd`#FPWOUU5b;9eMAF zZhfiZb|gk8aJIw*YLp4!*(=3l8Cp{(%p?ho22*vN9+5NLV0TTazNY$B5L6UKUrd$n zjbX%#m7&F#U?QNOBXkiiWB*_tk+H?N3`vg;1F-I+83{M2!8<^nydGr5XX}tC!10&e z7D36bLaB56WrjL&HiiMVtpff|K%|*{t*ltt^5ood{FOG0<>k&1h95qPio)2`eL${YAGIx(b4VN*~nKn6E~SIQUuRH zQ+5zP6jfnP$S0iJ@~t!Ai3o`X7biohli;E zT#yXyl{bojG@-TGZzpdVDXhbmF%F9+-^YSIv|MT1l3j zrxOFq>gd2%U}?6}8mIj?M zc077Zc9fq(-)4+gXv?Az26IO6eV`RAJz8e3)SC7~>%rlzDwySVx*q$ygTR5kW2ds- z!HBgcq0KON9*8Ff$X0wOq$`T7ml(@TF)VeoF}x1OttjuVHn3~sHrMB++}f7f9H%@f z=|kP_?#+fve@{0MlbkC9tyvQ_R?lRdRJ@$qcB(8*jyMyeME5ns6ypVI1Xm*Zr{DuS zZ!1)rQfa89c~;l~VkCiHI|PCBd`S*2RLNQM8!g9L6?n`^evQNEwfO@&JJRme+uopQX0%Jo zgd5G&#&{nX{o?TQwQvF1<^Cg3?2co;_06=~Hcb6~4XWpNFL!WU{+CK;>gH%|BLOh7@!hsa(>pNDAmpcuVO-?;Bic17R}^|6@8DahH)G z!EmhsfunLL|3b=M0MeK2vqZ|OqUqS8npxwge$w-4pFVXFq$_EKrZY?BuP@Az@(k`L z`ViQBSk`y+YwRT;&W| z2e3UfkCo^uTA4}Qmmtqs+nk#gNr2W4 zTH%hhErhB)pkXR{B!q5P3-OM+M;qu~f>}IjtF%>w{~K-0*jPVLl?Chz&zIdxp}bjx zStp&Iufr58FTQ36AHU)0+CmvaOpKF;W@sMTFpJ`j;3d)J_$tNQI^c<^1o<49Z(~K> z;EZTBaVT%14(bFw2ob@?JLQ2@(1pCdg3S%E4*dJ}dA*v}_a4_P(a`cHnBFJxNobAv zf&Zl-Yt*lhn-wjZsq<9v-IsXxAxMZ58C@e0!rzhJ+D@9^3~?~yllY^s$?&oNwyH!#~6x4gUrfxplCvK#!f z$viuszW>MFEcFL?>ux*((!L$;R?xc*myjRIjgnQX79@UPD$6Dz0jutM@7h_pq z0Zr)#O<^y_K6jfY^X%A-ip>P%3saX{!v;fxT-*0C_j4=UMH+Xth(XVkVGiiKE#f)q z%Jp=JT)uy{&}Iq2E*xr4YsJ5>w^=#-mRZ4vPXpI6q~1aFwi+lQcimO45V-JXP;>(Q zo={U`{=_JF`EQj87Wf}{Qy35s8r1*9Mxg({CvOt}?Vh9d&(}iI-quvs-rm~P;eRA@ zG5?1HO}puruc@S{YNAF3vmUc2B4!k*yi))<5BQmvd3tr}cIs#9)*AX>t`=~{f#Uz0 z0&Nk!7sSZwJe}=)-R^$0{yeS!V`Dh7w{w5rZ9ir!Z7Cd7dwZcK;BT#V0bzTt>;@Cl z#|#A!-IL6CZ@eHH!CG>OO8!%G8&8t4)Ro@}USB*k>oEUo0LsljsJ-%5Mo^MJF2I8- z#v7a5VdJ-Cd%(a+y6QwTmi+?f8Nxtm{g-+WGL>t;s#epv7ug>inqimZCVm!uT5Pf6 ziEgQt7^%xJf#!aPWbuC_3Nxfb&CFbQy!(8ANpkWLI4oSnH?Q3f?0k1t$3d+lkQs{~(>06l&v|MpcFsyAv zin6N!-;pggosR*vV=DO(#+}4ps|5$`udE%Kdmp?G7B#y%H`R|i8skKOd9Xzx8xgR$>Zo2R2Ytktq^w#ul4uicxW#{ zFjG_RNlBroV_n;a7U(KIpcp*{M~e~@>Q#Av90Jc5v%0c>egEdY4v3%|K1XvB{O_8G zkTWLC>OZKf;XguMH2-Pw{BKbFzaY;4v2seZV0>^7Q~d4O=AwaPhP3h|!hw5aqOtT@ z!SNz}$of**Bl3TK209@F=Tn1+mgZa8yh(Png%Zd6Mt}^NSjy)etQrF zme*llAW=N_8R*O~d2!apJnF%(JcN??=`$qs3Y+~xs>L9x`0^NIn!8mMRFA_tg`etw z3k{9JAjnl@ygIiJcNHTy02GMAvBVqEss&t2<2mnw!; zU`J)0>lWiqVqo|ex7!+@0i>B~BSU1A_0w#Ee+2pJx0BFiZ7RDHEvE*ptc9md(B{&+ zKE>TM)+Pd>HEmdJao7U@S>nL(qq*A)#eLOuIfAS@j`_sK0UEY6OAJJ-kOrHG zjHx`g!9j*_jRcJ%>CE9K2MVf?BUZKFHY?EpV6ai7sET-tqk=nDFh-(65rhjtlKEY% z@G&cQ<5BKatfdA1FKuB=i>CCC5(|9TMW%K~GbA4}80I5%B}(gck#Wlq@$nO3%@QP_ z8nvPkJFa|znk>V92cA!K1rKtr)skHEJD;k8P|R8RkCq1Rh^&}Evwa4BUJz2f!2=MH zo4j8Y$YL2313}H~F7@J7mh>u%556Hw0VUOz-Un@ZASCL)y8}4XXS`t1AC*^>PLwIc zUQok5PFS=*#)Z!3JZN&eZ6ZDP^-c@StY*t20JhCnbMxXf=LK#;`4KHEqMZ-Ly9KsS zI2VUJGY&PmdbM+iT)zek)#Qc#_i4uH43 z@T5SZBrhNCiK~~esjsO9!qBpaWK<`>!-`b71Y5ReXQ4AJU~T2Njri1CEp5oKw;Lnm)-Y@Z3sEY}XIgSy%xo=uek(kAAH5MsV$V3uTUsoTzxp_rF=tx zV07vlJNKtJhCu`b}*#m&5LV4TAE&%KtHViDAdv#c^x`J7bg z&N;#I2GkF@SIGht6p-V}`!F_~lCXjl1BdTLIjD2hH$J^YFN`7f{Q?OHPFEM$65^!u zNwkelo*5+$ZT|oQ%o%;rBX$+?xhvjb)SHgNHE_yP%wYkkvXHS{Bf$OiKJ5d1gI0j< zF6N}Aq=(WDo(J{e-uOecxPD>XZ@|u-tgTR<972`q8;&ZD!cep^@B5CaqFz|oU!iFj zU0;6fQX&~15E53EW&w1s9gQQ~Zk16X%6 zjG`j0yq}4deX2?Tr(03kg>C(!7a|b9qFI?jcE^Y>-VhudI@&LI6Qa}WQ>4H_!UVyF z((cm&!3gmq@;BD#5P~0;_2qgZhtJS|>WdtjY=q zLnHH~Fm!cxw|Z?Vw8*~?I$g#9j&uvgm7vPr#&iZgPP~v~BI4jOv;*OQ?jYJtzO<^y z7-#C={r7CO810!^s(MT!@@Vz_SVU)7VBi(e1%1rvS!?PTa}Uv`J!EP3s6Y!xUgM^8 z4f!fq<3Wer_#;u!5ECZ|^c1{|q_lh3m^9|nsMR1#Qm|?4Yp5~|er2?W^7~cl;_r4WSme_o68J9p03~Hc%X#VcX!xAu%1`R!dfGJCp zV*&m47>s^%Ib0~-2f$6oSgn3jg8m%UA;ArcdcRyM5;}|r;)?a^D*lel5C`V5G=c~k zy*w_&BfySOxE!(~PI$*dwG><+-%KT5p?whOUMA*k<9*gi#T{h3DAxzAPxN&Xws8o9Cp*`PA5>d9*Z-ynV# z9yY*1WR^D8|C%I@vo+d8r^pjJ$>eo|j>XiLWvTWLl(^;JHCsoPgem6PvegHb-OTf| zvTgsHSa;BkbG=(NgPO|CZu9gUCGr$8*EoH2_Z#^BnxF0yM~t`|9ws_xZ8X8iZYqh! zAh;HXJ)3P&)Q0(&F>!LN0g#bdbis-cQxyGn9Qgh`q+~49Fqd2epikEUw9caM%V6WgP)532RMRW}8gNS%V%Hx7apSz}tn@bQy!<=lbhmAH=FsMD?leawbnP5BWM0 z5{)@EEIYMu5;u)!+HQWhQ;D3_Cm_NADNeb-f56}<{41aYq8p4=93d=-=q0Yx#knGYfXVt z+kMxlus}t2T5FEyCN~!}90O_X@@PQpuy;kuGz@bWft%diBTx?d)_xWd_-(!LmVrh**oKg!1CNF&LX4{*j|) zIvjCR0I2UUuuEXh<9}oT_zT#jOrJAHNLFT~Ilh9hGJPI1<5`C-WA{tUYlyMeoy!+U zhA#=p!u1R7DNg9u4|QfED-2TuKI}>p#2P9--z;Bbf4Op*;Q9LCbO&aL2i<0O$ByoI z!9;Ght733FC>Pz>$_mw(F`zU?`m@>gE`9_p*=7o=7av`-&ifU(^)UU`Kg3Kw`h9-1 z6`e6+im=|m2v`pN(2dE%%n8YyQz;#3Q-|x`91z?gj68cMrHl}C25|6(_dIGk*8cA3 zRHB|Nwv{@sP4W+YZM)VKI>RlB`n=Oj~Rzx~M+Khz$N$45rLn6k1nvvD^&HtsMA4`s=MmuOJID@$s8Ph4E zAmSV^+s-z8cfv~Yd(40Sh4JG#F~aB>WFoX7ykaOr3JaJ&Lb49=B8Vk-SQT9%7TYhv z?-Pprt{|=Y5ZQ1?od|A<_IJU93|l4oAfBm?3-wk{O<8ea+`}u%(kub(LFo2zFtd?4 zwpN|2mBNywv+d^y_8#<$r>*5+$wRTCygFLcrwT(qc^n&@9r+}Kd_u@Ithz(6Qb4}A zWo_HdBj#V$VE#l6pD0a=NfB0l^6W^g`vm^sta>Tly?$E&{F?TTX~DsKF~poFfmN%2 z4x`Dc{u{Lkqz&y!33;X}weD}&;7p>xiI&ZUb1H9iD25a(gI|`|;G^NwJPv=1S5e)j z;U;`?n}jnY6rA{V^ zxTd{bK)Gi^odL3l989DQlN+Zs39Xe&otGeY(b5>rlIqfc7Ap4}EC?j<{M=hlH{1+d zw|c}}yx88_xQr`{98Z!d^FNH77=u(p-L{W6RvIn40f-BldeF-YD>p6#)(Qzf)lfZj z?3wAMtPPp>vMehkT`3gToPd%|D8~4`5WK{`#+}{L{jRUMt zrFz+O$C7y8$M&E4@+p+oV5c%uYzbqd2Y%SSgYy#xh4G3hQv>V*BnuKQhBa#=oZB~w{azUB+q%bRe_R^ z>fHBilnRTUfaJ201czL8^~Ix#+qOHSO)A|xWLqOxB$dT2W~)e-r9;bm=;p;RjYahB z*1hegN(VKK+ztr~h1}YP@6cfj{e#|sS`;3tJhIJK=tVJ-*h-5y9n*&cYCSdg#EHE# zSIx=r#qOaLJoVVf6v;(okg6?*L_55atl^W(gm^yjR?$GplNP>BZsBYEf_>wM0Lc;T zhf&gpzOWNxS>m+mN92N0{;4uw`P+9^*|-1~$uXpggj4- z^SFc4`uzj2OwdEVT@}Q`(^EcQ_5(ZtXTql*yGzdS&vrS_w>~~ra|Nb5abwf}Y!uq6R5f&6g2ge~2p(%c< z@O)cz%%rr4*cRJ5f`n@lvHNk@lE1a*96Kw6lJ~B-XfJW%?&-y?;E&?1AacU@`N`!O z6}V>8^%RZ7SQnZ-z$(jsX`amu*5Fj8g!3RTRwK^`2_QHe;_2y_n|6gSaGyPmI#kA0sYV<_qOZc#-2BO%hX)f$s-Z3xlI!ub z^;3ru11DA`4heAu%}HIXo&ctujzE2!6DIGE{?Zs>2}J+p&C$rc7gJC35gxhflorvsb%sGOxpuWhF)dL_&7&Z99=5M0b~Qa;Mo!j&Ti_kXW!86N%n= zSC@6Lw>UQ__F&+&Rzv?gscwAz8IP!n63>SP)^62(HK98nGjLY2*e^OwOq`3O|C92? z;TVhZ2SK%9AGW4ZavTB9?)mUbOoF`V7S=XM;#3EUpR+^oHtdV!GK^nXzCu>tpR|89 zdD{fnvCaN^^LL%amZ^}-E+214g&^56rpdc@yv0b<3}Ys?)f|fXN4oHf$six)-@<;W&&_kj z-B}M5U*1sb4)77aR=@%I?|Wkn-QJVuA96an25;~!gq(g1@O-5VGo7y&E_srxL6ZfS z*R%$gR}dyONgju*D&?geiSj7SZ@ftyA|}(*Y4KbvU!YLsi1EDQQCnb+-cM=K1io78o!v*);o<XwjaQH%)uIP&Zm?)Nfbfn;jIr z)d#!$gOe3QHp}2NBak@yYv3m(CPKkwI|{;d=gi552u?xj9ObCU^DJFQp4t4e1tPzM zvsRIGZ6VF+{6PvqsplMZWhz10YwS={?`~O0Ec$`-!klNUYtzWA^f9m7tkEzCy<_nS z=&<(awFeZvt51>@o_~>PLs05CY)$;}Oo$VDO)?l-{CS1Co=nxjqben*O1BR>#9`0^ zkwk^k-wcLCLGh|XLjdWv0_Hg54B&OzCE^3NCP}~OajK-LuRW53CkV~Su0U>zN%yQP zH8UH#W5P3-!ToO-2k&)}nFe`t+mdqCxxAHgcifup^gKpMObbox9LFK;LP3}0dP-UW z?Zo*^nrQ6*$FtZ(>kLCc2LY*|{!dUn$^RW~m9leoF|@Jy|M5p-G~j%+P0_#orRKf8 zvuu5<*XO!B?1E}-*SY~MOa$6c%2cM+xa8}_8x*aVn~57v&W(0mqN1W`5a7*VN{SUH zXz98DDyCnX2EPl-`Lesf`=AQT%YSDb`$%;(jUTrNen$NPJrlpPDP}prI>Ml!r6bCT;mjsg@X^#&<}CGf0JtR{Ecwd&)2zuhr#nqdgHj+g2n}GK9CHuwO zk>oZxy{vcOL)$8-}L^iVfJHAGfwN$prHjYV0ju}8%jWquw>}_W6j~m<}Jf!G?~r5&Rx)!9JNX!ts#SGe2HzobV5); zpj@&`cNcO&q+%*<%D7za|?m5qlmFK$=MJ_iv{aRs+BGVrs)98BlN^nMr{V_fcl_;jkzRju+c-y?gqBC_@J0dFLq-D9@VN&-`R9U;nv$Hg?>$oe4N&Ht$V_(JR3TG^! zzJsbQbi zFE6-{#9{G{+Z}ww!ycl*7rRdmU#_&|DqPfX3CR1I{Kk;bHwF6jh0opI`UV2W{*|nn zf_Y@%wW6APb&9RrbEN=PQRBEpM(N1w`81s=(xQj6 z-eO0k9=Al|>Ej|Mw&G`%q8e$2xVz1v4DXAi8G};R$y)ww638Y=9y$ZYFDM$}vzusg zUf+~BPX>(SjA|tgaFZr_e0{)+z9i6G#lgt=F_n$d=beAt0Sa0a7>z-?vcjl3e+W}+ z1&9=|vC=$co}-Zh*%3588G?v&U7%N1Qf-wNWJ)(v`iO5KHSkC5&g7CrKu8V}uQGcfcz zmBz#Lbqwqy#Z~UzHgOQ;Q-rPxrRNvl(&u6ts4~0=KkeS;zqURz%!-ERppmd%0v>iRlEf+H$yl{_8TMJzo0 z>n)`On|7=WQdsqhXI?#V{>+~}qt-cQbokEbgwV3QvSP7&hK4R{Z{aGHVS3;+h{|Hz z6$Js}_AJr383c_+6sNR|$qu6dqHXQTc6?(XWPCVZv=)D#6_;D_8P-=zOGEN5&?~8S zl5jQ?NL$c%O)*bOohdNwGIKM#jSAC?BVY={@A#c9GmX0=T(0G}xs`-%f3r=m6-cpK z!%waekyAvm9C3%>sixdZj+I(wQlbB4wv9xKI*T13DYG^T%}zZYJ|0$Oj^YtY+d$V$ zAVudSc-)FMl|54n=N{BnZTM|!>=bhaja?o7s+v1*U$!v!qQ%`T-6fBvmdPbVmro&d zk07TOp*KuxRUSTLRrBj{mjsnF8`d}rMViY8j`jo~Hp$fkv9F_g(jUo#Arp;Xw0M$~ zRIN!B22~$kx;QYmOkos@%|5k)!QypDMVe}1M9tZfkpXKGOxvKXB!=lo`p?|R1l=tA zp(1}c6T3Fwj_CPJwVsYtgeRKg?9?}%oRq0F+r+kdB=bFUdVDRPa;E~~>2$w}>O>v=?|e>#(-Lyx?nbg=ckJ#5U6;RT zNvHhXk$P}m9wSvFyU3}=7!y?Y z=fg$PbV8d7g25&-jOcs{%}wTDKm>!Vk);&rr;O1nvO0VrU&Q?TtYVU=ir`te8SLlS zKSNmV=+vF|ATGg`4$N1uS|n??f}C_4Sz!f|4Ly8#yTW-FBfvS48Tef|-46C(wEO_%pPhUC5$-~Y?!0vFZ^Gu`x=m7X99_?C-`|h zfmMM&Y@zdfitA@KPw4Mc(YHcY1)3*1xvW9V-r4n-9ZuBpFcf{yz+SR{ zo$ZSU_|fgwF~aakGr(9Be`~A|3)B=9`$M-TWKipq-NqRDRQc}ABo*s_5kV%doIX7LRLRau_gd@Rd_aLFXGSU+U?uAqh z8qusWWcvgQ&wu{|sRXmv?sl=xc<$6AR$+cl& zFNh5q1~kffG{3lDUdvEZu5c(aAG~+64FxdlfwY^*;JSS|m~CJusvi-!$XR`6@XtY2 znDHSz7}_Bx7zGq-^5{stTRy|I@N=>*y$zz>m^}^{d&~h;0kYiq8<^Wq7Dz0w31ShO^~LUfW6rfitR0(=3;Uue`Y%y@ex#eKPOW zO~V?)M#AeHB2kovn1v=n^D?2{2jhIQd9t|_Q+c|ZFaWt+r&#yrOu-!4pXAJuxM+Cx z*H&>eZ0v8Y`t}8{TV6smOj=__gFC=eah)mZt9gwz>>W$!>b3O;Rm^Ig*POZP8Rl0f zT~o=Nu1J|lO>}xX&#P58%Yl z83`HRs5#32Qm9mdCrMlV|NKNC+Z~ z9OB8xk5HJ>gBLi+m@(pvpw)1(OaVJKs*$Ou#@Knd#bk+V@y;YXT?)4eP9E5{J%KGtYinNYJUH9PU3A}66c>Xn zZ{Bn0<;8$WCOAL$^NqTjwM?5d=RHgw3!72WRo0c;+houoUA@HWLZM;^U$&sycWrFd zE7ekt9;kb0`lps{>R(}YnXlyGY}5pPd9zBpgXeJTY_jwaJGSJQC#-KJqmh-;ad&F- z-Y)E>!&`Rz!HtCz>%yOJ|v(u7P*I$jqEY3}(Z-orn4 zlI?CYKNl`6I){#2P1h)y(6?i;^z`N3bxTV%wNvQW+eu|x=kbj~s8rhCR*0H=iGkSj zk23lr9kr|p7#qKL=UjgO`@UnvzU)`&fI>1Qs7ubq{@+lK{hH* zvl6eSb9%yngRn^T<;jG1SVa)eA>T^XX=yUS@NCKpk?ovCW1D@!=@kn;l_BrG;hOTC z6K&H{<8K#dI(A+zw-MWxS+~{g$tI7|SfP$EYKxA}LlVO^sT#Oby^grkdZ^^lA}uEF zBSj$weBJG{+Bh@Yffzsw=HyChS(dtLE3i*}Zj@~!_T-Ay7z=B)+*~3|?w`Zd)Co2t zC&4DyB!o&YgSw+fJn6`sn$e)29`kUwAc+1MND7YjV%lO;H2}fNy>hD#=gT ze+-aFNpyKIoXY~Vq-}OWPBe?Rfu^{ps8>Xy%42r@RV#*QV~P83jdlFNgkPN=T|Kt7 zV*M`Rh*30&AWlb$;ae130e@}Tqi3zx2^JQHpM>j$6x`#{mu%tZlwx9Gj@Hc92IuY* zarmT|*d0E~vt6<+r?W^UW0&#U&)8B6+1+;k^2|FWBRP9?C4Rk)HAh&=AS8FS|NQaZ z2j!iZ)nbEyg4ZTp-zHwVlfLC~tXIrv(xrP8PAtR{*c;T24ycA-;auWsya-!kF~CWZ zw_uZ|%urXgUbc@x=L=_g@QJ@m#5beS@6W195Hn7>_}z@Xt{DIEA`A&V82bc^#!q8$ zFh?z_Vn|ozJ;NPd^5uu(9tspo8t%&-U9Ckay-s@DnM*R5rtu|4)~e)`z0P-sy?)kc zs_k&J@0&0!q4~%cKL)2l;N*T&0;mqX5T{Qy60%JtKTQZ-xb%KOcgqwJmb%MOOKk7N zgq})R_6**{8A|6H?fO+2`#QU)p$Ei2&nbj6TpLSIT^D$|`TcSeh+)}VMb}LmvZ{O| ze*1IdCt3+yhdYVxcM)Q_V0bIXLgr6~%JS<<&dxIgfL=Vnx4YHuU@I34JXA|+$_S3~ zy~X#gO_X!cSs^XM{yzDGNM>?v(+sF#<0;AH^YrE8smx<36bUsHbN#y57K8WEu(`qHvQ6cAZPo=J5C(lSmUCZ57Rj6cx!e^rfaI5%w}unz}4 zoX=nt)FVNV%QDJH`o!u9olLD4O5fl)xp+#RloZlaA92o3x4->?rB4`gS$;WO{R;Z3>cG3IgFX2EA?PK^M}@%1%A;?f6}s&CV$cIyEr#q5;yHdNZ9h{| z-=dX+a5elJoDo?Eq&Og!nN6A)5yYpnGEp}?=!C-V)(*~z-+?kY1Q7qs#Rsy%hu_60rdbB+QQNr?S1 z?;xtjUv|*E3}HmuNyB9aFL5H~3Ho0UsmuMZELp1a#CA1g`P{-mT?BchuLEtK}!QZ=3AWakRu~?f9V~3F;TV`5%9Pcs_$gq&CcU}r8gOO zC2&SWPsSG{&o-LIGTBqp6SLQZPvYKp$$7L4WRRZ0BR$Kf0I0SCFkqveCp@f)o8W)! z$%7D1R`&j7W9Q9CGus_)b%+B#J2G;l*FLz#s$hw{BHS~WNLODV#(!u_2Pe&tMsq={ zdm7>_WecWF#D=?eMjLj=-_z`aHMZ=3_-&E8;ibPmM}61i6J3is*=dKf%HC>=xbj4$ zS|Q-hWQ8T5mWde6h@;mS+?k=89?1FU<%qH9B(l&O>k|u_aD|DY*@~(`_pb|B#rJ&g zR0(~(68fpUPz6TdS@4JT5MOPrqDh5_H(eX1$P2SQrkvN8sTxwV>l0)Qq z0pzTuvtEAKRDkKGhhv^jk%|HQ1DdF%5oKq5BS>szk-CIke{%js?~%@$uaN3^Uz6Wf z_iyx{bZ(;9y4X&>LPV=L=d+A}7I4GkK0c1Xts{rrW1Q7apHf-))`BgC^0^F(>At1* za@e7{lq%yAkn*NH8Q1{@{lKhRg*^TfGvv!Sn*ed*x@6>M%aaqySxR|oNadYt1mpUZ z6H(rupHYf&Z z29$5g#|0MX#aR6TZ$@eGxxABRKakDYtD%5BmKp;HbG_ZbT+=81E&=XRk6m_3t9PvD zr5Cqy(v?gHcYvYvXkNH@S#Po~q(_7MOuCAB8G$a9BC##gw^5mW16cML=T=ERL7wsk zzNEayTG?mtB=x*wc@ifBCJ|irFVMOvH)AFRW8WE~U()QT=HBCe@s$dA9O!@`zAAT) zaOZ7l6vyR+Nk_OOF!ZlZmjoImKh)dxFbbR~z(cMhfeX1l7S_`;h|v3gI}n9$sSQ>+3@AFAy9=B_y$)q;Wdl|C-X|VV3w8 z2S#>|5dGA8^9%Bu&fhmVRrTX>Z7{~3V&0UpJNEl0=N32euvDGCJ>#6dUSi&PxFW*s zS`}TB>?}H(T2lxBJ!V#2taV;q%zd6fOr=SGHpoSG*4PDaiG0pdb5`jelVipkEk%FV zThLc@Hc_AL1#D&T4D=w@UezYNJ%0=f3iVRuVL5H?eeZM}4W*bomebEU@e2d`M<~uW zf#Bugwf`VezG|^Qbt6R_=U0}|=k;mIIakz99*>FrsQR{0aQRP6ko?5<7bkDN8evZ& zB@_KqQG?ErKL=1*ZM9_5?Pq%lcS4uLSzN(Mr5=t6xHLS~Ym`UgM@D&VNu8e?_=nSFtF$u@hpPSmI4Vo_t&v?>$~K4y(O~Rb*(MFy_igM7 z*~yYUyR6yQgzWnWMUgDov!!g=lInM+=lOmOk4L`O?{i&qxy&D*_qorRbDwj6?)!ef z#JLd7F6Z2I$S0iYI={rZNk*<{HtIl^mx=h>Cim*04K4+Z4IJtd*-)%6XV2(MCscPiw_a+y*?BKbTS@BZ3AUao^%Zi#PhoY9Vib4N>SE%4>=Jco0v zH_Miey{E;FkdlZSq)e<{`+S3W=*ttvD#hB8w=|2aV*D=yOV}(&p%0LbEWH$&@$X3x~CiF-?ejQ*N+-M zc8zT@3iwkdRT2t(XS`d7`tJQAjRmKAhiw{WOqpuvFp`i@Q@!KMhwKgsA}%@sw8Xo5Y=F zhRJZg)O4uqNWj?V&&vth*H#je6T}}p_<>!Dr#89q@uSjWv~JuW(>FqoJ5^ho0%K?E z9?x_Q;kmcsQ@5=}z@tdljMSt9-Z3xn$k)kEjK|qXS>EfuDmu(Z8|(W?gY6-l z@R_#M8=vxKMAoi&PwnaIYw2COJM@atcgfr=zK1bvjW?9B`-+Voe$Q+H$j!1$Tjn+* z&LY<%)L@;zhnJlB^Og6I&BOR-m?{IW;tyYC%FZ!&Z>kGjHJ6cqM-F z&19n+e1=9AH1VrVeHrIzqlC`w9=*zfmrerF?JMzO&|Mmv;!4DKc(sp+jy^Dx?(8>1 zH&yS_4yL7m&GWX~mdfgH*AB4{CKo;+egw=PrvkTaoBU+P-4u?E|&!c z)DKc;>$$B6u*Zr1SjUh2)FeuWLWHl5TH(UHWkf zLs>7px!c5n;rbe^lO@qlYLzlDVp(z?6rPZel=YB)Uv&n!2{+Mb$-vQl=xKw( zve&>xYx+jW_NJh!FV||r?;hdP*jOXYcLCp>DOtJ?2S^)DkM{{Eb zS$!L$e_o0(^}n3tA1R3-$SNvgBq;DOEo}fNc|tB%%#g4RA3{|euq)p+xd3I8^4E&m zFrD%}nvG^HUAIKe9_{tXB;tl|G<%>yk6R;8L2)KUJw4yHJXUOPM>(-+jxq4R;z8H#>rnJy*)8N+$wA$^F zN+H*3t)eFEgxLw+Nw3};4WV$qj&_D`%ADV2%r zJCPCo%{=z7;`F98(us5JnT(G@sKTZ^;2FVitXyLe-S5(hV&Ium+1pIUB(CZ#h|g)u zSLJJ<@HgrDiA-}V_6B^x1>c9B6%~847JkQ!^KLZ2skm;q*edo;UA)~?SghG8;QbHh z_6M;ouo_1rq9=x$<`Y@EA{C%6-pEV}B(1#sDoe_e1s3^Y>n#1Sw;N|}8D|s|VPd+g z-_$QhCz`vLxxrVMx3ape1xu3*wjx=yKSlM~nFgkNWb4?DDr*!?U)L_VeffF<+!j|b zZ$Wn2$TDv3C3V@BHpSgv3JUif8%hk%OsGZ=OxH@8&4`bbf$`aAMchl^qN>Eyu3JH} z9-S!x8-s4fE=lad%Pkp8hAs~u?|uRnL48O|;*DEU! zuS0{cpk%1E0nc__2%;apFsTm0bKtd&A0~S3Cj^?72-*Owk3V!ZG*PswDfS~}2<8le z5+W^`Y(&R)yVF*tU_s!XMcJS`;(Tr`J0%>p=Z&InR%D3@KEzzI+-2)HK zuoNZ&o=wUC&+*?ofPb0a(E6(<2Amd6%uSu_^-<1?hsxs~0K5^f(LsGqgEF^+0_H=uNk9S0bb!|O8d?m5gQjUKevPaO+*VfSn^2892K~%crWM8+6 z25@V?Y@J<9w%@NXh-2!}SK_(X)O4AM1-WTg>sj1{lj5@=q&dxE^9xng1_z9w9DK>| z6Iybcd0e zyi;Ew!KBRIfGPGytQ6}z}MeXCfLY0?9%RiyagSp_D1?N&c{ zyo>VbJ4Gy`@Fv+5cKgUgs~na$>BV{*em7PU3%lloy_aEovR+J7TfQKh8BJXyL6|P8un-Jnq(ghd!_HEOh$zlv2$~y3krgeH;9zC}V3f`uDtW(%mT#944DQa~^8ZI+zAUu4U(j0YcDfKR$bK#gvn_{JZ>|gZ5+)u?T$w7Q%F^;!Wk?G z(le7r!ufT*cxS}PR6hIVtXa)i`d$-_1KkyBU>qmgz-=T};uxx&sKgv48akIWQ89F{ z0XiY?WM^~;|T8zBOr zs#zuOONzH?svv*jokd5SK8wG>+yMC)LYL|vLqm^PMHcT=`}V$=nIRHe2?h)8WQa6O zPAU}d`1y(>kZiP~Gr=mtJLMu`i<2CspL|q2DqAgAD^7*$xzM`PU4^ga`ilE134XBQ z99P(LhHU@7qvl9Yzg$M`+dlS=x^(m-_3t|h>S}E0bcFMn=C|KamQ)=w2^e)35p`zY zRV8X?d;s^>Cof2SPR&nP3E+-LCkS0J$H!eh8~k0qo$}00b=7!H_I2O+Ro@3O$nPdm ztmbOO^B+IHzQ5w>@@@J4cKw5&^_w6s!s=H%&byAbUtczPQ7}wfTqxxtQNfn*u73Qw zGuWsrky_ajPx-5`R<)6xHf>C(oqGf_Fw|-U*GfS?xLML$kv;h_pZ@Kk$y0X(S+K80 z6^|z)*`5VUkawg}=z`S;VhZhxyDfrE0$(PMurAxl~<>lfZa>JZ288ULK7D` zl9|#L^JL}Y$j*j`0-K6kH#?bRmg#5L3iB4Z)%iF@SqT+Lp|{i`m%R-|ZE94Np7Pa5 zCqC^V3}B(FR340pmF*qaa}M}+h6}mqE~7Sh!9bDv9YRT|>vBNAqv09zXHMlcuhKD| zcjjA(b*XCIwJ33?CB!+;{)vX@9xns_b-VO{i0y?}{!sdXj1GM8+$#v>W7nw;+O_9B z_{4L;C6ol?(?W0<6taGEn1^uG=?Q3i29sE`RfYCaV$3DKc_;?HsL?D_fSYg}SuO5U zOB_f4^vZ_x%o`5|C@9C5+o=mFy@au{s)sKw!UgC&L35aH(sgDxRE2De%(%OT=VUdN ziVLEmdOvJ&5*tCMKRyXctCwQu_RH%;m*$YK&m;jtbdH#Ak~13T1^f89tn`A%QEHWs~jnY~E}p_Z$XC z=?YXLCkzVSK+Id`xZYTegb@W8_baLt-Fq`Tv|=)JPbFsKRm)4UW;yT+J`<)%#ue9DPOkje)YF2fsCilK9MIIK>p*`fkoD5nGfmLwt)!KOT+> zOFq*VZktDDyM3P5UOg`~XL#cbzC}eL%qMB=Q5$d89MKuN#$6|4gx_Jt0Gfn8w&q}%lq4QU%6#jT*MRT% zrLz~C8FYKHawn-EQWN1B75O&quS+Z81(zN)G>~vN8VwC+e+y(`>HcxC{MrJ;H1Z4k zZWuv$w_F0-Ub%MVcpIc){4PGL^I7M{>;hS?;eH!;gmcOE66z3;Z1Phqo(t zVP(Hg6q#0gIKgsg7L7WE!{Y#1nI(45tx2{$34dDd#!Z0NIyrm)HOn5W#7;f4pQci# zDW!FI(g4e668kI9{2+mLwB+=#9bfqgX%!B34V-$wwSN(_cm*^{y0jQtv*4}eO^sOV z*9xoNvX)c9isB}Tgx&ZRjp3kwhTVK?r9;n!x>^XYT z@Q^7zp{rkIs{2mUSE^2!Gf6$6;j~&4=-0cSJJDizZp6LTe8b45;{AKM%v99}{{FfC zz709%u0mC=1KXTo(=TqmZQ;c?$M3z(!xah>aywrj40sc2y3rKFw4jCq+Y+u=CH@_V zxz|qeTwa>+<|H%8Dz5u>ZI5MmjTFwXS-Fv!TDd*`>3{krWoNVx$<133`(ftS?ZPyY z&4@ah^3^i`vL$BZa>O|Nt?ucewzsF)0zX3qmM^|waXr=T0pfIb0*$AwU=?Ipl|1Y; z*Pk6{C-p4MY;j@IJ|DW>QHZQJcp;Z~?8(Q+Kk3^0qJ}SCk^*n4W zu9ZFwLHUx-$6xvaQ)SUQcYd6fF8&x)V`1bIuX@>{mE$b|Yd(qomn3;bPwnDUc0F=; zh*6_((%bqAYQWQ~odER?h>1mkL4kpb3s7`0m@rDKGU*oyF)$j~Ffd4fXV$?`f~rHf zB%Y)@5SXZvfwm10RY5X?TEo)PK_`L6qgBp=#>fO49$D zDq8Ozj0q6213tV5Qq=;fZ0$|KroY{Dz=l@lU^J)?Ko@ti20TRplXzphBi>XGx4bou zEWrkNjz0t5j!_ke{g5I#PUlEU$Km8g8TE|XK=MkU@PT4T><2OVamoK;wJ}3X0L$vX zgd7gNa359*nc)R-0!`2X@FOTB`+oETOPc=ubp5R)VQgY+5BTZZJ2?9QwnO=dnulIUF3gFn;BODC2)65)HeVd%t86sL7Rv^Y+nbn+&l z6BAJY(ETvwI)Ts$aiE8rht4KD*qNyE{8{x6R|%akbTBzw;2+6Echkt+W+`u^XX z_z&x%n '} +case $link in #( +/*) app_path=$link ;; #( +*) app_path=$APP_HOME$link ;; +esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { +echo "$*" +} >&2 + +die () { +echo +echo "$*" +echo +exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( +CYGWIN* ) cygwin=true ;; #( +Darwin* ) darwin=true ;; #( +MSYS* | MINGW* ) msys=true ;; #( +NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then +if [ -x "$JAVA_HOME/jre/sh/java" ] ; then +# IBM's JDK on AIX uses strange locations for the executables +JAVACMD=$JAVA_HOME/jre/sh/java +else +JAVACMD=$JAVA_HOME/bin/java +fi +if [ ! -x "$JAVACMD" ] ; then +die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi +else +JAVACMD=java +if ! command -v java >/dev/null 2>&1 +then +die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then +case $MAX_FD in #( +max*) +# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. +# shellcheck disable=SC2039,SC3045 +MAX_FD=$( ulimit -H -n ) || +warn "Could not query maximum file descriptor limit" +esac +case $MAX_FD in #( +'' | soft) :;; #( +*) +# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. +# shellcheck disable=SC2039,SC3045 +ulimit -n "$MAX_FD" || +warn "Could not set maximum file descriptor limit to $MAX_FD" +esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then +APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) +CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + +JAVACMD=$( cygpath --unix "$JAVACMD" ) + +# Now convert the arguments - kludge to limit ourselves to /bin/sh +for arg do +if +case $arg in #( +-*) false ;; # don't mess with options #( +/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath +[ -e "$t" ] ;; #( +*) false ;; +esac +then +arg=$( cygpath --path --ignore --mixed "$arg" ) +fi +# Roll the args list around exactly as many times as the number of +# args, so each arg winds up back in the position where it started, but +# possibly modified. +# +# NB: a `for` loop captures its iteration list before it begins, so +# changing the positional parameters here affects neither the number of +# iterations, nor the values presented in `arg`. +shift # remove old arg +set -- "$@" "$arg" # push replacement arg +done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ +"-Dorg.gradle.appname=$APP_BASE_NAME" \ +-classpath "$CLASSPATH" \ +org.gradle.wrapper.GradleWrapperMain \ +"$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then +die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( +printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | +xargs -n1 | +sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | +tr '\n' ' ' +)" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/samples/client/petstore/java/webclient-sealedInterface/gradlew.bat b/samples/client/petstore/java/webclient-sealedInterface/gradlew.bat new file mode 100644 index 000000000000..25da30dbdeee --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/samples/client/petstore/java/webclient-sealedInterface/pom.xml b/samples/client/petstore/java/webclient-sealedInterface/pom.xml new file mode 100644 index 000000000000..4fd524b665ae --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/pom.xml @@ -0,0 +1,132 @@ + + 4.0.0 + org.openapitools + sealed-interface-webclient + jar + sealed-interface-webclient + 0.0.1 + https://github.com/openapitools/openapi-generator + OpenAPI Java + + scm:git:git@github.com:openapitools/openapi-generator.git + scm:git:git@github.com:openapitools/openapi-generator.git + https://github.com/openapitools/openapi-generator + + + + + Unlicense + http://unlicense.org + repo + + + + + + OpenAPI-Generator Contributors + team@openapitools.org + OpenAPITools.org + http://openapitools.org + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.13.0 + + 1.8 + 1.8 + + + + org.apache.maven.plugins + maven-source-plugin + 3.3.1 + + + attach-sources + + jar-no-fork + + + + + + + + + + + + com.google.code.findbugs + jsr305 + 3.0.2 + + + + io.projectreactor + reactor-core + ${reactor-version} + + + + + org.springframework.boot + spring-boot-starter-webflux + ${spring-boot-version} + + + + io.projectreactor.netty + reactor-netty-http + ${reactor-netty-version} + + + + + com.fasterxml.jackson.core + jackson-databind + ${jackson-databind-version} + + + org.openapitools + jackson-databind-nullable + ${jackson-databind-nullable-version} + + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + ${jackson-version} + + + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} + provided + + + + + org.junit.jupiter + junit-jupiter-api + ${junit-version} + test + + + + UTF-8 + 2.17.1 + 2.17.1 + 0.2.6 + 2.7.17 + 1.3.5 + 3.4.34 + 1.0.39 + 5.10.2 + + diff --git a/samples/client/petstore/java/webclient-sealedInterface/settings.gradle b/samples/client/petstore/java/webclient-sealedInterface/settings.gradle new file mode 100644 index 000000000000..dc76aee9ad08 --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/settings.gradle @@ -0,0 +1 @@ +rootProject.name = "sealed-interface-webclient" \ No newline at end of file diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/AndroidManifest.xml b/samples/client/petstore/java/webclient-sealedInterface/src/main/AndroidManifest.xml new file mode 100644 index 000000000000..54fbcb3da1e8 --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/src/main/AndroidManifest.xml @@ -0,0 +1,3 @@ + + + diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/ApiClient.java new file mode 100644 index 000000000000..45422eccc043 --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/ApiClient.java @@ -0,0 +1,743 @@ +/* + * ByRefOrValue + * This tests for a oneOf interface representation + * + * The version of the OpenAPI document: 0.0.1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client; + +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; +import org.openapitools.jackson.nullable.JsonNullableModule; +import org.springframework.core.ParameterizedTypeReference; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpMethod; +import org.springframework.http.HttpRequest; +import org.springframework.http.HttpStatus; +import org.springframework.http.InvalidMediaTypeException; +import org.springframework.http.MediaType; +import org.springframework.http.RequestEntity; +import org.springframework.http.RequestEntity.BodyBuilder; +import org.springframework.http.ResponseEntity; +import org.springframework.http.client.BufferingClientHttpRequestFactory; +import org.springframework.http.client.ClientHttpRequestExecution; +import org.springframework.http.client.ClientHttpRequestInterceptor; +import org.springframework.http.client.ClientHttpResponse; +import org.springframework.http.client.reactive.ClientHttpRequest; +import org.springframework.http.codec.json.Jackson2JsonDecoder; +import org.springframework.http.codec.json.Jackson2JsonEncoder; +import org.springframework.util.CollectionUtils; +import org.springframework.util.LinkedMultiValueMap; +import org.springframework.util.MultiValueMap; +import org.springframework.util.StringUtils; +import org.springframework.web.client.RestClientException; +import org.springframework.web.util.UriComponentsBuilder; +import org.springframework.web.reactive.function.client.WebClient; +import org.springframework.web.reactive.function.client.WebClient.ResponseSpec; +import org.springframework.web.reactive.function.client.ClientResponse; +import org.springframework.web.reactive.function.BodyInserter; +import org.springframework.web.reactive.function.BodyInserters; +import org.springframework.web.reactive.function.client.ExchangeStrategies; +import reactor.core.publisher.Mono; +import reactor.core.publisher.Flux; +import java.util.Optional; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; +import java.text.DateFormat; +import java.text.ParseException; +import java.util.Arrays; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.TimeZone; + +import javax.annotation.Nullable; + +import java.time.OffsetDateTime; + +import org.openapitools.client.auth.Authentication; +import org.openapitools.client.auth.HttpBasicAuth; +import org.openapitools.client.auth.HttpBearerAuth; +import org.openapitools.client.auth.ApiKeyAuth; + +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.15.0-SNAPSHOT") +public class ApiClient extends JavaTimeFormatter { + public enum CollectionFormat { + CSV(","), TSV("\t"), SSV(" "), PIPES("|"), MULTI(null); + + protected final String separator; + CollectionFormat(String separator) { + this.separator = separator; + } + + protected String collectionToString(Collection collection) { + return StringUtils.collectionToDelimitedString(collection, separator); + } + } + + protected static final String URI_TEMPLATE_ATTRIBUTE = WebClient.class.getName() + ".uriTemplate"; + + protected HttpHeaders defaultHeaders = new HttpHeaders(); + protected MultiValueMap defaultCookies = new LinkedMultiValueMap(); + + protected String basePath = "http://localhost:8080"; + + protected final WebClient webClient; + protected final DateFormat dateFormat; + protected final ObjectMapper objectMapper; + + protected Map authentications; + + + public ApiClient() { + this.dateFormat = createDefaultDateFormat(); + this.objectMapper = createDefaultObjectMapper(this.dateFormat); + this.webClient = buildWebClient(this.objectMapper); + this.init(); + } + + public ApiClient(WebClient webClient) { + this(Optional.ofNullable(webClient).orElseGet(() -> buildWebClient()), createDefaultDateFormat()); + } + + public ApiClient(ObjectMapper mapper, DateFormat format) { + this(buildWebClient(mapper.copy()), format); + } + + public ApiClient(WebClient webClient, ObjectMapper mapper, DateFormat format) { + this(Optional.ofNullable(webClient).orElseGet(() -> buildWebClient(mapper.copy())), format); + } + + protected ApiClient(WebClient webClient, DateFormat format) { + this.webClient = webClient; + this.dateFormat = format; + this.objectMapper = createDefaultObjectMapper(format); + this.init(); + } + + public static DateFormat createDefaultDateFormat() { + DateFormat dateFormat = new RFC3339DateFormat(); + dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); + return dateFormat; + } + + public static ObjectMapper createDefaultObjectMapper(@Nullable DateFormat dateFormat) { + if (null == dateFormat) { + dateFormat = createDefaultDateFormat(); + } + ObjectMapper mapper = new ObjectMapper(); + mapper.setDateFormat(dateFormat); + mapper.registerModule(new JavaTimeModule()); + mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); + JsonNullableModule jnm = new JsonNullableModule(); + mapper.registerModule(jnm); + return mapper; + } + + protected void init() { + // Setup authentications (key: authentication name, value: authentication). + authentications = new HashMap(); + // Prevent the authentications from being modified. + authentications = Collections.unmodifiableMap(authentications); + } + + /** + * Build the WebClientBuilder used to make WebClient. + * @param mapper ObjectMapper used for serialize/deserialize + * @return WebClient + */ + public static WebClient.Builder buildWebClientBuilder(ObjectMapper mapper) { + ExchangeStrategies strategies = ExchangeStrategies + .builder() + .codecs(clientDefaultCodecsConfigurer -> { + clientDefaultCodecsConfigurer.defaultCodecs().jackson2JsonEncoder(new Jackson2JsonEncoder(mapper, MediaType.APPLICATION_JSON)); + clientDefaultCodecsConfigurer.defaultCodecs().jackson2JsonDecoder(new Jackson2JsonDecoder(mapper, MediaType.APPLICATION_JSON)); + }).build(); + WebClient.Builder webClientBuilder = WebClient.builder().exchangeStrategies(strategies); + return webClientBuilder; + } + + /** + * Build the WebClientBuilder used to make WebClient. + * @return WebClient + */ + public static WebClient.Builder buildWebClientBuilder() { + return buildWebClientBuilder(createDefaultObjectMapper(null)); + } + + /** + * Build the WebClient used to make HTTP requests. + * @param mapper ObjectMapper used for serialize/deserialize + * @return WebClient + */ + public static WebClient buildWebClient(ObjectMapper mapper) { + return buildWebClientBuilder(mapper).build(); + } + + /** + * Build the WebClient used to make HTTP requests. + * @return WebClient + */ + public static WebClient buildWebClient() { + return buildWebClientBuilder(createDefaultObjectMapper(null)).build(); + } + + /** + * Get the current base path + * @return String the base path + */ + public String getBasePath() { + return basePath; + } + + /** + * Set the base path, which should include the host + * @param basePath the base path + * @return ApiClient this client + */ + public ApiClient setBasePath(String basePath) { + this.basePath = basePath; + return this; + } + + /** + * Get authentications (key: authentication name, value: authentication). + * @return Map the currently configured authentication types + */ + public Map getAuthentications() { + return authentications; + } + + /** + * Get authentication for the given name. + * + * @param authName The authentication name + * @return The authentication, null if not found + */ + public Authentication getAuthentication(String authName) { + return authentications.get(authName); + } + + /** + * Helper method to set access token for the first Bearer authentication. + * @param bearerToken Bearer token + */ + public void setBearerToken(String bearerToken) { + for (Authentication auth : authentications.values()) { + if (auth instanceof HttpBearerAuth) { + ((HttpBearerAuth) auth).setBearerToken(bearerToken); + return; + } + } + throw new RuntimeException("No Bearer authentication configured!"); + } + + /** + * Helper method to set username for the first HTTP basic authentication. + * @param username the username + */ + public void setUsername(String username) { + for (Authentication auth : authentications.values()) { + if (auth instanceof HttpBasicAuth) { + ((HttpBasicAuth) auth).setUsername(username); + return; + } + } + throw new RuntimeException("No HTTP basic authentication configured!"); + } + + /** + * Helper method to set password for the first HTTP basic authentication. + * @param password the password + */ + public void setPassword(String password) { + for (Authentication auth : authentications.values()) { + if (auth instanceof HttpBasicAuth) { + ((HttpBasicAuth) auth).setPassword(password); + return; + } + } + throw new RuntimeException("No HTTP basic authentication configured!"); + } + + /** + * Helper method to set API key value for the first API key authentication. + * @param apiKey the API key + */ + public void setApiKey(String apiKey) { + for (Authentication auth : authentications.values()) { + if (auth instanceof ApiKeyAuth) { + ((ApiKeyAuth) auth).setApiKey(apiKey); + return; + } + } + throw new RuntimeException("No API key authentication configured!"); + } + + /** + * Helper method to set API key prefix for the first API key authentication. + * @param apiKeyPrefix the API key prefix + */ + public void setApiKeyPrefix(String apiKeyPrefix) { + for (Authentication auth : authentications.values()) { + if (auth instanceof ApiKeyAuth) { + ((ApiKeyAuth) auth).setApiKeyPrefix(apiKeyPrefix); + return; + } + } + throw new RuntimeException("No API key authentication configured!"); + } + + /** + * Set the User-Agent header's value (by adding to the default header map). + * @param userAgent the user agent string + * @return ApiClient this client + */ + public ApiClient setUserAgent(String userAgent) { + addDefaultHeader("User-Agent", userAgent); + return this; + } + + /** + * Add a default header. + * + * @param name The header's name + * @param value The header's value + * @return ApiClient this client + */ + public ApiClient addDefaultHeader(String name, String value) { + if (defaultHeaders.containsKey(name)) { + defaultHeaders.remove(name); + } + defaultHeaders.add(name, value); + return this; + } + + /** + * Add a default cookie. + * + * @param name The cookie's name + * @param value The cookie's value + * @return ApiClient this client + */ + public ApiClient addDefaultCookie(String name, String value) { + if (defaultCookies.containsKey(name)) { + defaultCookies.remove(name); + } + defaultCookies.add(name, value); + return this; + } + + /** + * Get the date format used to parse/format date parameters. + * @return DateFormat format + */ + public DateFormat getDateFormat() { + return dateFormat; + } + + /** + * Parse the given string into Date object. + */ + public Date parseDate(String str) { + try { + return dateFormat.parse(str); + } catch (ParseException e) { + throw new RuntimeException(e); + } + } + + /** + * Format the given Date object into string. + */ + public String formatDate(Date date) { + return dateFormat.format(date); + } + + /** + * Get the ObjectMapper used to make HTTP requests. + * @return ObjectMapper objectMapper + */ + public ObjectMapper getObjectMapper() { + return objectMapper; + } + + /** + * Get the WebClient used to make HTTP requests. + * @return WebClient webClient + */ + public WebClient getWebClient() { + return webClient; + } + + /** + * Format the given parameter object into string. + * @param param the object to convert + * @return String the parameter represented as a String + */ + public String parameterToString(Object param) { + if (param == null) { + return ""; + } else if (param instanceof Date) { + return formatDate( (Date) param); + } else if (param instanceof OffsetDateTime) { + return formatOffsetDateTime((OffsetDateTime) param); + } else if (param instanceof Collection) { + StringBuilder b = new StringBuilder(); + for(Object o : (Collection) param) { + if(b.length() > 0) { + b.append(","); + } + b.append(String.valueOf(o)); + } + return b.toString(); + } else { + return String.valueOf(param); + } + } + + /** + * Converts a parameter to a {@link MultiValueMap} for use in REST requests + * @param collectionFormat The format to convert to + * @param name The name of the parameter + * @param value The parameter's value + * @return a Map containing the String value(s) of the input parameter + */ + public MultiValueMap parameterToMultiValueMap(CollectionFormat collectionFormat, String name, Object value) { + final MultiValueMap params = new LinkedMultiValueMap(); + + if (name == null || name.isEmpty() || value == null) { + return params; + } + + if(collectionFormat == null) { + collectionFormat = CollectionFormat.CSV; + } + + if (value instanceof Map) { + @SuppressWarnings("unchecked") + final Map valuesMap = (Map) value; + for (final Entry entry : valuesMap.entrySet()) { + params.add(entry.getKey(), parameterToString(entry.getValue())); + } + return params; + } + + Collection valueCollection = null; + if (value instanceof Collection) { + valueCollection = (Collection) value; + } else { + params.add(name, parameterToString(value)); + return params; + } + + if (valueCollection.isEmpty()){ + return params; + } + + if (collectionFormat.equals(CollectionFormat.MULTI)) { + for (Object item : valueCollection) { + params.add(name, parameterToString(item)); + } + return params; + } + + List values = new ArrayList(); + for(Object o : valueCollection) { + values.add(parameterToString(o)); + } + params.add(name, collectionFormat.collectionToString(values)); + + return params; + } + + /** + * Check if the given {@code String} is a JSON MIME. + * @param mediaType the input MediaType + * @return boolean true if the MediaType represents JSON, false otherwise + */ + public boolean isJsonMime(String mediaType) { + // "* / *" is default to JSON + if ("*/*".equals(mediaType)) { + return true; + } + + try { + return isJsonMime(MediaType.parseMediaType(mediaType)); + } catch (InvalidMediaTypeException e) { + } + return false; + } + + /** + * Check if the given MIME is a JSON MIME. + * JSON MIME examples: + * application/json + * application/json; charset=UTF8 + * APPLICATION/JSON + * @param mediaType the input MediaType + * @return boolean true if the MediaType represents JSON, false otherwise + */ + public boolean isJsonMime(MediaType mediaType) { + return mediaType != null && (MediaType.APPLICATION_JSON.isCompatibleWith(mediaType) || mediaType.getSubtype().matches("^.*(\\+json|ndjson)[;]?\\s*$")); + } + + /** + * Check if the given {@code String} is a Problem JSON MIME (RFC-7807). + * @param mediaType the input MediaType + * @return boolean true if the MediaType represents Problem JSON, false otherwise + */ + public boolean isProblemJsonMime(String mediaType) { + return "application/problem+json".equalsIgnoreCase(mediaType); + } + + /** + * Select the Accept header's value from the given accepts array: + * if JSON exists in the given array, use it; + * otherwise use all of them (joining into a string) + * + * @param accepts The accepts array to select from + * @return List The list of MediaTypes to use for the Accept header + */ + public List selectHeaderAccept(String[] accepts) { + if (accepts.length == 0) { + return null; + } + for (String accept : accepts) { + MediaType mediaType = MediaType.parseMediaType(accept); + if (isJsonMime(mediaType) && !isProblemJsonMime(accept)) { + return Collections.singletonList(mediaType); + } + } + return MediaType.parseMediaTypes(StringUtils.arrayToCommaDelimitedString(accepts)); + } + + /** + * Select the Content-Type header's value from the given array: + * if JSON exists in the given array, use it; + * otherwise use the first one of the array. + * + * @param contentTypes The Content-Type array to select from + * @return MediaType The Content-Type header to use. If the given array is empty, null will be returned. + */ + public MediaType selectHeaderContentType(String[] contentTypes) { + if (contentTypes.length == 0) { + return null; + } + for (String contentType : contentTypes) { + MediaType mediaType = MediaType.parseMediaType(contentType); + if (isJsonMime(mediaType)) { + return mediaType; + } + } + return MediaType.parseMediaType(contentTypes[0]); + } + + /** + * Select the body to use for the request + * @param obj the body object + * @param formParams the form parameters + * @param contentType the content type of the request + * @return Object the selected body + */ + protected BodyInserter selectBody(Object obj, MultiValueMap formParams, MediaType contentType) { + if(MediaType.APPLICATION_FORM_URLENCODED.equals(contentType)) { + MultiValueMap map = new LinkedMultiValueMap<>(); + + formParams + .toSingleValueMap() + .entrySet() + .forEach(es -> map.add(es.getKey(), String.valueOf(es.getValue()))); + + return BodyInserters.fromFormData(map); + } else if(MediaType.MULTIPART_FORM_DATA.equals(contentType)) { + return BodyInserters.fromMultipartData(formParams); + } else { + return obj != null ? BodyInserters.fromValue(obj) : null; + } + } + + /** + * Invoke API by sending HTTP request with the given options. + * + * @param the return type to use + * @param path The sub-path of the HTTP URL + * @param method The request method + * @param pathParams The path parameters + * @param queryParams The query parameters + * @param body The request body object + * @param headerParams The header parameters + * @param formParams The form parameters + * @param accept The request's Accept header + * @param contentType The request's Content-Type header + * @param authNames The authentications to apply + * @param returnType The return type into which to deserialize the response + * @return The response body in chosen type + */ + public ResponseSpec invokeAPI(String path, HttpMethod method, Map pathParams, MultiValueMap queryParams, Object body, HttpHeaders headerParams, MultiValueMap cookieParams, MultiValueMap formParams, List accept, MediaType contentType, String[] authNames, ParameterizedTypeReference returnType) throws RestClientException { + final WebClient.RequestBodySpec requestBuilder = prepareRequest(path, method, pathParams, queryParams, body, headerParams, cookieParams, formParams, accept, contentType, authNames); + return requestBuilder.retrieve(); + } + + /** + * Include queryParams in uriParams taking into account the paramName + * @param queryParams The query parameters + * @param uriParams The path parameters + * return templatized query string + */ + protected String generateQueryUri(MultiValueMap queryParams, Map uriParams) { + StringBuilder queryBuilder = new StringBuilder(); + queryParams.forEach((name, values) -> { + if (CollectionUtils.isEmpty(values)) { + if (queryBuilder.length() != 0) { + queryBuilder.append('&'); + } + queryBuilder.append(name); + } else { + int valueItemCounter = 0; + for (Object value : values) { + if (queryBuilder.length() != 0) { + queryBuilder.append('&'); + } + queryBuilder.append(name); + if (value != null) { + String templatizedKey = name + valueItemCounter++; + uriParams.put(templatizedKey, value.toString()); + queryBuilder.append('=').append("{").append(templatizedKey).append("}"); + } + } + } + }); + return queryBuilder.toString(); + } + + protected WebClient.RequestBodySpec prepareRequest(String path, HttpMethod method, Map pathParams, + MultiValueMap queryParams, Object body, HttpHeaders headerParams, + MultiValueMap cookieParams, MultiValueMap formParams, List accept, + MediaType contentType, String[] authNames) { + updateParamsForAuth(authNames, queryParams, headerParams, cookieParams); + + final UriComponentsBuilder builder = UriComponentsBuilder.fromUriString(basePath).path(path); + + String finalUri = builder.build(false).toUriString(); + Map uriParams = new HashMap<>(); + uriParams.putAll(pathParams); + + if (queryParams != null && !queryParams.isEmpty()) { + //Include queryParams in uriParams taking into account the paramName + String queryUri = generateQueryUri(queryParams, uriParams); + //Append to finalUri the templatized query string like "?param1={param1Value}&....... + finalUri += "?" + queryUri; + } + + final WebClient.RequestBodySpec requestBuilder = webClient.method(method).uri(finalUri, uriParams); + + if (accept != null) { + requestBuilder.accept(accept.toArray(new MediaType[accept.size()])); + } + if(contentType != null) { + requestBuilder.contentType(contentType); + } + + addHeadersToRequest(headerParams, requestBuilder); + addHeadersToRequest(defaultHeaders, requestBuilder); + addCookiesToRequest(cookieParams, requestBuilder); + addCookiesToRequest(defaultCookies, requestBuilder); + + requestBuilder.attribute(URI_TEMPLATE_ATTRIBUTE, path); + + requestBuilder.body(selectBody(body, formParams, contentType)); + return requestBuilder; + } + + /** + * Add headers to the request that is being built + * @param headers The headers to add + * @param requestBuilder The current request + */ + protected void addHeadersToRequest(HttpHeaders headers, WebClient.RequestBodySpec requestBuilder) { + for (Entry> entry : headers.entrySet()) { + List values = entry.getValue(); + for(String value : values) { + if (value != null) { + requestBuilder.header(entry.getKey(), value); + } + } + } + } + + /** + * Add cookies to the request that is being built + * @param cookies The cookies to add + * @param requestBuilder The current request + */ + protected void addCookiesToRequest(MultiValueMap cookies, WebClient.RequestBodySpec requestBuilder) { + for (Entry> entry : cookies.entrySet()) { + List values = entry.getValue(); + for(String value : values) { + if (value != null) { + requestBuilder.cookie(entry.getKey(), value); + } + } + } + } + + /** + * Update query and header parameters based on authentication settings. + * + * @param authNames The authentications to apply + * @param queryParams The query parameters + * @param headerParams The header parameters + * @param cookieParams the cookie parameters + */ + protected void updateParamsForAuth(String[] authNames, MultiValueMap queryParams, HttpHeaders headerParams, MultiValueMap cookieParams) { + for (String authName : authNames) { + Authentication auth = authentications.get(authName); + if (auth == null) { + throw new RestClientException("Authentication undefined: " + authName); + } + auth.applyToParams(queryParams, headerParams, cookieParams); + } + } + + /** + * Formats the specified collection path parameter to a string value. + * + * @param collectionFormat The collection format of the parameter. + * @param values The values of the parameter. + * @return String representation of the parameter + */ + public String collectionPathParameterToString(CollectionFormat collectionFormat, Collection values) { + // create the value based on the collection format + if (CollectionFormat.MULTI.equals(collectionFormat)) { + // not valid for path params + return parameterToString(values); + } + + // collectionFormat is assumed to be "csv" by default + if(collectionFormat == null) { + collectionFormat = CollectionFormat.CSV; + } + + return collectionFormat.collectionToString(values); + } +} diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/JavaTimeFormatter.java b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/JavaTimeFormatter.java new file mode 100644 index 000000000000..ed08042eac1c --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/JavaTimeFormatter.java @@ -0,0 +1,68 @@ +/* + * ByRefOrValue + * This tests for a oneOf interface representation + * + * The version of the OpenAPI document: 0.0.1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.client; + +import java.time.OffsetDateTime; +import java.time.format.DateTimeFormatter; +import java.time.format.DateTimeParseException; + +/** + * Class that add parsing/formatting support for Java 8+ {@code OffsetDateTime} class. + * It's generated for java clients when {@code AbstractJavaCodegen#dateLibrary} specified as {@code java8}. + */ +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.15.0-SNAPSHOT") +public class JavaTimeFormatter { + private DateTimeFormatter offsetDateTimeFormatter = DateTimeFormatter.ISO_OFFSET_DATE_TIME; + + /** + * Get the date format used to parse/format {@code OffsetDateTime} parameters. + * + * @return DateTimeFormatter + */ + public DateTimeFormatter getOffsetDateTimeFormatter() { + return offsetDateTimeFormatter; + } + + /** + * Set the date format used to parse/format {@code OffsetDateTime} parameters. + * + * @param offsetDateTimeFormatter {@code DateTimeFormatter} + */ + public void setOffsetDateTimeFormatter(DateTimeFormatter offsetDateTimeFormatter) { + this.offsetDateTimeFormatter = offsetDateTimeFormatter; + } + + /** + * Parse the given string into {@code OffsetDateTime} object. + * + * @param str String + * @return {@code OffsetDateTime} + */ + public OffsetDateTime parseOffsetDateTime(String str) { + try { + return OffsetDateTime.parse(str, offsetDateTimeFormatter); + } catch (DateTimeParseException e) { + throw new RuntimeException(e); + } + } + + /** + * Format the given {@code OffsetDateTime} object into string. + * + * @param offsetDateTime {@code OffsetDateTime} + * @return {@code OffsetDateTime} in string format + */ + public String formatOffsetDateTime(OffsetDateTime offsetDateTime) { + return offsetDateTimeFormatter.format(offsetDateTime); + } +} \ No newline at end of file diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/RFC3339DateFormat.java b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/RFC3339DateFormat.java new file mode 100644 index 000000000000..90b36ecc0917 --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/RFC3339DateFormat.java @@ -0,0 +1,58 @@ +/* + * ByRefOrValue + * This tests for a oneOf interface representation + * + * The version of the OpenAPI document: 0.0.1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.client; + +import com.fasterxml.jackson.databind.util.StdDateFormat; + +import java.text.DateFormat; +import java.text.FieldPosition; +import java.text.ParsePosition; +import java.util.Date; +import java.text.DecimalFormat; +import java.util.GregorianCalendar; +import java.util.TimeZone; + +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.15.0-SNAPSHOT") +public class RFC3339DateFormat extends DateFormat { + private static final long serialVersionUID = 1L; + private static final TimeZone TIMEZONE_Z = TimeZone.getTimeZone("UTC"); + + private final StdDateFormat fmt = new StdDateFormat() + .withTimeZone(TIMEZONE_Z) + .withColonInTimeZone(true); + + public RFC3339DateFormat() { + this.calendar = new GregorianCalendar(); + this.numberFormat = new DecimalFormat(); + } + + @Override + public Date parse(String source) { + return parse(source, new ParsePosition(0)); + } + + @Override + public Date parse(String source, ParsePosition pos) { + return fmt.parse(source, pos); + } + + @Override + public StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition fieldPosition) { + return fmt.format(date, toAppendTo, fieldPosition); + } + + @Override + public Object clone() { + return super.clone(); + } +} diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/RFC3339InstantDeserializer.java b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/RFC3339InstantDeserializer.java new file mode 100644 index 000000000000..0817b51389f5 --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/RFC3339InstantDeserializer.java @@ -0,0 +1,100 @@ +/* + * ByRefOrValue + * This tests for a oneOf interface representation + * + * The version of the OpenAPI document: 0.0.1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.client; + +import java.io.IOException; +import java.time.Instant; +import java.time.OffsetDateTime; +import java.time.ZoneId; +import java.time.ZonedDateTime; +import java.time.format.DateTimeFormatter; +import java.time.temporal.Temporal; +import java.time.temporal.TemporalAccessor; +import java.util.function.BiFunction; +import java.util.function.Function; + +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeFeature; +import com.fasterxml.jackson.datatype.jsr310.deser.InstantDeserializer; + +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.15.0-SNAPSHOT") +public class RFC3339InstantDeserializer extends InstantDeserializer { + private static final long serialVersionUID = 1L; + private final static boolean DEFAULT_NORMALIZE_ZONE_ID = JavaTimeFeature.NORMALIZE_DESERIALIZED_ZONE_ID.enabledByDefault(); + private final static boolean DEFAULT_ALWAYS_ALLOW_STRINGIFIED_DATE_TIMESTAMPS + = JavaTimeFeature.ALWAYS_ALLOW_STRINGIFIED_DATE_TIMESTAMPS.enabledByDefault(); + + public static final RFC3339InstantDeserializer INSTANT = new RFC3339InstantDeserializer<>( + Instant.class, DateTimeFormatter.ISO_INSTANT, + Instant::from, + a -> Instant.ofEpochMilli( a.value ), + a -> Instant.ofEpochSecond( a.integer, a.fraction ), + null, + true, // yes, replace zero offset with Z + DEFAULT_NORMALIZE_ZONE_ID, + DEFAULT_ALWAYS_ALLOW_STRINGIFIED_DATE_TIMESTAMPS + ); + + public static final RFC3339InstantDeserializer OFFSET_DATE_TIME = new RFC3339InstantDeserializer<>( + OffsetDateTime.class, DateTimeFormatter.ISO_OFFSET_DATE_TIME, + OffsetDateTime::from, + a -> OffsetDateTime.ofInstant( Instant.ofEpochMilli( a.value ), a.zoneId ), + a -> OffsetDateTime.ofInstant( Instant.ofEpochSecond( a.integer, a.fraction ), a.zoneId ), + (d, z) -> ( d.isEqual( OffsetDateTime.MIN ) || d.isEqual( OffsetDateTime.MAX ) ? + d : + d.withOffsetSameInstant( z.getRules().getOffset( d.toLocalDateTime() ) ) ), + true, // yes, replace zero offset with Z + DEFAULT_NORMALIZE_ZONE_ID, + DEFAULT_ALWAYS_ALLOW_STRINGIFIED_DATE_TIMESTAMPS + ); + + public static final RFC3339InstantDeserializer ZONED_DATE_TIME = new RFC3339InstantDeserializer<>( + ZonedDateTime.class, DateTimeFormatter.ISO_ZONED_DATE_TIME, + ZonedDateTime::from, + a -> ZonedDateTime.ofInstant( Instant.ofEpochMilli( a.value ), a.zoneId ), + a -> ZonedDateTime.ofInstant( Instant.ofEpochSecond( a.integer, a.fraction ), a.zoneId ), + ZonedDateTime::withZoneSameInstant, + false, // keep zero offset and Z separate since zones explicitly supported + DEFAULT_NORMALIZE_ZONE_ID, + DEFAULT_ALWAYS_ALLOW_STRINGIFIED_DATE_TIMESTAMPS + ); + + protected RFC3339InstantDeserializer( + Class supportedType, + DateTimeFormatter formatter, + Function parsedToValue, + Function fromMilliseconds, + Function fromNanoseconds, + BiFunction adjust, + boolean replaceZeroOffsetAsZ, + boolean normalizeZoneId, + boolean readNumericStringsAsTimestamp) { + super( + supportedType, + formatter, + parsedToValue, + fromMilliseconds, + fromNanoseconds, + adjust, + replaceZeroOffsetAsZ, + normalizeZoneId, + readNumericStringsAsTimestamp + ); + } + + @Override + protected T _fromString(JsonParser p, DeserializationContext ctxt, String string0) throws IOException { + return super._fromString(p, ctxt, string0.replace( ' ', 'T' )); + } +} \ No newline at end of file diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/RFC3339JavaTimeModule.java b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/RFC3339JavaTimeModule.java new file mode 100644 index 000000000000..7662ee3d9385 --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/RFC3339JavaTimeModule.java @@ -0,0 +1,32 @@ +/* + * ByRefOrValue + * This tests for a oneOf interface representation + * + * The version of the OpenAPI document: 0.0.1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.client; + +import java.time.Instant; +import java.time.OffsetDateTime; +import java.time.ZonedDateTime; + +import com.fasterxml.jackson.databind.module.SimpleModule; + +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.15.0-SNAPSHOT") +public class RFC3339JavaTimeModule extends SimpleModule { + private static final long serialVersionUID = 1L; + + public RFC3339JavaTimeModule() { + super("RFC3339JavaTimeModule"); + + addDeserializer(Instant.class, RFC3339InstantDeserializer.INSTANT); + addDeserializer(OffsetDateTime.class, RFC3339InstantDeserializer.OFFSET_DATE_TIME); + addDeserializer(ZonedDateTime.class, RFC3339InstantDeserializer.ZONED_DATE_TIME); + } +} diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/ServerConfiguration.java b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/ServerConfiguration.java new file mode 100644 index 000000000000..b194f554645c --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/ServerConfiguration.java @@ -0,0 +1,72 @@ +/* + * ByRefOrValue + * This tests for a oneOf interface representation + * + * The version of the OpenAPI document: 0.0.1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client; + +import java.util.Map; + +/** + * Representing a Server configuration. + */ +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.15.0-SNAPSHOT") +public class ServerConfiguration { + public String URL; + public String description; + public Map variables; + + /** + * @param URL A URL to the target host. + * @param description A description of the host designated by the URL. + * @param variables A map between a variable name and its value. The value is used for substitution in the server's URL template. + */ + public ServerConfiguration(String URL, String description, Map variables) { + this.URL = URL; + this.description = description; + this.variables = variables; + } + + /** + * Format URL template using given variables. + * + * @param variables A map between a variable name and its value. + * @return Formatted URL. + */ + public String URL(Map variables) { + String url = this.URL; + + // go through variables and replace placeholders + for (Map.Entry variable: this.variables.entrySet()) { + String name = variable.getKey(); + ServerVariable serverVariable = variable.getValue(); + String value = serverVariable.defaultValue; + + if (variables != null && variables.containsKey(name)) { + value = variables.get(name); + if (serverVariable.enumValues.size() > 0 && !serverVariable.enumValues.contains(value)) { + throw new IllegalArgumentException("The variable " + name + " in the server URL has invalid value " + value + "."); + } + } + url = url.replace("{" + name + "}", value); + } + return url; + } + + /** + * Format URL template using default server variables. + * + * @return Formatted URL. + */ + public String URL() { + return URL(null); + } +} diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/ServerVariable.java b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/ServerVariable.java new file mode 100644 index 000000000000..4e9197a4ebdc --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/ServerVariable.java @@ -0,0 +1,37 @@ +/* + * ByRefOrValue + * This tests for a oneOf interface representation + * + * The version of the OpenAPI document: 0.0.1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client; + +import java.util.HashSet; + +/** + * Representing a Server Variable for server URL template substitution. + */ +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.15.0-SNAPSHOT") +public class ServerVariable { + public String description; + public String defaultValue; + public HashSet enumValues = null; + + /** + * @param description A description for the server variable. + * @param defaultValue The default value to use for substitution. + * @param enumValues An enumeration of string values to be used if the substitution options are from a limited set. + */ + public ServerVariable(String description, String defaultValue, HashSet enumValues) { + this.description = description; + this.defaultValue = defaultValue; + this.enumValues = enumValues; + } +} diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/StringUtil.java b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/StringUtil.java new file mode 100644 index 000000000000..f963ba19a7b0 --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/StringUtil.java @@ -0,0 +1,83 @@ +/* + * ByRefOrValue + * This tests for a oneOf interface representation + * + * The version of the OpenAPI document: 0.0.1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client; + +import java.util.Collection; +import java.util.Iterator; + +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.15.0-SNAPSHOT") +public class StringUtil { + /** + * Check if the given array contains the given value (with case-insensitive comparison). + * + * @param array The array + * @param value The value to search + * @return true if the array contains the value + */ + public static boolean containsIgnoreCase(String[] array, String value) { + for (String str : array) { + if (value == null && str == null) { + return true; + } + if (value != null && value.equalsIgnoreCase(str)) { + return true; + } + } + return false; + } + + /** + * Join an array of strings with the given separator. + *

+ * Note: This might be replaced by utility method from commons-lang or guava someday + * if one of those libraries is added as dependency. + *

+ * + * @param array The array of strings + * @param separator The separator + * @return the resulting string + */ + public static String join(String[] array, String separator) { + int len = array.length; + if (len == 0) { + return ""; + } + + StringBuilder out = new StringBuilder(); + out.append(array[0]); + for (int i = 1; i < len; i++) { + out.append(separator).append(array[i]); + } + return out.toString(); + } + + /** + * Join a list of strings with the given separator. + * + * @param list The list of strings + * @param separator The separator + * @return the resulting string + */ + public static String join(Collection list, String separator) { + Iterator iterator = list.iterator(); + StringBuilder out = new StringBuilder(); + if (iterator.hasNext()) { + out.append(iterator.next()); + } + while (iterator.hasNext()) { + out.append(separator).append(iterator.next()); + } + return out.toString(); + } +} diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/api/BarApi.java b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/api/BarApi.java new file mode 100644 index 000000000000..6a8dc1df328f --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/api/BarApi.java @@ -0,0 +1,124 @@ +package org.openapitools.client.api; + +import org.openapitools.client.ApiClient; + +import org.openapitools.client.model.Bar; +import org.openapitools.client.model.BarCreate; + +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Objects; +import java.util.Arrays; +import java.util.stream.Collectors; + +import org.springframework.core.io.FileSystemResource; +import org.springframework.core.ParameterizedTypeReference; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpMethod; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.util.LinkedMultiValueMap; +import org.springframework.util.MultiValueMap; +import org.springframework.web.reactive.function.client.WebClient.ResponseSpec; +import org.springframework.web.reactive.function.client.WebClientResponseException; +import reactor.core.publisher.Mono; +import reactor.core.publisher.Flux; + +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.15.0-SNAPSHOT") +public class BarApi { + private ApiClient apiClient; + + public BarApi() { + this(new ApiClient()); + } + + public BarApi(ApiClient apiClient) { + this.apiClient = apiClient; + } + + public ApiClient getApiClient() { + return apiClient; + } + + public void setApiClient(ApiClient apiClient) { + this.apiClient = apiClient; + } + + /** + * Create a Bar + * + *

200 - Bar created + * @param barCreate The barCreate parameter + * @return Bar + * @throws WebClientResponseException if an error occurs while attempting to invoke the API + */ + private ResponseSpec createBarRequestCreation(@javax.annotation.Nonnull BarCreate barCreate) throws WebClientResponseException { + Object postBody = barCreate; + // verify the required parameter 'barCreate' is set + if (barCreate == null) { + throw new WebClientResponseException("Missing the required parameter 'barCreate' when calling createBar", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); + } + // create path and map variables + final Map pathParams = new HashMap(); + + final MultiValueMap queryParams = new LinkedMultiValueMap(); + final HttpHeaders headerParams = new HttpHeaders(); + final MultiValueMap cookieParams = new LinkedMultiValueMap(); + final MultiValueMap formParams = new LinkedMultiValueMap(); + + final String[] localVarAccepts = { + "application/json" + }; + final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); + final String[] localVarContentTypes = { + "application/json" + }; + final MediaType localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); + + String[] localVarAuthNames = new String[] { }; + + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + return apiClient.invokeAPI("/bar", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + } + + /** + * Create a Bar + * + *

200 - Bar created + * @param barCreate The barCreate parameter + * @return Bar + * @throws WebClientResponseException if an error occurs while attempting to invoke the API + */ + public Mono createBar(@javax.annotation.Nonnull BarCreate barCreate) throws WebClientResponseException { + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + return createBarRequestCreation(barCreate).bodyToMono(localVarReturnType); + } + + /** + * Create a Bar + * + *

200 - Bar created + * @param barCreate The barCreate parameter + * @return ResponseEntity<Bar> + * @throws WebClientResponseException if an error occurs while attempting to invoke the API + */ + public Mono> createBarWithHttpInfo(@javax.annotation.Nonnull BarCreate barCreate) throws WebClientResponseException { + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + return createBarRequestCreation(barCreate).toEntity(localVarReturnType); + } + + /** + * Create a Bar + * + *

200 - Bar created + * @param barCreate The barCreate parameter + * @return ResponseSpec + * @throws WebClientResponseException if an error occurs while attempting to invoke the API + */ + public ResponseSpec createBarWithResponseSpec(@javax.annotation.Nonnull BarCreate barCreate) throws WebClientResponseException { + return createBarRequestCreation(barCreate); + } +} diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/api/FooApi.java b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/api/FooApi.java new file mode 100644 index 000000000000..1603e9dcaafb --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/api/FooApi.java @@ -0,0 +1,185 @@ +package org.openapitools.client.api; + +import org.openapitools.client.ApiClient; + +import org.openapitools.client.model.Foo; +import org.openapitools.client.model.FooRefOrValue; + +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Objects; +import java.util.Arrays; +import java.util.stream.Collectors; + +import org.springframework.core.io.FileSystemResource; +import org.springframework.core.ParameterizedTypeReference; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpMethod; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.util.LinkedMultiValueMap; +import org.springframework.util.MultiValueMap; +import org.springframework.web.reactive.function.client.WebClient.ResponseSpec; +import org.springframework.web.reactive.function.client.WebClientResponseException; +import reactor.core.publisher.Mono; +import reactor.core.publisher.Flux; + +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.15.0-SNAPSHOT") +public class FooApi { + private ApiClient apiClient; + + public FooApi() { + this(new ApiClient()); + } + + public FooApi(ApiClient apiClient) { + this.apiClient = apiClient; + } + + public ApiClient getApiClient() { + return apiClient; + } + + public void setApiClient(ApiClient apiClient) { + this.apiClient = apiClient; + } + + /** + * Create a Foo + * + *

201 - Error + * @param foo The Foo to be created + * @return FooRefOrValue + * @throws WebClientResponseException if an error occurs while attempting to invoke the API + */ + private ResponseSpec createFooRequestCreation(@javax.annotation.Nullable Foo foo) throws WebClientResponseException { + Object postBody = foo; + // create path and map variables + final Map pathParams = new HashMap(); + + final MultiValueMap queryParams = new LinkedMultiValueMap(); + final HttpHeaders headerParams = new HttpHeaders(); + final MultiValueMap cookieParams = new LinkedMultiValueMap(); + final MultiValueMap formParams = new LinkedMultiValueMap(); + + final String[] localVarAccepts = { + "application/json" + }; + final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); + final String[] localVarContentTypes = { + "application/json;charset=utf-8" + }; + final MediaType localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); + + String[] localVarAuthNames = new String[] { }; + + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + return apiClient.invokeAPI("/foo", HttpMethod.POST, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + } + + /** + * Create a Foo + * + *

201 - Error + * @param foo The Foo to be created + * @return FooRefOrValue + * @throws WebClientResponseException if an error occurs while attempting to invoke the API + */ + public Mono createFoo(@javax.annotation.Nullable Foo foo) throws WebClientResponseException { + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + return createFooRequestCreation(foo).bodyToMono(localVarReturnType); + } + + /** + * Create a Foo + * + *

201 - Error + * @param foo The Foo to be created + * @return ResponseEntity<FooRefOrValue> + * @throws WebClientResponseException if an error occurs while attempting to invoke the API + */ + public Mono> createFooWithHttpInfo(@javax.annotation.Nullable Foo foo) throws WebClientResponseException { + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + return createFooRequestCreation(foo).toEntity(localVarReturnType); + } + + /** + * Create a Foo + * + *

201 - Error + * @param foo The Foo to be created + * @return ResponseSpec + * @throws WebClientResponseException if an error occurs while attempting to invoke the API + */ + public ResponseSpec createFooWithResponseSpec(@javax.annotation.Nullable Foo foo) throws WebClientResponseException { + return createFooRequestCreation(foo); + } + + /** + * GET all Foos + * + *

200 - Success + * @return List<FooRefOrValue> + * @throws WebClientResponseException if an error occurs while attempting to invoke the API + */ + private ResponseSpec getAllFoosRequestCreation() throws WebClientResponseException { + Object postBody = null; + // create path and map variables + final Map pathParams = new HashMap(); + + final MultiValueMap queryParams = new LinkedMultiValueMap(); + final HttpHeaders headerParams = new HttpHeaders(); + final MultiValueMap cookieParams = new LinkedMultiValueMap(); + final MultiValueMap formParams = new LinkedMultiValueMap(); + + final String[] localVarAccepts = { + "application/json;charset=utf-8" + }; + final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); + final String[] localVarContentTypes = { }; + final MediaType localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); + + String[] localVarAuthNames = new String[] { }; + + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + return apiClient.invokeAPI("/foo", HttpMethod.GET, pathParams, queryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + } + + /** + * GET all Foos + * + *

200 - Success + * @return List<FooRefOrValue> + * @throws WebClientResponseException if an error occurs while attempting to invoke the API + */ + public Flux getAllFoos() throws WebClientResponseException { + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + return getAllFoosRequestCreation().bodyToFlux(localVarReturnType); + } + + /** + * GET all Foos + * + *

200 - Success + * @return ResponseEntity<List<FooRefOrValue>> + * @throws WebClientResponseException if an error occurs while attempting to invoke the API + */ + public Mono>> getAllFoosWithHttpInfo() throws WebClientResponseException { + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; + return getAllFoosRequestCreation().toEntityList(localVarReturnType); + } + + /** + * GET all Foos + * + *

200 - Success + * @return ResponseSpec + * @throws WebClientResponseException if an error occurs while attempting to invoke the API + */ + public ResponseSpec getAllFoosWithResponseSpec() throws WebClientResponseException { + return getAllFoosRequestCreation(); + } +} diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java new file mode 100644 index 000000000000..a905630d1fee --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java @@ -0,0 +1,75 @@ +/* + * ByRefOrValue + * This tests for a oneOf interface representation + * + * The version of the OpenAPI document: 0.0.1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.auth; + +import org.springframework.http.HttpHeaders; +import org.springframework.util.MultiValueMap; + +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.15.0-SNAPSHOT") +public class ApiKeyAuth implements Authentication { + private final String location; + private final String paramName; + + private String apiKey; + private String apiKeyPrefix; + + public ApiKeyAuth(String location, String paramName) { + this.location = location; + this.paramName = paramName; + } + + public String getLocation() { + return location; + } + + public String getParamName() { + return paramName; + } + + public String getApiKey() { + return apiKey; + } + + public void setApiKey(String apiKey) { + this.apiKey = apiKey; + } + + public String getApiKeyPrefix() { + return apiKeyPrefix; + } + + public void setApiKeyPrefix(String apiKeyPrefix) { + this.apiKeyPrefix = apiKeyPrefix; + } + + @Override + public void applyToParams(MultiValueMap queryParams, HttpHeaders headerParams, MultiValueMap cookieParams) { + if (apiKey == null) { + return; + } + String value; + if (apiKeyPrefix != null) { + value = apiKeyPrefix + " " + apiKey; + } else { + value = apiKey; + } + if (location.equals("query")) { + queryParams.add(paramName, value); + } else if (location.equals("header")) { + headerParams.add(paramName, value); + } else if (location.equals("cookie")) { + cookieParams.add(paramName, value); + } + } +} diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/auth/Authentication.java b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/auth/Authentication.java new file mode 100644 index 000000000000..83e358c7f9e0 --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/auth/Authentication.java @@ -0,0 +1,29 @@ +/* + * ByRefOrValue + * This tests for a oneOf interface representation + * + * The version of the OpenAPI document: 0.0.1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.auth; + +import org.springframework.http.HttpHeaders; +import org.springframework.util.MultiValueMap; + +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.15.0-SNAPSHOT") +public interface Authentication { + /** + * Apply authentication settings to header and / or query parameters. + * + * @param queryParams The query parameters for the request + * @param headerParams The header parameters for the request + * @param cookieParams The cookie parameters for the request + */ + void applyToParams(MultiValueMap queryParams, HttpHeaders headerParams, MultiValueMap cookieParams); +} diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java new file mode 100644 index 000000000000..469f317a23d2 --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java @@ -0,0 +1,51 @@ +/* + * ByRefOrValue + * This tests for a oneOf interface representation + * + * The version of the OpenAPI document: 0.0.1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.auth; + +import java.nio.charset.StandardCharsets; +import java.util.Base64; + +import org.springframework.http.HttpHeaders; +import org.springframework.util.MultiValueMap; + +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.15.0-SNAPSHOT") +public class HttpBasicAuth implements Authentication { + private String username; + private String password; + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + @Override + public void applyToParams(MultiValueMap queryParams, HttpHeaders headerParams, MultiValueMap cookieParams) { + if (username == null && password == null) { + return; + } + String str = (username == null ? "" : username) + ":" + (password == null ? "" : password); + headerParams.add(HttpHeaders.AUTHORIZATION, "Basic " + Base64.getEncoder().encodeToString(str.getBytes(StandardCharsets.UTF_8))); + } +} diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java new file mode 100644 index 000000000000..570225c141f2 --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java @@ -0,0 +1,48 @@ +/* + * ByRefOrValue + * This tests for a oneOf interface representation + * + * The version of the OpenAPI document: 0.0.1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.auth; + +import org.springframework.http.HttpHeaders; +import org.springframework.util.MultiValueMap; + +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.15.0-SNAPSHOT") +public class HttpBearerAuth implements Authentication { + private final String scheme; + private String bearerToken; + + public HttpBearerAuth(String scheme) { + this.scheme = scheme; + } + + public String getBearerToken() { + return bearerToken; + } + + public void setBearerToken(String bearerToken) { + this.bearerToken = bearerToken; + } + + @Override + public void applyToParams(MultiValueMap queryParams, HttpHeaders headerParams, MultiValueMap cookieParams) { + if (bearerToken == null) { + return; + } + headerParams.add(HttpHeaders.AUTHORIZATION, (scheme != null ? upperCaseBearer(scheme) + " " : "") + bearerToken); + } + + private static String upperCaseBearer(String scheme) { + return ("bearer".equalsIgnoreCase(scheme)) ? "Bearer" : scheme; + } + +} diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Addressable.java b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Addressable.java new file mode 100644 index 000000000000..b6388c968e9e --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Addressable.java @@ -0,0 +1,137 @@ +/* + * ByRefOrValue + * This tests for a oneOf interface representation + * + * The version of the OpenAPI document: 0.0.1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Objects; +import java.util.Arrays; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** + * Base schema for addressable entities + */ +@JsonPropertyOrder({ + Addressable.JSON_PROPERTY_HREF, + Addressable.JSON_PROPERTY_ID +}) +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.15.0-SNAPSHOT") +public class Addressable { + public static final String JSON_PROPERTY_HREF = "href"; + @javax.annotation.Nullable + private String href; + + public static final String JSON_PROPERTY_ID = "id"; + @javax.annotation.Nullable + private String id; + + public Addressable() { + } + + public Addressable href(@javax.annotation.Nullable String href) { + + this.href = href; + return this; + } + + /** + * Hyperlink reference + * @return href + */ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_HREF) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public String getHref() { + return href; + } + + + @JsonProperty(JSON_PROPERTY_HREF) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setHref(@javax.annotation.Nullable String href) { + this.href = href; + } + + public Addressable id(@javax.annotation.Nullable String id) { + + this.id = id; + return this; + } + + /** + * unique identifier + * @return id + */ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_ID) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public String getId() { + return id; + } + + + @JsonProperty(JSON_PROPERTY_ID) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setId(@javax.annotation.Nullable String id) { + this.id = id; + } + + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Addressable addressable = (Addressable) o; + return Objects.equals(this.href, addressable.href) && + Objects.equals(this.id, addressable.id); + } + + @Override + public int hashCode() { + return Objects.hash(href, id); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class Addressable {\n"); + sb.append(" href: ").append(toIndentedString(href)).append("\n"); + sb.append(" id: ").append(toIndentedString(id)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Apple.java b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Apple.java new file mode 100644 index 000000000000..d27a1084ec15 --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Apple.java @@ -0,0 +1,140 @@ +/* + * ByRefOrValue + * This tests for a oneOf interface representation + * + * The version of the OpenAPI document: 0.0.1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Objects; +import java.util.Arrays; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** + * Apple + */ +@JsonPropertyOrder({ + Apple.JSON_PROPERTY_SEEDS, + Apple.JSON_PROPERTY_FRUIT_TYPE +}) +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.15.0-SNAPSHOT") +public final class Apple implements Fruit { + public static final String JSON_PROPERTY_SEEDS = "seeds"; + @javax.annotation.Nonnull + private Integer seeds; + + public static final String JSON_PROPERTY_FRUIT_TYPE = "fruitType"; + @javax.annotation.Nonnull + private FruitType fruitType; + + public Apple() { + } + + public Apple seeds(@javax.annotation.Nonnull Integer seeds) { + + this.seeds = seeds; + return this; + } + + /** + * Get seeds + * @return seeds + */ + @javax.annotation.Nonnull + @JsonProperty(JSON_PROPERTY_SEEDS) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + + public Integer getSeeds() { + return seeds; + } + + + @JsonProperty(JSON_PROPERTY_SEEDS) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public void setSeeds(@javax.annotation.Nonnull Integer seeds) { + this.seeds = seeds; + } + + public Apple fruitType(@javax.annotation.Nonnull FruitType fruitType) { + + this.fruitType = fruitType; + return this; + } + + /** + * Get fruitType + * @return fruitType + */ + @javax.annotation.Nonnull + @JsonProperty(JSON_PROPERTY_FRUIT_TYPE) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + + public FruitType getFruitType() { + return fruitType; + } + + + @JsonProperty(JSON_PROPERTY_FRUIT_TYPE) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public void setFruitType(@javax.annotation.Nonnull FruitType fruitType) { + this.fruitType = fruitType; + } + + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Apple apple = (Apple) o; + return Objects.equals(this.seeds, apple.seeds) && + Objects.equals(this.fruitType, apple.fruitType); + } + + @Override + public int hashCode() { + return Objects.hash(seeds, fruitType); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class Apple {\n"); + sb.append(" seeds: ").append(toIndentedString(seeds)).append("\n"); + sb.append(" fruitType: ").append(toIndentedString(fruitType)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Banana.java b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Banana.java new file mode 100644 index 000000000000..c56446e6f9a1 --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Banana.java @@ -0,0 +1,140 @@ +/* + * ByRefOrValue + * This tests for a oneOf interface representation + * + * The version of the OpenAPI document: 0.0.1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Objects; +import java.util.Arrays; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** + * Banana + */ +@JsonPropertyOrder({ + Banana.JSON_PROPERTY_LENGTH, + Banana.JSON_PROPERTY_FRUIT_TYPE +}) +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.15.0-SNAPSHOT") +public final class Banana implements Fruit { + public static final String JSON_PROPERTY_LENGTH = "length"; + @javax.annotation.Nonnull + private Integer length; + + public static final String JSON_PROPERTY_FRUIT_TYPE = "fruitType"; + @javax.annotation.Nonnull + private FruitType fruitType; + + public Banana() { + } + + public Banana length(@javax.annotation.Nonnull Integer length) { + + this.length = length; + return this; + } + + /** + * Get length + * @return length + */ + @javax.annotation.Nonnull + @JsonProperty(JSON_PROPERTY_LENGTH) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + + public Integer getLength() { + return length; + } + + + @JsonProperty(JSON_PROPERTY_LENGTH) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public void setLength(@javax.annotation.Nonnull Integer length) { + this.length = length; + } + + public Banana fruitType(@javax.annotation.Nonnull FruitType fruitType) { + + this.fruitType = fruitType; + return this; + } + + /** + * Get fruitType + * @return fruitType + */ + @javax.annotation.Nonnull + @JsonProperty(JSON_PROPERTY_FRUIT_TYPE) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + + public FruitType getFruitType() { + return fruitType; + } + + + @JsonProperty(JSON_PROPERTY_FRUIT_TYPE) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public void setFruitType(@javax.annotation.Nonnull FruitType fruitType) { + this.fruitType = fruitType; + } + + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Banana banana = (Banana) o; + return Objects.equals(this.length, banana.length) && + Objects.equals(this.fruitType, banana.fruitType); + } + + @Override + public int hashCode() { + return Objects.hash(length, fruitType); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class Banana {\n"); + sb.append(" length: ").append(toIndentedString(length)).append("\n"); + sb.append(" fruitType: ").append(toIndentedString(fruitType)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Bar.java b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Bar.java new file mode 100644 index 000000000000..bb2ed6badbf1 --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Bar.java @@ -0,0 +1,215 @@ +/* + * ByRefOrValue + * This tests for a oneOf interface representation + * + * The version of the OpenAPI document: 0.0.1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Objects; +import java.util.Arrays; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import org.openapitools.client.model.Entity; +import org.openapitools.client.model.FooRefOrValue; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** + * Bar + */ +@JsonPropertyOrder({ + Bar.JSON_PROPERTY_ID, + Bar.JSON_PROPERTY_BAR_PROP_A, + Bar.JSON_PROPERTY_FOO_PROP_B, + Bar.JSON_PROPERTY_FOO +}) +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.15.0-SNAPSHOT") +@JsonIgnoreProperties( + value = "@type", // ignore manually set @type, it will be automatically generated by Jackson during serialization + allowSetters = true // allows the @type to be set during deserialization +) +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "@type", visible = true) + +public final class Bar extends Entity implements BarRefOrValue { + public static final String JSON_PROPERTY_ID = "id"; + @javax.annotation.Nonnull + private String id; + + public static final String JSON_PROPERTY_BAR_PROP_A = "barPropA"; + @javax.annotation.Nullable + private String barPropA; + + public static final String JSON_PROPERTY_FOO_PROP_B = "fooPropB"; + @javax.annotation.Nullable + private String fooPropB; + + public static final String JSON_PROPERTY_FOO = "foo"; + @javax.annotation.Nullable + private FooRefOrValue foo; + + public Bar() { + + } + + public Bar id(@javax.annotation.Nonnull String id) { + + this.id = id; + return this; + } + + /** + * Get id + * @return id + */ + @javax.annotation.Nonnull + @JsonProperty(JSON_PROPERTY_ID) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + + public String getId() { + return id; + } + + + @JsonProperty(JSON_PROPERTY_ID) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public void setId(@javax.annotation.Nonnull String id) { + this.id = id; + } + + public Bar barPropA(@javax.annotation.Nullable String barPropA) { + + this.barPropA = barPropA; + return this; + } + + /** + * Get barPropA + * @return barPropA + */ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_BAR_PROP_A) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public String getBarPropA() { + return barPropA; + } + + + @JsonProperty(JSON_PROPERTY_BAR_PROP_A) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setBarPropA(@javax.annotation.Nullable String barPropA) { + this.barPropA = barPropA; + } + + public Bar fooPropB(@javax.annotation.Nullable String fooPropB) { + + this.fooPropB = fooPropB; + return this; + } + + /** + * Get fooPropB + * @return fooPropB + */ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_FOO_PROP_B) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public String getFooPropB() { + return fooPropB; + } + + + @JsonProperty(JSON_PROPERTY_FOO_PROP_B) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setFooPropB(@javax.annotation.Nullable String fooPropB) { + this.fooPropB = fooPropB; + } + + public Bar foo(@javax.annotation.Nullable FooRefOrValue foo) { + + this.foo = foo; + return this; + } + + /** + * Get foo + * @return foo + */ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_FOO) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public FooRefOrValue getFoo() { + return foo; + } + + + @JsonProperty(JSON_PROPERTY_FOO) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setFoo(@javax.annotation.Nullable FooRefOrValue foo) { + this.foo = foo; + } + + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Bar bar = (Bar) o; + return Objects.equals(this.id, bar.id) && + Objects.equals(this.barPropA, bar.barPropA) && + Objects.equals(this.fooPropB, bar.fooPropB) && + Objects.equals(this.foo, bar.foo) && + super.equals(o); + } + + @Override + public int hashCode() { + return Objects.hash(id, barPropA, fooPropB, foo, super.hashCode()); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class Bar {\n"); + sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" id: ").append(toIndentedString(id)).append("\n"); + sb.append(" barPropA: ").append(toIndentedString(barPropA)).append("\n"); + sb.append(" fooPropB: ").append(toIndentedString(fooPropB)).append("\n"); + sb.append(" foo: ").append(toIndentedString(foo)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/BarCreate.java b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/BarCreate.java new file mode 100644 index 000000000000..0f7866dda051 --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/BarCreate.java @@ -0,0 +1,184 @@ +/* + * ByRefOrValue + * This tests for a oneOf interface representation + * + * The version of the OpenAPI document: 0.0.1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Objects; +import java.util.Arrays; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import org.openapitools.client.model.Entity; +import org.openapitools.client.model.FooRefOrValue; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** + * BarCreate + */ +@JsonPropertyOrder({ + BarCreate.JSON_PROPERTY_BAR_PROP_A, + BarCreate.JSON_PROPERTY_FOO_PROP_B, + BarCreate.JSON_PROPERTY_FOO +}) +@JsonTypeName("Bar_Create") +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.15.0-SNAPSHOT") +@JsonIgnoreProperties( + value = "@type", // ignore manually set @type, it will be automatically generated by Jackson during serialization + allowSetters = true // allows the @type to be set during deserialization +) +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "@type", visible = true) + +public class BarCreate extends Entity { + public static final String JSON_PROPERTY_BAR_PROP_A = "barPropA"; + @javax.annotation.Nullable + private String barPropA; + + public static final String JSON_PROPERTY_FOO_PROP_B = "fooPropB"; + @javax.annotation.Nullable + private String fooPropB; + + public static final String JSON_PROPERTY_FOO = "foo"; + @javax.annotation.Nullable + private FooRefOrValue foo; + + public BarCreate() { + + } + + public BarCreate barPropA(@javax.annotation.Nullable String barPropA) { + + this.barPropA = barPropA; + return this; + } + + /** + * Get barPropA + * @return barPropA + */ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_BAR_PROP_A) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public String getBarPropA() { + return barPropA; + } + + + @JsonProperty(JSON_PROPERTY_BAR_PROP_A) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setBarPropA(@javax.annotation.Nullable String barPropA) { + this.barPropA = barPropA; + } + + public BarCreate fooPropB(@javax.annotation.Nullable String fooPropB) { + + this.fooPropB = fooPropB; + return this; + } + + /** + * Get fooPropB + * @return fooPropB + */ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_FOO_PROP_B) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public String getFooPropB() { + return fooPropB; + } + + + @JsonProperty(JSON_PROPERTY_FOO_PROP_B) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setFooPropB(@javax.annotation.Nullable String fooPropB) { + this.fooPropB = fooPropB; + } + + public BarCreate foo(@javax.annotation.Nullable FooRefOrValue foo) { + + this.foo = foo; + return this; + } + + /** + * Get foo + * @return foo + */ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_FOO) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public FooRefOrValue getFoo() { + return foo; + } + + + @JsonProperty(JSON_PROPERTY_FOO) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setFoo(@javax.annotation.Nullable FooRefOrValue foo) { + this.foo = foo; + } + + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + BarCreate barCreate = (BarCreate) o; + return Objects.equals(this.barPropA, barCreate.barPropA) && + Objects.equals(this.fooPropB, barCreate.fooPropB) && + Objects.equals(this.foo, barCreate.foo) && + super.equals(o); + } + + @Override + public int hashCode() { + return Objects.hash(barPropA, fooPropB, foo, super.hashCode()); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class BarCreate {\n"); + sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" barPropA: ").append(toIndentedString(barPropA)).append("\n"); + sb.append(" fooPropB: ").append(toIndentedString(fooPropB)).append("\n"); + sb.append(" foo: ").append(toIndentedString(foo)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/BarRef.java b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/BarRef.java new file mode 100644 index 000000000000..78b1badc87ee --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/BarRef.java @@ -0,0 +1,85 @@ +/* + * ByRefOrValue + * This tests for a oneOf interface representation + * + * The version of the OpenAPI document: 0.0.1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Objects; +import java.util.Arrays; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import org.openapitools.client.model.EntityRef; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** + * BarRef + */ +@JsonPropertyOrder({ +}) +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.15.0-SNAPSHOT") +@JsonIgnoreProperties( + value = "@type", // ignore manually set @type, it will be automatically generated by Jackson during serialization + allowSetters = true // allows the @type to be set during deserialization +) +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "@type", visible = true) + +public final class BarRef extends EntityRef implements BarRefOrValue { + public BarRef() { + + } + + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + return super.equals(o); + } + + @Override + public int hashCode() { + return Objects.hash(super.hashCode()); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class BarRef {\n"); + sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/BarRefOrValue.java b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/BarRefOrValue.java new file mode 100644 index 000000000000..b9e396f42855 --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/BarRefOrValue.java @@ -0,0 +1,46 @@ +/* + * ByRefOrValue + * This tests for a oneOf interface representation + * + * The version of the OpenAPI document: 0.0.1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Objects; +import java.util.Arrays; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import org.openapitools.client.model.Bar; +import org.openapitools.client.model.BarRef; +import org.openapitools.client.model.FooRefOrValue; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.15.0-SNAPSHOT") +@JsonIgnoreProperties( + value = "@type", // ignore manually set @type, it will be automatically generated by Jackson during serialization + allowSetters = true // allows the @type to be set during deserialization +) +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "@type", visible = true) +@JsonSubTypes({ + @JsonSubTypes.Type(value = Bar.class, name = "Bar"), + @JsonSubTypes.Type(value = BarRef.class, name = "BarRef"), +}) + +public sealed interface BarRefOrValue permits Bar, BarRef { + public String getAtType(); +} + diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Entity.java b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Entity.java new file mode 100644 index 000000000000..c724d44eb58b --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Entity.java @@ -0,0 +1,250 @@ +/* + * ByRefOrValue + * This tests for a oneOf interface representation + * + * The version of the OpenAPI document: 0.0.1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Objects; +import java.util.Arrays; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** + * Entity + */ +@JsonPropertyOrder({ + Entity.JSON_PROPERTY_HREF, + Entity.JSON_PROPERTY_ID, + Entity.JSON_PROPERTY_AT_SCHEMA_LOCATION, + Entity.JSON_PROPERTY_AT_BASE_TYPE, + Entity.JSON_PROPERTY_AT_TYPE +}) +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.15.0-SNAPSHOT") +@JsonIgnoreProperties( + value = "@type", // ignore manually set @type, it will be automatically generated by Jackson during serialization + allowSetters = true // allows the @type to be set during deserialization +) +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "@type", visible = true) +@JsonSubTypes({ + @JsonSubTypes.Type(value = Bar.class, name = "Bar"), + @JsonSubTypes.Type(value = BarCreate.class, name = "Bar_Create"), + @JsonSubTypes.Type(value = Foo.class, name = "Foo"), + @JsonSubTypes.Type(value = Pasta.class, name = "Pasta"), + @JsonSubTypes.Type(value = Pizza.class, name = "Pizza"), + @JsonSubTypes.Type(value = PizzaSpeziale.class, name = "PizzaSpeziale"), +}) + +public class Entity { + public static final String JSON_PROPERTY_HREF = "href"; + @javax.annotation.Nullable + protected String href; + + public static final String JSON_PROPERTY_ID = "id"; + @javax.annotation.Nullable + protected String id; + + public static final String JSON_PROPERTY_AT_SCHEMA_LOCATION = "@schemaLocation"; + @javax.annotation.Nullable + protected String atSchemaLocation; + + public static final String JSON_PROPERTY_AT_BASE_TYPE = "@baseType"; + @javax.annotation.Nullable + protected String atBaseType; + + public static final String JSON_PROPERTY_AT_TYPE = "@type"; + @javax.annotation.Nonnull + protected String atType; + + public Entity() { + } + + public Entity href(@javax.annotation.Nullable String href) { + + this.href = href; + return this; + } + + /** + * Hyperlink reference + * @return href + */ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_HREF) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public String getHref() { + return href; + } + + + @JsonProperty(JSON_PROPERTY_HREF) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setHref(@javax.annotation.Nullable String href) { + this.href = href; + } + + public Entity id(@javax.annotation.Nullable String id) { + + this.id = id; + return this; + } + + /** + * unique identifier + * @return id + */ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_ID) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public String getId() { + return id; + } + + + @JsonProperty(JSON_PROPERTY_ID) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setId(@javax.annotation.Nullable String id) { + this.id = id; + } + + public Entity atSchemaLocation(@javax.annotation.Nullable String atSchemaLocation) { + + this.atSchemaLocation = atSchemaLocation; + return this; + } + + /** + * A URI to a JSON-Schema file that defines additional attributes and relationships + * @return atSchemaLocation + */ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_AT_SCHEMA_LOCATION) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public String getAtSchemaLocation() { + return atSchemaLocation; + } + + + @JsonProperty(JSON_PROPERTY_AT_SCHEMA_LOCATION) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setAtSchemaLocation(@javax.annotation.Nullable String atSchemaLocation) { + this.atSchemaLocation = atSchemaLocation; + } + + public Entity atBaseType(@javax.annotation.Nullable String atBaseType) { + + this.atBaseType = atBaseType; + return this; + } + + /** + * When sub-classing, this defines the super-class + * @return atBaseType + */ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_AT_BASE_TYPE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public String getAtBaseType() { + return atBaseType; + } + + + @JsonProperty(JSON_PROPERTY_AT_BASE_TYPE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setAtBaseType(@javax.annotation.Nullable String atBaseType) { + this.atBaseType = atBaseType; + } + + public Entity atType(@javax.annotation.Nonnull String atType) { + + this.atType = atType; + return this; + } + + /** + * When sub-classing, this defines the sub-class Extensible name + * @return atType + */ + @javax.annotation.Nonnull + @JsonProperty(JSON_PROPERTY_AT_TYPE) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + + public String getAtType() { + return atType; + } + + + @JsonProperty(JSON_PROPERTY_AT_TYPE) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public void setAtType(@javax.annotation.Nonnull String atType) { + this.atType = atType; + } + + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Entity entity = (Entity) o; + return Objects.equals(this.href, entity.href) && + Objects.equals(this.id, entity.id) && + Objects.equals(this.atSchemaLocation, entity.atSchemaLocation) && + Objects.equals(this.atBaseType, entity.atBaseType) && + Objects.equals(this.atType, entity.atType); + } + + @Override + public int hashCode() { + return Objects.hash(href, id, atSchemaLocation, atBaseType, atType); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class Entity {\n"); + sb.append(" href: ").append(toIndentedString(href)).append("\n"); + sb.append(" id: ").append(toIndentedString(id)).append("\n"); + sb.append(" atSchemaLocation: ").append(toIndentedString(atSchemaLocation)).append("\n"); + sb.append(" atBaseType: ").append(toIndentedString(atBaseType)).append("\n"); + sb.append(" atType: ").append(toIndentedString(atType)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/EntityRef.java b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/EntityRef.java new file mode 100644 index 000000000000..e1bf5904fb6b --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/EntityRef.java @@ -0,0 +1,310 @@ +/* + * ByRefOrValue + * This tests for a oneOf interface representation + * + * The version of the OpenAPI document: 0.0.1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Objects; +import java.util.Arrays; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** + * Entity reference schema to be use for all entityRef class. + */ +@JsonPropertyOrder({ + EntityRef.JSON_PROPERTY_NAME, + EntityRef.JSON_PROPERTY_AT_REFERRED_TYPE, + EntityRef.JSON_PROPERTY_HREF, + EntityRef.JSON_PROPERTY_ID, + EntityRef.JSON_PROPERTY_AT_SCHEMA_LOCATION, + EntityRef.JSON_PROPERTY_AT_BASE_TYPE, + EntityRef.JSON_PROPERTY_AT_TYPE +}) +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.15.0-SNAPSHOT") +@JsonIgnoreProperties( + value = "@type", // ignore manually set @type, it will be automatically generated by Jackson during serialization + allowSetters = true // allows the @type to be set during deserialization +) +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "@type", visible = true) +@JsonSubTypes({ + @JsonSubTypes.Type(value = BarRef.class, name = "BarRef"), + @JsonSubTypes.Type(value = FooRef.class, name = "FooRef"), +}) + +public class EntityRef { + public static final String JSON_PROPERTY_NAME = "name"; + @javax.annotation.Nullable + protected String name; + + public static final String JSON_PROPERTY_AT_REFERRED_TYPE = "@referredType"; + @javax.annotation.Nullable + protected String atReferredType; + + public static final String JSON_PROPERTY_HREF = "href"; + @javax.annotation.Nullable + protected String href; + + public static final String JSON_PROPERTY_ID = "id"; + @javax.annotation.Nullable + protected String id; + + public static final String JSON_PROPERTY_AT_SCHEMA_LOCATION = "@schemaLocation"; + @javax.annotation.Nullable + protected String atSchemaLocation; + + public static final String JSON_PROPERTY_AT_BASE_TYPE = "@baseType"; + @javax.annotation.Nullable + protected String atBaseType; + + public static final String JSON_PROPERTY_AT_TYPE = "@type"; + @javax.annotation.Nonnull + protected String atType; + + public EntityRef() { + } + + public EntityRef name(@javax.annotation.Nullable String name) { + + this.name = name; + return this; + } + + /** + * Name of the related entity. + * @return name + */ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public String getName() { + return name; + } + + + @JsonProperty(JSON_PROPERTY_NAME) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setName(@javax.annotation.Nullable String name) { + this.name = name; + } + + public EntityRef atReferredType(@javax.annotation.Nullable String atReferredType) { + + this.atReferredType = atReferredType; + return this; + } + + /** + * The actual type of the target instance when needed for disambiguation. + * @return atReferredType + */ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_AT_REFERRED_TYPE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public String getAtReferredType() { + return atReferredType; + } + + + @JsonProperty(JSON_PROPERTY_AT_REFERRED_TYPE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setAtReferredType(@javax.annotation.Nullable String atReferredType) { + this.atReferredType = atReferredType; + } + + public EntityRef href(@javax.annotation.Nullable String href) { + + this.href = href; + return this; + } + + /** + * Hyperlink reference + * @return href + */ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_HREF) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public String getHref() { + return href; + } + + + @JsonProperty(JSON_PROPERTY_HREF) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setHref(@javax.annotation.Nullable String href) { + this.href = href; + } + + public EntityRef id(@javax.annotation.Nullable String id) { + + this.id = id; + return this; + } + + /** + * unique identifier + * @return id + */ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_ID) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public String getId() { + return id; + } + + + @JsonProperty(JSON_PROPERTY_ID) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setId(@javax.annotation.Nullable String id) { + this.id = id; + } + + public EntityRef atSchemaLocation(@javax.annotation.Nullable String atSchemaLocation) { + + this.atSchemaLocation = atSchemaLocation; + return this; + } + + /** + * A URI to a JSON-Schema file that defines additional attributes and relationships + * @return atSchemaLocation + */ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_AT_SCHEMA_LOCATION) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public String getAtSchemaLocation() { + return atSchemaLocation; + } + + + @JsonProperty(JSON_PROPERTY_AT_SCHEMA_LOCATION) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setAtSchemaLocation(@javax.annotation.Nullable String atSchemaLocation) { + this.atSchemaLocation = atSchemaLocation; + } + + public EntityRef atBaseType(@javax.annotation.Nullable String atBaseType) { + + this.atBaseType = atBaseType; + return this; + } + + /** + * When sub-classing, this defines the super-class + * @return atBaseType + */ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_AT_BASE_TYPE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public String getAtBaseType() { + return atBaseType; + } + + + @JsonProperty(JSON_PROPERTY_AT_BASE_TYPE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setAtBaseType(@javax.annotation.Nullable String atBaseType) { + this.atBaseType = atBaseType; + } + + public EntityRef atType(@javax.annotation.Nonnull String atType) { + + this.atType = atType; + return this; + } + + /** + * When sub-classing, this defines the sub-class Extensible name + * @return atType + */ + @javax.annotation.Nonnull + @JsonProperty(JSON_PROPERTY_AT_TYPE) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + + public String getAtType() { + return atType; + } + + + @JsonProperty(JSON_PROPERTY_AT_TYPE) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public void setAtType(@javax.annotation.Nonnull String atType) { + this.atType = atType; + } + + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + EntityRef entityRef = (EntityRef) o; + return Objects.equals(this.name, entityRef.name) && + Objects.equals(this.atReferredType, entityRef.atReferredType) && + Objects.equals(this.href, entityRef.href) && + Objects.equals(this.id, entityRef.id) && + Objects.equals(this.atSchemaLocation, entityRef.atSchemaLocation) && + Objects.equals(this.atBaseType, entityRef.atBaseType) && + Objects.equals(this.atType, entityRef.atType); + } + + @Override + public int hashCode() { + return Objects.hash(name, atReferredType, href, id, atSchemaLocation, atBaseType, atType); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class EntityRef {\n"); + sb.append(" name: ").append(toIndentedString(name)).append("\n"); + sb.append(" atReferredType: ").append(toIndentedString(atReferredType)).append("\n"); + sb.append(" href: ").append(toIndentedString(href)).append("\n"); + sb.append(" id: ").append(toIndentedString(id)).append("\n"); + sb.append(" atSchemaLocation: ").append(toIndentedString(atSchemaLocation)).append("\n"); + sb.append(" atBaseType: ").append(toIndentedString(atBaseType)).append("\n"); + sb.append(" atType: ").append(toIndentedString(atType)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Extensible.java b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Extensible.java new file mode 100644 index 000000000000..2d2fc0ff04fa --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Extensible.java @@ -0,0 +1,169 @@ +/* + * ByRefOrValue + * This tests for a oneOf interface representation + * + * The version of the OpenAPI document: 0.0.1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Objects; +import java.util.Arrays; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** + * Extensible + */ +@JsonPropertyOrder({ + Extensible.JSON_PROPERTY_AT_SCHEMA_LOCATION, + Extensible.JSON_PROPERTY_AT_BASE_TYPE, + Extensible.JSON_PROPERTY_AT_TYPE +}) +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.15.0-SNAPSHOT") +public class Extensible { + public static final String JSON_PROPERTY_AT_SCHEMA_LOCATION = "@schemaLocation"; + @javax.annotation.Nullable + private String atSchemaLocation; + + public static final String JSON_PROPERTY_AT_BASE_TYPE = "@baseType"; + @javax.annotation.Nullable + private String atBaseType; + + public static final String JSON_PROPERTY_AT_TYPE = "@type"; + @javax.annotation.Nonnull + private String atType; + + public Extensible() { + } + + public Extensible atSchemaLocation(@javax.annotation.Nullable String atSchemaLocation) { + + this.atSchemaLocation = atSchemaLocation; + return this; + } + + /** + * A URI to a JSON-Schema file that defines additional attributes and relationships + * @return atSchemaLocation + */ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_AT_SCHEMA_LOCATION) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public String getAtSchemaLocation() { + return atSchemaLocation; + } + + + @JsonProperty(JSON_PROPERTY_AT_SCHEMA_LOCATION) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setAtSchemaLocation(@javax.annotation.Nullable String atSchemaLocation) { + this.atSchemaLocation = atSchemaLocation; + } + + public Extensible atBaseType(@javax.annotation.Nullable String atBaseType) { + + this.atBaseType = atBaseType; + return this; + } + + /** + * When sub-classing, this defines the super-class + * @return atBaseType + */ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_AT_BASE_TYPE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public String getAtBaseType() { + return atBaseType; + } + + + @JsonProperty(JSON_PROPERTY_AT_BASE_TYPE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setAtBaseType(@javax.annotation.Nullable String atBaseType) { + this.atBaseType = atBaseType; + } + + public Extensible atType(@javax.annotation.Nonnull String atType) { + + this.atType = atType; + return this; + } + + /** + * When sub-classing, this defines the sub-class Extensible name + * @return atType + */ + @javax.annotation.Nonnull + @JsonProperty(JSON_PROPERTY_AT_TYPE) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + + public String getAtType() { + return atType; + } + + + @JsonProperty(JSON_PROPERTY_AT_TYPE) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public void setAtType(@javax.annotation.Nonnull String atType) { + this.atType = atType; + } + + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Extensible extensible = (Extensible) o; + return Objects.equals(this.atSchemaLocation, extensible.atSchemaLocation) && + Objects.equals(this.atBaseType, extensible.atBaseType) && + Objects.equals(this.atType, extensible.atType); + } + + @Override + public int hashCode() { + return Objects.hash(atSchemaLocation, atBaseType, atType); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class Extensible {\n"); + sb.append(" atSchemaLocation: ").append(toIndentedString(atSchemaLocation)).append("\n"); + sb.append(" atBaseType: ").append(toIndentedString(atBaseType)).append("\n"); + sb.append(" atType: ").append(toIndentedString(atType)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Foo.java b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Foo.java new file mode 100644 index 000000000000..4632b8c55c8b --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Foo.java @@ -0,0 +1,150 @@ +/* + * ByRefOrValue + * This tests for a oneOf interface representation + * + * The version of the OpenAPI document: 0.0.1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Objects; +import java.util.Arrays; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import org.openapitools.client.model.Entity; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** + * Foo + */ +@JsonPropertyOrder({ + Foo.JSON_PROPERTY_FOO_PROP_A, + Foo.JSON_PROPERTY_FOO_PROP_B +}) +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.15.0-SNAPSHOT") +@JsonIgnoreProperties( + value = "@type", // ignore manually set @type, it will be automatically generated by Jackson during serialization + allowSetters = true // allows the @type to be set during deserialization +) +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "@type", visible = true) + +public final class Foo extends Entity implements FooRefOrValue { + public static final String JSON_PROPERTY_FOO_PROP_A = "fooPropA"; + @javax.annotation.Nullable + private String fooPropA; + + public static final String JSON_PROPERTY_FOO_PROP_B = "fooPropB"; + @javax.annotation.Nullable + private String fooPropB; + + public Foo() { + + } + + public Foo fooPropA(@javax.annotation.Nullable String fooPropA) { + + this.fooPropA = fooPropA; + return this; + } + + /** + * Get fooPropA + * @return fooPropA + */ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_FOO_PROP_A) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public String getFooPropA() { + return fooPropA; + } + + + @JsonProperty(JSON_PROPERTY_FOO_PROP_A) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setFooPropA(@javax.annotation.Nullable String fooPropA) { + this.fooPropA = fooPropA; + } + + public Foo fooPropB(@javax.annotation.Nullable String fooPropB) { + + this.fooPropB = fooPropB; + return this; + } + + /** + * Get fooPropB + * @return fooPropB + */ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_FOO_PROP_B) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public String getFooPropB() { + return fooPropB; + } + + + @JsonProperty(JSON_PROPERTY_FOO_PROP_B) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setFooPropB(@javax.annotation.Nullable String fooPropB) { + this.fooPropB = fooPropB; + } + + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Foo foo = (Foo) o; + return Objects.equals(this.fooPropA, foo.fooPropA) && + Objects.equals(this.fooPropB, foo.fooPropB) && + super.equals(o); + } + + @Override + public int hashCode() { + return Objects.hash(fooPropA, fooPropB, super.hashCode()); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class Foo {\n"); + sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" fooPropA: ").append(toIndentedString(fooPropA)).append("\n"); + sb.append(" fooPropB: ").append(toIndentedString(fooPropB)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/FooRef.java b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/FooRef.java new file mode 100644 index 000000000000..b612e2a74567 --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/FooRef.java @@ -0,0 +1,118 @@ +/* + * ByRefOrValue + * This tests for a oneOf interface representation + * + * The version of the OpenAPI document: 0.0.1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Objects; +import java.util.Arrays; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import org.openapitools.client.model.EntityRef; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** + * FooRef + */ +@JsonPropertyOrder({ + FooRef.JSON_PROPERTY_FOOREF_PROP_A +}) +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.15.0-SNAPSHOT") +@JsonIgnoreProperties( + value = "@type", // ignore manually set @type, it will be automatically generated by Jackson during serialization + allowSetters = true // allows the @type to be set during deserialization +) +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "@type", visible = true) + +public final class FooRef extends EntityRef implements FooRefOrValue { + public static final String JSON_PROPERTY_FOOREF_PROP_A = "foorefPropA"; + @javax.annotation.Nullable + private String foorefPropA; + + public FooRef() { + + } + + public FooRef foorefPropA(@javax.annotation.Nullable String foorefPropA) { + + this.foorefPropA = foorefPropA; + return this; + } + + /** + * Get foorefPropA + * @return foorefPropA + */ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_FOOREF_PROP_A) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public String getFoorefPropA() { + return foorefPropA; + } + + + @JsonProperty(JSON_PROPERTY_FOOREF_PROP_A) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setFoorefPropA(@javax.annotation.Nullable String foorefPropA) { + this.foorefPropA = foorefPropA; + } + + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + FooRef fooRef = (FooRef) o; + return Objects.equals(this.foorefPropA, fooRef.foorefPropA) && + super.equals(o); + } + + @Override + public int hashCode() { + return Objects.hash(foorefPropA, super.hashCode()); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class FooRef {\n"); + sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" foorefPropA: ").append(toIndentedString(foorefPropA)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/FooRefOrValue.java b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/FooRefOrValue.java new file mode 100644 index 000000000000..e57b4b9af93c --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/FooRefOrValue.java @@ -0,0 +1,45 @@ +/* + * ByRefOrValue + * This tests for a oneOf interface representation + * + * The version of the OpenAPI document: 0.0.1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Objects; +import java.util.Arrays; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import org.openapitools.client.model.Foo; +import org.openapitools.client.model.FooRef; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.15.0-SNAPSHOT") +@JsonIgnoreProperties( + value = "@type", // ignore manually set @type, it will be automatically generated by Jackson during serialization + allowSetters = true // allows the @type to be set during deserialization +) +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "@type", visible = true) +@JsonSubTypes({ + @JsonSubTypes.Type(value = Foo.class, name = "Foo"), + @JsonSubTypes.Type(value = FooRef.class, name = "FooRef"), +}) + +public sealed interface FooRefOrValue permits Foo, FooRef { + public String getAtType(); +} + diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Fruit.java b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Fruit.java new file mode 100644 index 000000000000..3e7539fa9bee --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Fruit.java @@ -0,0 +1,46 @@ +/* + * ByRefOrValue + * This tests for a oneOf interface representation + * + * The version of the OpenAPI document: 0.0.1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Objects; +import java.util.Arrays; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import org.openapitools.client.model.Apple; +import org.openapitools.client.model.Banana; +import org.openapitools.client.model.FruitType; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.15.0-SNAPSHOT") +@JsonIgnoreProperties( + value = "fruitType", // ignore manually set fruitType, it will be automatically generated by Jackson during serialization + allowSetters = true // allows the fruitType to be set during deserialization +) +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "fruitType", visible = true) +@JsonSubTypes({ + @JsonSubTypes.Type(value = Apple.class, name = "APPLE"), + @JsonSubTypes.Type(value = Banana.class, name = "BANANA"), +}) + +public sealed interface Fruit permits Apple, Banana { + public FruitType getFruitType(); +} + diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/FruitType.java b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/FruitType.java new file mode 100644 index 000000000000..494d8c68ad3f --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/FruitType.java @@ -0,0 +1,59 @@ +/* + * ByRefOrValue + * This tests for a oneOf interface representation + * + * The version of the OpenAPI document: 0.0.1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Objects; +import java.util.Arrays; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + +/** + * Gets or Sets FruitType + */ +public enum FruitType { + + APPLE("APPLE"), + + BANANA("BANANA"); + + private String value; + + FruitType(String value) { + this.value = value; + } + + @JsonValue + public String getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static FruitType fromValue(String value) { + for (FruitType b : FruitType.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } +} + diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Pasta.java b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Pasta.java new file mode 100644 index 000000000000..79df741540f9 --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Pasta.java @@ -0,0 +1,118 @@ +/* + * ByRefOrValue + * This tests for a oneOf interface representation + * + * The version of the OpenAPI document: 0.0.1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Objects; +import java.util.Arrays; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import org.openapitools.client.model.Entity; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** + * Pasta + */ +@JsonPropertyOrder({ + Pasta.JSON_PROPERTY_VENDOR +}) +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.15.0-SNAPSHOT") +@JsonIgnoreProperties( + value = "@type", // ignore manually set @type, it will be automatically generated by Jackson during serialization + allowSetters = true // allows the @type to be set during deserialization +) +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "@type", visible = true) + +public class Pasta extends Entity { + public static final String JSON_PROPERTY_VENDOR = "vendor"; + @javax.annotation.Nullable + private String vendor; + + public Pasta() { + + } + + public Pasta vendor(@javax.annotation.Nullable String vendor) { + + this.vendor = vendor; + return this; + } + + /** + * Get vendor + * @return vendor + */ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_VENDOR) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public String getVendor() { + return vendor; + } + + + @JsonProperty(JSON_PROPERTY_VENDOR) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setVendor(@javax.annotation.Nullable String vendor) { + this.vendor = vendor; + } + + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Pasta pasta = (Pasta) o; + return Objects.equals(this.vendor, pasta.vendor) && + super.equals(o); + } + + @Override + public int hashCode() { + return Objects.hash(vendor, super.hashCode()); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class Pasta {\n"); + sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" vendor: ").append(toIndentedString(vendor)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Pizza.java b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Pizza.java new file mode 100644 index 000000000000..6bd432b50677 --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Pizza.java @@ -0,0 +1,122 @@ +/* + * ByRefOrValue + * This tests for a oneOf interface representation + * + * The version of the OpenAPI document: 0.0.1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Objects; +import java.util.Arrays; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import java.math.BigDecimal; +import org.openapitools.client.model.Entity; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** + * Pizza + */ +@JsonPropertyOrder({ + Pizza.JSON_PROPERTY_PIZZA_SIZE +}) +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.15.0-SNAPSHOT") +@JsonIgnoreProperties( + value = "@type", // ignore manually set @type, it will be automatically generated by Jackson during serialization + allowSetters = true // allows the @type to be set during deserialization +) +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "@type", visible = true) +@JsonSubTypes({ + @JsonSubTypes.Type(value = PizzaSpeziale.class, name = "PizzaSpeziale"), +}) + +public class Pizza extends Entity { + public static final String JSON_PROPERTY_PIZZA_SIZE = "pizzaSize"; + @javax.annotation.Nullable + protected BigDecimal pizzaSize; + + public Pizza() { + + } + + public Pizza pizzaSize(@javax.annotation.Nullable BigDecimal pizzaSize) { + + this.pizzaSize = pizzaSize; + return this; + } + + /** + * Get pizzaSize + * @return pizzaSize + */ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_PIZZA_SIZE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public BigDecimal getPizzaSize() { + return pizzaSize; + } + + + @JsonProperty(JSON_PROPERTY_PIZZA_SIZE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setPizzaSize(@javax.annotation.Nullable BigDecimal pizzaSize) { + this.pizzaSize = pizzaSize; + } + + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Pizza pizza = (Pizza) o; + return Objects.equals(this.pizzaSize, pizza.pizzaSize) && + super.equals(o); + } + + @Override + public int hashCode() { + return Objects.hash(pizzaSize, super.hashCode()); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class Pizza {\n"); + sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" pizzaSize: ").append(toIndentedString(pizzaSize)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/PizzaSpeziale.java b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/PizzaSpeziale.java new file mode 100644 index 000000000000..b2255770f78d --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/PizzaSpeziale.java @@ -0,0 +1,119 @@ +/* + * ByRefOrValue + * This tests for a oneOf interface representation + * + * The version of the OpenAPI document: 0.0.1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Objects; +import java.util.Arrays; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import java.math.BigDecimal; +import org.openapitools.client.model.Pizza; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; + +/** + * PizzaSpeziale + */ +@JsonPropertyOrder({ + PizzaSpeziale.JSON_PROPERTY_TOPPINGS +}) +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.15.0-SNAPSHOT") +@JsonIgnoreProperties( + value = "@type", // ignore manually set @type, it will be automatically generated by Jackson during serialization + allowSetters = true // allows the @type to be set during deserialization +) +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "@type", visible = true) + +public class PizzaSpeziale extends Pizza { + public static final String JSON_PROPERTY_TOPPINGS = "toppings"; + @javax.annotation.Nullable + private String toppings; + + public PizzaSpeziale() { + + } + + public PizzaSpeziale toppings(@javax.annotation.Nullable String toppings) { + + this.toppings = toppings; + return this; + } + + /** + * Get toppings + * @return toppings + */ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_TOPPINGS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public String getToppings() { + return toppings; + } + + + @JsonProperty(JSON_PROPERTY_TOPPINGS) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setToppings(@javax.annotation.Nullable String toppings) { + this.toppings = toppings; + } + + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + PizzaSpeziale pizzaSpeziale = (PizzaSpeziale) o; + return Objects.equals(this.toppings, pizzaSpeziale.toppings) && + super.equals(o); + } + + @Override + public int hashCode() { + return Objects.hash(toppings, super.hashCode()); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class PizzaSpeziale {\n"); + sb.append(" ").append(toIndentedString(super.toString())).append("\n"); + sb.append(" toppings: ").append(toIndentedString(toppings)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/api/BarApiTest.java b/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/api/BarApiTest.java new file mode 100644 index 000000000000..5bb38a6cfab9 --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/api/BarApiTest.java @@ -0,0 +1,51 @@ +/* + * ByRefOrValue + * This tests for a oneOf interface representation + * + * The version of the OpenAPI document: 0.0.1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.api; + +import org.openapitools.client.model.Bar; +import org.openapitools.client.model.BarCreate; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * API tests for BarApi + */ +@Disabled +public class BarApiTest { + + private final BarApi api = new BarApi(); + + + /** + * Create a Bar + * + * + */ + @Test + public void createBarTest() { + // uncomment below to test the function + //BarCreate barCreate = null; + //Bar response = api.createBar(barCreate).block(); + + // TODO: test validations + } + +} diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/api/FooApiTest.java b/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/api/FooApiTest.java new file mode 100644 index 000000000000..d91e4dff84cf --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/api/FooApiTest.java @@ -0,0 +1,64 @@ +/* + * ByRefOrValue + * This tests for a oneOf interface representation + * + * The version of the OpenAPI document: 0.0.1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.api; + +import org.openapitools.client.model.Foo; +import org.openapitools.client.model.FooRefOrValue; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * API tests for FooApi + */ +@Disabled +public class FooApiTest { + + private final FooApi api = new FooApi(); + + + /** + * Create a Foo + * + * + */ + @Test + public void createFooTest() { + // uncomment below to test the function + //Foo foo = null; + //FooRefOrValue response = api.createFoo(foo).block(); + + // TODO: test validations + } + + /** + * GET all Foos + * + * + */ + @Test + public void getAllFoosTest() { + // uncomment below to test the function + //List response = api.getAllFoos().collectList().block(); + + // TODO: test validations + } + +} diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/AddressableTest.java b/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/AddressableTest.java new file mode 100644 index 000000000000..b298f46e63ea --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/AddressableTest.java @@ -0,0 +1,55 @@ +/* + * ByRefOrValue + * This tests for a oneOf interface representation + * + * The version of the OpenAPI document: 0.0.1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for Addressable + */ +class AddressableTest { + private final Addressable model = new Addressable(); + + /** + * Model tests for Addressable + */ + @Test + void testAddressable() { + // TODO: test Addressable + } + + /** + * Test the property 'href' + */ + @Test + void hrefTest() { + // TODO: test href + } + + /** + * Test the property 'id' + */ + @Test + void idTest() { + // TODO: test id + } + +} diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/AppleTest.java b/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/AppleTest.java new file mode 100644 index 000000000000..ed97c849d726 --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/AppleTest.java @@ -0,0 +1,50 @@ +/* + * ByRefOrValue + * This tests for a oneOf interface representation + * + * The version of the OpenAPI document: 0.0.1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for Apple + */ +class AppleTest { + private final Apple model = new Apple(); + + /** + * Model tests for Apple + */ + @Test + void testApple() { + // TODO: test Apple + } + + /** + * Test the property 'seeds' + */ + @Test + void seedsTest() { + // TODO: test seeds + } + +} diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/BananaTest.java b/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/BananaTest.java new file mode 100644 index 000000000000..ea6cfbe742c3 --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/BananaTest.java @@ -0,0 +1,50 @@ +/* + * ByRefOrValue + * This tests for a oneOf interface representation + * + * The version of the OpenAPI document: 0.0.1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for Banana + */ +class BananaTest { + private final Banana model = new Banana(); + + /** + * Model tests for Banana + */ + @Test + void testBanana() { + // TODO: test Banana + } + + /** + * Test the property 'length' + */ + @Test + void lengthTest() { + // TODO: test length + } + +} diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/BarCreateTest.java b/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/BarCreateTest.java new file mode 100644 index 000000000000..98538ab051f0 --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/BarCreateTest.java @@ -0,0 +1,84 @@ +/* + * ByRefOrValue + * This tests for a oneOf interface representation + * + * The version of the OpenAPI document: 0.0.1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import org.openapitools.client.model.Entity; +import org.openapitools.client.model.FooRefOrValue; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for BarCreate + */ +class BarCreateTest { + private final BarCreate model = new BarCreate(); + + /** + * Model tests for BarCreate + */ + @Test + void testBarCreate() { + // TODO: test BarCreate + } + + /** + * Test the property 'href' + */ + @Test + void hrefTest() { + // TODO: test href + } + + /** + * Test the property 'id' + */ + @Test + void idTest() { + // TODO: test id + } + + /** + * Test the property 'atSchemaLocation' + */ + @Test + void atSchemaLocationTest() { + // TODO: test atSchemaLocation + } + + /** + * Test the property 'atBaseType' + */ + @Test + void atBaseTypeTest() { + // TODO: test atBaseType + } + + /** + * Test the property 'atType' + */ + @Test + void atTypeTest() { + // TODO: test atType + } + +} diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/BarRefOrValueTest.java b/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/BarRefOrValueTest.java new file mode 100644 index 000000000000..19fb3cdae646 --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/BarRefOrValueTest.java @@ -0,0 +1,35 @@ +/* + * ByRefOrValue + * This tests for a oneOf interface representation + * + * The version of the OpenAPI document: 0.0.1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import org.openapitools.client.model.Bar; +import org.openapitools.client.model.BarRef; +import org.openapitools.client.model.FooRefOrValue; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for BarRefOrValue + */ +class BarRefOrValueTest { +} diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/BarRefTest.java b/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/BarRefTest.java new file mode 100644 index 000000000000..7c50ffb3cd13 --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/BarRefTest.java @@ -0,0 +1,99 @@ +/* + * ByRefOrValue + * This tests for a oneOf interface representation + * + * The version of the OpenAPI document: 0.0.1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import org.openapitools.client.model.EntityRef; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for BarRef + */ +class BarRefTest { + private final BarRef model = new BarRef(); + + /** + * Model tests for BarRef + */ + @Test + void testBarRef() { + // TODO: test BarRef + } + + /** + * Test the property 'name' + */ + @Test + void nameTest() { + // TODO: test name + } + + /** + * Test the property 'atReferredType' + */ + @Test + void atReferredTypeTest() { + // TODO: test atReferredType + } + + /** + * Test the property 'href' + */ + @Test + void hrefTest() { + // TODO: test href + } + + /** + * Test the property 'id' + */ + @Test + void idTest() { + // TODO: test id + } + + /** + * Test the property 'atSchemaLocation' + */ + @Test + void atSchemaLocationTest() { + // TODO: test atSchemaLocation + } + + /** + * Test the property 'atBaseType' + */ + @Test + void atBaseTypeTest() { + // TODO: test atBaseType + } + + /** + * Test the property 'atType' + */ + @Test + void atTypeTest() { + // TODO: test atType + } + +} diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/BarTest.java b/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/BarTest.java new file mode 100644 index 000000000000..05557fca744e --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/BarTest.java @@ -0,0 +1,84 @@ +/* + * ByRefOrValue + * This tests for a oneOf interface representation + * + * The version of the OpenAPI document: 0.0.1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import org.openapitools.client.model.Entity; +import org.openapitools.client.model.FooRefOrValue; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for Bar + */ +class BarTest { + private final Bar model = new Bar(); + + /** + * Model tests for Bar + */ + @Test + void testBar() { + // TODO: test Bar + } + + /** + * Test the property 'href' + */ + @Test + void hrefTest() { + // TODO: test href + } + + /** + * Test the property 'id' + */ + @Test + void idTest() { + // TODO: test id + } + + /** + * Test the property 'atSchemaLocation' + */ + @Test + void atSchemaLocationTest() { + // TODO: test atSchemaLocation + } + + /** + * Test the property 'atBaseType' + */ + @Test + void atBaseTypeTest() { + // TODO: test atBaseType + } + + /** + * Test the property 'atType' + */ + @Test + void atTypeTest() { + // TODO: test atType + } + +} diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/EntityRefTest.java b/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/EntityRefTest.java new file mode 100644 index 000000000000..1054e173ab46 --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/EntityRefTest.java @@ -0,0 +1,82 @@ +/* + * ByRefOrValue + * This tests for a oneOf interface representation + * + * The version of the OpenAPI document: 0.0.1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for EntityRef + */ +class EntityRefTest { + private final EntityRef model = new EntityRef(); + + /** + * Model tests for EntityRef + */ + @Test + void testEntityRef() { + // TODO: test EntityRef + } + + /** + * Test the property 'href' + */ + @Test + void hrefTest() { + // TODO: test href + } + + /** + * Test the property 'id' + */ + @Test + void idTest() { + // TODO: test id + } + + /** + * Test the property 'atSchemaLocation' + */ + @Test + void atSchemaLocationTest() { + // TODO: test atSchemaLocation + } + + /** + * Test the property 'atBaseType' + */ + @Test + void atBaseTypeTest() { + // TODO: test atBaseType + } + + /** + * Test the property 'atType' + */ + @Test + void atTypeTest() { + // TODO: test atType + } + +} diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/EntityTest.java b/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/EntityTest.java new file mode 100644 index 000000000000..8968b6539047 --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/EntityTest.java @@ -0,0 +1,82 @@ +/* + * ByRefOrValue + * This tests for a oneOf interface representation + * + * The version of the OpenAPI document: 0.0.1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for Entity + */ +class EntityTest { + private final Entity model = new Entity(); + + /** + * Model tests for Entity + */ + @Test + void testEntity() { + // TODO: test Entity + } + + /** + * Test the property 'href' + */ + @Test + void hrefTest() { + // TODO: test href + } + + /** + * Test the property 'id' + */ + @Test + void idTest() { + // TODO: test id + } + + /** + * Test the property 'atSchemaLocation' + */ + @Test + void atSchemaLocationTest() { + // TODO: test atSchemaLocation + } + + /** + * Test the property 'atBaseType' + */ + @Test + void atBaseTypeTest() { + // TODO: test atBaseType + } + + /** + * Test the property 'atType' + */ + @Test + void atTypeTest() { + // TODO: test atType + } + +} diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/ExtensibleTest.java b/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/ExtensibleTest.java new file mode 100644 index 000000000000..2d4da7dbf7a6 --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/ExtensibleTest.java @@ -0,0 +1,63 @@ +/* + * ByRefOrValue + * This tests for a oneOf interface representation + * + * The version of the OpenAPI document: 0.0.1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for Extensible + */ +class ExtensibleTest { + private final Extensible model = new Extensible(); + + /** + * Model tests for Extensible + */ + @Test + void testExtensible() { + // TODO: test Extensible + } + + /** + * Test the property 'atSchemaLocation' + */ + @Test + void atSchemaLocationTest() { + // TODO: test atSchemaLocation + } + + /** + * Test the property 'atBaseType' + */ + @Test + void atBaseTypeTest() { + // TODO: test atBaseType + } + + /** + * Test the property 'atType' + */ + @Test + void atTypeTest() { + // TODO: test atType + } + +} diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/FooRefOrValueTest.java b/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/FooRefOrValueTest.java new file mode 100644 index 000000000000..e2e3d98ab759 --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/FooRefOrValueTest.java @@ -0,0 +1,34 @@ +/* + * ByRefOrValue + * This tests for a oneOf interface representation + * + * The version of the OpenAPI document: 0.0.1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import org.openapitools.client.model.Foo; +import org.openapitools.client.model.FooRef; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for FooRefOrValue + */ +class FooRefOrValueTest { +} diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/FooRefTest.java b/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/FooRefTest.java new file mode 100644 index 000000000000..7582d6863899 --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/FooRefTest.java @@ -0,0 +1,99 @@ +/* + * ByRefOrValue + * This tests for a oneOf interface representation + * + * The version of the OpenAPI document: 0.0.1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import org.openapitools.client.model.EntityRef; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for FooRef + */ +class FooRefTest { + private final FooRef model = new FooRef(); + + /** + * Model tests for FooRef + */ + @Test + void testFooRef() { + // TODO: test FooRef + } + + /** + * Test the property 'name' + */ + @Test + void nameTest() { + // TODO: test name + } + + /** + * Test the property 'atReferredType' + */ + @Test + void atReferredTypeTest() { + // TODO: test atReferredType + } + + /** + * Test the property 'href' + */ + @Test + void hrefTest() { + // TODO: test href + } + + /** + * Test the property 'id' + */ + @Test + void idTest() { + // TODO: test id + } + + /** + * Test the property 'atSchemaLocation' + */ + @Test + void atSchemaLocationTest() { + // TODO: test atSchemaLocation + } + + /** + * Test the property 'atBaseType' + */ + @Test + void atBaseTypeTest() { + // TODO: test atBaseType + } + + /** + * Test the property 'atType' + */ + @Test + void atTypeTest() { + // TODO: test atType + } + +} diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/FooTest.java b/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/FooTest.java new file mode 100644 index 000000000000..fcaea0f5cb51 --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/FooTest.java @@ -0,0 +1,83 @@ +/* + * ByRefOrValue + * This tests for a oneOf interface representation + * + * The version of the OpenAPI document: 0.0.1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import org.openapitools.client.model.Entity; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for Foo + */ +class FooTest { + private final Foo model = new Foo(); + + /** + * Model tests for Foo + */ + @Test + void testFoo() { + // TODO: test Foo + } + + /** + * Test the property 'href' + */ + @Test + void hrefTest() { + // TODO: test href + } + + /** + * Test the property 'id' + */ + @Test + void idTest() { + // TODO: test id + } + + /** + * Test the property 'atSchemaLocation' + */ + @Test + void atSchemaLocationTest() { + // TODO: test atSchemaLocation + } + + /** + * Test the property 'atBaseType' + */ + @Test + void atBaseTypeTest() { + // TODO: test atBaseType + } + + /** + * Test the property 'atType' + */ + @Test + void atTypeTest() { + // TODO: test atType + } + +} diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/FruitTest.java b/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/FruitTest.java new file mode 100644 index 000000000000..cc1adc4a88e5 --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/FruitTest.java @@ -0,0 +1,35 @@ +/* + * ByRefOrValue + * This tests for a oneOf interface representation + * + * The version of the OpenAPI document: 0.0.1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import org.openapitools.client.model.Apple; +import org.openapitools.client.model.Banana; +import org.openapitools.client.model.FruitType; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for Fruit + */ +class FruitTest { +} diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/FruitTypeTest.java b/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/FruitTypeTest.java new file mode 100644 index 000000000000..63738bea136e --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/FruitTypeTest.java @@ -0,0 +1,32 @@ +/* + * ByRefOrValue + * This tests for a oneOf interface representation + * + * The version of the OpenAPI document: 0.0.1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for FruitType + */ +class FruitTypeTest { + /** + * Model tests for FruitType + */ + @Test + void testFruitType() { + // TODO: test FruitType + } + +} diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/PastaTest.java b/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/PastaTest.java new file mode 100644 index 000000000000..4fa0eb0f5341 --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/PastaTest.java @@ -0,0 +1,83 @@ +/* + * ByRefOrValue + * This tests for a oneOf interface representation + * + * The version of the OpenAPI document: 0.0.1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import org.openapitools.client.model.Entity; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for Pasta + */ +class PastaTest { + private final Pasta model = new Pasta(); + + /** + * Model tests for Pasta + */ + @Test + void testPasta() { + // TODO: test Pasta + } + + /** + * Test the property 'href' + */ + @Test + void hrefTest() { + // TODO: test href + } + + /** + * Test the property 'id' + */ + @Test + void idTest() { + // TODO: test id + } + + /** + * Test the property 'atSchemaLocation' + */ + @Test + void atSchemaLocationTest() { + // TODO: test atSchemaLocation + } + + /** + * Test the property 'atBaseType' + */ + @Test + void atBaseTypeTest() { + // TODO: test atBaseType + } + + /** + * Test the property 'atType' + */ + @Test + void atTypeTest() { + // TODO: test atType + } + +} diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/PizzaSpezialeTest.java b/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/PizzaSpezialeTest.java new file mode 100644 index 000000000000..1d8fbb9ee871 --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/PizzaSpezialeTest.java @@ -0,0 +1,92 @@ +/* + * ByRefOrValue + * This tests for a oneOf interface representation + * + * The version of the OpenAPI document: 0.0.1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import java.math.BigDecimal; +import org.openapitools.client.model.Pizza; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for PizzaSpeziale + */ +class PizzaSpezialeTest { + private final PizzaSpeziale model = new PizzaSpeziale(); + + /** + * Model tests for PizzaSpeziale + */ + @Test + void testPizzaSpeziale() { + // TODO: test PizzaSpeziale + } + + /** + * Test the property 'pizzaSize' + */ + @Test + void pizzaSizeTest() { + // TODO: test pizzaSize + } + + /** + * Test the property 'href' + */ + @Test + void hrefTest() { + // TODO: test href + } + + /** + * Test the property 'id' + */ + @Test + void idTest() { + // TODO: test id + } + + /** + * Test the property 'atSchemaLocation' + */ + @Test + void atSchemaLocationTest() { + // TODO: test atSchemaLocation + } + + /** + * Test the property 'atBaseType' + */ + @Test + void atBaseTypeTest() { + // TODO: test atBaseType + } + + /** + * Test the property 'atType' + */ + @Test + void atTypeTest() { + // TODO: test atType + } + +} diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/PizzaTest.java b/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/PizzaTest.java new file mode 100644 index 000000000000..586edcfce750 --- /dev/null +++ b/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/PizzaTest.java @@ -0,0 +1,84 @@ +/* + * ByRefOrValue + * This tests for a oneOf interface representation + * + * The version of the OpenAPI document: 0.0.1 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import java.math.BigDecimal; +import org.openapitools.client.model.Entity; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for Pizza + */ +class PizzaTest { + private final Pizza model = new Pizza(); + + /** + * Model tests for Pizza + */ + @Test + void testPizza() { + // TODO: test Pizza + } + + /** + * Test the property 'href' + */ + @Test + void hrefTest() { + // TODO: test href + } + + /** + * Test the property 'id' + */ + @Test + void idTest() { + // TODO: test id + } + + /** + * Test the property 'atSchemaLocation' + */ + @Test + void atSchemaLocationTest() { + // TODO: test atSchemaLocation + } + + /** + * Test the property 'atBaseType' + */ + @Test + void atBaseTypeTest() { + // TODO: test atBaseType + } + + /** + * Test the property 'atType' + */ + @Test + void atTypeTest() { + // TODO: test atType + } + +} From 6494638171fae013bbe36280449bd3269d696239 Mon Sep 17 00:00:00 2001 From: Mattias-Sehlstedt <60173714+Mattias-Sehlstedt@users.noreply.github.com> Date: Fri, 18 Jul 2025 11:48:11 +0200 Subject: [PATCH 3/8] Add internal java17 additionalProperty setting --- .../openapitools/codegen/languages/JavaClientCodegen.java | 5 ++++- .../client/petstore/java/webclient-sealedInterface/gradlew | 0 .../client/petstore/java/webclient-sealedInterface/pom.xml | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) mode change 100644 => 100755 samples/client/petstore/java/webclient-sealedInterface/gradlew diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java index 4e439d3a5406..6e3d45c7530b 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java @@ -109,7 +109,6 @@ public class JavaClientCodegen extends AbstractJavaCodegen // Internal configurations public static final String SINGLE_REQUEST_PARAMETER = "singleRequestParameter"; public static final String STATIC_REQUEST = "staticRequest"; - // TODO attempt to implement the setting similar to how it is done here https://github.com/OpenAPITools/openapi-generator/pull/20590/files public static final String JAVA_17 = "java17"; public static final String SERIALIZATION_LIBRARY_GSON = "gson"; @@ -380,6 +379,10 @@ public void processOpts() { writePropertyBack(SINGLE_REQUEST_PARAMETER, getSingleRequestParameter()); writePropertyBack(STATIC_REQUEST, getStaticRequest()); + if (libWebClient && (useSealedOneOfInterfaces || useJakartaEe)) { + writePropertyBack(JAVA_17, true); + } + if (!useRxJava && !useRxJava2 && !useRxJava3) { additionalProperties.put(DO_NOT_USE_RX, true); } diff --git a/samples/client/petstore/java/webclient-sealedInterface/gradlew b/samples/client/petstore/java/webclient-sealedInterface/gradlew old mode 100644 new mode 100755 diff --git a/samples/client/petstore/java/webclient-sealedInterface/pom.xml b/samples/client/petstore/java/webclient-sealedInterface/pom.xml index 4fd524b665ae..549681480003 100644 --- a/samples/client/petstore/java/webclient-sealedInterface/pom.xml +++ b/samples/client/petstore/java/webclient-sealedInterface/pom.xml @@ -38,8 +38,8 @@ maven-compiler-plugin 3.13.0 - 1.8 - 1.8 + 17 + 17 From 83ebc6268a6a768271e2ca3c2acfcb45a2028541 Mon Sep 17 00:00:00 2001 From: Mattias-Sehlstedt <60173714+Mattias-Sehlstedt@users.noreply.github.com> Date: Fri, 18 Jul 2025 13:33:18 +0200 Subject: [PATCH 4/8] Move samples to highlight that they do not use the petstore --- .github/workflows/samples-java-client-jdk17.yaml | 6 +++--- bin/configs/java-webclient-sealedInterface.yaml | 2 +- .../.github/workflows/maven.yml | 0 .../java/webclient-sealedInterface/.gitignore | 0 .../.openapi-generator-ignore | 0 .../.openapi-generator/FILES | 0 .../.openapi-generator/VERSION | 0 .../java/webclient-sealedInterface/.travis.yml | 0 .../java/webclient-sealedInterface/README.md | 0 .../java/webclient-sealedInterface/api/openapi.yaml | 0 .../java/webclient-sealedInterface/build.gradle | 0 .../java/webclient-sealedInterface/build.sbt | 0 .../webclient-sealedInterface/docs/Addressable.md | 0 .../java/webclient-sealedInterface/docs/Apple.md | 0 .../java/webclient-sealedInterface/docs/Banana.md | 0 .../java/webclient-sealedInterface/docs/Bar.md | 0 .../java/webclient-sealedInterface/docs/BarApi.md | 0 .../webclient-sealedInterface/docs/BarCreate.md | 0 .../java/webclient-sealedInterface/docs/BarRef.md | 0 .../webclient-sealedInterface/docs/BarRefOrValue.md | 0 .../java/webclient-sealedInterface/docs/Entity.md | 0 .../webclient-sealedInterface/docs/EntityRef.md | 0 .../webclient-sealedInterface/docs/Extensible.md | 0 .../java/webclient-sealedInterface/docs/Foo.md | 0 .../java/webclient-sealedInterface/docs/FooApi.md | 0 .../java/webclient-sealedInterface/docs/FooRef.md | 0 .../webclient-sealedInterface/docs/FooRefOrValue.md | 0 .../java/webclient-sealedInterface/docs/Fruit.md | 0 .../webclient-sealedInterface/docs/FruitType.md | 0 .../java/webclient-sealedInterface/docs/Pasta.md | 0 .../java/webclient-sealedInterface/docs/Pizza.md | 0 .../webclient-sealedInterface/docs/PizzaSpeziale.md | 0 .../java/webclient-sealedInterface/git_push.sh | 0 .../webclient-sealedInterface/gradle.properties | 0 .../gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 .../java/webclient-sealedInterface/gradlew | 0 .../java/webclient-sealedInterface/gradlew.bat | 0 .../java/webclient-sealedInterface/pom.xml | 0 .../java/webclient-sealedInterface/settings.gradle | 0 .../src/main/AndroidManifest.xml | 0 .../java/org/openapitools/client/ApiClient.java | 0 .../org/openapitools/client/JavaTimeFormatter.java | 0 .../org/openapitools/client/RFC3339DateFormat.java | 0 .../client/RFC3339InstantDeserializer.java | 0 .../openapitools/client/RFC3339JavaTimeModule.java | 0 .../openapitools/client/ServerConfiguration.java | 0 .../org/openapitools/client/ServerVariable.java | 0 .../java/org/openapitools/client/StringUtil.java | 0 .../java/org/openapitools/client/api/BarApi.java | 0 .../java/org/openapitools/client/api/FooApi.java | 0 .../org/openapitools/client/auth/ApiKeyAuth.java | 0 .../openapitools/client/auth/Authentication.java | 0 .../org/openapitools/client/auth/HttpBasicAuth.java | 0 .../openapitools/client/auth/HttpBearerAuth.java | 0 .../org/openapitools/client/model/Addressable.java | 0 .../java/org/openapitools/client/model/Apple.java | 0 .../java/org/openapitools/client/model/Banana.java | 0 .../java/org/openapitools/client/model/Bar.java | 0 .../org/openapitools/client/model/BarCreate.java | 0 .../java/org/openapitools/client/model/BarRef.java | 0 .../openapitools/client/model/BarRefOrValue.java | 0 .../java/org/openapitools/client/model/Entity.java | 0 .../org/openapitools/client/model/EntityRef.java | 0 .../org/openapitools/client/model/Extensible.java | 0 .../java/org/openapitools/client/model/Foo.java | 0 .../java/org/openapitools/client/model/FooRef.java | 0 .../openapitools/client/model/FooRefOrValue.java | 0 .../java/org/openapitools/client/model/Fruit.java | 0 .../org/openapitools/client/model/FruitType.java | 0 .../java/org/openapitools/client/model/Pasta.java | 0 .../java/org/openapitools/client/model/Pizza.java | 0 .../openapitools/client/model/PizzaSpeziale.java | 0 .../org/openapitools/client/api/BarApiTest.java | 0 .../org/openapitools/client/api/FooApiTest.java | 0 .../openapitools/client/model/AddressableTest.java | 0 .../org/openapitools/client/model/AppleTest.java | 0 .../org/openapitools/client/model/BananaTest.java | 0 .../openapitools/client/model/BarCreateTest.java | 0 .../client/model/BarRefOrValueTest.java | 0 .../org/openapitools/client/model/BarRefTest.java | 0 .../java/org/openapitools/client/model/BarTest.java | 0 .../openapitools/client/model/EntityRefTest.java | 0 .../org/openapitools/client/model/EntityTest.java | 0 .../openapitools/client/model/ExtensibleTest.java | 0 .../client/model/FooRefOrValueTest.java | 0 .../org/openapitools/client/model/FooRefTest.java | 0 .../java/org/openapitools/client/model/FooTest.java | 0 .../org/openapitools/client/model/FruitTest.java | 0 .../openapitools/client/model/FruitTypeTest.java | 0 .../org/openapitools/client/model/PastaTest.java | 0 .../client/model/PizzaSpezialeTest.java | 0 .../org/openapitools/client/model/PizzaTest.java | 0 93 files changed, 4 insertions(+), 4 deletions(-) rename samples/client/{petstore => others}/java/webclient-sealedInterface/.github/workflows/maven.yml (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/.gitignore (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/.openapi-generator-ignore (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/.openapi-generator/FILES (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/.openapi-generator/VERSION (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/.travis.yml (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/README.md (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/api/openapi.yaml (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/build.gradle (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/build.sbt (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/docs/Addressable.md (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/docs/Apple.md (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/docs/Banana.md (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/docs/Bar.md (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/docs/BarApi.md (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/docs/BarCreate.md (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/docs/BarRef.md (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/docs/BarRefOrValue.md (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/docs/Entity.md (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/docs/EntityRef.md (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/docs/Extensible.md (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/docs/Foo.md (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/docs/FooApi.md (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/docs/FooRef.md (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/docs/FooRefOrValue.md (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/docs/Fruit.md (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/docs/FruitType.md (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/docs/Pasta.md (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/docs/Pizza.md (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/docs/PizzaSpeziale.md (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/git_push.sh (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/gradle.properties (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/gradle/wrapper/gradle-wrapper.jar (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/gradle/wrapper/gradle-wrapper.properties (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/gradlew (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/gradlew.bat (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/pom.xml (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/settings.gradle (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/src/main/AndroidManifest.xml (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/src/main/java/org/openapitools/client/ApiClient.java (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/src/main/java/org/openapitools/client/JavaTimeFormatter.java (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/src/main/java/org/openapitools/client/RFC3339DateFormat.java (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/src/main/java/org/openapitools/client/RFC3339InstantDeserializer.java (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/src/main/java/org/openapitools/client/RFC3339JavaTimeModule.java (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/src/main/java/org/openapitools/client/ServerConfiguration.java (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/src/main/java/org/openapitools/client/ServerVariable.java (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/src/main/java/org/openapitools/client/StringUtil.java (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/src/main/java/org/openapitools/client/api/BarApi.java (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/src/main/java/org/openapitools/client/api/FooApi.java (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/src/main/java/org/openapitools/client/auth/Authentication.java (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Addressable.java (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Apple.java (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Banana.java (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Bar.java (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/BarCreate.java (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/BarRef.java (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/BarRefOrValue.java (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Entity.java (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/EntityRef.java (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Extensible.java (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Foo.java (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/FooRef.java (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/FooRefOrValue.java (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Fruit.java (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/FruitType.java (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Pasta.java (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Pizza.java (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/PizzaSpeziale.java (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/src/test/java/org/openapitools/client/api/BarApiTest.java (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/src/test/java/org/openapitools/client/api/FooApiTest.java (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/AddressableTest.java (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/AppleTest.java (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/BananaTest.java (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/BarCreateTest.java (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/BarRefOrValueTest.java (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/BarRefTest.java (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/BarTest.java (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/EntityRefTest.java (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/EntityTest.java (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/ExtensibleTest.java (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/FooRefOrValueTest.java (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/FooRefTest.java (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/FooTest.java (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/FruitTest.java (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/FruitTypeTest.java (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/PastaTest.java (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/PizzaSpezialeTest.java (100%) rename samples/client/{petstore => others}/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/PizzaTest.java (100%) diff --git a/.github/workflows/samples-java-client-jdk17.yaml b/.github/workflows/samples-java-client-jdk17.yaml index 50b0781bbb73..5d47bf3adf5e 100644 --- a/.github/workflows/samples-java-client-jdk17.yaml +++ b/.github/workflows/samples-java-client-jdk17.yaml @@ -6,7 +6,7 @@ on: - samples/client/petstore/java/resttemplate-jakarta/** - samples/client/petstore/java/webclient-jakarta/** - samples/client/petstore/java/restclient-*/** - - samples/client/petstore/java/webclient-sealedInterface/** + - samples/client/others/java/webclient-sealedInterface/** - samples/client/petstore/java/webclient-useSingleRequestParameter/** - samples/client/others/java/restclient-enum-in-multipart/** pull_request: @@ -14,7 +14,7 @@ on: - samples/client/petstore/java/resttemplate-jakarta/** - samples/client/petstore/java/webclient-jakarta/** - samples/client/petstore/java/restclient-*/** - - samples/client/petstore/java/webclient-sealedInterface/** + - samples/client/others/java/webclient-sealedInterface/** - samples/client/petstore/java/webclient-useSingleRequestParameter/** - samples/client/others/java/restclient-enum-in-multipart/** jobs: @@ -33,7 +33,7 @@ jobs: - samples/client/petstore/java/restclient-swagger2 - samples/client/petstore/java/restclient-useSingleRequestParameter - samples/client/petstore/java/restclient-useSingleRequestParameter-static - - samples/client/petstore/java/webclient-sealedInterface + - samples/client/others/java/webclient-sealedInterface - samples/client/petstore/java/webclient-useSingleRequestParameter - samples/client/others/java/restclient-enum-in-multipart steps: diff --git a/bin/configs/java-webclient-sealedInterface.yaml b/bin/configs/java-webclient-sealedInterface.yaml index 62360d7846d4..43ba9421f7bc 100644 --- a/bin/configs/java-webclient-sealedInterface.yaml +++ b/bin/configs/java-webclient-sealedInterface.yaml @@ -1,5 +1,5 @@ generatorName: java -outputDir: samples/client/petstore/java/webclient-sealedInterface +outputDir: samples/client/others/java/webclient-sealedInterface library: webclient inputSpec: modules/openapi-generator/src/test/resources/3_0/oneof_polymorphism_and_inheritance.yaml templateDir: modules/openapi-generator/src/main/resources/Java diff --git a/samples/client/petstore/java/webclient-sealedInterface/.github/workflows/maven.yml b/samples/client/others/java/webclient-sealedInterface/.github/workflows/maven.yml similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/.github/workflows/maven.yml rename to samples/client/others/java/webclient-sealedInterface/.github/workflows/maven.yml diff --git a/samples/client/petstore/java/webclient-sealedInterface/.gitignore b/samples/client/others/java/webclient-sealedInterface/.gitignore similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/.gitignore rename to samples/client/others/java/webclient-sealedInterface/.gitignore diff --git a/samples/client/petstore/java/webclient-sealedInterface/.openapi-generator-ignore b/samples/client/others/java/webclient-sealedInterface/.openapi-generator-ignore similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/.openapi-generator-ignore rename to samples/client/others/java/webclient-sealedInterface/.openapi-generator-ignore diff --git a/samples/client/petstore/java/webclient-sealedInterface/.openapi-generator/FILES b/samples/client/others/java/webclient-sealedInterface/.openapi-generator/FILES similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/.openapi-generator/FILES rename to samples/client/others/java/webclient-sealedInterface/.openapi-generator/FILES diff --git a/samples/client/petstore/java/webclient-sealedInterface/.openapi-generator/VERSION b/samples/client/others/java/webclient-sealedInterface/.openapi-generator/VERSION similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/.openapi-generator/VERSION rename to samples/client/others/java/webclient-sealedInterface/.openapi-generator/VERSION diff --git a/samples/client/petstore/java/webclient-sealedInterface/.travis.yml b/samples/client/others/java/webclient-sealedInterface/.travis.yml similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/.travis.yml rename to samples/client/others/java/webclient-sealedInterface/.travis.yml diff --git a/samples/client/petstore/java/webclient-sealedInterface/README.md b/samples/client/others/java/webclient-sealedInterface/README.md similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/README.md rename to samples/client/others/java/webclient-sealedInterface/README.md diff --git a/samples/client/petstore/java/webclient-sealedInterface/api/openapi.yaml b/samples/client/others/java/webclient-sealedInterface/api/openapi.yaml similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/api/openapi.yaml rename to samples/client/others/java/webclient-sealedInterface/api/openapi.yaml diff --git a/samples/client/petstore/java/webclient-sealedInterface/build.gradle b/samples/client/others/java/webclient-sealedInterface/build.gradle similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/build.gradle rename to samples/client/others/java/webclient-sealedInterface/build.gradle diff --git a/samples/client/petstore/java/webclient-sealedInterface/build.sbt b/samples/client/others/java/webclient-sealedInterface/build.sbt similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/build.sbt rename to samples/client/others/java/webclient-sealedInterface/build.sbt diff --git a/samples/client/petstore/java/webclient-sealedInterface/docs/Addressable.md b/samples/client/others/java/webclient-sealedInterface/docs/Addressable.md similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/docs/Addressable.md rename to samples/client/others/java/webclient-sealedInterface/docs/Addressable.md diff --git a/samples/client/petstore/java/webclient-sealedInterface/docs/Apple.md b/samples/client/others/java/webclient-sealedInterface/docs/Apple.md similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/docs/Apple.md rename to samples/client/others/java/webclient-sealedInterface/docs/Apple.md diff --git a/samples/client/petstore/java/webclient-sealedInterface/docs/Banana.md b/samples/client/others/java/webclient-sealedInterface/docs/Banana.md similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/docs/Banana.md rename to samples/client/others/java/webclient-sealedInterface/docs/Banana.md diff --git a/samples/client/petstore/java/webclient-sealedInterface/docs/Bar.md b/samples/client/others/java/webclient-sealedInterface/docs/Bar.md similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/docs/Bar.md rename to samples/client/others/java/webclient-sealedInterface/docs/Bar.md diff --git a/samples/client/petstore/java/webclient-sealedInterface/docs/BarApi.md b/samples/client/others/java/webclient-sealedInterface/docs/BarApi.md similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/docs/BarApi.md rename to samples/client/others/java/webclient-sealedInterface/docs/BarApi.md diff --git a/samples/client/petstore/java/webclient-sealedInterface/docs/BarCreate.md b/samples/client/others/java/webclient-sealedInterface/docs/BarCreate.md similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/docs/BarCreate.md rename to samples/client/others/java/webclient-sealedInterface/docs/BarCreate.md diff --git a/samples/client/petstore/java/webclient-sealedInterface/docs/BarRef.md b/samples/client/others/java/webclient-sealedInterface/docs/BarRef.md similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/docs/BarRef.md rename to samples/client/others/java/webclient-sealedInterface/docs/BarRef.md diff --git a/samples/client/petstore/java/webclient-sealedInterface/docs/BarRefOrValue.md b/samples/client/others/java/webclient-sealedInterface/docs/BarRefOrValue.md similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/docs/BarRefOrValue.md rename to samples/client/others/java/webclient-sealedInterface/docs/BarRefOrValue.md diff --git a/samples/client/petstore/java/webclient-sealedInterface/docs/Entity.md b/samples/client/others/java/webclient-sealedInterface/docs/Entity.md similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/docs/Entity.md rename to samples/client/others/java/webclient-sealedInterface/docs/Entity.md diff --git a/samples/client/petstore/java/webclient-sealedInterface/docs/EntityRef.md b/samples/client/others/java/webclient-sealedInterface/docs/EntityRef.md similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/docs/EntityRef.md rename to samples/client/others/java/webclient-sealedInterface/docs/EntityRef.md diff --git a/samples/client/petstore/java/webclient-sealedInterface/docs/Extensible.md b/samples/client/others/java/webclient-sealedInterface/docs/Extensible.md similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/docs/Extensible.md rename to samples/client/others/java/webclient-sealedInterface/docs/Extensible.md diff --git a/samples/client/petstore/java/webclient-sealedInterface/docs/Foo.md b/samples/client/others/java/webclient-sealedInterface/docs/Foo.md similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/docs/Foo.md rename to samples/client/others/java/webclient-sealedInterface/docs/Foo.md diff --git a/samples/client/petstore/java/webclient-sealedInterface/docs/FooApi.md b/samples/client/others/java/webclient-sealedInterface/docs/FooApi.md similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/docs/FooApi.md rename to samples/client/others/java/webclient-sealedInterface/docs/FooApi.md diff --git a/samples/client/petstore/java/webclient-sealedInterface/docs/FooRef.md b/samples/client/others/java/webclient-sealedInterface/docs/FooRef.md similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/docs/FooRef.md rename to samples/client/others/java/webclient-sealedInterface/docs/FooRef.md diff --git a/samples/client/petstore/java/webclient-sealedInterface/docs/FooRefOrValue.md b/samples/client/others/java/webclient-sealedInterface/docs/FooRefOrValue.md similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/docs/FooRefOrValue.md rename to samples/client/others/java/webclient-sealedInterface/docs/FooRefOrValue.md diff --git a/samples/client/petstore/java/webclient-sealedInterface/docs/Fruit.md b/samples/client/others/java/webclient-sealedInterface/docs/Fruit.md similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/docs/Fruit.md rename to samples/client/others/java/webclient-sealedInterface/docs/Fruit.md diff --git a/samples/client/petstore/java/webclient-sealedInterface/docs/FruitType.md b/samples/client/others/java/webclient-sealedInterface/docs/FruitType.md similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/docs/FruitType.md rename to samples/client/others/java/webclient-sealedInterface/docs/FruitType.md diff --git a/samples/client/petstore/java/webclient-sealedInterface/docs/Pasta.md b/samples/client/others/java/webclient-sealedInterface/docs/Pasta.md similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/docs/Pasta.md rename to samples/client/others/java/webclient-sealedInterface/docs/Pasta.md diff --git a/samples/client/petstore/java/webclient-sealedInterface/docs/Pizza.md b/samples/client/others/java/webclient-sealedInterface/docs/Pizza.md similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/docs/Pizza.md rename to samples/client/others/java/webclient-sealedInterface/docs/Pizza.md diff --git a/samples/client/petstore/java/webclient-sealedInterface/docs/PizzaSpeziale.md b/samples/client/others/java/webclient-sealedInterface/docs/PizzaSpeziale.md similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/docs/PizzaSpeziale.md rename to samples/client/others/java/webclient-sealedInterface/docs/PizzaSpeziale.md diff --git a/samples/client/petstore/java/webclient-sealedInterface/git_push.sh b/samples/client/others/java/webclient-sealedInterface/git_push.sh similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/git_push.sh rename to samples/client/others/java/webclient-sealedInterface/git_push.sh diff --git a/samples/client/petstore/java/webclient-sealedInterface/gradle.properties b/samples/client/others/java/webclient-sealedInterface/gradle.properties similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/gradle.properties rename to samples/client/others/java/webclient-sealedInterface/gradle.properties diff --git a/samples/client/petstore/java/webclient-sealedInterface/gradle/wrapper/gradle-wrapper.jar b/samples/client/others/java/webclient-sealedInterface/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/gradle/wrapper/gradle-wrapper.jar rename to samples/client/others/java/webclient-sealedInterface/gradle/wrapper/gradle-wrapper.jar diff --git a/samples/client/petstore/java/webclient-sealedInterface/gradle/wrapper/gradle-wrapper.properties b/samples/client/others/java/webclient-sealedInterface/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/gradle/wrapper/gradle-wrapper.properties rename to samples/client/others/java/webclient-sealedInterface/gradle/wrapper/gradle-wrapper.properties diff --git a/samples/client/petstore/java/webclient-sealedInterface/gradlew b/samples/client/others/java/webclient-sealedInterface/gradlew similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/gradlew rename to samples/client/others/java/webclient-sealedInterface/gradlew diff --git a/samples/client/petstore/java/webclient-sealedInterface/gradlew.bat b/samples/client/others/java/webclient-sealedInterface/gradlew.bat similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/gradlew.bat rename to samples/client/others/java/webclient-sealedInterface/gradlew.bat diff --git a/samples/client/petstore/java/webclient-sealedInterface/pom.xml b/samples/client/others/java/webclient-sealedInterface/pom.xml similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/pom.xml rename to samples/client/others/java/webclient-sealedInterface/pom.xml diff --git a/samples/client/petstore/java/webclient-sealedInterface/settings.gradle b/samples/client/others/java/webclient-sealedInterface/settings.gradle similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/settings.gradle rename to samples/client/others/java/webclient-sealedInterface/settings.gradle diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/AndroidManifest.xml b/samples/client/others/java/webclient-sealedInterface/src/main/AndroidManifest.xml similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/src/main/AndroidManifest.xml rename to samples/client/others/java/webclient-sealedInterface/src/main/AndroidManifest.xml diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/ApiClient.java similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/ApiClient.java rename to samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/ApiClient.java diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/JavaTimeFormatter.java b/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/JavaTimeFormatter.java similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/JavaTimeFormatter.java rename to samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/JavaTimeFormatter.java diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/RFC3339DateFormat.java b/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/RFC3339DateFormat.java similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/RFC3339DateFormat.java rename to samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/RFC3339DateFormat.java diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/RFC3339InstantDeserializer.java b/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/RFC3339InstantDeserializer.java similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/RFC3339InstantDeserializer.java rename to samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/RFC3339InstantDeserializer.java diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/RFC3339JavaTimeModule.java b/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/RFC3339JavaTimeModule.java similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/RFC3339JavaTimeModule.java rename to samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/RFC3339JavaTimeModule.java diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/ServerConfiguration.java b/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/ServerConfiguration.java similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/ServerConfiguration.java rename to samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/ServerConfiguration.java diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/ServerVariable.java b/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/ServerVariable.java similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/ServerVariable.java rename to samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/ServerVariable.java diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/StringUtil.java b/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/StringUtil.java similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/StringUtil.java rename to samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/StringUtil.java diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/api/BarApi.java b/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/api/BarApi.java similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/api/BarApi.java rename to samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/api/BarApi.java diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/api/FooApi.java b/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/api/FooApi.java similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/api/FooApi.java rename to samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/api/FooApi.java diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java b/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java rename to samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/auth/Authentication.java b/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/auth/Authentication.java similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/auth/Authentication.java rename to samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/auth/Authentication.java diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java b/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java rename to samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java b/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java rename to samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Addressable.java b/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Addressable.java similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Addressable.java rename to samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Addressable.java diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Apple.java b/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Apple.java similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Apple.java rename to samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Apple.java diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Banana.java b/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Banana.java similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Banana.java rename to samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Banana.java diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Bar.java b/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Bar.java similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Bar.java rename to samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Bar.java diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/BarCreate.java b/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/BarCreate.java similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/BarCreate.java rename to samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/BarCreate.java diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/BarRef.java b/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/BarRef.java similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/BarRef.java rename to samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/BarRef.java diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/BarRefOrValue.java b/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/BarRefOrValue.java similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/BarRefOrValue.java rename to samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/BarRefOrValue.java diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Entity.java b/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Entity.java similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Entity.java rename to samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Entity.java diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/EntityRef.java b/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/EntityRef.java similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/EntityRef.java rename to samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/EntityRef.java diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Extensible.java b/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Extensible.java similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Extensible.java rename to samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Extensible.java diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Foo.java b/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Foo.java similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Foo.java rename to samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Foo.java diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/FooRef.java b/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/FooRef.java similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/FooRef.java rename to samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/FooRef.java diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/FooRefOrValue.java b/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/FooRefOrValue.java similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/FooRefOrValue.java rename to samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/FooRefOrValue.java diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Fruit.java b/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Fruit.java similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Fruit.java rename to samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Fruit.java diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/FruitType.java b/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/FruitType.java similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/FruitType.java rename to samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/FruitType.java diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Pasta.java b/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Pasta.java similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Pasta.java rename to samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Pasta.java diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Pizza.java b/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Pizza.java similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Pizza.java rename to samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Pizza.java diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/PizzaSpeziale.java b/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/PizzaSpeziale.java similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/PizzaSpeziale.java rename to samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/PizzaSpeziale.java diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/api/BarApiTest.java b/samples/client/others/java/webclient-sealedInterface/src/test/java/org/openapitools/client/api/BarApiTest.java similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/api/BarApiTest.java rename to samples/client/others/java/webclient-sealedInterface/src/test/java/org/openapitools/client/api/BarApiTest.java diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/api/FooApiTest.java b/samples/client/others/java/webclient-sealedInterface/src/test/java/org/openapitools/client/api/FooApiTest.java similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/api/FooApiTest.java rename to samples/client/others/java/webclient-sealedInterface/src/test/java/org/openapitools/client/api/FooApiTest.java diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/AddressableTest.java b/samples/client/others/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/AddressableTest.java similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/AddressableTest.java rename to samples/client/others/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/AddressableTest.java diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/AppleTest.java b/samples/client/others/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/AppleTest.java similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/AppleTest.java rename to samples/client/others/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/AppleTest.java diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/BananaTest.java b/samples/client/others/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/BananaTest.java similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/BananaTest.java rename to samples/client/others/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/BananaTest.java diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/BarCreateTest.java b/samples/client/others/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/BarCreateTest.java similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/BarCreateTest.java rename to samples/client/others/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/BarCreateTest.java diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/BarRefOrValueTest.java b/samples/client/others/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/BarRefOrValueTest.java similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/BarRefOrValueTest.java rename to samples/client/others/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/BarRefOrValueTest.java diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/BarRefTest.java b/samples/client/others/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/BarRefTest.java similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/BarRefTest.java rename to samples/client/others/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/BarRefTest.java diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/BarTest.java b/samples/client/others/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/BarTest.java similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/BarTest.java rename to samples/client/others/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/BarTest.java diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/EntityRefTest.java b/samples/client/others/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/EntityRefTest.java similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/EntityRefTest.java rename to samples/client/others/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/EntityRefTest.java diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/EntityTest.java b/samples/client/others/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/EntityTest.java similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/EntityTest.java rename to samples/client/others/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/EntityTest.java diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/ExtensibleTest.java b/samples/client/others/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/ExtensibleTest.java similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/ExtensibleTest.java rename to samples/client/others/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/ExtensibleTest.java diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/FooRefOrValueTest.java b/samples/client/others/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/FooRefOrValueTest.java similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/FooRefOrValueTest.java rename to samples/client/others/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/FooRefOrValueTest.java diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/FooRefTest.java b/samples/client/others/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/FooRefTest.java similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/FooRefTest.java rename to samples/client/others/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/FooRefTest.java diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/FooTest.java b/samples/client/others/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/FooTest.java similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/FooTest.java rename to samples/client/others/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/FooTest.java diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/FruitTest.java b/samples/client/others/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/FruitTest.java similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/FruitTest.java rename to samples/client/others/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/FruitTest.java diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/FruitTypeTest.java b/samples/client/others/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/FruitTypeTest.java similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/FruitTypeTest.java rename to samples/client/others/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/FruitTypeTest.java diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/PastaTest.java b/samples/client/others/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/PastaTest.java similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/PastaTest.java rename to samples/client/others/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/PastaTest.java diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/PizzaSpezialeTest.java b/samples/client/others/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/PizzaSpezialeTest.java similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/PizzaSpezialeTest.java rename to samples/client/others/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/PizzaSpezialeTest.java diff --git a/samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/PizzaTest.java b/samples/client/others/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/PizzaTest.java similarity index 100% rename from samples/client/petstore/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/PizzaTest.java rename to samples/client/others/java/webclient-sealedInterface/src/test/java/org/openapitools/client/model/PizzaTest.java From 58eb0fe9090b250ebad84ec2a3982cc34b022d71 Mon Sep 17 00:00:00 2001 From: Mattias-Sehlstedt <60173714+Mattias-Sehlstedt@users.noreply.github.com> Date: Fri, 18 Jul 2025 14:14:47 +0200 Subject: [PATCH 5/8] Align documentation --- .../org/openapitools/codegen/languages/JavaClientCodegen.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java index 6e3d45c7530b..3bb308b425b9 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java @@ -259,7 +259,7 @@ public JavaClientCodegen() { cliOptions.add(CliOption.newBoolean(USE_ENUM_CASE_INSENSITIVE, "Use `equalsIgnoreCase` when String for enum comparison", useEnumCaseInsensitive)); cliOptions.add(CliOption.newBoolean(FAIL_ON_UNKNOWN_PROPERTIES, "Fail Jackson de-serialization on unknown properties", this.failOnUnknownProperties)); cliOptions.add(CliOption.newBoolean(SUPPORT_VERTX_FUTURE, "Also generate api methods that return a vertx Future instead of taking a callback. Only `vertx` supports this option. Requires vertx 4 or greater.", this.supportVertxFuture)); - cliOptions.add(CliOption.newBoolean(USE_SEALED_ONE_OF_INTERFACES, "Generate the oneOf interfaces as sealed interfaces", this.useSealedOneOfInterfaces)); + cliOptions.add(CliOption.newBoolean(USE_SEALED_ONE_OF_INTERFACES, "Generate the oneOf interfaces as sealed. Only supported for WebClient and RestClient.", this.useSealedOneOfInterfaces)); supportedLibraries.put(JERSEY2, "HTTP client: Jersey client 2.25.1. JSON processing: Jackson 2.17.1"); supportedLibraries.put(JERSEY3, "HTTP client: Jersey client 3.1.1. JSON processing: Jackson 2.17.1"); From 92a14596ba331eaeefa66d5ee7e0f6c35edaa730 Mon Sep 17 00:00:00 2001 From: Mattias-Sehlstedt <60173714+Mattias-Sehlstedt@users.noreply.github.com> Date: Fri, 18 Jul 2025 14:18:42 +0200 Subject: [PATCH 6/8] Update samples --- .../client/others/java/webclient-sealedInterface/build.gradle | 2 +- samples/client/others/java/webclient-sealedInterface/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/client/others/java/webclient-sealedInterface/build.gradle b/samples/client/others/java/webclient-sealedInterface/build.gradle index 49ad139b2047..5a16cb26a6e4 100644 --- a/samples/client/others/java/webclient-sealedInterface/build.gradle +++ b/samples/client/others/java/webclient-sealedInterface/build.gradle @@ -116,7 +116,7 @@ ext { jakarta_annotation_version = "1.3.5" beanvalidation_version = "2.0.2" reactor_version = "3.4.34" - reactor_netty_version = "1.0.39" + reactor_netty_version = "1.2.8" jackson_version = "2.17.1" jackson_databind_version = "2.17.1" jackson_databind_nullable_version = "0.2.6" diff --git a/samples/client/others/java/webclient-sealedInterface/pom.xml b/samples/client/others/java/webclient-sealedInterface/pom.xml index 549681480003..f5ac256f1009 100644 --- a/samples/client/others/java/webclient-sealedInterface/pom.xml +++ b/samples/client/others/java/webclient-sealedInterface/pom.xml @@ -126,7 +126,7 @@ 2.7.17 1.3.5 3.4.34 - 1.0.39 + 1.2.8 5.10.2 From da84f6b5f05e8dc9860d3be7bdbdb3cf16866bab Mon Sep 17 00:00:00 2001 From: Mattias-Sehlstedt <60173714+Mattias-Sehlstedt@users.noreply.github.com> Date: Fri, 18 Jul 2025 14:43:11 +0200 Subject: [PATCH 7/8] Align documentation --- docs/generators/java-microprofile.md | 1 + docs/generators/java.md | 2 +- .../org/openapitools/codegen/languages/JavaClientCodegen.java | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/generators/java-microprofile.md b/docs/generators/java-microprofile.md index a0b647c62e71..b928fb0f32e3 100644 --- a/docs/generators/java-microprofile.md +++ b/docs/generators/java-microprofile.md @@ -103,6 +103,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |useRuntimeException|Use RuntimeException instead of Exception. Only jersey2, jersey3, okhttp-gson, vertx, microprofile support this option.| |false| |useRxJava2|Whether to use the RxJava2 adapter with the retrofit2 library. IMPORTANT: This option has been deprecated.| |false| |useRxJava3|Whether to use the RxJava3 adapter with the retrofit2 library. IMPORTANT: This option has been deprecated.| |false| +|useSealedOneOfInterfaces|Generate the oneOf interfaces as sealed interfaces. Only supported for WebClient and RestClient.| |false| |useSingleRequestParameter|Setting this property to "true" will generate functions with a single argument containing all API endpoint parameters instead of one argument per parameter. ONLY native, jersey2, jersey3, okhttp-gson, microprofile, Spring RestClient, Spring WebClient support this option. Setting this property to "static" does the same as "true", but also makes the generated arguments class static with single parameter instantiation.| |false| |webclientBlockingOperations|Making all WebClient operations blocking(sync). Note that if on operation 'x-webclient-blocking: false' then such operation won't be sync| |false| |withAWSV4Signature|whether to include AWS v4 signature support (only available for okhttp-gson library)| |false| diff --git a/docs/generators/java.md b/docs/generators/java.md index 7e0ee3f03819..7c9ffca4760d 100644 --- a/docs/generators/java.md +++ b/docs/generators/java.md @@ -98,12 +98,12 @@ These options may be applied as additional-properties (cli) or configOptions (pl |useJakartaEe|whether to use Jakarta EE namespace instead of javax| |false| |useOneOfDiscriminatorLookup|Use the discriminator's mapping in oneOf to speed up the model lookup. IMPORTANT: Validation (e.g. one and only one match in oneOf's schemas) will be skipped. Only jersey2, jersey3, native, okhttp-gson support this option.| |false| |useOneOfInterfaces|whether to use a java interface to describe a set of oneOf options, where each option is a class that implements the interface| |false| -|useSealedOneOfInterfaces|Generate the oneOf interfaces as sealed interfaces. Only supported for WebClient and RestClient.| |false| |usePlayWS|Use Play! Async HTTP client (Play WS API)| |false| |useReflectionEqualsHashCode|Use org.apache.commons.lang3.builder for equals and hashCode in the models. WARNING: This will fail under a security manager, unless the appropriate permissions are set up correctly and also there's potential performance impact.| |false| |useRuntimeException|Use RuntimeException instead of Exception. Only jersey2, jersey3, okhttp-gson, vertx, microprofile support this option.| |false| |useRxJava2|Whether to use the RxJava2 adapter with the retrofit2 library. IMPORTANT: This option has been deprecated.| |false| |useRxJava3|Whether to use the RxJava3 adapter with the retrofit2 library. IMPORTANT: This option has been deprecated.| |false| +|useSealedOneOfInterfaces|Generate the oneOf interfaces as sealed interfaces. Only supported for WebClient and RestClient.| |false| |useSingleRequestParameter|Setting this property to "true" will generate functions with a single argument containing all API endpoint parameters instead of one argument per parameter. ONLY native, jersey2, jersey3, okhttp-gson, microprofile, Spring RestClient, Spring WebClient support this option. Setting this property to "static" does the same as "true", but also makes the generated arguments class static with single parameter instantiation.| |false| |webclientBlockingOperations|Making all WebClient operations blocking(sync). Note that if on operation 'x-webclient-blocking: false' then such operation won't be sync| |false| |withAWSV4Signature|whether to include AWS v4 signature support (only available for okhttp-gson library)| |false| diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java index 3bb308b425b9..5a847d0afc14 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java @@ -259,7 +259,7 @@ public JavaClientCodegen() { cliOptions.add(CliOption.newBoolean(USE_ENUM_CASE_INSENSITIVE, "Use `equalsIgnoreCase` when String for enum comparison", useEnumCaseInsensitive)); cliOptions.add(CliOption.newBoolean(FAIL_ON_UNKNOWN_PROPERTIES, "Fail Jackson de-serialization on unknown properties", this.failOnUnknownProperties)); cliOptions.add(CliOption.newBoolean(SUPPORT_VERTX_FUTURE, "Also generate api methods that return a vertx Future instead of taking a callback. Only `vertx` supports this option. Requires vertx 4 or greater.", this.supportVertxFuture)); - cliOptions.add(CliOption.newBoolean(USE_SEALED_ONE_OF_INTERFACES, "Generate the oneOf interfaces as sealed. Only supported for WebClient and RestClient.", this.useSealedOneOfInterfaces)); + cliOptions.add(CliOption.newBoolean(USE_SEALED_ONE_OF_INTERFACES, "Generate the oneOf interfaces as sealed interfaces. Only supported for WebClient and RestClient.", this.useSealedOneOfInterfaces)); supportedLibraries.put(JERSEY2, "HTTP client: Jersey client 2.25.1. JSON processing: Jackson 2.17.1"); supportedLibraries.put(JERSEY3, "HTTP client: Jersey client 3.1.1. JSON processing: Jackson 2.17.1"); From 146b2e2e3f5eb61020b87487b7f9f7405efbef29 Mon Sep 17 00:00:00 2001 From: Mattias-Sehlstedt <60173714+Mattias-Sehlstedt@users.noreply.github.com> Date: Fri, 18 Jul 2025 18:44:05 +0200 Subject: [PATCH 8/8] Update mustache files and samples to change gradle settings to java17 --- .../libraries/webclient/build.gradle.mustache | 16 ++++++++-------- .../java/webclient-sealedInterface/build.gradle | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/build.gradle.mustache index c3355f8f7331..cd72ef667f23 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/build.gradle.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/build.gradle.mustache @@ -32,14 +32,14 @@ if(hasProperty('target') && target == 'android') { } compileOptions { - {{#useJakartaEe}} + {{#java17}} sourceCompatibility JavaVersion.VERSION_17 targetCompatibility JavaVersion.VERSION_17 - {{/useJakartaEe}} - {{^useJakartaEe}} + {{/java17}} + {{^java17}} sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 - {{/useJakartaEe}} + {{/java17}} } // Rename the aar correctly @@ -84,14 +84,14 @@ if(hasProperty('target') && target == 'android') { apply plugin: 'java' apply plugin: 'maven-publish' - {{#useJakartaEe}} + {{#java17}} sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 - {{/useJakartaEe}} - {{^useJakartaEe}} + {{/java17}} + {{^java17}} sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 - {{/useJakartaEe}} + {{/java17}} publishing { publications { diff --git a/samples/client/others/java/webclient-sealedInterface/build.gradle b/samples/client/others/java/webclient-sealedInterface/build.gradle index 5a16cb26a6e4..4dcf6da4a0b6 100644 --- a/samples/client/others/java/webclient-sealedInterface/build.gradle +++ b/samples/client/others/java/webclient-sealedInterface/build.gradle @@ -32,8 +32,8 @@ if(hasProperty('target') && target == 'android') { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } // Rename the aar correctly @@ -78,8 +78,8 @@ if(hasProperty('target') && target == 'android') { apply plugin: 'java' apply plugin: 'maven-publish' - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 publishing { publications {