[Minor] removed uses of deprecated methods
This commit is contained in:
parent
3e4cba757e
commit
9cf1e925c5
|
@ -79,7 +79,7 @@ public class Controller {
|
||||||
public ExecutionPolicy refreshExecutionPolicy(StrolchTransaction tx, Action action) {
|
public ExecutionPolicy refreshExecutionPolicy(StrolchTransaction tx, Action action) {
|
||||||
ExecutionPolicy executionPolicy = this.inExecution.computeIfAbsent(action.getLocator(), e -> {
|
ExecutionPolicy executionPolicy = this.inExecution.computeIfAbsent(action.getLocator(), e -> {
|
||||||
Resource resource = tx.getResourceFor(action, true);
|
Resource resource = tx.getResourceFor(action, true);
|
||||||
return tx.getPolicy(resource.getPolicyDef(ExecutionPolicy.class));
|
return tx.getPolicy(resource, ExecutionPolicy.class);
|
||||||
});
|
});
|
||||||
|
|
||||||
// always update the TX and controller
|
// always update the TX and controller
|
||||||
|
|
|
@ -25,7 +25,7 @@ public abstract class ActionExecutionCommand extends BasePlanningAndExecutionCom
|
||||||
protected ExecutionPolicy getExecutionPolicy(Action action) {
|
protected ExecutionPolicy getExecutionPolicy(Action action) {
|
||||||
if (this.executionPolicy != null)
|
if (this.executionPolicy != null)
|
||||||
return this.executionPolicy;
|
return this.executionPolicy;
|
||||||
return tx().getPolicy(action.getPolicyDef(ExecutionPolicy.class));
|
return tx().getPolicy(action, ExecutionPolicy.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -1,11 +1,8 @@
|
||||||
package li.strolch.execution.command;
|
package li.strolch.execution.command;
|
||||||
|
|
||||||
import static li.strolch.execution.policy.ActivityArchivalPolicy.DEFAULT_ACTIVITY_ARCHIVAL;
|
|
||||||
|
|
||||||
import li.strolch.execution.policy.ActivityArchivalPolicy;
|
import li.strolch.execution.policy.ActivityArchivalPolicy;
|
||||||
import li.strolch.model.Locator;
|
import li.strolch.model.Locator;
|
||||||
import li.strolch.model.activity.Activity;
|
import li.strolch.model.activity.Activity;
|
||||||
import li.strolch.model.policy.PolicyDef;
|
|
||||||
import li.strolch.persistence.api.StrolchTransaction;
|
import li.strolch.persistence.api.StrolchTransaction;
|
||||||
import li.strolch.service.api.Command;
|
import li.strolch.service.api.Command;
|
||||||
import li.strolch.utils.dbc.DBC;
|
import li.strolch.utils.dbc.DBC;
|
||||||
|
@ -39,8 +36,6 @@ public class ArchiveActivityCommand extends Command {
|
||||||
|
|
||||||
logger.info("Activity " + activity.getLocator() + " is in state " + activity.getState());
|
logger.info("Activity " + activity.getLocator() + " is in state " + activity.getState());
|
||||||
|
|
||||||
PolicyDef policyDef = activity.getPolicyDef(ActivityArchivalPolicy.class, DEFAULT_ACTIVITY_ARCHIVAL);
|
tx().getPolicy(activity, ActivityArchivalPolicy.class).archive(activity);
|
||||||
ActivityArchivalPolicy archivalPolicy = tx().getPolicy(policyDef);
|
|
||||||
archivalPolicy.archive(activity);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -22,6 +22,7 @@ import li.strolch.model.Resource;
|
||||||
import li.strolch.model.State;
|
import li.strolch.model.State;
|
||||||
import li.strolch.model.activity.Action;
|
import li.strolch.model.activity.Action;
|
||||||
import li.strolch.model.activity.Activity;
|
import li.strolch.model.activity.Activity;
|
||||||
|
import li.strolch.model.policy.PolicyDef;
|
||||||
import li.strolch.persistence.api.StrolchTransaction;
|
import li.strolch.persistence.api.StrolchTransaction;
|
||||||
import li.strolch.utils.dbc.DBC;
|
import li.strolch.utils.dbc.DBC;
|
||||||
|
|
||||||
|
@ -77,9 +78,11 @@ public class AssignActionCommand extends PlanningCommand {
|
||||||
@Override
|
@Override
|
||||||
public Void visitAction(Action action) {
|
public Void visitAction(Action action) {
|
||||||
|
|
||||||
|
PolicyDef planningPolicyDef = action.findPolicy(PlanningPolicy.class, DEFAULT_PLANNING);
|
||||||
|
|
||||||
// unplan the action
|
// unplan the action
|
||||||
if (action.getState() == State.PLANNED) {
|
if (action.getState() == State.PLANNED) {
|
||||||
PlanningPolicy planningPolicy = tx().getPolicy(action.findPolicy(PlanningPolicy.class, DEFAULT_PLANNING));
|
PlanningPolicy planningPolicy = tx().getPolicy(PlanningPolicy.class, planningPolicyDef);
|
||||||
planningPolicy.unplan(action);
|
planningPolicy.unplan(action);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -88,7 +91,7 @@ public class AssignActionCommand extends PlanningCommand {
|
||||||
action.setResourceType(this.targetResourceType);
|
action.setResourceType(this.targetResourceType);
|
||||||
|
|
||||||
// finally plan the action to the assigned resource
|
// finally plan the action to the assigned resource
|
||||||
PlanningPolicy planningPolicy = tx().getPolicy(action.findPolicy(PlanningPolicy.class, DEFAULT_PLANNING));
|
PlanningPolicy planningPolicy = tx().getPolicy(PlanningPolicy.class, planningPolicyDef);
|
||||||
planningPolicy.plan(action);
|
planningPolicy.plan(action);
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
|
|
|
@ -22,6 +22,7 @@ import li.strolch.model.Resource;
|
||||||
import li.strolch.model.State;
|
import li.strolch.model.State;
|
||||||
import li.strolch.model.activity.Action;
|
import li.strolch.model.activity.Action;
|
||||||
import li.strolch.model.activity.Activity;
|
import li.strolch.model.activity.Activity;
|
||||||
|
import li.strolch.model.policy.PolicyDef;
|
||||||
import li.strolch.model.timedstate.StrolchTimedState;
|
import li.strolch.model.timedstate.StrolchTimedState;
|
||||||
import li.strolch.model.timevalue.IValueChange;
|
import li.strolch.model.timevalue.IValueChange;
|
||||||
import li.strolch.persistence.api.StrolchTransaction;
|
import li.strolch.persistence.api.StrolchTransaction;
|
||||||
|
@ -66,7 +67,8 @@ public class PlanActionCommand extends PlanningCommand {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Void visitAction(Action action) {
|
public Void visitAction(Action action) {
|
||||||
PlanningPolicy planningPolicy = tx().getPolicy(action.findPolicy(PlanningPolicy.class, DEFAULT_PLANNING));
|
PolicyDef planningPolicyDef = action.findPolicy(PlanningPolicy.class, DEFAULT_PLANNING);
|
||||||
|
PlanningPolicy planningPolicy = tx().getPolicy(PlanningPolicy.class, planningPolicyDef);
|
||||||
planningPolicy.plan(action);
|
planningPolicy.plan(action);
|
||||||
if (action.getState() == State.PLANNED)
|
if (action.getState() == State.PLANNED)
|
||||||
getConfirmationPolicy(action).toPlanned(action);
|
getConfirmationPolicy(action).toPlanned(action);
|
||||||
|
|
|
@ -22,6 +22,7 @@ import li.strolch.model.Resource;
|
||||||
import li.strolch.model.State;
|
import li.strolch.model.State;
|
||||||
import li.strolch.model.activity.Action;
|
import li.strolch.model.activity.Action;
|
||||||
import li.strolch.model.activity.Activity;
|
import li.strolch.model.activity.Activity;
|
||||||
|
import li.strolch.model.policy.PolicyDef;
|
||||||
import li.strolch.model.timedstate.StrolchTimedState;
|
import li.strolch.model.timedstate.StrolchTimedState;
|
||||||
import li.strolch.model.timevalue.IValueChange;
|
import li.strolch.model.timevalue.IValueChange;
|
||||||
import li.strolch.persistence.api.StrolchTransaction;
|
import li.strolch.persistence.api.StrolchTransaction;
|
||||||
|
@ -66,7 +67,8 @@ public class PlanActivityCommand extends PlanningCommand {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Void visitAction(Action action) {
|
public Void visitAction(Action action) {
|
||||||
PlanningPolicy planningPolicy = tx().getPolicy(action.findPolicy(PlanningPolicy.class, DEFAULT_PLANNING));
|
PolicyDef planningPolicyDef = action.findPolicy(PlanningPolicy.class, DEFAULT_PLANNING);
|
||||||
|
PlanningPolicy planningPolicy = tx().getPolicy(PlanningPolicy.class, planningPolicyDef);
|
||||||
planningPolicy.plan(action);
|
planningPolicy.plan(action);
|
||||||
if (action.getState() == State.PLANNED)
|
if (action.getState() == State.PLANNED)
|
||||||
getConfirmationPolicy(action).toPlanned(action);
|
getConfirmationPolicy(action).toPlanned(action);
|
||||||
|
|
|
@ -23,6 +23,7 @@ import li.strolch.execution.policy.PlanningPolicy;
|
||||||
import li.strolch.model.State;
|
import li.strolch.model.State;
|
||||||
import li.strolch.model.activity.Action;
|
import li.strolch.model.activity.Action;
|
||||||
import li.strolch.model.activity.Activity;
|
import li.strolch.model.activity.Activity;
|
||||||
|
import li.strolch.model.policy.PolicyDef;
|
||||||
import li.strolch.model.timevalue.IValue;
|
import li.strolch.model.timevalue.IValue;
|
||||||
import li.strolch.model.timevalue.IValueChange;
|
import li.strolch.model.timevalue.IValueChange;
|
||||||
import li.strolch.persistence.api.StrolchTransaction;
|
import li.strolch.persistence.api.StrolchTransaction;
|
||||||
|
@ -67,9 +68,11 @@ public class ShiftActionCommand extends PlanningCommand {
|
||||||
@Override
|
@Override
|
||||||
public Void visitAction(Action action) {
|
public Void visitAction(Action action) {
|
||||||
|
|
||||||
|
PolicyDef planningPolicyDef = action.findPolicy(PlanningPolicy.class, DEFAULT_PLANNING);
|
||||||
|
|
||||||
// unplan the action
|
// unplan the action
|
||||||
if (action.getState() == State.PLANNED) {
|
if (action.getState() == State.PLANNED) {
|
||||||
PlanningPolicy planningPolicy = tx().getPolicy(action.findPolicy(PlanningPolicy.class, DEFAULT_PLANNING));
|
PlanningPolicy planningPolicy = tx().getPolicy(PlanningPolicy.class, planningPolicyDef);
|
||||||
planningPolicy.unplan(action);
|
planningPolicy.unplan(action);
|
||||||
if (action.getState() == State.CREATED)
|
if (action.getState() == State.CREATED)
|
||||||
getConfirmationPolicy(action).toCreated(action);
|
getConfirmationPolicy(action).toCreated(action);
|
||||||
|
@ -82,7 +85,7 @@ public class ShiftActionCommand extends PlanningCommand {
|
||||||
}
|
}
|
||||||
|
|
||||||
// finally plan the action
|
// finally plan the action
|
||||||
PlanningPolicy planningPolicy = tx().getPolicy(action.findPolicy(PlanningPolicy.class, DEFAULT_PLANNING));
|
PlanningPolicy planningPolicy = tx().getPolicy(PlanningPolicy.class, planningPolicyDef);
|
||||||
planningPolicy.plan(action);
|
planningPolicy.plan(action);
|
||||||
if (action.getState() == State.PLANNED)
|
if (action.getState() == State.PLANNED)
|
||||||
getConfirmationPolicy(action).toPlanned(action);
|
getConfirmationPolicy(action).toPlanned(action);
|
||||||
|
|
|
@ -22,6 +22,7 @@ import li.strolch.model.Resource;
|
||||||
import li.strolch.model.State;
|
import li.strolch.model.State;
|
||||||
import li.strolch.model.activity.Action;
|
import li.strolch.model.activity.Action;
|
||||||
import li.strolch.model.activity.Activity;
|
import li.strolch.model.activity.Activity;
|
||||||
|
import li.strolch.model.policy.PolicyDef;
|
||||||
import li.strolch.model.timedstate.StrolchTimedState;
|
import li.strolch.model.timedstate.StrolchTimedState;
|
||||||
import li.strolch.model.timevalue.IValueChange;
|
import li.strolch.model.timevalue.IValueChange;
|
||||||
import li.strolch.persistence.api.StrolchTransaction;
|
import li.strolch.persistence.api.StrolchTransaction;
|
||||||
|
@ -68,7 +69,8 @@ public class UnplanActionCommand extends PlanningCommand {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Void visitAction(Action action) {
|
public Void visitAction(Action action) {
|
||||||
PlanningPolicy planningPolicy = tx().getPolicy(action.findPolicy(PlanningPolicy.class, DEFAULT_PLANNING));
|
PolicyDef planningPolicyDef = action.findPolicy(PlanningPolicy.class, DEFAULT_PLANNING);
|
||||||
|
PlanningPolicy planningPolicy = tx().getPolicy(PlanningPolicy.class, planningPolicyDef);
|
||||||
planningPolicy.unplan(action);
|
planningPolicy.unplan(action);
|
||||||
if (action.getState() == State.CREATED)
|
if (action.getState() == State.CREATED)
|
||||||
getConfirmationPolicy(action).toCreated(action);
|
getConfirmationPolicy(action).toCreated(action);
|
||||||
|
|
|
@ -22,6 +22,7 @@ import li.strolch.model.Resource;
|
||||||
import li.strolch.model.State;
|
import li.strolch.model.State;
|
||||||
import li.strolch.model.activity.Action;
|
import li.strolch.model.activity.Action;
|
||||||
import li.strolch.model.activity.Activity;
|
import li.strolch.model.activity.Activity;
|
||||||
|
import li.strolch.model.policy.PolicyDef;
|
||||||
import li.strolch.model.timedstate.StrolchTimedState;
|
import li.strolch.model.timedstate.StrolchTimedState;
|
||||||
import li.strolch.model.timevalue.IValueChange;
|
import li.strolch.model.timevalue.IValueChange;
|
||||||
import li.strolch.persistence.api.StrolchTransaction;
|
import li.strolch.persistence.api.StrolchTransaction;
|
||||||
|
@ -66,7 +67,8 @@ public class UnplanActivityCommand extends PlanningCommand {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Void visitAction(Action action) {
|
public Void visitAction(Action action) {
|
||||||
PlanningPolicy planningPolicy = tx().getPolicy(action.findPolicy(PlanningPolicy.class, DEFAULT_PLANNING));
|
PolicyDef planningPolicyDef = action.findPolicy(PlanningPolicy.class, DEFAULT_PLANNING);
|
||||||
|
PlanningPolicy planningPolicy = tx().getPolicy(PlanningPolicy.class, planningPolicyDef);
|
||||||
planningPolicy.unplan(action);
|
planningPolicy.unplan(action);
|
||||||
if (action.getState() == State.CREATED)
|
if (action.getState() == State.CREATED)
|
||||||
getConfirmationPolicy(action).toCreated(action);
|
getConfirmationPolicy(action).toCreated(action);
|
||||||
|
|
|
@ -20,8 +20,9 @@ public class ValueRefReportFilter extends ReportFilterPolicy {
|
||||||
public void init(String value) {
|
public void init(String value) {
|
||||||
super.init(value);
|
super.init(value);
|
||||||
|
|
||||||
this.filterPolicy = tx().getPolicy(PolicyDef
|
PolicyDef filterPolicyDef = PolicyDef
|
||||||
.valueOf(ReportFilterPolicy.class.getSimpleName(), KeyPolicyDef.XML_PREFIX + this.filterValue));
|
.valueOf(ReportFilterPolicy.class.getSimpleName(), KeyPolicyDef.XML_PREFIX + this.filterValue);
|
||||||
|
this.filterPolicy = tx().getPolicy(ReportFilterPolicy.class, filterPolicyDef);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
Loading…
Reference in New Issue