Merge "Update docker-compose for configurable certs"

diff --git a/policy-agent/pom.xml b/policy-agent/pom.xml
index 8f56cd6..0dd6d03 100644 (file)
--- a/policy-agent/pom.xml
+++ b/policy-agent/pom.xml
@@ -61,7 +61,6 @@
         <javax.ws.rs-api.version>2.1.1</javax.ws.rs-api.version>
         <sonar-maven-plugin.version>3.7.0.1746</sonar-maven-plugin.version>
         <jacoco-maven-plugin.version>0.8.5</jacoco-maven-plugin.version>
-        <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
         <exec.skip>true</exec.skip>
     </properties>
     <dependencies>
@@ -357,7 +356,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
-                <version>${exec-maven-plugin.version}</version>
                 <executions>
                     <execution>
                         <id>run-test-script</id>

diff --git a/policy-agent/src/main/java/org/oransc/policyagent/dmaap/DmaapMessageConsumer.java b/policy-agent/src/main/java/org/oransc/policyagent/dmaap/DmaapMessageConsumer.java
index 4642bd7..8e2aba4 100644 (file)
--- a/policy-agent/src/main/java/org/oransc/policyagent/dmaap/DmaapMessageConsumer.java
+++ b/policy-agent/src/main/java/org/oransc/policyagent/dmaap/DmaapMessageConsumer.java
@@ -25,7 +25,6 @@ import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParser;
 
-import java.io.IOException;
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
@@ -142,7 +141,7 @@ public class DmaapMessageConsumer {
         }
     }
 
