diff options
author | Jim Hahn <jrh3@att.com> | 2020-06-03 09:26:33 -0400 |
---|---|---|
committer | Jim Hahn <jrh3@att.com> | 2020-07-14 10:29:49 -0400 |
commit | e87b18923c23a1a0fbfaae1c75645a577b96c892 (patch) | |
tree | 5b7b0e4d52dca3f81b7c9add036b5f6816d5bf78 /controlloop/common/rules-test/src/main | |
parent | c3879a50de6473b8673faa9f958a0c646a4b8ca9 (diff) |
Remove usecases and legacy actor code
Made the following changes to remove usescase and legacy actor
code:
- deleted the usecases controller and feature
- deleted code associated with legacy actors, with the exception
of AaiManager, which is needed by RestControlLoopManager
- moved the contents of the "guard" project into the m2/guard project,
as that is the only thing that still needs it
- modified the m2/GuardContext to get the name of its persistence unit
from the properties so it could be overridden by junit tests
- used eclipselink constants
Also fixed a bug in the properties for the VFC actor.
Addressed review comment:
- removed usecases from Dockerfile
Issue-ID: POLICY-2558
Change-Id: I677d68c9efed9247c3d55773abdcc736b577a6b4
Signed-off-by: Jim Hahn <jrh3@att.com>
Diffstat (limited to 'controlloop/common/rules-test/src/main')
-rw-r--r-- | controlloop/common/rules-test/src/main/java/org/onap/policy/controlloop/common/rules/test/Rules.java | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/controlloop/common/rules-test/src/main/java/org/onap/policy/controlloop/common/rules/test/Rules.java b/controlloop/common/rules-test/src/main/java/org/onap/policy/controlloop/common/rules/test/Rules.java index 2e15895bc..62632e9d2 100644 --- a/controlloop/common/rules-test/src/main/java/org/onap/policy/controlloop/common/rules/test/Rules.java +++ b/controlloop/common/rules-test/src/main/java/org/onap/policy/controlloop/common/rules/test/Rules.java @@ -51,7 +51,6 @@ import org.onap.policy.common.utils.coder.StandardCoder; import org.onap.policy.common.utils.resources.ResourceUtils; import org.onap.policy.controlloop.ControlLoopEvent; import org.onap.policy.controlloop.drl.legacy.ControlLoopParams; -import org.onap.policy.controlloop.eventmanager.ControlLoopEventManager; import org.onap.policy.controlloop.eventmanager.ControlLoopEventManager2; import org.onap.policy.drools.controller.DroolsController; import org.onap.policy.drools.persistence.SystemPersistence; @@ -165,14 +164,6 @@ public class Rules { await(clazz.getSimpleName()).atMost(5, TimeUnit.SECONDS) .until(() -> drools.facts(controllerName, clazz).isEmpty()); } - - /* - * We can't delete this class directly; we have to wait for the rules to clean it - * up, because the rule also cleans up a number of other associated objects. - */ - Class<?> clazz = ControlLoopEventManager.class; - await(clazz.getSimpleName()).atMost(5, TimeUnit.SECONDS) - .until(() -> drools.facts(controllerName, clazz).isEmpty()); } /** |