summaryrefslogtreecommitdiffstats
path: root/PolicyEngineUtils/src
diff options
context:
space:
mode:
authorPamela Dragosh <pdragosh@research.att.com>2018-11-06 13:37:35 -0500
committerPamela Dragosh <pdragosh@research.att.com>2018-11-08 13:36:33 -0500
commitcf54241ec76e67246961eb2d25c55b1e14c43877 (patch)
tree7b61b8d78676485fc08c20076f1ff62a5bef26ca /PolicyEngineUtils/src
parentcf6e8fd9a574877c6efaf6bad0cf18750e5a6a22 (diff)
Update dmaap 1.1.9 changes
Upgrading policy/parent to v1.1.9 requires these code changes to occur. Need to change to policy/parent 2.0.1 for the right dmaap to be included. Upgrade policy common and drools-applications to 1.3.3 released artifacts. Also just included the change from gerrit review https://gerrit.onap.org/r/#/c/72026/ instead of cherry picking it. Updating release to 1.3.3-SNAPSHOT Issue-ID: POLICY-1229 Change-Id: I16f4bbd9ba2d46cdc3b94feba1f2e7f20d837dad Signed-off-by: Pamela Dragosh <pdragosh@research.att.com> (cherry picked from commit fe8b9e72cafa4acf31db4239593a74a5ccf89a4a) Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
Diffstat (limited to 'PolicyEngineUtils/src')
-rw-r--r--PolicyEngineUtils/src/main/java/org/onap/policy/utils/BusConsumer.java7
-rw-r--r--PolicyEngineUtils/src/main/java/org/onap/policy/utils/BusPublisher.java6
-rw-r--r--PolicyEngineUtils/src/test/java/org/onap/policy/utils/test/BusTest.java3
3 files changed, 6 insertions, 10 deletions
diff --git a/PolicyEngineUtils/src/main/java/org/onap/policy/utils/BusConsumer.java b/PolicyEngineUtils/src/main/java/org/onap/policy/utils/BusConsumer.java
index 6d80a6a78..0d4c86b3d 100644
--- a/PolicyEngineUtils/src/main/java/org/onap/policy/utils/BusConsumer.java
+++ b/PolicyEngineUtils/src/main/java/org/onap/policy/utils/BusConsumer.java
@@ -23,10 +23,9 @@ package org.onap.policy.utils;
import java.net.MalformedURLException;
import java.util.List;
import java.util.Properties;
-
-import com.att.nsa.mr.client.MRClient.MRApiException;
-import com.att.nsa.mr.client.impl.MRConsumerImpl;
-import com.att.nsa.mr.test.clients.ProtocolTypeConstants;
+import org.onap.dmaap.mr.client.MRClient.MRApiException;
+import org.onap.dmaap.mr.client.impl.MRConsumerImpl;
+import org.onap.dmaap.mr.test.clients.ProtocolTypeConstants;
public interface BusConsumer {
diff --git a/PolicyEngineUtils/src/main/java/org/onap/policy/utils/BusPublisher.java b/PolicyEngineUtils/src/main/java/org/onap/policy/utils/BusPublisher.java
index 3a12122bf..745213529 100644
--- a/PolicyEngineUtils/src/main/java/org/onap/policy/utils/BusPublisher.java
+++ b/PolicyEngineUtils/src/main/java/org/onap/policy/utils/BusPublisher.java
@@ -24,14 +24,12 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
-
+import org.onap.dmaap.mr.client.impl.MRSimplerBatchPublisher;
+import org.onap.dmaap.mr.test.clients.ProtocolTypeConstants;
import org.onap.policy.common.logging.eelf.PolicyLogger;
import org.onap.policy.common.logging.flexlogger.FlexLogger;
import org.onap.policy.common.logging.flexlogger.Logger;
-import com.att.nsa.mr.client.impl.MRSimplerBatchPublisher;
-import com.att.nsa.mr.test.clients.ProtocolTypeConstants;
-
public interface BusPublisher {
/**
diff --git a/PolicyEngineUtils/src/test/java/org/onap/policy/utils/test/BusTest.java b/PolicyEngineUtils/src/test/java/org/onap/policy/utils/test/BusTest.java
index 37170f077..37f0bb016 100644
--- a/PolicyEngineUtils/src/test/java/org/onap/policy/utils/test/BusTest.java
+++ b/PolicyEngineUtils/src/test/java/org/onap/policy/utils/test/BusTest.java
@@ -27,11 +27,10 @@ import java.net.MalformedURLException;
import java.util.Arrays;
import org.junit.Test;
+import org.onap.dmaap.mr.client.MRClient.MRApiException;
import org.onap.policy.utils.BusConsumer;
import org.onap.policy.utils.BusPublisher;
-import com.att.nsa.mr.client.MRClient.MRApiException;
-
public class BusTest {
@Test