Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Minor] code cleanup in AbstractTransaction

This commit is contained in:
Robert von Burg 2021-07-16 15:39:37 +02:00
parent afed799dba
commit a213866787
1 changed files with 45 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
li.strolch.agent/src/main/java/li/strolch/persistence/api/AbstractTransaction.java
View File

@ -1403,44 +1403,42 @@ public abstract class AbstractTransaction implements StrolchTransaction {
if (this.objectFilter == null) if (this.objectFilter == null)
return; return;
List<Object> changed;
/* /*
* Resources * Resources
*/ */
// removed // removed
changed = this.objectFilter.getRemoved(Tags.RESOURCE); List<Resource> changedR = this.objectFilter.getRemoved(Resource.class, Tags.RESOURCE);
if (changed.size() == 1) { if (changedR.size() == 1) {
RemoveResourceCommand cmd = new RemoveResourceCommand(this); RemoveResourceCommand cmd = new RemoveResourceCommand(this);
cmd.setResource((Resource) changed.get(0)); cmd.setResource(changedR.get(0));
addCommand(cmd); addCommand(cmd);
} else if (changed.size() > 1) { } else if (changedR.size() > 1) {
RemoveResourcesCommand cmd = new RemoveResourcesCommand(this); RemoveResourcesCommand cmd = new RemoveResourcesCommand(this);
changed.stream().map(e -> (Resource) e).forEach(cmd::addResource); cmd.setResources(changedR);
addCommand(cmd); addCommand(cmd);
} }
// updated // updated
changed = this.objectFilter.getUpdated(Tags.RESOURCE); changedR = this.objectFilter.getUpdated(Resource.class, Tags.RESOURCE);
if (changed.size() == 1) { if (changedR.size() == 1) {
UpdateResourceCommand cmd = new UpdateResourceCommand(this); UpdateResourceCommand cmd = new UpdateResourceCommand(this);
cmd.setResource((Resource) changed.get(0)); cmd.setResource(changedR.get(0));
addCommand(cmd); addCommand(cmd);
} else if (changed.size() > 1) { } else if (changedR.size() > 1) {
UpdateResourcesCommand cmd = new UpdateResourcesCommand(this); UpdateResourcesCommand cmd = new UpdateResourcesCommand(this);
changed.stream().map(e -> (Resource) e).forEach(cmd::addResource); cmd.setResources(changedR);
addCommand(cmd); addCommand(cmd);
} }
// added // added
changed = this.objectFilter.getAdded(Tags.RESOURCE); changedR = this.objectFilter.getAdded(Resource.class, Tags.RESOURCE);
if (changed.size() == 1) { if (changedR.size() == 1) {
AddResourceCommand cmd = new AddResourceCommand(this); AddResourceCommand cmd = new AddResourceCommand(this);
cmd.setResource((Resource) changed.get(0)); cmd.setResource((Resource) changedR.get(0));
addCommand(cmd); addCommand(cmd);
} else if (changed.size() > 1) { } else if (changedR.size() > 1) {
AddResourcesCommand cmd = new AddResourcesCommand(this); AddResourcesCommand cmd = new AddResourcesCommand(this);
changed.stream().map(e -> (Resource) e).forEach(cmd::addResource); changedR.stream().map(e -> (Resource) e).forEach(cmd::addResource);
addCommand(cmd); addCommand(cmd);
} }
@ -1448,38 +1446,38 @@ public abstract class AbstractTransaction implements StrolchTransaction {
* Orders * Orders
*/ */
// removed // removed
changed = this.objectFilter.getRemoved(Tags.ORDER); List<Order> changedO = this.objectFilter.getRemoved(Order.class, Tags.ORDER);
if (changed.size() == 1) { if (changedO.size() == 1) {
RemoveOrderCommand cmd = new RemoveOrderCommand(this); RemoveOrderCommand cmd = new RemoveOrderCommand(this);
cmd.setOrder((Order) changed.get(0)); cmd.setOrder(changedO.get(0));
addCommand(cmd); addCommand(cmd);
} else if (changed.size() > 1) { } else if (changedO.size() > 1) {
RemoveOrdersCommand cmd = new RemoveOrdersCommand(this); RemoveOrdersCommand cmd = new RemoveOrdersCommand(this);
changed.stream().map(e -> (Order) e).forEach(cmd::addOrder); cmd.setOrders(changedO);
addCommand(cmd); addCommand(cmd);
} }
// updated // updated
changed = this.objectFilter.getUpdated(Tags.ORDER); changedO = this.objectFilter.getUpdated(Order.class, Tags.ORDER);
if (changed.size() == 1) { if (changedO.size() == 1) {
UpdateOrderCommand cmd = new UpdateOrderCommand(this); UpdateOrderCommand cmd = new UpdateOrderCommand(this);
cmd.setOrder((Order) changed.get(0)); cmd.setOrder(changedO.get(0));
addCommand(cmd); addCommand(cmd);
} else if (changed.size() > 1) { } else if (changedO.size() > 1) {
UpdateOrdersCommand cmd = new UpdateOrdersCommand(this); UpdateOrdersCommand cmd = new UpdateOrdersCommand(this);
changed.stream().map(e -> (Order) e).forEach(cmd::addOrder); cmd.setOrders(changedO);
addCommand(cmd); addCommand(cmd);
} }
// added // added
changed = this.objectFilter.getAdded(Tags.ORDER); changedO = this.objectFilter.getAdded(Order.class, Tags.ORDER);
if (changed.size() == 1) { if (changedO.size() == 1) {
AddOrderCommand cmd = new AddOrderCommand(this); AddOrderCommand cmd = new AddOrderCommand(this);
cmd.setOrder((Order) changed.get(0)); cmd.setOrder(changedO.get(0));
addCommand(cmd); addCommand(cmd);
} else if (changed.size() > 1) { } else if (changedO.size() > 1) {
AddOrdersCommand cmd = new AddOrdersCommand(this); AddOrdersCommand cmd = new AddOrdersCommand(this);
changed.stream().map(e -> (Order) e).forEach(cmd::addOrder); cmd.setOrders(changedO);
addCommand(cmd); addCommand(cmd);
} }
@ -1487,38 +1485,38 @@ public abstract class AbstractTransaction implements StrolchTransaction {
* Activities * Activities
*/ */
// removed // removed
changed = this.objectFilter.getRemoved(Tags.ACTIVITY); List<Activity> changedA = this.objectFilter.getRemoved(Activity.class, Tags.ACTIVITY);
if (changed.size() == 1) { if (changedA.size() == 1) {
RemoveActivityCommand cmd = new RemoveActivityCommand(this); RemoveActivityCommand cmd = new RemoveActivityCommand(this);
cmd.setActivity((Activity) changed.get(0)); cmd.setActivity(changedA.get(0));
addCommand(cmd); addCommand(cmd);
} else if (changed.size() > 1) { } else if (changedA.size() > 1) {
RemoveActivitiesCommand cmd = new RemoveActivitiesCommand(this); RemoveActivitiesCommand cmd = new RemoveActivitiesCommand(this);
changed.stream().map(e -> (Activity) e).forEach(cmd::addActivity); cmd.setActivities(changedA);
addCommand(cmd); addCommand(cmd);
} }
// updated // updated
changed = this.objectFilter.getUpdated(Tags.ACTIVITY); changedA = this.objectFilter.getUpdated(Activity.class, Tags.ACTIVITY);
if (changed.size() == 1) { if (changedA.size() == 1) {
UpdateActivityCommand cmd = new UpdateActivityCommand(this); UpdateActivityCommand cmd = new UpdateActivityCommand(this);
cmd.setActivity((Activity) changed.get(0)); cmd.setActivity(changedA.get(0));
addCommand(cmd); addCommand(cmd);
} else if (changed.size() > 1) { } else if (changedA.size() > 1) {
UpdateActivitiesCommand cmd = new UpdateActivitiesCommand(this); UpdateActivitiesCommand cmd = new UpdateActivitiesCommand(this);
changed.stream().map(e -> (Activity) e).forEach(cmd::addActivity); cmd.setActivities(changedA);
addCommand(cmd); addCommand(cmd);
} }
// added // added
changed = this.objectFilter.getAdded(Tags.ACTIVITY); changedA = this.objectFilter.getAdded(Activity.class, Tags.ACTIVITY);
if (changed.size() == 1) { if (changedA.size() == 1) {
AddActivityCommand cmd = new AddActivityCommand(this); AddActivityCommand cmd = new AddActivityCommand(this);
cmd.setActivity((Activity) changed.get(0)); cmd.setActivity(changedA.get(0));
addCommand(cmd); addCommand(cmd);
} else if (changed.size() > 1) { } else if (changedA.size() > 1) {
AddActivitiesCommand cmd = new AddActivitiesCommand(this); AddActivitiesCommand cmd = new AddActivitiesCommand(this);
changed.stream().map(e -> (Activity) e).forEach(cmd::addActivitiy); cmd.setActivities(changedA);
addCommand(cmd); addCommand(cmd);
} }