Remove legacy actor code from models

Deleted legacy actor code.  That includes deleting most of the
XxxManager classes.

Issue-ID: POLICY-2559
Change-Id: I1ef1b900ca1d23e88da64b2c95a18986feb1b765
Signed-off-by: Jim Hahn <jrh3@att.com>

2 files changed, 0 insertions, 333 deletions

diff --git a/models-interactions/model-actors/actor.appc/src/main/java/org/onap/policy/controlloop/actor/appc/AppcActor.java b/models-interactions/model-actors/actor.appc/src/main/java/org/onap/policy/controlloop/actor/appc/AppcActor.java
index 8634fbf6a..72309b043 100644
--- a/models-interactions/model-actors/actor.appc/src/main/java/org/onap/policy/controlloop/actor/appc/AppcActor.java
+++ b/models-interactions/model-actors/actor.appc/src/main/java/org/onap/policy/controlloop/actor/appc/AppcActor.java
@@ -21,56 +21,14 @@
 
 package org.onap.policy.controlloop.actor.appc;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import org.onap.policy.appc.CommonHeader;
-import org.onap.policy.appc.Request;
-import org.onap.policy.common.utils.coder.CoderException;
-import org.onap.policy.common.utils.coder.StandardCoder;
-import org.onap.policy.controlloop.ControlLoopOperation;
-import org.onap.policy.controlloop.VirtualControlLoopEvent;
 import org.onap.policy.controlloop.actorserviceprovider.impl.BidirectionalTopicActor;
 import org.onap.policy.controlloop.actorserviceprovider.impl.BidirectionalTopicOperator;
 import org.onap.policy.controlloop.actorserviceprovider.parameters.BidirectionalTopicActorParams;
-import org.onap.policy.controlloop.policy.Policy;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 
 public class AppcActor extends BidirectionalTopicActor<BidirectionalTopicActorParams> {
     public static final String NAME = "APPC";
 
-    private static final Logger logger = LoggerFactory.getLogger(AppcActor.class);
-
-    // TODO old code: remove lines down to **HERE**
-
-    private static final StandardCoder coder = new StandardCoder();
-
-    // Strings for targets
-    private static final String TARGET_VM = "VM";
-    private static final String TARGET_VNF = "VNF";
-
-    // Strings for recipes
-    private static final String RECIPE_RESTART = "Restart";
-    private static final String RECIPE_REBUILD = "Rebuild";
-    private static final String RECIPE_MIGRATE = "Migrate";
-    private static final String RECIPE_MODIFY = "ModifyConfig";
-
-    private static final ImmutableList<String> recipes =
-                    ImmutableList.of(RECIPE_RESTART, RECIPE_REBUILD, RECIPE_MIGRATE, RECIPE_MODIFY);
-    private static final ImmutableMap<String, List<String>> targets = new ImmutableMap.Builder<String, List<String>>()
-                    .put(RECIPE_RESTART, ImmutableList.of(TARGET_VM)).put(RECIPE_REBUILD, ImmutableList.of(TARGET_VM))
-                    .put(RECIPE_MIGRATE, ImmutableList.of(TARGET_VM)).put(RECIPE_MODIFY, ImmutableList.of(TARGET_VNF))
-                    .build();
-    private static final ImmutableMap<String, List<String>> payloads = new ImmutableMap.Builder<String, List<String>>()
-                    .put(RECIPE_MODIFY, ImmutableList.of("generic-vnf.vnf-id")).build();
-
-    // **HERE**
-
     /**
      * Constructs the object.
      */
@@ -80,86 +38,4 @@ public class AppcActor extends BidirectionalTopicActor<BidirectionalTopicActorPa
         addOperator(new BidirectionalTopicOperator(NAME, ModifyConfigOperation.NAME, this, AppcOperation.SELECTOR_KEYS,
                         ModifyConfigOperation::new));
     }
