Make Actors event-agnostic

Removed event and event-context code from the Actor code.  Also removed
the preprocessing steps from the Actor code, giving the application
complete control over any preprocessing.
Also fixed a bug wherein the APPC actor was treating the
AAI_RESOURCE_VNF property as a String instead of as a GenericVnf.

Issue-ID: POLICY-2746-actor
Change-Id: Ibc05fe39ffedc0bc461abf10e6a960861ac70119
Signed-off-by: Jim Hahn <jrh3@att.com>

4 files changed, 3 insertions, 159 deletions

diff --git a/models-interactions/model-actors/actor.aai/src/test/java/org/onap/policy/controlloop/actor/aai/AaiCustomQueryOperationTest.java b/models-interactions/model-actors/actor.aai/src/test/java/org/onap/policy/controlloop/actor/aai/AaiCustomQueryOperationTest.java
index 5a5e170dd..61155ce07 100644
--- a/models-interactions/model-actors/actor.aai/src/test/java/org/onap/policy/controlloop/actor/aai/AaiCustomQueryOperationTest.java
+++ b/models-interactions/model-actors/actor.aai/src/test/java/org/onap/policy/controlloop/actor/aai/AaiCustomQueryOperationTest.java
@@ -21,12 +21,9 @@
 package org.onap.policy.controlloop.actor.aai;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
-import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.verify;
@@ -44,33 +41,20 @@ import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.mockito.Mock;
 import org.onap.policy.aai.AaiConstants;
 import org.onap.policy.aai.AaiCqResponse;
-import org.onap.policy.common.endpoints.http.client.HttpClientFactory;
 import org.onap.policy.common.endpoints.http.client.HttpClientFactoryInstance;
 import org.onap.policy.common.utils.coder.StandardCoder;
-import org.onap.policy.common.utils.coder.StandardCoderObject;
 import org.onap.policy.controlloop.actorserviceprovider.OperationOutcome;
 import org.onap.policy.controlloop.actorserviceprovider.OperationProperties;
 import org.onap.policy.controlloop.actorserviceprovider.OperationResult;
-import org.onap.policy.controlloop.actorserviceprovider.Util;
-import org.onap.policy.controlloop.actorserviceprovider.impl.HttpOperation;
-import org.onap.policy.controlloop.actorserviceprovider.impl.HttpOperator;
-import org.onap.policy.controlloop.actorserviceprovider.parameters.ControlLoopOperationParams;
 import org.onap.policy.controlloop.actorserviceprovider.parameters.HttpConfig;
 import org.onap.policy.controlloop.actorserviceprovider.parameters.HttpParams;
