X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=main%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fpdpx%2Fmain%2Fstartstop%2FXacmlPdpActivator.java;h=eb3ac230f6d3ce2905879fb661fc1148cfdaa8bb;hb=a805d1f1044b204e7aeb898b4b5682925bf9284d;hp=8af412d59a345546c0d9d2ea6d7e29c88041c05d;hpb=aba606406dded6ea6d9bf140ea2cbbf11fe90238;p=policy%2Fxacml-pdp.git

diff --git a/main/src/main/java/org/onap/policy/pdpx/main/startstop/XacmlPdpActivator.java b/main/src/main/java/org/onap/policy/pdpx/main/startstop/XacmlPdpActivator.java
index 8af412d5..eb3ac230 100644
--- a/main/src/main/java/org/onap/policy/pdpx/main/startstop/XacmlPdpActivator.java
+++ b/main/src/main/java/org/onap/policy/pdpx/main/startstop/XacmlPdpActivator.java
@@ -25,7 +25,7 @@ import java.util.Arrays;
 import java.util.Properties;
 import lombok.Getter;
 import lombok.Setter;
-import org.onap.policy.common.endpoints.event.comm.TopicEndpoint;
+import org.onap.policy.common.endpoints.event.comm.TopicEndpointManager;
 import org.onap.policy.common.endpoints.event.comm.TopicSource;
 import org.onap.policy.common.endpoints.event.comm.client.TopicSinkClient;
 import org.onap.policy.common.endpoints.event.comm.client.TopicSinkClientException;
@@ -85,8 +85,8 @@ public class XacmlPdpActivator extends ServiceManagerContainer {
     public XacmlPdpActivator(final XacmlPdpParameterGroup xacmlPdpParameterGroup, Properties topicProperties) {
         LOGGER.info("Activator initializing using {} and {}", xacmlPdpParameterGroup, topicProperties);
 
-        TopicEndpoint.manager.addTopicSinks(topicProperties);
-        TopicEndpoint.manager.addTopicSources(topicProperties);
+        TopicEndpointManager.getManager().addTopicSinks(topicProperties);
+        TopicEndpointManager.getManager().addTopicSources(topicProperties);
 
         final XacmlPdpHearbeatPublisher heartbeat;
         final TopicSinkClient sinkClient;
@@ -135,8 +135,8 @@ public class XacmlPdpActivator extends ServiceManagerContainer {
             this::unregisterMsgDispatcher);
 
         addAction("topics",
-            TopicEndpoint.manager::start,
-            TopicEndpoint.manager::shutdown);
+            TopicEndpointManager.getManager()::start,
+            TopicEndpointManager.getManager()::shutdown);
 
         addAction("Terminate PDP",
             () -> { },
@@ -196,7 +196,7 @@ public class XacmlPdpActivator extends ServiceManagerContainer {
      * Registers the dispatcher with the topic source(s).
      */
     private void registerMsgDispatcher() {
-        for (TopicSource source : TopicEndpoint.manager.getTopicSources(Arrays.asList(TOPIC))) {
+        for (TopicSource source : TopicEndpointManager.getManager().getTopicSources(Arrays.asList(TOPIC))) {
             source.register(msgDispatcher);
         }
     }
@@ -205,7 +205,7 @@ public class XacmlPdpActivator extends ServiceManagerContainer {
      * Unregisters the dispatcher from the topic source(s).
      */
     private void unregisterMsgDispatcher() {
-        for (TopicSource source : TopicEndpoint.manager.getTopicSources(Arrays.asList(TOPIC))) {
+        for (TopicSource source : TopicEndpointManager.getManager().getTopicSources(Arrays.asList(TOPIC))) {
             source.unregister(msgDispatcher);
         }
     }