[Major] refactored DataMigration.buildMigrationVersionChangeCommand()
This commit is contained in:
parent
3154899f77
commit
86d4fe4eeb
|
@ -34,7 +34,7 @@ public class DataMigration extends Migration {
|
||||||
command.setResourceTypes(Collections.emptySet());
|
command.setResourceTypes(Collections.emptySet());
|
||||||
|
|
||||||
tx.addCommand(command);
|
tx.addCommand(command);
|
||||||
tx.addCommand(buildMigrationVersionChangeCommand(container, tx));
|
buildMigrationVersionChangeCommand(container, tx);
|
||||||
tx.commitOnClose();
|
tx.commitOnClose();
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
String msg = MessageFormat.format("Migration of {0} failed due to {1}", getVersion(), e.getMessage());
|
String msg = MessageFormat.format("Migration of {0} failed due to {1}", getVersion(), e.getMessage());
|
||||||
|
|
|
@ -9,7 +9,6 @@ import li.strolch.model.ParameterBag;
|
||||||
import li.strolch.model.Resource;
|
import li.strolch.model.Resource;
|
||||||
import li.strolch.model.parameter.StringParameter;
|
import li.strolch.model.parameter.StringParameter;
|
||||||
import li.strolch.persistence.api.StrolchTransaction;
|
import li.strolch.persistence.api.StrolchTransaction;
|
||||||
import li.strolch.service.api.Command;
|
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
@ -52,7 +51,7 @@ public abstract class Migration {
|
||||||
return container.getRealm(getRealm()).openTx(cert, getClass());
|
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);
|
Resource migrationsRes = tx.getResourceBy(MIGRATIONS_TYPE, MIGRATIONS_ID);
|
||||||
if (migrationsRes == null) {
|
if (migrationsRes == null) {
|
||||||
|
@ -67,7 +66,8 @@ public abstract class Migration {
|
||||||
|
|
||||||
AddResourceCommand cmd = new AddResourceCommand(container, tx);
|
AddResourceCommand cmd = new AddResourceCommand(container, tx);
|
||||||
cmd.setResource(migrationsRes);
|
cmd.setResource(migrationsRes);
|
||||||
return cmd;
|
|
||||||
|
tx.addCommand(cmd);
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
|
@ -77,7 +77,7 @@ public abstract class Migration {
|
||||||
cmd.setParameter(currentVersionP);
|
cmd.setParameter(currentVersionP);
|
||||||
cmd.setValueAsString(getVersion().toString());
|
cmd.setValueAsString(getVersion().toString());
|
||||||
|
|
||||||
return cmd;
|
tx.addCommand(cmd);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -112,7 +112,7 @@ public class MigrationsTest {
|
||||||
addOrderCommand.setOrder(fooOrder);
|
addOrderCommand.setOrder(fooOrder);
|
||||||
tx.addCommand(addOrderCommand);
|
tx.addCommand(addOrderCommand);
|
||||||
|
|
||||||
tx.addCommand(buildMigrationVersionChangeCommand(container, tx));
|
buildMigrationVersionChangeCommand(container, tx);
|
||||||
|
|
||||||
tx.commitOnClose();
|
tx.commitOnClose();
|
||||||
}
|
}
|
||||||
|
@ -139,7 +139,7 @@ public class MigrationsTest {
|
||||||
addOrderCommand.setOrder(fooOrder);
|
addOrderCommand.setOrder(fooOrder);
|
||||||
tx.addCommand(addOrderCommand);
|
tx.addCommand(addOrderCommand);
|
||||||
|
|
||||||
tx.addCommand(buildMigrationVersionChangeCommand(container, tx));
|
buildMigrationVersionChangeCommand(container, tx);
|
||||||
|
|
||||||
tx.commitOnClose();
|
tx.commitOnClose();
|
||||||
}
|
}
|
||||||
|
@ -166,7 +166,7 @@ public class MigrationsTest {
|
||||||
removeOrderCommand.setOrder(fooOrder);
|
removeOrderCommand.setOrder(fooOrder);
|
||||||
tx.addCommand(removeOrderCommand);
|
tx.addCommand(removeOrderCommand);
|
||||||
|
|
||||||
tx.addCommand(buildMigrationVersionChangeCommand(container, tx));
|
buildMigrationVersionChangeCommand(container, tx);
|
||||||
|
|
||||||
tx.commitOnClose();
|
tx.commitOnClose();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue