diff options
author | sblimkie <steven.blimkie@amdocs.com> | 2018-01-22 19:29:18 -0500 |
---|---|---|
committer | sblimkie <steven.blimkie@amdocs.com> | 2018-01-22 19:31:50 -0500 |
commit | c8d962ad88da4403ae9186e7213a7ce28b82aaa1 (patch) | |
tree | 564a7482c69040e14b4c219f6904d02a2abb97d4 /src/main/java/org/onap/crud/service | |
parent | a0e716dc093cd8a4a4ec8aaca7bc1635e518527a (diff) |
Fix issue with patch requests
Fix issue where patch commands were failing for non-string vertex
properties
Change-Id: I1cf25565fc121745e817c8292c99d4cdc89c4a35
Issue-ID: AAI-685
Signed-off-by: sblimkie <steven.blimkie@amdocs.com>
Diffstat (limited to 'src/main/java/org/onap/crud/service')
3 files changed, 12 insertions, 12 deletions
diff --git a/src/main/java/org/onap/crud/service/AbstractGraphDataService.java b/src/main/java/org/onap/crud/service/AbstractGraphDataService.java index ef276a3..1163623 100644 --- a/src/main/java/org/onap/crud/service/AbstractGraphDataService.java +++ b/src/main/java/org/onap/crud/service/AbstractGraphDataService.java @@ -67,7 +67,7 @@ public abstract class AbstractGraphDataService { public String getVertex(String version, String id, String type) throws CrudException { type = OxmModelValidator.resolveCollectionType(version, type); - Vertex vertex = dao.getVertex(id, type); + Vertex vertex = dao.getVertex(id, type, version); List<Edge> edges = dao.getVertexEdges(id); return CrudResponseBuilder.buildGetVertexResponse(OxmModelValidator.validateOutgoingPayload(version, vertex), edges, version); @@ -166,7 +166,7 @@ public abstract class AbstractGraphDataService { vertexPayload.setProperties(CrudServiceUtil.mergeHeaderInFoToPayload(vertexPayload.getProperties(), headers, false)); - Vertex existingVertex = dao.getVertex(vertexPayload.getId(), OxmModelValidator.resolveCollectionType(version, vertexPayload.getType())); + Vertex existingVertex = dao.getVertex(vertexPayload.getId(), OxmModelValidator.resolveCollectionType(version, vertexPayload.getType()), version); Vertex validatedVertex = OxmModelValidator.validateIncomingPatchPayload(vertexPayload.getId(), version, vertexPayload.getType(), vertexPayload.getProperties(), existingVertex); Vertex persistedVertex = updateBulkVertex(validatedVertex, vertexPayload.getId(), version, txId); diff --git a/src/main/java/org/onap/crud/service/CrudAsyncGraphDataService.java b/src/main/java/org/onap/crud/service/CrudAsyncGraphDataService.java index 60a18d3..b3e7551 100644 --- a/src/main/java/org/onap/crud/service/CrudAsyncGraphDataService.java +++ b/src/main/java/org/onap/crud/service/CrudAsyncGraphDataService.java @@ -261,7 +261,7 @@ public class CrudAsyncGraphDataService extends AbstractGraphDataService { public String patchVertex(String version, String id, String type, VertexPayload payload) throws CrudException { Vertex existingVertex - = dao.getVertex(id, OxmModelValidator.resolveCollectionType(version, type)); + = dao.getVertex(id, OxmModelValidator.resolveCollectionType(version, type), version); Vertex patchedVertex = OxmModelValidator.validateIncomingPatchPayload(id, version, type, payload.getProperties(), existingVertex); diff --git a/src/main/java/org/onap/crud/service/CrudGraphDataService.java b/src/main/java/org/onap/crud/service/CrudGraphDataService.java index a18ab3b..61550b2 100644 --- a/src/main/java/org/onap/crud/service/CrudGraphDataService.java +++ b/src/main/java/org/onap/crud/service/CrudGraphDataService.java @@ -46,7 +46,7 @@ public class CrudGraphDataService extends AbstractGraphDataService { } private String addVertex(String version, Vertex vertex) throws CrudException { - Vertex addedVertex = dao.addVertex(vertex.getType(), vertex.getProperties()); + Vertex addedVertex = dao.addVertex(vertex.getType(), vertex.getProperties(), version); return CrudResponseBuilder .buildUpsertVertexResponse(OxmModelValidator.validateOutgoingPayload(version, addedVertex), version); } @@ -57,7 +57,7 @@ public class CrudGraphDataService extends AbstractGraphDataService { } private String addEdge(String version, Edge edge) throws CrudException { - Edge addedEdge = dao.addEdge(edge.getType(), edge.getSource(), edge.getTarget(), edge.getProperties()); + Edge addedEdge = dao.addEdge(edge.getType(), edge.getSource(), edge.getTarget(), edge.getProperties(), version); return CrudResponseBuilder .buildUpsertEdgeResponse(RelationshipSchemaValidator.validateOutgoingPayload(version, addedEdge), version); } @@ -69,13 +69,13 @@ public class CrudGraphDataService extends AbstractGraphDataService { } private String updateVertex(String version, Vertex vertex) throws CrudException { - Vertex updatedVertex = dao.updateVertex(vertex.getId().get(), vertex.getType(), vertex.getProperties()); + Vertex updatedVertex = dao.updateVertex(vertex.getId().get(), vertex.getType(), vertex.getProperties(), version); return CrudResponseBuilder .buildUpsertVertexResponse(OxmModelValidator.validateOutgoingPayload(version, updatedVertex), version); } public String patchVertex(String version, String id, String type, VertexPayload payload) throws CrudException { - Vertex existingVertex = dao.getVertex(id, OxmModelValidator.resolveCollectionType(version, type)); + Vertex existingVertex = dao.getVertex(id, OxmModelValidator.resolveCollectionType(version, type), version); Vertex vertex = OxmModelValidator.validateIncomingPatchPayload(id, version, type, payload.getProperties(), existingVertex); return updateVertex(version, vertex); @@ -112,18 +112,18 @@ public class CrudGraphDataService extends AbstractGraphDataService { } - public Vertex getVertex(String id) throws CrudException { - return dao.getVertex(id); + public Vertex getVertex(String id, String version) throws CrudException { + return dao.getVertex(id, version); } @Override protected Vertex addBulkVertex(Vertex vertex, String version, String dbTransId) throws CrudException { - return dao.addVertex(vertex.getType(), vertex.getProperties(), dbTransId); + return dao.addVertex(vertex.getType(), vertex.getProperties(), version, dbTransId); } @Override protected Vertex updateBulkVertex(Vertex vertex, String id, String version, String dbTransId) throws CrudException { - return dao.updateVertex(id, vertex.getType(), vertex.getProperties(), dbTransId); + return dao.updateVertex(id, vertex.getType(), vertex.getProperties(), version, dbTransId); } @Override @@ -133,7 +133,7 @@ public class CrudGraphDataService extends AbstractGraphDataService { @Override protected Edge addBulkEdge(Edge edge, String version, String dbTransId) throws CrudException { - return dao.addEdge(edge.getType(), edge.getSource(), edge.getTarget(), edge.getProperties(), dbTransId); + return dao.addEdge(edge.getType(), edge.getSource(), edge.getTarget(), edge.getProperties(), version, dbTransId); } @Override |