diff options
| author |   Jim Hahn <jrh3@att.com> | 2020-06-11 15:33:32 -0400 |
|---|---|---|
| committer | Jim Hahn <jrh3@att.com> | 2020-06-11 16:44:37 -0400 |
| commit | 68322db4ff9d41c32eb9af02e84b9a703f1c8ac0 (patch) | |
| tree | 6055e0c2b1f780dae74b67d31b11e6e9c6fef64d /controlloop/common/eventmanager/src/main/java | |
| parent | 1ce01c244fbcc328e0f03adb78b87fc776b74829 (diff) | |
Remove deprecated properties for CDS and VFC
Now that the changes to the Actors have been merged, the former properties
can be removed, too.
Also fixed guard operator/operation name since it changed from "Guard"
to "Decision".
Issue-ID: POLICY-2629
Change-Id: I1c8d4575be598a8cab12b1aa4ad9b1d3e1f12113
Signed-off-by: Jim Hahn <jrh3@att.com>
Diffstat (limited to 'controlloop/common/eventmanager/src/main/java')
| -rw-r--r-- | controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/EventManagerServices.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/EventManagerServices.java b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/EventManagerServices.java index 8ce3cb188..66b9006a9 100644 --- a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/EventManagerServices.java +++ b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/EventManagerServices.java @@ -25,10 +25,10 @@ import java.util.Properties; import lombok.Getter; import org.onap.policy.common.parameters.ValidationResult; import org.onap.policy.common.utils.properties.PropertyObjectUtils; +import org.onap.policy.controlloop.actor.guard.DecisionOperation; +import org.onap.policy.controlloop.actor.guard.DecisionOperator; import org.onap.policy.controlloop.actor.guard.GuardActorServiceProvider; import org.onap.policy.controlloop.actor.guard.GuardConfig; -import org.onap.policy.controlloop.actor.guard.GuardOperation; -import org.onap.policy.controlloop.actor.guard.GuardOperator; import org.onap.policy.controlloop.actorserviceprovider.ActorService; import org.onap.policy.controlloop.actorserviceprovider.Util; import org.onap.policy.controlloop.ophistory.OperationHistoryDataManager; @@ -103,8 +103,8 @@ public class EventManagerServices { */ public boolean isGuardEnabled() { try { - GuardOperator guard = (GuardOperator) getActorService().getActor(GuardActorServiceProvider.NAME) - .getOperator(GuardOperation.NAME); + DecisionOperator guard = (DecisionOperator) getActorService().getActor(GuardActorServiceProvider.NAME) + .getOperator(DecisionOperation.NAME); if (!guard.isConfigured()) { logger.warn("cannot check 'disabled' property in GUARD actor - assuming disabled"); return false; |