-
-    // TODO old code: remove lines down to **HERE**
-
-    @Override
-    public String actor() {
-        return NAME;
-    }
-
-    @Override
-    public List<String> recipes() {
-        return ImmutableList.copyOf(recipes);
-    }
-
-    @Override
-    public List<String> recipeTargets(String recipe) {
-        return ImmutableList.copyOf(targets.getOrDefault(recipe, Collections.emptyList()));
-    }
-
-    @Override
-    public List<String> recipePayloads(String recipe) {
-        return ImmutableList.copyOf(payloads.getOrDefault(recipe, Collections.emptyList()));
-    }
-
-    /**
-     * Constructs an APPC request conforming to the legacy API. The legacy API will be
-     * deprecated in future releases as all legacy functionality is moved into the LCM
-     * API.
-     *
-     * @param onset the event that is reporting the alert for policy to perform an action
-     * @param operation the control loop operation specifying the actor, operation,
-     *        target, etc.
-     * @param policy the policy the was specified from the yaml generated by CLAMP or
-     *        through the Policy GUI/API
-     * @return an APPC request conforming to the legacy API
-     */
-    public static Request constructRequest(VirtualControlLoopEvent onset, ControlLoopOperation operation, Policy policy,
-                    String targetVnf) {
-        /*
-         * Construct an APPC request
-         */
-        Request request = new Request();
-        request.setCommonHeader(new CommonHeader());
-        request.getCommonHeader().setRequestId(onset.getRequestId());
-        request.getCommonHeader().setSubRequestId(operation.getSubRequestId());
-        request.setAction(policy.getRecipe().substring(0, 1).toUpperCase() + policy.getRecipe().substring(1));
-
-        // convert policy payload strings to objects
-        if (policy.getPayload() == null) {
-            logger.info("no APPC payload specified for policy {}", policy.getName());
-        } else {
-            convertPayload(policy.getPayload(), request.getPayload());
-        }
-
-        // add/replace specific values
-        request.getPayload().put("generic-vnf.vnf-id", targetVnf);
-
-        /*
-         * Return the request
-         */
-
-        return request;
-    }
-
-    /**
-     * Converts a payload. The original value is assumed to be a JSON string, which is
-     * decoded into an object.
-     *
-     * @param source source from which to get the values
-     * @param target where to place the decoded values
-     */
-    private static void convertPayload(Map<String, String> source, Map<String, Object> target) {
-        for (Entry<String, String> ent : source.entrySet()) {
-            try {
-                target.put(ent.getKey(), coder.decode(ent.getValue(), Object.class));
-
-            } catch (CoderException e) {
-                logger.warn("cannot decode JSON value {}: {}", ent.getKey(), ent.getValue(), e);
-            }
-        }
-    }
-
-    // **HERE**
 }
diff --git a/models-interactions/model-actors/actor.appc/src/test/java/org/onap/policy/controlloop/actor/appc/AppcActorTest.java b/models-interactions/model-actors/actor.appc/src/test/java/org/onap/policy/controlloop/actor/appc/AppcActorTest.java
index 47773f23f..f40cc680b 100644
--- a/models-interactions/model-actors/actor.appc/src/test/java/org/onap/policy/controlloop/actor/appc/AppcActorTest.java
+++ b/models-interactions/model-actors/actor.appc/src/test/java/org/onap/policy/controlloop/actor/appc/AppcActorTest.java
@@ -22,115 +22,14 @@
 package org.onap.policy.controlloop.actor.appc;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
 
-import java.time.Instant;
 import java.util.Arrays;
-import java.util.HashMap;
-import java.util.UUID;
 import java.util.stream.Collectors;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
 import org.junit.Test;
-import org.onap.policy.appc.Request;
-import org.onap.policy.appc.Response;
-import org.onap.policy.appc.ResponseCode;
-import org.onap.policy.appc.ResponseStatus;
-import org.onap.policy.appc.util.Serialization;
-import org.onap.policy.common.endpoints.http.server.HttpServletServerFactoryInstance;
-import org.onap.policy.controlloop.ControlLoopEventStatus;
-import org.onap.policy.controlloop.ControlLoopOperation;
-import org.onap.policy.controlloop.ControlLoopTargetType;
-import org.onap.policy.controlloop.VirtualControlLoopEvent;
 import org.onap.policy.controlloop.actor.test.BasicActor;
