Make Actors event-agnostic

[policy/models.git] / models-interactions / model-actors / actorServiceProvider / src / test / java / org / onap / policy / controlloop / actorserviceprovider / impl / HttpOperationTest.java

diff --git a/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/HttpOperationTest.java b/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/HttpOperationTest.java
index eb1aa88..587313a 100644 (file)
--- a/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/HttpOperationTest.java
+++ b/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/impl/HttpOperationTest.java
@@ -77,13 +77,11 @@ import org.onap.policy.common.endpoints.utils.NetLoggerUtil.EventType;
 import org.onap.policy.common.gson.GsonMessageBodyHandler;
 import org.onap.policy.common.utils.coder.CoderException;
 import org.onap.policy.common.utils.network.NetworkUtil;
-import org.onap.policy.controlloop.VirtualControlLoopEvent;
 import org.onap.policy.controlloop.actorserviceprovider.OperationOutcome;
-import org.onap.policy.controlloop.actorserviceprovider.controlloop.ControlLoopEventContext;
+import org.onap.policy.controlloop.actorserviceprovider.OperationResult;
 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.policy.PolicyResult;
 
 public class HttpOperationTest {
 
@@ -118,8 +116,6 @@ public class HttpOperationTest {
     @Mock
     private Executor executor;
 
-    private VirtualControlLoopEvent event;
-    private ControlLoopEventContext context;
     private ControlLoopOperationParams params;
     private OperationOutcome outcome;
     private AtomicReference<InvocationCallback<Response>> callback;
@@ -150,8 +146,7 @@ public class HttpOperationTest {
         /*
          * Start the clients, one to the server, and one to a non-existent server.
          */
-        TopicParamsBuilder builder = BusTopicParams.builder().managed(true).hostname("localhost").basePath(BASE_URI)
-                        .serializationProvider(GsonMessageBodyHandler.class.getName());
+        TopicParamsBuilder builder = BusTopicParams.builder().managed(true).hostname("localhost").basePath(BASE_URI);
 
         HttpClientFactoryInstance.getClientFactory().build(builder.clientName(HTTP_CLIENT).port(port).build());
 
@@ -185,13 +180,9 @@ public class HttpOperationTest {
         when(response.readEntity(String.class)).thenReturn(TEXT);
         when(response.getStatus()).thenReturn(200);
 
-        event = new VirtualControlLoopEvent();
-        event.setRequestId(REQ_ID);
+        params = ControlLoopOperationParams.builder().actor(ACTOR).operation(OPERATION).requestId(REQ_ID).build();
 
-        context = new ControlLoopEventContext(event);
-        params = ControlLoopOperationParams.builder().actor(ACTOR).operation(OPERATION).context(context).build();
-
-        outcome = params.makeOutcome();
+        outcome = params.makeOutcome(null);
 
         callback = new AtomicReference<>();
         future = new CompletableFuture<>();
@@ -258,7 +249,7 @@ public class HttpOperationTest {
         assertSame(outcome, future2.get(5, TimeUnit.SECONDS));
         assertSame(TEXT, outcome.getResponse());
 
-        assertEquals(PolicyResult.SUCCESS, outcome.getResult());
+        assertEquals(OperationResult.SUCCESS, outcome.getResult());
     }
 
     /**
@@ -290,7 +281,7 @@ public class HttpOperationTest {
         CompletableFuture<OperationOutcome> result = oper.processResponse(outcome, PATH, response);
         assertTrue(result.isDone());
         assertSame(outcome, result.get());
-        assertEquals(PolicyResult.SUCCESS, outcome.getResult());
+        assertEquals(OperationResult.SUCCESS, outcome.getResult());
         assertSame(TEXT, outcome.getResponse());
     }
 
@@ -303,7 +294,7 @@ public class HttpOperationTest {
         CompletableFuture<OperationOutcome> result = oper.processResponse(outcome, PATH, response);
         assertTrue(result.isDone());
         assertSame(outcome, result.get());
-        assertEquals(PolicyResult.FAILURE, outcome.getResult());
+        assertEquals(OperationResult.FAILURE, outcome.getResult());
         assertSame(TEXT, outcome.getResponse());
     }
 
@@ -319,7 +310,7 @@ public class HttpOperationTest {
         CompletableFuture<OperationOutcome> result = oper2.processResponse(outcome, PATH, response);
         assertTrue(result.isDone());
         assertSame(outcome, result.get());
-        assertEquals(PolicyResult.SUCCESS, outcome.getResult());
+        assertEquals(OperationResult.SUCCESS, outcome.getResult());
         assertEquals(Integer.valueOf(10), outcome.getResponse());
     }
 
@@ -360,7 +351,7 @@ public class HttpOperationTest {
         OperationOutcome outcome = runOperation(oper2);
         assertNotNull(outcome);
         assertEquals(1, nget);
-        assertEquals(PolicyResult.SUCCESS, outcome.getResult());
+        assertEquals(OperationResult.SUCCESS, outcome.getResult());
         assertTrue(outcome.getResponse() instanceof MyResponse);
     }
 
@@ -377,7 +368,7 @@ public class HttpOperationTest {
         OperationOutcome outcome = runOperation(oper2);
         assertNotNull(outcome);
         assertEquals(1, ndelete);
-        assertEquals(PolicyResult.SUCCESS, outcome.getResult());
+        assertEquals(OperationResult.SUCCESS, outcome.getResult());
         assertTrue(outcome.getResponse() instanceof String);
     }
 
@@ -393,7 +384,7 @@ public class HttpOperationTest {
         OperationOutcome outcome = runOperation(oper2);
         assertNotNull(outcome);
         assertEquals(1, npost);
-        assertEquals(PolicyResult.SUCCESS, outcome.getResult());
+        assertEquals(OperationResult.SUCCESS, outcome.getResult());
         assertTrue(outcome.getResponse() instanceof MyResponse);
     }
 
@@ -410,13 +401,13 @@ public class HttpOperationTest {
         OperationOutcome outcome = runOperation(oper2);
         assertNotNull(outcome);
         assertEquals(1, nput);
-        assertEquals(PolicyResult.SUCCESS, outcome.getResult());
+        assertEquals(OperationResult.SUCCESS, outcome.getResult());
         assertTrue(outcome.getResponse() instanceof MyResponse);
     }
 
     @Test
     public void testMakeDecoder() {
-        assertNotNull(oper.makeCoder());
+        assertNotNull(oper.getCoder());
     }
 
     /**
@@ -503,7 +494,7 @@ public class HttpOperationTest {
 
     private class MyGetOperation<T> extends HttpOperation<T> {
         public MyGetOperation(Class<T> responseClass) {
-            super(HttpOperationTest.this.params, HttpOperationTest.this.config, responseClass);
+            super(HttpOperationTest.this.params, HttpOperationTest.this.config, responseClass, Collections.emptyList());
         }
 
         @Override
@@ -524,7 +515,8 @@ public class HttpOperationTest {
 
     private class MyPostOperation extends HttpOperation<MyResponse> {
         public MyPostOperation() {
-            super(HttpOperationTest.this.params, HttpOperationTest.this.config, MyResponse.class);
+            super(HttpOperationTest.this.params, HttpOperationTest.this.config, MyResponse.class,
+                            Collections.emptyList());
         }
 
         @Override
@@ -532,14 +524,15 @@ public class HttpOperationTest {
 
             MyRequest request = new MyRequest();
 
-            Entity<MyRequest> entity = Entity.entity(request, MediaType.APPLICATION_JSON);
-
             Map<String, Object> headers = makeHeaders();
 
             headers.put("Accept", MediaType.APPLICATION_JSON);
             String url = getUrl();
 
-            logMessage(EventType.OUT, CommInfrastructure.REST, url, request);
+            String strRequest = prettyPrint(request);
+            logMessage(EventType.OUT, CommInfrastructure.REST, url, strRequest);
+
+            Entity<String> entity = Entity.entity(strRequest, MediaType.APPLICATION_JSON);
 
             // @formatter:off
             return handleResponse(outcome, url,
@@ -550,7 +543,8 @@ public class HttpOperationTest {
 
     private class MyPutOperation extends HttpOperation<MyResponse> {
         public MyPutOperation() {
-            super(HttpOperationTest.this.params, HttpOperationTest.this.config, MyResponse.class);
+            super(HttpOperationTest.this.params, HttpOperationTest.this.config, MyResponse.class,
+                            Collections.emptyList());
         }
 
         @Override
@@ -558,14 +552,15 @@ public class HttpOperationTest {
 
             MyRequest request = new MyRequest();
 
-            Entity<MyRequest> entity = Entity.entity(request, MediaType.APPLICATION_JSON);
-
             Map<String, Object> headers = makeHeaders();
 
             headers.put("Accept", MediaType.APPLICATION_JSON);
             String url = getUrl();
 
-            logMessage(EventType.OUT, CommInfrastructure.REST, url, request);
+            String strRequest = prettyPrint(request);
+            logMessage(EventType.OUT, CommInfrastructure.REST, url, strRequest);
+
+            Entity<String> entity = Entity.entity(strRequest, MediaType.APPLICATION_JSON);
 
             // @formatter:off
             return handleResponse(outcome, url,
@@ -576,7 +571,7 @@ public class HttpOperationTest {
 
     private class MyDeleteOperation extends HttpOperation<String> {
         public MyDeleteOperation() {
-            super(HttpOperationTest.this.params, HttpOperationTest.this.config, String.class);
+            super(HttpOperationTest.this.params, HttpOperationTest.this.config, String.class, Collections.emptyList());
         }
 
         @Override