From 0ecb4e4efd30ac749131445b15df82902e3ceddd Mon Sep 17 00:00:00 2001
From: cedricarnauld123 <cedricarnauld2@gmail.com>
Date: Tue, 28 Mar 2023 17:08:05 +0200
Subject: [PATCH] #1509 clean up Clean all tests resources

---
 .gitignore                                    |  2 +
 cobigen-eclipse/cobigen-eclipse-test/pom.xml  | 24 +-----
 .../crud-java-server-app-complex/pom.xml      | 83 -------------------
 .../src/main/resources/template-set.xml       | 40 ---------
 .../src/main/java/com/test.java               |  0
 .../src/main/resources/functions.ftl          |  0
 .../src/main/resources/template-set.xml       | 40 ---------
 .../pom.xml                                   |  0
 .../src/main/java/com/test.java               |  0
 .../src/main/resources/functions.ftl          |  0
 .../src/main/resources/template-set.xml       | 56 +++++++++++++
 .../to/${variables.entityName}Eto.java.ftl    |  1 +
 12 files changed, 61 insertions(+), 185 deletions(-)
 delete mode 100644 cobigen-eclipse/cobigen-eclipse-test/src/main/resources/AdaptTemplatesTest/template-sets/adapted/crud-java-server-app-complex/pom.xml
 delete mode 100644 cobigen-eclipse/cobigen-eclipse-test/src/main/resources/AdaptTemplatesTest/template-sets/adapted/crud-java-server-app-complex/src/main/resources/template-set.xml
 delete mode 100644 cobigen-eclipse/cobigen-eclipse-test/src/main/resources/AdaptTemplatesTest/template-sets/adapted/crud-java-server-app/src/main/java/com/test.java
 delete mode 100644 cobigen-eclipse/cobigen-eclipse-test/src/main/resources/AdaptTemplatesTest/template-sets/adapted/crud-java-server-app/src/main/resources/functions.ftl
 delete mode 100644 cobigen-eclipse/cobigen-eclipse-test/src/main/resources/AdaptTemplatesTest/template-sets/adapted/crud-java-server-app/src/main/resources/template-set.xml
 rename cobigen-eclipse/cobigen-eclipse-test/src/main/resources/AdaptTemplatesTest/template-sets/adapted/{crud-java-server-app => crud-openapi-java-server-app}/pom.xml (100%)
 rename cobigen-eclipse/cobigen-eclipse-test/src/main/resources/AdaptTemplatesTest/template-sets/adapted/{crud-java-server-app-complex => crud-openapi-java-server-app}/src/main/java/com/test.java (100%)
 rename cobigen-eclipse/cobigen-eclipse-test/src/main/resources/AdaptTemplatesTest/template-sets/adapted/{crud-java-server-app-complex => crud-openapi-java-server-app}/src/main/resources/functions.ftl (100%)
 create mode 100644 cobigen-eclipse/cobigen-eclipse-test/src/main/resources/AdaptTemplatesTest/template-sets/adapted/crud-openapi-java-server-app/src/main/resources/template-set.xml
 create mode 100644 cobigen-eclipse/cobigen-eclipse-test/src/main/resources/AdaptTemplatesTest/template-sets/adapted/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/logic/api/to/${variables.entityName}Eto.java.ftl

diff --git a/.gitignore b/.gitignore
index 978e10ba4f..16466648c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,3 +49,5 @@ cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/TemplateP
 cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/TemplateProcessingTest/template-sets/downloaded/crud-java-server-app-1.0.0-sources.jar
 cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/TemplateProcessingTest/template-sets/downloaded/crud-java-server-app-complex-1.0.0.jar
 cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/TemplateProcessingTest/template-sets/downloaded/crud-java-server-app-complex-1.0.0-sources.jar
