From 908b4693e5a0a4c2f323dbf518b35e4620f183a1 Mon Sep 17 00:00:00 2001 From: "Bansal, Nitin (nb121v)" Date: Mon, 20 Nov 2017 16:02:06 -0500 Subject: [PATCH] Refactor to move from openecomp to onap Refactor to move from openecomp to onap IssueID: AAI-486 Change-Id: I1d5634739514acf11d5fbdf5e2c7865aaccd864e Signed-off-by: Bansal, Nitin (nb121v) --- pom.xml | 14 ++--- .../org/{openecomp => onap}/crud/dao/GraphDao.java | 8 +-- .../crud/dao/champ/ChampDao.java | 62 +++++++++++----------- .../crud/dao/champion/ChampionDao.java | 34 ++++++------ .../crud/dao/champion/ChampionEdgeSerializer.java | 6 +-- .../dao/champion/ChampionVertexSerializer.java | 4 +- .../org/{openecomp => onap}/crud/entity/Edge.java | 2 +- .../{openecomp => onap}/crud/entity/Vertex.java | 2 +- .../{openecomp => onap}/crud/event/GraphEvent.java | 4 +- .../crud/event/GraphEventEdge.java | 8 +-- .../crud/event/GraphEventVertex.java | 6 +-- .../crud/exception/CrudException.java | 2 +- .../crud/logging/CrudServiceMsgs.java | 4 +- .../crud/logging/LoggingUtil.java | 12 ++--- .../crud/parser/CrudResponseBuilder.java | 16 +++--- .../crud/service/AaiResourceService.java | 20 +++---- .../crud/service/BulkPayload.java | 4 +- .../crud/service/CrudGraphDataService.java | 24 ++++----- .../crud/service/CrudRestService.java | 14 ++--- .../crud/service/EdgePayload.java | 4 +- .../crud/service/JaxrsEchoService.java | 8 +-- .../crud/service/VertexPayload.java | 4 +- .../crud/util/CrudJaxbTransformation.java | 2 +- .../crud/util/CrudProperties.java | 2 +- .../crud/util/CrudServiceConstants.java | 2 +- .../crud/util/CrudServiceUtil.java | 4 +- .../{openecomp => onap}/crud/util/FileWatcher.java | 2 +- .../schema/OxmModelValidator.java | 8 +-- .../schema/RelationshipSchema.java | 4 +- .../schema/RelationshipSchemaLoader.java | 14 ++--- .../schema/RelationshipSchemaValidator.java | 12 ++--- .../crud/dao/champ/ChampDaoTest.java | 12 ++--- .../schema/AaiResourceServiceTest.java | 8 +-- .../schema/RelationshipSchemaLoaderTest.java | 4 +- .../schema/RelationshipSchemaTest.java | 4 +- 35 files changed, 170 insertions(+), 170 deletions(-) rename src/main/java/org/{openecomp => onap}/crud/dao/GraphDao.java (97%) rename src/main/java/org/{openecomp => onap}/crud/dao/champ/ChampDao.java (93%) rename src/main/java/org/{openecomp => onap}/crud/dao/champion/ChampionDao.java (96%) rename src/main/java/org/{openecomp => onap}/crud/dao/champion/ChampionEdgeSerializer.java (94%) rename src/main/java/org/{openecomp => onap}/crud/dao/champion/ChampionVertexSerializer.java (95%) rename src/main/java/org/{openecomp => onap}/crud/entity/Edge.java (99%) rename src/main/java/org/{openecomp => onap}/crud/entity/Vertex.java (98%) rename src/main/java/org/{openecomp => onap}/crud/event/GraphEvent.java (98%) rename src/main/java/org/{openecomp => onap}/crud/event/GraphEventEdge.java (97%) rename src/main/java/org/{openecomp => onap}/crud/event/GraphEventVertex.java (97%) rename src/main/java/org/{openecomp => onap}/crud/exception/CrudException.java (98%) rename src/main/java/org/{openecomp => onap}/crud/logging/CrudServiceMsgs.java (96%) rename src/main/java/org/{openecomp => onap}/crud/logging/LoggingUtil.java (92%) rename src/main/java/org/{openecomp => onap}/crud/parser/CrudResponseBuilder.java (95%) rename src/main/java/org/{openecomp => onap}/crud/service/AaiResourceService.java (95%) rename src/main/java/org/{openecomp => onap}/crud/service/BulkPayload.java (97%) rename src/main/java/org/{openecomp => onap}/crud/service/CrudGraphDataService.java (96%) rename src/main/java/org/{openecomp => onap}/crud/service/CrudRestService.java (99%) rename src/main/java/org/{openecomp => onap}/crud/service/EdgePayload.java (97%) rename src/main/java/org/{openecomp => onap}/crud/service/JaxrsEchoService.java (92%) rename src/main/java/org/{openecomp => onap}/crud/service/VertexPayload.java (97%) rename src/main/java/org/{openecomp => onap}/crud/util/CrudJaxbTransformation.java (99%) rename src/main/java/org/{openecomp => onap}/crud/util/CrudProperties.java (98%) rename src/main/java/org/{openecomp => onap}/crud/util/CrudServiceConstants.java (98%) rename src/main/java/org/{openecomp => onap}/crud/util/CrudServiceUtil.java (96%) rename src/main/java/org/{openecomp => onap}/crud/util/FileWatcher.java (97%) rename src/main/java/org/{openecomp => onap}/schema/OxmModelValidator.java (98%) rename src/main/java/org/{openecomp => onap}/schema/RelationshipSchema.java (97%) rename src/main/java/org/{openecomp => onap}/schema/RelationshipSchemaLoader.java (96%) rename src/main/java/org/{openecomp => onap}/schema/RelationshipSchemaValidator.java (98%) rename src/test/java/org/{openecomp => onap}/crud/dao/champ/ChampDaoTest.java (98%) rename src/test/java/org/{openecomp => onap}/schema/AaiResourceServiceTest.java (94%) rename src/test/java/org/{openecomp => onap}/schema/RelationshipSchemaLoaderTest.java (97%) rename src/test/java/org/{openecomp => onap}/schema/RelationshipSchemaTest.java (98%) diff --git a/pom.xml b/pom.xml index be7f88e..e4119d1 100644 --- a/pom.xml +++ b/pom.xml @@ -77,9 +77,9 @@ - org.openecomp.aai.logging-service + org.onap.aai.logging-service common-logging - 1.0.0 + 1.1.0 @@ -111,9 +111,9 @@ - org.onap.aai.aai-common - aai-auth - 1.1.0-SNAPSHOT + org.onap.aai.aai-common + aai-auth + 1.1.0 @@ -136,9 +136,9 @@ - org.openecomp.aai + org.onap.aai rest-client - 1.1.1 + 1.1.0 net.dongliu diff --git a/src/main/java/org/openecomp/crud/dao/GraphDao.java b/src/main/java/org/onap/crud/dao/GraphDao.java similarity index 97% rename from src/main/java/org/openecomp/crud/dao/GraphDao.java rename to src/main/java/org/onap/crud/dao/GraphDao.java index 7e8c043..bc42b15 100644 --- a/src/main/java/org/openecomp/crud/dao/GraphDao.java +++ b/src/main/java/org/onap/crud/dao/GraphDao.java @@ -21,15 +21,15 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.crud.dao; +package org.onap.crud.dao; import java.util.List; import java.util.Map; -import org.openecomp.crud.entity.Edge; +import org.onap.crud.entity.Edge; -import org.openecomp.crud.entity.Vertex; -import org.openecomp.crud.exception.CrudException; +import org.onap.crud.entity.Vertex; +import org.onap.crud.exception.CrudException; public interface GraphDao { diff --git a/src/main/java/org/openecomp/crud/dao/champ/ChampDao.java b/src/main/java/org/onap/crud/dao/champ/ChampDao.java similarity index 93% rename from src/main/java/org/openecomp/crud/dao/champ/ChampDao.java rename to src/main/java/org/onap/crud/dao/champ/ChampDao.java index 93c3cdd..f217897 100644 --- a/src/main/java/org/openecomp/crud/dao/champ/ChampDao.java +++ b/src/main/java/org/onap/crud/dao/champ/ChampDao.java @@ -21,7 +21,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.crud.dao.champ; +package org.onap.crud.dao.champ; import java.util.ArrayList; import java.util.List; @@ -31,24 +31,24 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.openecomp.aai.champcore.ChampGraph; -import org.openecomp.aai.champcore.ChampTransaction; -import org.openecomp.aai.champcore.exceptions.ChampMarshallingException; -import org.openecomp.aai.champcore.exceptions.ChampObjectNotExistsException; -import org.openecomp.aai.champcore.exceptions.ChampRelationshipNotExistsException; -import org.openecomp.aai.champcore.exceptions.ChampSchemaViolationException; -import org.openecomp.aai.champcore.exceptions.ChampTransactionException; -import org.openecomp.aai.champcore.exceptions.ChampUnmarshallingException; -import org.openecomp.aai.champcore.model.ChampObject; -import org.openecomp.aai.champcore.model.ChampRelationship; -import org.openecomp.aai.champcore.model.fluent.object.ObjectBuildOrPropertiesStep; -import org.openecomp.cl.api.Logger; -import org.openecomp.cl.eelf.LoggerFactory; -import org.openecomp.crud.dao.GraphDao; -import org.openecomp.crud.entity.Edge; -import org.openecomp.crud.entity.Vertex; -import org.openecomp.crud.exception.CrudException; -import org.openecomp.crud.logging.CrudServiceMsgs; +import org.onap.aai.champcore.ChampGraph; +import org.onap.aai.champcore.ChampTransaction; +import org.onap.aai.champcore.exceptions.ChampMarshallingException; +import org.onap.aai.champcore.exceptions.ChampObjectNotExistsException; +import org.onap.aai.champcore.exceptions.ChampRelationshipNotExistsException; +import org.onap.aai.champcore.exceptions.ChampSchemaViolationException; +import org.onap.aai.champcore.exceptions.ChampTransactionException; +import org.onap.aai.champcore.exceptions.ChampUnmarshallingException; +import org.onap.aai.champcore.model.ChampObject; +import org.onap.aai.champcore.model.ChampRelationship; +import org.onap.aai.champcore.model.fluent.object.ObjectBuildOrPropertiesStep; +import org.onap.aai.cl.api.Logger; +import org.onap.aai.cl.eelf.LoggerFactory; +import org.onap.crud.dao.GraphDao; +import org.onap.crud.entity.Edge; +import org.onap.crud.entity.Vertex; +import org.onap.crud.exception.CrudException; +import org.onap.crud.logging.CrudServiceMsgs; /** * This is the integration layer between the CRUD API service and the low level @@ -106,7 +106,7 @@ public class ChampDao implements GraphDao { Optional retrievedVertex = champApi.retrieveObject(idAsLong); - String nodeType = org.openecomp.schema.OxmModelValidator.Metadata.NODE_TYPE.propertyName(); + String nodeType = org.onap.schema.OxmModelValidator.Metadata.NODE_TYPE.propertyName(); if (retrievedVertex.isPresent() && retrievedVertex.get().getProperties().get(nodeType) != null) { return vertexFromChampObject(retrievedVertex.get(), retrievedVertex.get().getProperties().get(nodeType).toString()); @@ -142,9 +142,9 @@ public class ChampDao implements GraphDao { // Did we find it? if (retrievedVertex.isPresent() && retrievedVertex.get().getProperties() - .get(org.openecomp.schema.OxmModelValidator.Metadata.NODE_TYPE.propertyName()) != null + .get(org.onap.schema.OxmModelValidator.Metadata.NODE_TYPE.propertyName()) != null && retrievedVertex.get().getProperties() - .get(org.openecomp.schema.OxmModelValidator.Metadata.NODE_TYPE.propertyName()).toString() + .get(org.onap.schema.OxmModelValidator.Metadata.NODE_TYPE.propertyName()).toString() .equalsIgnoreCase(type)) { // Yup, convert it to a Vector object and return it. @@ -222,7 +222,7 @@ public class ChampDao implements GraphDao { } // Add the aai_node_type so that AAI can read the data created by gizmo - properties.put(org.openecomp.schema.OxmModelValidator.Metadata.NODE_TYPE.propertyName(), type); + properties.put(org.onap.schema.OxmModelValidator.Metadata.NODE_TYPE.propertyName(), type); // Create an object to represent our vertex in the format expected by the // Champ library. @@ -250,7 +250,7 @@ public class ChampDao implements GraphDao { logger.debug("Update vertex with id: " + id + " with properties: " + propertiesMapToString(properties)); } // Add the aai_node_type so that AAI can read the data created by gizmo - properties.put(org.openecomp.schema.OxmModelValidator.Metadata.NODE_TYPE.propertyName(), type); + properties.put(org.onap.schema.OxmModelValidator.Metadata.NODE_TYPE.propertyName(), type); try { // Now, build the updated version of the Champ Object... @@ -276,7 +276,7 @@ public class ChampDao implements GraphDao { + propertiesMapToString(filter)); } - filter.put(org.openecomp.schema.OxmModelValidator.Metadata.NODE_TYPE.propertyName(), type); + filter.put(org.onap.schema.OxmModelValidator.Metadata.NODE_TYPE.propertyName(), type); Stream retrievedVertices; try { @@ -582,16 +582,16 @@ public class ChampDao implements GraphDao { Edge.Builder edgeBuilder = new Edge.Builder(relationship.getType()).id(relationshipId.toString()); edgeBuilder.source(vertexFromChampObject(relationship.getSource(), relationship.getSource().getProperties() - .get(org.openecomp.schema.OxmModelValidator.Metadata.NODE_TYPE.propertyName()) == null + .get(org.onap.schema.OxmModelValidator.Metadata.NODE_TYPE.propertyName()) == null ? relationship.getSource().getType() : relationship.getSource().getProperties() - .get(org.openecomp.schema.OxmModelValidator.Metadata.NODE_TYPE.propertyName()).toString())); + .get(org.onap.schema.OxmModelValidator.Metadata.NODE_TYPE.propertyName()).toString())); edgeBuilder.target(vertexFromChampObject(relationship.getTarget(), relationship.getTarget().getProperties() - .get(org.openecomp.schema.OxmModelValidator.Metadata.NODE_TYPE.propertyName()) == null + .get(org.onap.schema.OxmModelValidator.Metadata.NODE_TYPE.propertyName()) == null ? relationship.getTarget().getType() : relationship.getTarget().getProperties() - .get(org.openecomp.schema.OxmModelValidator.Metadata.NODE_TYPE.propertyName()).toString())); + .get(org.onap.schema.OxmModelValidator.Metadata.NODE_TYPE.propertyName()).toString())); for (String key : relationship.getProperties().keySet()) { edgeBuilder.property(key, relationship.getProperties().get(key).toString()); @@ -674,7 +674,7 @@ public class ChampDao implements GraphDao { } // Add the aai_node_type so that AAI can read the data created by gizmo - properties.put(org.openecomp.schema.OxmModelValidator.Metadata.NODE_TYPE.propertyName(), type); + properties.put(org.onap.schema.OxmModelValidator.Metadata.NODE_TYPE.propertyName(), type); // Create an object to represent our vertex in the format expected by the // Champ library. @@ -738,7 +738,7 @@ public class ChampDao implements GraphDao { logger.debug("Update vertex with id: " + id + " with properties: " + propertiesMapToString(properties)); } // Add the aai_node_type so that AAI can read the data created by gizmo - properties.put(org.openecomp.schema.OxmModelValidator.Metadata.NODE_TYPE.propertyName(), type); + properties.put(org.onap.schema.OxmModelValidator.Metadata.NODE_TYPE.propertyName(), type); try { // Now, build the updated version of the Champ Object... diff --git a/src/main/java/org/openecomp/crud/dao/champion/ChampionDao.java b/src/main/java/org/onap/crud/dao/champion/ChampionDao.java similarity index 96% rename from src/main/java/org/openecomp/crud/dao/champion/ChampionDao.java rename to src/main/java/org/onap/crud/dao/champion/ChampionDao.java index 48fa6cb..4bde2e0 100644 --- a/src/main/java/org/openecomp/crud/dao/champion/ChampionDao.java +++ b/src/main/java/org/onap/crud/dao/champion/ChampionDao.java @@ -21,7 +21,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.crud.dao.champion; +package org.onap.crud.dao.champion; import net.dongliu.gson.GsonJava8TypeAdapterFactory; @@ -33,17 +33,17 @@ import org.apache.http.NameValuePair; import org.apache.http.client.utils.URLEncodedUtils; import org.apache.http.message.BasicNameValuePair; import org.eclipse.jetty.util.security.Password; -import org.openecomp.aai.logging.LoggingContext; -import org.openecomp.cl.api.Logger; -import org.openecomp.cl.eelf.LoggerFactory; -import org.openecomp.crud.dao.GraphDao; -import org.openecomp.crud.entity.Edge; -import org.openecomp.crud.entity.Vertex; -import org.openecomp.crud.exception.CrudException; -import org.openecomp.crud.util.CrudServiceConstants; -import org.openecomp.restclient.client.OperationResult; -import org.openecomp.restclient.client.RestClient; -import org.openecomp.restclient.enums.RestAuthenticationMode; +import org.onap.aai.logging.LoggingContext; +import org.onap.aai.cl.api.Logger; +import org.onap.aai.cl.eelf.LoggerFactory; +import org.onap.crud.dao.GraphDao; +import org.onap.crud.entity.Edge; +import org.onap.crud.entity.Vertex; +import org.onap.crud.exception.CrudException; +import org.onap.crud.util.CrudServiceConstants; +import org.onap.aai.restclient.client.OperationResult; +import org.onap.aai.restclient.client.RestClient; +import org.onap.aai.restclient.enums.RestAuthenticationMode; import org.slf4j.MDC; import java.nio.charset.Charset; @@ -153,7 +153,7 @@ public class ChampionDao implements GraphDao { @Override public List getVertices(String type, Map filter) throws CrudException { - filter.put(org.openecomp.schema.OxmModelValidator.Metadata.NODE_TYPE.propertyName(), type); + filter.put(org.onap.schema.OxmModelValidator.Metadata.NODE_TYPE.propertyName(), type); String url = baseUrl + "objects/filter" + "?" + URLEncodedUtils.format(convertToNameValuePair(filter), Charset.defaultCharset()); @@ -231,7 +231,7 @@ public class ChampionDao implements GraphDao { // Add the aai_node_type so that AAI can read the data created by gizmo // TODO: This probably shouldn't be here - properties.put(org.openecomp.schema.OxmModelValidator.Metadata.NODE_TYPE.propertyName(), type); + properties.put(org.onap.schema.OxmModelValidator.Metadata.NODE_TYPE.propertyName(), type); Vertex.Builder insertVertexBuilder = new Vertex.Builder(type); properties.forEach(insertVertexBuilder::property); @@ -258,7 +258,7 @@ public class ChampionDao implements GraphDao { // Add the aai_node_type so that AAI can read the data created by gizmo // TODO: This probably shouldn't be here - properties.put(org.openecomp.schema.OxmModelValidator.Metadata.NODE_TYPE.propertyName(), type); + properties.put(org.onap.schema.OxmModelValidator.Metadata.NODE_TYPE.propertyName(), type); Vertex.Builder insertVertexBuilder = new Vertex.Builder(type); insertVertexBuilder.id(id); @@ -430,7 +430,7 @@ public class ChampionDao implements GraphDao { // Add the aai_node_type so that AAI can read the data created by gizmo // TODO: This probably shouldn't be here - properties.put(org.openecomp.schema.OxmModelValidator.Metadata.NODE_TYPE.propertyName(), type); + properties.put(org.onap.schema.OxmModelValidator.Metadata.NODE_TYPE.propertyName(), type); Vertex.Builder insertVertexBuilder = new Vertex.Builder(type); properties.forEach(insertVertexBuilder::property); @@ -485,7 +485,7 @@ public class ChampionDao implements GraphDao { // Add the aai_node_type so that AAI can read the data created by gizmo // TODO: This probably shouldn't be here - properties.put(org.openecomp.schema.OxmModelValidator.Metadata.NODE_TYPE.propertyName(), type); + properties.put(org.onap.schema.OxmModelValidator.Metadata.NODE_TYPE.propertyName(), type); Vertex.Builder insertVertexBuilder = new Vertex.Builder(type); insertVertexBuilder.id(id); diff --git a/src/main/java/org/openecomp/crud/dao/champion/ChampionEdgeSerializer.java b/src/main/java/org/onap/crud/dao/champion/ChampionEdgeSerializer.java similarity index 94% rename from src/main/java/org/openecomp/crud/dao/champion/ChampionEdgeSerializer.java rename to src/main/java/org/onap/crud/dao/champion/ChampionEdgeSerializer.java index 5ca6c2c..655d096 100644 --- a/src/main/java/org/openecomp/crud/dao/champion/ChampionEdgeSerializer.java +++ b/src/main/java/org/onap/crud/dao/champion/ChampionEdgeSerializer.java @@ -21,15 +21,15 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.crud.dao.champion; +package org.onap.crud.dao.champion; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; -import org.openecomp.crud.entity.Edge; -import org.openecomp.crud.entity.Vertex; +import org.onap.crud.entity.Edge; +import org.onap.crud.entity.Vertex; import java.lang.reflect.Type; diff --git a/src/main/java/org/openecomp/crud/dao/champion/ChampionVertexSerializer.java b/src/main/java/org/onap/crud/dao/champion/ChampionVertexSerializer.java similarity index 95% rename from src/main/java/org/openecomp/crud/dao/champion/ChampionVertexSerializer.java rename to src/main/java/org/onap/crud/dao/champion/ChampionVertexSerializer.java index ab743d7..904ad2e 100644 --- a/src/main/java/org/openecomp/crud/dao/champion/ChampionVertexSerializer.java +++ b/src/main/java/org/onap/crud/dao/champion/ChampionVertexSerializer.java @@ -21,14 +21,14 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.crud.dao.champion; +package org.onap.crud.dao.champion; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; -import org.openecomp.crud.entity.Vertex; +import org.onap.crud.entity.Vertex; import java.lang.reflect.Type; diff --git a/src/main/java/org/openecomp/crud/entity/Edge.java b/src/main/java/org/onap/crud/entity/Edge.java similarity index 99% rename from src/main/java/org/openecomp/crud/entity/Edge.java rename to src/main/java/org/onap/crud/entity/Edge.java index 4d2de24..87b0ac4 100644 --- a/src/main/java/org/openecomp/crud/entity/Edge.java +++ b/src/main/java/org/onap/crud/entity/Edge.java @@ -21,7 +21,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.crud.entity; +package org.onap.crud.entity; import net.dongliu.gson.GsonJava8TypeAdapterFactory; diff --git a/src/main/java/org/openecomp/crud/entity/Vertex.java b/src/main/java/org/onap/crud/entity/Vertex.java similarity index 98% rename from src/main/java/org/openecomp/crud/entity/Vertex.java rename to src/main/java/org/onap/crud/entity/Vertex.java index 12c274f..42d0eef 100644 --- a/src/main/java/org/openecomp/crud/entity/Vertex.java +++ b/src/main/java/org/onap/crud/entity/Vertex.java @@ -21,7 +21,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.crud.entity; +package org.onap.crud.entity; import net.dongliu.gson.GsonJava8TypeAdapterFactory; diff --git a/src/main/java/org/openecomp/crud/event/GraphEvent.java b/src/main/java/org/onap/crud/event/GraphEvent.java similarity index 98% rename from src/main/java/org/openecomp/crud/event/GraphEvent.java rename to src/main/java/org/onap/crud/event/GraphEvent.java index 392bf2d..9e9c44c 100644 --- a/src/main/java/org/openecomp/crud/event/GraphEvent.java +++ b/src/main/java/org/onap/crud/event/GraphEvent.java @@ -21,13 +21,13 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.crud.event; +package org.onap.crud.event; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.annotations.SerializedName; -import org.openecomp.crud.exception.CrudException; +import org.onap.crud.exception.CrudException; import javax.ws.rs.core.Response.Status; diff --git a/src/main/java/org/openecomp/crud/event/GraphEventEdge.java b/src/main/java/org/onap/crud/event/GraphEventEdge.java similarity index 97% rename from src/main/java/org/openecomp/crud/event/GraphEventEdge.java rename to src/main/java/org/onap/crud/event/GraphEventEdge.java index aaf9b72..58ea4a7 100644 --- a/src/main/java/org/openecomp/crud/event/GraphEventEdge.java +++ b/src/main/java/org/onap/crud/event/GraphEventEdge.java @@ -21,7 +21,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.crud.event; +package org.onap.crud.event; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -30,9 +30,9 @@ import com.google.gson.JsonObject; import com.google.gson.annotations.SerializedName; import com.google.gson.reflect.TypeToken; -import org.openecomp.crud.entity.Edge; -import org.openecomp.crud.entity.Vertex; -import org.openecomp.crud.exception.CrudException; +import org.onap.crud.entity.Edge; +import org.onap.crud.entity.Vertex; +import org.onap.crud.exception.CrudException; import java.util.Map; import javax.ws.rs.core.Response.Status; diff --git a/src/main/java/org/openecomp/crud/event/GraphEventVertex.java b/src/main/java/org/onap/crud/event/GraphEventVertex.java similarity index 97% rename from src/main/java/org/openecomp/crud/event/GraphEventVertex.java rename to src/main/java/org/onap/crud/event/GraphEventVertex.java index 7fde12a..d9a06d4 100644 --- a/src/main/java/org/openecomp/crud/event/GraphEventVertex.java +++ b/src/main/java/org/onap/crud/event/GraphEventVertex.java @@ -21,7 +21,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.crud.event; +package org.onap.crud.event; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -30,8 +30,8 @@ import com.google.gson.JsonObject; import com.google.gson.annotations.SerializedName; import com.google.gson.reflect.TypeToken; -import org.openecomp.crud.entity.Vertex; -import org.openecomp.crud.exception.CrudException; +import org.onap.crud.entity.Vertex; +import org.onap.crud.exception.CrudException; import java.util.Map; import javax.ws.rs.core.Response.Status; diff --git a/src/main/java/org/openecomp/crud/exception/CrudException.java b/src/main/java/org/onap/crud/exception/CrudException.java similarity index 98% rename from src/main/java/org/openecomp/crud/exception/CrudException.java rename to src/main/java/org/onap/crud/exception/CrudException.java index 2911070..a3d3127 100644 --- a/src/main/java/org/openecomp/crud/exception/CrudException.java +++ b/src/main/java/org/onap/crud/exception/CrudException.java @@ -21,7 +21,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.crud.exception; +package org.onap.crud.exception; import javax.ws.rs.core.Response.Status; diff --git a/src/main/java/org/openecomp/crud/logging/CrudServiceMsgs.java b/src/main/java/org/onap/crud/logging/CrudServiceMsgs.java similarity index 96% rename from src/main/java/org/openecomp/crud/logging/CrudServiceMsgs.java rename to src/main/java/org/onap/crud/logging/CrudServiceMsgs.java index 4298709..6b04a0f 100644 --- a/src/main/java/org/openecomp/crud/logging/CrudServiceMsgs.java +++ b/src/main/java/org/onap/crud/logging/CrudServiceMsgs.java @@ -21,11 +21,11 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.crud.logging; +package org.onap.crud.logging; import com.att.eelf.i18n.EELFResourceManager; -import org.openecomp.cl.eelf.LogMessageEnum; +import org.onap.aai.cl.eelf.LogMessageEnum; public enum CrudServiceMsgs implements LogMessageEnum { diff --git a/src/main/java/org/openecomp/crud/logging/LoggingUtil.java b/src/main/java/org/onap/crud/logging/LoggingUtil.java similarity index 92% rename from src/main/java/org/openecomp/crud/logging/LoggingUtil.java rename to src/main/java/org/onap/crud/logging/LoggingUtil.java index b66a309..453dc9d 100644 --- a/src/main/java/org/openecomp/crud/logging/LoggingUtil.java +++ b/src/main/java/org/onap/crud/logging/LoggingUtil.java @@ -21,13 +21,13 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.crud.logging; +package org.onap.crud.logging; -import org.openecomp.cl.api.LogFields; -import org.openecomp.cl.api.LogLine; -import org.openecomp.cl.api.Logger; -import org.openecomp.cl.mdc.MdcContext; -import org.openecomp.crud.util.CrudServiceConstants; +import org.onap.aai.cl.api.LogFields; +import org.onap.aai.cl.api.LogLine; +import org.onap.aai.cl.api.Logger; +import org.onap.aai.cl.mdc.MdcContext; +import org.onap.crud.util.CrudServiceConstants; import org.slf4j.MDC; import javax.servlet.http.HttpServletRequest; diff --git a/src/main/java/org/openecomp/crud/parser/CrudResponseBuilder.java b/src/main/java/org/onap/crud/parser/CrudResponseBuilder.java similarity index 95% rename from src/main/java/org/openecomp/crud/parser/CrudResponseBuilder.java rename to src/main/java/org/onap/crud/parser/CrudResponseBuilder.java index b527fa1..62d1408 100644 --- a/src/main/java/org/openecomp/crud/parser/CrudResponseBuilder.java +++ b/src/main/java/org/onap/crud/parser/CrudResponseBuilder.java @@ -21,7 +21,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.crud.parser; +package org.onap.crud.parser; import java.util.ArrayList; import java.util.HashMap; @@ -31,13 +31,13 @@ import java.util.Set; import javax.ws.rs.core.Response.Status; -import org.openecomp.crud.entity.Edge; -import org.openecomp.crud.entity.Vertex; -import org.openecomp.crud.exception.CrudException; -import org.openecomp.crud.service.BulkPayload; -import org.openecomp.crud.service.EdgePayload; -import org.openecomp.crud.service.VertexPayload; -import org.openecomp.schema.RelationshipSchemaLoader; +import org.onap.crud.entity.Edge; +import org.onap.crud.entity.Vertex; +import org.onap.crud.exception.CrudException; +import org.onap.crud.service.BulkPayload; +import org.onap.crud.service.EdgePayload; +import org.onap.crud.service.VertexPayload; +import org.onap.schema.RelationshipSchemaLoader; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/src/main/java/org/openecomp/crud/service/AaiResourceService.java b/src/main/java/org/onap/crud/service/AaiResourceService.java similarity index 95% rename from src/main/java/org/openecomp/crud/service/AaiResourceService.java rename to src/main/java/org/onap/crud/service/AaiResourceService.java index 9c6565a..2e4464d 100644 --- a/src/main/java/org/openecomp/crud/service/AaiResourceService.java +++ b/src/main/java/org/onap/crud/service/AaiResourceService.java @@ -21,7 +21,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.crud.service; +package org.onap.crud.service; import java.security.cert.X509Certificate; import java.util.AbstractMap; @@ -52,15 +52,15 @@ import org.onap.aai.serialization.db.EdgeRule; import org.onap.aai.serialization.db.EdgeRules; import org.onap.aai.serialization.db.EdgeType; import org.openecomp.auth.Auth; -import org.openecomp.cl.api.Logger; -import org.openecomp.cl.eelf.LoggerFactory; -import org.openecomp.crud.exception.CrudException; -import org.openecomp.crud.logging.CrudServiceMsgs; -import org.openecomp.crud.logging.LoggingUtil; -import org.openecomp.crud.service.CrudRestService.Action; -import org.openecomp.crud.util.CrudServiceConstants; -import org.openecomp.schema.RelationshipSchemaLoader; -import org.openecomp.schema.RelationshipSchemaValidator; +import org.onap.aai.cl.api.Logger; +import org.onap.aai.cl.eelf.LoggerFactory; +import org.onap.crud.exception.CrudException; +import org.onap.crud.logging.CrudServiceMsgs; +import org.onap.crud.logging.LoggingUtil; +import org.onap.crud.service.CrudRestService.Action; +import org.onap.crud.util.CrudServiceConstants; +import org.onap.schema.RelationshipSchemaLoader; +import org.onap.schema.RelationshipSchemaValidator; import org.slf4j.MDC; import com.google.gson.Gson; diff --git a/src/main/java/org/openecomp/crud/service/BulkPayload.java b/src/main/java/org/onap/crud/service/BulkPayload.java similarity index 97% rename from src/main/java/org/openecomp/crud/service/BulkPayload.java rename to src/main/java/org/onap/crud/service/BulkPayload.java index 619c53b..538d9c0 100644 --- a/src/main/java/org/openecomp/crud/service/BulkPayload.java +++ b/src/main/java/org/onap/crud/service/BulkPayload.java @@ -21,7 +21,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.crud.service; +package org.onap.crud.service; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -29,7 +29,7 @@ import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import org.openecomp.crud.exception.CrudException; +import org.onap.crud.exception.CrudException; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/org/openecomp/crud/service/CrudGraphDataService.java b/src/main/java/org/onap/crud/service/CrudGraphDataService.java similarity index 96% rename from src/main/java/org/openecomp/crud/service/CrudGraphDataService.java rename to src/main/java/org/onap/crud/service/CrudGraphDataService.java index 340fafa..268e492 100644 --- a/src/main/java/org/openecomp/crud/service/CrudGraphDataService.java +++ b/src/main/java/org/onap/crud/service/CrudGraphDataService.java @@ -21,7 +21,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.crud.service; +package org.onap.crud.service; import java.util.ArrayList; import java.util.HashMap; @@ -31,17 +31,17 @@ import java.util.Map; import javax.ws.rs.core.Response.Status; import org.onap.aaiutils.oxm.OxmModelLoader; -import org.openecomp.aai.champcore.ChampGraph; -import org.openecomp.crud.dao.GraphDao; -import org.openecomp.crud.dao.champ.ChampDao; -import org.openecomp.crud.entity.Edge; - -import org.openecomp.crud.entity.Vertex; -import org.openecomp.crud.exception.CrudException; -import org.openecomp.crud.parser.CrudResponseBuilder; -import org.openecomp.schema.OxmModelValidator; -import org.openecomp.schema.RelationshipSchemaLoader; -import org.openecomp.schema.RelationshipSchemaValidator; +import org.onap.aai.champcore.ChampGraph; +import org.onap.crud.dao.GraphDao; +import org.onap.crud.dao.champ.ChampDao; +import org.onap.crud.entity.Edge; + +import org.onap.crud.entity.Vertex; +import org.onap.crud.exception.CrudException; +import org.onap.crud.parser.CrudResponseBuilder; +import org.onap.schema.OxmModelValidator; +import org.onap.schema.RelationshipSchemaLoader; +import org.onap.schema.RelationshipSchemaValidator; import com.google.gson.JsonElement; diff --git a/src/main/java/org/openecomp/crud/service/CrudRestService.java b/src/main/java/org/onap/crud/service/CrudRestService.java similarity index 99% rename from src/main/java/org/openecomp/crud/service/CrudRestService.java rename to src/main/java/org/onap/crud/service/CrudRestService.java index 79b5624..da792b5 100644 --- a/src/main/java/org/openecomp/crud/service/CrudRestService.java +++ b/src/main/java/org/onap/crud/service/CrudRestService.java @@ -21,7 +21,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.crud.service; +package org.onap.crud.service; import java.security.cert.X509Certificate; import java.util.ArrayList; @@ -50,12 +50,12 @@ import javax.ws.rs.core.UriInfo; import org.apache.cxf.jaxrs.ext.PATCH; import org.openecomp.auth.Auth; -import org.openecomp.cl.api.Logger; -import org.openecomp.cl.eelf.LoggerFactory; -import org.openecomp.crud.exception.CrudException; -import org.openecomp.crud.logging.CrudServiceMsgs; -import org.openecomp.crud.logging.LoggingUtil; -import org.openecomp.crud.util.CrudServiceConstants; +import org.onap.aai.cl.api.Logger; +import org.onap.aai.cl.eelf.LoggerFactory; +import org.onap.crud.exception.CrudException; +import org.onap.crud.logging.CrudServiceMsgs; +import org.onap.crud.logging.LoggingUtil; +import org.onap.crud.util.CrudServiceConstants; import org.slf4j.MDC; import com.google.gson.JsonElement; diff --git a/src/main/java/org/openecomp/crud/service/EdgePayload.java b/src/main/java/org/onap/crud/service/EdgePayload.java similarity index 97% rename from src/main/java/org/openecomp/crud/service/EdgePayload.java rename to src/main/java/org/onap/crud/service/EdgePayload.java index d098d16..dc25497 100644 --- a/src/main/java/org/openecomp/crud/service/EdgePayload.java +++ b/src/main/java/org/onap/crud/service/EdgePayload.java @@ -21,13 +21,13 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.crud.service; +package org.onap.crud.service; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonElement; -import org.openecomp.crud.exception.CrudException; +import org.onap.crud.exception.CrudException; import javax.ws.rs.core.Response.Status; diff --git a/src/main/java/org/openecomp/crud/service/JaxrsEchoService.java b/src/main/java/org/onap/crud/service/JaxrsEchoService.java similarity index 92% rename from src/main/java/org/openecomp/crud/service/JaxrsEchoService.java rename to src/main/java/org/onap/crud/service/JaxrsEchoService.java index 0edd316..cdea726 100644 --- a/src/main/java/org/openecomp/crud/service/JaxrsEchoService.java +++ b/src/main/java/org/onap/crud/service/JaxrsEchoService.java @@ -21,11 +21,11 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.crud.service; +package org.onap.crud.service; -import org.openecomp.cl.api.Logger; -import org.openecomp.cl.eelf.LoggerFactory; -import org.openecomp.crud.logging.LoggingUtil; +import org.onap.aai.cl.api.Logger; +import org.onap.aai.cl.eelf.LoggerFactory; +import org.onap.crud.logging.LoggingUtil; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.GET; diff --git a/src/main/java/org/openecomp/crud/service/VertexPayload.java b/src/main/java/org/onap/crud/service/VertexPayload.java similarity index 97% rename from src/main/java/org/openecomp/crud/service/VertexPayload.java rename to src/main/java/org/onap/crud/service/VertexPayload.java index ed79002..4529d70 100644 --- a/src/main/java/org/openecomp/crud/service/VertexPayload.java +++ b/src/main/java/org/onap/crud/service/VertexPayload.java @@ -21,13 +21,13 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.crud.service; +package org.onap.crud.service; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonElement; -import org.openecomp.crud.exception.CrudException; +import org.onap.crud.exception.CrudException; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/org/openecomp/crud/util/CrudJaxbTransformation.java b/src/main/java/org/onap/crud/util/CrudJaxbTransformation.java similarity index 99% rename from src/main/java/org/openecomp/crud/util/CrudJaxbTransformation.java rename to src/main/java/org/onap/crud/util/CrudJaxbTransformation.java index c1a1e18..05afea2 100644 --- a/src/main/java/org/openecomp/crud/util/CrudJaxbTransformation.java +++ b/src/main/java/org/onap/crud/util/CrudJaxbTransformation.java @@ -21,7 +21,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.crud.util; +package org.onap.crud.util; import org.eclipse.persistence.dynamic.DynamicEntity; import org.eclipse.persistence.jaxb.JAXBMarshaller; diff --git a/src/main/java/org/openecomp/crud/util/CrudProperties.java b/src/main/java/org/onap/crud/util/CrudProperties.java similarity index 98% rename from src/main/java/org/openecomp/crud/util/CrudProperties.java rename to src/main/java/org/onap/crud/util/CrudProperties.java index 69b2e16..b029dd1 100644 --- a/src/main/java/org/openecomp/crud/util/CrudProperties.java +++ b/src/main/java/org/onap/crud/util/CrudProperties.java @@ -21,7 +21,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.crud.util; +package org.onap.crud.util; import java.io.File; import java.io.FileInputStream; diff --git a/src/main/java/org/openecomp/crud/util/CrudServiceConstants.java b/src/main/java/org/onap/crud/util/CrudServiceConstants.java similarity index 98% rename from src/main/java/org/openecomp/crud/util/CrudServiceConstants.java rename to src/main/java/org/onap/crud/util/CrudServiceConstants.java index 1a4858f..0d07707 100644 --- a/src/main/java/org/openecomp/crud/util/CrudServiceConstants.java +++ b/src/main/java/org/onap/crud/util/CrudServiceConstants.java @@ -21,7 +21,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.crud.util; +package org.onap.crud.util; public class CrudServiceConstants { public static final String CRD_SERVICE_NAME = "Crud-Service"; diff --git a/src/main/java/org/openecomp/crud/util/CrudServiceUtil.java b/src/main/java/org/onap/crud/util/CrudServiceUtil.java similarity index 96% rename from src/main/java/org/openecomp/crud/util/CrudServiceUtil.java rename to src/main/java/org/onap/crud/util/CrudServiceUtil.java index b88f20b..49b0317 100644 --- a/src/main/java/org/openecomp/crud/util/CrudServiceUtil.java +++ b/src/main/java/org/onap/crud/util/CrudServiceUtil.java @@ -21,9 +21,9 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.crud.util; +package org.onap.crud.util; -import org.openecomp.crud.exception.CrudException; +import org.onap.crud.exception.CrudException; import javax.ws.rs.core.Response.Status; diff --git a/src/main/java/org/openecomp/crud/util/FileWatcher.java b/src/main/java/org/onap/crud/util/FileWatcher.java similarity index 97% rename from src/main/java/org/openecomp/crud/util/FileWatcher.java rename to src/main/java/org/onap/crud/util/FileWatcher.java index 8c7cbc1..711fa08 100644 --- a/src/main/java/org/openecomp/crud/util/FileWatcher.java +++ b/src/main/java/org/onap/crud/util/FileWatcher.java @@ -21,7 +21,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.crud.util; +package org.onap.crud.util; import java.io.File; import java.util.TimerTask; diff --git a/src/main/java/org/openecomp/schema/OxmModelValidator.java b/src/main/java/org/onap/schema/OxmModelValidator.java similarity index 98% rename from src/main/java/org/openecomp/schema/OxmModelValidator.java rename to src/main/java/org/onap/schema/OxmModelValidator.java index 79136e4..d23804c 100644 --- a/src/main/java/org/openecomp/schema/OxmModelValidator.java +++ b/src/main/java/org/onap/schema/OxmModelValidator.java @@ -21,7 +21,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.schema; +package org.onap.schema; import com.google.common.base.CaseFormat; import com.google.gson.JsonElement; @@ -33,9 +33,9 @@ import org.eclipse.persistence.jaxb.dynamic.DynamicJAXBContext; import org.eclipse.persistence.mappings.DatabaseMapping; import org.eclipse.persistence.oxm.XMLField; import org.onap.aaiutils.oxm.OxmModelLoader; -import org.openecomp.crud.entity.Vertex; -import org.openecomp.crud.exception.CrudException; -import org.openecomp.crud.util.CrudServiceUtil; +import org.onap.crud.entity.Vertex; +import org.onap.crud.exception.CrudException; +import org.onap.crud.util.CrudServiceUtil; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/org/openecomp/schema/RelationshipSchema.java b/src/main/java/org/onap/schema/RelationshipSchema.java similarity index 97% rename from src/main/java/org/openecomp/schema/RelationshipSchema.java rename to src/main/java/org/onap/schema/RelationshipSchema.java index a8d101d..e6a40b5 100644 --- a/src/main/java/org/openecomp/schema/RelationshipSchema.java +++ b/src/main/java/org/onap/schema/RelationshipSchema.java @@ -21,13 +21,13 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.schema; +package org.onap.schema; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import org.codehaus.jackson.map.ObjectMapper; -import org.openecomp.crud.exception.CrudException; +import org.onap.crud.exception.CrudException; import java.io.IOException; import java.util.*; diff --git a/src/main/java/org/openecomp/schema/RelationshipSchemaLoader.java b/src/main/java/org/onap/schema/RelationshipSchemaLoader.java similarity index 96% rename from src/main/java/org/openecomp/schema/RelationshipSchemaLoader.java rename to src/main/java/org/onap/schema/RelationshipSchemaLoader.java index cc6315c..48727a0 100644 --- a/src/main/java/org/openecomp/schema/RelationshipSchemaLoader.java +++ b/src/main/java/org/onap/schema/RelationshipSchemaLoader.java @@ -21,7 +21,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.schema; +package org.onap.schema; import java.io.File; import java.io.FileInputStream; @@ -46,11 +46,11 @@ import java.util.stream.Collectors; import javax.ws.rs.core.Response.Status; import org.apache.commons.io.IOUtils; -import org.openecomp.cl.eelf.LoggerFactory; -import org.openecomp.crud.exception.CrudException; -import org.openecomp.crud.logging.CrudServiceMsgs; -import org.openecomp.crud.util.CrudServiceConstants; -import org.openecomp.crud.util.FileWatcher; +import org.onap.aai.cl.eelf.LoggerFactory; +import org.onap.crud.exception.CrudException; +import org.onap.crud.logging.CrudServiceMsgs; +import org.onap.crud.util.CrudServiceConstants; +import org.onap.crud.util.FileWatcher; import org.springframework.core.io.UrlResource; import org.springframework.core.io.support.PathMatchingResourcePatternResolver; import org.springframework.core.io.support.ResourcePatternResolver; @@ -66,7 +66,7 @@ public class RelationshipSchemaLoader { final static Pattern propsFilePattern = Pattern.compile(edgePropsFiles + "(.*)" + fileExt); final static Pattern versionPattern = Pattern.compile(".*(v\\d+)" + fileExt); - private static org.openecomp.cl.api.Logger logger = LoggerFactory.getInstance() + private static org.onap.aai.cl.api.Logger logger = LoggerFactory.getInstance() .getLogger(RelationshipSchemaLoader.class.getName()); public synchronized static void loadModels() throws CrudException { diff --git a/src/main/java/org/openecomp/schema/RelationshipSchemaValidator.java b/src/main/java/org/onap/schema/RelationshipSchemaValidator.java similarity index 98% rename from src/main/java/org/openecomp/schema/RelationshipSchemaValidator.java rename to src/main/java/org/onap/schema/RelationshipSchemaValidator.java index e2374be..53048be 100644 --- a/src/main/java/org/openecomp/schema/RelationshipSchemaValidator.java +++ b/src/main/java/org/onap/schema/RelationshipSchemaValidator.java @@ -21,16 +21,16 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ -package org.openecomp.schema; +package org.onap.schema; import com.google.gson.JsonElement; import com.google.gson.JsonNull; -import org.openecomp.crud.entity.Edge; -import org.openecomp.crud.entity.Vertex; -import org.openecomp.crud.exception.CrudException; -import org.openecomp.crud.service.EdgePayload; -import org.openecomp.crud.util.CrudServiceUtil; +import org.onap.crud.entity.Edge; +import org.onap.crud.entity.Vertex; +import org.onap.crud.exception.CrudException; +import org.onap.crud.service.EdgePayload; +import org.onap.crud.util.CrudServiceUtil; import org.radeox.util.logging.Logger; import java.util.HashMap; diff --git a/src/test/java/org/openecomp/crud/dao/champ/ChampDaoTest.java b/src/test/java/org/onap/crud/dao/champ/ChampDaoTest.java similarity index 98% rename from src/test/java/org/openecomp/crud/dao/champ/ChampDaoTest.java rename to src/test/java/org/onap/crud/dao/champ/ChampDaoTest.java index 847e67b..eb1e987 100644 --- a/src/test/java/org/openecomp/crud/dao/champ/ChampDaoTest.java +++ b/src/test/java/org/onap/crud/dao/champ/ChampDaoTest.java @@ -1,14 +1,14 @@ -package org.openecomp.crud.dao.champ; +package org.onap.crud.dao.champ; import org.junit.After; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; -import org.openecomp.aai.champcore.graph.impl.InMemoryChampGraphImpl; -import org.openecomp.crud.dao.GraphDao; -import org.openecomp.crud.entity.Edge; -import org.openecomp.crud.entity.Vertex; -import org.openecomp.crud.exception.CrudException; +import org.onap.aai.champcore.graph.impl.InMemoryChampGraphImpl; +import org.onap.crud.dao.GraphDao; +import org.onap.crud.entity.Edge; +import org.onap.crud.entity.Vertex; +import org.onap.crud.exception.CrudException; import java.util.HashMap; import java.util.List; diff --git a/src/test/java/org/openecomp/schema/AaiResourceServiceTest.java b/src/test/java/org/onap/schema/AaiResourceServiceTest.java similarity index 94% rename from src/test/java/org/openecomp/schema/AaiResourceServiceTest.java rename to src/test/java/org/onap/schema/AaiResourceServiceTest.java index 16db6d2..766fcff 100644 --- a/src/test/java/org/openecomp/schema/AaiResourceServiceTest.java +++ b/src/test/java/org/onap/schema/AaiResourceServiceTest.java @@ -1,4 +1,4 @@ -package org.openecomp.schema; +package org.onap.schema; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -12,9 +12,9 @@ import org.onap.aai.serialization.db.EdgeProperty; import org.onap.aai.serialization.db.EdgeRule; import org.onap.aai.serialization.db.EdgeRules; import org.onap.aai.serialization.db.EdgeType; -import org.openecomp.crud.exception.CrudException; -import org.openecomp.crud.service.AaiResourceService; -import org.openecomp.crud.service.EdgePayload; +import org.onap.crud.exception.CrudException; +import org.onap.crud.service.AaiResourceService; +import org.onap.crud.service.EdgePayload; import com.google.gson.JsonElement; diff --git a/src/test/java/org/openecomp/schema/RelationshipSchemaLoaderTest.java b/src/test/java/org/onap/schema/RelationshipSchemaLoaderTest.java similarity index 97% rename from src/test/java/org/openecomp/schema/RelationshipSchemaLoaderTest.java rename to src/test/java/org/onap/schema/RelationshipSchemaLoaderTest.java index ccd3c72..0c62162 100644 --- a/src/test/java/org/openecomp/schema/RelationshipSchemaLoaderTest.java +++ b/src/test/java/org/onap/schema/RelationshipSchemaLoaderTest.java @@ -1,10 +1,10 @@ -package org.openecomp.schema; +package org.onap.schema; import static org.junit.Assert.*; import edu.emory.mathcs.backport.java.util.Arrays; import org.junit.Before; import org.junit.Test; -import org.openecomp.crud.exception.CrudException; +import org.onap.crud.exception.CrudException; import java.io.File; import java.util.ArrayList; diff --git a/src/test/java/org/openecomp/schema/RelationshipSchemaTest.java b/src/test/java/org/onap/schema/RelationshipSchemaTest.java similarity index 98% rename from src/test/java/org/openecomp/schema/RelationshipSchemaTest.java rename to src/test/java/org/onap/schema/RelationshipSchemaTest.java index 74cd85f..95b3dde 100644 --- a/src/test/java/org/openecomp/schema/RelationshipSchemaTest.java +++ b/src/test/java/org/onap/schema/RelationshipSchemaTest.java @@ -1,8 +1,8 @@ -package org.openecomp.schema; +package org.onap.schema; import org.apache.commons.io.IOUtils; import org.junit.Test; -import org.openecomp.crud.exception.CrudException; +import org.onap.crud.exception.CrudException; import java.io.File; import java.io.FileInputStream; -- 2.16.6