From 059f42e1a2289ecb2cb5835b8b14a0d098c9e1d3 Mon Sep 17 00:00:00 2001 From: "Arul.Nambi" Date: Wed, 13 Sep 2017 15:13:29 -0400 Subject: [PATCH] Renaming openecomp to onap Issue-ID: AAI-208 Change-Id: I559ba27fba96364c506730e8cbac05a9e6591694 Signed-off-by: Arul.Nambi --- pom.xml | 2 +- .../model-loader/v1/conf/modelLoaderBeans.groovy | 2 +- .../aai}/modelloader/config/ModelLoaderConfig.java | 2 +- .../aai}/modelloader/entity/Artifact.java | 2 +- .../aai}/modelloader/entity/ArtifactHandler.java | 6 +++--- .../aai}/modelloader/entity/ArtifactType.java | 2 +- .../entity/catalog/VnfCatalogArtifact.java | 6 +++--- .../entity/catalog/VnfCatalogArtifactHandler.java | 14 +++++++------- .../entity/model/AbstractModelArtifact.java | 10 +++++----- .../aai}/modelloader/entity/model/IModelParser.java | 4 ++-- .../aai}/modelloader/entity/model/ModelArtifact.java | 10 +++++----- .../entity/model/ModelArtifactHandler.java | 12 ++++++------ .../modelloader/entity/model/ModelArtifactParser.java | 7 +++---- .../modelloader/entity/model/ModelParserFactory.java | 4 ++-- .../aai}/modelloader/entity/model/ModelSorter.java | 6 +++--- .../modelloader/entity/model/ModelV8Artifact.java | 12 ++++++------ .../entity/model/ModelV8ArtifactParser.java | 7 +++---- .../modelloader/entity/model/NamedQueryArtifact.java | 10 +++++----- .../entity/model/NamedQueryArtifactParser.java | 7 +++---- .../notification/DistributionStatusMsg.java | 2 +- .../aai}/modelloader/notification/EventCallback.java | 19 +++++++++---------- .../aai}/modelloader/restclient/AaiRestClient.java | 8 +++++--- .../modelloader/service/ModelLoaderInterface.java | 2 +- .../aai}/modelloader/service/ModelLoaderMsgs.java | 2 +- .../aai}/modelloader/service/ModelLoaderService.java | 13 ++++++------- .../aai}/modelloader/service/SdcConnectionJob.java | 6 +++--- .../aai}/modelloader/util/JsonXmlConverter.java | 2 +- .../modelloader/config/ModelLoaderConfigTest.java | 6 +++--- .../entity/catalog/VnfCatalogArtifactHandlerTest.java | 12 +++++++----- .../entity/model/ModelArtifactParserTest.java | 6 ++++-- .../entity/model/ModelParserFactoryTest.java | 7 ++++++- .../modelloader/entity/model/ModelSorterTest.java | 8 ++++++-- .../entity/model/ModelV8ArtifactParserTest.java | 6 ++++-- .../entity/model/NamedQueryArtifactParserTest.java | 6 ++++-- .../modelloader/restclient/AaiRestClientTest.java | 8 ++++---- .../aai}/modelloader/util/JsonXmlConverterTest.java | 3 ++- 36 files changed, 128 insertions(+), 113 deletions(-) rename src/main/java/org/{openecomp => onap/aai}/modelloader/config/ModelLoaderConfig.java (99%) rename src/main/java/org/{openecomp => onap/aai}/modelloader/entity/Artifact.java (97%) rename src/main/java/org/{openecomp => onap/aai}/modelloader/entity/ArtifactHandler.java (90%) rename src/main/java/org/{openecomp => onap/aai}/modelloader/entity/ArtifactType.java (96%) rename src/main/java/org/{openecomp => onap/aai}/modelloader/entity/catalog/VnfCatalogArtifact.java (89%) rename src/main/java/org/{openecomp => onap/aai}/modelloader/entity/catalog/VnfCatalogArtifactHandler.java (93%) rename src/main/java/org/{openecomp => onap/aai}/modelloader/entity/model/AbstractModelArtifact.java (91%) rename src/main/java/org/{openecomp => onap/aai}/modelloader/entity/model/IModelParser.java (92%) rename src/main/java/org/{openecomp => onap/aai}/modelloader/entity/model/ModelArtifact.java (96%) rename src/main/java/org/{openecomp => onap/aai}/modelloader/entity/model/ModelArtifactHandler.java (90%) rename src/main/java/org/{openecomp => onap/aai}/modelloader/entity/model/ModelArtifactParser.java (97%) rename src/main/java/org/{openecomp => onap/aai}/modelloader/entity/model/ModelParserFactory.java (96%) rename src/main/java/org/{openecomp => onap/aai}/modelloader/entity/model/ModelSorter.java (98%) rename src/main/java/org/{openecomp => onap/aai}/modelloader/entity/model/ModelV8Artifact.java (92%) rename src/main/java/org/{openecomp => onap/aai}/modelloader/entity/model/ModelV8ArtifactParser.java (96%) rename src/main/java/org/{openecomp => onap/aai}/modelloader/entity/model/NamedQueryArtifact.java (93%) rename src/main/java/org/{openecomp => onap/aai}/modelloader/entity/model/NamedQueryArtifactParser.java (96%) rename src/main/java/org/{openecomp => onap/aai}/modelloader/notification/DistributionStatusMsg.java (95%) rename src/main/java/org/{openecomp => onap/aai}/modelloader/notification/EventCallback.java (95%) rename src/main/java/org/{openecomp => onap/aai}/modelloader/restclient/AaiRestClient.java (98%) rename src/main/java/org/{openecomp => onap/aai}/modelloader/service/ModelLoaderInterface.java (95%) rename src/main/java/org/{openecomp => onap/aai}/modelloader/service/ModelLoaderMsgs.java (94%) rename src/main/java/org/{openecomp => onap/aai}/modelloader/service/ModelLoaderService.java (93%) rename src/main/java/org/{openecomp => onap/aai}/modelloader/service/SdcConnectionJob.java (94%) rename src/main/java/org/{openecomp => onap/aai}/modelloader/util/JsonXmlConverter.java (95%) rename src/test/java/org/{openecomp => onap/aai}/modelloader/config/ModelLoaderConfigTest.java (97%) rename src/test/java/org/{openecomp => onap/aai}/modelloader/entity/catalog/VnfCatalogArtifactHandlerTest.java (88%) rename src/test/java/org/{openecomp => onap/aai}/modelloader/entity/model/ModelArtifactParserTest.java (95%) rename src/test/java/org/{openecomp => onap/aai}/modelloader/entity/model/ModelParserFactoryTest.java (86%) rename src/test/java/org/{openecomp => onap/aai}/modelloader/entity/model/ModelSorterTest.java (94%) rename src/test/java/org/{openecomp => onap/aai}/modelloader/entity/model/ModelV8ArtifactParserTest.java (94%) rename src/test/java/org/{openecomp => onap/aai}/modelloader/entity/model/NamedQueryArtifactParserTest.java (91%) rename src/test/java/org/{openecomp => onap/aai}/modelloader/restclient/AaiRestClientTest.java (95%) rename src/test/java/org/{openecomp => onap/aai}/modelloader/util/JsonXmlConverterTest.java (94%) diff --git a/pom.xml b/pom.xml index 507459b..57a009a 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ 2.0.0 - org.openecomp.aai.model-loader + org.onap.aai.model-loader model-loader 1.1.0-SNAPSHOT aai-model-loader diff --git a/src/main/ajsc/model-loader_v1/model-loader/v1/conf/modelLoaderBeans.groovy b/src/main/ajsc/model-loader_v1/model-loader/v1/conf/modelLoaderBeans.groovy index 2162213..32379f7 100644 --- a/src/main/ajsc/model-loader_v1/model-loader/v1/conf/modelLoaderBeans.groovy +++ b/src/main/ajsc/model-loader_v1/model-loader/v1/conf/modelLoaderBeans.groovy @@ -23,7 +23,7 @@ beans{ xmlns jaxrs: "http://cxf.apache.org/jaxrs" xmlns util: "http://www.springframework.org/schema/util" - modelLoader(org.openecomp.modelloader.service.ModelLoaderService) + modelLoader(org.onap.aai.modelloader.service.ModelLoaderService) util.list(id: 'modelLoaderServices') { ref(bean:'modelLoader') diff --git a/src/main/java/org/openecomp/modelloader/config/ModelLoaderConfig.java b/src/main/java/org/onap/aai/modelloader/config/ModelLoaderConfig.java similarity index 99% rename from src/main/java/org/openecomp/modelloader/config/ModelLoaderConfig.java rename to src/main/java/org/onap/aai/modelloader/config/ModelLoaderConfig.java index cb4719e..cca99f1 100644 --- a/src/main/java/org/openecomp/modelloader/config/ModelLoaderConfig.java +++ b/src/main/java/org/onap/aai/modelloader/config/ModelLoaderConfig.java @@ -21,7 +21,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.modelloader.config; +package org.onap.aai.modelloader.config; import org.eclipse.jetty.util.security.Password; import org.openecomp.sdc.api.consumer.IConfiguration; diff --git a/src/main/java/org/openecomp/modelloader/entity/Artifact.java b/src/main/java/org/onap/aai/modelloader/entity/Artifact.java similarity index 97% rename from src/main/java/org/openecomp/modelloader/entity/Artifact.java rename to src/main/java/org/onap/aai/modelloader/entity/Artifact.java index 1deb4f4..cf612ce 100644 --- a/src/main/java/org/openecomp/modelloader/entity/Artifact.java +++ b/src/main/java/org/onap/aai/modelloader/entity/Artifact.java @@ -21,7 +21,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.modelloader.entity; +package org.onap.aai.modelloader.entity; public abstract class Artifact { diff --git a/src/main/java/org/openecomp/modelloader/entity/ArtifactHandler.java b/src/main/java/org/onap/aai/modelloader/entity/ArtifactHandler.java similarity index 90% rename from src/main/java/org/openecomp/modelloader/entity/ArtifactHandler.java rename to src/main/java/org/onap/aai/modelloader/entity/ArtifactHandler.java index 245a93c..b52b1a6 100644 --- a/src/main/java/org/openecomp/modelloader/entity/ArtifactHandler.java +++ b/src/main/java/org/onap/aai/modelloader/entity/ArtifactHandler.java @@ -21,12 +21,12 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.modelloader.entity; - -import org.openecomp.modelloader.config.ModelLoaderConfig; +package org.onap.aai.modelloader.entity; import java.util.List; +import org.onap.aai.modelloader.config.ModelLoaderConfig; + public abstract class ArtifactHandler { protected ModelLoaderConfig config; diff --git a/src/main/java/org/openecomp/modelloader/entity/ArtifactType.java b/src/main/java/org/onap/aai/modelloader/entity/ArtifactType.java similarity index 96% rename from src/main/java/org/openecomp/modelloader/entity/ArtifactType.java rename to src/main/java/org/onap/aai/modelloader/entity/ArtifactType.java index 4ab7bd1..33b7d61 100644 --- a/src/main/java/org/openecomp/modelloader/entity/ArtifactType.java +++ b/src/main/java/org/onap/aai/modelloader/entity/ArtifactType.java @@ -21,7 +21,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.modelloader.entity; +package org.onap.aai.modelloader.entity; public enum ArtifactType { MODEL, diff --git a/src/main/java/org/openecomp/modelloader/entity/catalog/VnfCatalogArtifact.java b/src/main/java/org/onap/aai/modelloader/entity/catalog/VnfCatalogArtifact.java similarity index 89% rename from src/main/java/org/openecomp/modelloader/entity/catalog/VnfCatalogArtifact.java rename to src/main/java/org/onap/aai/modelloader/entity/catalog/VnfCatalogArtifact.java index 79cff98..1ca6b25 100644 --- a/src/main/java/org/openecomp/modelloader/entity/catalog/VnfCatalogArtifact.java +++ b/src/main/java/org/onap/aai/modelloader/entity/catalog/VnfCatalogArtifact.java @@ -21,10 +21,10 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.modelloader.entity.catalog; +package org.onap.aai.modelloader.entity.catalog; -import org.openecomp.modelloader.entity.Artifact; -import org.openecomp.modelloader.entity.ArtifactType; +import org.onap.aai.modelloader.entity.Artifact; +import org.onap.aai.modelloader.entity.ArtifactType; public class VnfCatalogArtifact extends Artifact { public VnfCatalogArtifact(String payload) { diff --git a/src/main/java/org/openecomp/modelloader/entity/catalog/VnfCatalogArtifactHandler.java b/src/main/java/org/onap/aai/modelloader/entity/catalog/VnfCatalogArtifactHandler.java similarity index 93% rename from src/main/java/org/openecomp/modelloader/entity/catalog/VnfCatalogArtifactHandler.java rename to src/main/java/org/onap/aai/modelloader/entity/catalog/VnfCatalogArtifactHandler.java index d96f25b..9ef3f6f 100644 --- a/src/main/java/org/openecomp/modelloader/entity/catalog/VnfCatalogArtifactHandler.java +++ b/src/main/java/org/onap/aai/modelloader/entity/catalog/VnfCatalogArtifactHandler.java @@ -21,7 +21,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.modelloader.entity.catalog; +package org.onap.aai.modelloader.entity.catalog; import com.sun.jersey.api.client.ClientResponse; @@ -31,14 +31,14 @@ import generated.VnfCatalog.PartNumberList; import inventory.aai.openecomp.org.v8.VnfImage; import org.eclipse.persistence.jaxb.MarshallerProperties; +import org.onap.aai.modelloader.config.ModelLoaderConfig; +import org.onap.aai.modelloader.entity.Artifact; +import org.onap.aai.modelloader.entity.ArtifactHandler; +import org.onap.aai.modelloader.restclient.AaiRestClient; +import org.onap.aai.modelloader.restclient.AaiRestClient.MimeType; +import org.onap.aai.modelloader.service.ModelLoaderMsgs; import org.openecomp.cl.api.Logger; import org.openecomp.cl.eelf.LoggerFactory; -import org.openecomp.modelloader.config.ModelLoaderConfig; -import org.openecomp.modelloader.entity.Artifact; -import org.openecomp.modelloader.entity.ArtifactHandler; -import org.openecomp.modelloader.restclient.AaiRestClient; -import org.openecomp.modelloader.restclient.AaiRestClient.MimeType; -import org.openecomp.modelloader.service.ModelLoaderMsgs; import org.springframework.web.util.UriUtils; import java.io.StringReader; diff --git a/src/main/java/org/openecomp/modelloader/entity/model/AbstractModelArtifact.java b/src/main/java/org/onap/aai/modelloader/entity/model/AbstractModelArtifact.java similarity index 91% rename from src/main/java/org/openecomp/modelloader/entity/model/AbstractModelArtifact.java rename to src/main/java/org/onap/aai/modelloader/entity/model/AbstractModelArtifact.java index 2738457..a942cf6 100644 --- a/src/main/java/org/openecomp/modelloader/entity/model/AbstractModelArtifact.java +++ b/src/main/java/org/onap/aai/modelloader/entity/model/AbstractModelArtifact.java @@ -21,16 +21,16 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.modelloader.entity.model; +package org.onap.aai.modelloader.entity.model; import java.util.HashSet; import java.util.List; import java.util.Set; -import org.openecomp.modelloader.config.ModelLoaderConfig; -import org.openecomp.modelloader.entity.Artifact; -import org.openecomp.modelloader.entity.ArtifactType; -import org.openecomp.modelloader.restclient.AaiRestClient; +import org.onap.aai.modelloader.config.ModelLoaderConfig; +import org.onap.aai.modelloader.entity.Artifact; +import org.onap.aai.modelloader.entity.ArtifactType; +import org.onap.aai.modelloader.restclient.AaiRestClient; public abstract class AbstractModelArtifact extends Artifact { diff --git a/src/main/java/org/openecomp/modelloader/entity/model/IModelParser.java b/src/main/java/org/onap/aai/modelloader/entity/model/IModelParser.java similarity index 92% rename from src/main/java/org/openecomp/modelloader/entity/model/IModelParser.java rename to src/main/java/org/onap/aai/modelloader/entity/model/IModelParser.java index ac97f34..0d34908 100644 --- a/src/main/java/org/openecomp/modelloader/entity/model/IModelParser.java +++ b/src/main/java/org/onap/aai/modelloader/entity/model/IModelParser.java @@ -21,11 +21,11 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.modelloader.entity.model; +package org.onap.aai.modelloader.entity.model; import java.util.List; -import org.openecomp.modelloader.entity.Artifact; +import org.onap.aai.modelloader.entity.Artifact; public interface IModelParser { public List parse(byte[] artifactPayload, String artifactName); diff --git a/src/main/java/org/openecomp/modelloader/entity/model/ModelArtifact.java b/src/main/java/org/onap/aai/modelloader/entity/model/ModelArtifact.java similarity index 96% rename from src/main/java/org/openecomp/modelloader/entity/model/ModelArtifact.java rename to src/main/java/org/onap/aai/modelloader/entity/model/ModelArtifact.java index 369b09e..f0e848d 100644 --- a/src/main/java/org/openecomp/modelloader/entity/model/ModelArtifact.java +++ b/src/main/java/org/onap/aai/modelloader/entity/model/ModelArtifact.java @@ -21,7 +21,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.modelloader.entity.model; +package org.onap.aai.modelloader.entity.model; import java.io.StringWriter; import java.util.List; @@ -34,12 +34,12 @@ import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; +import org.onap.aai.modelloader.config.ModelLoaderConfig; +import org.onap.aai.modelloader.entity.ArtifactType; +import org.onap.aai.modelloader.restclient.AaiRestClient; +import org.onap.aai.modelloader.service.ModelLoaderMsgs; import org.openecomp.cl.api.Logger; import org.openecomp.cl.eelf.LoggerFactory; -import org.openecomp.modelloader.config.ModelLoaderConfig; -import org.openecomp.modelloader.entity.ArtifactType; -import org.openecomp.modelloader.restclient.AaiRestClient; -import org.openecomp.modelloader.service.ModelLoaderMsgs; import org.w3c.dom.Node; import com.sun.jersey.api.client.ClientResponse; diff --git a/src/main/java/org/openecomp/modelloader/entity/model/ModelArtifactHandler.java b/src/main/java/org/onap/aai/modelloader/entity/model/ModelArtifactHandler.java similarity index 90% rename from src/main/java/org/openecomp/modelloader/entity/model/ModelArtifactHandler.java rename to src/main/java/org/onap/aai/modelloader/entity/model/ModelArtifactHandler.java index e4e1dd0..b7da5a2 100644 --- a/src/main/java/org/openecomp/modelloader/entity/model/ModelArtifactHandler.java +++ b/src/main/java/org/onap/aai/modelloader/entity/model/ModelArtifactHandler.java @@ -21,15 +21,15 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.modelloader.entity.model; +package org.onap.aai.modelloader.entity.model; +import org.onap.aai.modelloader.config.ModelLoaderConfig; +import org.onap.aai.modelloader.entity.Artifact; +import org.onap.aai.modelloader.entity.ArtifactHandler; +import org.onap.aai.modelloader.restclient.AaiRestClient; +import org.onap.aai.modelloader.service.ModelLoaderMsgs; import org.openecomp.cl.api.Logger; import org.openecomp.cl.eelf.LoggerFactory; -import org.openecomp.modelloader.config.ModelLoaderConfig; -import org.openecomp.modelloader.entity.Artifact; -import org.openecomp.modelloader.entity.ArtifactHandler; -import org.openecomp.modelloader.restclient.AaiRestClient; -import org.openecomp.modelloader.service.ModelLoaderMsgs; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/org/openecomp/modelloader/entity/model/ModelArtifactParser.java b/src/main/java/org/onap/aai/modelloader/entity/model/ModelArtifactParser.java similarity index 97% rename from src/main/java/org/openecomp/modelloader/entity/model/ModelArtifactParser.java rename to src/main/java/org/onap/aai/modelloader/entity/model/ModelArtifactParser.java index 779b135..a362fce 100644 --- a/src/main/java/org/openecomp/modelloader/entity/model/ModelArtifactParser.java +++ b/src/main/java/org/onap/aai/modelloader/entity/model/ModelArtifactParser.java @@ -21,13 +21,12 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.modelloader.entity.model; +package org.onap.aai.modelloader.entity.model; +import org.onap.aai.modelloader.entity.Artifact; +import org.onap.aai.modelloader.service.ModelLoaderMsgs; import org.openecomp.cl.api.Logger; import org.openecomp.cl.eelf.LoggerFactory; -import org.openecomp.modelloader.entity.Artifact; -import org.openecomp.modelloader.service.ModelLoaderMsgs; - import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/src/main/java/org/openecomp/modelloader/entity/model/ModelParserFactory.java b/src/main/java/org/onap/aai/modelloader/entity/model/ModelParserFactory.java similarity index 96% rename from src/main/java/org/openecomp/modelloader/entity/model/ModelParserFactory.java rename to src/main/java/org/onap/aai/modelloader/entity/model/ModelParserFactory.java index ab1ceab..df54811 100644 --- a/src/main/java/org/openecomp/modelloader/entity/model/ModelParserFactory.java +++ b/src/main/java/org/onap/aai/modelloader/entity/model/ModelParserFactory.java @@ -21,16 +21,16 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.modelloader.entity.model; +package org.onap.aai.modelloader.entity.model; import java.io.StringReader; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; +import org.onap.aai.modelloader.service.ModelLoaderMsgs; import org.openecomp.cl.api.Logger; import org.openecomp.cl.eelf.LoggerFactory; -import org.openecomp.modelloader.service.ModelLoaderMsgs; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.xml.sax.InputSource; diff --git a/src/main/java/org/openecomp/modelloader/entity/model/ModelSorter.java b/src/main/java/org/onap/aai/modelloader/entity/model/ModelSorter.java similarity index 98% rename from src/main/java/org/openecomp/modelloader/entity/model/ModelSorter.java rename to src/main/java/org/onap/aai/modelloader/entity/model/ModelSorter.java index 0a1090e..825cbcb 100644 --- a/src/main/java/org/openecomp/modelloader/entity/model/ModelSorter.java +++ b/src/main/java/org/onap/aai/modelloader/entity/model/ModelSorter.java @@ -21,12 +21,10 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.modelloader.entity.model; +package org.onap.aai.modelloader.entity.model; import jline.internal.Log; -import org.openecomp.modelloader.entity.Artifact; - import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -34,6 +32,8 @@ import java.util.HashSet; import java.util.Iterator; import java.util.List; +import org.onap.aai.modelloader.entity.Artifact; + /** * Utility class to sort the given Models according to their dependencies. * Example: Given a list of Models [A, B, C] where B depends on A, and A depends diff --git a/src/main/java/org/openecomp/modelloader/entity/model/ModelV8Artifact.java b/src/main/java/org/onap/aai/modelloader/entity/model/ModelV8Artifact.java similarity index 92% rename from src/main/java/org/openecomp/modelloader/entity/model/ModelV8Artifact.java rename to src/main/java/org/onap/aai/modelloader/entity/model/ModelV8Artifact.java index ba7e661..892d20f 100644 --- a/src/main/java/org/openecomp/modelloader/entity/model/ModelV8Artifact.java +++ b/src/main/java/org/onap/aai/modelloader/entity/model/ModelV8Artifact.java @@ -21,19 +21,19 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.modelloader.entity.model; +package org.onap.aai.modelloader.entity.model; import java.util.List; import javax.ws.rs.core.Response; +import org.onap.aai.modelloader.config.ModelLoaderConfig; +import org.onap.aai.modelloader.entity.Artifact; +import org.onap.aai.modelloader.entity.ArtifactType; +import org.onap.aai.modelloader.restclient.AaiRestClient; +import org.onap.aai.modelloader.service.ModelLoaderMsgs; import org.openecomp.cl.api.Logger; import org.openecomp.cl.eelf.LoggerFactory; -import org.openecomp.modelloader.config.ModelLoaderConfig; -import org.openecomp.modelloader.entity.Artifact; -import org.openecomp.modelloader.entity.ArtifactType; -import org.openecomp.modelloader.restclient.AaiRestClient; -import org.openecomp.modelloader.service.ModelLoaderMsgs; import com.sun.jersey.api.client.ClientResponse; diff --git a/src/main/java/org/openecomp/modelloader/entity/model/ModelV8ArtifactParser.java b/src/main/java/org/onap/aai/modelloader/entity/model/ModelV8ArtifactParser.java similarity index 96% rename from src/main/java/org/openecomp/modelloader/entity/model/ModelV8ArtifactParser.java rename to src/main/java/org/onap/aai/modelloader/entity/model/ModelV8ArtifactParser.java index a6b3d23..af6160f 100644 --- a/src/main/java/org/openecomp/modelloader/entity/model/ModelV8ArtifactParser.java +++ b/src/main/java/org/onap/aai/modelloader/entity/model/ModelV8ArtifactParser.java @@ -21,13 +21,12 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.modelloader.entity.model; +package org.onap.aai.modelloader.entity.model; +import org.onap.aai.modelloader.entity.Artifact; +import org.onap.aai.modelloader.service.ModelLoaderMsgs; import org.openecomp.cl.api.Logger; import org.openecomp.cl.eelf.LoggerFactory; -import org.openecomp.modelloader.entity.Artifact; -import org.openecomp.modelloader.service.ModelLoaderMsgs; - import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/src/main/java/org/openecomp/modelloader/entity/model/NamedQueryArtifact.java b/src/main/java/org/onap/aai/modelloader/entity/model/NamedQueryArtifact.java similarity index 93% rename from src/main/java/org/openecomp/modelloader/entity/model/NamedQueryArtifact.java rename to src/main/java/org/onap/aai/modelloader/entity/model/NamedQueryArtifact.java index a5f4ef4..ece8d4b 100644 --- a/src/main/java/org/openecomp/modelloader/entity/model/NamedQueryArtifact.java +++ b/src/main/java/org/onap/aai/modelloader/entity/model/NamedQueryArtifact.java @@ -21,18 +21,18 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.modelloader.entity.model; +package org.onap.aai.modelloader.entity.model; import java.util.List; import javax.ws.rs.core.Response; +import org.onap.aai.modelloader.config.ModelLoaderConfig; +import org.onap.aai.modelloader.entity.ArtifactType; +import org.onap.aai.modelloader.restclient.AaiRestClient; +import org.onap.aai.modelloader.service.ModelLoaderMsgs; import org.openecomp.cl.api.Logger; import org.openecomp.cl.eelf.LoggerFactory; -import org.openecomp.modelloader.config.ModelLoaderConfig; -import org.openecomp.modelloader.entity.ArtifactType; -import org.openecomp.modelloader.restclient.AaiRestClient; -import org.openecomp.modelloader.service.ModelLoaderMsgs; import com.sun.jersey.api.client.ClientResponse; diff --git a/src/main/java/org/openecomp/modelloader/entity/model/NamedQueryArtifactParser.java b/src/main/java/org/onap/aai/modelloader/entity/model/NamedQueryArtifactParser.java similarity index 96% rename from src/main/java/org/openecomp/modelloader/entity/model/NamedQueryArtifactParser.java rename to src/main/java/org/onap/aai/modelloader/entity/model/NamedQueryArtifactParser.java index 9e4507d..b035592 100644 --- a/src/main/java/org/openecomp/modelloader/entity/model/NamedQueryArtifactParser.java +++ b/src/main/java/org/onap/aai/modelloader/entity/model/NamedQueryArtifactParser.java @@ -21,13 +21,12 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.modelloader.entity.model; +package org.onap.aai.modelloader.entity.model; +import org.onap.aai.modelloader.entity.Artifact; +import org.onap.aai.modelloader.service.ModelLoaderMsgs; import org.openecomp.cl.api.Logger; import org.openecomp.cl.eelf.LoggerFactory; -import org.openecomp.modelloader.entity.Artifact; -import org.openecomp.modelloader.service.ModelLoaderMsgs; - import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/src/main/java/org/openecomp/modelloader/notification/DistributionStatusMsg.java b/src/main/java/org/onap/aai/modelloader/notification/DistributionStatusMsg.java similarity index 95% rename from src/main/java/org/openecomp/modelloader/notification/DistributionStatusMsg.java rename to src/main/java/org/onap/aai/modelloader/notification/DistributionStatusMsg.java index c0305c0..6c267e6 100644 --- a/src/main/java/org/openecomp/modelloader/notification/DistributionStatusMsg.java +++ b/src/main/java/org/onap/aai/modelloader/notification/DistributionStatusMsg.java @@ -21,7 +21,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.modelloader.notification; +package org.onap.aai.modelloader.notification; import org.openecomp.sdc.api.consumer.IDistributionStatusMessage; import org.openecomp.sdc.utils.DistributionStatusEnum; diff --git a/src/main/java/org/openecomp/modelloader/notification/EventCallback.java b/src/main/java/org/onap/aai/modelloader/notification/EventCallback.java similarity index 95% rename from src/main/java/org/openecomp/modelloader/notification/EventCallback.java rename to src/main/java/org/onap/aai/modelloader/notification/EventCallback.java index c75dc94..1d40291 100644 --- a/src/main/java/org/openecomp/modelloader/notification/EventCallback.java +++ b/src/main/java/org/onap/aai/modelloader/notification/EventCallback.java @@ -21,7 +21,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.modelloader.notification; +package org.onap.aai.modelloader.notification; import org.openecomp.sdc.api.IDistributionClient; import org.openecomp.sdc.api.consumer.IDistributionStatusMessage; @@ -34,19 +34,18 @@ import org.openecomp.sdc.api.results.IDistributionClientResult; import org.openecomp.sdc.utils.ArtifactTypeEnum; import org.openecomp.sdc.utils.DistributionActionResultEnum; import org.openecomp.sdc.utils.DistributionStatusEnum; - +import org.onap.aai.modelloader.config.ModelLoaderConfig; +import org.onap.aai.modelloader.entity.Artifact; +import org.onap.aai.modelloader.entity.catalog.VnfCatalogArtifact; +import org.onap.aai.modelloader.entity.catalog.VnfCatalogArtifactHandler; +import org.onap.aai.modelloader.entity.model.IModelParser; +import org.onap.aai.modelloader.entity.model.ModelArtifactHandler; +import org.onap.aai.modelloader.entity.model.ModelParserFactory; +import org.onap.aai.modelloader.service.ModelLoaderMsgs; import org.openecomp.cl.api.Logger; import org.openecomp.cl.eelf.LoggerFactory; import org.openecomp.cl.mdc.MdcContext; import org.openecomp.cl.mdc.MdcOverride; -import org.openecomp.modelloader.config.ModelLoaderConfig; -import org.openecomp.modelloader.entity.Artifact; -import org.openecomp.modelloader.entity.catalog.VnfCatalogArtifact; -import org.openecomp.modelloader.entity.catalog.VnfCatalogArtifactHandler; -import org.openecomp.modelloader.entity.model.IModelParser; -import org.openecomp.modelloader.entity.model.ModelArtifactHandler; -import org.openecomp.modelloader.entity.model.ModelParserFactory; -import org.openecomp.modelloader.service.ModelLoaderMsgs; import org.slf4j.MDC; import java.text.SimpleDateFormat; diff --git a/src/main/java/org/openecomp/modelloader/restclient/AaiRestClient.java b/src/main/java/org/onap/aai/modelloader/restclient/AaiRestClient.java similarity index 98% rename from src/main/java/org/openecomp/modelloader/restclient/AaiRestClient.java rename to src/main/java/org/onap/aai/modelloader/restclient/AaiRestClient.java index a642ec6..712290e 100644 --- a/src/main/java/org/openecomp/modelloader/restclient/AaiRestClient.java +++ b/src/main/java/org/onap/aai/modelloader/restclient/AaiRestClient.java @@ -21,7 +21,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.modelloader.restclient; +package org.onap.aai.modelloader.restclient; import com.sun.jersey.api.client.Client; import com.sun.jersey.api.client.ClientResponse; @@ -29,14 +29,16 @@ import com.sun.jersey.api.client.config.ClientConfig; import com.sun.jersey.api.client.config.DefaultClientConfig; import com.sun.jersey.api.client.filter.LoggingFilter; import com.sun.jersey.client.urlconnection.HTTPSProperties; + +import org.onap.aai.modelloader.config.ModelLoaderConfig; +import org.onap.aai.modelloader.restclient.AaiRestClient; +import org.onap.aai.modelloader.service.ModelLoaderMsgs; import org.openecomp.cl.api.LogFields; import org.openecomp.cl.api.LogLine; import org.openecomp.cl.api.Logger; import org.openecomp.cl.eelf.LoggerFactory; import org.openecomp.cl.mdc.MdcContext; import org.openecomp.cl.mdc.MdcOverride; -import org.openecomp.modelloader.config.ModelLoaderConfig; -import org.openecomp.modelloader.service.ModelLoaderMsgs; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; diff --git a/src/main/java/org/openecomp/modelloader/service/ModelLoaderInterface.java b/src/main/java/org/onap/aai/modelloader/service/ModelLoaderInterface.java similarity index 95% rename from src/main/java/org/openecomp/modelloader/service/ModelLoaderInterface.java rename to src/main/java/org/onap/aai/modelloader/service/ModelLoaderInterface.java index c5ead66..9233796 100644 --- a/src/main/java/org/openecomp/modelloader/service/ModelLoaderInterface.java +++ b/src/main/java/org/onap/aai/modelloader/service/ModelLoaderInterface.java @@ -21,7 +21,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.modelloader.service; +package org.onap.aai.modelloader.service; import java.io.IOException; diff --git a/src/main/java/org/openecomp/modelloader/service/ModelLoaderMsgs.java b/src/main/java/org/onap/aai/modelloader/service/ModelLoaderMsgs.java similarity index 94% rename from src/main/java/org/openecomp/modelloader/service/ModelLoaderMsgs.java rename to src/main/java/org/onap/aai/modelloader/service/ModelLoaderMsgs.java index b66e5eb..6362e7f 100644 --- a/src/main/java/org/openecomp/modelloader/service/ModelLoaderMsgs.java +++ b/src/main/java/org/onap/aai/modelloader/service/ModelLoaderMsgs.java @@ -21,7 +21,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.modelloader.service; +package org.onap.aai.modelloader.service; import com.att.eelf.i18n.EELFResourceManager; diff --git a/src/main/java/org/openecomp/modelloader/service/ModelLoaderService.java b/src/main/java/org/onap/aai/modelloader/service/ModelLoaderService.java similarity index 93% rename from src/main/java/org/openecomp/modelloader/service/ModelLoaderService.java rename to src/main/java/org/onap/aai/modelloader/service/ModelLoaderService.java index d500f26..b5f5981 100644 --- a/src/main/java/org/openecomp/modelloader/service/ModelLoaderService.java +++ b/src/main/java/org/onap/aai/modelloader/service/ModelLoaderService.java @@ -21,18 +21,17 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.modelloader.service; +package org.onap.aai.modelloader.service; import org.openecomp.sdc.api.IDistributionClient; import org.openecomp.sdc.api.results.IDistributionClientResult; import org.openecomp.sdc.impl.DistributionClientFactory; import org.openecomp.sdc.utils.DistributionActionResultEnum; - +import org.onap.aai.modelloader.config.ModelLoaderConfig; +import org.onap.aai.modelloader.entity.model.ModelArtifactHandler; +import org.onap.aai.modelloader.notification.EventCallback; import org.openecomp.cl.api.Logger; import org.openecomp.cl.eelf.LoggerFactory; -import org.openecomp.modelloader.config.ModelLoaderConfig; -import org.openecomp.modelloader.entity.model.ModelArtifactHandler; -import org.openecomp.modelloader.notification.EventCallback; import java.io.FileInputStream; import java.io.IOException; @@ -163,7 +162,7 @@ public class ModelLoaderService implements ModelLoaderInterface { } /** (non-Javadoc) - * @see org.openecomp.modelloader.service.ModelLoaderInterface#loadModel(java.lang.String) + * @see org.onap.aai.modelloader.service.ModelLoaderInterface#loadModel(java.lang.String) */ @Override public Response loadModel(String modelid) { @@ -173,7 +172,7 @@ public class ModelLoaderService implements ModelLoaderInterface { } /** (non-Javadoc) - * @see org.openecomp.modelloader.service.ModelLoaderInterface#saveModel(java.lang.String, java.lang.String) + * @see org.onap.aai.modelloader.service.ModelLoaderInterface#saveModel(java.lang.String, java.lang.String) */ @Override public Response saveModel(String modelid, String modelname) { diff --git a/src/main/java/org/openecomp/modelloader/service/SdcConnectionJob.java b/src/main/java/org/onap/aai/modelloader/service/SdcConnectionJob.java similarity index 94% rename from src/main/java/org/openecomp/modelloader/service/SdcConnectionJob.java rename to src/main/java/org/onap/aai/modelloader/service/SdcConnectionJob.java index ffc1352..30c8709 100644 --- a/src/main/java/org/openecomp/modelloader/service/SdcConnectionJob.java +++ b/src/main/java/org/onap/aai/modelloader/service/SdcConnectionJob.java @@ -21,16 +21,16 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.modelloader.service; +package org.onap.aai.modelloader.service; import java.util.Date; import java.util.Timer; import java.util.TimerTask; +import org.onap.aai.modelloader.config.ModelLoaderConfig; +import org.onap.aai.modelloader.notification.EventCallback; import org.openecomp.cl.api.Logger; import org.openecomp.cl.eelf.LoggerFactory; -import org.openecomp.modelloader.config.ModelLoaderConfig; -import org.openecomp.modelloader.notification.EventCallback; import org.openecomp.sdc.api.IDistributionClient; import org.openecomp.sdc.api.results.IDistributionClientResult; import org.openecomp.sdc.utils.DistributionActionResultEnum; diff --git a/src/main/java/org/openecomp/modelloader/util/JsonXmlConverter.java b/src/main/java/org/onap/aai/modelloader/util/JsonXmlConverter.java similarity index 95% rename from src/main/java/org/openecomp/modelloader/util/JsonXmlConverter.java rename to src/main/java/org/onap/aai/modelloader/util/JsonXmlConverter.java index 25a19c2..e307be6 100644 --- a/src/main/java/org/openecomp/modelloader/util/JsonXmlConverter.java +++ b/src/main/java/org/onap/aai/modelloader/util/JsonXmlConverter.java @@ -21,7 +21,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.modelloader.util; +package org.onap.aai.modelloader.util; import org.json.JSONArray; import org.json.JSONException; diff --git a/src/test/java/org/openecomp/modelloader/config/ModelLoaderConfigTest.java b/src/test/java/org/onap/aai/modelloader/config/ModelLoaderConfigTest.java similarity index 97% rename from src/test/java/org/openecomp/modelloader/config/ModelLoaderConfigTest.java rename to src/test/java/org/onap/aai/modelloader/config/ModelLoaderConfigTest.java index 54ce0d5..b30b00d 100644 --- a/src/test/java/org/openecomp/modelloader/config/ModelLoaderConfigTest.java +++ b/src/test/java/org/onap/aai/modelloader/config/ModelLoaderConfigTest.java @@ -21,7 +21,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.modelloader.config; +package org.onap.aai.modelloader.config; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -33,8 +33,8 @@ import java.util.Properties; import org.eclipse.jetty.util.security.Password; import org.junit.Test; -import org.openecomp.modelloader.restclient.AaiRestClient; - +import org.onap.aai.modelloader.config.ModelLoaderConfig; +import org.onap.aai.modelloader.restclient.AaiRestClient; import org.openecomp.sdc.utils.ArtifactTypeEnum; public class ModelLoaderConfigTest { diff --git a/src/test/java/org/openecomp/modelloader/entity/catalog/VnfCatalogArtifactHandlerTest.java b/src/test/java/org/onap/aai/modelloader/entity/catalog/VnfCatalogArtifactHandlerTest.java similarity index 88% rename from src/test/java/org/openecomp/modelloader/entity/catalog/VnfCatalogArtifactHandlerTest.java rename to src/test/java/org/onap/aai/modelloader/entity/catalog/VnfCatalogArtifactHandlerTest.java index a6e1b96..22137f5 100644 --- a/src/test/java/org/openecomp/modelloader/entity/catalog/VnfCatalogArtifactHandlerTest.java +++ b/src/test/java/org/onap/aai/modelloader/entity/catalog/VnfCatalogArtifactHandlerTest.java @@ -21,7 +21,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.modelloader.entity.catalog; +package org.onap.aai.modelloader.entity.catalog; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -37,10 +37,12 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mockito; -import org.openecomp.modelloader.config.ModelLoaderConfig; -import org.openecomp.modelloader.entity.Artifact; -import org.openecomp.modelloader.restclient.AaiRestClient; -import org.openecomp.modelloader.restclient.AaiRestClient.MimeType; +import org.onap.aai.modelloader.config.ModelLoaderConfig; +import org.onap.aai.modelloader.entity.Artifact; +import org.onap.aai.modelloader.entity.catalog.VnfCatalogArtifact; +import org.onap.aai.modelloader.entity.catalog.VnfCatalogArtifactHandler; +import org.onap.aai.modelloader.restclient.AaiRestClient; +import org.onap.aai.modelloader.restclient.AaiRestClient.MimeType; import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; diff --git a/src/test/java/org/openecomp/modelloader/entity/model/ModelArtifactParserTest.java b/src/test/java/org/onap/aai/modelloader/entity/model/ModelArtifactParserTest.java similarity index 95% rename from src/test/java/org/openecomp/modelloader/entity/model/ModelArtifactParserTest.java rename to src/test/java/org/onap/aai/modelloader/entity/model/ModelArtifactParserTest.java index 040d5a0..95b1748 100644 --- a/src/test/java/org/openecomp/modelloader/entity/model/ModelArtifactParserTest.java +++ b/src/test/java/org/onap/aai/modelloader/entity/model/ModelArtifactParserTest.java @@ -21,7 +21,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.modelloader.entity.model; +package org.onap.aai.modelloader.entity.model; import static org.junit.Assert.assertTrue; @@ -30,7 +30,9 @@ import java.nio.file.Paths; import java.util.List; import org.junit.Test; -import org.openecomp.modelloader.entity.Artifact; +import org.onap.aai.modelloader.entity.Artifact; +import org.onap.aai.modelloader.entity.model.ModelArtifact; +import org.onap.aai.modelloader.entity.model.ModelArtifactParser; public class ModelArtifactParserTest { diff --git a/src/test/java/org/openecomp/modelloader/entity/model/ModelParserFactoryTest.java b/src/test/java/org/onap/aai/modelloader/entity/model/ModelParserFactoryTest.java similarity index 86% rename from src/test/java/org/openecomp/modelloader/entity/model/ModelParserFactoryTest.java rename to src/test/java/org/onap/aai/modelloader/entity/model/ModelParserFactoryTest.java index 2b4faff..9deaf52 100644 --- a/src/test/java/org/openecomp/modelloader/entity/model/ModelParserFactoryTest.java +++ b/src/test/java/org/onap/aai/modelloader/entity/model/ModelParserFactoryTest.java @@ -21,7 +21,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.modelloader.entity.model; +package org.onap.aai.modelloader.entity.model; import static org.junit.Assert.assertTrue; @@ -29,6 +29,11 @@ import java.nio.file.Files; import java.nio.file.Paths; import org.junit.Test; +import org.onap.aai.modelloader.entity.model.IModelParser; +import org.onap.aai.modelloader.entity.model.ModelArtifactParser; +import org.onap.aai.modelloader.entity.model.ModelParserFactory; +import org.onap.aai.modelloader.entity.model.ModelV8ArtifactParser; +import org.onap.aai.modelloader.entity.model.NamedQueryArtifactParser; public class ModelParserFactoryTest { diff --git a/src/test/java/org/openecomp/modelloader/entity/model/ModelSorterTest.java b/src/test/java/org/onap/aai/modelloader/entity/model/ModelSorterTest.java similarity index 94% rename from src/test/java/org/openecomp/modelloader/entity/model/ModelSorterTest.java rename to src/test/java/org/onap/aai/modelloader/entity/model/ModelSorterTest.java index 27cdfc9..c787e06 100644 --- a/src/test/java/org/openecomp/modelloader/entity/model/ModelSorterTest.java +++ b/src/test/java/org/onap/aai/modelloader/entity/model/ModelSorterTest.java @@ -21,7 +21,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.modelloader.entity.model; +package org.onap.aai.modelloader.entity.model; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -31,7 +31,11 @@ import java.util.Collections; import java.util.List; import org.junit.Test; -import org.openecomp.modelloader.entity.Artifact; +import org.onap.aai.modelloader.entity.Artifact; +import org.onap.aai.modelloader.entity.model.ModelArtifact; +import org.onap.aai.modelloader.entity.model.ModelSorter; +import org.onap.aai.modelloader.entity.model.ModelV8Artifact; +import org.onap.aai.modelloader.entity.model.NamedQueryArtifact; public class ModelSorterTest { diff --git a/src/test/java/org/openecomp/modelloader/entity/model/ModelV8ArtifactParserTest.java b/src/test/java/org/onap/aai/modelloader/entity/model/ModelV8ArtifactParserTest.java similarity index 94% rename from src/test/java/org/openecomp/modelloader/entity/model/ModelV8ArtifactParserTest.java rename to src/test/java/org/onap/aai/modelloader/entity/model/ModelV8ArtifactParserTest.java index 17772a7..6a9bd61 100644 --- a/src/test/java/org/openecomp/modelloader/entity/model/ModelV8ArtifactParserTest.java +++ b/src/test/java/org/onap/aai/modelloader/entity/model/ModelV8ArtifactParserTest.java @@ -21,7 +21,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.modelloader.entity.model; +package org.onap.aai.modelloader.entity.model; import static org.junit.Assert.assertTrue; @@ -30,7 +30,9 @@ import java.nio.file.Paths; import java.util.List; import org.junit.Test; -import org.openecomp.modelloader.entity.Artifact; +import org.onap.aai.modelloader.entity.Artifact; +import org.onap.aai.modelloader.entity.model.ModelV8Artifact; +import org.onap.aai.modelloader.entity.model.ModelV8ArtifactParser; public class ModelV8ArtifactParserTest { diff --git a/src/test/java/org/openecomp/modelloader/entity/model/NamedQueryArtifactParserTest.java b/src/test/java/org/onap/aai/modelloader/entity/model/NamedQueryArtifactParserTest.java similarity index 91% rename from src/test/java/org/openecomp/modelloader/entity/model/NamedQueryArtifactParserTest.java rename to src/test/java/org/onap/aai/modelloader/entity/model/NamedQueryArtifactParserTest.java index 69ac855..75065a3 100644 --- a/src/test/java/org/openecomp/modelloader/entity/model/NamedQueryArtifactParserTest.java +++ b/src/test/java/org/onap/aai/modelloader/entity/model/NamedQueryArtifactParserTest.java @@ -21,7 +21,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.modelloader.entity.model; +package org.onap.aai.modelloader.entity.model; import static org.junit.Assert.assertTrue; @@ -30,7 +30,9 @@ import java.nio.file.Paths; import java.util.List; import org.junit.Test; -import org.openecomp.modelloader.entity.Artifact; +import org.onap.aai.modelloader.entity.Artifact; +import org.onap.aai.modelloader.entity.model.NamedQueryArtifact; +import org.onap.aai.modelloader.entity.model.NamedQueryArtifactParser; public class NamedQueryArtifactParserTest { diff --git a/src/test/java/org/openecomp/modelloader/restclient/AaiRestClientTest.java b/src/test/java/org/onap/aai/modelloader/restclient/AaiRestClientTest.java similarity index 95% rename from src/test/java/org/openecomp/modelloader/restclient/AaiRestClientTest.java rename to src/test/java/org/onap/aai/modelloader/restclient/AaiRestClientTest.java index 8f9931c..07541b2 100644 --- a/src/test/java/org/openecomp/modelloader/restclient/AaiRestClientTest.java +++ b/src/test/java/org/onap/aai/modelloader/restclient/AaiRestClientTest.java @@ -21,15 +21,15 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.modelloader.restclient; +package org.onap.aai.modelloader.restclient; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Paths; -import org.openecomp.modelloader.config.ModelLoaderConfig; -import org.openecomp.modelloader.entity.ArtifactType; -import org.openecomp.modelloader.entity.model.ModelArtifact; +import org.onap.aai.modelloader.config.ModelLoaderConfig; +import org.onap.aai.modelloader.entity.ArtifactType; +import org.onap.aai.modelloader.entity.model.ModelArtifact; public class AaiRestClientTest { diff --git a/src/test/java/org/openecomp/modelloader/util/JsonXmlConverterTest.java b/src/test/java/org/onap/aai/modelloader/util/JsonXmlConverterTest.java similarity index 94% rename from src/test/java/org/openecomp/modelloader/util/JsonXmlConverterTest.java rename to src/test/java/org/onap/aai/modelloader/util/JsonXmlConverterTest.java index fc8a80a..816f004 100644 --- a/src/test/java/org/openecomp/modelloader/util/JsonXmlConverterTest.java +++ b/src/test/java/org/onap/aai/modelloader/util/JsonXmlConverterTest.java @@ -21,7 +21,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.modelloader.util; +package org.onap.aai.modelloader.util; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -34,6 +34,7 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import org.junit.Test; +import org.onap.aai.modelloader.util.JsonXmlConverter; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -- 2.16.6