+cobigen-eclipse/cobigen-eclipse-test/src/main/resources/AdaptTemplatesTest/template-sets/downloaded/crud-java-server-app-1.0.0.jar
+cobigen-eclipse/cobigen-eclipse-test/src/main/resources/AdaptTemplatesTest/template-sets/downloaded/crud-java-server-app-1.0.0-sources.jar
diff --git a/cobigen-eclipse/cobigen-eclipse-test/pom.xml b/cobigen-eclipse/cobigen-eclipse-test/pom.xml
index 37aae63f6b..d8f4c8b78f 100644
--- a/cobigen-eclipse/cobigen-eclipse-test/pom.xml
+++ b/cobigen-eclipse/cobigen-eclipse-test/pom.xml
@@ -13,8 +13,7 @@
   <properties>
     <tycho.testArgLine.enriched>${surefireArgLineIntegration} -Xms512m -Xmx2048m -XX:+DisableExplicitGC</tycho.testArgLine.enriched>
     <enforcer.skip>true</enforcer.skip>
-    <maven.test.AdaptTemplatesTest1>src\main\resources\AdaptTemplatesTest\template-sets\adapted\crud-java-server-app</maven.test.AdaptTemplatesTest1>
-    <maven.test.AdaptTemplatesTest2>src\main\resources\AdaptTemplatesTest\template-sets\adapted\crud-java-server-app-complex</maven.test.AdaptTemplatesTest2>
+    <maven.test.AdaptTemplatesTest1>src\main\resources\AdaptTemplatesTest\template-sets\adapted\crud-openapi-java-server-app</maven.test.AdaptTemplatesTest1>
 
   </properties>
 
@@ -87,26 +86,7 @@
               </arguments>
             </configuration>
           </execution>
