diff options
author | sblimkie <steven.blimkie@amdocs.com> | 2017-12-20 10:15:36 -0500 |
---|---|---|
committer | sblimkie <steven.blimkie@amdocs.com> | 2017-12-20 10:21:46 -0500 |
commit | 0e7b5a7e16a4f807580b152f3de766d1512543f1 (patch) | |
tree | c5b50902b1115e3be89111a53852609e32735227 /src/main/java/org/onap/crud/service/CrudGraphDataService.java | |
parent | 382e07e97ccd5f7bd47bdd735143ab3658661a68 (diff) |
Consolidate syncrounous and asyncronous APIs
Gizmo to present a single API, and the mode in which it interacts with
the backend is configurable at deploy time.
Change-Id: Iab96f71c9f99dd1d8d70f01a90478a975c50bff1
Issue-ID: AAI-482
Signed-off-by: sblimkie <steven.blimkie@amdocs.com>
Diffstat (limited to 'src/main/java/org/onap/crud/service/CrudGraphDataService.java')
-rw-r--r-- | src/main/java/org/onap/crud/service/CrudGraphDataService.java | 39 |
1 files changed, 2 insertions, 37 deletions
diff --git a/src/main/java/org/onap/crud/service/CrudGraphDataService.java b/src/main/java/org/onap/crud/service/CrudGraphDataService.java index 4e42d44..49bf370 100644 --- a/src/main/java/org/onap/crud/service/CrudGraphDataService.java +++ b/src/main/java/org/onap/crud/service/CrudGraphDataService.java @@ -36,24 +36,17 @@ 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.crud.util.CrudServiceUtil; import org.onap.schema.OxmModelValidator; import org.onap.schema.RelationshipSchemaValidator; import com.google.gson.JsonElement; -public class CrudGraphDataService { - - private GraphDao dao; +public class CrudGraphDataService extends AbstractGraphDataService { public CrudGraphDataService(GraphDao dao) throws CrudException { - this.dao = dao; - - CrudServiceUtil.loadModels(); + super(dao); } - - public String addVertex(String version, String type, VertexPayload payload) throws CrudException { Vertex vertex = OxmModelValidator.validateIncomingUpsertPayload(null, version, type, payload.getProperties()); return addVertex(version, vertex); @@ -195,20 +188,6 @@ public class CrudGraphDataService { .buildUpsertEdgeResponse(RelationshipSchemaValidator.validateOutgoingPayload(version, addedEdge), version); } - public String getEdge(String version, String id, String type) throws CrudException { - RelationshipSchemaValidator.validateType(version, type); - Edge edge = dao.getEdge(id, type); - - return CrudResponseBuilder.buildGetEdgeResponse(RelationshipSchemaValidator.validateOutgoingPayload(version, edge), - version); - } - - public String getEdges(String version, String type, Map<String, String> filter) throws CrudException { - RelationshipSchemaValidator.validateType(version, type); - List<Edge> items = dao.getEdges(type, RelationshipSchemaValidator.resolveCollectionfilter(version, type, filter)); - return CrudResponseBuilder.buildGetEdgesResponse(items, version); - } - public String updateVertex(String version, String id, String type, VertexPayload payload) throws CrudException { Vertex vertex = OxmModelValidator.validateIncomingUpsertPayload(id, version, type, payload.getProperties()); return updateVertex(version, vertex); @@ -267,18 +246,4 @@ public class CrudGraphDataService { return dao.getVertex(id); } - public String getVertex(String version, String id, String type) throws CrudException { - type = OxmModelValidator.resolveCollectionType(version, type); - Vertex vertex = dao.getVertex(id, type); - List<Edge> edges = dao.getVertexEdges(id); - return CrudResponseBuilder.buildGetVertexResponse(OxmModelValidator.validateOutgoingPayload(version, vertex), edges, - version); - } - - public String getVertices(String version, String type, Map<String, String> filter) throws CrudException { - type = OxmModelValidator.resolveCollectionType(version, type); - List<Vertex> items = dao.getVertices(type, OxmModelValidator.resolveCollectionfilter(version, type, filter)); - return CrudResponseBuilder.buildGetVerticesResponse(items, version); - } - } |