feat(#1156): generate Java models alongside citrus classes

Author: bbortt

test-api-generator/citrus-test-api-generator-core/pom.xml

@@ -17,6 +17,10 @@
     <name>Citrus :: Test API Generator :: Core</name>
     <description>Generates a Citrus Test-API for OpenAPI and WSDL specifications.</description>
 
+    <properties>
+        <openapi-java-folder>${project.build.directory}/openapi-java-resources</openapi-java-folder>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>org.citrusframework</groupId>
@@ -118,6 +122,64 @@
                 </executions>
             </plugin>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>3.7.1</version>
+                <configuration>
+                    <artifactItems>
+                        <artifactItem>
+                            <groupId>org.openapitools</groupId>
+                            <artifactId>openapi-generator</artifactId>
+                            <version>${org.openapitools.version}</version>
+                            <includes>Java/*Annotation*.mustache,Java/*Model*.mustache,Java/model*.mustache,Java/pojo*.mustache</includes>
+                        </artifactItem>
+                    </artifactItems>
+                    <outputDirectory>
+                        ${openapi-java-folder}
+                    </outputDirectory>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>unpack-java-templates</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-resources-plugin</artifactId>
+            <version>3.3.1</version>
+                <executions>
+                    <execution>
+                        <id>prepare-java-templates</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.outputDirectory}/java-citrus</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>
+                                        ${openapi-java-folder}/Java
+                                    </directory>
+                                    <includes>
+                                        <include>
+                                            *.mustache
+                                        </include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
             <plugin>
                 <groupId>org.openapitools</groupId>
                 <artifactId>openapi-generator-maven-plugin</artifactId>

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<String> 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 + ")."));