From 86d4fe4eeb33c9c7ec62a01601dd77d1ae4d25cc Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Tue, 14 Apr 2015 21:17:01 +0200 Subject: [PATCH] [Major] refactored DataMigration.buildMigrationVersionChangeCommand() --- .../main/java/li/strolch/migrations/DataMigration.java | 2 +- .../src/main/java/li/strolch/migrations/Migration.java | 8 ++++---- .../test/java/li/strolch/migrations/MigrationsTest.java | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/li.strolch.service/src/main/java/li/strolch/migrations/DataMigration.java b/li.strolch.service/src/main/java/li/strolch/migrations/DataMigration.java index e4b38d95c..3150b8bfe 100644 --- a/li.strolch.service/src/main/java/li/strolch/migrations/DataMigration.java +++ b/li.strolch.service/src/main/java/li/strolch/migrations/DataMigration.java @@ -34,7 +34,7 @@ public class DataMigration extends Migration { command.setResourceTypes(Collections.emptySet()); tx.addCommand(command); - tx.addCommand(buildMigrationVersionChangeCommand(container, tx)); + buildMigrationVersionChangeCommand(container, tx); tx.commitOnClose(); } catch (Exception e) { String msg = MessageFormat.format("Migration of {0} failed due to {1}", getVersion(), e.getMessage()); diff --git a/li.strolch.service/src/main/java/li/strolch/migrations/Migration.java b/li.strolch.service/src/main/java/li/strolch/migrations/Migration.java index 283be50ac..3a675b2db 100644 --- a/li.strolch.service/src/main/java/li/strolch/migrations/Migration.java +++ b/li.strolch.service/src/main/java/li/strolch/migrations/Migration.java @@ -9,7 +9,6 @@ import li.strolch.model.ParameterBag; import li.strolch.model.Resource; import li.strolch.model.parameter.StringParameter; import li.strolch.persistence.api.StrolchTransaction; -import li.strolch.service.api.Command; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -52,7 +51,7 @@ public abstract class Migration { return container.getRealm(getRealm()).openTx(cert, getClass()); } - protected Command buildMigrationVersionChangeCommand(ComponentContainer container, StrolchTransaction tx) { + protected void buildMigrationVersionChangeCommand(ComponentContainer container, StrolchTransaction tx) { Resource migrationsRes = tx.getResourceBy(MIGRATIONS_TYPE, MIGRATIONS_ID); if (migrationsRes == null) { @@ -67,7 +66,8 @@ public abstract class Migration { AddResourceCommand cmd = new AddResourceCommand(container, tx); cmd.setResource(migrationsRes); - return cmd; + + tx.addCommand(cmd); } else { @@ -77,7 +77,7 @@ public abstract class Migration { cmd.setParameter(currentVersionP); cmd.setValueAsString(getVersion().toString()); - return cmd; + tx.addCommand(cmd); } } diff --git a/li.strolch.service/src/test/java/li/strolch/migrations/MigrationsTest.java b/li.strolch.service/src/test/java/li/strolch/migrations/MigrationsTest.java index f72f1410a..bce19ef6d 100644 --- a/li.strolch.service/src/test/java/li/strolch/migrations/MigrationsTest.java +++ b/li.strolch.service/src/test/java/li/strolch/migrations/MigrationsTest.java @@ -112,7 +112,7 @@ public class MigrationsTest { addOrderCommand.setOrder(fooOrder); tx.addCommand(addOrderCommand); - tx.addCommand(buildMigrationVersionChangeCommand(container, tx)); + buildMigrationVersionChangeCommand(container, tx); tx.commitOnClose(); } @@ -139,7 +139,7 @@ public class MigrationsTest { addOrderCommand.setOrder(fooOrder); tx.addCommand(addOrderCommand); - tx.addCommand(buildMigrationVersionChangeCommand(container, tx)); + buildMigrationVersionChangeCommand(container, tx); tx.commitOnClose(); } @@ -166,7 +166,7 @@ public class MigrationsTest { removeOrderCommand.setOrder(fooOrder); tx.addCommand(removeOrderCommand); - tx.addCommand(buildMigrationVersionChangeCommand(container, tx)); + buildMigrationVersionChangeCommand(container, tx); tx.commitOnClose(); }