1595 extend uprader to upgrade from monolithic structure to template set.xml

cobigen-cli/cli-systemtest/src/test/java/com/devonfw/cobigen/cli/systemtest/GenerateCommandIT.java

@@ -75,14 +75,12 @@ public void generateFromEntityTest() throws Exception {
    * @throws Exception test fails
    */
   @Test
-  @Ignore // TODO: re-enable when upgrade process is implemented, see: https://github.com/devonfw/cobigen/issues/1595
   public void upgradeAndGenerateFromEntityTest() throws Exception {
 
-    FileUtils.copyDirectory(new File(testFileRootPath + "templatesproject"), this.tmpProject.toFile());
-    this.tmpProject.resolve("templates-devon4j").toFile()
-        .renameTo(this.tmpProject.resolve(ConfigurationConstants.COBIGEN_TEMPLATES).toFile());
+    FileUtils.copyDirectory(new File(testFileRootPath + "templatesproject/templates-devon4j"),
+        this.currentHome.toFile().toPath().resolve(ConfigurationConstants.COBIGEN_TEMPLATES).toFile());
     File baseProject = this.tmpProject.resolve("maven.project/core/").toFile();
-    File monolithicConfiguration = this.tmpProject.toFile();
+    File monolithicConfiguration = this.currentHome.toFile();
     String args[] = new String[7];
     args[0] = "generate";
     args[1] = this.entityInputFile.getAbsolutePath();
@@ -95,6 +93,7 @@ public void upgradeAndGenerateFromEntityTest() throws Exception {
     execute(args, false);
 
     assertThat(this.currentHome.resolve(ConfigurationConstants.CONFIG_PROPERTY_TEMPLATE_SETS_PATH)).exists();
+    assertThat(this.currentHome.resolve(ConfigurationConstants.BACKUP_FOLDER)).exists();
 
     assertThat(baseProject.toPath().resolve("src/main/java/com/maven/project/sampledatamanagement/logic/api/to"))
         .exists();

cobigen/cobigen-core-systemtest/src/test/java/com/devonfw/cobigen/systemtest/GenerationIT.java

@@ -26,6 +26,8 @@
 import org.mockito.ArgumentMatchers;
 
 import com.devonfw.cobigen.api.CobiGen;
+import com.devonfw.cobigen.api.TemplateAdapter;
+import com.devonfw.cobigen.api.exception.DeprecatedMonolithicConfigurationException;
 import com.devonfw.cobigen.api.exception.InvalidConfigurationException;
 import com.devonfw.cobigen.api.extension.GeneratorPluginActivator;
 import com.devonfw.cobigen.api.extension.InputReader;
@@ -37,6 +39,7 @@
 import com.devonfw.cobigen.api.to.MatcherTo;
 import com.devonfw.cobigen.api.to.TemplateTo;
 import com.devonfw.cobigen.impl.CobiGenFactory;
+import com.devonfw.cobigen.impl.adapter.TemplateAdapterImpl;
 import com.devonfw.cobigen.impl.extension.PluginRegistry;
 import com.devonfw.cobigen.impl.model.ModelBuilderImpl;
 import com.devonfw.cobigen.systemtest.common.AbstractApiTest;
@@ -81,6 +84,46 @@ public void testOverrideMergeStrategy() throws Exception {
     assertThat(target).hasContent("overwritten");
   }
 
+  /**
+   * Tests if after a upgrade with a merge of context and templates to template sets a generation of all matching (java)
+   * templates is successful
+   *
+   * @throws Exception test fails.
+   */
+  @Test
+  public void testUpgradeAndGenerateWithJavaInput() throws Exception {
+
+    File templates = this.tmpFolder.newFolder("templates");
+    FileUtils.copyDirectory(new File(testFileRootPath + "UpgradeTest/templates"), templates);
+    CobiGen cobigen = null;
+    assertThatThrownBy(() -> {
+      CobiGenFactory.create(templates.toURI());
+    }).isInstanceOf(DeprecatedMonolithicConfigurationException.class);
+
+    TemplateAdapter templateAdapter = new TemplateAdapterImpl(templates.toPath());
+    Path templateSets = templateAdapter.upgradeMonolithicTemplates(templates.toPath());
+    cobigen = CobiGenFactory.create(templateSets.getParent().toUri());
+    Object input = cobigen.read(
+        new File("src/test/java/com/devonfw/cobigen/systemtest/testobjects/io/generator/logic/api/to/InputEto.java")
+            .toPath(),
+        Charset.forName("UTF-8"), getClass().getClassLoader());
+
+    File folder = this.tmpFolder.newFolder("GenerationTest");
+    File target = new File(folder, "generated.txt");
+    FileUtils.write(target, "base");
+
+    List<TemplateTo> templatesTos = cobigen.getMatchingTemplates(input);
+    List<IncrementTo> increments = cobigen.getMatchingIncrements(input);
+    List<String> triggersIds = cobigen.getMatchingTriggerIds(input);
+    assertThat(templatesTos).hasSize(1);
+    assertThat(increments).hasSize(1);
+    assertThat(triggersIds).hasSize(1);
+
+    GenerationReportTo report1 = cobigen.generate(input, templatesTos.get(0), Paths.get(folder.toURI()));
+
+    assertThat(report1).isSuccessful();
+  }
+
   /**
    * Tests that multiple template sets with templates, increments and triggers get read and generate of all matching
    * (java) templates is successful

cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTest/UpgradeTest/templates/CobiGen_Templates/pom.xml

@@ -0,0 +1,55 @@
+<?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>templates-devon4j</artifactId>
+  <version>dev-SNAPSHOT</version>
+  <packaging>jar</packaging>
+  <properties>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-math3</artifactId>
+      <version>3.6.1</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <resources>
+      <resource>
+        <directory>src/main/templates</directory>
+        <targetPath>src/main/templates</targetPath>
+      </resource>
+    </resources>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>flatten-maven-plugin</artifactId>
+      </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>

cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTest/UpgradeTest/templates/CobiGen_Templates/src/main/templates/context.xml

@@ -0,0 +1,6 @@
+<contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.1">
+    <trigger id="entities" type="java" templateFolder="template-test">
+      <matcher type="fqn" value=".+">
+      </matcher>
+    </trigger>
+</contextConfiguration>

cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTest/UpgradeTest/templates/CobiGen_Templates/src/main/templates/template-test/templates.xml

@@ -0,0 +1,13 @@
+  <templatesConfiguration xmlns="http://capgemini.com/devonfw/cobigen/TemplatesConfiguration"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0">
+    <templates>
+      <template name="t2" destinationPath="generated.txt" templateFile="templates/generated.txt.ftl"
+        mergeStrategy="override"/>
+    </templates>
+
+    <increments>
+      <increment name="i2" description="the only increment">
+        <templateRef ref="t2"/>
+      </increment>
+    </increments>
+  </templatesConfiguration>

cobigen/cobigen-core-systemtest/src/test/resources/testdata/systemtest/GenerationTest/UpgradeTest/templates/CobiGen_Templates/src/main/templates/template-test/templates/generated.txt.ftl

@@ -0,0 +1 @@
+overwritten

cobigen/cobigen-core/pom.xml

@@ -148,7 +148,8 @@
               <packageName>com.devonfw.cobigen.impl.config.entity.io.v1_0</packageName>
               <outputDirectory>${project.build.directory}/generated-sources/config/v1.0</outputDirectory>
               <sources>
-                <source>${basedir}/src/main/resources/schema/v1.0</source>
+                <source>${basedir}/src/main/resources/schema/v1.0/contextConfiguration.xsd</source>
+                <source>${basedir}/src/main/resources/schema/v1.0/templatesConfiguration.xsd</source>
               </sources>
             </configuration>
           </execution>
@@ -237,16 +238,16 @@
             </configuration>
           </execution>
           <execution>
-            <id>generate-v6.0-configuration</id>
+            <id>generate-TSv1.0-configuration</id>
             <phase>generate-sources</phase>
             <goals>
               <goal>xjc</goal>
             </goals>
             <configuration>
-              <packageName>com.devonfw.cobigen.impl.config.entity.io.v6_0</packageName>
-              <outputDirectory>${project.build.directory}/generated-sources/config/v6.0</outputDirectory>
+              <packageName>com.devonfw.cobigen.impl.tsconfig.entity.io.v1_0</packageName>
+              <outputDirectory>${project.build.directory}/generated-sources/tsconfig/v1.0</outputDirectory>
               <sources>
-                <source>${basedir}/src/main/resources/schema/v6.0</source>
+                <source>${basedir}/src/main/resources/schema/v1.0/templateSetConfiguration.xsd</source>
               </sources>
             </configuration>
           </execution>
@@ -261,7 +262,7 @@
               <packageName>com.devonfw.cobigen.impl.config.entity.io</packageName>
               <outputDirectory>${project.build.directory}/generated-sources/config/current</outputDirectory>
               <sources>
-                <source>${basedir}/src/main/resources/schema/v6.0/templateSetConfiguration.xsd</source>
+                <source>${basedir}/src/main/resources/schema/v1.0/templateSetConfiguration.xsd</source>
               </sources>
             </configuration>
           </execution>

cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/ContextConfiguration.java

@@ -84,7 +84,13 @@ private void readConfiguration(Path configRoot) throws InvalidConfigurationExcep
     }
 
     this.configurationPath = this.contextConfigurationReader.getContextRoot();
-    this.triggers = this.contextConfigurationReader.loadTriggers();
+    boolean isTemplateSet = false;
+    // check if configurationHolder is present to check for template set configuration
+    // configurationHolder is never used in monolitic configuration here.
+    if (this.configurationHolder != null) {
+      isTemplateSet = this.configurationHolder.isTemplateSetConfiguration();
+    }
+    this.triggers = this.contextConfigurationReader.loadTriggers(isTemplateSet);
 
   }
 

cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/TemplateSetConfiguration.java

@@ -60,8 +60,6 @@ public Map<String, Increment> getIncrements() {
   /** The reader to read the template-set.xml files */
   private TemplateSetConfigurationReader templateSetConfigurationReader;
 
-  private ConfigurationHolder configurationHolder;
-
   /**
    * Map of the root template folders distinguished by their trigger ID
    */
@@ -146,17 +144,17 @@ private void initializeTemplateSets(boolean isZipFile, Path configurationPath, P
     TemplateFolder templateFolder = this.templateSetConfigurationReader.getRootTemplateFolder();
 
     TemplatesConfigurationReader templatesConfigurationReader = new TemplatesConfigurationReader(
-        templatesConfigurationStatic, templateFolder, this.configurationHolder, templateSetFile);
+        templatesConfigurationStatic, templateFolder, null, templateSetFile);
 
     ContextConfigurationReader contextConfigurationReader = new ContextConfigurationReader(contextConfigurationStatic,
         templateSetFile);
 
-    Map<String, Trigger> trigger = contextConfigurationReader.loadTriggers();
+    Map<String, Trigger> trigger = contextConfigurationReader.loadTriggers(true);
 
     // uses the 1st element because a template-set has only one trigger
     Trigger activeTrigger = trigger.get(trigger.keySet().toArray()[0]);
 
-    Map<Path, Path> configLocations = this.templateSetConfigurationReader.getConfigLocations();
+      Map<Path, Path> configLocations = this.templateSetConfigurationReader.getConfigLocations();
     Path templateSetRootFolder = configLocations.get(templateSetFile);
     this.utilFolders.put(activeTrigger.getId(), templateSetRootFolder);
 

cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/constant/TemplateSetConfigurationVersion.java

@@ -8,9 +8,10 @@
 public enum TemplateSetConfigurationVersion {
 
   /**
-   * Initial release. Merges the content of the context.xml and the templates.xml into a new template-set.xml file.
+   * Initial release. Merges the content of the context.xml v3 and the templates.xml v5 into a new template-set.xml
+   * file.
    */
-  v6_0(6f, false);
+  v1_0(1f, false);
 
   /** Comparable float representation of the version number. */
   private float floatRepresentation;

cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/reader/ContextConfigurationReader.java

@@ -18,6 +18,7 @@
 import javax.xml.validation.Schema;
 import javax.xml.validation.SchemaFactory;
 
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.xml.sax.SAXException;
@@ -319,17 +320,27 @@ private List<Path> loadContextFilesInSubfolder(Path configRoot) {
   /**
    * Loads all {@link Trigger}s of the static context into the local representation
    *
+   * @param isTemplateSet TODO
    * @return a {@link List} containing all the {@link Trigger}s
    */
-  public Map<String, Trigger> loadTriggers() {
+  public Map<String, Trigger> loadTriggers(boolean isTemplateSet) {
 
     Map<String, Trigger> triggers = new HashMap<>();
     for (Path contextFile : this.contextConfigurations.keySet()) {
       ContextConfiguration contextConfiguration = this.contextConfigurations.get(contextFile);
       for (com.devonfw.cobigen.impl.config.entity.io.Trigger t : contextConfiguration.getTrigger()) {
-        triggers.put(t.getId(), new Trigger(t.getId(), t.getType(), t.getTemplateFolder(),
+        String templateFolder = t.getTemplateFolder();
+        if (isTemplateSet) {
+          if (!StringUtils.isEmpty(templateFolder) || !templateFolder.equals("/")) {
+            LOG.warn("Ignoring content of template folder field: {} from trigger, not needed for template sets.",
+                templateFolder);
+          }
+          templateFolder = "/";
+        }
+        triggers.put(t.getId(), new Trigger(t.getId(), t.getType(), templateFolder,
             Charset.forName(t.getInputCharset()), loadMatchers(t), loadContainerMatchers(t)));
       }
+
     }
     return triggers;
   }

cobigen/cobigen-core/src/main/java/com/devonfw/cobigen/impl/config/reader/TemplatesConfigurationReader.java

@@ -750,7 +750,7 @@ private Trigger getExternalTrigger(String triggerToSearch) {
 
     ContextConfigurationReader contextConfigurationReader = new ContextConfigurationReader(
         this.configurationHolder.readContextConfiguration().getConfigurationPath());
-    Map<String, Trigger> triggers = contextConfigurationReader.loadTriggers();
+    Map<String, Trigger> triggers = contextConfigurationReader.loadTriggers(this.configurationHolder.isTemplateSetConfiguration());
     Trigger trig = triggers.get(triggerToSearch);
     if (trig == null) {
       throw new InvalidConfigurationException(this.configFilePath.toUri().toString(),