Extracting common code in InstallationManagerTestCase

wildfly · Jul 25, 2024 · e921710 · e921710
1 parent 8b38f17
commit e921710
Show file tree

Hide file tree

Showing 19 changed files with 1,011 additions and 1,502 deletions.
diff --git a/installation-manager/src/main/java/org/wildfly/core/instmgr/InstMgrHistoryHandler.java b/installation-manager/src/main/java/org/wildfly/core/instmgr/InstMgrHistoryHandler.java
@@ -6,6 +6,8 @@
 package org.wildfly.core.instmgr;
 
 import java.nio.file.Path;
+import java.sql.Date;
+import java.text.DateFormat;
 import java.util.List;
 import java.util.Locale;
 
@@ -53,7 +55,10 @@ public void execute(OperationContext context, ModelNode operation) throws Operat
                     for (HistoryResult hr : history) {
                         ModelNode entry = new ModelNode();
                         entry.get(InstMgrConstants.HISTORY_RESULT_HASH).set(hr.getName());
-                        entry.get(InstMgrConstants.HISTORY_RESULT_TIMESTAMP).set(hr.timestamp().toString());
+                        if (hr.timestamp() != null) {
+                            final java.util.Date timestamp = Date.from(hr.timestamp());
+                            entry.get(InstMgrConstants.HISTORY_RESULT_TIMESTAMP).set(DateFormat.getInstance().format(timestamp));
+                        }
                         entry.get(InstMgrConstants.HISTORY_RESULT_TYPE).set(hr.getType().toLowerCase(Locale.ENGLISH));
                         if (hr.getVersions() != null && !hr.getVersions().isEmpty()) {
                             final ModelNode versions = entry.get(InstMgrConstants.HISTORY_RESULT_CHANNEL_VERSIONS);

diff --git a/pom.xml b/pom.xml
@@ -234,7 +234,7 @@
         <version.org.wildfly.client.config>1.0.1.Final</version.org.wildfly.client.config>
         <version.org.wildfly.common>1.7.0.Final</version.org.wildfly.common>
         <version.org.wildfly.discovery>1.3.0.Final</version.org.wildfly.discovery>
-        <version.org.wildfly.installation-manager.installation-manager-api>1.0.3.Final-SNAPSHOT</version.org.wildfly.installation-manager.installation-manager-api>
+        <version.org.wildfly.installation-manager.installation-manager-api>1.0.3.Final</version.org.wildfly.installation-manager.installation-manager-api>
         <version.org.wildfly.legacy.test>8.0.2.Final</version.org.wildfly.legacy.test>
         <version.org.wildfly.openssl>2.2.5.Final</version.org.wildfly.openssl>
         <version.org.wildfly.openssl.natives>2.2.2.Final</version.org.wildfly.openssl.natives>

diff --git a/...s/test/integration/domain/installationmanager/InstallationManagerIntegrationTestCase.java b/...s/test/integration/domain/installationmanager/InstallationManagerIntegrationTestCase.java
diff --git a/.../jboss/as/test/manualmode/installationmanager/InstallationManagerIntegrationTestCase.java b/.../jboss/as/test/manualmode/installationmanager/InstallationManagerIntegrationTestCase.java
diff --git a/...esources/META-INF/services/org.wildfly.installationmanager.spi.InstallationManagerFactory b/...esources/META-INF/services/org.wildfly.installationmanager.spi.InstallationManagerFactory
diff --git a/...sources/org/jboss/as/test/manualmode/installationmanager/test-repo-one/dummy_file_one.txt b/...sources/org/jboss/as/test/manualmode/installationmanager/test-repo-one/dummy_file_one.txt
diff --git a/.../jboss/as/test/manualmode/installationmanager/test-repo-one/maven-repository/artifact-one b/.../jboss/as/test/manualmode/installationmanager/test-repo-one/maven-repository/artifact-one
diff --git a/.../test/manualmode/installationmanager/test-repo-one/other-directory-one/dummy_file_one.txt b/.../test/manualmode/installationmanager/test-repo-one/other-directory-one/dummy_file_one.txt
diff --git a/...sources/org/jboss/as/test/manualmode/installationmanager/test-repo-two/dummy_file_two.txt b/...sources/org/jboss/as/test/manualmode/installationmanager/test-repo-two/dummy_file_two.txt
diff --git a/.../jboss/as/test/manualmode/installationmanager/test-repo-two/maven-repository/artifact-two b/.../jboss/as/test/manualmode/installationmanager/test-repo-two/maven-repository/artifact-two
diff --git a/.../test/manualmode/installationmanager/test-repo-two/other-directory-two/dummy_file_two.txt b/.../test/manualmode/installationmanager/test-repo-two/other-directory-two/dummy_file_two.txt
diff --git a/...d/src/main/java/org/wildfly/test/installationmanager/BaseInstallationManagerTestCase.java b/...d/src/main/java/org/wildfly/test/installationmanager/BaseInstallationManagerTestCase.java
diff --git a/...ionmanager.spi.InstallationManagerFactory → ...ionmanager.spi.InstallationManagerFactory b/...ionmanager.spi.InstallationManagerFactory → ...ionmanager.spi.InstallationManagerFactory
diff --git a/...nmanager/test-repo-one/dummy_file_one.txt → ...nmanager/test-repo-one/dummy_file_one.txt b/...nmanager/test-repo-one/dummy_file_one.txt → ...nmanager/test-repo-one/dummy_file_one.txt
diff --git a/...st-repo-one/maven-repository/artifact-one → ...st-repo-one/maven-repository/artifact-one b/...st-repo-one/maven-repository/artifact-one → ...st-repo-one/maven-repository/artifact-one
diff --git a/...ne/other-directory-one/dummy_file_one.txt → ...ne/other-directory-one/dummy_file_one.txt b/...ne/other-directory-one/dummy_file_one.txt → ...ne/other-directory-one/dummy_file_one.txt
diff --git a/...nmanager/test-repo-two/dummy_file_two.txt → ...nmanager/test-repo-two/dummy_file_two.txt b/...nmanager/test-repo-two/dummy_file_two.txt → ...nmanager/test-repo-two/dummy_file_two.txt
diff --git a/...st-repo-two/maven-repository/artifact-two → ...st-repo-two/maven-repository/artifact-two b/...st-repo-two/maven-repository/artifact-two → ...st-repo-two/maven-repository/artifact-two
diff --git a/...wo/other-directory-two/dummy_file_two.txt → ...wo/other-directory-two/dummy_file_two.txt b/...wo/other-directory-two/dummy_file_two.txt → ...wo/other-directory-two/dummy_file_two.txt