-    private void processMsg(String msg) throws IOException {
+    private void processMsg(String msg) {
         logger.debug("Message Reveived from DMAAP : {}", msg);
         getDmaapMessageHandler().handleDmaapMsg(msg);
     }

diff --git a/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java b/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java
index d856c8a..0fb80f3 100644 (file)
--- a/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java
+++ b/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java
@@ -337,7 +337,7 @@ class ApplicationTest {
 
         url = "/policies";
         String rsp = restClient().get(url).block();
-        assertThat(rsp).contains(policyInstanceId).as("Response contains policy instance ID.");
+        assertThat(rsp).as("Response contains policy instance ID.").contains(policyInstanceId);
 
         url = "/policy?id=" + policyInstanceId;
         rsp = restClient().get(url).block();
@@ -348,6 +348,7 @@ class ApplicationTest {
         testErrorCode(restClient().put(url, policyBody), HttpStatus.NOT_FOUND);
 
         url = putPolicyUrl(serviceName, ricName, policyTypeName + "XX", policyInstanceId);
+        addPolicyType(policyTypeName + "XX", "otherRic");
         testErrorCode(restClient().put(url, policyBody), HttpStatus.NOT_FOUND);
 
         url = putPolicyUrl(serviceName, ricName, policyTypeName, policyInstanceId);
@@ -602,7 +603,7 @@ class ApplicationTest {
         // GET (all)
         url = "/services";
         rsp = restClient().get(url).block();
-        assertThat(rsp).contains(serviceName).as("Response contains service name");
+        assertThat(rsp).as("Response contains service name").contains(serviceName);
         logger.info(rsp);
 
         // Keep alive

diff --git a/policy-agent/src/test/java/org/oransc/policyagent/dmaap/DmaapMessageHandlerTest.java b/policy-agent/src/test/java/org/oransc/policyagent/dmaap/DmaapMessageHandlerTest.java
index 7de215e..2e71a2e 100644 (file)
--- a/policy-agent/src/test/java/org/oransc/policyagent/dmaap/DmaapMessageHandlerTest.java
+++ b/policy-agent/src/test/java/org/oransc/policyagent/dmaap/DmaapMessageHandlerTest.java
@@ -66,7 +66,7 @@ class DmaapMessageHandlerTest {
     private final AsyncRestClient agentClient = mock(AsyncRestClient.class);
     private DmaapMessageHandler testedObject;
     private static Gson gson = new GsonBuilder() //
-        .create(); //
+            .create(); //
 
     @BeforeEach
     private void setUp() throws Exception {
@@ -84,19 +84,19 @@ class DmaapMessageHandlerTest {
 
     DmaapRequestMessage dmaapRequestMessage(Operation operation) {
         Optional<JsonObject> payload =
-            ((operation == Operation.PUT || operation == Operation.POST) ? Optional.of(payloadAsJson())
-                : Optional.empty());
+                ((operation == Operation.PUT || operation == Operation.POST) ? Optional.of(payloadAsJson())
+                        : Optional.empty());
         return ImmutableDmaapRequestMessage.builder() //
-            .apiVersion("apiVersion") //
-            .correlationId("correlationId") //
-            .operation(operation) //
-            .originatorId("originatorId") //
-            .payload(payload) //
-            .requestId("requestId") //
-            .target("target") //
-            .timestamp("timestamp") //
-            .url(URL) //
-            .build();
+                .apiVersion("apiVersion") //
+                .correlationId("correlationId") //
+                .operation(operation) //
+                .originatorId("originatorId") //
+                .payload(payload) //
+                .requestId("requestId") //
+                .target("target") //
+                .timestamp("timestamp") //
+                .url(URL) //
+                .build();
     }
 
     private String dmaapInputMessage(Operation operation) {
@@ -131,14 +131,14 @@ class DmaapMessageHandlerTest {
     @Test
     void unparseableMessage_thenWarning() {
         final ListAppender<ILoggingEvent> logAppender =
-            LoggingUtils.getLogListAppender(DmaapMessageHandler.class, WARN);
+                LoggingUtils.getLogListAppender(DmaapMessageHandler.class, WARN);
 
         String msg = "bad message";
         testedObject.handleDmaapMsg(msg);
 
         assertThat(logAppender.list.get(0).getFormattedMessage()).startsWith(
-            "handleDmaapMsg failure org.oransc.policyagent.exceptions.ServiceException: Received unparsable "
-                + "message from DMAAP: \"" + msg + "\", reason: ");
+                "handleDmaapMsg failure org.oransc.policyagent.exceptions.ServiceException: Received unparsable "
+                        + "message from DMAAP: \"" + msg + "\", reason: ");
     }
 
     @Test
@@ -149,10 +149,10 @@ class DmaapMessageHandlerTest {
         String message = dmaapInputMessage(Operation.DELETE);
 
         StepVerifier //
-            .create(testedObject.createTask(message)) //
-            .expectSubscription() //
-            .expectNext("OK") //
-            .verifyComplete(); //
+                .create(testedObject.createTask(message)) //
+                .expectSubscription() //
+                .expectNext("OK") //
+                .verifyComplete(); //
 
         verify(agentClient).deleteForEntity(URL);
         verifyNoMoreInteractions(agentClient);
@@ -168,10 +168,10 @@ class DmaapMessageHandlerTest {
         doReturn(Mono.just("OK")).when(dmaapClient).post(anyString(), anyString());
 
         StepVerifier //
-            .create(testedObject.createTask(dmaapInputMessage(Operation.GET))) //
-            .expectSubscription() //
-            .expectNext("OK") //
-            .verifyComplete(); //
+                .create(testedObject.createTask(dmaapInputMessage(Operation.GET))) //
+                .expectSubscription() //
+                .expectNext("OK") //
+                .verifyComplete(); //
 
         verify(agentClient).getForEntity(URL);
         verifyNoMoreInteractions(agentClient);
@@ -186,10 +186,10 @@ class DmaapMessageHandlerTest {
         doReturn(Mono.just("OK")).when(dmaapClient).post(anyString(), anyString());
 
         StepVerifier //
-            .create(testedObject.createTask(dmaapInputMessage(Operation.PUT))) //
-            .expectSubscription() //
-            .expectNext("OK") //
-            .verifyComplete(); //
+                .create(testedObject.createTask(dmaapInputMessage(Operation.PUT))) //
+                .expectSubscription() //
+                .expectNext("OK") //
+                .verifyComplete(); //
 
         verify(agentClient).putForEntity(URL, payloadAsString());
         verifyNoMoreInteractions(agentClient);
@@ -204,10 +204,10 @@ class DmaapMessageHandlerTest {
         doReturn(Mono.just("OK")).when(dmaapClient).post(anyString(), anyString());
 
         StepVerifier //
-            .create(testedObject.createTask(dmaapInputMessage(Operation.POST))) //
-            .expectSubscription() //
-            .expectNext("OK") //
-            .verifyComplete(); //
+                .create(testedObject.createTask(dmaapInputMessage(Operation.POST))) //
+                .expectSubscription() //
+                .expectNext("OK") //
+                .verifyComplete(); //
 
         verify(agentClient).postForEntity(URL, payloadAsString());
         verifyNoMoreInteractions(agentClient);
@@ -230,8 +230,8 @@ class DmaapMessageHandlerTest {
         ArgumentCaptor<String> captor = ArgumentCaptor.forClass(String.class);
         verify(dmaapClient).post(anyString(), captor.capture());
         String actualMessage = captor.getValue();
-        assertThat(actualMessage).contains(HttpStatus.BAD_GATEWAY.toString())
-            .as("Message \"%s\" sent to DMaaP contains %s", actualMessage, HttpStatus.BAD_GATEWAY);
+        assertThat(actualMessage).as("Message \"%s\" sent to DMaaP contains %s", actualMessage, HttpStatus.BAD_GATEWAY)
+                .contains(HttpStatus.BAD_GATEWAY.toString());
 
         verifyNoMoreInteractions(dmaapClient);
     }
@@ -257,11 +257,11 @@ class DmaapMessageHandlerTest {
         message = message.replace(",\"payload\":{\"name\":\"name\",\"schema\":\"schema\"}", "");
 
         final ListAppender<ILoggingEvent> logAppender =
-            LoggingUtils.getLogListAppender(DmaapMessageHandler.class, WARN);
+                LoggingUtils.getLogListAppender(DmaapMessageHandler.class, WARN);
 
         testedObject.handleDmaapMsg(message);
 
         assertThat(logAppender.list.get(0).getFormattedMessage())
-            .startsWith("Expected payload in message from DMAAP: ");
+                .startsWith("Expected payload in message from DMAAP: ");
     }
 }