From 908b4693e5a0a4c2f323dbf518b35e4620f183a1 Mon Sep 17 00:00:00 2001 From: "Bansal, Nitin (nb121v)" Date: Mon, 20 Nov 2017 16:02:06 -0500 Subject: Refactor to move from openecomp to onap Refactor to move from openecomp to onap IssueID: AAI-486 Change-Id: I1d5634739514acf11d5fbdf5e2c7865aaccd864e Signed-off-by: Bansal, Nitin (nb121v) --- .../java/org/openecomp/crud/event/GraphEvent.java | 235 --------------------- .../org/openecomp/crud/event/GraphEventEdge.java | 212 ------------------- .../org/openecomp/crud/event/GraphEventVertex.java | 181 ---------------- 3 files changed, 628 deletions(-) delete mode 100644 src/main/java/org/openecomp/crud/event/GraphEvent.java delete mode 100644 src/main/java/org/openecomp/crud/event/GraphEventEdge.java delete mode 100644 src/main/java/org/openecomp/crud/event/GraphEventVertex.java (limited to 'src/main/java/org/openecomp/crud/event') diff --git a/src/main/java/org/openecomp/crud/event/GraphEvent.java b/src/main/java/org/openecomp/crud/event/GraphEvent.java deleted file mode 100644 index 392bf2d..0000000 --- a/src/main/java/org/openecomp/crud/event/GraphEvent.java +++ /dev/null @@ -1,235 +0,0 @@ -/** - * ============LICENSE_START======================================================= - * Gizmo - * ================================================================================ - * Copyright © 2017 AT&T Intellectual Property. - * Copyright © 2017 Amdocs - * All rights reserved. - * ================================================================================ - * 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 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * 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.openecomp.crud.event; - -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.annotations.SerializedName; - -import org.openecomp.crud.exception.CrudException; - -import javax.ws.rs.core.Response.Status; - -public class GraphEvent { - - public enum GraphEventOperation { - CREATE, UPDATE, DELETE - } - - public enum GraphEventResult { - SUCCESS, FAILURE - } - - private GraphEventOperation operation; - - @SerializedName("transaction-id") - private String transactionId; - - private long timestamp; - - private GraphEventVertex vertex; - - private GraphEventEdge edge; - - private GraphEventResult result; - - @SerializedName("error-message") - private String errorMessage; - - private Status httpErrorStatus; - - /** - * Marshaller/unmarshaller for converting to/from JSON. - */ - private static final Gson gson = new GsonBuilder().disableHtmlEscaping() - .setPrettyPrinting().create(); - - public static Builder builder(GraphEventOperation operation) { - return new Builder(operation); - } - - public GraphEventOperation getOperation() { - return operation; - } - - public String getTransactionId() { - return transactionId; - } - - public long getTimestamp() { - return timestamp; - } - - public GraphEventVertex getVertex() { - return vertex; - } - - public GraphEventEdge getEdge() { - return edge; - } - - public GraphEventResult getResult() { - return result; - } - - public String getErrorMessage() { - return errorMessage; - } - - public void setResult(GraphEventResult result) { - this.result = result; - } - - - public Status getHttpErrorStatus() { - return httpErrorStatus; - } - - public void setHttpErrorStatus(Status httpErrorStatus) { - this.httpErrorStatus = httpErrorStatus; - } - - public void setTimestamp(long timestamp) { - this.timestamp = timestamp; - } - - public void setErrorMessage(String errorMessage) { - this.errorMessage = errorMessage; - } - - public void setVertex(GraphEventVertex vertex) { - this.vertex = vertex; - } - - public void setEdge(GraphEventEdge edge) { - this.edge = edge; - } - - /** - * Unmarshalls this Vertex object into a JSON string. - * - * @return - A JSON format string representation of this Vertex. - */ - public String toJson() { - return gson.toJson(this); - } - - /** - * Marshalls the provided JSON string into a Vertex object. - * - * @param json - The JSON string to produce the Vertex from. - * @return - A Vertex object. - * @throws SpikeException - */ - public static GraphEvent fromJson(String json) throws CrudException { - - try { - - // Make sure that we were actually provided a non-empty string - // before we - // go any further. - if (json == null || json.isEmpty()) { - throw new CrudException("Empty or null JSON string.", Status.BAD_REQUEST); - } - - // Marshall the string into a Vertex object. - return gson.fromJson(json, GraphEvent.class); - - } catch (Exception ex) { - throw new CrudException("Unable to parse JSON string: ", Status.BAD_REQUEST); - } - } - - @Override - public String toString() { - - return toJson(); - } - - public String getObjectKey() { - if (this.getVertex() != null) { - return this.getVertex().getId(); - } else if (this.getEdge() != null) { - return this.getEdge().getId(); - } - - return null; - - } - - public String getObjectType() { - if (this.getVertex() != null) { - return "vertex->" + this.getVertex().getType(); - } else if (this.getEdge() != null) { - return "edge->" + this.getEdge().getType(); - } - - return null; - - } - - public static class Builder { - - GraphEvent event = null; - - public Builder(GraphEventOperation operation) { - event = new GraphEvent(); - event.operation = operation; - } - - public Builder vertex(GraphEventVertex vertex) { - event.vertex = vertex; - return this; - } - - public Builder edge(GraphEventEdge edge) { - event.edge = edge; - return this; - } - - public Builder result(GraphEventResult result) { - event.result = result; - return this; - } - - public Builder errorMessage(String errorMessage) { - event.errorMessage = errorMessage; - return this; - } - - public Builder httpErrorStatus(Status httpErrorStatus) { - event.httpErrorStatus = httpErrorStatus; - return this; - } - - public GraphEvent build() { - - event.timestamp = System.currentTimeMillis(); - event.transactionId = java.util.UUID.randomUUID().toString(); - - return event; - } - } - -} diff --git a/src/main/java/org/openecomp/crud/event/GraphEventEdge.java b/src/main/java/org/openecomp/crud/event/GraphEventEdge.java deleted file mode 100644 index aaf9b72..0000000 --- a/src/main/java/org/openecomp/crud/event/GraphEventEdge.java +++ /dev/null @@ -1,212 +0,0 @@ -/** - * ============LICENSE_START======================================================= - * Gizmo - * ================================================================================ - * Copyright © 2017 AT&T Intellectual Property. - * Copyright © 2017 Amdocs - * All rights reserved. - * ================================================================================ - * 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 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * 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.openecomp.crud.event; - -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.annotations.SerializedName; -import com.google.gson.reflect.TypeToken; - -import org.openecomp.crud.entity.Edge; -import org.openecomp.crud.entity.Vertex; -import org.openecomp.crud.exception.CrudException; - -import java.util.Map; -import javax.ws.rs.core.Response.Status; - -/** - * This class provides a generic representation of an Edge as provided by the - * graph data store. - */ -public class GraphEventEdge { - - /** - * The unique identifier used to identify this edge in the graph data store. - */ - @SerializedName("key") - private String id; - - @SerializedName("schema-version") - private String modelVersion; - - /** - * Type label assigned to this vertex. - */ - private String type; - - /** - * Source vertex for our edge. - */ - private GraphEventVertex source; - - /** - * Target vertex for our edge. - */ - private GraphEventVertex target; - - /** - * Map of all of the properties assigned to this vertex. - */ - private JsonElement properties; - - /** - * Marshaller/unmarshaller for converting to/from JSON. - */ - private static final Gson gson = new GsonBuilder().disableHtmlEscaping().create(); - - public GraphEventEdge(String id, String modelVersion, String type, GraphEventVertex source, - GraphEventVertex target, JsonElement properties) { - this.id = id; - this.modelVersion = modelVersion; - this.type = type; - this.source = source; - this.target = target; - this.properties = properties; - } - - public GraphEventEdge() { - - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public GraphEventVertex getSource() { - return source; - } - - public void setSource(GraphEventVertex source) { - this.source = source; - } - - public GraphEventVertex getTarget() { - return target; - } - - public void setTarget(GraphEventVertex target) { - this.target = target; - } - - public JsonElement getProperties() { - return properties; - } - - public void setProperties(JsonElement properties) { - this.properties = properties; - } - - public String getModelVersion() { - return modelVersion; - } - - public void setModelVersion(String modelVersion) { - this.modelVersion = modelVersion; - } - - /** - * Unmarshalls this Edge object into a JSON string. - * - * @return - A JSON format string representation of this Edge. - */ - public String toJson() { - return gson.toJson(this); - } - - /** - * Marshalls the provided JSON string into a Edge object. - * - * @param json - The JSON string to produce the Edge from. - * @return - A Edge object. - * @throws SpikeException - */ - public static GraphEventEdge fromJson(String json) throws CrudException { - - try { - - // Make sure that we were actually provided a non-empty string - // before we - // go any further. - if (json == null || json.isEmpty()) { - throw new CrudException("Unable to parse JSON string: ", Status.BAD_REQUEST); - } - - // Marshall the string into an Edge object. - return gson.fromJson(json, GraphEventEdge.class); - - } catch (Exception ex) { - throw new CrudException("Unable to parse JSON string: ", Status.BAD_REQUEST); - } - } - - public static GraphEventEdge fromEdge(Edge edge, String modelVersion) { - - java.lang.reflect.Type mapType = new TypeToken>() {}.getType(); - JsonObject props = gson.toJsonTree(edge.getProperties(), mapType).getAsJsonObject(); - - GraphEventEdge graphEventEdge = new GraphEventEdge(edge.getId().orElse(""), modelVersion, - edge.getType(), new GraphEventVertex(edge.getSource().getId().orElse(""), null, - edge.getSource().getType(), null), new GraphEventVertex(edge.getTarget().getId().orElse(""), - null, edge.getTarget().getType(), null), props); - - return graphEventEdge; - - } - - public Edge toEdge() { - Edge.Builder builder = new Edge.Builder(this.getType()).id(this.getId()); - if (this.getSource() != null) { - builder.source(new Vertex.Builder(this.getSource().getType()).id(this.getSource().getId()) - .build()); - } - if (this.getTarget() != null) { - builder.target(new Vertex.Builder(this.getTarget().getType()).id(this.getTarget().getId()) - .build()); - } - - if (this.getProperties() != null) { - java.lang.reflect.Type mapType = new TypeToken>() {}.getType(); - Map propertiesMap = gson.fromJson(this.getProperties(), mapType); - for (String key : propertiesMap.keySet()) { - builder.property(key, propertiesMap.get(key)); - } - } - return builder.build(); - - } -} diff --git a/src/main/java/org/openecomp/crud/event/GraphEventVertex.java b/src/main/java/org/openecomp/crud/event/GraphEventVertex.java deleted file mode 100644 index 7fde12a..0000000 --- a/src/main/java/org/openecomp/crud/event/GraphEventVertex.java +++ /dev/null @@ -1,181 +0,0 @@ -/** - * ============LICENSE_START======================================================= - * Gizmo - * ================================================================================ - * Copyright © 2017 AT&T Intellectual Property. - * Copyright © 2017 Amdocs - * All rights reserved. - * ================================================================================ - * 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 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * 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.openecomp.crud.event; - -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.annotations.SerializedName; -import com.google.gson.reflect.TypeToken; - -import org.openecomp.crud.entity.Vertex; -import org.openecomp.crud.exception.CrudException; - -import java.util.Map; -import javax.ws.rs.core.Response.Status; - -/** - * This class provides a generic representation of a Vertex as provided by the - * graph data store. - */ -public class GraphEventVertex { - - /** - * The unique identifier used to identify this vertex in the graph data - * store. - */ - @SerializedName("key") - private String id; - - @SerializedName("schema-version") - private String modelVersion; - - /** - * Type label assigned to this vertex. - */ - private String type; - - /** - * Map of all of the properties assigned to this vertex. - */ - private JsonElement properties; - - /** - * Marshaller/unmarshaller for converting to/from JSON. - */ - private static final Gson gson = new GsonBuilder().disableHtmlEscaping().create(); - - public GraphEventVertex(String id, String modelVersion, String type, JsonElement properties) { - this.id = id; - this.modelVersion = modelVersion; - this.type = type; - this.properties = properties; - } - - public GraphEventVertex() { - - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - - public JsonElement getProperties() { - return properties; - } - - public void setProperties(JsonElement properties) { - this.properties = properties; - } - - public String getModelVersion() { - return modelVersion; - } - - public void setModelVersion(String modelVersion) { - this.modelVersion = modelVersion; - } - - /** - * Unmarshalls this Vertex object into a JSON string. - * - * @return - A JSON format string representation of this Vertex. - */ - public String toJson() { - return gson.toJson(this); - } - - /** - * Marshalls the provided JSON string into a Vertex object. - * - * @param json - The JSON string to produce the Vertex from. - * @return - A Vertex object. - * @throws SpikeException - */ - public static GraphEventVertex fromJson(String json) throws CrudException { - - try { - - // Make sure that we were actually provided a non-empty string - // before we - // go any further. - if (json == null || json.isEmpty()) { - throw new CrudException("Empty or null JSON string.", Status.BAD_REQUEST); - } - - // Marshall the string into a Vertex object. - return gson.fromJson(json, GraphEventVertex.class); - - } catch (Exception ex) { - throw new CrudException("Unable to parse JSON string: ", Status.BAD_REQUEST); - } - } - - @Override - public String toString() { - - return toJson(); - } - - public static GraphEventVertex fromVertex(Vertex vertex, String modelVersion) { - - java.lang.reflect.Type mapType = new TypeToken>() {}.getType(); - JsonObject props = gson.toJsonTree(vertex.getProperties(), mapType).getAsJsonObject(); - GraphEventVertex graphEventVertex = new GraphEventVertex(vertex.getId().orElse(""), - modelVersion, vertex.getType(), props); - return graphEventVertex; - - } - - public Vertex toVertex() { - Vertex.Builder builder = new Vertex.Builder(this.getType()).id(this.getId()); - - if (this.getProperties() != null) { - java.lang.reflect.Type mapType = new TypeToken>() {}.getType(); - Map propertiesMap = gson.fromJson(this.getProperties(), mapType); - for (String key : propertiesMap.keySet()) { - builder.property(key, propertiesMap.get(key)); - } - } - - return builder.build(); - - } - - -} -- cgit 1.2.3-korg