Code Review
/
aai
/
gizmo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Apply multiplicity Rule upon Edge creation
[aai/gizmo.git]
/
src
/
main
/
java
/
org
/
onap
/
crud
/
parser
/
CrudResponseBuilder.java
diff --git
a/src/main/java/org/onap/crud/parser/CrudResponseBuilder.java
b/src/main/java/org/onap/crud/parser/CrudResponseBuilder.java
index
e28f7a7
..
29d8824
100644
(file)
--- a/
src/main/java/org/onap/crud/parser/CrudResponseBuilder.java
+++ b/
src/main/java/org/onap/crud/parser/CrudResponseBuilder.java
@@
-24,18
+24,10
@@
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Set;
-
-import javax.ws.rs.core.Response.Status;
-
import org.onap.crud.entity.Edge;
import org.onap.crud.entity.Vertex;
import org.onap.crud.exception.CrudException;
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 org.onap.schema.EdgeRulesLoader;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonArray;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonArray;
@@
-120,7
+112,7
@@
public class CrudResponseBuilder {
EdgePayload inEdge = new EdgePayload();
inEdge.setId(e.getId().get());
inEdge.setType(e.getType());
EdgePayload inEdge = new EdgePayload();
inEdge.setId(e.getId().get());
inEdge.setType(e.getType());
- inEdge.setUrl(URL_BASE + "relationships/" +
RelationshipSchema
Loader.getLatestSchemaVersion() + "/"
+ inEdge.setUrl(URL_BASE + "relationships/" +
EdgeRules
Loader.getLatestSchemaVersion() + "/"
+ e.getType() + "/" + e.getId().get());
inEdge.setSource(URL_BASE + version + "/" + e.getSource().getType() + "/" + e.getSource().getId().get());
+ e.getType() + "/" + e.getId().get());
inEdge.setSource(URL_BASE + version + "/" + e.getSource().getType() + "/" + e.getSource().getId().get());
@@
-129,7
+121,7
@@
public class CrudResponseBuilder {
EdgePayload outEdge = new EdgePayload();
outEdge.setId(e.getId().get());
outEdge.setType(e.getType());
EdgePayload outEdge = new EdgePayload();
outEdge.setId(e.getId().get());
outEdge.setType(e.getType());
- outEdge.setUrl(URL_BASE + "relationships/" +
RelationshipSchema
Loader.getLatestSchemaVersion() + "/"
+ outEdge.setUrl(URL_BASE + "relationships/" +
EdgeRules
Loader.getLatestSchemaVersion() + "/"
+ e.getType() + "/" + e.getId().get());
outEdge.setTarget(URL_BASE + version + "/" + e.getTarget().getType() + "/" + e.getTarget().getId().get());
outEdges.add(outEdge);
+ e.getType() + "/" + e.getId().get());
outEdge.setTarget(URL_BASE + version + "/" + e.getTarget().getType() + "/" + e.getTarget().getId().get());
outEdges.add(outEdge);