-          <execution>
-            <id>Install test adaptTemplatesTests2</id>
-            <phase>test-compile</phase>
-            <goals>
-              <goal>exec</goal>
-            </goals>
-            <configuration>
-              <executable>mvn</executable>
-              <workingDirectory>${maven.test.AdaptTemplatesTest2}</workingDirectory>
-              <arguments>
-                <argument>install</argument>
-                <!-- https://stackoverflow.com/a/66801171 -->
-                <argument>-Djansi.force=true</argument>
-                <argument>-Djansi.passthrough=true</argument>
-                <argument>-B</argument>
-                <argument>-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn</argument>
-              </arguments>
-            </configuration>
-          </execution>
-          </executions>
+        </executions>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
diff --git a/cobigen-eclipse/cobigen-eclipse-test/src/main/resources/AdaptTemplatesTest/template-sets/adapted/crud-java-server-app-complex/pom.xml b/cobigen-eclipse/cobigen-eclipse-test/src/main/resources/AdaptTemplatesTest/template-sets/adapted/crud-java-server-app-complex/pom.xml
deleted file mode 100644
index 3c69a2539d..0000000000
--- a/cobigen-eclipse/cobigen-eclipse-test/src/main/resources/AdaptTemplatesTest/template-sets/adapted/crud-java-server-app-complex/pom.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-  xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.devonfw.test</groupId>
-  <artifactId>crud-java-server-app-complex</artifactId>
-  <version>1.0.0</version>
-  <packaging>jar</packaging>
-  <properties>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
-  </properties>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.3.1</version>
-        <configuration>
-          <outputDirectory>../../downloaded</outputDirectory>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-source-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-sources</id>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <skipSource>${skip.deployment}</skipSource>
-          <outputDirectory>../../downloaded</outputDirectory>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <version>2.7</version>
-        <configuration>
-          <encoding>UTF-8</encoding>
-        </configuration>
-      </plugin>
-      <!-- Inject Maven Properties in java-templates source folder -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>templating-maven-plugin</artifactId>
-        <version>1.0.0</version>
-        <executions>
-          <execution>
-            <id>generate-maven-properties-class</id>
-            <goals>
-              <goal>filter-sources</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>prepare-package</phase>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <configuration>
-              <tasks>
-                <echo>Integrate POM manually</echo>
-                <copy file="pom.xml" tofile="${project.build.outputDirectory}/pom.xml"/>
-              </tasks>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
\ No newline at end of file
diff --git a/cobigen-eclipse/cobigen-eclipse-test/src/main/resources/AdaptTemplatesTest/template-sets/adapted/crud-java-server-app-complex/src/main/resources/template-set.xml b/cobigen-eclipse/cobigen-eclipse-test/src/main/resources/AdaptTemplatesTest/template-sets/adapted/crud-java-server-app-complex/src/main/resources/template-set.xml
deleted file mode 100644
index 5cfe219789..0000000000
--- a/cobigen-eclipse/cobigen-eclipse-test/src/main/resources/AdaptTemplatesTest/template-sets/adapted/crud-java-server-app-complex/src/main/resources/template-set.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tns:templateSetConfiguration version="6.0" xmlns:tns="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration" xmlns:cc="http://capgemini.com/devonfw/cobigen/ContextConfiguration" xmlns:tc="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration templateSetConfiguration.xsd ">
-<cc:contextConfiguration version="3.0">
-  <cc:trigger id="crud_java_server_app_complex" type="java">
-    <cc:containerMatcher type="package" value="((.+\.)?([^\.]+))\.([^\.]+)\.dataaccess\.api" retrieveObjectsRecursively="false" />
-    <cc:matcher type="fqn" value="((.+\.)?([^\.]+))\.([^\.]+)\.dataaccess\.api\.([^\.]+)Entity">
-      <cc:variableAssignment type="regex" key="rootPackage" value="1" />
-      <cc:variableAssignment type="regex" key="domain" value="3" />
-      <cc:variableAssignment type="regex" key="component" value="4" />
-      <cc:variableAssignment type="regex" key="entityName" value="5" />
-    </cc:matcher>
-  </cc:trigger>
-  <cc:tags>
-    <cc:tag name="Java"></cc:tag>
-    <cc:tag name="CRUD"></cc:tag>
-    <cc:tag name="Server"></cc:tag>
-    <cc:tag name="App"></cc:tag>
-  </cc:tags>
-  <cc:links>
-    <cc:link url="https://docs.spring.io/spring-data/data-commons/docs/1.6.1.RELEASE/reference/html/repositories.html"></cc:link>
-  </cc:links>
-</cc:contextConfiguration>
-
-<tc:templatesConfiguration version="5.0">
-
-  <tc:templates>
-    <tc:templateExtension ref="${variables.entityName}Eto.java" mergeStrategy="javamerge"/>
-  </tc:templates>
-
-  <tc:templateScans>
-    <tc:templateScan name="ts_scan" templatePath="templates" destinationPath="" />
-  </tc:templateScans>
-
-  <tc:increments>
-    <tc:increment name="tos" description="TO's">
-      <tc:templateRef ref="${variables.entityName}Eto.java"/>
-    </tc:increment>
-  </tc:increments>
-</tc:templatesConfiguration>
-</tns:templateSetConfiguration>
\ No newline at end of file
diff --git a/cobigen-eclipse/cobigen-eclipse-test/src/main/resources/AdaptTemplatesTest/template-sets/adapted/crud-java-server-app/src/main/java/com/test.java b/cobigen-eclipse/cobigen-eclipse-test/src/main/resources/AdaptTemplatesTest/template-sets/adapted/crud-java-server-app/src/main/java/com/test.java
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/cobigen-eclipse/cobigen-eclipse-test/src/main/resources/AdaptTemplatesTest/template-sets/adapted/crud-java-server-app/src/main/resources/functions.ftl b/cobigen-eclipse/cobigen-eclipse-test/src/main/resources/AdaptTemplatesTest/template-sets/adapted/crud-java-server-app/src/main/resources/functions.ftl
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/cobigen-eclipse/cobigen-eclipse-test/src/main/resources/AdaptTemplatesTest/template-sets/adapted/crud-java-server-app/src/main/resources/template-set.xml b/cobigen-eclipse/cobigen-eclipse-test/src/main/resources/AdaptTemplatesTest/template-sets/adapted/crud-java-server-app/src/main/resources/template-set.xml
deleted file mode 100644
index 4515b452ec..0000000000
--- a/cobigen-eclipse/cobigen-eclipse-test/src/main/resources/AdaptTemplatesTest/template-sets/adapted/crud-java-server-app/src/main/resources/template-set.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tns:templateSetConfiguration version="6.0" xmlns:tns="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration" xmlns:cc="http://capgemini.com/devonfw/cobigen/ContextConfiguration" xmlns:tc="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration templateSetConfiguration.xsd ">
-<cc:contextConfiguration version="3.0">
-  <cc:trigger id="crud_java_server_app" type="java">
-    <cc:containerMatcher type="package" value="((.+\.)?([^\.]+))\.([^\.]+)\.dataaccess\.api" retrieveObjectsRecursively="false" />
-    <cc:matcher type="fqn" value="((.+\.)?([^\.]+))\.([^\.]+)\.dataaccess\.api\.([^\.]+)Entity">
-      <cc:variableAssignment type="regex" key="rootPackage" value="1" />
-      <cc:variableAssignment type="regex" key="domain" value="3" />
-      <cc:variableAssignment type="regex" key="component" value="4" />
-      <cc:variableAssignment type="regex" key="entityName" value="5" />
-    </cc:matcher>
-  </cc:trigger>
-  <cc:tags>
-    <cc:tag name="Java"></cc:tag>
-    <cc:tag name="CRUD"></cc:tag>
-    <cc:tag name="Server"></cc:tag>
-    <cc:tag name="App"></cc:tag>
-  </cc:tags>
-  <cc:links>
-    <cc:link url="https://docs.spring.io/spring-data/data-commons/docs/1.6.1.RELEASE/reference/html/repositories.html"></cc:link>
-  </cc:links>
-</cc:contextConfiguration>
-
-<tc:templatesConfiguration version="5.0">
-
-  <tc:templates>
-    <tc:templateExtension ref="${variables.entityName}Eto.java" mergeStrategy="javamerge"/>
-  </tc:templates>
-
-  <tc:templateScans>
-    <tc:templateScan name="ts_scan" templatePath="templates" destinationPath="" />
-  </tc:templateScans>
-
-  <tc:increments>
-    <tc:increment name="tos" description="TO's">
-      <tc:templateRef ref="${variables.entityName}Eto.java"/>
-    </tc:increment>
-  </tc:increments>
-</tc:templatesConfiguration>
-</tns:templateSetConfiguration>
\ No newline at end of file
diff --git a/cobigen-eclipse/cobigen-eclipse-test/src/main/resources/AdaptTemplatesTest/template-sets/adapted/crud-java-server-app/pom.xml b/cobigen-eclipse/cobigen-eclipse-test/src/main/resources/AdaptTemplatesTest/template-sets/adapted/crud-openapi-java-server-app/pom.xml
similarity index 100%
rename from cobigen-eclipse/cobigen-eclipse-test/src/main/resources/AdaptTemplatesTest/template-sets/adapted/crud-java-server-app/pom.xml
rename to cobigen-eclipse/cobigen-eclipse-test/src/main/resources/AdaptTemplatesTest/template-sets/adapted/crud-openapi-java-server-app/pom.xml
diff --git a/cobigen-eclipse/cobigen-eclipse-test/src/main/resources/AdaptTemplatesTest/template-sets/adapted/crud-java-server-app-complex/src/main/java/com/test.java b/cobigen-eclipse/cobigen-eclipse-test/src/main/resources/AdaptTemplatesTest/template-sets/adapted/crud-openapi-java-server-app/src/main/java/com/test.java
similarity index 100%
rename from cobigen-eclipse/cobigen-eclipse-test/src/main/resources/AdaptTemplatesTest/template-sets/adapted/crud-java-server-app-complex/src/main/java/com/test.java
rename to cobigen-eclipse/cobigen-eclipse-test/src/main/resources/AdaptTemplatesTest/template-sets/adapted/crud-openapi-java-server-app/src/main/java/com/test.java
diff --git a/cobigen-eclipse/cobigen-eclipse-test/src/main/resources/AdaptTemplatesTest/template-sets/adapted/crud-java-server-app-complex/src/main/resources/functions.ftl b/cobigen-eclipse/cobigen-eclipse-test/src/main/resources/AdaptTemplatesTest/template-sets/adapted/crud-openapi-java-server-app/src/main/resources/functions.ftl
similarity index 100%
rename from cobigen-eclipse/cobigen-eclipse-test/src/main/resources/AdaptTemplatesTest/template-sets/adapted/crud-java-server-app-complex/src/main/resources/functions.ftl
rename to cobigen-eclipse/cobigen-eclipse-test/src/main/resources/AdaptTemplatesTest/template-sets/adapted/crud-openapi-java-server-app/src/main/resources/functions.ftl
diff --git a/cobigen-eclipse/cobigen-eclipse-test/src/main/resources/AdaptTemplatesTest/template-sets/adapted/crud-openapi-java-server-app/src/main/resources/template-set.xml b/cobigen-eclipse/cobigen-eclipse-test/src/main/resources/AdaptTemplatesTest/template-sets/adapted/crud-openapi-java-server-app/src/main/resources/template-set.xml
new file mode 100644
index 0000000000..f0d54fa334
--- /dev/null
+++ b/cobigen-eclipse/cobigen-eclipse-test/src/main/resources/AdaptTemplatesTest/template-sets/adapted/crud-openapi-java-server-app/src/main/resources/template-set.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tns:templateSetConfiguration version="6.0"
+  xmlns:tns="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration"
+  xmlns:cc="http://capgemini.com/devonfw/cobigen/ContextConfiguration"
+  xmlns:tc="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://capgemini.com/devonfw/cobigen/TemplateSetConfiguration templateSetConfiguration.xsd
+                      ">
+  <cc:contextConfiguration version="3.0">
+    <cc:trigger id="crud_openapi_java_server_app" type="openapi">
+      <cc:containerMatcher type="element" value="openAPIFile" />
+      <cc:matcher type="element" value="EntityDef">
+        <cc:variableAssignment type="extension" key="rootPackage"
+          value="x-rootpackage" />
+        <cc:variableAssignment type="property" key="component"
+          value="componentName" />
+        <cc:variableAssignment type="property" key="entityName" value="name" />
+      </cc:matcher>
+    </cc:trigger>
+    <cc:tags>
+      <cc:tag name="Java"></cc:tag>
+      <cc:tag name="OpenAPI"></cc:tag>
+      <cc:tag name="CRUD"></cc:tag>
+      <cc:tag name="Server"></cc:tag>
+      <cc:tag name="App"></cc:tag>
+    </cc:tags>
+    <cc:links>
+      <cc:link
+        url="https://github.com/devonfw/cobigen/wiki/howto-devonfw-ide-CobiGen-PoC-E2E"></cc:link>
+    </cc:links>
+  </cc:contextConfiguration>
+  <tc:templatesConfiguration version="5.0">
+    <tc:templates>
+      <tc:templateExtension ref="${variables.entityName}Eto.java"
+        mergeStrategy="javamerge" />
+
+    </tc:templates>
+
+    <tc:templateScans>
+      <tc:templateScan templatePath="templates" destinationPath="src/main" />
+    </tc:templateScans>
+
+    <tc:increments>
+      <tc:increment name="server" description="CRUD devon4j Server"
+        explanation="Creates (backends) server CRUD service for java application.">
+        <tc:incrementRef ref="rest_service_impl" />
+      </tc:increment>
+
+      <tc:increment name="rest_service_impl" description="CRUD REST services">
+        <tc:templateRef ref="${variables.entityName}Eto.java"/>
+      </tc:increment>
+
+    </tc:increments>
+  </tc:templatesConfiguration>
+
+</tns:templateSetConfiguration>
\ No newline at end of file
diff --git a/cobigen-eclipse/cobigen-eclipse-test/src/main/resources/AdaptTemplatesTest/template-sets/adapted/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/logic/api/to/${variables.entityName}Eto.java.ftl b/cobigen-eclipse/cobigen-eclipse-test/src/main/resources/AdaptTemplatesTest/template-sets/adapted/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/logic/api/to/${variables.entityName}Eto.java.ftl
new file mode 100644
index 0000000000..0c233890ea
--- /dev/null
+++ b/cobigen-eclipse/cobigen-eclipse-test/src/main/resources/AdaptTemplatesTest/template-sets/adapted/crud-openapi-java-server-app/src/main/resources/templates/java/${variables.rootPackage}/${variables.component}/logic/api/to/${variables.entityName}Eto.java.ftl
@@ -0,0 +1 @@
+package test;
\ No newline at end of file