devonfw#1518 Implemented requested changes

mdukhan · Aug 23, 2022 · f067be5 · f067be5
1 parent 260c0e5
commit f067be5
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 9 deletions.
diff --git a/cobigen-cli/cli/src/main/java/com/devonfw/cobigen/cli/commands/GenerateCommand.java b/cobigen-cli/cli/src/main/java/com/devonfw/cobigen/cli/commands/GenerateCommand.java
@@ -272,10 +272,11 @@ private void checkMonolithicConfigurationException() {
     try {
       CobiGenUtils.initializeCobiGen(this.templatesProject, false);
     } catch (DeprecatedMonolithicConfigurationException e) {
+      String monolithicConfigurationMessage = "Found monolithic configuration at:";
       if (this.templatesProject == null)
-        LOG.warn("Found monolithic configuration at: {} ", ConfigurationFinder.findTemplatesLocation());
+        LOG.warn(monolithicConfigurationMessage + "{} ", ConfigurationFinder.findTemplatesLocation());
       else
-        LOG.warn("Found monolithic configuration at: {} ", this.templatesProject);
+        LOG.warn(monolithicConfigurationMessage + "{} ", this.templatesProject);
       LOG.warn(e.getMessage());
       if (this.upgradeConfiguration) {
         startTemplatesUpgrader();

diff --git a/...pse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/common/tools/ResourcesPluginUtil.java b/...pse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/common/tools/ResourcesPluginUtil.java
@@ -59,7 +59,7 @@ public class ResourcesPluginUtil {
   /**
    * This variable is used to know if the templates got upgraded or not
    */
-  public static boolean TemplatesUpgraded = false;
+  public static boolean templatesUpgraded = false;
 
   /**
    * This variable is used to know if we have a custom generator project
@@ -307,7 +307,7 @@ public static void startTemplatesUpgrader(Path monolithicConfiguration) {
       templateAdapter = new TemplateAdapterImpl(monolithicConfiguration);
     }
     templateAdapter.upgradeMonolithicTemplates(monolithicConfiguration);
-    TemplatesUpgraded = true;
+    templatesUpgraded = true;
   }
 
 }
diff --git a/...se/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/generator/GeneratorWrapperFactory.java b/...se/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/generator/GeneratorWrapperFactory.java
@@ -225,7 +225,7 @@ private static CobiGen initializeGenerator(boolean allowMonolithicConfiguration)
 
       // we need to check if templates got upgraded then initialize cobigen again. Now with the new template-set
       // structure
-      if (ResourcesPluginUtil.TemplatesUpgraded)
+      if (ResourcesPluginUtil.templatesUpgraded)
         return initializeCobiGen(null, true);
 
       return initializeCobiGen(generatorProj, true);
@@ -261,15 +261,15 @@ private static CobiGen initializeCobiGen(IProject generatorProj, boolean allowMo
     Path templateSetsAdaptedFolderPath = templatesDirectoryPath.resolve(ConfigurationConstants.ADAPTED_FOLDER);
     Path templateSetsDownloadedFolderPath = templatesDirectoryPath.resolve(ConfigurationConstants.DOWNLOADED_FOLDER);
 
-    if (!ResourcesPluginUtil.generatorProjExists || ResourcesPluginUtil.TemplatesUpgraded
+    if (!ResourcesPluginUtil.generatorProjExists || ResourcesPluginUtil.templatesUpgraded
         || generatorProj.getLocationURI() == null) {
 
       /*
        * After the upgrade the new template-sets will be used. Only once! Then the old configuration has to be deleted
        * or the upgrader will start again. This time the upgrader cannot start again because template-sets already
        * exists.
        */
-      ResourcesPluginUtil.TemplatesUpgraded = false;
+      ResourcesPluginUtil.templatesUpgraded = false;
       // check adapted and downloaded folder
       if (Files.exists(templateSetsAdaptedFolderPath) || Files.exists(templateSetsDownloadedFolderPath)) {
         return CobiGenFactory.create(templatesDirectoryPath.toUri(), allowMonolithicConfiguration);

diff --git a/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/util/TimestampUtilTest.java b/cobigen/cobigen-core/src/test/java/com/devonfw/cobigen/unittest/util/TimestampUtilTest.java
@@ -19,12 +19,12 @@ public class TimestampUtilTest {
 
   /**
    *
-   * Tests the read and write method from TimestampUtil also tests that only one Timestamp will be stored at a time
+   * Tests the write method from TimestampUtil also tests that only one Timestamp will be stored at a time
    *
    * @throws IOException
    */
   @Test
-  public void testWriteAndReadTimestamp() throws IOException {
+  public void testWriteTimestamp() throws IOException {
 
     Path configFile = Paths.get("src/test/resources/testdata/unittest/config/util/config");
     Timestamp InstantTimestamp = TimestampUtil.createInstantTimestamp();
@@ -39,4 +39,24 @@ public void testWriteAndReadTimestamp() throws IOException {
 
   }
 
+  /**
+   *
+   * Tests the readTimestamp method from TimestampUtil
+   *
+   * @throws IOException
+   */
+  @Test
+  public void testReadTimestamp() throws IOException {
+
+    Path configFile = Paths.get("src/test/resources/testdata/unittest/config/util/config");
+    Timestamp InstantTimestamp = TimestampUtil.createInstantTimestamp();
+    TimestampUtil.writeTimestamp(configFile, InstantTimestamp);
+
+    Timestamp InstantTimestampCopy = TimestampUtil.readTimestamp(configFile);
+
+    Assert.assertEquals(InstantTimestamp, InstantTimestampCopy);
+
+    Files.delete(configFile.toFile());
+
+  }
 }