diff --git a/dotCMS/src/main/java/com/dotmarketing/startup/runonce/Task241009CreatePostgresJobQueueTables.java b/dotCMS/src/main/java/com/dotmarketing/startup/runonce/Task241220CreatePostgresJobQueueTables.java similarity index 99% rename from dotCMS/src/main/java/com/dotmarketing/startup/runonce/Task241009CreatePostgresJobQueueTables.java rename to dotCMS/src/main/java/com/dotmarketing/startup/runonce/Task241220CreatePostgresJobQueueTables.java index df1d33198c28..b6487bdebb8a 100644 --- a/dotCMS/src/main/java/com/dotmarketing/startup/runonce/Task241009CreatePostgresJobQueueTables.java +++ b/dotCMS/src/main/java/com/dotmarketing/startup/runonce/Task241220CreatePostgresJobQueueTables.java @@ -15,7 +15,7 @@ * implementation. This task creates the job_queue, job, and job_history tables along with their * associated indexes. */ -public class Task241009CreatePostgresJobQueueTables implements StartupTask { +public class Task241220CreatePostgresJobQueueTables implements StartupTask { @Override public boolean forceRun() { diff --git a/dotCMS/src/main/java/com/dotmarketing/util/TaskLocatorUtil.java b/dotCMS/src/main/java/com/dotmarketing/util/TaskLocatorUtil.java index e48669802f32..ffeede95a0b5 100644 --- a/dotCMS/src/main/java/com/dotmarketing/util/TaskLocatorUtil.java +++ b/dotCMS/src/main/java/com/dotmarketing/util/TaskLocatorUtil.java @@ -247,7 +247,7 @@ import com.dotmarketing.startup.runonce.Task240513UpdateContentTypesSystemField; import com.dotmarketing.startup.runonce.Task240530AddDotAIPortletToLayout; import com.dotmarketing.startup.runonce.Task240606AddVariableColumnToWorkflow; -import com.dotmarketing.startup.runonce.Task241009CreatePostgresJobQueueTables; +import com.dotmarketing.startup.runonce.Task241220CreatePostgresJobQueueTables; import com.dotmarketing.startup.runonce.Task241013RemoveFullPathLcColumnFromIdentifier; import com.dotmarketing.startup.runonce.Task241014AddTemplateValueOnContentletIndex; import com.dotmarketing.startup.runonce.Task241015ReplaceLanguagesWithLocalesPortlet; @@ -572,11 +572,11 @@ public static List> getStartupRunOnceTaskClasses() { .add(Task240513UpdateContentTypesSystemField.class) .add(Task240530AddDotAIPortletToLayout.class) .add(Task240606AddVariableColumnToWorkflow.class) - .add(Task241009CreatePostgresJobQueueTables.class) .add(Task241013RemoveFullPathLcColumnFromIdentifier.class) .add(Task241014AddTemplateValueOnContentletIndex.class) .add(Task241015ReplaceLanguagesWithLocalesPortlet.class) - .add(Task241016AddCustomLanguageVariablesPortletToLayout.class) + .add(Task241016AddCustomLanguageVariablesPortletToLayout.class) + .add(Task241220CreatePostgresJobQueueTables.class) .build(); return ret.stream().sorted(classNameComparator).collect(Collectors.toList()); } diff --git a/dotcms-integration/src/test/java/com/dotcms/MainSuite2b.java b/dotcms-integration/src/test/java/com/dotcms/MainSuite2b.java index c3c016e5fc34..91d8c6377748 100644 --- a/dotcms-integration/src/test/java/com/dotcms/MainSuite2b.java +++ b/dotcms-integration/src/test/java/com/dotcms/MainSuite2b.java @@ -187,7 +187,7 @@ import com.dotmarketing.startup.runonce.Task240513UpdateContentTypesSystemFieldTest; import com.dotmarketing.startup.runonce.Task240530AddDotAIPortletToLayoutTest; import com.dotmarketing.startup.runonce.Task240606AddVariableColumnToWorkflowTest; -import com.dotmarketing.startup.runonce.Task241009CreatePostgresJobQueueTablesTest; +import com.dotmarketing.startup.runonce.Task241220CreatePostgresJobQueueTablesTest; import com.dotmarketing.startup.runonce.Task241013RemoveFullPathLcColumnFromIdentifierTest; import com.dotmarketing.startup.runonce.Task241015ReplaceLanguagesWithLocalesPortletTest; import com.dotmarketing.startup.runonce.Task241016AddCustomLanguageVariablesPortletToLayoutTest; @@ -397,8 +397,7 @@ SimpleJUnit4InjectionIT.class, LegacyJSONObjectRenderTest.class, Task241013RemoveFullPathLcColumnFromIdentifierTest.class, - Task241009CreatePostgresJobQueueTablesTest.class, - + Task241220CreatePostgresJobQueueTablesTest.class, UniqueFieldDataBaseUtilTest.class, DBUniqueFieldValidationStrategyTest.class, Task241013RemoveFullPathLcColumnFromIdentifierTest.class, diff --git a/dotcms-integration/src/test/java/com/dotmarketing/startup/runonce/Task241009CreatePostgresJobQueueTablesTest.java b/dotcms-integration/src/test/java/com/dotmarketing/startup/runonce/Task241220CreatePostgresJobQueueTablesTest.java similarity index 92% rename from dotcms-integration/src/test/java/com/dotmarketing/startup/runonce/Task241009CreatePostgresJobQueueTablesTest.java rename to dotcms-integration/src/test/java/com/dotmarketing/startup/runonce/Task241220CreatePostgresJobQueueTablesTest.java index 6f68e59edd57..c7bc8627d647 100644 --- a/dotcms-integration/src/test/java/com/dotmarketing/startup/runonce/Task241009CreatePostgresJobQueueTablesTest.java +++ b/dotcms-integration/src/test/java/com/dotmarketing/startup/runonce/Task241220CreatePostgresJobQueueTablesTest.java @@ -19,14 +19,14 @@ import org.junit.Test; /** - * Test class for {@link Task241009CreatePostgresJobQueueTables}. + * Test class for {@link Task241220CreatePostgresJobQueueTables}. *

* This test class ensures that the job queue tables are properly created by the upgrade task. *

* The test first drops the tables if they exist, then executes the upgrade task and validates that * the tables were successfully created. */ -public class Task241009CreatePostgresJobQueueTablesTest extends IntegrationTestBase { +public class Task241220CreatePostgresJobQueueTablesTest extends IntegrationTestBase { /** * Initializes the test environment and ensures the job queue tables do not exist. @@ -66,8 +66,8 @@ private void dropTablesIfExist() { } /** - * Method to test {@link Task241009CreatePostgresJobQueueTables#executeUpgrade()} and - * {@link Task241009CreatePostgresJobQueueTables#forceRun()}. + * Method to test {@link Task241220CreatePostgresJobQueueTables#executeUpgrade()} and + * {@link Task241220CreatePostgresJobQueueTables#forceRun()}. *

* Given Scenario: The job queue tables do not exist. *

@@ -98,8 +98,8 @@ public void executeTaskUpgrade() throws SQLException, DotDataException, DotSecur } /** - * Method to test {@link Task241009CreatePostgresJobQueueTables#executeUpgrade()} and - * {@link Task241009CreatePostgresJobQueueTables#forceRun()}. + * Method to test {@link Task241220CreatePostgresJobQueueTables#executeUpgrade()} and + * {@link Task241220CreatePostgresJobQueueTables#forceRun()}. *

* Given Scenario: The job queue tables do not exist, and the upgrade task is run twice. *

@@ -130,7 +130,7 @@ public void executeTaskUpgradeTwice() // Run the upgrade task again, should not fail LocalTransaction.wrap(() -> { try { - final var task = new Task241009CreatePostgresJobQueueTables(); + final var task = new Task241220CreatePostgresJobQueueTables(); task.executeUpgrade(); } catch (Exception e) { final var message = "The upgrade task should not fail when the tables already exist"; @@ -149,7 +149,7 @@ public void executeTaskUpgradeTwice() private static void executeUpgradeAndValidate() throws SQLException, DotDataException, DotSecurityException { - final var task = new Task241009CreatePostgresJobQueueTables(); + final var task = new Task241220CreatePostgresJobQueueTables(); final Connection connection = DbConnectionFactory.getConnection(); final DotDatabaseMetaData databaseMetaData = new DotDatabaseMetaData();