<version>2.0.0</version>
</parent>
- <groupId>org.openecomp.aai.model-loader</groupId>
+ <groupId>org.onap.aai.model-loader</groupId>
<artifactId>model-loader</artifactId>
<version>1.1.0-SNAPSHOT</version>
<name>aai-model-loader</name>
xmlns jaxrs: "http://cxf.apache.org/jaxrs"\r
xmlns util: "http://www.springframework.org/schema/util"\r
\r
- modelLoader(org.openecomp.modelloader.service.ModelLoaderService)\r
+ modelLoader(org.onap.aai.modelloader.service.ModelLoaderService)\r
\r
util.list(id: 'modelLoaderServices') {\r
ref(bean:'modelLoader')\r
*
* 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;
*
* 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 {
*\r
* ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
*/\r
-package org.openecomp.modelloader.entity;\r
-\r
-import org.openecomp.modelloader.config.ModelLoaderConfig;\r
+package org.onap.aai.modelloader.entity;\r
\r
import java.util.List;\r
\r
+import org.onap.aai.modelloader.config.ModelLoaderConfig;\r
+\r
public abstract class ArtifactHandler {\r
\r
protected ModelLoaderConfig config;\r
*
* 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,
*
* 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) {
*\r
* ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
*/\r
-package org.openecomp.modelloader.entity.catalog;\r
+package org.onap.aai.modelloader.entity.catalog;\r
\r
import com.sun.jersey.api.client.ClientResponse;\r
\r
import inventory.aai.openecomp.org.v8.VnfImage;\r
\r
import org.eclipse.persistence.jaxb.MarshallerProperties;\r
+import org.onap.aai.modelloader.config.ModelLoaderConfig;\r
+import org.onap.aai.modelloader.entity.Artifact;\r
+import org.onap.aai.modelloader.entity.ArtifactHandler;\r
+import org.onap.aai.modelloader.restclient.AaiRestClient;\r
+import org.onap.aai.modelloader.restclient.AaiRestClient.MimeType;\r
+import org.onap.aai.modelloader.service.ModelLoaderMsgs;\r
import org.openecomp.cl.api.Logger;\r
import org.openecomp.cl.eelf.LoggerFactory;\r
-import org.openecomp.modelloader.config.ModelLoaderConfig;\r
-import org.openecomp.modelloader.entity.Artifact;\r
-import org.openecomp.modelloader.entity.ArtifactHandler;\r
-import org.openecomp.modelloader.restclient.AaiRestClient;\r
-import org.openecomp.modelloader.restclient.AaiRestClient.MimeType;\r
-import org.openecomp.modelloader.service.ModelLoaderMsgs;\r
import org.springframework.web.util.UriUtils;\r
\r
import java.io.StringReader;\r
*
* 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 {
*
* 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<Artifact> parse(byte[] artifactPayload, String artifactName);
*
* 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;
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;
*
* 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;
*
* 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;
*
* 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;
*
* 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;
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
*
* 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;
*
* 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;
*
* 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;
*
* 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;
*\r
* ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
*/\r
-package org.openecomp.modelloader.notification;\r
+package org.onap.aai.modelloader.notification;\r
\r
import org.openecomp.sdc.api.consumer.IDistributionStatusMessage;\r
import org.openecomp.sdc.utils.DistributionStatusEnum;\r
*
* 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;
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;
*
* 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;
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;
*\r
* ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
*/\r
-package org.openecomp.modelloader.service;\r
+package org.onap.aai.modelloader.service;\r
\r
import java.io.IOException;\r
\r
*\r
* ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
*/\r
-package org.openecomp.modelloader.service;\r
+package org.onap.aai.modelloader.service;\r
\r
import com.att.eelf.i18n.EELFResourceManager;\r
\r
*
* 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;
}
/** (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) {
}
/** (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) {
*
* 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;
*\r
* ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
*/\r
-package org.openecomp.modelloader.util;\r
+package org.onap.aai.modelloader.util;\r
\r
import org.json.JSONArray;\r
import org.json.JSONException;\r
*
* 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;
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 {
*\r
* ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
*/\r
-package org.openecomp.modelloader.entity.catalog;\r
+package org.onap.aai.modelloader.entity.catalog;\r
\r
import static org.junit.Assert.assertTrue;\r
import static org.junit.Assert.fail;\r
import org.junit.runner.RunWith;\r
import org.mockito.ArgumentCaptor;\r
import org.mockito.Mockito;\r
-import org.openecomp.modelloader.config.ModelLoaderConfig;\r
-import org.openecomp.modelloader.entity.Artifact;\r
-import org.openecomp.modelloader.restclient.AaiRestClient;\r
-import org.openecomp.modelloader.restclient.AaiRestClient.MimeType;\r
+import org.onap.aai.modelloader.config.ModelLoaderConfig;\r
+import org.onap.aai.modelloader.entity.Artifact;\r
+import org.onap.aai.modelloader.entity.catalog.VnfCatalogArtifact;\r
+import org.onap.aai.modelloader.entity.catalog.VnfCatalogArtifactHandler;\r
+import org.onap.aai.modelloader.restclient.AaiRestClient;\r
+import org.onap.aai.modelloader.restclient.AaiRestClient.MimeType;\r
import org.powermock.api.mockito.PowerMockito;\r
import org.powermock.core.classloader.annotations.PrepareForTest;\r
import org.powermock.modules.junit4.PowerMockRunner;\r
*
* 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;
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 {
*
* 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;
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 {
*
* 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;
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 {
*
* 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;
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 {
*
* 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;
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 {
*
* 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 {
*\r
* ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
*/\r
-package org.openecomp.modelloader.util;\r
+package org.onap.aai.modelloader.util;\r
\r
import static org.junit.Assert.assertFalse;\r
import static org.junit.Assert.assertTrue;\r
import javax.xml.parsers.DocumentBuilderFactory;\r
\r
import org.junit.Test;\r
+import org.onap.aai.modelloader.util.JsonXmlConverter;\r
import org.w3c.dom.Document;\r
import org.w3c.dom.Node;\r
import org.w3c.dom.NodeList;\r