From 0756759f39e125b02d63b4e93de83b3c6b13beea Mon Sep 17 00:00:00 2001 From: Patrick Brady Date: Wed, 13 Dec 2017 11:09:30 -0800 Subject: First part of onap rename This is the first commit of the rename. This commit changes refereces to org.openecomp.appc > org.onap.appc that occur within files. The package folder structure is not changed in this commit. Change-Id: Ic95d749eb99d8a6f4f2b9ee9b06eb41c5cfa7e1c Signed-off-by: Patrick Brady Issue-ID: APPC-13 --- .../java/org/openecomp/appc/listener/LCM/TestConverter.java | 10 +++++----- .../appc/listener/LCM1607/model/TestJsonGenericMessages.java | 4 ++-- .../org/openecomp/appc/listener/TestAbstractListener.java | 8 ++++---- .../appc/listener/TestAppcDmaapListenerActivator.java | 4 ++-- .../org/openecomp/appc/listener/TestListenerProperties.java | 12 ++++++------ .../org/openecomp/appc/listener/demo/model/TestEnums.java | 6 +++--- .../org/openecomp/appc/listener/demo/model/TestMessages.java | 10 +++++----- .../org/openecomp/appc/listener/impl/TestController.java | 2 +- .../org/openecomp/appc/listener/impl/TestEventHandler.java | 10 +++++----- .../java/org/openecomp/appc/listener/impl/TestListener.java | 10 +++++----- .../java/org/openecomp/appc/listener/util/TestMapper.java | 4 ++-- 11 files changed, 40 insertions(+), 40 deletions(-) (limited to 'appc-event-listener/appc-event-listener-bundle/src/test') diff --git a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/LCM/TestConverter.java b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/LCM/TestConverter.java index 99f775140..f9fb7f408 100644 --- a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/LCM/TestConverter.java +++ b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/LCM/TestConverter.java @@ -22,16 +22,16 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.listener.LCM; +package org.onap.appc.listener.LCM; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import org.junit.Assert; import org.junit.Test; -import org.openecomp.appc.listener.LCM.conv.Converter; -import org.openecomp.appc.listener.LCM.model.DmaapIncomingMessage; -import org.openecomp.appc.listener.LCM.model.DmaapOutgoingMessage; -import org.openecomp.appc.listener.util.Mapper; +import org.onap.appc.listener.LCM.conv.Converter; +import org.onap.appc.listener.LCM.model.DmaapIncomingMessage; +import org.onap.appc.listener.LCM.model.DmaapOutgoingMessage; +import org.onap.appc.listener.util.Mapper; public class TestConverter { diff --git a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/LCM1607/model/TestJsonGenericMessages.java b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/LCM1607/model/TestJsonGenericMessages.java index 03dd62b01..f28bd8cb3 100644 --- a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/LCM1607/model/TestJsonGenericMessages.java +++ b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/LCM1607/model/TestJsonGenericMessages.java @@ -22,12 +22,12 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.listener.LCM1607.model; +package org.onap.appc.listener.LCM1607.model; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Assert; import org.junit.Test; -import org.openecomp.appc.listener.util.Mapper; +import org.onap.appc.listener.util.Mapper; import java.io.IOException; import java.util.HashMap; diff --git a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/TestAbstractListener.java b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/TestAbstractListener.java index 3cd04fa89..a21bcd416 100644 --- a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/TestAbstractListener.java +++ b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/TestAbstractListener.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.listener; +package org.onap.appc.listener; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -34,8 +34,8 @@ import java.util.concurrent.ThreadPoolExecutor; import org.junit.Before; import org.junit.Test; -import org.openecomp.appc.listener.AbstractListener; -import org.openecomp.appc.listener.ListenerProperties; +import org.onap.appc.listener.AbstractListener; +import org.onap.appc.listener.ListenerProperties; public class TestAbstractListener { @@ -59,7 +59,7 @@ public class TestAbstractListener { @Before public void setup() throws Exception { Properties regularProps = new Properties(); - regularProps.load(getClass().getResourceAsStream("/org/openecomp/appc/default.properties")); + regularProps.load(getClass().getResourceAsStream("/org/onap/appc/default.properties")); props = new ListenerProperties("", regularProps); listener = new DummyListener(props); } diff --git a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/TestAppcDmaapListenerActivator.java b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/TestAppcDmaapListenerActivator.java index 1fca2d375..6bb96b95c 100644 --- a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/TestAppcDmaapListenerActivator.java +++ b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/TestAppcDmaapListenerActivator.java @@ -22,13 +22,13 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.listener; +package org.onap.appc.listener; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; import org.junit.Test; -import org.openecomp.appc.listener.AppcEventListenerActivator; +import org.onap.appc.listener.AppcEventListenerActivator; public class TestAppcDmaapListenerActivator { diff --git a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/TestListenerProperties.java b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/TestListenerProperties.java index 643f8d179..42c263394 100644 --- a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/TestListenerProperties.java +++ b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/TestListenerProperties.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.listener; +package org.onap.appc.listener; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -35,10 +35,10 @@ import java.util.Properties; import org.junit.Before; import org.junit.Test; -import org.openecomp.appc.adapter.factory.MessageService; -import org.openecomp.appc.listener.AbstractListener; -import org.openecomp.appc.listener.ListenerProperties; -import org.openecomp.appc.listener.ListenerProperties.KEYS; +import org.onap.appc.adapter.factory.MessageService; +import org.onap.appc.listener.AbstractListener; +import org.onap.appc.listener.ListenerProperties; +import org.onap.appc.listener.ListenerProperties.KEYS; public class TestListenerProperties { @@ -126,7 +126,7 @@ public class TestListenerProperties { Properties tmp = new Properties(); try { - tmp.load(getClass().getResourceAsStream("/org/openecomp/appc/default.properties")); + tmp.load(getClass().getResourceAsStream("/org/onap/appc/default.properties")); } catch (Exception e) { fail("Could not load properties to test"); } diff --git a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/demo/model/TestEnums.java b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/demo/model/TestEnums.java index bf12a534d..f201e02f0 100644 --- a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/demo/model/TestEnums.java +++ b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/demo/model/TestEnums.java @@ -22,14 +22,14 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.listener.demo.model; +package org.onap.appc.listener.demo.model; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import org.junit.Test; -import org.openecomp.appc.listener.demo.model.Action; -import org.openecomp.appc.listener.demo.model.Status; +import org.onap.appc.listener.demo.model.Action; +import org.onap.appc.listener.demo.model.Status; public class TestEnums { diff --git a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/demo/model/TestMessages.java b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/demo/model/TestMessages.java index 4dbb945b8..3eedd88a3 100644 --- a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/demo/model/TestMessages.java +++ b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/demo/model/TestMessages.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.listener.demo.model; +package org.onap.appc.listener.demo.model; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -35,10 +35,10 @@ import org.json.JSONObject; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; -import org.openecomp.appc.listener.demo.model.IncomingMessage; -import org.openecomp.appc.listener.demo.model.OutgoingMessage; -import org.openecomp.appc.listener.demo.model.Status; -import org.openecomp.appc.listener.util.Mapper; +import org.onap.appc.listener.demo.model.IncomingMessage; +import org.onap.appc.listener.demo.model.OutgoingMessage; +import org.onap.appc.listener.demo.model.Status; +import org.onap.appc.listener.util.Mapper; public class TestMessages { private IncomingMessage in; diff --git a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/impl/TestController.java b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/impl/TestController.java index 2a2c7de0a..d44bb22cc 100644 --- a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/impl/TestController.java +++ b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/impl/TestController.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.listener.impl; +package org.onap.appc.listener.impl; public class TestController { diff --git a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/impl/TestEventHandler.java b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/impl/TestEventHandler.java index 7f48d45dd..992566358 100644 --- a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/impl/TestEventHandler.java +++ b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/impl/TestEventHandler.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.listener.impl; +package org.onap.appc.listener.impl; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -40,9 +40,9 @@ import org.apache.commons.lang3.StringUtils; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; -import org.openecomp.appc.listener.EventHandler; -import org.openecomp.appc.listener.ListenerProperties; -import org.openecomp.appc.listener.impl.EventHandlerImpl; +import org.onap.appc.listener.EventHandler; +import org.onap.appc.listener.ListenerProperties; +import org.onap.appc.listener.impl.EventHandlerImpl; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonSerialize; @@ -58,7 +58,7 @@ public class TestEventHandler { private EventHandler adapter; - private static final String PROP_FILE = "/org/openecomp/appc/default.properties"; + private static final String PROP_FILE = "/org/onap/appc/default.properties"; private static final String MESSAGE_FILE = "/DCAEResponse.txt"; diff --git a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/impl/TestListener.java b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/impl/TestListener.java index 6fbda7e4f..67ad9bf1d 100644 --- a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/impl/TestListener.java +++ b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/impl/TestListener.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.listener.impl; +package org.onap.appc.listener.impl; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -32,14 +32,14 @@ import java.util.Properties; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; -import org.openecomp.appc.listener.Listener; -import org.openecomp.appc.listener.ListenerProperties; -import org.openecomp.appc.listener.demo.impl.ListenerImpl; +import org.onap.appc.listener.Listener; +import org.onap.appc.listener.ListenerProperties; +import org.onap.appc.listener.demo.impl.ListenerImpl; @Ignore public class TestListener { - private static final String PROP_FILE = "/org/openecomp/appc/default.properties"; + private static final String PROP_FILE = "/org/onap/appc/default.properties"; private Listener listener; diff --git a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/util/TestMapper.java b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/util/TestMapper.java index 47f02946b..de726194f 100644 --- a/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/util/TestMapper.java +++ b/appc-event-listener/appc-event-listener-bundle/src/test/java/org/openecomp/appc/listener/util/TestMapper.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.listener.util; +package org.onap.appc.listener.util; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -36,7 +36,7 @@ import java.util.List; import org.json.JSONObject; import org.junit.Before; import org.junit.Test; -import org.openecomp.appc.listener.util.Mapper; +import org.onap.appc.listener.util.Mapper; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -- cgit 1.2.3-korg