yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-11-14 09:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolve Merge conflicts, Java Checkstyle

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
openmetadata-service/src/main/java/org/openmetadata/service/migration/mysql/v1100/Migration.java
View File

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

13
openmetadata-service/src/main/java/org/openmetadata/service/migration/postgres/v1100/Migration.java
View File

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

1489
openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v1100/MigrationUtil.java
View File

File diff suppressed because it is too large Load Diff