Fix models due to sonar changes in common

Fixed breakages due to changes made in policy/common to satisfy
sonar.

Change-Id: I7de701e743664afb5963a454c59478d1a1c83e87
Issue-ID: POLICY-1791
Signed-off-by: Jim Hahn <jrh3@att.com>

2 files changed, 6 insertions, 7 deletions

diff --git a/models-sim/policy-models-sim-pdp/src/main/java/org/onap/policy/models/sim/pdp/PdpSimulatorActivator.java b/models-sim/policy-models-sim-pdp/src/main/java/org/onap/policy/models/sim/pdp/PdpSimulatorActivator.java
index 502dec7b3..735784ee6 100644
--- a/models-sim/policy-models-sim-pdp/src/main/java/org/onap/policy/models/sim/pdp/PdpSimulatorActivator.java
+++ b/models-sim/policy-models-sim-pdp/src/main/java/org/onap/policy/models/sim/pdp/PdpSimulatorActivator.java
@@ -26,7 +26,7 @@ import java.util.Properties;
 import java.util.Random;
 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.TopicSink;
 import org.onap.policy.common.endpoints.event.comm.TopicSource;
 import org.onap.policy.common.endpoints.listeners.MessageTypeDispatcher;
@@ -82,8 +82,8 @@ public class PdpSimulatorActivator {
     public PdpSimulatorActivator(final PdpSimulatorParameterGroup pdpSimulatorParameterGroup,
             final Properties topicProperties) {
 
-        topicSinks = TopicEndpoint.manager.addTopicSinks(topicProperties);
-        topicSources = TopicEndpoint.manager.addTopicSources(topicProperties);
+        topicSinks = TopicEndpointManager.getManager().addTopicSinks(topicProperties);
+        topicSources = TopicEndpointManager.getManager().addTopicSources(topicProperties);
 
         final int random = RANDOM.nextInt();
         final String instanceId = "pdp_" + random;
@@ -100,8 +100,8 @@ public class PdpSimulatorActivator {
         // @formatter:off
         this.manager = new ServiceManager()
             .addAction("topics",
-                TopicEndpoint.manager::start,
-                TopicEndpoint.manager::shutdown)
+                TopicEndpointManager.getManager()::start,
+                TopicEndpointManager.getManager()::shutdown)
             .addAction("set alive",
                 () -> setAlive(true),
                 () -> setAlive(false))
diff --git a/models-sim/policy-models-sim-pdp/src/test/java/org/onap/policy/models/sim/pdp/TestPdpSimulatorActivator.java b/models-sim/policy-models-sim-pdp/src/test/java/org/onap/policy/models/sim/pdp/TestPdpSimulatorActivator.java
index dbf7bbcea..b2ab08760 100644
--- a/models-sim/policy-models-sim-pdp/src/test/java/org/onap/policy/models/sim/pdp/TestPdpSimulatorActivator.java
+++ b/models-sim/policy-models-sim-pdp/src/test/java/org/onap/policy/models/sim/pdp/TestPdpSimulatorActivator.java
@@ -1,6 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2019 Nordix Foundation.
+ *  Modifications Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,9 +28,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-import java.io.FileInputStream;
 import java.util.Properties;
-
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;