Use DbUpgradeStep for the channel definition type and implementation …

…upgrade
flowable · Sep 26, 2024 · 3272edf · 3272edf
1 parent bd2984f
commit 3272edf
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 24 deletions.
diff --git a/...src/main/java/org/flowable/common/engine/impl/db/EngineSqlScriptBasedDbSchemaManager.java b/...src/main/java/org/flowable/common/engine/impl/db/EngineSqlScriptBasedDbSchemaManager.java
@@ -137,13 +137,11 @@ protected String schemaUpdateInLock() {
 
         boolean isEngineTablePresent = isEngineTablePresent();
 
-        ChangeLogVersion changeLogVersion = null;
         String dbVersion = null;
         if (isEngineTablePresent) {
             dbVersion = getDbVersion();
             if (dbVersion == null) {
-                changeLogVersion = getChangeLogVersion();
-                dbVersion = changeLogVersion.dbVersion();
+                dbVersion = getChangeLogVersion().dbVersion();
             }
         }
 
@@ -155,8 +153,6 @@ protected String schemaUpdateInLock() {
         if (isUpgradeNeeded) {
             // Engine upgrade
             dbSchemaUpgrade(context, matchingVersionIndex, dbVersion);
-            dbSchemaUpgraded(changeLogVersion);
-
             feedback = "upgraded Flowable from " + dbVersion + " to " + getEngineVersion();
 
         } else if (!isEngineTablePresent) {
@@ -171,10 +167,6 @@ public String getContext() {
         return context;
     }
 
-    protected void dbSchemaUpgraded(ChangeLogVersion changeLogVersion) {
-
-    }
-
     public boolean isEngineTablePresent() {
         return isTablePresent(getEngineTableName());
     }

diff --git a/...try/impl/cmd/UpdateChannelDefinitionTypeAndImplementationForAllChannelDefinitionsCmd.java b/...try/impl/cmd/UpdateChannelDefinitionTypeAndImplementationForAllChannelDefinitionsCmd.java
@@ -19,6 +19,8 @@
 
 import org.apache.commons.io.IOUtils;
 import org.flowable.common.engine.api.FlowableException;
+import org.flowable.common.engine.impl.context.Context;
+import org.flowable.common.engine.impl.db.DbUpgradeStep;
 import org.flowable.common.engine.impl.interceptor.Command;
 import org.flowable.common.engine.impl.interceptor.CommandContext;
 import org.flowable.eventregistry.api.ChannelDefinition;
@@ -31,7 +33,12 @@
 /**
  * @author Filip Hrisafov
  */
-public class UpdateChannelDefinitionTypeAndImplementationForAllChannelDefinitionsCmd implements Command<Void> {
+public class UpdateChannelDefinitionTypeAndImplementationForAllChannelDefinitionsCmd implements Command<Void>, DbUpgradeStep {
+
+    @Override
+    public void execute() throws Exception {
+        execute(Context.getCommandContext());
+    }
 
     @Override
     public Void execute(CommandContext commandContext) {

diff --git a/...event-registry/src/main/java/org/flowable/eventregistry/impl/db/EventDbSchemaManager.java b/...event-registry/src/main/java/org/flowable/eventregistry/impl/db/EventDbSchemaManager.java
@@ -15,11 +15,9 @@
 import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
-import org.flowable.common.engine.impl.AbstractEngineConfiguration;
 import org.flowable.common.engine.impl.db.EngineSchemaManagerLockConfiguration;
 import org.flowable.common.engine.impl.db.EngineSqlScriptBasedDbSchemaManager;
 import org.flowable.eventregistry.impl.EventRegistryEngine;
-import org.flowable.eventregistry.impl.cmd.UpdateChannelDefinitionTypeAndImplementationForAllChannelDefinitionsCmd;
 import org.flowable.eventregistry.impl.util.CommandContextUtil;
 
 public class EventDbSchemaManager extends EngineSqlScriptBasedDbSchemaManager {
@@ -71,18 +69,6 @@ protected String getDbVersionForChangelogVersion(String changeLogVersion) {
         return "6.5.0.0";
     }
 
-    protected AbstractEngineConfiguration getEngineConfiguration() {
-        return CommandContextUtil.getEventRegistryConfiguration();
-    }
-
-    @Override
-    protected void dbSchemaUpgraded(ChangeLogVersion changeLogVersion) {
-        String version = changeLogVersion.version();
-        if ("1".equals(version) || "2".equals(version)) {
-            getEngineConfiguration().getCommandExecutor().execute(new UpdateChannelDefinitionTypeAndImplementationForAllChannelDefinitionsCmd());
-        }
-    }
-
     @Override
     protected String getResourcesRootDirectory() {
         return "org/flowable/eventregistry/db/";

diff --git a/...flowable/eventregistry/db/upgrade/flowable.db2.upgradestep.6710.to.6720.eventregistry.sql b/...flowable/eventregistry/db/upgrade/flowable.db2.upgradestep.6710.to.6720.eventregistry.sql
@@ -6,4 +6,5 @@ ALTER TABLE FLW_CHANNEL_DEFINITION ADD IMPLEMENTATION_ VARCHAR(255);
 
 CALL SYSPROC.ADMIN_CMD ('REORG TABLE FLW_CHANNEL_DEFINITION');
 
+execute java org.flowable.eventregistry.impl.cmd.UpdateChannelDefinitionTypeAndImplementationForAllChannelDefinitionsCmd
 
diff --git a/.../flowable/eventregistry/db/upgrade/flowable.h2.upgradestep.6710.to.6720.eventregistry.sql b/.../flowable/eventregistry/db/upgrade/flowable.h2.upgradestep.6710.to.6720.eventregistry.sql
@@ -1,3 +1,5 @@
 ALTER TABLE FLW_CHANNEL_DEFINITION ADD TYPE_ VARCHAR(255);
 
 ALTER TABLE FLW_CHANNEL_DEFINITION ADD IMPLEMENTATION_ VARCHAR(255);
+
+execute java org.flowable.eventregistry.impl.cmd.UpdateChannelDefinitionTypeAndImplementationForAllChannelDefinitionsCmd
diff --git a/...owable/eventregistry/db/upgrade/flowable.mssql.upgradestep.6710.to.6720.eventregistry.sql b/...owable/eventregistry/db/upgrade/flowable.mssql.upgradestep.6710.to.6720.eventregistry.sql
@@ -1,3 +1,5 @@
 ALTER TABLE FLW_CHANNEL_DEFINITION ADD TYPE_ varchar(255);
 
 ALTER TABLE FLW_CHANNEL_DEFINITION ADD IMPLEMENTATION_ varchar(255);
+
+execute java org.flowable.eventregistry.impl.cmd.UpdateChannelDefinitionTypeAndImplementationForAllChannelDefinitionsCmd
diff --git a/...owable/eventregistry/db/upgrade/flowable.mysql.upgradestep.6710.to.6720.eventregistry.sql b/...owable/eventregistry/db/upgrade/flowable.mysql.upgradestep.6710.to.6720.eventregistry.sql
@@ -1,3 +1,5 @@
 ALTER TABLE FLW_CHANNEL_DEFINITION ADD TYPE_ VARCHAR(255) NULL;
 
 ALTER TABLE FLW_CHANNEL_DEFINITION ADD IMPLEMENTATION_ VARCHAR(255) NULL;
+
+execute java org.flowable.eventregistry.impl.cmd.UpdateChannelDefinitionTypeAndImplementationForAllChannelDefinitionsCmd
diff --git a/...wable/eventregistry/db/upgrade/flowable.oracle.upgradestep.6710.to.6720.eventregistry.sql b/...wable/eventregistry/db/upgrade/flowable.oracle.upgradestep.6710.to.6720.eventregistry.sql
@@ -1,3 +1,5 @@
 ALTER TABLE FLW_CHANNEL_DEFINITION ADD TYPE_ VARCHAR2(255);
 
 ALTER TABLE FLW_CHANNEL_DEFINITION ADD IMPLEMENTATION_ VARCHAR2(255);
+
+execute java org.flowable.eventregistry.impl.cmd.UpdateChannelDefinitionTypeAndImplementationForAllChannelDefinitionsCmd
diff --git a/...ble/eventregistry/db/upgrade/flowable.postgres.upgradestep.6710.to.6720.eventregistry.sql b/...ble/eventregistry/db/upgrade/flowable.postgres.upgradestep.6710.to.6720.eventregistry.sql
@@ -1,3 +1,5 @@
 ALTER TABLE FLW_CHANNEL_DEFINITION ADD TYPE_ VARCHAR(255);
 
 ALTER TABLE FLW_CHANNEL_DEFINITION ADD IMPLEMENTATION_ VARCHAR(255);
+
+execute java org.flowable.eventregistry.impl.cmd.UpdateChannelDefinitionTypeAndImplementationForAllChannelDefinitionsCmd