From d0f9e47adecf3e51f168383e4568471f605ec6d3 Mon Sep 17 00:00:00 2001 From: PatrikBuhr Date: Tue, 28 Apr 2020 15:18:39 +0200 Subject: [PATCH] Fixed so that DMAAP client uses https Change-Id: I530c70159ef26bb3d3df11f23b3f89715c591efb Issue-ID: NONRTRIC-195 Signed-off-by: PatrikBuhr --- .../main/java/org/oransc/policyagent/dmaap/DmaapMessageConsumer.java | 2 +- .../java/org/oransc/policyagent/dmaap/DmaapMessageConsumerTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 f03aa582..da209a86 100644 --- a/policy-agent/src/main/java/org/oransc/policyagent/dmaap/DmaapMessageConsumer.java +++ b/policy-agent/src/main/java/org/oransc/policyagent/dmaap/DmaapMessageConsumer.java @@ -110,7 +110,7 @@ public class DmaapMessageConsumer implements Runnable { } private DmaapMessageHandler getDmaapMessageHandler() throws IOException { - String agentBaseUrl = "http://localhost:" + this.localServerPort; + String agentBaseUrl = "https://localhost:" + this.localServerPort; AsyncRestClient agentClient = createRestClient(agentBaseUrl); Properties dmaapPublisherProperties = applicationConfig.getDmaapPublisherConfig(); MRBatchingPublisher producer = getMessageRouterPublisher(dmaapPublisherProperties); diff --git a/policy-agent/src/test/java/org/oransc/policyagent/dmaap/DmaapMessageConsumerTest.java b/policy-agent/src/test/java/org/oransc/policyagent/dmaap/DmaapMessageConsumerTest.java index 153c4ecc..8dd36473 100644 --- a/policy-agent/src/test/java/org/oransc/policyagent/dmaap/DmaapMessageConsumerTest.java +++ b/policy-agent/src/test/java/org/oransc/policyagent/dmaap/DmaapMessageConsumerTest.java @@ -170,7 +170,7 @@ public class DmaapMessageConsumerTest { messageConsumerUnderTest.run(); - verify(messageConsumerUnderTest).createRestClient("http://localhost:0"); + verify(messageConsumerUnderTest).createRestClient("https://localhost:0"); verify(messageConsumerUnderTest).getMessageRouterPublisher(properties); verify(messageHandlerMock).handleDmaapMsg("message"); -- 2.16.6