diff options
Diffstat (limited to 'models-sim/policy-models-sim-pdp/src')
5 files changed, 9 insertions, 28 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 735784ee6..2c3f8f79f 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 @@ -22,7 +22,6 @@ package org.onap.policy.models.sim.pdp; import java.util.List; -import java.util.Properties; import java.util.Random; import lombok.Getter; import lombok.Setter; @@ -77,13 +76,13 @@ public class PdpSimulatorActivator { * Instantiate the activator for onappf PDP-A. * * @param pdpSimulatorParameterGroup the parameters for the onappf PDP-A service - * @param topicProperties properties used to configure the topics */ - public PdpSimulatorActivator(final PdpSimulatorParameterGroup pdpSimulatorParameterGroup, - final Properties topicProperties) { + public PdpSimulatorActivator(final PdpSimulatorParameterGroup pdpSimulatorParameterGroup) { - topicSinks = TopicEndpointManager.getManager().addTopicSinks(topicProperties); - topicSources = TopicEndpointManager.getManager().addTopicSources(topicProperties); + topicSinks = TopicEndpointManager.getManager() + .addTopicSinks(pdpSimulatorParameterGroup.getTopicParameterGroup().getTopicSinks()); + topicSources = TopicEndpointManager.getManager() + .addTopicSources(pdpSimulatorParameterGroup.getTopicParameterGroup().getTopicSources()); final int random = RANDOM.nextInt(); final String instanceId = "pdp_" + random; diff --git a/models-sim/policy-models-sim-pdp/src/main/java/org/onap/policy/models/sim/pdp/PdpSimulatorMain.java b/models-sim/policy-models-sim-pdp/src/main/java/org/onap/policy/models/sim/pdp/PdpSimulatorMain.java index ee974c579..e367cca41 100644 --- a/models-sim/policy-models-sim-pdp/src/main/java/org/onap/policy/models/sim/pdp/PdpSimulatorMain.java +++ b/models-sim/policy-models-sim-pdp/src/main/java/org/onap/policy/models/sim/pdp/PdpSimulatorMain.java @@ -22,8 +22,6 @@ package org.onap.policy.models.sim.pdp; import java.util.Arrays; -import java.util.Properties; -import org.onap.policy.common.endpoints.utils.ParameterUtils; import org.onap.policy.common.utils.services.Registry; import org.onap.policy.models.sim.pdp.exception.PdpSimulatorException; import org.onap.policy.models.sim.pdp.parameters.PdpSimulatorParameterGroup; @@ -79,11 +77,8 @@ public class PdpSimulatorMain { return; } - // Read the properties - Properties topicProperties = ParameterUtils.getTopicProperties(parameterGroup.getTopicParameterGroup()); - // create the activator - activator = new PdpSimulatorActivator(parameterGroup, topicProperties); + activator = new PdpSimulatorActivator(parameterGroup); Registry.register(PdpSimulatorConstants.REG_PDP_SIMULATOR_ACTIVATOR, activator); // Start the activator try { 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 b2ab08760..1ebd2a082 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 @@ -28,11 +28,9 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import java.util.Properties; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.onap.policy.common.endpoints.utils.ParameterUtils; import org.onap.policy.common.utils.services.Registry; import org.onap.policy.models.pdp.concepts.PdpStatus; import org.onap.policy.models.sim.pdp.exception.PdpSimulatorException; @@ -62,8 +60,7 @@ public class TestPdpSimulatorActivator { new PdpSimulatorCommandLineArguments(pdpSimulatorConfigParameters); final PdpSimulatorParameterGroup parGroup = new PdpSimulatorParameterHandler().getParameters(arguments); - final Properties props = ParameterUtils.getTopicProperties(parGroup.getTopicParameterGroup()); - activator = new PdpSimulatorActivator(parGroup, props); + activator = new PdpSimulatorActivator(parGroup); } /** diff --git a/models-sim/policy-models-sim-pdp/src/test/java/org/onap/policy/models/sim/pdp/comm/TestPdpStateChangeListener.java b/models-sim/policy-models-sim-pdp/src/test/java/org/onap/policy/models/sim/pdp/comm/TestPdpStateChangeListener.java index 2b3704738..93015e94e 100644 --- a/models-sim/policy-models-sim-pdp/src/test/java/org/onap/policy/models/sim/pdp/comm/TestPdpStateChangeListener.java +++ b/models-sim/policy-models-sim-pdp/src/test/java/org/onap/policy/models/sim/pdp/comm/TestPdpStateChangeListener.java @@ -31,12 +31,10 @@ import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import java.util.Properties; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.onap.policy.common.endpoints.event.comm.Topic.CommInfrastructure; -import org.onap.policy.common.endpoints.utils.ParameterUtils; import org.onap.policy.common.utils.services.Registry; import org.onap.policy.models.pdp.concepts.PdpStateChange; import org.onap.policy.models.pdp.concepts.PdpStatus; @@ -88,10 +86,7 @@ public class TestPdpStateChangeListener { // Read the parameters pdpSimulatorParameterGroup = new PdpSimulatorParameterHandler().getParameters(arguments); - // Read the properties - final Properties topicProperties = - ParameterUtils.getTopicProperties(pdpSimulatorParameterGroup.getTopicParameterGroup()); - activator = new PdpSimulatorActivator(pdpSimulatorParameterGroup, topicProperties); + activator = new PdpSimulatorActivator(pdpSimulatorParameterGroup); Registry.register(PdpSimulatorConstants.REG_PDP_SIMULATOR_ACTIVATOR, activator); activator.initialize(); } diff --git a/models-sim/policy-models-sim-pdp/src/test/java/org/onap/policy/models/sim/pdp/comm/TestPdpUpdateListener.java b/models-sim/policy-models-sim-pdp/src/test/java/org/onap/policy/models/sim/pdp/comm/TestPdpUpdateListener.java index 9ae8d370a..7bf70ddc1 100644 --- a/models-sim/policy-models-sim-pdp/src/test/java/org/onap/policy/models/sim/pdp/comm/TestPdpUpdateListener.java +++ b/models-sim/policy-models-sim-pdp/src/test/java/org/onap/policy/models/sim/pdp/comm/TestPdpUpdateListener.java @@ -31,12 +31,10 @@ import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import java.util.Properties; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.onap.policy.common.endpoints.event.comm.Topic.CommInfrastructure; -import org.onap.policy.common.endpoints.utils.ParameterUtils; import org.onap.policy.common.utils.services.Registry; import org.onap.policy.models.pdp.concepts.PdpStatus; import org.onap.policy.models.pdp.concepts.PdpUpdate; @@ -82,10 +80,7 @@ public class TestPdpUpdateListener { // Read the parameters pdpSimulatorParameterGroup = new PdpSimulatorParameterHandler().getParameters(arguments); - // Read the properties - final Properties topicProperties = - ParameterUtils.getTopicProperties(pdpSimulatorParameterGroup.getTopicParameterGroup()); - activator = new PdpSimulatorActivator(pdpSimulatorParameterGroup, topicProperties); + activator = new PdpSimulatorActivator(pdpSimulatorParameterGroup); Registry.register(PdpSimulatorConstants.REG_PDP_SIMULATOR_ACTIVATOR, activator); activator.initialize(); pdpUpdateMessageListener = new PdpUpdateListener(); |