-import org.onap.policy.controlloop.actorserviceprovider.spi.Actor;
 
 public class AaiCustomQueryOperationTest extends BasicAaiOperation {
     private static final StandardCoder coder = new StandardCoder();
 
     private static final String MY_LINK = "my-link";
-    private static final String MY_VSERVER = "my-vserver-name";
-    private static final String SIM_VSERVER = "OzVServer";
-
-    @Mock
-    private Actor tenantActor;
 
     private AaiCustomQueryOperation oper;
 
@@ -95,14 +79,8 @@ public class AaiCustomQueryOperationTest extends BasicAaiOperation {
     public void setUp() throws Exception {
         super.setUpBasic();
 
-        params.getContext().getEnrichment().put(AaiCustomQueryOperation.VSERVER_VSERVER_NAME, MY_VSERVER);
-
-        MyTenantOperator tenantOperator = new MyTenantOperator();
-
-        when(service.getActor(AaiConstants.ACTOR_NAME)).thenReturn(tenantActor);
-        when(tenantActor.getOperator(AaiGetTenantOperation.NAME)).thenReturn(tenantOperator);
-
         oper = new AaiCustomQueryOperation(params, config);
+        oper.setProperty(OperationProperties.AAI_VSERVER_LINK, MY_LINK);
     }
 
     /**
@@ -115,7 +93,6 @@ public class AaiCustomQueryOperationTest extends BasicAaiOperation {
 
         params = params.toBuilder().retry(0).timeoutSec(5).executor(blockingExecutor).preprocessed(true).build();
         oper = new AaiCustomQueryOperation(params, config);
-        oper.setProperty(OperationProperties.AAI_TARGET_ENTITY, SIM_VSERVER);
 
         oper.setProperty(OperationProperties.AAI_VSERVER_LINK, MY_LINK);
 
@@ -132,16 +109,6 @@ public class AaiCustomQueryOperationTest extends BasicAaiOperation {
     }
 
     @Test
-    public void testGetVserver() {
-        assertEquals(MY_VSERVER, oper.getVserver());
-
-        // try without enrichment data
-        params.getContext().getEnrichment().remove(AaiCustomQueryOperation.VSERVER_VSERVER_NAME);
-        assertThatIllegalArgumentException().isThrownBy(() -> oper.getVserver())
-                        .withMessage("missing " + AaiCustomQueryOperation.VSERVER_VSERVER_NAME + " in enrichment data");
-    }
-
-    @Test
     public void testGetPropertyNames() {
         assertThat(oper.getPropertyNames()).isEqualTo(List.of(OperationProperties.AAI_VSERVER_LINK));
     }
@@ -152,18 +119,9 @@ public class AaiCustomQueryOperationTest extends BasicAaiOperation {
         assertEquals("3", oper.getSubRequestId());
     }
 
-    /**
-     * Tests startPreprocessorAsync(), when preprocessing is disabled.
-     */
-    @Test
-    public void testStartPreprocessorAsyncDisabled() {
-        params = params.toBuilder().preprocessed(true).build();
-        assertNull(new AaiCustomQueryOperation(params, config).startPreprocessorAsync());
-    }
-
     @Test
     @SuppressWarnings("unchecked")
-    public void testStartOperationAsync_testStartPreprocessorAsync_testMakeRequest_testPostProcess() throws Exception {
+    public void testStartOperationAsync_testMakeRequest() throws Exception {
         // need two responses
         when(rawResponse.readEntity(String.class)).thenReturn(makeTenantReply()).thenReturn(makeCqReply());
         when(webAsync.get(any(InvocationCallback.class))).thenAnswer(provideResponse(rawResponse));
@@ -173,41 +131,9 @@ public class AaiCustomQueryOperationTest extends BasicAaiOperation {
 
         assertEquals(OperationResult.SUCCESS, getResult(future2));
 
-        // tenant response should have been cached within the context
-        assertNotNull(context.getProperty(AaiGetTenantOperation.getKey(MY_VSERVER)));
-
-        // custom query response should have been cached within the context
-        AaiCqResponse cqData = context.getProperty(AaiCqResponse.CONTEXT_KEY);
-        assertNotNull(cqData);
-
         assertEquals("1", future2.get().getSubRequestId());
     }
 
-    /**
-     * Tests when preprocessor step is not needed.
-     */
-    @Test
-    @SuppressWarnings("unchecked")
-    public void testStartOperationAsync_testStartPreprocessorAsyncNotNeeded() throws Exception {
-        // pre-load the tenant data
-        final StandardCoderObject data = preloadTenantData();
-
-        // only need one response
-        when(rawResponse.readEntity(String.class)).thenReturn(makeCqReply());
-        when(webAsync.put(any(), any(InvocationCallback.class))).thenAnswer(provideResponse(rawResponse, 1));
-
-        CompletableFuture<OperationOutcome> future2 = oper.start();
-
-        assertEquals(OperationResult.SUCCESS, getResult(future2));
-
-        // should not have replaced tenant response
-        assertSame(data, context.getProperty(AaiGetTenantOperation.getKey(MY_VSERVER)));
-
-        // custom query response should have been cached within the context
-        AaiCqResponse cqData = context.getProperty(AaiCqResponse.CONTEXT_KEY);
-        assertNotNull(cqData);
-    }
-
     @Test
     public void testMakeHeaders() {
         verifyHeaders(oper.makeHeaders());
@@ -216,9 +142,6 @@ public class AaiCustomQueryOperationTest extends BasicAaiOperation {
     @Test
     @SuppressWarnings("unchecked")
     public void testMakeRequest_testGetVserverLink() throws Exception {
-        // preload
-        preloadTenantData();
-
         when(rawResponse.readEntity(String.class)).thenReturn(makeCqReply());
         when(webAsync.put(any(), any(InvocationCallback.class))).thenAnswer(provideResponse(rawResponse, 1));
 
@@ -237,27 +160,12 @@ public class AaiCustomQueryOperationTest extends BasicAaiOperation {
     }
 
     @Test
-    public void testGetVserverLinkViaProperty() throws Exception {
+    public void testGetVserverLink() throws Exception {
         oper.setProperty(OperationProperties.AAI_VSERVER_LINK, MY_LINK);
         assertEquals(MY_LINK, oper.getVserverLink());
     }
 
     @Test
-    public void testGetVserverLinkNoTenantData() throws Exception {
-        assertThatIllegalStateException().isThrownBy(() -> oper.getVserverLink())
-                        .withMessage("cannot perform custom query - cannot determine resource-link");
-    }
-
-    @Test
-    public void testGetVserverLinkNoResourceLink() throws Exception {
-        // pre-load EMPTY tenant data
-        preloadTenantData(new StandardCoderObject());
-
-        assertThatIllegalArgumentException().isThrownBy(() -> oper.getVserverLink())
-                        .withMessage("cannot perform custom query - no resource-link");
-    }
-
-    @Test
     public void testSetOutcome() {
         outcome = oper.setOutcome(params.makeOutcome(null), OperationResult.SUCCESS, null, null);
         assertNull(outcome.getResponse());
@@ -278,16 +186,6 @@ public class AaiCustomQueryOperationTest extends BasicAaiOperation {
         return "{}";
     }
 
-    private StandardCoderObject preloadTenantData() throws Exception {
-        StandardCoderObject data = coder.decode(makeTenantReply(), StandardCoderObject.class);
-        preloadTenantData(data);
-        return data;
-    }
-
-    private void preloadTenantData(StandardCoderObject data) {
-        context.setProperty(AaiGetTenantOperation.getKey(MY_VSERVER), data);
-        context.setProperty(AaiGetTenantOperation.getKey(SIM_VSERVER), data);
-    }
 
     private OperationResult getResult(CompletableFuture<OperationOutcome> future2)
                     throws InterruptedException, ExecutionException, TimeoutException {
@@ -297,25 +195,4 @@ public class AaiCustomQueryOperationTest extends BasicAaiOperation {
 
         return future2.get().getResult();
     }
-
-    protected class MyTenantOperator extends HttpOperator {
-        public MyTenantOperator() {
-            super(AaiConstants.ACTOR_NAME, AaiGetTenantOperation.NAME);
-
-            HttpParams http = HttpParams.builder().clientName(MY_CLIENT).path(PATH).timeoutSec(1).build();
-
-            configure(Util.translateToMap(AaiGetTenantOperation.NAME, http));
-            start();
-        }
-
-        @Override
-        public HttpOperation<?> buildOperation(ControlLoopOperationParams params) {
-            return new AaiGetTenantOperation(params, getCurrentConfig());
-        }
-
-        @Override
-        protected HttpClientFactory getClientFactory() {
-            return factory;
-        }
-    }
 }
diff --git a/models-interactions/model-actors/actor.aai/src/test/java/org/onap/policy/controlloop/actor/aai/AaiGetOperationTest.java b/models-interactions/model-actors/actor.aai/src/test/java/org/onap/policy/controlloop/actor/aai/AaiGetOperationTest.java
index df0dbff98..1cde4c860 100644
--- a/models-interactions/model-actors/actor.aai/src/test/java/org/onap/policy/controlloop/actor/aai/AaiGetOperationTest.java
+++ b/models-interactions/model-actors/actor.aai/src/test/java/org/onap/policy/controlloop/actor/aai/AaiGetOperationTest.java
@@ -29,7 +29,6 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import java.util.Map;
-import java.util.concurrent.CompletableFuture;
 import javax.ws.rs.client.Invocation.Builder;
 import javax.ws.rs.client.WebTarget;
 import org.junit.AfterClass;
@@ -37,14 +36,11 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.onap.policy.aai.AaiConstants;
-import org.onap.policy.common.utils.coder.StandardCoderObject;
-import org.onap.policy.controlloop.actorserviceprovider.OperationOutcome;
 
 public class AaiGetOperationTest extends BasicAaiOperation {
     private static final String MY_NAME = "my-operation-name";
     private static final String PARAM_NAME = "my-param";
     private static final String PARAM_VALUE = "my-value";
-    private static final String MY_URL = "my-url";
 
     private AaiGetOperation oper;
 
@@ -105,15 +101,6 @@ public class AaiGetOperationTest extends BasicAaiOperation {
     }
 
     @Test
-    public void testPostProcessResponse() throws Exception {
-        StandardCoderObject resp = new StandardCoderObject();
-        CompletableFuture<OperationOutcome> future2 = oper.postProcessResponse(outcome, MY_URL, null, resp);
-
-        assertSame(outcome, future2.get());
-        assertSame(resp, context.getProperty("AAI.my-operation-name.my-target"));
-    }
-
-    @Test
     public void testGetRetry() {
         // use default if null retry
         assertEquals(AaiGetOperation.DEFAULT_RETRY, oper.getRetry(null));
diff --git a/models-interactions/model-actors/actor.aai/src/test/java/org/onap/policy/controlloop/actor/aai/AaiGetPnfOperationTest.java b/models-interactions/model-actors/actor.aai/src/test/java/org/onap/policy/controlloop/actor/aai/AaiGetPnfOperationTest.java
index 84f28210e..fb2b770db 100644
--- a/models-interactions/model-actors/actor.aai/src/test/java/org/onap/policy/controlloop/actor/aai/AaiGetPnfOperationTest.java
+++ b/models-interactions/model-actors/actor.aai/src/test/java/org/onap/policy/controlloop/actor/aai/AaiGetPnfOperationTest.java
@@ -23,8 +23,6 @@ package org.onap.policy.controlloop.actor.aai;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
@@ -141,11 +139,6 @@ public class AaiGetPnfOperationTest extends BasicAaiOperation {
 
         assertEquals(OperationResult.SUCCESS, future2.get().getResult());
 
-        // data should have been cached within the context
-        StandardCoderObject data = context.getProperty(AaiGetPnfOperation.getKey(TARGET_ENTITY));
-        assertNotNull(data);
-        assertEquals(TEXT, data.getString(INPUT_FIELD));
-
         assertEquals("1", future2.get().getSubRequestId());
     }
 
@@ -168,9 +161,6 @@ public class AaiGetPnfOperationTest extends BasicAaiOperation {
         assertTrue(future2.isDone());
 
         assertEquals(OperationResult.FAILURE, future2.get().getResult());
-
-        // data should NOT have been cached within the context
-        assertNull(context.getProperty(AaiGetPnfOperation.getKey(TARGET_ENTITY)));
     }
 
     @Test
diff --git a/models-interactions/model-actors/actor.aai/src/test/java/org/onap/policy/controlloop/actor/aai/AaiGetTenantOperationTest.java b/models-interactions/model-actors/actor.aai/src/test/java/org/onap/policy/controlloop/actor/aai/AaiGetTenantOperationTest.java
index cf9a7a6a1..27495d8fc 100644
--- a/models-interactions/model-actors/actor.aai/src/test/java/org/onap/policy/controlloop/actor/aai/AaiGetTenantOperationTest.java
+++ b/models-interactions/model-actors/actor.aai/src/test/java/org/onap/policy/controlloop/actor/aai/AaiGetTenantOperationTest.java
@@ -23,8 +23,6 @@ package org.onap.policy.controlloop.actor.aai;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
@@ -141,11 +139,6 @@ public class AaiGetTenantOperationTest extends BasicAaiOperation {
 
         assertEquals(OperationResult.SUCCESS, future2.get().getResult());
 
-        // data should have been cached within the context
-        StandardCoderObject data = context.getProperty(AaiGetTenantOperation.getKey(TARGET_ENTITY));
-        assertNotNull(data);
-        assertEquals(TEXT, data.getString(INPUT_FIELD));
-
         assertEquals("1", future2.get().getSubRequestId());
     }
 
@@ -168,9 +161,6 @@ public class AaiGetTenantOperationTest extends BasicAaiOperation {
         assertTrue(future2.isDone());
 
         assertEquals(OperationResult.FAILURE, future2.get().getResult());
-
-        // data should NOT have been cached within the context
-        assertNull(context.getProperty(AaiGetTenantOperation.getKey(TARGET_ENTITY)));
     }
 
     @Test