X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aai%2Fgizmo.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fcrud%2Futil%2FCrudServiceUtil.java;h=64a822c7fd8cc5d81bce7b8bc92d5ad4775f3e61;hp=244177605433fd89da09b5a0e86014b75e560d44;hb=0c40bcde9facc109ceb8dabb91156df2b4fb4129;hpb=df7904cca9c67ed7ce99e1d1d1c3a2c961a61445

diff --git a/src/main/java/org/onap/crud/util/CrudServiceUtil.java b/src/main/java/org/onap/crud/util/CrudServiceUtil.java
index 2441776..64a822c 100644
--- a/src/main/java/org/onap/crud/util/CrudServiceUtil.java
+++ b/src/main/java/org/onap/crud/util/CrudServiceUtil.java
@@ -33,10 +33,10 @@ 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.parser.EdgePayload;
-import org.onap.crud.parser.util.EdgePayloadUtil;
+import org.onap.crud.service.EdgePayload;
 import org.onap.schema.EdgeRulesLoader;
 import org.onap.schema.RelationshipSchema;
+import org.onap.schema.RelationshipSchemaValidator;
 
 public class CrudServiceUtil {
 
@@ -138,8 +138,8 @@ public class CrudServiceUtil {
       throw new CrudException("Source/Target not specified", Status.BAD_REQUEST);
     }
 
-    Set<String> edgeTypes = schema.getValidRelationTypes(EdgePayloadUtil.getVertexNodeType(payload.getSource()),
-        EdgePayloadUtil.getVertexNodeType(payload.getTarget()));
+    Set<String> 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);