X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fcrud%2Futil%2FCrudServiceUtil.java;h=64a822c7fd8cc5d81bce7b8bc92d5ad4775f3e61;hb=0c40bcde9facc109ceb8dabb91156df2b4fb4129;hp=6c251bc4e47280f9ace57a38fb771f3884090114;hpb=00832f054dd0c21492af531548e321ea25cdb8b4;p=aai%2Fgizmo.git diff --git a/src/main/java/org/onap/crud/util/CrudServiceUtil.java b/src/main/java/org/onap/crud/util/CrudServiceUtil.java index 6c251bc..64a822c 100644 --- a/src/main/java/org/onap/crud/util/CrudServiceUtil.java +++ b/src/main/java/org/onap/crud/util/CrudServiceUtil.java @@ -20,28 +20,30 @@ */ package org.onap.crud.util; -import org.onap.aai.db.props.AAIProperties; -import org.onap.crud.exception.CrudException; -import org.onap.schema.OxmModelLoader; -import org.onap.schema.EdgeRulesLoader; - import com.google.gson.Gson; import com.google.gson.JsonElement; import com.google.gson.JsonPrimitive; - import java.util.AbstractMap; import java.util.HashSet; import java.util.Map; -import java.util.Set; import java.util.Map.Entry; - +import java.util.Set; +import javax.ws.rs.core.EntityTag; import javax.ws.rs.core.HttpHeaders; +import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Response.Status; +import org.onap.crud.exception.CrudException; +import org.onap.crud.service.EdgePayload; +import org.onap.schema.EdgeRulesLoader; +import org.onap.schema.RelationshipSchema; +import org.onap.schema.RelationshipSchemaValidator; public class CrudServiceUtil { private static Gson gson = new Gson(); - + public static final java.lang.String LAST_MOD_SOURCE_OF_TRUTH = "last-mod-source-of-truth"; + public static final java.lang.String SOURCE_OF_TRUTH = "source-of-truth"; + @SuppressWarnings({"unchecked", "rawtypes"}) public static Object validateFieldType(String value, Class clazz) throws CrudException { try { @@ -54,13 +56,13 @@ public class CrudServiceUtil { } else if (clazz.isAssignableFrom(Double.class)) { return Double.parseDouble(value); } else if (clazz.isAssignableFrom(Boolean.class)) { - + // If the value is an IN/OUT direction, this gets seen as a boolean, so // check for that first. if (value.equals("OUT") || value.equals("IN")) { return value; } - + if (!value.equals("true") && !value.equals("false")) { throw new CrudException("Invalid propertry value: " + value, Status.BAD_REQUEST); } @@ -73,16 +75,6 @@ public class CrudServiceUtil { } } - public static void loadModels() throws CrudException { - // load the schemas - try { - OxmModelLoader.loadModels(); - EdgeRulesLoader.loadModels (); - } catch (Exception e) { - throw new CrudException(e); - } - } - /** * This method will merge header property from app id in request payload if not already populated * @param propertiesFromRequest @@ -93,23 +85,23 @@ public class CrudServiceUtil { @SuppressWarnings("unchecked") public static JsonElement mergeHeaderInFoToPayload(JsonElement propertiesFromRequest, HttpHeaders headers, boolean isAdd) { - String sourceOfTruth = headers.getRequestHeaders().getFirst("X-FromAppId"); + String sourceOfTruth = headers.getRequestHeaders().getFirst("X-FromAppId"); Set> properties = new HashSet>(); properties.addAll(propertiesFromRequest.getAsJsonObject().entrySet()); - + Set propertyKeys = new HashSet(); for(Map.Entry property : properties) { propertyKeys.add(property.getKey()); } - - if(!propertyKeys.contains(AAIProperties.LAST_MOD_SOURCE_OF_TRUTH)) { - properties.add(new AbstractMap.SimpleEntry(AAIProperties.LAST_MOD_SOURCE_OF_TRUTH, - (JsonElement)(new JsonPrimitive(sourceOfTruth)))); + + if(!propertyKeys.contains(LAST_MOD_SOURCE_OF_TRUTH)) { + properties.add(new AbstractMap.SimpleEntry(LAST_MOD_SOURCE_OF_TRUTH, + (new JsonPrimitive(sourceOfTruth)))); } - - if(isAdd && !propertyKeys.contains(AAIProperties.SOURCE_OF_TRUTH)) { - properties.add(new AbstractMap.SimpleEntry(AAIProperties.SOURCE_OF_TRUTH, - (JsonElement)(new JsonPrimitive(sourceOfTruth)))); + + if(isAdd && !propertyKeys.contains(SOURCE_OF_TRUTH)) { + properties.add(new AbstractMap.SimpleEntry(SOURCE_OF_TRUTH, + (new JsonPrimitive(sourceOfTruth)))); } Object[] propArray = properties.toArray(); @@ -117,7 +109,7 @@ public class CrudServiceUtil { sb.append("{"); boolean first=true; for(int i=0; i entry = (Entry) propArray[i]; if(!first) { sb.append(","); @@ -126,7 +118,37 @@ public class CrudServiceUtil { first=false; } sb.append("}"); - + return gson.fromJson(sb.toString(), JsonElement.class); } + + public static EntityTag getETagFromHeader(MultivaluedMap headers) { + EntityTag entityTag = null; + if (headers != null && headers.containsKey(CrudServiceConstants.CRD_HEADER_ETAG)) { + String value = headers.getFirst(CrudServiceConstants.CRD_HEADER_ETAG); + entityTag = new EntityTag(value.replace("\"", "")); + } + return entityTag; + } + + public static String determineEdgeType(EdgePayload payload, String version) throws CrudException { + RelationshipSchema schema = EdgeRulesLoader.getSchemaForVersion(version); + + if (payload.getSource() == null || payload.getTarget() == null) { + throw new CrudException("Source/Target not specified", Status.BAD_REQUEST); + } + + Set edgeTypes = schema.getValidRelationTypes(RelationshipSchemaValidator.vertexTypeFromUri(payload.getSource()), + RelationshipSchemaValidator.vertexTypeFromUri(payload.getTarget())); + + if (edgeTypes.size() == 0) { + throw new CrudException("No valid relationship types from " + payload.getSource() + " to " + payload.getTarget(), Status.BAD_REQUEST); + } + + if (edgeTypes.size() > 1) { + throw new CrudException("Multiple possible relationship types from " + payload.getSource() + " to " + payload.getTarget(), Status.BAD_REQUEST); + } + + return edgeTypes.iterator().next(); + } }