X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fcrud%2Fservice%2FAbstractGraphDataService.java;h=8225adf24c686daac5304d3c610f6418bf26597d;hb=0c40bcde9facc109ceb8dabb91156df2b4fb4129;hp=ef276a3f562a4417a5e46ffb984ce6428c4cfbc7;hpb=a0e716dc093cd8a4a4ec8aaca7bc1635e518527a;p=aai%2Fgizmo.git diff --git a/src/main/java/org/onap/crud/service/AbstractGraphDataService.java b/src/main/java/org/onap/crud/service/AbstractGraphDataService.java index ef276a3..8225adf 100644 --- a/src/main/java/org/onap/crud/service/AbstractGraphDataService.java +++ b/src/main/java/org/onap/crud/service/AbstractGraphDataService.java @@ -1,16 +1,15 @@ /** * ============LICENSE_START======================================================= - * Gizmo + * org.onap.aai * ================================================================================ - * Copyright © 2017 AT&T Intellectual Property. - * Copyright © 2017 Amdocs - * All rights reserved. + * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright © 2017-2018 Amdocs * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -18,21 +17,27 @@ * See the License for the specific language governing permissions and * limitations under the License. * ============LICENSE_END========================================================= - * - * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ package org.onap.crud.service; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonElement; +import com.google.gson.reflect.TypeToken; import java.util.ArrayList; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; - +import java.util.Set; +import javax.ws.rs.core.EntityTag; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response.Status; - +import net.dongliu.gson.GsonJava8TypeAdapterFactory; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.onap.aai.restclient.client.OperationResult; import org.onap.crud.dao.GraphDao; +import org.onap.crud.dao.champ.ChampEdgeSerializer; +import org.onap.crud.dao.champ.ChampVertexSerializer; import org.onap.crud.entity.Edge; import org.onap.crud.entity.Vertex; import org.onap.crud.exception.CrudException; @@ -41,50 +46,58 @@ import org.onap.crud.util.CrudServiceUtil; import org.onap.schema.OxmModelValidator; import org.onap.schema.RelationshipSchemaValidator; -import com.google.gson.JsonElement; - public abstract class AbstractGraphDataService { + protected GraphDao daoForGet; protected GraphDao dao; - - public AbstractGraphDataService(GraphDao dao) throws CrudException { - this.dao = dao; - CrudServiceUtil.loadModels(); + public AbstractGraphDataService() throws CrudException { } - - 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 ImmutablePair getEdge(String version, String id, String type, Map queryParams) throws CrudException { + RelationshipSchemaValidator.validateType(version, type); + OperationResult operationResult = daoForGet.getEdge(id, type, queryParams); + EntityTag entityTag = CrudServiceUtil.getETagFromHeader(operationResult.getHeaders()); + Edge edge = Edge.fromJson(operationResult.getResult()); + return new ImmutablePair<>(entityTag, CrudResponseBuilder.buildGetEdgeResponse(RelationshipSchemaValidator.validateOutgoingPayload(version, edge), version)); } - - public String getEdges(String version, String type, Map filter) throws CrudException { + + public ImmutablePair getEdges(String version, String type, Map filter) throws CrudException { + Gson champGson = new GsonBuilder() + .registerTypeAdapterFactory(new GsonJava8TypeAdapterFactory()) + .registerTypeAdapter(Vertex.class, new ChampVertexSerializer()) + .registerTypeAdapter(Edge.class, new ChampEdgeSerializer()).create(); RelationshipSchemaValidator.validateType(version, type); - List items = dao.getEdges(type, RelationshipSchemaValidator.resolveCollectionfilter(version, type, filter)); - return CrudResponseBuilder.buildGetEdgesResponse(items, version); + OperationResult operationResult = daoForGet.getEdges(type, RelationshipSchemaValidator.resolveCollectionfilter(version, type, filter)); + List items = champGson.fromJson(operationResult.getResult(), new TypeToken>() { + }.getType()); + EntityTag entityTag = CrudServiceUtil.getETagFromHeader(operationResult.getHeaders()); + return new ImmutablePair<>(entityTag, CrudResponseBuilder.buildGetEdgesResponse(items, version)); } - - public String getVertex(String version, String id, String type) throws CrudException { + + public ImmutablePair getVertex(String version, String id, String type, Map queryParams) throws CrudException { type = OxmModelValidator.resolveCollectionType(version, type); - Vertex vertex = dao.getVertex(id, type); - List edges = dao.getVertexEdges(id); - return CrudResponseBuilder.buildGetVertexResponse(OxmModelValidator.validateOutgoingPayload(version, vertex), edges, - version); + OperationResult vertexOpResult = daoForGet.getVertex(id, type, version, queryParams); + Vertex vertex = Vertex.fromJson(vertexOpResult.getResult(), version); + List edges = daoForGet.getVertexEdges(id, queryParams, null); + EntityTag entityTag = CrudServiceUtil.getETagFromHeader(vertexOpResult.getHeaders()); + return new ImmutablePair<>(entityTag, CrudResponseBuilder.buildGetVertexResponse(OxmModelValidator.validateOutgoingPayload(version, vertex), edges, + version)); } - public String getVertices(String version, String type, Map filter, HashSet properties) throws CrudException { + public ImmutablePair getVertices(String version, String type, Map filter, Set properties) throws CrudException { type = OxmModelValidator.resolveCollectionType(version, type); - List items = dao.getVertices(type, OxmModelValidator.resolveCollectionfilter(version, type, filter), properties); - return CrudResponseBuilder.buildGetVerticesResponse(items, version); + OperationResult operationResult = daoForGet.getVertices(type, OxmModelValidator.resolveCollectionfilter(version, type, filter), properties, version); + List vertices = Vertex.collectionFromJson(operationResult.getResult(), version); + EntityTag entityTag = CrudServiceUtil.getETagFromHeader(operationResult.getHeaders()); + return new ImmutablePair<>(entityTag, CrudResponseBuilder.buildGetVerticesResponse(vertices, version)); } - + public String addBulk(String version, BulkPayload payload, HttpHeaders headers) throws CrudException { - HashMap vertices = new HashMap(); - HashMap edges = new HashMap(); + HashMap vertices = new HashMap<>(); + HashMap edges = new HashMap<>(); + + String txId = dao.openTransaction(); - String txId = dao.openTransaction(); - try { // Step 1. Handle edge deletes (must happen before vertex deletes) for (JsonElement v : payload.getRelationships()) { @@ -99,11 +112,10 @@ public abstract class AbstractGraphDataService { EdgePayload edgePayload = EdgePayload.fromJson(item.getValue().getAsJsonObject().toString()); if (opr.getValue().getAsString().equalsIgnoreCase("delete")) { - RelationshipSchemaValidator.validateType(version, edgePayload.getType()); - deleteBulkEdge(edgePayload.getId(), version, edgePayload.getType(), txId); + deleteBulkEdge(edgePayload.getId(), version, txId); } - } - + } + // Step 2: Handle vertex deletes for (JsonElement v : payload.getObjects()) { List> entries = new ArrayList>( @@ -122,7 +134,7 @@ public abstract class AbstractGraphDataService { deleteBulkVertex(vertexPayload.getId(), version, type, txId); } } - + // Step 3: Handle vertex add/modify (must happen before edge adds) for (JsonElement v : payload.getObjects()) { List> entries = new ArrayList>( @@ -134,21 +146,21 @@ public abstract class AbstractGraphDataService { Map.Entry opr = entries.get(0); Map.Entry item = entries.get(1); VertexPayload vertexPayload = VertexPayload.fromJson(item.getValue().getAsJsonObject().toString()); - + // Add vertex if (opr.getValue().getAsString().equalsIgnoreCase("add")) { - vertexPayload.setProperties(CrudServiceUtil.mergeHeaderInFoToPayload(vertexPayload.getProperties(), - headers, true)); + vertexPayload.setProperties(CrudServiceUtil.mergeHeaderInFoToPayload(vertexPayload.getProperties(), + headers, true)); Vertex validatedVertex = OxmModelValidator.validateIncomingUpsertPayload(null, version, vertexPayload.getType(), vertexPayload.getProperties()); Vertex persistedVertex = addBulkVertex(validatedVertex, version, txId); Vertex outgoingVertex = OxmModelValidator.validateOutgoingPayload(version, persistedVertex); vertices.put(item.getKey(), outgoingVertex); } - - // Update vertex + + // Update vertex else if (opr.getValue().getAsString().equalsIgnoreCase("modify")) { - vertexPayload.setProperties(CrudServiceUtil.mergeHeaderInFoToPayload(vertexPayload.getProperties(), + vertexPayload.setProperties(CrudServiceUtil.mergeHeaderInFoToPayload(vertexPayload.getProperties(), headers, false)); Vertex validatedVertex = OxmModelValidator.validateIncomingUpsertPayload(vertexPayload.getId(), version, vertexPayload.getType(), vertexPayload.getProperties()); @@ -156,18 +168,19 @@ public abstract class AbstractGraphDataService { Vertex outgoingVertex = OxmModelValidator.validateOutgoingPayload(version, persistedVertex); vertices.put(item.getKey(), outgoingVertex); } - - // Patch vertex + + // Patch vertex else if (opr.getValue().getAsString().equalsIgnoreCase("patch")) { if ( (vertexPayload.getId() == null) || (vertexPayload.getType() == null) ) { throw new CrudException("id and type must be specified for patch request", Status.BAD_REQUEST); } - - vertexPayload.setProperties(CrudServiceUtil.mergeHeaderInFoToPayload(vertexPayload.getProperties(), + + vertexPayload.setProperties(CrudServiceUtil.mergeHeaderInFoToPayload(vertexPayload.getProperties(), headers, false)); - - Vertex existingVertex = dao.getVertex(vertexPayload.getId(), OxmModelValidator.resolveCollectionType(version, vertexPayload.getType())); - Vertex validatedVertex = OxmModelValidator.validateIncomingPatchPayload(vertexPayload.getId(), + + OperationResult existingVertexOpResult = dao.getVertex(vertexPayload.getId(), OxmModelValidator.resolveCollectionType(version, vertexPayload.getType()), version, new HashMap()); + Vertex existingVertex = Vertex.fromJson(existingVertexOpResult.getResult(), version); + Vertex validatedVertex = OxmModelValidator.validateIncomingPatchPayload(vertexPayload.getId(), version, vertexPayload.getType(), vertexPayload.getProperties(), existingVertex); Vertex persistedVertex = updateBulkVertex(validatedVertex, vertexPayload.getId(), version, txId); Vertex outgoingVertex = OxmModelValidator.validateOutgoingPayload(version, persistedVertex); @@ -175,7 +188,7 @@ public abstract class AbstractGraphDataService { } } - // Step 4: Handle edge add/modify + // Step 4: Handle edge add/modify for (JsonElement v : payload.getRelationships()) { List> entries = new ArrayList>( v.getAsJsonObject().entrySet()); @@ -189,7 +202,7 @@ public abstract class AbstractGraphDataService { // Add/Update edge if (opr.getValue().getAsString().equalsIgnoreCase("add") - || opr.getValue().getAsString().equalsIgnoreCase("modify") + || opr.getValue().getAsString().equalsIgnoreCase("modify") || opr.getValue().getAsString().equalsIgnoreCase("patch")) { Edge validatedEdge; Edge persistedEdge; @@ -213,28 +226,47 @@ public abstract class AbstractGraphDataService { edgePayload .setTarget("services/inventory/" + version + "/" + target.getType() + "/" + target.getId().get()); } - validatedEdge = RelationshipSchemaValidator.validateIncomingAddPayload(version, edgePayload.getType(), - edgePayload); + + // If the type isn't set, resolve it based on on the sourece and target vertex types + if (edgePayload.getType() == null || edgePayload.getType().isEmpty()) { + edgePayload.setType(CrudServiceUtil.determineEdgeType(edgePayload, version)); + } + + validatedEdge = RelationshipSchemaValidator.validateIncomingAddPayload(version, edgePayload.getType(),edgePayload); + persistedEdge = addBulkEdge(validatedEdge, version, txId); } else if (opr.getValue().getAsString().equalsIgnoreCase("modify")) { - Edge edge = dao.getEdge(edgePayload.getId(), edgePayload.getType(), txId); + Edge edge = dao.getEdge(edgePayload.getId(), txId); + + // If the type isn't set, resolve it based on on the sourece and target vertex types + if (edgePayload.getType() == null || edgePayload.getType().isEmpty()) { + edgePayload.setType(edge.getType()); + } + validatedEdge = RelationshipSchemaValidator.validateIncomingUpdatePayload(edge, version, edgePayload); + persistedEdge = updateBulkEdge(validatedEdge, version, txId); } else { - if ( (edgePayload.getId() == null) || (edgePayload.getType() == null) ) { - throw new CrudException("id and type must be specified for patch request", Status.BAD_REQUEST); + if (edgePayload.getId() == null) { + throw new CrudException("id must be specified for patch request", Status.BAD_REQUEST); + } + Edge existingEdge = dao.getEdge(edgePayload.getId(), txId); + + // If the type isn't set, resolve it based on on the sourece and target vertex types + if (edgePayload.getType() == null || edgePayload.getType().isEmpty()) { + edgePayload.setType(existingEdge.getType()); } - Edge existingEdge = dao.getEdge(edgePayload.getId(), edgePayload.getType(), txId); + Edge patchedEdge = RelationshipSchemaValidator.validateIncomingPatchPayload(existingEdge, version, edgePayload); persistedEdge = updateBulkEdge(patchedEdge, version, txId); } - + Edge outgoingEdge = RelationshipSchemaValidator.validateOutgoingPayload(version, persistedEdge); edges.put(item.getKey(), outgoingEdge); - } - } - + } + } + // commit transaction dao.commitTransaction(txId); } catch (CrudException ex) { @@ -248,25 +280,32 @@ public abstract class AbstractGraphDataService { dao.rollbackTransaction(txId); } } - + return CrudResponseBuilder.buildUpsertBulkResponse(vertices, edges, version, payload); } - public abstract String addVertex(String version, String type, VertexPayload payload) throws CrudException; - public abstract String updateVertex(String version, String id, String type, VertexPayload payload) throws CrudException; - public abstract String patchVertex(String version, String id, String type, VertexPayload payload) throws CrudException; + public abstract ImmutablePair addVertex(String version, String type, VertexPayload payload) + throws CrudException; + public abstract ImmutablePair updateVertex(String version, String id, String type, + VertexPayload payload) throws CrudException; + public abstract ImmutablePair patchVertex(String version, String id, String type, + VertexPayload payload) throws CrudException; public abstract String deleteVertex(String version, String id, String type) throws CrudException; - public abstract String addEdge(String version, String type, EdgePayload payload) throws CrudException; + public abstract ImmutablePair addEdge(String version, String type, EdgePayload payload) + throws CrudException; public abstract String deleteEdge(String version, String id, String type) throws CrudException; - public abstract String updateEdge(String version, String id, String type, EdgePayload payload) throws CrudException; - public abstract String patchEdge(String version, String id, String type, EdgePayload payload) throws CrudException; - + public abstract ImmutablePair updateEdge(String version, String id, String type, + EdgePayload payload) throws CrudException; + public abstract ImmutablePair patchEdge(String version, String id, String type, + EdgePayload payload) throws CrudException; + protected abstract Vertex addBulkVertex(Vertex vertex, String version, String dbTransId) throws CrudException; protected abstract Vertex updateBulkVertex(Vertex vertex, String id, String version, String dbTransId) throws CrudException; protected abstract void deleteBulkVertex(String id, String version, String type, String dbTransId) throws CrudException; - + protected abstract Edge addBulkEdge(Edge edge, String version, String dbTransId) throws CrudException; protected abstract Edge updateBulkEdge(Edge edge, String version, String dbTransId) throws CrudException; - protected abstract void deleteBulkEdge(String id, String version, String type, String dbTransId) throws CrudException; + protected abstract void deleteBulkEdge(String id, String version, String dbTransId) throws CrudException; + }