From eabf0a08faa6581c88c2e4ca5be56d4630891046 Mon Sep 17 00:00:00 2001 From: Gurjeet Bedi Date: Sun, 7 Jan 2018 21:07:50 -0500 Subject: OXM which tracks provenance Support for source-of-truth and last-mod-source-of-truth Issue-ID: AAI-482 Change-Id: Idc7ec47c0561f2dad6f930d0ac0dd3fff9585b4f Signed-off-by: Gurjeet Bedi --- .../org/onap/crud/service/CrudRestService.java | 62 +++------------------- 1 file changed, 8 insertions(+), 54 deletions(-) (limited to 'src/main/java/org/onap/crud/service/CrudRestService.java') diff --git a/src/main/java/org/onap/crud/service/CrudRestService.java b/src/main/java/org/onap/crud/service/CrudRestService.java index b9161a1..fcf19c0 100644 --- a/src/main/java/org/onap/crud/service/CrudRestService.java +++ b/src/main/java/org/onap/crud/service/CrudRestService.java @@ -24,14 +24,10 @@ package org.onap.crud.service; import java.security.cert.X509Certificate; -import java.util.AbstractMap; import java.util.ArrayList; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; import javax.security.auth.x500.X500Principal; import javax.servlet.http.HttpServletRequest; @@ -55,16 +51,14 @@ import org.apache.cxf.jaxrs.ext.PATCH; import org.onap.aaiauth.auth.Auth; import org.onap.aai.cl.api.Logger; import org.onap.aai.cl.eelf.LoggerFactory; -import org.onap.aai.db.props.AAIProperties; import org.onap.crud.exception.CrudException; import org.onap.crud.logging.CrudServiceMsgs; import org.onap.crud.logging.LoggingUtil; import org.onap.crud.util.CrudServiceConstants; +import org.onap.crud.util.CrudServiceUtil; import org.slf4j.MDC; -import com.google.gson.Gson; import com.google.gson.JsonElement; -import com.google.gson.JsonPrimitive; public class CrudRestService { @@ -73,8 +67,6 @@ public class CrudRestService { Logger auditLogger = LoggerFactory.getInstance().getAuditLogger(CrudRestService.class.getName()); private Auth auth; - Gson gson = new Gson(); - private String mediaType = MediaType.APPLICATION_JSON; public static final String HTTP_PATCH_METHOD_OVERRIDE = "X-HTTP-Method-Override"; @@ -335,7 +327,7 @@ public class CrudRestService { } String result; - payload.setProperties(mergeHeaderInFoToPayload(payload.getProperties(), headers, false)); + payload.setProperties(CrudServiceUtil.mergeHeaderInFoToPayload(payload.getProperties(), headers, false)); if (headers.getRequestHeaders().getFirst(HTTP_PATCH_METHOD_OVERRIDE) != null && headers.getRequestHeaders().getFirst(HTTP_PATCH_METHOD_OVERRIDE).equalsIgnoreCase("PATCH")) { @@ -381,7 +373,7 @@ public class CrudRestService { throw new CrudException("ID Mismatch", Status.BAD_REQUEST); } - payload.setProperties(mergeHeaderInFoToPayload(payload.getProperties(), headers, false)); + payload.setProperties(CrudServiceUtil.mergeHeaderInFoToPayload(payload.getProperties(), headers, false)); String result = graphDataService.patchVertex(version, id, type, payload); response = Response.status(Status.OK).entity(result).type(mediaType).build(); @@ -426,7 +418,7 @@ public class CrudRestService { throw new CrudException("Vertex Type mismatch", Status.BAD_REQUEST); } - payload.setProperties(mergeHeaderInFoToPayload(payload.getProperties(), headers, true)); + payload.setProperties(CrudServiceUtil.mergeHeaderInFoToPayload(payload.getProperties(), headers, true)); String result = graphDataService.addVertex(version, type, payload); response = Response.status(Status.CREATED).entity(result).type(mediaType).build(); @@ -443,47 +435,6 @@ public class CrudRestService { return response; } - private JsonElement mergeHeaderInFoToPayload(JsonElement propertiesFromRequest, HttpHeaders headers, boolean isAdd) { - if(!headers.getRequestHeaders().containsKey("X-FromAppId")) - return propertiesFromRequest; - - String sourceOfTruth = headers.getRequestHeaders().getFirst("X-FromAppId"); - Set> properties = new HashSet>(); - properties.addAll(propertiesFromRequest.getAsJsonObject().entrySet()); - - Set propertyKeys = new HashSet(); - for(Map.Entry property : properties) { - propertyKeys.add(property.getKey()); - } - - if(!propertyKeys.contains(AAIProperties.LAST_MOD_SOURCE_OF_TRUTH)) { - properties.add(new AbstractMap.SimpleEntry(AAIProperties.LAST_MOD_SOURCE_OF_TRUTH, - (JsonElement)(new JsonPrimitive(sourceOfTruth)))); - } - - if(isAdd && !propertyKeys.contains(AAIProperties.SOURCE_OF_TRUTH)) { - properties.add(new AbstractMap.SimpleEntry(AAIProperties.SOURCE_OF_TRUTH, - (JsonElement)(new JsonPrimitive(sourceOfTruth)))); - } - - Object[] propArray = properties.toArray(); - StringBuilder sb = new StringBuilder(); - sb.append("{"); - boolean first=true; - for(int i=0; i entry = (Entry) propArray[i]; - if(!first) { - sb.append(","); - } - sb.append("\"").append(entry.getKey()).append("\"").append(":").append(entry.getValue()); - first=false; - } - sb.append("}"); - - return gson.fromJson(sb.toString(), JsonElement.class); - } - private void validateBulkPayload(BulkPayload payload) throws CrudException { List vertices = new ArrayList(); List edges = new ArrayList(); @@ -608,7 +559,7 @@ public class CrudRestService { } validateBulkPayload(payload); - String result = graphDataService.addBulk(version, payload); + String result = graphDataService.addBulk(version, payload, headers); response = Response.status(Status.OK).entity(result).type(mediaType).build(); } catch (CrudException ce) { response = Response.status(ce.getHttpStatus()).entity(ce.getMessage()).build(); @@ -649,6 +600,9 @@ public class CrudRestService { if (payload.getType() == null || payload.getType().isEmpty()) { throw new CrudException("Missing Vertex Type ", Status.BAD_REQUEST); } + + payload.setProperties(CrudServiceUtil.mergeHeaderInFoToPayload(payload.getProperties(), headers, true)); + String result = graphDataService.addVertex(version, payload.getType(), payload); response = Response.status(Status.CREATED).entity(result).type(mediaType).build(); } catch (CrudException ce) { -- cgit 1.2.3-korg