<!-- Common logging framework -->
<dependency>
- <groupId>org.openecomp.aai.logging-service</groupId>
+ <groupId>org.onap.aai.logging-service</groupId>
<artifactId>common-logging</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0</version>
</dependency>
<dependency>
</dependency>
<dependency>
- <groupId>org.onap.aai.aai-common</groupId>
- <artifactId>aai-auth</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <groupId>org.onap.aai.aai-common</groupId>
+ <artifactId>aai-auth</artifactId>
+ <version>1.1.0</version>
</dependency>
<dependency>
</exclusions>
</dependency>
<dependency>
- <groupId>org.openecomp.aai</groupId>
+ <groupId>org.onap.aai</groupId>
<artifactId>rest-client</artifactId>
- <version>1.1.1</version>
+ <version>1.1.0</version>
</dependency>
<dependency>
<groupId>net.dongliu</groupId>
*
* 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 {
*
* 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;
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
Optional<ChampObject> 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());
// 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.
}
// 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.
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...
+ 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<ChampObject> retrievedVertices;
try {
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());
}
// 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.
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...
*
* 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;
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;
@Override
public List<Vertex> getVertices(String type, Map<String, Object> 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());
// 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);
// 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);
// 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);
// 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);
*
* 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;
*
* 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;
*
* 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;
*
* 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;
*
* 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;
*
* 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 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;
*
* 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 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;
*
* 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;
*
* 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 {
*
* 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;
*
* 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;
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;
*\r
* ECOMP is a trademark and service mark of AT&T Intellectual Property.\r
*/\r
-package org.openecomp.crud.service;\r
+package org.onap.crud.service;\r
\r
import java.security.cert.X509Certificate;\r
import java.util.AbstractMap;\r
import org.onap.aai.serialization.db.EdgeRules;\r
import org.onap.aai.serialization.db.EdgeType;\r
import org.openecomp.auth.Auth;\r
-import org.openecomp.cl.api.Logger;\r
-import org.openecomp.cl.eelf.LoggerFactory;\r
-import org.openecomp.crud.exception.CrudException;\r
-import org.openecomp.crud.logging.CrudServiceMsgs;\r
-import org.openecomp.crud.logging.LoggingUtil;\r
-import org.openecomp.crud.service.CrudRestService.Action;\r
-import org.openecomp.crud.util.CrudServiceConstants;\r
-import org.openecomp.schema.RelationshipSchemaLoader;\r
-import org.openecomp.schema.RelationshipSchemaValidator;\r
+import org.onap.aai.cl.api.Logger;\r
+import org.onap.aai.cl.eelf.LoggerFactory;\r
+import org.onap.crud.exception.CrudException;\r
+import org.onap.crud.logging.CrudServiceMsgs;\r
+import org.onap.crud.logging.LoggingUtil;\r
+import org.onap.crud.service.CrudRestService.Action;\r
+import org.onap.crud.util.CrudServiceConstants;\r
+import org.onap.schema.RelationshipSchemaLoader;\r
+import org.onap.schema.RelationshipSchemaValidator;\r
import org.slf4j.MDC;\r
\r
import com.google.gson.Gson;\r
*
* 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 com.google.gson.JsonObject;
-import org.openecomp.crud.exception.CrudException;
+import org.onap.crud.exception.CrudException;
import java.util.ArrayList;
import java.util.List;
*
* 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;
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;
*
* 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;
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;
*
* 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;
*
* 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;
*
* 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;
*
* 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;
*
* 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;
*
* 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";
*
* 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;
*
* 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;
*
* 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;
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;
*
* 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.*;
*
* 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;
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;
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 {
*
* 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;
-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;
-package org.openecomp.schema;\r
+package org.onap.schema;\r
\r
import static org.junit.Assert.assertTrue;\r
import static org.junit.Assert.fail;\r
import org.onap.aai.serialization.db.EdgeRule;\r
import org.onap.aai.serialization.db.EdgeRules;\r
import org.onap.aai.serialization.db.EdgeType;\r
-import org.openecomp.crud.exception.CrudException;\r
-import org.openecomp.crud.service.AaiResourceService;\r
-import org.openecomp.crud.service.EdgePayload;\r
+import org.onap.crud.exception.CrudException;\r
+import org.onap.crud.service.AaiResourceService;\r
+import org.onap.crud.service.EdgePayload;\r
\r
import com.google.gson.JsonElement;\r
\r
-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;
-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;