-import org.onap.policy.controlloop.policy.Policy;
-import org.onap.policy.controlloop.policy.Target;
-import org.onap.policy.controlloop.policy.TargetType;
-import org.onap.policy.simulators.Util;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class AppcActorTest extends BasicActor {
 
-    private static final String GENERIC_VNF_ID = "generic-vnf.vnf-id";
-
-    private static final String MODIFY_CONFIG = "ModifyConfig";
-
-    private static final String JSON_OUTPUT = "JSON Output: \n";
-
-    private static final Logger logger = LoggerFactory.getLogger(AppcActorTest.class);
-
-    private static final VirtualControlLoopEvent onsetEvent;
-    private static final ControlLoopOperation operation;
-    private static final Policy policy;
-
-    private static final String KEY1 = "my-keyA";
-    private static final String KEY2 = "my-keyB";
-    private static final String SUBKEY = "sub-key";
-
-    private static final String VALUE1 = "'my-value'".replace('\'', '"');
-    private static final String VALUE2 = "{'sub-key':20}".replace('\'', '"');
-    private static final String SUBVALUE = "20";
-
-    static {
-        /*
-         * Construct an onset with an AAI subtag containing generic-vnf.vnf-id and a
-         * target type of VM.
-         */
-        onsetEvent = new VirtualControlLoopEvent();
-        onsetEvent.setClosedLoopControlName("closedLoopControlName-Test");
-        onsetEvent.setRequestId(UUID.randomUUID());
-        onsetEvent.setClosedLoopEventClient("tca.instance00001");
-        onsetEvent.setTargetType(ControlLoopTargetType.VNF);
-        onsetEvent.setTarget("generic-vnf.vnf-name");
-        onsetEvent.setFrom("DCAE");
-        onsetEvent.setClosedLoopAlarmStart(Instant.now());
-        onsetEvent.setAai(new HashMap<>());
-        onsetEvent.getAai().put("generic-vnf.vnf-name", "fw0001vm001fw001");
-        onsetEvent.setClosedLoopEventStatus(ControlLoopEventStatus.ONSET);
-
-        /* Construct an operation with an APPC actor and ModifyConfig operation. */
-        operation = new ControlLoopOperation();
-        operation.setActor("APPC");
-        operation.setOperation(MODIFY_CONFIG);
-        operation.setTarget("VNF");
-        operation.setEnd(Instant.now());
-        operation.setSubRequestId("1");
-
-        /* Construct a policy specifying to modify configuration. */
-        policy = new Policy();
-        policy.setName("Modify Packet Generation Config");
-        policy.setDescription("Upon getting the trigger event, modify packet gen config");
-        policy.setActor("APPC");
-        policy.setTarget(new Target(TargetType.VNF));
-        policy.getTarget().setResourceID("Eace933104d443b496b8.nodes.heat.vpg");
-        policy.setRecipe(MODIFY_CONFIG);
-        policy.setPayload(null);
-        policy.setRetry(2);
-        policy.setTimeout(300);
-
-    }
-
-    /**
-     * Set up before test class.
-     *
-     * @throws Exception if the A&AI simulator cannot be started
-     */
-    @BeforeClass
-    public static void setUpSimulator() throws Exception {
-        Util.buildAaiSim();
-    }
-
-    /**
-     * Tear down after test class.
-     */
-    @AfterClass
-    public static void tearDownSimulator() {
-        HttpServletServerFactoryInstance.getServerFactory().destroy();
-    }
-
     @Test
     public void testConstructor() {
         AppcActor prov = new AppcActor();
@@ -148,112 +47,4 @@ public class AppcActorTest extends BasicActor {
         // verify that it all plugs into the ActorService
         verifyActorService(AppcActor.NAME, "service.yaml");
     }
-
-    @Test
-    public void testConstructModifyConfigRequest() {
-        policy.setPayload(new HashMap<>());
-        policy.getPayload().put(KEY1, VALUE1);
-        policy.getPayload().put(KEY2, VALUE2);
-
-        Request appcRequest;
-        appcRequest = AppcActor.constructRequest(onsetEvent, operation, policy, "vnf01");
-
-        /* The service provider must return a non null APPC request */
-        assertNotNull(appcRequest);
-
-        /* A common header is required and cannot be null */
-        assertNotNull(appcRequest.getCommonHeader());
-        assertEquals(appcRequest.getCommonHeader().getRequestId(), onsetEvent.getRequestId());
-
-        /* An action is required and cannot be null */
-        assertNotNull(appcRequest.getAction());
-        assertEquals(MODIFY_CONFIG, appcRequest.getAction());
-
-        /* A payload is required and cannot be null */
-        assertNotNull(appcRequest.getPayload());
-        assertTrue(appcRequest.getPayload().containsKey(GENERIC_VNF_ID));
-        assertNotNull(appcRequest.getPayload().get(GENERIC_VNF_ID));
-        assertTrue(appcRequest.getPayload().containsKey(KEY1));
-        assertTrue(appcRequest.getPayload().containsKey(KEY2));
-
-        logger.debug("APPC Request: \n" + appcRequest.toString());
-
-        /* Print out request as json to make sure serialization works */
-        String jsonRequest = Serialization.gsonPretty.toJson(appcRequest);
-        logger.debug(JSON_OUTPUT + jsonRequest);
-
-        /* The JSON string must contain the following fields */
-        assertTrue(jsonRequest.contains("CommonHeader"));
-        assertTrue(jsonRequest.contains("Action"));
-        assertTrue(jsonRequest.contains(MODIFY_CONFIG));
-        assertTrue(jsonRequest.contains("Payload"));
-        assertTrue(jsonRequest.contains(GENERIC_VNF_ID));
-        assertTrue(jsonRequest.contains(KEY1));
-        assertTrue(jsonRequest.contains(KEY2));
-        assertTrue(jsonRequest.contains(SUBKEY));
-        assertTrue(jsonRequest.contains(SUBVALUE));
-        assertFalse(jsonRequest.contains(SUBVALUE + ".0"));
-
-        Response appcResponse = new Response(appcRequest);
-        appcResponse.setStatus(new ResponseStatus());
-        appcResponse.getStatus().setCode(ResponseCode.SUCCESS.getValue());
-        appcResponse.getStatus().setDescription("AppC success");
-        /* Print out request as json to make sure serialization works */
-        String jsonResponse = Serialization.gsonPretty.toJson(appcResponse);
-        logger.debug(JSON_OUTPUT + jsonResponse);
-    }
-
-    @Test
-    public void testConstructModifyConfigRequest_NullPayload() {
-
-        Request appcRequest;
-        appcRequest = AppcActor.constructRequest(onsetEvent, operation, policy, "vnf01");
-
-        /* The service provider must return a non null APPC request */
-        assertNotNull(appcRequest);
-
-        /* A common header is required and cannot be null */
-        assertNotNull(appcRequest.getCommonHeader());
-        assertEquals(appcRequest.getCommonHeader().getRequestId(), onsetEvent.getRequestId());
-
-        /* An action is required and cannot be null */
-        assertNotNull(appcRequest.getAction());
-        assertEquals(MODIFY_CONFIG, appcRequest.getAction());
-
-        /* A payload is required and cannot be null */
-        assertNotNull(appcRequest.getPayload());
-        assertTrue(appcRequest.getPayload().containsKey(GENERIC_VNF_ID));
-        assertNotNull(appcRequest.getPayload().get(GENERIC_VNF_ID));
-
-        logger.debug("APPC Request: \n" + appcRequest.toString());
-
-        /* Print out request as json to make sure serialization works */
-        String jsonRequest = Serialization.gsonPretty.toJson(appcRequest);
-        logger.debug(JSON_OUTPUT + jsonRequest);
-
-        /* The JSON string must contain the following fields */
-        assertTrue(jsonRequest.contains("CommonHeader"));
-        assertTrue(jsonRequest.contains("Action"));
-        assertTrue(jsonRequest.contains(MODIFY_CONFIG));
-        assertTrue(jsonRequest.contains("Payload"));
-        assertTrue(jsonRequest.contains(GENERIC_VNF_ID));
-
-        Response appcResponse = new Response(appcRequest);
-        appcResponse.setStatus(new ResponseStatus());
-        appcResponse.getStatus().setCode(ResponseCode.SUCCESS.getValue());
-        appcResponse.getStatus().setDescription("AppC success");
-        /* Print out request as json to make sure serialization works */
-        String jsonResponse = Serialization.gsonPretty.toJson(appcResponse);
-        logger.debug(JSON_OUTPUT + jsonResponse);
-    }
-
-    @Test
-    public void testMethods() {
-        AppcActor sp = new AppcActor();
-
-        assertEquals("APPC", sp.actor());
-        assertEquals(4, sp.recipes().size());
-        assertEquals("VM", sp.recipeTargets("Restart").get(0));
-        assertEquals(0, sp.recipePayloads("Restart").size());
-    }
 }