summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2019-07-30 11:53:14 -0400
committerJim Hahn <jrh3@att.com>2019-07-30 11:53:14 -0400
commit535b68b4ea437547639a8f662766bcaa9c6fabe8 (patch)
tree1480b3da8cf12dd0cf0d8cde86aeb1ec7098ccda
parentc646dd80d9d61d2311baa7cae924b203951ecc9a (diff)
Use new addTopic() method in xacml-pdp
Replaced ParameterUtils with the use of the new addTopic(TopicParameterGroup) method. Change-Id: I35bf8a78d4670835dda005cdb218665a3bf48a16 Issue-ID: POLICY-1953 Signed-off-by: Jim Hahn <jrh3@att.com>
-rw-r--r--main/src/main/java/org/onap/policy/pdpx/main/startstop/Main.java7
-rw-r--r--main/src/main/java/org/onap/policy/pdpx/main/startstop/XacmlPdpActivator.java9
-rw-r--r--main/src/test/java/org/onap/policy/pdpx/main/startstop/TestXacmlPdpActivator.java7
3 files changed, 5 insertions, 18 deletions
diff --git a/main/src/main/java/org/onap/policy/pdpx/main/startstop/Main.java b/main/src/main/java/org/onap/policy/pdpx/main/startstop/Main.java
index 62b811d8..8d3aa9ff 100644
--- a/main/src/main/java/org/onap/policy/pdpx/main/startstop/Main.java
+++ b/main/src/main/java/org/onap/policy/pdpx/main/startstop/Main.java
@@ -22,9 +22,7 @@
package org.onap.policy.pdpx.main.startstop;
import java.util.Arrays;
-import java.util.Properties;
import lombok.Getter;
-import org.onap.policy.common.endpoints.utils.ParameterUtils;
import org.onap.policy.pdpx.main.PolicyXacmlPdpException;
import org.onap.policy.pdpx.main.parameters.XacmlPdpParameterGroup;
import org.onap.policy.pdpx.main.parameters.XacmlPdpParameterHandler;
@@ -71,11 +69,8 @@ public class Main {
// Read the parameters
XacmlPdpParameterGroup parameterGroup = new XacmlPdpParameterHandler().getParameters(arguments);
- // Read the properties
- Properties props = ParameterUtils.getTopicProperties(parameterGroup.getTopicParameterGroup());
-
// Now, create the activator for the policy xacml pdp service
- activator = new XacmlPdpActivator(parameterGroup, props);
+ activator = new XacmlPdpActivator(parameterGroup);
XacmlPdpActivator.setCurrent(activator);
// Start the activator
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 70253c09..16998a22 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
@@ -22,7 +22,6 @@ package org.onap.policy.pdpx.main.startstop;
import java.nio.file.Paths;
import java.util.Arrays;
-import java.util.Properties;
import lombok.Getter;
import lombok.Setter;
import org.onap.policy.common.endpoints.event.comm.TopicEndpointManager;
@@ -77,13 +76,11 @@ public class XacmlPdpActivator extends ServiceManagerContainer {
* Instantiate the activator for policy xacml pdp as a complete service.
*
* @param xacmlPdpParameterGroup the parameters for the xacml pdp service
- * @param topicProperties properties used to configure the topics
*/
- public XacmlPdpActivator(final XacmlPdpParameterGroup xacmlPdpParameterGroup, Properties topicProperties) {
- LOGGER.info("Activator initializing using {} and {}", xacmlPdpParameterGroup, topicProperties);
+ public XacmlPdpActivator(final XacmlPdpParameterGroup xacmlPdpParameterGroup) {
+ LOGGER.info("Activator initializing using {}", xacmlPdpParameterGroup);
- TopicEndpointManager.getManager().addTopicSinks(topicProperties);
- TopicEndpointManager.getManager().addTopicSources(topicProperties);
+ TopicEndpointManager.getManager().addTopics(xacmlPdpParameterGroup.getTopicParameterGroup());
final XacmlPdpHearbeatPublisher heartbeat;
final TopicSinkClient sinkClient;
diff --git a/main/src/test/java/org/onap/policy/pdpx/main/startstop/TestXacmlPdpActivator.java b/main/src/test/java/org/onap/policy/pdpx/main/startstop/TestXacmlPdpActivator.java
index 7e7dee22..cd4b78d9 100644
--- a/main/src/test/java/org/onap/policy/pdpx/main/startstop/TestXacmlPdpActivator.java
+++ b/main/src/test/java/org/onap/policy/pdpx/main/startstop/TestXacmlPdpActivator.java
@@ -26,12 +26,10 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-import java.util.Properties;
import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.onap.policy.common.endpoints.utils.ParameterUtils;
import org.onap.policy.pdpx.main.CommonRest;
import org.onap.policy.pdpx.main.PolicyXacmlPdpException;
import org.onap.policy.pdpx.main.parameters.CommonTestData;
@@ -45,7 +43,6 @@ import org.onap.policy.pdpx.main.parameters.XacmlPdpParameterHandler;
*/
public class TestXacmlPdpActivator extends CommonRest {
private static XacmlPdpParameterGroup parGroup;
- private static Properties props;
private XacmlPdpActivator activator = null;
@@ -60,8 +57,6 @@ public class TestXacmlPdpActivator extends CommonRest {
final XacmlPdpCommandLineArguments arguments = new XacmlPdpCommandLineArguments(xacmlPdpConfigParameters);
parGroup = new XacmlPdpParameterHandler().getParameters(arguments);
- props = ParameterUtils.getTopicProperties(parGroup.getTopicParameterGroup());
-
// don't want the common "main" running
CommonRest.stopMain();
}
@@ -71,7 +66,7 @@ public class TestXacmlPdpActivator extends CommonRest {
*/
@Before
public void setUp() {
- activator = new XacmlPdpActivator(parGroup, props);
+ activator = new XacmlPdpActivator(parGroup);
}
@Test