diff --git a/test-api-generator/citrus-test-api-generator-core/pom.xml b/test-api-generator/citrus-test-api-generator-core/pom.xml index 4681188d7e..5e1af11aa2 100644 --- a/test-api-generator/citrus-test-api-generator-core/pom.xml +++ b/test-api-generator/citrus-test-api-generator-core/pom.xml @@ -17,6 +17,10 @@ Citrus :: Test API Generator :: Core Generates a Citrus Test-API for OpenAPI and WSDL specifications. + + ${project.build.directory}/openapi-java-resources + + org.citrusframework @@ -118,6 +122,64 @@ + + org.apache.maven.plugins + maven-dependency-plugin + 3.7.1 + + + + org.openapitools + openapi-generator + ${org.openapitools.version} + Java/*Annotation*.mustache,Java/*Model*.mustache,Java/model*.mustache,Java/pojo*.mustache + + + + ${openapi-java-folder} + + + + + unpack-java-templates + generate-resources + + unpack + + + + + + + org.apache.maven.plugins + maven-resources-plugin + 3.3.1 + + + prepare-java-templates + process-resources + + copy-resources + + + ${project.build.outputDirectory}/java-citrus + + + + ${openapi-java-folder}/Java + + + + *.mustache + + + + + + + + + org.openapitools openapi-generator-maven-plugin diff --git a/test-api-generator/citrus-test-api-generator-core/src/main/java/org/citrusframework/openapi/generator/JavaCitrusCodegen.java b/test-api-generator/citrus-test-api-generator-core/src/main/java/org/citrusframework/openapi/generator/JavaCitrusCodegen.java index d62d4c1a9d..c624c885f6 100644 --- a/test-api-generator/citrus-test-api-generator-core/src/main/java/org/citrusframework/openapi/generator/JavaCitrusCodegen.java +++ b/test-api-generator/citrus-test-api-generator-core/src/main/java/org/citrusframework/openapi/generator/JavaCitrusCodegen.java @@ -85,6 +85,7 @@ public JavaCitrusCodegen() { // set default additionalProperties.put(API_TYPE, API_TYPE_REST); + additionalProperties.put("useJakartaEe", true); // add additional reserved words used in CitrusAbstractTestRequest and its base class to prevent name collisions Set reservedWordsTemp = reservedWords(); @@ -119,8 +120,7 @@ public JavaCitrusCodegen() { newString(API_ENDPOINT, "Which http client should be used (default " + httpClient + ").")); cliOptions.add( - newString( - API_TYPE, + newString(API_TYPE, "Specifies the type of API to be generated specify SOAP to generate a SOAP API. By default a REST API will be generated" ) ); @@ -135,10 +135,8 @@ public JavaCitrusCodegen() { newString(OPENAPI_SCHEMA, "Which OpenAPI schema should be used (default " + openapiSchema + ").")); cliOptions.add( - newString( - PREFIX, - "Add a prefix before the name of the files. First character should be upper case (default " - + apiPrefix + ")." + newString(PREFIX, + "Add a prefix before the name of the files. First character should be upper case (default " + apiPrefix + ")." ) ); cliOptions.add(newString(PREFIX, "The api prefix (default " + apiPrefix + ").")); diff --git a/test-api-generator/citrus-test-api-generator-core/src/main/resources/java-citrus/api.mustache b/test-api-generator/citrus-test-api-generator-core/src/main/resources/java-citrus/api.mustache index 36d6186da8..a023345fb7 100644 --- a/test-api-generator/citrus-test-api-generator-core/src/main/resources/java-citrus/api.mustache +++ b/test-api-generator/citrus-test-api-generator-core/src/main/resources/java-citrus/api.mustache @@ -1,28 +1,7 @@ -/* - * Copyright the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * ================================================== - * GENERATED CLASS, ALL CHANGES WILL BE LOST - * ================================================== - */ +{{>licenseInfo}} package {{package}}; -import jakarta.annotation.Generated; import org.citrusframework.testapi.GeneratedApi; import org.citrusframework.testapi.GeneratedApiRequest; import jakarta.servlet.http.Cookie; @@ -52,7 +31,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -@Generated(value = "org.citrusframework.openapi.generator.JavaCitrusCodegen") +{{>additionalModelTypeAnnotations}}{{>generatedAnnotation}}{{#discriminator}}{{>typeInfoAnnotation}}{{/discriminator}}{{>xmlAnnotation}} public class {{classname}} implements GeneratedApi { diff --git a/test-api-generator/citrus-test-api-generator-core/src/main/resources/java-citrus/api_soap.mustache b/test-api-generator/citrus-test-api-generator-core/src/main/resources/java-citrus/api_soap.mustache index 6db53348df..ba2f8d48a6 100644 --- a/test-api-generator/citrus-test-api-generator-core/src/main/resources/java-citrus/api_soap.mustache +++ b/test-api-generator/citrus-test-api-generator-core/src/main/resources/java-citrus/api_soap.mustache @@ -1,28 +1,7 @@ -/* - * Copyright the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * ================================================== - * GENERATED CLASS, ALL CHANGES WILL BE LOST - * ================================================== - */ +{{>licenseInfo}} package {{package}}; -import jakarta.annotation.Generated; import java.io.IOException; import java.util.HashMap; import java.util.Map; @@ -45,7 +24,7 @@ import org.springframework.util.CollectionUtils; import {{invokerPackage}}.citrus.{{prefix}}AbstractTestRequest; -@Generated(value = "org.citrusframework.openapi.generator.JavaCitrusCodegen") +{{>additionalModelTypeAnnotations}}{{>generatedAnnotation}}{{#discriminator}}{{>typeInfoAnnotation}}{{/discriminator}}{{>xmlAnnotation}} public class {{classname}} implements GeneratedApi { public static final {{classname}} INSTANCE = new {{classname}}(); diff --git a/test-api-generator/citrus-test-api-generator-core/src/main/resources/java-citrus/bean_configuration.mustache b/test-api-generator/citrus-test-api-generator-core/src/main/resources/java-citrus/bean_configuration.mustache index a895518c45..7bf35af55f 100644 --- a/test-api-generator/citrus-test-api-generator-core/src/main/resources/java-citrus/bean_configuration.mustache +++ b/test-api-generator/citrus-test-api-generator-core/src/main/resources/java-citrus/bean_configuration.mustache @@ -1,24 +1,4 @@ -/* - * Copyright the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * ================================================== - * GENERATED CLASS, ALL CHANGES WILL BE LOST - * ================================================== - */ +{{>licenseInfo}} package {{invokerPackage}}.spring; @@ -29,13 +9,12 @@ import static org.springframework.beans.factory.config.BeanDefinition.SCOPE_PROT import {{package}}.{{classname}}; {{/apis}} {{/apiInfo}} -import javax.annotation.processing.Generated; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Scope; @Configuration -@Generated(value = "org.citrusframework.openapi.generator.JavaCitrusCodegen") +{{>additionalModelTypeAnnotations}}{{>generatedAnnotation}}{{#discriminator}}{{>typeInfoAnnotation}}{{/discriminator}}{{>xmlAnnotation}} public class {{prefix}}BeanConfiguration { {{#apiInfo}} {{#apis}} diff --git a/test-api-generator/citrus-test-api-generator-core/src/main/resources/java-citrus/bean_definition_parser.mustache b/test-api-generator/citrus-test-api-generator-core/src/main/resources/java-citrus/bean_definition_parser.mustache index b6b205a521..01e502f284 100644 --- a/test-api-generator/citrus-test-api-generator-core/src/main/resources/java-citrus/bean_definition_parser.mustache +++ b/test-api-generator/citrus-test-api-generator-core/src/main/resources/java-citrus/bean_definition_parser.mustache @@ -1,24 +1,4 @@ -/* - * Copyright the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * ================================================== - * GENERATED CLASS, ALL CHANGES WILL BE LOST - * ================================================== - */ +{{>licenseInfo}} package {{invokerPackage}}.citrus; @@ -28,8 +8,6 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.annotation.processing.Generated; - import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; @@ -42,7 +20,7 @@ import org.w3c.dom.Attr; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; -@Generated(value = "org.citrusframework.openapi.generator.JavaCitrusCodegen") +{{>additionalModelTypeAnnotations}}{{>generatedAnnotation}}{{#discriminator}}{{>typeInfoAnnotation}}{{/discriminator}}{{>xmlAnnotation}} public class {{prefix}}BeanDefinitionParser implements BeanDefinitionParser { private static final String COOKIE = "cookie"; diff --git a/test-api-generator/citrus-test-api-generator-core/src/main/resources/java-citrus/licenseInfo.mustache b/test-api-generator/citrus-test-api-generator-core/src/main/resources/java-citrus/licenseInfo.mustache new file mode 100644 index 0000000000..c719a5151a --- /dev/null +++ b/test-api-generator/citrus-test-api-generator-core/src/main/resources/java-citrus/licenseInfo.mustache @@ -0,0 +1,15 @@ +/* +* Copyright the original author or authors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ \ No newline at end of file diff --git a/test-api-generator/citrus-test-api-generator-core/src/main/resources/java-citrus/model.mustache b/test-api-generator/citrus-test-api-generator-core/src/main/resources/java-citrus/model.mustache deleted file mode 100644 index d5341fea2c..0000000000 --- a/test-api-generator/citrus-test-api-generator-core/src/main/resources/java-citrus/model.mustache +++ /dev/null @@ -1 +0,0 @@ -// not in use diff --git a/test-api-generator/citrus-test-api-generator-core/src/main/resources/java-citrus/model_doc.mustache b/test-api-generator/citrus-test-api-generator-core/src/main/resources/java-citrus/model_doc.mustache deleted file mode 100644 index f8737ed4d9..0000000000 --- a/test-api-generator/citrus-test-api-generator-core/src/main/resources/java-citrus/model_doc.mustache +++ /dev/null @@ -1 +0,0 @@ -# not in use diff --git a/test-api-generator/citrus-test-api-generator-core/src/main/resources/java-citrus/namespace_handler.mustache b/test-api-generator/citrus-test-api-generator-core/src/main/resources/java-citrus/namespace_handler.mustache index 535f504b0b..8ca4a446da 100644 --- a/test-api-generator/citrus-test-api-generator-core/src/main/resources/java-citrus/namespace_handler.mustache +++ b/test-api-generator/citrus-test-api-generator-core/src/main/resources/java-citrus/namespace_handler.mustache @@ -1,24 +1,4 @@ -/* - * Copyright the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * ================================================== - * GENERATED CLASS, ALL CHANGES WILL BE LOST - * ================================================== - */ +{{>licenseInfo}} package {{invokerPackage}}.citrus.extension; @@ -29,11 +9,9 @@ import {{package}}.{{classname}}; {{/apiInfo}} import {{invokerPackage}}.citrus.{{prefix}}BeanDefinitionParser; -import javax.annotation.processing.Generated; - import org.springframework.beans.factory.xml.NamespaceHandlerSupport; -@Generated(value = "org.citrusframework.openapi.generator.JavaCitrusCodegen") +{{>additionalModelTypeAnnotations}}{{>generatedAnnotation}}{{#discriminator}}{{>typeInfoAnnotation}}{{/discriminator}}{{>xmlAnnotation}} public class {{prefix}}NamespaceHandler extends NamespaceHandlerSupport { @Override diff --git a/test-api-generator/citrus-test-api-generator-core/src/main/resources/java-citrus/test_base.mustache b/test-api-generator/citrus-test-api-generator-core/src/main/resources/java-citrus/test_base.mustache index a3de4774fb..be87ee214a 100644 --- a/test-api-generator/citrus-test-api-generator-core/src/main/resources/java-citrus/test_base.mustache +++ b/test-api-generator/citrus-test-api-generator-core/src/main/resources/java-citrus/test_base.mustache @@ -1,30 +1,9 @@ -/* - * Copyright the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * ================================================== - * GENERATED CLASS, ALL CHANGES WILL BE LOST - * ================================================== - */ +{{>licenseInfo}} package {{invokerPackage}}.citrus; import static org.springframework.util.CollectionUtils.isEmpty; -import jakarta.annotation.Generated; import jakarta.annotation.Nullable; import java.util.List; import java.util.Map; @@ -51,7 +30,7 @@ import org.slf4j.MarkerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -@Generated(value = "org.citrusframework.openapi.generator.JavaCitrusCodegen") +{{>additionalModelTypeAnnotations}}{{>generatedAnnotation}}{{#discriminator}}{{>typeInfoAnnotation}}{{/discriminator}}{{>xmlAnnotation}} public abstract class {{prefix}}AbstractTestRequest extends AbstractTestAction { protected final Marker coverageMarker = MarkerFactory.getMarker("{{#lambda.uppercase}}{{prefix}}{{/lambda.uppercase}}-API-COVERAGE"); diff --git a/test-api-generator/citrus-test-api-generator-core/src/main/resources/java-citrus/test_base_soap.mustache b/test-api-generator/citrus-test-api-generator-core/src/main/resources/java-citrus/test_base_soap.mustache index bd49969597..04f3c5568c 100644 --- a/test-api-generator/citrus-test-api-generator-core/src/main/resources/java-citrus/test_base_soap.mustache +++ b/test-api-generator/citrus-test-api-generator-core/src/main/resources/java-citrus/test_base_soap.mustache @@ -1,28 +1,7 @@ -/* - * Copyright the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * ================================================== - * GENERATED CLASS, ALL CHANGES WILL BE LOST - * ================================================== - */ +{{>licenseInfo}} package {{invokerPackage}}.citrus; -import jakarta.annotation.Generated; import java.util.List; import java.util.ServiceLoader; import org.citrusframework.actions.AbstractTestAction; @@ -48,7 +27,7 @@ import org.springframework.util.CollectionUtils; import javax.sql.DataSource; import java.util.Map; -@Generated(value = "org.citrusframework.openapi.generator.JavaCitrusCodegen") +{{>additionalModelTypeAnnotations}}{{>generatedAnnotation}}{{#discriminator}}{{>typeInfoAnnotation}}{{/discriminator}}{{>xmlAnnotation}} public abstract class {{prefix}}AbstractTestRequest extends AbstractTestAction { protected final Marker coverageMarker = MarkerFactory.getMarker("{{#lambda.uppercase}}{{prefix}}{{/lambda.uppercase}}-API-COVERAGE"); diff --git a/test-api-generator/citrus-test-api-generator-core/src/test/java/org/citrusframework/openapi/generator/GeneratedApiIT.java b/test-api-generator/citrus-test-api-generator-core/src/test/java/org/citrusframework/openapi/generator/GeneratedApiIT.java index 0240db1100..4ad6df823a 100644 --- a/test-api-generator/citrus-test-api-generator-core/src/test/java/org/citrusframework/openapi/generator/GeneratedApiIT.java +++ b/test-api-generator/citrus-test-api-generator-core/src/test/java/org/citrusframework/openapi/generator/GeneratedApiIT.java @@ -77,8 +77,10 @@ @ExtendWith({CitrusSpringExtension.class}) @SpringBootTest(classes = {CitrusSpringConfig.class, GeneratedApiIT.Config.class}) @TestPropertySource( - properties = {"applicationServiceClient.basic.username=Max Mustermann", - "applicationServiceClient.basic.password=Top secret"} + properties = { + "applicationServiceClient.basic.username=Max Mustermann", + "applicationServiceClient.basic.password=Top secret" + } ) class GeneratedApiIT { diff --git a/test-api-generator/citrus-test-api-generator-core/src/test/java/org/citrusframework/openapi/generator/JavaCitrusCodegenIT.java b/test-api-generator/citrus-test-api-generator-core/src/test/java/org/citrusframework/openapi/generator/JavaCitrusCodegenIT.java index 49230954ba..1d205f9400 100644 --- a/test-api-generator/citrus-test-api-generator-core/src/test/java/org/citrusframework/openapi/generator/JavaCitrusCodegenIT.java +++ b/test-api-generator/citrus-test-api-generator-core/src/test/java/org/citrusframework/openapi/generator/JavaCitrusCodegenIT.java @@ -1,12 +1,20 @@ package org.citrusframework.openapi.generator; +import static java.nio.file.Files.readString; +import static java.nio.file.Files.walk; import static org.assertj.core.api.Assertions.assertThat; +import static org.citrusframework.openapi.generator.JavaCitrusCodegenTest.getAbsoluteTargetDirectoryPath; +import static org.citrusframework.openapi.generator.JavaCitrusCodegenTest.getAbsoluteTestResourcePath; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.File; import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; import java.util.stream.Stream; import org.apache.commons.lang3.stream.Streams; import org.citrusframework.exceptions.CitrusRuntimeException; +import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; @@ -17,20 +25,41 @@ /** * This test case is designed to validate the consistency of the code generation process and detect * any discrepancies between the generated API files and the reference files stored in - * '/JavaCitrusCodegenIntegrationTest/expectedgen/'. It compares the results of API generation - * against the reference files, and a failure indicates potential changes in mustache templates or - * code generation logic. + * '/JavaCitrusCodegenIT/expectedgen/'. It compares the results of API generation against the + * reference files, and a failure indicates potential changes in mustache templates or code + * generation logic. *

* If this test fails, it is essential to review the code generation process and underlying * templates carefully. If the changes are intentional and verified, update the reference files by - * copying the generated API sources to the '/JavaCitrusCodegenIntegrationTest/expectedgen/' - * directory. To ensure accurate copying, without unwanted code formatting, use a simple File - * Explorer instead of relying on IDE-based operations. + * copying the generated API sources to the '/JavaCitrusCodegenIT/expectedgen/' directory. To ensure + * accurate copying, without unwanted code formatting, use a simple File Explorer instead of relying + * on IDE-based operations. */ class JavaCitrusCodegenIT { + public static final String BASE_PACKAGE = "org/citrusframework/openapi/generator"; + + private static long countFilesRecursively(Path dir) throws IOException { + try (Stream walk = walk(dir)) { + return walk.filter(Files::isRegularFile).count(); + } + } + + @Test + void noAdditionalFiles() throws IOException { + long expectedFileCount = countFilesRecursively( + Path.of(getAbsoluteTestResourcePath( + BASE_PACKAGE + "/JavaCitrusCodegenIT/expectedgen/rest"))); + long actualFileCount = countFilesRecursively( + Path.of(getAbsoluteTargetDirectoryPath( + "generated-test-sources/" + BASE_PACKAGE + "/rest"))); + + assertEquals(expectedFileCount, actualFileCount, + "Directories do not have the same number of files."); + } + static Stream getResourcesForRest() throws IOException { - return geClassResourcesIgnoringInnerClasses("org/citrusframework/openapi/generator/rest"); + return geClassResourcesIgnoringInnerClasses(BASE_PACKAGE + "/rest"); } @ParameterizedTest @@ -38,7 +67,8 @@ static Stream getResourcesForRest() throws IOException { void testGeneratedFiles(Resource resource) throws IOException { File classFile = resource.getFile(); String absolutePath = classFile.getAbsolutePath(); - String javaFilePath = absolutePath.replace("test-classes", "generated-test-sources") + String javaFilePath = absolutePath + .replace("test-classes", "generated-test-sources") .replace(".class", ".java"); assertFileContent(new File(javaFilePath), "rest"); @@ -46,7 +76,7 @@ void testGeneratedFiles(Resource resource) throws IOException { static Stream getResourcesForSoap() throws IOException { return geClassResourcesIgnoringInnerClasses( - "org/citrusframework/openapi/generator/soap/bookservice"); + BASE_PACKAGE + "/soap/bookservice"); } @ParameterizedTest @@ -55,7 +85,8 @@ void testGeneratedSoapFiles(Resource resource) throws IOException { File classFile = resource.getFile(); String absolutePath = classFile.getAbsolutePath(); - String javaFilePath = absolutePath.replace("test-classes", "generated-test-sources") + String javaFilePath = absolutePath + .replace("test-classes", "generated-test-sources") .replace(".class", ".java"); assertFileContent(new File(javaFilePath), "soap"); @@ -63,29 +94,39 @@ void testGeneratedSoapFiles(Resource resource) throws IOException { private static Stream geClassResourcesIgnoringInnerClasses(String path) throws IOException { - return Streams.of(new PathMatchingResourcePatternResolver().getResources( - path + "/**/*.class")).filter(resource -> { - try { - return !resource.getURI().toString().contains("$"); - } catch (Exception e) { - throw new CitrusRuntimeException("Unable to retrieve URL from resource!"); - } - }).map(Arguments::arguments); + return Streams.of( + new PathMatchingResourcePatternResolver().getResources(path + "/**/*.class")) + .filter(resource -> { + try { + return !resource.getURI().toString().contains("$"); + } catch (Exception e) { + throw new CitrusRuntimeException("Unable to retrieve URL from resource!"); + } + } + ).map(Arguments::arguments); } + /* + * NOTE: when changes have been performed to mustache templates, the expected files need to be updated. + * Be aware that file content may change according to IDE formatting rules if the files are copied via IDE. + * Files should therefore be copied using a file explorer which ensures that content of files does not change. + */ private void assertFileContent(File file, String apiDir) throws IOException { assertThat(file).exists(); - String expectedFilePath = - "org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/" - + file.getAbsolutePath().substring(file.getAbsolutePath().indexOf(apiDir)); + String expectedFilePath = BASE_PACKAGE + "/JavaCitrusCodegenIT/expectedgen/" + file.getAbsolutePath().substring(file.getAbsolutePath().indexOf(apiDir)); ClassPathResource classPathResource = new ClassPathResource(expectedFilePath); - /* - * NOTE: when changes have been performed to mustache templates, the expected files need to be updated. - * Be aware that file content may change according to IDE formatting rules if the files are copied via IDE. - * Files should therefore be copied using a file explorer which ensures that content of files does not change. - */ - assertThat(file).hasSameTextualContentAs(classPathResource.getFile()); + String actualContent = readString(file.toPath()); + String expectedContent = readString(classPathResource.getFile().toPath()); + + // Replace "Generated" with a placeholder + String generatedAnnotationPattern = "@jakarta\\.annotation\\.Generated\\(.*?\\)"; + String placeholder = "@jakarta.annotation.Generated(value = \"org.citrusframework.openapi.generator.JavaCitrusCodegen\", date = \"TIMESTAMP\", comments = \"Generator version: VERSION\")"; + + actualContent = actualContent.replaceAll(generatedAnnotationPattern, placeholder); + expectedContent = expectedContent.replaceAll(generatedAnnotationPattern, placeholder); + + assertThat(actualContent).isEqualTo(expectedContent); } } diff --git a/test-api-generator/citrus-test-api-generator-core/src/test/java/org/citrusframework/openapi/generator/JavaCitrusCodegenTest.java b/test-api-generator/citrus-test-api-generator-core/src/test/java/org/citrusframework/openapi/generator/JavaCitrusCodegenTest.java index 9c6874c5de..f3860de3b4 100644 --- a/test-api-generator/citrus-test-api-generator-core/src/test/java/org/citrusframework/openapi/generator/JavaCitrusCodegenTest.java +++ b/test-api-generator/citrus-test-api-generator-core/src/test/java/org/citrusframework/openapi/generator/JavaCitrusCodegenTest.java @@ -39,8 +39,8 @@ class JavaCitrusCodegenTest { * @param pathToFileInTestResources The file within {@code src/test/resources} to look for * @return the absolute path to the file */ - private String getTestResource(String pathToFileInTestResources) { - URL resourceUrl = getClass().getClassLoader().getResource(pathToFileInTestResources); + static String getAbsoluteTestResourcePath(String pathToFileInTestResources) { + URL resourceUrl = JavaCitrusCodegenTest.class.getClassLoader().getResource(pathToFileInTestResources); assert resourceUrl != null; File inputSpecFile = new File(resourceUrl.getFile()); return inputSpecFile.getAbsolutePath(); @@ -52,7 +52,7 @@ private String getTestResource(String pathToFileInTestResources) { * @param pathToFileInTargetDirectory The file within {@code target} to look for * @return the absolute path to the file */ - private static String getAbsoluteTargetDirectoryPath(String pathToFileInTargetDirectory) { + static String getAbsoluteTargetDirectoryPath(String pathToFileInTargetDirectory) { String projectBaseDir = System.getProperty("user.dir"); // Base directory of the project File outputDirFile = new File(projectBaseDir, "target/" + pathToFileInTargetDirectory); return outputDirFile.getAbsolutePath(); @@ -109,7 +109,7 @@ void areAdditionalPropertiesProcessedTest() { @Test void areReservedWordsEscapedTest() throws IOException { - String absoluteInputSpecPath = getTestResource("apis/petstore_reservedWords.yaml"); + String absoluteInputSpecPath = getAbsoluteTestResourcePath("apis/petstore_reservedWords.yaml"); String absoluteOutputDirPath = getAbsoluteTargetDirectoryPath("JavaCitrusCodegenTest/petstore_escapedWords"); final CodegenConfigurator configurator = new CodegenConfigurator() @@ -121,7 +121,8 @@ void areReservedWordsEscapedTest() throws IOException { DefaultGenerator generator = new DefaultGenerator(); List outputFiles = generator.opts(clientOptInput).generate(); - Optional file = outputFiles.stream().filter(x -> "PetApi.java".equals(x.getName())) + Optional file = outputFiles.stream() + .filter(x -> "PetApi.java".equals(x.getName())) .findFirst(); assertThat(file).isPresent(); @@ -129,12 +130,16 @@ void areReservedWordsEscapedTest() throws IOException { List lines = Files.readAllLines(file.get().toPath(), StandardCharsets.UTF_8); // "name" is a reserved word, so it should be escaped with an underline for the second parameter - assertThat(lines.stream().filter(x -> x.contains("\"name\", this._name")).count()).isEqualTo(1L); + assertThat( + lines.stream() + .filter(x -> x.contains("\"name\", this._name")) + .count()) + .isEqualTo(1L); } @Test void arePathParamsFieldsPresent() throws IOException { - String absoluteInputSpecPath = getTestResource("apis/petstore.yaml"); + String absoluteInputSpecPath = getAbsoluteTestResourcePath("apis/petstore.yaml"); String absoluteOutputDirPath = getAbsoluteTargetDirectoryPath("JavaCitrusCodegenTest/petstore"); final CodegenConfigurator configurator = new CodegenConfigurator() @@ -146,7 +151,8 @@ void arePathParamsFieldsPresent() throws IOException { DefaultGenerator generator = new DefaultGenerator(); List outputFiles = generator.opts(clientOptInput).generate(); - Optional file = outputFiles.stream().filter(x -> "PetApi.java".equals(x.getName())) + Optional file = outputFiles.stream() + .filter(x -> "PetApi.java".equals(x.getName())) .findFirst(); assertThat(file).isPresent(); @@ -154,15 +160,22 @@ void arePathParamsFieldsPresent() throws IOException { List lines = Files.readAllLines(file.get().toPath(), StandardCharsets.UTF_8); // "name" is a reserved word, so it should be escaped with an underline for the second parameter - assertThat(lines.stream().filter(x -> x.contains("private String petId;")).count()).isEqualTo(4L); - assertThat(lines.stream().filter( - x -> x.contains("endpoint = endpoint.replace(\"{\" + \"petId\" + \"}\", petId);")) - .count()).isEqualTo(4L); + assertThat( + lines.stream() + .filter(x -> x.contains("private String petId;")) + .count()) + .isEqualTo(4L); + assertThat( + lines.stream() + .filter(x -> x.contains( + "endpoint = endpoint.replace(\"{\" + \"petId\" + \"}\", petId);")) + .count()) + .isEqualTo(4L); } @Test void areBasicAuthFieldsPresent() throws IOException { - String absoluteInputSpecPath = getTestResource("apis/petstore.yaml"); + String absoluteInputSpecPath = getAbsoluteTestResourcePath("apis/petstore.yaml"); String absoluteOutputDirPath = getAbsoluteTargetDirectoryPath("JavaCitrusCodegenTest/petstore"); final CodegenConfigurator configurator = new CodegenConfigurator() @@ -174,7 +187,8 @@ void areBasicAuthFieldsPresent() throws IOException { DefaultGenerator generator = new DefaultGenerator(); List outputFiles = generator.opts(clientOptInput).generate(); - Optional file = outputFiles.stream().filter(x -> "PetApi.java".equals(x.getName())) + Optional file = outputFiles.stream() + .filter(x -> "PetApi.java".equals(x.getName())) .findFirst(); assertThat(file).isPresent(); @@ -182,20 +196,24 @@ void areBasicAuthFieldsPresent() throws IOException { List lines = Files.readAllLines(file.get().toPath(), StandardCharsets.UTF_8); // "name" is a reserved word, so it should be escaped with an underline for the second parameter - assertThat(lines.stream() - .filter(x -> x.contains("@Value(\"${\" + \"apiEndpoint.basic.username:#{null}}\")")) - .count()).isEqualTo(1L); assertThat( - lines.stream().filter(x -> x.contains("private String basicUsername;")).count()).isEqualTo(1L); + lines.stream() + .filter(x -> x.contains("@Value(\"${\" + \"apiEndpoint.basic.username:#{null}}\")")) + .count()) + .isEqualTo(1L); + assertThat( + lines.stream() + .filter(x -> x.contains("private String basicUsername;")) + .count()) + .isEqualTo(1L); assertThat( - lines - .stream() + lines.stream() .filter(x -> x.contains( "messageBuilderSupport.header(\"Authorization\", \"Basic \" + Base64.getEncoder().encodeToString((context.replaceDynamicContentInString(basicUsername)+\":\"+context.replaceDynamicContentInString(basicPassword)).getBytes()));" ) ) - .count() - ).isEqualTo(1L); + .count()) + .isEqualTo(1L); } } diff --git a/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/multiparttest/citrus/MultipartTestAbstractTestRequest.java b/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/multiparttest/citrus/MultipartTestAbstractTestRequest.java similarity index 91% rename from test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/multiparttest/citrus/MultipartTestAbstractTestRequest.java rename to test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/multiparttest/citrus/MultipartTestAbstractTestRequest.java index 01092606ba..d66cc3aa30 100644 --- a/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/multiparttest/citrus/MultipartTestAbstractTestRequest.java +++ b/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/multiparttest/citrus/MultipartTestAbstractTestRequest.java @@ -1,30 +1,23 @@ /* - * Copyright the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * ================================================== - * GENERATED CLASS, ALL CHANGES WILL BE LOST - * ================================================== - */ +* Copyright the original author or authors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ package org.citrusframework.openapi.generator.rest.multiparttest.citrus; import static org.springframework.util.CollectionUtils.isEmpty; -import jakarta.annotation.Generated; import jakarta.annotation.Nullable; import java.util.List; import java.util.Map; @@ -51,7 +44,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -@Generated(value = "org.citrusframework.openapi.generator.JavaCitrusCodegen") +@jakarta.annotation.Generated(value = "org.citrusframework.openapi.generator.JavaCitrusCodegen", date = "2024-07-03T15:24:46.388350800+02:00[Europe/Zurich]", comments = "Generator version: 7.5.0") public abstract class MultipartTestAbstractTestRequest extends AbstractTestAction { protected final Marker coverageMarker = MarkerFactory.getMarker("MULTIPARTTEST-API-COVERAGE"); diff --git a/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/multiparttest/citrus/MultipartTestBeanDefinitionParser.java b/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/multiparttest/citrus/MultipartTestBeanDefinitionParser.java similarity index 92% rename from test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/multiparttest/citrus/MultipartTestBeanDefinitionParser.java rename to test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/multiparttest/citrus/MultipartTestBeanDefinitionParser.java index 37df5ee8b9..1102147b82 100644 --- a/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/multiparttest/citrus/MultipartTestBeanDefinitionParser.java +++ b/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/multiparttest/citrus/MultipartTestBeanDefinitionParser.java @@ -1,24 +1,18 @@ /* - * Copyright the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * ================================================== - * GENERATED CLASS, ALL CHANGES WILL BE LOST - * ================================================== - */ +* Copyright the original author or authors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ package org.citrusframework.openapi.generator.rest.multiparttest.citrus; @@ -28,8 +22,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.annotation.processing.Generated; - import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; @@ -42,7 +34,7 @@ import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; -@Generated(value = "org.citrusframework.openapi.generator.JavaCitrusCodegen") +@jakarta.annotation.Generated(value = "org.citrusframework.openapi.generator.JavaCitrusCodegen", date = "2024-07-03T15:24:46.388350800+02:00[Europe/Zurich]", comments = "Generator version: 7.5.0") public class MultipartTestBeanDefinitionParser implements BeanDefinitionParser { private static final String COOKIE = "cookie"; diff --git a/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/multiparttest/citrus/extension/MultipartTestNamespaceHandler.java b/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/multiparttest/citrus/extension/MultipartTestNamespaceHandler.java similarity index 61% rename from test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/multiparttest/citrus/extension/MultipartTestNamespaceHandler.java rename to test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/multiparttest/citrus/extension/MultipartTestNamespaceHandler.java index 4517c7a801..edd3e67e73 100644 --- a/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/multiparttest/citrus/extension/MultipartTestNamespaceHandler.java +++ b/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/multiparttest/citrus/extension/MultipartTestNamespaceHandler.java @@ -1,35 +1,27 @@ /* - * Copyright the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * ================================================== - * GENERATED CLASS, ALL CHANGES WILL BE LOST - * ================================================== - */ +* Copyright the original author or authors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ package org.citrusframework.openapi.generator.rest.multiparttest.citrus.extension; import org.citrusframework.openapi.generator.rest.multiparttest.request.MultiparttestControllerApi; import org.citrusframework.openapi.generator.rest.multiparttest.citrus.MultipartTestBeanDefinitionParser; -import javax.annotation.processing.Generated; - import org.springframework.beans.factory.xml.NamespaceHandlerSupport; -@Generated(value = "org.citrusframework.openapi.generator.JavaCitrusCodegen") +@jakarta.annotation.Generated(value = "org.citrusframework.openapi.generator.JavaCitrusCodegen", date = "2024-07-03T15:24:46.388350800+02:00[Europe/Zurich]", comments = "Generator version: 7.5.0") public class MultipartTestNamespaceHandler extends NamespaceHandlerSupport { @Override diff --git a/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/multiparttest/model/Metadata.java b/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/multiparttest/model/Metadata.java new file mode 100644 index 0000000000..dbd2bcb664 --- /dev/null +++ b/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/multiparttest/model/Metadata.java @@ -0,0 +1,294 @@ +/* +* Copyright the original author or authors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +package org.citrusframework.openapi.generator.rest.multiparttest.model; + +import java.util.Objects; +import java.util.Arrays; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.time.OffsetDateTime; +import java.util.HashMap; +import java.util.Map; + +/** + * Metadata + */ +@jakarta.annotation.Generated(value = "org.citrusframework.openapi.generator.JavaCitrusCodegen", date = "2024-07-03T15:24:46.388350800+02:00[Europe/Zurich]", comments = "Generator version: 7.5.0") +public class Metadata { + private Map userMetadata = new HashMap<>(); + + private Map rawMetadata = new HashMap<>(); + + private OffsetDateTime httpExpiresDate; + + private OffsetDateTime expirationTime; + + private String expirationTimeRuleId; + + private Boolean ongoingRestore; + + private OffsetDateTime restoreExpirationTime; + + private Boolean bucketKeyEnabled; + + public Metadata() { + } + + public Metadata userMetadata(Map userMetadata) { + + this.userMetadata = userMetadata; + return this; + } + + public Metadata putUserMetadataItem(String key, String userMetadataItem) { + if (this.userMetadata == null) { + this.userMetadata = new HashMap<>(); + } + this.userMetadata.put(key, userMetadataItem); + return this; + } + + /** + * Get userMetadata + * @return userMetadata + **/ + @jakarta.annotation.Nullable + + public Map getUserMetadata() { + return userMetadata; + } + + + public void setUserMetadata(Map userMetadata) { + this.userMetadata = userMetadata; + } + + + public Metadata rawMetadata(Map rawMetadata) { + + this.rawMetadata = rawMetadata; + return this; + } + + public Metadata putRawMetadataItem(String key, String rawMetadataItem) { + if (this.rawMetadata == null) { + this.rawMetadata = new HashMap<>(); + } + this.rawMetadata.put(key, rawMetadataItem); + return this; + } + + /** + * Get rawMetadata + * @return rawMetadata + **/ + @jakarta.annotation.Nullable + + public Map getRawMetadata() { + return rawMetadata; + } + + + public void setRawMetadata(Map rawMetadata) { + this.rawMetadata = rawMetadata; + } + + + public Metadata httpExpiresDate(OffsetDateTime httpExpiresDate) { + + this.httpExpiresDate = httpExpiresDate; + return this; + } + + /** + * Get httpExpiresDate + * @return httpExpiresDate + **/ + @jakarta.annotation.Nullable + + public OffsetDateTime getHttpExpiresDate() { + return httpExpiresDate; + } + + + public void setHttpExpiresDate(OffsetDateTime httpExpiresDate) { + this.httpExpiresDate = httpExpiresDate; + } + + + public Metadata expirationTime(OffsetDateTime expirationTime) { + + this.expirationTime = expirationTime; + return this; + } + + /** + * Get expirationTime + * @return expirationTime + **/ + @jakarta.annotation.Nullable + + public OffsetDateTime getExpirationTime() { + return expirationTime; + } + + + public void setExpirationTime(OffsetDateTime expirationTime) { + this.expirationTime = expirationTime; + } + + + public Metadata expirationTimeRuleId(String expirationTimeRuleId) { + + this.expirationTimeRuleId = expirationTimeRuleId; + return this; + } + + /** + * Get expirationTimeRuleId + * @return expirationTimeRuleId + **/ + @jakarta.annotation.Nullable + + public String getExpirationTimeRuleId() { + return expirationTimeRuleId; + } + + + public void setExpirationTimeRuleId(String expirationTimeRuleId) { + this.expirationTimeRuleId = expirationTimeRuleId; + } + + + public Metadata ongoingRestore(Boolean ongoingRestore) { + + this.ongoingRestore = ongoingRestore; + return this; + } + + /** + * Get ongoingRestore + * @return ongoingRestore + **/ + @jakarta.annotation.Nullable + + public Boolean getOngoingRestore() { + return ongoingRestore; + } + + + public void setOngoingRestore(Boolean ongoingRestore) { + this.ongoingRestore = ongoingRestore; + } + + + public Metadata restoreExpirationTime(OffsetDateTime restoreExpirationTime) { + + this.restoreExpirationTime = restoreExpirationTime; + return this; + } + + /** + * Get restoreExpirationTime + * @return restoreExpirationTime + **/ + @jakarta.annotation.Nullable + + public OffsetDateTime getRestoreExpirationTime() { + return restoreExpirationTime; + } + + + public void setRestoreExpirationTime(OffsetDateTime restoreExpirationTime) { + this.restoreExpirationTime = restoreExpirationTime; + } + + + public Metadata bucketKeyEnabled(Boolean bucketKeyEnabled) { + + this.bucketKeyEnabled = bucketKeyEnabled; + return this; + } + + /** + * Get bucketKeyEnabled + * @return bucketKeyEnabled + **/ + @jakarta.annotation.Nullable + + public Boolean getBucketKeyEnabled() { + return bucketKeyEnabled; + } + + + public void setBucketKeyEnabled(Boolean bucketKeyEnabled) { + this.bucketKeyEnabled = bucketKeyEnabled; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Metadata metadata = (Metadata) o; + return Objects.equals(this.userMetadata, metadata.userMetadata) && + Objects.equals(this.rawMetadata, metadata.rawMetadata) && + Objects.equals(this.httpExpiresDate, metadata.httpExpiresDate) && + Objects.equals(this.expirationTime, metadata.expirationTime) && + Objects.equals(this.expirationTimeRuleId, metadata.expirationTimeRuleId) && + Objects.equals(this.ongoingRestore, metadata.ongoingRestore) && + Objects.equals(this.restoreExpirationTime, metadata.restoreExpirationTime) && + Objects.equals(this.bucketKeyEnabled, metadata.bucketKeyEnabled); + } + + @Override + public int hashCode() { + return Objects.hash(userMetadata, rawMetadata, httpExpiresDate, expirationTime, expirationTimeRuleId, ongoingRestore, restoreExpirationTime, bucketKeyEnabled); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class Metadata {\n"); + sb.append(" userMetadata: ").append(toIndentedString(userMetadata)).append("\n"); + sb.append(" rawMetadata: ").append(toIndentedString(rawMetadata)).append("\n"); + sb.append(" httpExpiresDate: ").append(toIndentedString(httpExpiresDate)).append("\n"); + sb.append(" expirationTime: ").append(toIndentedString(expirationTime)).append("\n"); + sb.append(" expirationTimeRuleId: ").append(toIndentedString(expirationTimeRuleId)).append("\n"); + sb.append(" ongoingRestore: ").append(toIndentedString(ongoingRestore)).append("\n"); + sb.append(" restoreExpirationTime: ").append(toIndentedString(restoreExpirationTime)).append("\n"); + sb.append(" bucketKeyEnabled: ").append(toIndentedString(bucketKeyEnabled)).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/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/multiparttest/model/PutObjectResult.java b/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/multiparttest/model/PutObjectResult.java new file mode 100644 index 0000000000..8e3abaa146 --- /dev/null +++ b/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/multiparttest/model/PutObjectResult.java @@ -0,0 +1,251 @@ +/* +* Copyright the original author or authors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +package org.citrusframework.openapi.generator.rest.multiparttest.model; + +import java.util.Objects; +import java.util.Arrays; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.time.OffsetDateTime; +import org.citrusframework.openapi.generator.rest.multiparttest.model.Metadata; + +/** + * PutObjectResult + */ +@jakarta.annotation.Generated(value = "org.citrusframework.openapi.generator.JavaCitrusCodegen", date = "2024-07-03T15:24:46.388350800+02:00[Europe/Zurich]", comments = "Generator version: 7.5.0") +public class PutObjectResult { + private String versionId; + + private String eTag; + + private OffsetDateTime expirationTime; + + private String expirationTimeRuleId; + + private String contentMd5; + + private Metadata metadata; + + private Boolean isRequesterCharged; + + public PutObjectResult() { + } + + public PutObjectResult versionId(String versionId) { + + this.versionId = versionId; + return this; + } + + /** + * Get versionId + * @return versionId + **/ + @jakarta.annotation.Nullable + + public String getVersionId() { + return versionId; + } + + + public void setVersionId(String versionId) { + this.versionId = versionId; + } + + + public PutObjectResult eTag(String eTag) { + + this.eTag = eTag; + return this; + } + + /** + * Get eTag + * @return eTag + **/ + @jakarta.annotation.Nullable + + public String geteTag() { + return eTag; + } + + + public void seteTag(String eTag) { + this.eTag = eTag; + } + + + public PutObjectResult expirationTime(OffsetDateTime expirationTime) { + + this.expirationTime = expirationTime; + return this; + } + + /** + * Get expirationTime + * @return expirationTime + **/ + @jakarta.annotation.Nullable + + public OffsetDateTime getExpirationTime() { + return expirationTime; + } + + + public void setExpirationTime(OffsetDateTime expirationTime) { + this.expirationTime = expirationTime; + } + + + public PutObjectResult expirationTimeRuleId(String expirationTimeRuleId) { + + this.expirationTimeRuleId = expirationTimeRuleId; + return this; + } + + /** + * Get expirationTimeRuleId + * @return expirationTimeRuleId + **/ + @jakarta.annotation.Nullable + + public String getExpirationTimeRuleId() { + return expirationTimeRuleId; + } + + + public void setExpirationTimeRuleId(String expirationTimeRuleId) { + this.expirationTimeRuleId = expirationTimeRuleId; + } + + + public PutObjectResult contentMd5(String contentMd5) { + + this.contentMd5 = contentMd5; + return this; + } + + /** + * Get contentMd5 + * @return contentMd5 + **/ + @jakarta.annotation.Nullable + + public String getContentMd5() { + return contentMd5; + } + + + public void setContentMd5(String contentMd5) { + this.contentMd5 = contentMd5; + } + + + public PutObjectResult metadata(Metadata metadata) { + + this.metadata = metadata; + return this; + } + + /** + * Get metadata + * @return metadata + **/ + @jakarta.annotation.Nullable + + public Metadata getMetadata() { + return metadata; + } + + + public void setMetadata(Metadata metadata) { + this.metadata = metadata; + } + + + public PutObjectResult isRequesterCharged(Boolean isRequesterCharged) { + + this.isRequesterCharged = isRequesterCharged; + return this; + } + + /** + * Get isRequesterCharged + * @return isRequesterCharged + **/ + @jakarta.annotation.Nullable + + public Boolean getIsRequesterCharged() { + return isRequesterCharged; + } + + + public void setIsRequesterCharged(Boolean isRequesterCharged) { + this.isRequesterCharged = isRequesterCharged; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + PutObjectResult putObjectResult = (PutObjectResult) o; + return Objects.equals(this.versionId, putObjectResult.versionId) && + Objects.equals(this.eTag, putObjectResult.eTag) && + Objects.equals(this.expirationTime, putObjectResult.expirationTime) && + Objects.equals(this.expirationTimeRuleId, putObjectResult.expirationTimeRuleId) && + Objects.equals(this.contentMd5, putObjectResult.contentMd5) && + Objects.equals(this.metadata, putObjectResult.metadata) && + Objects.equals(this.isRequesterCharged, putObjectResult.isRequesterCharged); + } + + @Override + public int hashCode() { + return Objects.hash(versionId, eTag, expirationTime, expirationTimeRuleId, contentMd5, metadata, isRequesterCharged); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class PutObjectResult {\n"); + sb.append(" versionId: ").append(toIndentedString(versionId)).append("\n"); + sb.append(" eTag: ").append(toIndentedString(eTag)).append("\n"); + sb.append(" expirationTime: ").append(toIndentedString(expirationTime)).append("\n"); + sb.append(" expirationTimeRuleId: ").append(toIndentedString(expirationTimeRuleId)).append("\n"); + sb.append(" contentMd5: ").append(toIndentedString(contentMd5)).append("\n"); + sb.append(" metadata: ").append(toIndentedString(metadata)).append("\n"); + sb.append(" isRequesterCharged: ").append(toIndentedString(isRequesterCharged)).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/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/multiparttest/request/MultiparttestControllerApi.java b/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/multiparttest/request/MultiparttestControllerApi.java similarity index 97% rename from test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/multiparttest/request/MultiparttestControllerApi.java rename to test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/multiparttest/request/MultiparttestControllerApi.java index 7ced338bb8..85f1b174b2 100644 --- a/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/multiparttest/request/MultiparttestControllerApi.java +++ b/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/multiparttest/request/MultiparttestControllerApi.java @@ -1,28 +1,21 @@ /* - * Copyright the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * ================================================== - * GENERATED CLASS, ALL CHANGES WILL BE LOST - * ================================================== - */ +* Copyright the original author or authors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ package org.citrusframework.openapi.generator.rest.multiparttest.request; -import jakarta.annotation.Generated; import org.citrusframework.testapi.GeneratedApi; import org.citrusframework.testapi.GeneratedApiRequest; import jakarta.servlet.http.Cookie; @@ -52,7 +45,7 @@ import java.util.Map; import java.util.stream.Collectors; -@Generated(value = "org.citrusframework.openapi.generator.JavaCitrusCodegen") +@jakarta.annotation.Generated(value = "org.citrusframework.openapi.generator.JavaCitrusCodegen", date = "2024-07-03T15:24:46.388350800+02:00[Europe/Zurich]", comments = "Generator version: 7.5.0") public class MultiparttestControllerApi implements GeneratedApi { diff --git a/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/multiparttest/spring/MultipartTestBeanConfiguration.java b/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/multiparttest/spring/MultipartTestBeanConfiguration.java similarity index 65% rename from test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/multiparttest/spring/MultipartTestBeanConfiguration.java rename to test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/multiparttest/spring/MultipartTestBeanConfiguration.java index d93b11f104..d5fd2b4a60 100644 --- a/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/multiparttest/spring/MultipartTestBeanConfiguration.java +++ b/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/multiparttest/spring/MultipartTestBeanConfiguration.java @@ -1,37 +1,30 @@ /* - * Copyright the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * ================================================== - * GENERATED CLASS, ALL CHANGES WILL BE LOST - * ================================================== - */ +* Copyright the original author or authors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ package org.citrusframework.openapi.generator.rest.multiparttest.spring; import static org.springframework.beans.factory.config.BeanDefinition.SCOPE_PROTOTYPE; import org.citrusframework.openapi.generator.rest.multiparttest.request.MultiparttestControllerApi; -import javax.annotation.processing.Generated; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Scope; @Configuration -@Generated(value = "org.citrusframework.openapi.generator.JavaCitrusCodegen") +@jakarta.annotation.Generated(value = "org.citrusframework.openapi.generator.JavaCitrusCodegen", date = "2024-07-03T15:24:46.388350800+02:00[Europe/Zurich]", comments = "Generator version: 7.5.0") public class MultipartTestBeanConfiguration { @Bean diff --git a/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/petstore/citrus/PetStoreAbstractTestRequest.java b/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/petstore/citrus/PetStoreAbstractTestRequest.java similarity index 91% rename from test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/petstore/citrus/PetStoreAbstractTestRequest.java rename to test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/petstore/citrus/PetStoreAbstractTestRequest.java index 29a409ea85..222b2f239f 100644 --- a/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/petstore/citrus/PetStoreAbstractTestRequest.java +++ b/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/petstore/citrus/PetStoreAbstractTestRequest.java @@ -1,30 +1,23 @@ /* - * Copyright the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * ================================================== - * GENERATED CLASS, ALL CHANGES WILL BE LOST - * ================================================== - */ +* Copyright the original author or authors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ package org.citrusframework.openapi.generator.rest.petstore.citrus; import static org.springframework.util.CollectionUtils.isEmpty; -import jakarta.annotation.Generated; import jakarta.annotation.Nullable; import java.util.List; import java.util.Map; @@ -51,7 +44,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -@Generated(value = "org.citrusframework.openapi.generator.JavaCitrusCodegen") +@jakarta.annotation.Generated(value = "org.citrusframework.openapi.generator.JavaCitrusCodegen", date = "2024-07-03T15:24:45.610010900+02:00[Europe/Zurich]", comments = "Generator version: 7.5.0") public abstract class PetStoreAbstractTestRequest extends AbstractTestAction { protected final Marker coverageMarker = MarkerFactory.getMarker("PETSTORE-API-COVERAGE"); diff --git a/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/petstore/citrus/PetStoreBeanDefinitionParser.java b/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/petstore/citrus/PetStoreBeanDefinitionParser.java similarity index 92% rename from test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/petstore/citrus/PetStoreBeanDefinitionParser.java rename to test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/petstore/citrus/PetStoreBeanDefinitionParser.java index f7ee721e6c..d1018d8efb 100644 --- a/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/petstore/citrus/PetStoreBeanDefinitionParser.java +++ b/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/petstore/citrus/PetStoreBeanDefinitionParser.java @@ -1,24 +1,18 @@ /* - * Copyright the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * ================================================== - * GENERATED CLASS, ALL CHANGES WILL BE LOST - * ================================================== - */ +* Copyright the original author or authors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ package org.citrusframework.openapi.generator.rest.petstore.citrus; @@ -28,8 +22,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.annotation.processing.Generated; - import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; @@ -42,7 +34,7 @@ import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; -@Generated(value = "org.citrusframework.openapi.generator.JavaCitrusCodegen") +@jakarta.annotation.Generated(value = "org.citrusframework.openapi.generator.JavaCitrusCodegen", date = "2024-07-03T15:24:45.610010900+02:00[Europe/Zurich]", comments = "Generator version: 7.5.0") public class PetStoreBeanDefinitionParser implements BeanDefinitionParser { private static final String COOKIE = "cookie"; diff --git a/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/petstore/citrus/extension/PetStoreNamespaceHandler.java b/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/petstore/citrus/extension/PetStoreNamespaceHandler.java similarity index 78% rename from test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/petstore/citrus/extension/PetStoreNamespaceHandler.java rename to test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/petstore/citrus/extension/PetStoreNamespaceHandler.java index b7bb6298c1..ac9e93f527 100644 --- a/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/petstore/citrus/extension/PetStoreNamespaceHandler.java +++ b/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/petstore/citrus/extension/PetStoreNamespaceHandler.java @@ -1,24 +1,18 @@ /* - * Copyright the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * ================================================== - * GENERATED CLASS, ALL CHANGES WILL BE LOST - * ================================================== - */ +* Copyright the original author or authors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ package org.citrusframework.openapi.generator.rest.petstore.citrus.extension; @@ -27,11 +21,9 @@ import org.citrusframework.openapi.generator.rest.petstore.request.UserApi; import org.citrusframework.openapi.generator.rest.petstore.citrus.PetStoreBeanDefinitionParser; -import javax.annotation.processing.Generated; - import org.springframework.beans.factory.xml.NamespaceHandlerSupport; -@Generated(value = "org.citrusframework.openapi.generator.JavaCitrusCodegen") +@jakarta.annotation.Generated(value = "org.citrusframework.openapi.generator.JavaCitrusCodegen", date = "2024-07-03T15:24:45.610010900+02:00[Europe/Zurich]", comments = "Generator version: 7.5.0") public class PetStoreNamespaceHandler extends NamespaceHandlerSupport { @Override diff --git a/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/petstore/model/Category.java b/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/petstore/model/Category.java new file mode 100644 index 0000000000..e53e2d9247 --- /dev/null +++ b/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/petstore/model/Category.java @@ -0,0 +1,119 @@ +/* +* Copyright the original author or authors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +package org.citrusframework.openapi.generator.rest.petstore.model; + +import java.util.Objects; +import java.util.Arrays; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * A category for a pet + */ +@jakarta.annotation.Generated(value = "org.citrusframework.openapi.generator.JavaCitrusCodegen", date = "2024-07-03T15:24:45.610010900+02:00[Europe/Zurich]", comments = "Generator version: 7.5.0") +public class Category { + private Long id; + + private String _name; + + public Category() { + } + + public Category id(Long id) { + + this.id = id; + return this; + } + + /** + * Get id + * @return id + **/ + @jakarta.annotation.Nullable + + public Long getId() { + return id; + } + + + public void setId(Long id) { + this.id = id; + } + + + public Category _name(String _name) { + + this._name = _name; + return this; + } + + /** + * Get _name + * @return _name + **/ + @jakarta.annotation.Nullable + + public String getName() { + return _name; + } + + + public void setName(String _name) { + this._name = _name; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Category category = (Category) o; + return Objects.equals(this.id, category.id) && + Objects.equals(this._name, category._name); + } + + @Override + public int hashCode() { + return Objects.hash(id, _name); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class Category {\n"); + sb.append(" id: ").append(toIndentedString(id)).append("\n"); + sb.append(" _name: ").append(toIndentedString(_name)).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/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/petstore/model/ModelApiResponse.java b/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/petstore/model/ModelApiResponse.java new file mode 100644 index 0000000000..c75502f466 --- /dev/null +++ b/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/petstore/model/ModelApiResponse.java @@ -0,0 +1,145 @@ +/* +* Copyright the original author or authors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +package org.citrusframework.openapi.generator.rest.petstore.model; + +import java.util.Objects; +import java.util.Arrays; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * Describes the result of uploading an image resource + */ +@jakarta.annotation.Generated(value = "org.citrusframework.openapi.generator.JavaCitrusCodegen", date = "2024-07-03T15:24:45.610010900+02:00[Europe/Zurich]", comments = "Generator version: 7.5.0") +public class ModelApiResponse { + private Integer code; + + private String _type; + + private String message; + + public ModelApiResponse() { + } + + public ModelApiResponse code(Integer code) { + + this.code = code; + return this; + } + + /** + * Get code + * @return code + **/ + @jakarta.annotation.Nullable + + public Integer getCode() { + return code; + } + + + public void setCode(Integer code) { + this.code = code; + } + + + public ModelApiResponse _type(String _type) { + + this._type = _type; + return this; + } + + /** + * Get _type + * @return _type + **/ + @jakarta.annotation.Nullable + + public String getType() { + return _type; + } + + + public void setType(String _type) { + this._type = _type; + } + + + public ModelApiResponse message(String message) { + + this.message = message; + return this; + } + + /** + * Get message + * @return message + **/ + @jakarta.annotation.Nullable + + public String getMessage() { + return message; + } + + + public void setMessage(String message) { + this.message = message; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ModelApiResponse _apiResponse = (ModelApiResponse) o; + return Objects.equals(this.code, _apiResponse.code) && + Objects.equals(this._type, _apiResponse._type) && + Objects.equals(this.message, _apiResponse.message); + } + + @Override + public int hashCode() { + return Objects.hash(code, _type, message); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ModelApiResponse {\n"); + sb.append(" code: ").append(toIndentedString(code)).append("\n"); + sb.append(" _type: ").append(toIndentedString(_type)).append("\n"); + sb.append(" message: ").append(toIndentedString(message)).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/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/petstore/model/Order.java b/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/petstore/model/Order.java new file mode 100644 index 0000000000..e35a75223b --- /dev/null +++ b/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/petstore/model/Order.java @@ -0,0 +1,259 @@ +/* +* Copyright the original author or authors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +package org.citrusframework.openapi.generator.rest.petstore.model; + +import java.util.Objects; +import java.util.Arrays; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.time.OffsetDateTime; + +/** + * An order for a pets from the pet store + */ +@jakarta.annotation.Generated(value = "org.citrusframework.openapi.generator.JavaCitrusCodegen", date = "2024-07-03T15:24:45.610010900+02:00[Europe/Zurich]", comments = "Generator version: 7.5.0") +public class Order { + private Long id; + + private Long petId; + + private Integer quantity; + + private OffsetDateTime shipDate; + + /** + * Order Status + */ + public enum StatusEnum { + PLACED("placed"), + + APPROVED("approved"), + + DELIVERED("delivered"); + + private String value; + + StatusEnum(String value) { + this.value = value; + } + + public String getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + public static StatusEnum fromValue(String value) { + for (StatusEnum b : StatusEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + + private StatusEnum status; + + private Boolean complete = false; + + public Order() { + } + + public Order id(Long id) { + + this.id = id; + return this; + } + + /** + * Get id + * @return id + **/ + @jakarta.annotation.Nullable + + public Long getId() { + return id; + } + + + public void setId(Long id) { + this.id = id; + } + + + public Order petId(Long petId) { + + this.petId = petId; + return this; + } + + /** + * Get petId + * @return petId + **/ + @jakarta.annotation.Nullable + + public Long getPetId() { + return petId; + } + + + public void setPetId(Long petId) { + this.petId = petId; + } + + + public Order quantity(Integer quantity) { + + this.quantity = quantity; + return this; + } + + /** + * Get quantity + * @return quantity + **/ + @jakarta.annotation.Nullable + + public Integer getQuantity() { + return quantity; + } + + + public void setQuantity(Integer quantity) { + this.quantity = quantity; + } + + + public Order shipDate(OffsetDateTime shipDate) { + + this.shipDate = shipDate; + return this; + } + + /** + * Get shipDate + * @return shipDate + **/ + @jakarta.annotation.Nullable + + public OffsetDateTime getShipDate() { + return shipDate; + } + + + public void setShipDate(OffsetDateTime shipDate) { + this.shipDate = shipDate; + } + + + public Order status(StatusEnum status) { + + this.status = status; + return this; + } + + /** + * Order Status + * @return status + **/ + @jakarta.annotation.Nullable + + public StatusEnum getStatus() { + return status; + } + + + public void setStatus(StatusEnum status) { + this.status = status; + } + + + public Order complete(Boolean complete) { + + this.complete = complete; + return this; + } + + /** + * Get complete + * @return complete + **/ + @jakarta.annotation.Nullable + + public Boolean getComplete() { + return complete; + } + + + public void setComplete(Boolean complete) { + this.complete = complete; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Order order = (Order) o; + return Objects.equals(this.id, order.id) && + Objects.equals(this.petId, order.petId) && + Objects.equals(this.quantity, order.quantity) && + Objects.equals(this.shipDate, order.shipDate) && + Objects.equals(this.status, order.status) && + Objects.equals(this.complete, order.complete); + } + + @Override + public int hashCode() { + return Objects.hash(id, petId, quantity, shipDate, status, complete); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class Order {\n"); + sb.append(" id: ").append(toIndentedString(id)).append("\n"); + sb.append(" petId: ").append(toIndentedString(petId)).append("\n"); + sb.append(" quantity: ").append(toIndentedString(quantity)).append("\n"); + sb.append(" shipDate: ").append(toIndentedString(shipDate)).append("\n"); + sb.append(" status: ").append(toIndentedString(status)).append("\n"); + sb.append(" complete: ").append(toIndentedString(complete)).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/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/petstore/model/Pet.java b/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/petstore/model/Pet.java new file mode 100644 index 0000000000..ae8a438c5a --- /dev/null +++ b/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/petstore/model/Pet.java @@ -0,0 +1,279 @@ +/* +* Copyright the original author or authors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +package org.citrusframework.openapi.generator.rest.petstore.model; + +import java.util.Objects; +import java.util.Arrays; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import org.citrusframework.openapi.generator.rest.petstore.model.Category; +import org.citrusframework.openapi.generator.rest.petstore.model.Tag; + +/** + * A pet for sale in the pet store + */ +@jakarta.annotation.Generated(value = "org.citrusframework.openapi.generator.JavaCitrusCodegen", date = "2024-07-03T15:24:45.610010900+02:00[Europe/Zurich]", comments = "Generator version: 7.5.0") +public class Pet { + private Long id; + + private Category category; + + private String _name; + + private List photoUrls = new ArrayList<>(); + + private List tags = new ArrayList<>(); + + /** + * pet status in the store + */ + public enum StatusEnum { + AVAILABLE("available"), + + PENDING("pending"), + + SOLD("sold"); + + private String value; + + StatusEnum(String value) { + this.value = value; + } + + public String getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + public static StatusEnum fromValue(String value) { + for (StatusEnum b : StatusEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + + private StatusEnum status; + + public Pet() { + } + + public Pet id(Long id) { + + this.id = id; + return this; + } + + /** + * Get id + * @return id + **/ + @jakarta.annotation.Nullable + + public Long getId() { + return id; + } + + + public void setId(Long id) { + this.id = id; + } + + + public Pet category(Category category) { + + this.category = category; + return this; + } + + /** + * Get category + * @return category + **/ + @jakarta.annotation.Nullable + + public Category getCategory() { + return category; + } + + + public void setCategory(Category category) { + this.category = category; + } + + + public Pet _name(String _name) { + + this._name = _name; + return this; + } + + /** + * Get _name + * @return _name + **/ + @jakarta.annotation.Nonnull + + public String getName() { + return _name; + } + + + public void setName(String _name) { + this._name = _name; + } + + + public Pet photoUrls(List photoUrls) { + + this.photoUrls = photoUrls; + return this; + } + + public Pet addPhotoUrlsItem(String photoUrlsItem) { + if (this.photoUrls == null) { + this.photoUrls = new ArrayList<>(); + } + this.photoUrls.add(photoUrlsItem); + return this; + } + + /** + * Get photoUrls + * @return photoUrls + **/ + @jakarta.annotation.Nonnull + + public List getPhotoUrls() { + return photoUrls; + } + + + public void setPhotoUrls(List photoUrls) { + this.photoUrls = photoUrls; + } + + + public Pet tags(List tags) { + + this.tags = tags; + return this; + } + + public Pet addTagsItem(Tag tagsItem) { + if (this.tags == null) { + this.tags = new ArrayList<>(); + } + this.tags.add(tagsItem); + return this; + } + + /** + * Get tags + * @return tags + **/ + @jakarta.annotation.Nullable + + public List getTags() { + return tags; + } + + + public void setTags(List tags) { + this.tags = tags; + } + + + public Pet status(StatusEnum status) { + + this.status = status; + return this; + } + + /** + * pet status in the store + * @return status + **/ + @jakarta.annotation.Nullable + + public StatusEnum getStatus() { + return status; + } + + + public void setStatus(StatusEnum status) { + this.status = status; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Pet pet = (Pet) o; + return Objects.equals(this.id, pet.id) && + Objects.equals(this.category, pet.category) && + Objects.equals(this._name, pet._name) && + Objects.equals(this.photoUrls, pet.photoUrls) && + Objects.equals(this.tags, pet.tags) && + Objects.equals(this.status, pet.status); + } + + @Override + public int hashCode() { + return Objects.hash(id, category, _name, photoUrls, tags, status); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class Pet {\n"); + sb.append(" id: ").append(toIndentedString(id)).append("\n"); + sb.append(" category: ").append(toIndentedString(category)).append("\n"); + sb.append(" _name: ").append(toIndentedString(_name)).append("\n"); + sb.append(" photoUrls: ").append(toIndentedString(photoUrls)).append("\n"); + sb.append(" tags: ").append(toIndentedString(tags)).append("\n"); + sb.append(" status: ").append(toIndentedString(status)).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/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/petstore/model/Tag.java b/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/petstore/model/Tag.java new file mode 100644 index 0000000000..aefcc664e3 --- /dev/null +++ b/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/petstore/model/Tag.java @@ -0,0 +1,119 @@ +/* +* Copyright the original author or authors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +package org.citrusframework.openapi.generator.rest.petstore.model; + +import java.util.Objects; +import java.util.Arrays; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * A tag for a pet + */ +@jakarta.annotation.Generated(value = "org.citrusframework.openapi.generator.JavaCitrusCodegen", date = "2024-07-03T15:24:45.610010900+02:00[Europe/Zurich]", comments = "Generator version: 7.5.0") +public class Tag { + private Long id; + + private String _name; + + public Tag() { + } + + public Tag id(Long id) { + + this.id = id; + return this; + } + + /** + * Get id + * @return id + **/ + @jakarta.annotation.Nullable + + public Long getId() { + return id; + } + + + public void setId(Long id) { + this.id = id; + } + + + public Tag _name(String _name) { + + this._name = _name; + return this; + } + + /** + * Get _name + * @return _name + **/ + @jakarta.annotation.Nullable + + public String getName() { + return _name; + } + + + public void setName(String _name) { + this._name = _name; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Tag tag = (Tag) o; + return Objects.equals(this.id, tag.id) && + Objects.equals(this._name, tag._name); + } + + @Override + public int hashCode() { + return Objects.hash(id, _name); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class Tag {\n"); + sb.append(" id: ").append(toIndentedString(id)).append("\n"); + sb.append(" _name: ").append(toIndentedString(_name)).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/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/petstore/model/User.java b/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/petstore/model/User.java new file mode 100644 index 0000000000..3581497dda --- /dev/null +++ b/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/petstore/model/User.java @@ -0,0 +1,275 @@ +/* +* Copyright the original author or authors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ + +package org.citrusframework.openapi.generator.rest.petstore.model; + +import java.util.Objects; +import java.util.Arrays; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * A User who is purchasing from the pet store + */ +@jakarta.annotation.Generated(value = "org.citrusframework.openapi.generator.JavaCitrusCodegen", date = "2024-07-03T15:24:45.610010900+02:00[Europe/Zurich]", comments = "Generator version: 7.5.0") +public class User { + private Long id; + + private String username; + + private String firstName; + + private String lastName; + + private String email; + + private String password; + + private String phone; + + private Integer userStatus; + + public User() { + } + + public User id(Long id) { + + this.id = id; + return this; + } + + /** + * Get id + * @return id + **/ + @jakarta.annotation.Nullable + + public Long getId() { + return id; + } + + + public void setId(Long id) { + this.id = id; + } + + + public User username(String username) { + + this.username = username; + return this; + } + + /** + * Get username + * @return username + **/ + @jakarta.annotation.Nullable + + public String getUsername() { + return username; + } + + + public void setUsername(String username) { + this.username = username; + } + + + public User firstName(String firstName) { + + this.firstName = firstName; + return this; + } + + /** + * Get firstName + * @return firstName + **/ + @jakarta.annotation.Nullable + + public String getFirstName() { + return firstName; + } + + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + + public User lastName(String lastName) { + + this.lastName = lastName; + return this; + } + + /** + * Get lastName + * @return lastName + **/ + @jakarta.annotation.Nullable + + public String getLastName() { + return lastName; + } + + + public void setLastName(String lastName) { + this.lastName = lastName; + } + + + public User email(String email) { + + this.email = email; + return this; + } + + /** + * Get email + * @return email + **/ + @jakarta.annotation.Nullable + + public String getEmail() { + return email; + } + + + public void setEmail(String email) { + this.email = email; + } + + + public User password(String password) { + + this.password = password; + return this; + } + + /** + * Get password + * @return password + **/ + @jakarta.annotation.Nullable + + public String getPassword() { + return password; + } + + + public void setPassword(String password) { + this.password = password; + } + + + public User phone(String phone) { + + this.phone = phone; + return this; + } + + /** + * Get phone + * @return phone + **/ + @jakarta.annotation.Nullable + + public String getPhone() { + return phone; + } + + + public void setPhone(String phone) { + this.phone = phone; + } + + + public User userStatus(Integer userStatus) { + + this.userStatus = userStatus; + return this; + } + + /** + * User Status + * @return userStatus + **/ + @jakarta.annotation.Nullable + + public Integer getUserStatus() { + return userStatus; + } + + + public void setUserStatus(Integer userStatus) { + this.userStatus = userStatus; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + User user = (User) o; + return Objects.equals(this.id, user.id) && + Objects.equals(this.username, user.username) && + Objects.equals(this.firstName, user.firstName) && + Objects.equals(this.lastName, user.lastName) && + Objects.equals(this.email, user.email) && + Objects.equals(this.password, user.password) && + Objects.equals(this.phone, user.phone) && + Objects.equals(this.userStatus, user.userStatus); + } + + @Override + public int hashCode() { + return Objects.hash(id, username, firstName, lastName, email, password, phone, userStatus); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class User {\n"); + sb.append(" id: ").append(toIndentedString(id)).append("\n"); + sb.append(" username: ").append(toIndentedString(username)).append("\n"); + sb.append(" firstName: ").append(toIndentedString(firstName)).append("\n"); + sb.append(" lastName: ").append(toIndentedString(lastName)).append("\n"); + sb.append(" email: ").append(toIndentedString(email)).append("\n"); + sb.append(" password: ").append(toIndentedString(password)).append("\n"); + sb.append(" phone: ").append(toIndentedString(phone)).append("\n"); + sb.append(" userStatus: ").append(toIndentedString(userStatus)).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/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/petstore/request/PetApi.java b/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/petstore/request/PetApi.java similarity index 97% rename from test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/petstore/request/PetApi.java rename to test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/petstore/request/PetApi.java index 570912da01..41a154158e 100644 --- a/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/petstore/request/PetApi.java +++ b/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/petstore/request/PetApi.java @@ -1,28 +1,21 @@ /* - * Copyright the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * ================================================== - * GENERATED CLASS, ALL CHANGES WILL BE LOST - * ================================================== - */ +* Copyright the original author or authors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ package org.citrusframework.openapi.generator.rest.petstore.request; -import jakarta.annotation.Generated; import org.citrusframework.testapi.GeneratedApi; import org.citrusframework.testapi.GeneratedApiRequest; import jakarta.servlet.http.Cookie; @@ -52,7 +45,7 @@ import java.util.Map; import java.util.stream.Collectors; -@Generated(value = "org.citrusframework.openapi.generator.JavaCitrusCodegen") +@jakarta.annotation.Generated(value = "org.citrusframework.openapi.generator.JavaCitrusCodegen", date = "2024-07-03T15:24:45.610010900+02:00[Europe/Zurich]", comments = "Generator version: 7.5.0") public class PetApi implements GeneratedApi { diff --git a/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/petstore/request/StoreApi.java b/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/petstore/request/StoreApi.java similarity index 95% rename from test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/petstore/request/StoreApi.java rename to test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/petstore/request/StoreApi.java index b7d6754a4f..db50a61387 100644 --- a/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/petstore/request/StoreApi.java +++ b/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/petstore/request/StoreApi.java @@ -1,28 +1,21 @@ /* - * Copyright the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * ================================================== - * GENERATED CLASS, ALL CHANGES WILL BE LOST - * ================================================== - */ +* Copyright the original author or authors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ package org.citrusframework.openapi.generator.rest.petstore.request; -import jakarta.annotation.Generated; import org.citrusframework.testapi.GeneratedApi; import org.citrusframework.testapi.GeneratedApiRequest; import jakarta.servlet.http.Cookie; @@ -52,7 +45,7 @@ import java.util.Map; import java.util.stream.Collectors; -@Generated(value = "org.citrusframework.openapi.generator.JavaCitrusCodegen") +@jakarta.annotation.Generated(value = "org.citrusframework.openapi.generator.JavaCitrusCodegen", date = "2024-07-03T15:24:45.610010900+02:00[Europe/Zurich]", comments = "Generator version: 7.5.0") public class StoreApi implements GeneratedApi { diff --git a/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/petstore/request/UserApi.java b/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/petstore/request/UserApi.java similarity index 97% rename from test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/petstore/request/UserApi.java rename to test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/petstore/request/UserApi.java index 7c89b95787..6b07c599a5 100644 --- a/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/petstore/request/UserApi.java +++ b/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/petstore/request/UserApi.java @@ -1,28 +1,21 @@ /* - * Copyright the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * ================================================== - * GENERATED CLASS, ALL CHANGES WILL BE LOST - * ================================================== - */ +* Copyright the original author or authors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ package org.citrusframework.openapi.generator.rest.petstore.request; -import jakarta.annotation.Generated; import org.citrusframework.testapi.GeneratedApi; import org.citrusframework.testapi.GeneratedApiRequest; import jakarta.servlet.http.Cookie; @@ -52,7 +45,7 @@ import java.util.Map; import java.util.stream.Collectors; -@Generated(value = "org.citrusframework.openapi.generator.JavaCitrusCodegen") +@jakarta.annotation.Generated(value = "org.citrusframework.openapi.generator.JavaCitrusCodegen", date = "2024-07-03T15:24:45.610010900+02:00[Europe/Zurich]", comments = "Generator version: 7.5.0") public class UserApi implements GeneratedApi { diff --git a/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/petstore/spring/PetStoreBeanConfiguration.java b/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/petstore/spring/PetStoreBeanConfiguration.java similarity index 80% rename from test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/petstore/spring/PetStoreBeanConfiguration.java rename to test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/petstore/spring/PetStoreBeanConfiguration.java index bf6750e796..9b31309e7a 100644 --- a/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/petstore/spring/PetStoreBeanConfiguration.java +++ b/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/rest/petstore/spring/PetStoreBeanConfiguration.java @@ -1,24 +1,18 @@ /* - * Copyright the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * ================================================== - * GENERATED CLASS, ALL CHANGES WILL BE LOST - * ================================================== - */ +* Copyright the original author or authors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ package org.citrusframework.openapi.generator.rest.petstore.spring; @@ -27,13 +21,12 @@ import org.citrusframework.openapi.generator.rest.petstore.request.PetApi; import org.citrusframework.openapi.generator.rest.petstore.request.StoreApi; import org.citrusframework.openapi.generator.rest.petstore.request.UserApi; -import javax.annotation.processing.Generated; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Scope; @Configuration -@Generated(value = "org.citrusframework.openapi.generator.JavaCitrusCodegen") +@jakarta.annotation.Generated(value = "org.citrusframework.openapi.generator.JavaCitrusCodegen", date = "2024-07-03T15:24:45.610010900+02:00[Europe/Zurich]", comments = "Generator version: 7.5.0") public class PetStoreBeanConfiguration { @Bean diff --git a/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/soap/bookservice/citrus/OpenApiFromWsdlAbstractTestRequest.java b/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/soap/bookservice/citrus/OpenApiFromWsdlAbstractTestRequest.java similarity index 89% rename from test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/soap/bookservice/citrus/OpenApiFromWsdlAbstractTestRequest.java rename to test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/soap/bookservice/citrus/OpenApiFromWsdlAbstractTestRequest.java index 4e493250fc..78cc8b5bcf 100644 --- a/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/soap/bookservice/citrus/OpenApiFromWsdlAbstractTestRequest.java +++ b/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/soap/bookservice/citrus/OpenApiFromWsdlAbstractTestRequest.java @@ -1,28 +1,21 @@ /* - * Copyright the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * ================================================== - * GENERATED CLASS, ALL CHANGES WILL BE LOST - * ================================================== - */ +* Copyright the original author or authors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ package org.citrusframework.openapi.generator.soap.bookservice.citrus; -import jakarta.annotation.Generated; import java.util.List; import java.util.ServiceLoader; import org.citrusframework.actions.AbstractTestAction; @@ -48,7 +41,7 @@ import javax.sql.DataSource; import java.util.Map; -@Generated(value = "org.citrusframework.openapi.generator.JavaCitrusCodegen") +@jakarta.annotation.Generated(value = "org.citrusframework.openapi.generator.JavaCitrusCodegen", date = "2024-07-03T15:24:46.256348400+02:00[Europe/Zurich]", comments = "Generator version: 7.5.0") public abstract class OpenApiFromWsdlAbstractTestRequest extends AbstractTestAction { protected final Marker coverageMarker = MarkerFactory.getMarker("OPENAPIFROMWSDL-API-COVERAGE"); diff --git a/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/soap/bookservice/citrus/OpenApiFromWsdlBeanDefinitionParser.java b/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/soap/bookservice/citrus/OpenApiFromWsdlBeanDefinitionParser.java similarity index 92% rename from test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/soap/bookservice/citrus/OpenApiFromWsdlBeanDefinitionParser.java rename to test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/soap/bookservice/citrus/OpenApiFromWsdlBeanDefinitionParser.java index 6bb955eb0b..e777f4608c 100644 --- a/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/soap/bookservice/citrus/OpenApiFromWsdlBeanDefinitionParser.java +++ b/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/soap/bookservice/citrus/OpenApiFromWsdlBeanDefinitionParser.java @@ -1,24 +1,18 @@ /* - * Copyright the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * ================================================== - * GENERATED CLASS, ALL CHANGES WILL BE LOST - * ================================================== - */ +* Copyright the original author or authors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ package org.citrusframework.openapi.generator.soap.bookservice.citrus; @@ -28,8 +22,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.annotation.processing.Generated; - import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; @@ -42,7 +34,7 @@ import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; -@Generated(value = "org.citrusframework.openapi.generator.JavaCitrusCodegen") +@jakarta.annotation.Generated(value = "org.citrusframework.openapi.generator.JavaCitrusCodegen", date = "2024-07-03T15:24:46.256348400+02:00[Europe/Zurich]", comments = "Generator version: 7.5.0") public class OpenApiFromWsdlBeanDefinitionParser implements BeanDefinitionParser { private static final String COOKIE = "cookie"; diff --git a/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/soap/bookservice/citrus/extension/OpenApiFromWsdlNamespaceHandler.java b/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/soap/bookservice/citrus/extension/OpenApiFromWsdlNamespaceHandler.java similarity index 50% rename from test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/soap/bookservice/citrus/extension/OpenApiFromWsdlNamespaceHandler.java rename to test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/soap/bookservice/citrus/extension/OpenApiFromWsdlNamespaceHandler.java index 9c2f110274..6454ee52fa 100644 --- a/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/soap/bookservice/citrus/extension/OpenApiFromWsdlNamespaceHandler.java +++ b/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/soap/bookservice/citrus/extension/OpenApiFromWsdlNamespaceHandler.java @@ -1,35 +1,27 @@ /* - * Copyright the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * ================================================== - * GENERATED CLASS, ALL CHANGES WILL BE LOST - * ================================================== - */ +* Copyright the original author or authors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ package org.citrusframework.openapi.generator.soap.bookservice.citrus.extension; import org.citrusframework.openapi.generator.soap.bookservice.request.BookServiceSoapApi; import org.citrusframework.openapi.generator.soap.bookservice.citrus.OpenApiFromWsdlBeanDefinitionParser; -import javax.annotation.processing.Generated; - import org.springframework.beans.factory.xml.NamespaceHandlerSupport; -@Generated(value = "org.citrusframework.openapi.generator.JavaCitrusCodegen") +@jakarta.annotation.Generated(value = "org.citrusframework.openapi.generator.JavaCitrusCodegen", date = "2024-07-03T15:24:46.256348400+02:00[Europe/Zurich]", comments = "Generator version: 7.5.0") public class OpenApiFromWsdlNamespaceHandler extends NamespaceHandlerSupport { @Override diff --git a/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/soap/bookservice/request/BookServiceSoapApi.java b/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/soap/bookservice/request/BookServiceSoapApi.java similarity index 93% rename from test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/soap/bookservice/request/BookServiceSoapApi.java rename to test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/soap/bookservice/request/BookServiceSoapApi.java index f253418eec..ae5505df35 100644 --- a/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/soap/bookservice/request/BookServiceSoapApi.java +++ b/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/soap/bookservice/request/BookServiceSoapApi.java @@ -1,28 +1,21 @@ /* - * Copyright the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * ================================================== - * GENERATED CLASS, ALL CHANGES WILL BE LOST - * ================================================== - */ +* Copyright the original author or authors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ package org.citrusframework.openapi.generator.soap.bookservice.request; -import jakarta.annotation.Generated; import java.io.IOException; import java.util.HashMap; import java.util.Map; @@ -45,7 +38,7 @@ import org.citrusframework.openapi.generator.soap.bookservice.citrus.OpenApiFromWsdlAbstractTestRequest; -@Generated(value = "org.citrusframework.openapi.generator.JavaCitrusCodegen") +@jakarta.annotation.Generated(value = "org.citrusframework.openapi.generator.JavaCitrusCodegen", date = "2024-07-03T15:24:46.256348400+02:00[Europe/Zurich]", comments = "Generator version: 7.5.0") public class BookServiceSoapApi implements GeneratedApi { public static final BookServiceSoapApi INSTANCE = new BookServiceSoapApi(); diff --git a/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/soap/bookservice/spring/OpenApiFromWsdlBeanConfiguration.java b/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/soap/bookservice/spring/OpenApiFromWsdlBeanConfiguration.java similarity index 52% rename from test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/soap/bookservice/spring/OpenApiFromWsdlBeanConfiguration.java rename to test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/soap/bookservice/spring/OpenApiFromWsdlBeanConfiguration.java index 919d03669b..b1bfeaee9d 100644 --- a/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/soap/bookservice/spring/OpenApiFromWsdlBeanConfiguration.java +++ b/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIT/expectedgen/soap/bookservice/spring/OpenApiFromWsdlBeanConfiguration.java @@ -1,37 +1,30 @@ /* - * Copyright the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * ================================================== - * GENERATED CLASS, ALL CHANGES WILL BE LOST - * ================================================== - */ +* Copyright the original author or authors. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +*/ package org.citrusframework.openapi.generator.soap.bookservice.spring; import static org.springframework.beans.factory.config.BeanDefinition.SCOPE_PROTOTYPE; import org.citrusframework.openapi.generator.soap.bookservice.request.BookServiceSoapApi; -import javax.annotation.processing.Generated; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Scope; @Configuration -@Generated(value = "org.citrusframework.openapi.generator.JavaCitrusCodegen") +@jakarta.annotation.Generated(value = "org.citrusframework.openapi.generator.JavaCitrusCodegen", date = "2024-07-03T15:24:46.256348400+02:00[Europe/Zurich]", comments = "Generator version: 7.5.0") public class OpenApiFromWsdlBeanConfiguration { @Bean diff --git a/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/multiparttest/model/Metadata.java b/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/multiparttest/model/Metadata.java deleted file mode 100644 index d5341fea2c..0000000000 --- a/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/multiparttest/model/Metadata.java +++ /dev/null @@ -1 +0,0 @@ -// not in use diff --git a/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/multiparttest/model/PutObjectResult.java b/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/multiparttest/model/PutObjectResult.java deleted file mode 100644 index d5341fea2c..0000000000 --- a/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/multiparttest/model/PutObjectResult.java +++ /dev/null @@ -1 +0,0 @@ -// not in use diff --git a/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/petstore/model/Category.java b/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/petstore/model/Category.java deleted file mode 100644 index d5341fea2c..0000000000 --- a/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/petstore/model/Category.java +++ /dev/null @@ -1 +0,0 @@ -// not in use diff --git a/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/petstore/model/ModelApiResponse.java b/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/petstore/model/ModelApiResponse.java deleted file mode 100644 index d5341fea2c..0000000000 --- a/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/petstore/model/ModelApiResponse.java +++ /dev/null @@ -1 +0,0 @@ -// not in use diff --git a/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/petstore/model/Order.java b/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/petstore/model/Order.java deleted file mode 100644 index d5341fea2c..0000000000 --- a/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/petstore/model/Order.java +++ /dev/null @@ -1 +0,0 @@ -// not in use diff --git a/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/petstore/model/Pet.java b/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/petstore/model/Pet.java deleted file mode 100644 index d5341fea2c..0000000000 --- a/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/petstore/model/Pet.java +++ /dev/null @@ -1 +0,0 @@ -// not in use diff --git a/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/petstore/model/Tag.java b/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/petstore/model/Tag.java deleted file mode 100644 index d5341fea2c..0000000000 --- a/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/petstore/model/Tag.java +++ /dev/null @@ -1 +0,0 @@ -// not in use diff --git a/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/petstore/model/User.java b/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/petstore/model/User.java deleted file mode 100644 index d5341fea2c..0000000000 --- a/test-api-generator/citrus-test-api-generator-core/src/test/resources/org/citrusframework/openapi/generator/JavaCitrusCodegenIntegrationTest/expectedgen/rest/petstore/model/User.java +++ /dev/null @@ -1 +0,0 @@ -// not in use diff --git a/test-api-generator/citrus-test-api-generator-maven-plugin/src/main/java/org/citrusframework/maven/plugin/TestApiGeneratorMojo.java b/test-api-generator/citrus-test-api-generator-maven-plugin/src/main/java/org/citrusframework/maven/plugin/TestApiGeneratorMojo.java index d37b4d8ffe..0c079c7402 100644 --- a/test-api-generator/citrus-test-api-generator-maven-plugin/src/main/java/org/citrusframework/maven/plugin/TestApiGeneratorMojo.java +++ b/test-api-generator/citrus-test-api-generator-maven-plugin/src/main/java/org/citrusframework/maven/plugin/TestApiGeneratorMojo.java @@ -332,7 +332,6 @@ public String qualifiedEndpoint() { } Map toConfigOptionsProperties() { - Map configOptionsProperties = new HashMap<>(); configOptionsProperties.put(PREFIX, prefix); configOptionsProperties.put(API_ENDPOINT, qualifiedEndpoint());