Renaming openecomp to onap

Issue-ID: AAI-208
Change-Id: I2635c4ed4f9e5d17b93a8ec2c3a0d82b79f75320
Signed-off-by: Arul.Nambi <arul.nambi@amdocs.com>

16 files changed, 124 insertions, 115 deletions

diff --git a/src/test/java/org/openecomp/aai/champ/concurrency/ConcurrencyTest.java b/src/test/java/org/onap/aai/champ/concurrency/ConcurrencyTest.java
index a9a6b75..f33266d 100644
--- a/src/test/java/org/openecomp/aai/champ/concurrency/ConcurrencyTest.java
+++ b/src/test/java/org/onap/aai/champ/concurrency/ConcurrencyTest.java
@@ -19,17 +19,17 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.concurrency;
+package org.onap.aai.champ.concurrency;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
 import org.junit.Test;
-import org.openecomp.aai.champ.ChampAPI;
-import org.openecomp.aai.champ.ChampGraph;
-import org.openecomp.aai.champ.core.ChampObjectTest;
-import org.openecomp.aai.champ.core.ChampRelationshipTest;
+import org.onap.aai.champ.ChampAPI;
+import org.onap.aai.champ.ChampGraph;
+import org.onap.aai.champ.core.ChampObjectTest;
+import org.onap.aai.champ.core.ChampRelationshipTest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/test/java/org/openecomp/aai/champ/core/BaseChampAPITest.java b/src/test/java/org/onap/aai/champ/core/BaseChampAPITest.java
index 7d374c3..af737bc 100644
--- a/src/test/java/org/openecomp/aai/champ/core/BaseChampAPITest.java
+++ b/src/test/java/org/onap/aai/champ/core/BaseChampAPITest.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.core;
+package org.onap.aai.champ.core;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/test/java/org/openecomp/aai/champ/core/ChampAPITest.java b/src/test/java/org/onap/aai/champ/core/ChampAPITest.java
index 7cd259e..d0097d9 100644
--- a/src/test/java/org/openecomp/aai/champ/core/ChampAPITest.java
+++ b/src/test/java/org/onap/aai/champ/core/ChampAPITest.java
@@ -19,15 +19,15 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.core;
+package org.onap.aai.champ.core;
 
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
-import org.openecomp.aai.champ.ChampAPI;
-import org.openecomp.aai.champ.ChampGraph;
-import org.openecomp.aai.champ.model.ChampObjectConstraint;
-import org.openecomp.aai.champ.model.ChampRelationshipConstraint;
+import org.onap.aai.champ.ChampAPI;
+import org.onap.aai.champ.ChampGraph;
+import org.onap.aai.champ.model.ChampObjectConstraint;
+import org.onap.aai.champ.model.ChampRelationshipConstraint;
 
 public class ChampAPITest {
 
diff --git a/src/test/java/org/openecomp/aai/champ/core/ChampElementTest.java b/src/test/java/org/onap/aai/champ/core/ChampElementTest.java
index 4d34f8a..af19cc2 100644
--- a/src/test/java/org/openecomp/aai/champ/core/ChampElementTest.java
+++ b/src/test/java/org/onap/aai/champ/core/ChampElementTest.java
@@ -19,14 +19,14 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.core;
+package org.onap.aai.champ.core;
 
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
-import org.openecomp.aai.champ.model.ChampElement;
-import org.openecomp.aai.champ.model.ChampObject;
-import org.openecomp.aai.champ.model.ChampRelationship;
+import org.onap.aai.champ.model.ChampElement;
+import org.onap.aai.champ.model.ChampObject;
+import org.onap.aai.champ.model.ChampRelationship;
 
 public class ChampElementTest {
 
diff --git a/src/test/java/org/openecomp/aai/champ/core/ChampFieldTest.java b/src/test/java/org/onap/aai/champ/core/ChampFieldTest.java
index f852d9d..0b4dbb8 100644
--- a/src/test/java/org/openecomp/aai/champ/core/ChampFieldTest.java
+++ b/src/test/java/org/onap/aai/champ/core/ChampFieldTest.java
@@ -19,12 +19,12 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.core;
+package org.onap.aai.champ.core;
 
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
-import org.openecomp.aai.champ.model.ChampField;
+import org.onap.aai.champ.model.ChampField;
 
 public class ChampFieldTest {
 
diff --git a/src/test/java/org/openecomp/aai/champ/core/ChampObjectIndexTest.java b/src/test/java/org/onap/aai/champ/core/ChampObjectIndexTest.java
index 6f71664..a11b67b 100644
--- a/src/test/java/org/openecomp/aai/champ/core/ChampObjectIndexTest.java
+++ b/src/test/java/org/onap/aai/champ/core/ChampObjectIndexTest.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.core;
+package org.onap.aai.champ.core;
 
 import static org.junit.Assert.assertTrue;
 
@@ -29,10 +29,10 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import org.junit.Test;
-import org.openecomp.aai.champ.ChampAPI;
-import org.openecomp.aai.champ.ChampGraph;
-import org.openecomp.aai.champ.exceptions.ChampIndexNotExistsException;
-import org.openecomp.aai.champ.model.ChampObjectIndex;
+import org.onap.aai.champ.ChampAPI;
+import org.onap.aai.champ.ChampGraph;
+import org.onap.aai.champ.exceptions.ChampIndexNotExistsException;
+import org.onap.aai.champ.model.ChampObjectIndex;
 
 public class ChampObjectIndexTest extends BaseChampAPITest {
 	@Test
diff --git a/src/test/java/org/openecomp/aai/champ/core/ChampObjectTest.java b/src/test/java/org/onap/aai/champ/core/ChampObjectTest.java
index f149243..fea167b 100644
--- a/src/test/java/org/openecomp/aai/champ/core/ChampObjectTest.java
+++ b/src/test/java/org/onap/aai/champ/core/ChampObjectTest.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.core;
+package org.onap.aai.champ.core;
 
 import static org.junit.Assert.assertTrue;
 
@@ -31,16 +31,16 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import org.junit.Test;
-import org.openecomp.aai.champ.ChampAPI;
-import org.openecomp.aai.champ.ChampGraph;
-import org.openecomp.aai.champ.exceptions.ChampMarshallingException;
-import org.openecomp.aai.champ.exceptions.ChampObjectNotExistsException;
-import org.openecomp.aai.champ.exceptions.ChampSchemaViolationException;
-import org.openecomp.aai.champ.exceptions.ChampUnmarshallingException;
-import org.openecomp.aai.champ.model.ChampCardinality;
-import org.openecomp.aai.champ.model.ChampField;
-import org.openecomp.aai.champ.model.ChampObject;
-import org.openecomp.aai.champ.model.ChampSchema;
+import org.onap.aai.champ.ChampAPI;
+import org.onap.aai.champ.ChampGraph;
+import org.onap.aai.champ.exceptions.ChampMarshallingException;
+import org.onap.aai.champ.exceptions.ChampObjectNotExistsException;
+import org.onap.aai.champ.exceptions.ChampSchemaViolationException;
+import org.onap.aai.champ.exceptions.ChampUnmarshallingException;
+import org.onap.aai.champ.model.ChampCardinality;
+import org.onap.aai.champ.model.ChampField;
+import org.onap.aai.champ.model.ChampObject;
+import org.onap.aai.champ.model.ChampSchema;
 
 public class ChampObjectTest extends BaseChampAPITest {
 
diff --git a/src/test/java/org/openecomp/aai/champ/core/ChampPartitionTest.java b/src/test/java/org/onap/aai/champ/core/ChampPartitionTest.java
index c8671bb..42894f4 100644
--- a/src/test/java/org/openecomp/aai/champ/core/ChampPartitionTest.java
+++ b/src/test/java/org/onap/aai/champ/core/ChampPartitionTest.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.core;
+package org.onap.aai.champ.core;
 
 import static org.junit.Assert.assertTrue;
 
@@ -27,16 +27,16 @@ import java.util.Collections;
 import java.util.Optional;
 
 import org.junit.Test;
-import org.openecomp.aai.champ.ChampAPI;
-import org.openecomp.aai.champ.ChampGraph;
-import org.openecomp.aai.champ.exceptions.ChampMarshallingException;
-import org.openecomp.aai.champ.exceptions.ChampObjectNotExistsException;
-import org.openecomp.aai.champ.exceptions.ChampRelationshipNotExistsException;
-import org.openecomp.aai.champ.exceptions.ChampSchemaViolationException;
-import org.openecomp.aai.champ.exceptions.ChampUnmarshallingException;
-import org.openecomp.aai.champ.model.ChampObject;
-import org.openecomp.aai.champ.model.ChampPartition;
-import org.openecomp.aai.champ.model.ChampRelationship;
+import org.onap.aai.champ.ChampAPI;
+import org.onap.aai.champ.ChampGraph;
+import org.onap.aai.champ.exceptions.ChampMarshallingException;
+import org.onap.aai.champ.exceptions.ChampObjectNotExistsException;
+import org.onap.aai.champ.exceptions.ChampRelationshipNotExistsException;
+import org.onap.aai.champ.exceptions.ChampSchemaViolationException;
+import org.onap.aai.champ.exceptions.ChampUnmarshallingException;
+import org.onap.aai.champ.model.ChampObject;
+import org.onap.aai.champ.model.ChampPartition;
+import org.onap.aai.champ.model.ChampRelationship;
 
 public class ChampPartitionTest extends BaseChampAPITest {
 
diff --git a/src/test/java/org/openecomp/aai/champ/core/ChampPropertyConstraintTest.java b/src/test/java/org/onap/aai/champ/core/ChampPropertyConstraintTest.java
index 8ee45f4..5dfbadf 100644
--- a/src/test/java/org/openecomp/aai/champ/core/ChampPropertyConstraintTest.java
+++ b/src/test/java/org/onap/aai/champ/core/ChampPropertyConstraintTest.java
@@ -19,14 +19,14 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.core;
+package org.onap.aai.champ.core;
 
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
-import org.openecomp.aai.champ.model.ChampCardinality;
-import org.openecomp.aai.champ.model.ChampField;
-import org.openecomp.aai.champ.model.ChampPropertyConstraint;
+import org.onap.aai.champ.model.ChampCardinality;
+import org.onap.aai.champ.model.ChampField;
+import org.onap.aai.champ.model.ChampPropertyConstraint;
 
 public class ChampPropertyConstraintTest {
 
diff --git a/src/test/java/org/openecomp/aai/champ/core/ChampRelationshipIndexTest.java b/src/test/java/org/onap/aai/champ/core/ChampRelationshipIndexTest.java
index a611df7..58c7d79 100644
--- a/src/test/java/org/openecomp/aai/champ/core/ChampRelationshipIndexTest.java
+++ b/src/test/java/org/onap/aai/champ/core/ChampRelationshipIndexTest.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.core;
+package org.onap.aai.champ.core;
 
 import static org.junit.Assert.assertTrue;
 
@@ -29,17 +29,17 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import org.junit.Test;
-import org.openecomp.aai.champ.ChampAPI;
-import org.openecomp.aai.champ.ChampGraph;
-import org.openecomp.aai.champ.exceptions.ChampIndexNotExistsException;
-import org.openecomp.aai.champ.exceptions.ChampMarshallingException;
-import org.openecomp.aai.champ.exceptions.ChampObjectNotExistsException;
-import org.openecomp.aai.champ.exceptions.ChampRelationshipNotExistsException;
-import org.openecomp.aai.champ.exceptions.ChampSchemaViolationException;
-import org.openecomp.aai.champ.exceptions.ChampUnmarshallingException;
-import org.openecomp.aai.champ.model.ChampField;
-import org.openecomp.aai.champ.model.ChampRelationship;
-import org.openecomp.aai.champ.model.ChampRelationshipIndex;
+import org.onap.aai.champ.ChampAPI;
+import org.onap.aai.champ.ChampGraph;
+import org.onap.aai.champ.exceptions.ChampIndexNotExistsException;
+import org.onap.aai.champ.exceptions.ChampMarshallingException;
+import org.onap.aai.champ.exceptions.ChampObjectNotExistsException;
+import org.onap.aai.champ.exceptions.ChampRelationshipNotExistsException;
+import org.onap.aai.champ.exceptions.ChampSchemaViolationException;
+import org.onap.aai.champ.exceptions.ChampUnmarshallingException;
+import org.onap.aai.champ.model.ChampField;
+import org.onap.aai.champ.model.ChampRelationship;
+import org.onap.aai.champ.model.ChampRelationshipIndex;
 
 public class ChampRelationshipIndexTest extends BaseChampAPITest {
 
diff --git a/src/test/java/org/openecomp/aai/champ/core/ChampRelationshipTest.java b/src/test/java/org/onap/aai/champ/core/ChampRelationshipTest.java
index cf025d6..3d95268 100644
--- a/src/test/java/org/openecomp/aai/champ/core/ChampRelationshipTest.java
+++ b/src/test/java/org/onap/aai/champ/core/ChampRelationshipTest.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.core;
+package org.onap.aai.champ.core;
 
 import static org.junit.Assert.assertTrue;
 
@@ -28,17 +28,17 @@ import java.util.Optional;
 import java.util.stream.Collectors;
 
 import org.junit.Test;
-import org.openecomp.aai.champ.ChampAPI;
-import org.openecomp.aai.champ.ChampGraph;
-import org.openecomp.aai.champ.exceptions.ChampMarshallingException;
-import org.openecomp.aai.champ.exceptions.ChampObjectNotExistsException;
-import org.openecomp.aai.champ.exceptions.ChampRelationshipNotExistsException;
-import org.openecomp.aai.champ.exceptions.ChampSchemaViolationException;
-import org.openecomp.aai.champ.exceptions.ChampUnmarshallingException;
-import org.openecomp.aai.champ.model.ChampObject;
-import org.openecomp.aai.champ.model.ChampRelationship;
-import org.openecomp.aai.champ.model.ChampRelationship.ReservedPropertyKeys;
-import org.openecomp.aai.champ.model.ChampRelationship.ReservedTypes;
+import org.onap.aai.champ.ChampAPI;
+import org.onap.aai.champ.ChampGraph;
+import org.onap.aai.champ.exceptions.ChampMarshallingException;
+import org.onap.aai.champ.exceptions.ChampObjectNotExistsException;
+import org.onap.aai.champ.exceptions.ChampRelationshipNotExistsException;
+import org.onap.aai.champ.exceptions.ChampSchemaViolationException;
+import org.onap.aai.champ.exceptions.ChampUnmarshallingException;
+import org.onap.aai.champ.model.ChampObject;
+import org.onap.aai.champ.model.ChampRelationship;
+import org.onap.aai.champ.model.ChampRelationship.ReservedPropertyKeys;
+import org.onap.aai.champ.model.ChampRelationship.ReservedTypes;
 
 public class ChampRelationshipTest extends BaseChampAPITest {
 
diff --git a/src/test/java/org/openecomp/aai/champ/core/ChampSchemaTest.java b/src/test/java/org/onap/aai/champ/core/ChampSchemaTest.java
index e3f099e..df33631 100644
--- a/src/test/java/org/openecomp/aai/champ/core/ChampSchemaTest.java
+++ b/src/test/java/org/onap/aai/champ/core/ChampSchemaTest.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.core;
+package org.onap.aai.champ.core;
 
 import static org.junit.Assert.assertTrue;
 
@@ -27,25 +27,25 @@ import java.io.IOException;
 import java.util.Set;
 
 import org.junit.Test;
-import org.openecomp.aai.champ.ChampAPI;
-import org.openecomp.aai.champ.ChampGraph;
-import org.openecomp.aai.champ.exceptions.ChampMarshallingException;
-import org.openecomp.aai.champ.exceptions.ChampObjectNotExistsException;
-import org.openecomp.aai.champ.exceptions.ChampSchemaViolationException;
-import org.openecomp.aai.champ.model.ChampConnectionConstraint;
-import org.openecomp.aai.champ.model.ChampConnectionMultiplicity;
-import org.openecomp.aai.champ.model.ChampField;
-import org.openecomp.aai.champ.model.ChampObject;
-import org.openecomp.aai.champ.model.ChampObject.ReservedTypes;
-import org.openecomp.aai.champ.model.ChampObjectConstraint;
-import org.openecomp.aai.champ.model.ChampPartition;
-import org.openecomp.aai.champ.model.ChampPropertyConstraint;
-import org.openecomp.aai.champ.model.ChampRelationship;
-import org.openecomp.aai.champ.model.ChampRelationshipConstraint;
-import org.openecomp.aai.champ.model.ChampSchema;
-import org.openecomp.aai.champ.schema.AlwaysValidChampSchemaEnforcer;
-import org.openecomp.aai.champ.schema.ChampSchemaEnforcer;
-import org.openecomp.aai.champ.schema.DefaultChampSchemaEnforcer;
+import org.onap.aai.champ.ChampAPI;
+import org.onap.aai.champ.ChampGraph;
+import org.onap.aai.champ.exceptions.ChampMarshallingException;
+import org.onap.aai.champ.exceptions.ChampObjectNotExistsException;
+import org.onap.aai.champ.exceptions.ChampSchemaViolationException;
+import org.onap.aai.champ.model.ChampConnectionConstraint;
+import org.onap.aai.champ.model.ChampConnectionMultiplicity;
+import org.onap.aai.champ.model.ChampField;
+import org.onap.aai.champ.model.ChampObject;
+import org.onap.aai.champ.model.ChampObjectConstraint;
+import org.onap.aai.champ.model.ChampPartition;
+import org.onap.aai.champ.model.ChampPropertyConstraint;
+import org.onap.aai.champ.model.ChampRelationship;
+import org.onap.aai.champ.model.ChampRelationshipConstraint;
+import org.onap.aai.champ.model.ChampSchema;
+import org.onap.aai.champ.model.ChampObject.ReservedTypes;
+import org.onap.aai.champ.schema.AlwaysValidChampSchemaEnforcer;
+import org.onap.aai.champ.schema.ChampSchemaEnforcer;
+import org.onap.aai.champ.schema.DefaultChampSchemaEnforcer;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
diff --git a/src/test/java/org/openecomp/aai/champ/event/AbstractLoggingChampGraphTest.java b/src/test/java/org/onap/aai/champ/event/AbstractLoggingChampGraphTest.java
index 5383d28..388b16f 100644
--- a/src/test/java/org/openecomp/aai/champ/event/AbstractLoggingChampGraphTest.java
+++ b/src/test/java/org/onap/aai/champ/event/AbstractLoggingChampGraphTest.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.event;
+package org.onap.aai.champ.event;
 
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
@@ -37,21 +37,22 @@ import java.util.stream.Stream;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.openecomp.aai.champ.ChampCapabilities;
-import org.openecomp.aai.champ.exceptions.ChampIndexNotExistsException;
-import org.openecomp.aai.champ.exceptions.ChampMarshallingException;
-import org.openecomp.aai.champ.exceptions.ChampObjectNotExistsException;
-import org.openecomp.aai.champ.exceptions.ChampRelationshipNotExistsException;
-import org.openecomp.aai.champ.exceptions.ChampSchemaViolationException;
-import org.openecomp.aai.champ.exceptions.ChampUnmarshallingException;
-import org.openecomp.aai.champ.model.ChampObject;
-import org.openecomp.aai.champ.model.ChampObjectConstraint;
-import org.openecomp.aai.champ.model.ChampObjectIndex;
-import org.openecomp.aai.champ.model.ChampPartition;
-import org.openecomp.aai.champ.model.ChampRelationship;
-import org.openecomp.aai.champ.model.ChampRelationshipConstraint;
-import org.openecomp.aai.champ.model.ChampRelationshipIndex;
-import org.openecomp.aai.champ.model.ChampSchema;
+import org.onap.aai.champ.ChampCapabilities;
+import org.onap.aai.champ.event.AbstractLoggingChampGraph;
+import org.onap.aai.champ.exceptions.ChampIndexNotExistsException;
+import org.onap.aai.champ.exceptions.ChampMarshallingException;
+import org.onap.aai.champ.exceptions.ChampObjectNotExistsException;
+import org.onap.aai.champ.exceptions.ChampRelationshipNotExistsException;
+import org.onap.aai.champ.exceptions.ChampSchemaViolationException;
+import org.onap.aai.champ.exceptions.ChampUnmarshallingException;
+import org.onap.aai.champ.model.ChampObject;
+import org.onap.aai.champ.model.ChampObjectConstraint;
+import org.onap.aai.champ.model.ChampObjectIndex;
+import org.onap.aai.champ.model.ChampPartition;
+import org.onap.aai.champ.model.ChampRelationship;
+import org.onap.aai.champ.model.ChampRelationshipConstraint;
+import org.onap.aai.champ.model.ChampRelationshipIndex;
+import org.onap.aai.champ.model.ChampSchema;
 import org.slf4j.Logger;
 
 import com.att.nsa.cambria.client.CambriaPublisher;
diff --git a/src/test/java/org/openecomp/aai/champ/exceptions/ChampExceptionTest.java b/src/test/java/org/onap/aai/champ/exceptions/ChampExceptionTest.java
index 3f813f5..b92ccdf 100644
--- a/src/test/java/org/openecomp/aai/champ/exceptions/ChampExceptionTest.java
+++ b/src/test/java/org/onap/aai/champ/exceptions/ChampExceptionTest.java
@@ -19,11 +19,17 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.exceptions;
+package org.onap.aai.champ.exceptions;
 
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
+import org.onap.aai.champ.exceptions.ChampIndexNotExistsException;
+import org.onap.aai.champ.exceptions.ChampMarshallingException;
+import org.onap.aai.champ.exceptions.ChampObjectNotExistsException;
+import org.onap.aai.champ.exceptions.ChampRelationshipNotExistsException;
+import org.onap.aai.champ.exceptions.ChampSchemaViolationException;
+import org.onap.aai.champ.exceptions.ChampUnmarshallingException;
 
 public class ChampExceptionTest {
 
diff --git a/src/test/java/org/openecomp/aai/champ/ie/ExportTest.java b/src/test/java/org/onap/aai/champ/ie/ExportTest.java
index 7ecb3de..80142b2 100644
--- a/src/test/java/org/openecomp/aai/champ/ie/ExportTest.java
+++ b/src/test/java/org/onap/aai/champ/ie/ExportTest.java
@@ -19,11 +19,12 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.ie;
+package org.onap.aai.champ.ie;
 
 import org.junit.Test;
-import org.openecomp.aai.champ.ChampAPI;
-import org.openecomp.aai.champ.ChampGraph;
+import org.onap.aai.champ.ChampAPI;
+import org.onap.aai.champ.ChampGraph;
+import org.onap.aai.champ.ie.GraphMLImporterExporter;
 
 public class ExportTest {
 
diff --git a/src/test/java/org/openecomp/aai/champ/ie/ImportTest.java b/src/test/java/org/onap/aai/champ/ie/ImportTest.java
index ba2cbb1..0dca95e 100644
--- a/src/test/java/org/openecomp/aai/champ/ie/ImportTest.java
+++ b/src/test/java/org/onap/aai/champ/ie/ImportTest.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END============================================
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.aai.champ.ie;
+package org.onap.aai.champ.ie;
 
 import static org.junit.Assert.assertTrue;
 
@@ -27,8 +27,9 @@ import java.util.Collections;
 import java.util.Optional;
 
 import org.junit.Test;
-import org.openecomp.aai.champ.ChampAPI;
-import org.openecomp.aai.champ.ChampGraph;
+import org.onap.aai.champ.ChampAPI;
+import org.onap.aai.champ.ChampGraph;
+import org.onap.aai.champ.ie.GraphMLImporterExporter;
 
 public class ImportTest {