Resolve Merge conflicts, Java Checkstyle

This commit is contained in:
Ram Narayan Balaji 2025-09-24 19:49:00 +05:30
parent b462268f70
commit 929e2a6b00
3 changed files with 757 additions and 755 deletions

View File

@ -19,11 +19,11 @@ public class Migration extends MigrationProcessImpl {
public void runDataMigration() {
MigrationUtil migrationUtil = new MigrationUtil(handle, ConnectionType.MYSQL);
migrationUtil.migrateEntityStatusForExistingEntities();
// Initialize WorkflowHandler before attempting to update workflows
// This ensures that Flowable engine is ready for validation
initializeWorkflowHandler();
// Initialize WorkflowHandler before attempting to update workflows
// This ensures that Flowable engine is ready for validation
initializeWorkflowHandler();
// Update GlossaryTermApprovalWorkflow: migrate to generic tasks and add thresholds
updateGlossaryTermApprovalWorkflow();
// Update GlossaryTermApprovalWorkflow: migrate to generic tasks and add thresholds
updateGlossaryTermApprovalWorkflow();
}
}

View File

@ -1,6 +1,9 @@
package org.openmetadata.service.migration.postgres.v1100;
import static org.openmetadata.service.migration.utils.v1100.MigrationUtil.updateGlossaryTermApprovalWorkflow;
import lombok.SneakyThrows;
import org.openmetadata.service.jdbi3.locator.ConnectionType;
import org.openmetadata.service.migration.api.MigrationProcessImpl;
import org.openmetadata.service.migration.utils.MigrationFile;
import org.openmetadata.service.migration.utils.v1100.MigrationUtil;
@ -16,11 +19,11 @@ public class Migration extends MigrationProcessImpl {
public void runDataMigration() {
MigrationUtil migrationUtil = new MigrationUtil(handle, ConnectionType.POSTGRES);
migrationUtil.migrateEntityStatusForExistingEntities();
// Initialize WorkflowHandler before attempting to update workflows
// This ensures that Flowable engine is ready for validation
initializeWorkflowHandler();
// Initialize WorkflowHandler before attempting to update workflows
// This ensures that Flowable engine is ready for validation
initializeWorkflowHandler();
// Update GlossaryTermApprovalWorkflow: migrate to generic tasks and add thresholds
updateGlossaryTermApprovalWorkflow();
// Update GlossaryTermApprovalWorkflow: migrate to generic tasks and add thresholds
updateGlossaryTermApprovalWorkflow();
}
}