From 8d9e20f386991373ffbcad3ab5c784fad3deaf34 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Fri, 25 Jan 2013 20:36:20 +0100 Subject: [PATCH] SONAR-2501 second step to fix case of Graphson* classes --- .../org/sonar/core/graph/GraphWriter.java | 6 +- ...nException.java => GraphsonException.java} | 6 +- .../{GraphonMode.java => GraphsonMode.java} | 2 +- ...GraphonReader.java => GraphsonReader.java} | 14 +- ...GraphonTokens.java => GraphsonTokens.java} | 2 +- .../core/graph/graphson/GraphsonUtil.java | 142 +++++++++--------- ...GraphonWriter.java => GraphsonWriter.java} | 16 +- .../graph/graphson/GraphsonReaderTest.java | 42 +++--- .../core/graph/graphson/GraphsonUtilTest.java | 106 ++++++------- .../graph/graphson/GraphsonWriterTest.java | 48 +++--- 10 files changed, 192 insertions(+), 192 deletions(-) rename sonar-core/src/main/java/org/sonar/core/graph/graphson/{GraphonException.java => GraphsonException.java} (85%) rename sonar-core/src/main/java/org/sonar/core/graph/graphson/{GraphonMode.java => GraphsonMode.java} (98%) rename sonar-core/src/main/java/org/sonar/core/graph/graphson/{GraphonReader.java => GraphsonReader.java} (84%) rename sonar-core/src/main/java/org/sonar/core/graph/graphson/{GraphonTokens.java => GraphsonTokens.java} (98%) rename sonar-core/src/main/java/org/sonar/core/graph/graphson/{GraphonWriter.java => GraphsonWriter.java} (84%) diff --git a/sonar-core/src/main/java/org/sonar/core/graph/GraphWriter.java b/sonar-core/src/main/java/org/sonar/core/graph/GraphWriter.java index 72066aee2f4..4c1e178bed8 100644 --- a/sonar-core/src/main/java/org/sonar/core/graph/GraphWriter.java +++ b/sonar-core/src/main/java/org/sonar/core/graph/GraphWriter.java @@ -21,8 +21,8 @@ package org.sonar.core.graph; import com.tinkerpop.blueprints.Graph; import org.apache.commons.io.IOUtils; -import org.sonar.core.graph.graphson.GraphonMode; -import org.sonar.core.graph.graphson.GraphonWriter; +import org.sonar.core.graph.graphson.GraphsonMode; +import org.sonar.core.graph.graphson.GraphsonWriter; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -32,7 +32,7 @@ public class GraphWriter { public String write(Graph graph) { ByteArrayOutputStream output = new ByteArrayOutputStream(); try { - new GraphonWriter().write(graph, output, GraphonMode.COMPACT); + new GraphsonWriter().write(graph, output, GraphsonMode.COMPACT); output.flush(); output.close(); return new String(output.toByteArray()); diff --git a/sonar-core/src/main/java/org/sonar/core/graph/graphson/GraphonException.java b/sonar-core/src/main/java/org/sonar/core/graph/graphson/GraphsonException.java similarity index 85% rename from sonar-core/src/main/java/org/sonar/core/graph/graphson/GraphonException.java rename to sonar-core/src/main/java/org/sonar/core/graph/graphson/GraphsonException.java index 9962fbda3cc..12cc1692a63 100644 --- a/sonar-core/src/main/java/org/sonar/core/graph/graphson/GraphonException.java +++ b/sonar-core/src/main/java/org/sonar/core/graph/graphson/GraphsonException.java @@ -19,12 +19,12 @@ */ package org.sonar.core.graph.graphson; -public class GraphonException extends RuntimeException { - public GraphonException(String message) { +public class GraphsonException extends RuntimeException { + public GraphsonException(String message) { super(message); } - public GraphonException(String message, Throwable cause) { + public GraphsonException(String message, Throwable cause) { super(message, cause); } } diff --git a/sonar-core/src/main/java/org/sonar/core/graph/graphson/GraphonMode.java b/sonar-core/src/main/java/org/sonar/core/graph/graphson/GraphsonMode.java similarity index 98% rename from sonar-core/src/main/java/org/sonar/core/graph/graphson/GraphonMode.java rename to sonar-core/src/main/java/org/sonar/core/graph/graphson/GraphsonMode.java index ecc326fc87a..2ddc49949da 100644 --- a/sonar-core/src/main/java/org/sonar/core/graph/graphson/GraphonMode.java +++ b/sonar-core/src/main/java/org/sonar/core/graph/graphson/GraphsonMode.java @@ -24,7 +24,7 @@ package org.sonar.core.graph.graphson; * * @author Stephen Mallette */ -public enum GraphonMode { +public enum GraphsonMode { /** * COMPACT constructs GraphSON on the assumption that all property keys * are fair game for exclusion including _type, _inV, _outV, _label and _id. diff --git a/sonar-core/src/main/java/org/sonar/core/graph/graphson/GraphonReader.java b/sonar-core/src/main/java/org/sonar/core/graph/graphson/GraphsonReader.java similarity index 84% rename from sonar-core/src/main/java/org/sonar/core/graph/graphson/GraphonReader.java rename to sonar-core/src/main/java/org/sonar/core/graph/graphson/GraphsonReader.java index 525d70b237d..7d0912279a3 100644 --- a/sonar-core/src/main/java/org/sonar/core/graph/graphson/GraphonReader.java +++ b/sonar-core/src/main/java/org/sonar/core/graph/graphson/GraphsonReader.java @@ -33,7 +33,7 @@ import java.util.Set; /** * Greatly inspired by the Blueprints implementation based on Jettison/Jackson */ -public class GraphonReader { +public class GraphsonReader { public Graph read(InputStream jsonInput, Graph toGraph) { return read(jsonInput, toGraph, 1000, null, null); @@ -57,25 +57,25 @@ public class GraphonReader { ElementFactory elementFactory = new ElementFactory(batchGraph); - final GraphonMode mode = GraphonMode.valueOf(json.get(GraphonTokens.MODE).toString()); + final GraphsonMode mode = GraphsonMode.valueOf(json.get(GraphsonTokens.MODE).toString()); GraphsonUtil graphson = new GraphsonUtil(mode, elementFactory, vertexPropertyKeys, edgePropertyKeys); - JSONArray vertices = (JSONArray) json.get(GraphonTokens.VERTICES); + JSONArray vertices = (JSONArray) json.get(GraphsonTokens.VERTICES); for (Object vertice : vertices) { graphson.vertexFromJson((JSONObject) vertice); } - JSONArray edges = (JSONArray) json.get(GraphonTokens.EDGES); + JSONArray edges = (JSONArray) json.get(GraphsonTokens.EDGES); for (Object edgeObject : edges) { JSONObject edge = (JSONObject) edgeObject; - final Vertex inV = batchGraph.getVertex(edge.get(GraphonTokens._IN_V)); - final Vertex outV = batchGraph.getVertex(edge.get(GraphonTokens._OUT_V)); + final Vertex inV = batchGraph.getVertex(edge.get(GraphsonTokens._IN_V)); + final Vertex outV = batchGraph.getVertex(edge.get(GraphsonTokens._OUT_V)); graphson.edgeFromJson(edge, outV, inV); } batchGraph.shutdown(); return toGraph; } catch (Exception e) { - throw new GraphonException("Unable to parse GraphSON", e); + throw new GraphsonException("Unable to parse GraphSON", e); } } } diff --git a/sonar-core/src/main/java/org/sonar/core/graph/graphson/GraphonTokens.java b/sonar-core/src/main/java/org/sonar/core/graph/graphson/GraphsonTokens.java similarity index 98% rename from sonar-core/src/main/java/org/sonar/core/graph/graphson/GraphonTokens.java rename to sonar-core/src/main/java/org/sonar/core/graph/graphson/GraphsonTokens.java index affd04126dd..41cdf51ad82 100644 --- a/sonar-core/src/main/java/org/sonar/core/graph/graphson/GraphonTokens.java +++ b/sonar-core/src/main/java/org/sonar/core/graph/graphson/GraphsonTokens.java @@ -23,7 +23,7 @@ package org.sonar.core.graph.graphson; * @author Marko A. Rodriguez (http://markorodriguez.com) * @author Stephen Mallette */ -class GraphonTokens { +class GraphsonTokens { public static final String VERTEX = "vertex"; public static final String EDGE = "edge"; public static final String _ID = "_id"; diff --git a/sonar-core/src/main/java/org/sonar/core/graph/graphson/GraphsonUtil.java b/sonar-core/src/main/java/org/sonar/core/graph/graphson/GraphsonUtil.java index 069abc8856a..4d9af353308 100644 --- a/sonar-core/src/main/java/org/sonar/core/graph/graphson/GraphsonUtil.java +++ b/sonar-core/src/main/java/org/sonar/core/graph/graphson/GraphsonUtil.java @@ -50,7 +50,7 @@ import static org.sonar.core.graph.graphson.ElementPropertyConfig.ElementPropert */ class GraphsonUtil { - private final GraphonMode mode; + private final GraphsonMode mode; private final Set vertexPropertyKeys; private final Set edgePropertyKeys; private final ElementFactory factory; @@ -69,19 +69,19 @@ class GraphsonUtil { /** * A GraphSONUtiltiy that includes all properties of vertices and edges. */ - GraphsonUtil(GraphonMode mode, ElementFactory factory) { + GraphsonUtil(GraphsonMode mode, ElementFactory factory) { this(mode, factory, ElementPropertyConfig.AllProperties); } /** * A GraphSONUtility that includes the specified properties. */ - GraphsonUtil(GraphonMode mode, ElementFactory factory, + GraphsonUtil(GraphsonMode mode, ElementFactory factory, Set vertexPropertyKeys, Set edgePropertyKeys) { this(mode, factory, ElementPropertyConfig.includeProperties(vertexPropertyKeys, edgePropertyKeys)); } - GraphsonUtil(GraphonMode mode, ElementFactory factory, + GraphsonUtil(GraphsonMode mode, ElementFactory factory, ElementPropertyConfig config) { this.vertexPropertyKeys = config.getVertexPropertyKeys(); this.edgePropertyKeys = config.getEdgePropertyKeys(); @@ -90,15 +90,15 @@ class GraphsonUtil { this.mode = mode; this.factory = factory; - this.hasEmbeddedTypes = mode == GraphonMode.EXTENDED; + this.hasEmbeddedTypes = mode == GraphsonMode.EXTENDED; - this.includeReservedVertexId = includeReservedKey(mode, GraphonTokens._ID, vertexPropertyKeys, this.vertexPropertiesRule); - this.includeReservedEdgeId = includeReservedKey(mode, GraphonTokens._ID, edgePropertyKeys, this.edgePropertiesRule); - this.includeReservedVertexType = includeReservedKey(mode, GraphonTokens._TYPE, vertexPropertyKeys, this.vertexPropertiesRule); - this.includeReservedEdgeType = includeReservedKey(mode, GraphonTokens._TYPE, edgePropertyKeys, this.edgePropertiesRule); - this.includeReservedEdgeLabel = includeReservedKey(mode, GraphonTokens._LABEL, edgePropertyKeys, this.edgePropertiesRule); - this.includeReservedEdgeOutV = includeReservedKey(mode, GraphonTokens._OUT_V, edgePropertyKeys, this.edgePropertiesRule); - this.includeReservedEdgeInV = includeReservedKey(mode, GraphonTokens._IN_V, edgePropertyKeys, this.edgePropertiesRule); + this.includeReservedVertexId = includeReservedKey(mode, GraphsonTokens._ID, vertexPropertyKeys, this.vertexPropertiesRule); + this.includeReservedEdgeId = includeReservedKey(mode, GraphsonTokens._ID, edgePropertyKeys, this.edgePropertiesRule); + this.includeReservedVertexType = includeReservedKey(mode, GraphsonTokens._TYPE, vertexPropertyKeys, this.vertexPropertiesRule); + this.includeReservedEdgeType = includeReservedKey(mode, GraphsonTokens._TYPE, edgePropertyKeys, this.edgePropertiesRule); + this.includeReservedEdgeLabel = includeReservedKey(mode, GraphsonTokens._LABEL, edgePropertyKeys, this.edgePropertiesRule); + this.includeReservedEdgeOutV = includeReservedKey(mode, GraphsonTokens._OUT_V, edgePropertyKeys, this.edgePropertiesRule); + this.includeReservedEdgeInV = includeReservedKey(mode, GraphsonTokens._IN_V, edgePropertyKeys, this.edgePropertiesRule); } /** @@ -108,7 +108,7 @@ class GraphsonUtil { * @param propertyKeys The property keys at the root of the element to serialize. If null, then all keys are serialized. * @param mode the type of GraphSON to be generated. */ - static JSONObject jsonFromElement(Element element, @Nullable Set propertyKeys, GraphonMode mode) { + static JSONObject jsonFromElement(Element element, @Nullable Set propertyKeys, GraphsonMode mode) { GraphsonUtil graphson = element instanceof Edge ? new GraphsonUtil(mode, null, null, propertyKeys) : new GraphsonUtil(mode, null, propertyKeys, null); return graphson.jsonFromElement(element); @@ -121,7 +121,7 @@ class GraphsonUtil { * @param propertyKeys The property keys at the root of the element to serialize. If null, then all keys are serialized. * @param mode The type of GraphSON to generate. */ - static JSONObject objectNodeFromElement(Element element, Set propertyKeys, GraphonMode mode) { + static JSONObject objectNodeFromElement(Element element, Set propertyKeys, GraphsonMode mode) { GraphsonUtil graphson = element instanceof Edge ? new GraphsonUtil(mode, null, null, propertyKeys) : new GraphsonUtil(mode, null, propertyKeys, null); return graphson.objectNodeFromElement(element); @@ -135,7 +135,7 @@ class GraphsonUtil { * @param mode the mode of the GraphSON * @param propertyKeys a list of keys to include on reading of element properties */ - static Vertex vertexFromJson(JSONObject json, ElementFactory factory, GraphonMode mode, + static Vertex vertexFromJson(JSONObject json, ElementFactory factory, GraphsonMode mode, Set propertyKeys) throws IOException { GraphsonUtil graphson = new GraphsonUtil(mode, factory, propertyKeys, null); return graphson.vertexFromJson(json); @@ -149,7 +149,7 @@ class GraphsonUtil { * @param mode the mode of the GraphSON * @param propertyKeys a list of keys to include on reading of element properties */ - static Vertex vertexFromJson(String json, ElementFactory factory, GraphonMode mode, + static Vertex vertexFromJson(String json, ElementFactory factory, GraphsonMode mode, Set propertyKeys) throws ParseException { GraphsonUtil graphson = new GraphsonUtil(mode, factory, propertyKeys, null); return graphson.vertexFromJson(json); @@ -163,18 +163,18 @@ class GraphsonUtil { * @param mode the mode of the GraphSON * @param propertyKeys a list of keys to include on reading of element properties */ - static Vertex vertexFromJson(InputStream json, ElementFactory factory, GraphonMode mode, + static Vertex vertexFromJson(InputStream json, ElementFactory factory, GraphsonMode mode, Set propertyKeys) throws IOException, ParseException { GraphsonUtil graphson = new GraphsonUtil(mode, factory, propertyKeys, null); return graphson.vertexFromJson(json); } - private static boolean includeReservedKey(GraphonMode mode, String key, + private static boolean includeReservedKey(GraphsonMode mode, String key, Set propertyKeys, ElementPropertiesRule rule) { // the key is always included in modes other than compact. if it is compact, then validate that the // key is in the property key list - return mode != GraphonMode.COMPACT || includeKey(key, propertyKeys, rule); + return mode != GraphsonMode.COMPACT || includeKey(key, propertyKeys, rule); } private static boolean includeKey(String key, Set propertyKeys, @@ -209,7 +209,7 @@ class GraphsonUtil { * @param propertyKeys a list of keys to include when reading of element properties */ static Edge edgeFromJson(String json, Vertex out, Vertex in, - ElementFactory factory, GraphonMode mode, + ElementFactory factory, GraphsonMode mode, Set propertyKeys) throws IOException, ParseException { GraphsonUtil graphson = new GraphsonUtil(mode, factory, null, propertyKeys); return graphson.edgeFromJson(json, out, in); @@ -224,7 +224,7 @@ class GraphsonUtil { * @param propertyKeys a list of keys to include when reading of element properties */ static Edge edgeFromJson(InputStream json, Vertex out, Vertex in, - ElementFactory factory, GraphonMode mode, + ElementFactory factory, GraphsonMode mode, Set propertyKeys) throws IOException, ParseException { GraphsonUtil graphson = new GraphsonUtil(mode, factory, null, propertyKeys); return graphson.edgeFromJson(json, out, in); @@ -239,7 +239,7 @@ class GraphsonUtil { * @param propertyKeys a list of keys to include when reading of element properties */ static Edge edgeFromJson(JSONObject json, Vertex out, Vertex in, - ElementFactory factory, GraphonMode mode, + ElementFactory factory, GraphsonMode mode, Set propertyKeys) throws IOException { GraphsonUtil graphson = new GraphsonUtil(mode, factory, null, propertyKeys); return graphson.edgeFromJson(json, out, in); @@ -261,8 +261,8 @@ class GraphsonUtil { } private static boolean isReservedKey(String key) { - return key.equals(GraphonTokens._ID) || key.equals(GraphonTokens._TYPE) || key.equals(GraphonTokens._LABEL) - || key.equals(GraphonTokens._OUT_V) || key.equals(GraphonTokens._IN_V); + return key.equals(GraphsonTokens._ID) || key.equals(GraphsonTokens._TYPE) || key.equals(GraphsonTokens._LABEL) + || key.equals(GraphsonTokens._OUT_V) || key.equals(GraphsonTokens._IN_V); } private static JSONArray createJSONList(List list, Set propertyKeys, boolean showTypes) { @@ -270,7 +270,7 @@ class GraphsonUtil { for (Object item : list) { if (item instanceof Element) { jsonList.add(objectNodeFromElement((Element) item, propertyKeys, - showTypes ? GraphonMode.EXTENDED : GraphonMode.NORMAL)); + showTypes ? GraphsonMode.EXTENDED : GraphsonMode.NORMAL)); } else if (item instanceof List) { jsonList.add(createJSONList((List) item, propertyKeys, showTypes)); } else if (item instanceof Map) { @@ -296,7 +296,7 @@ class GraphsonUtil { value = createJSONMap((Map) value, propertyKeys, showTypes); } else if (value instanceof Element) { value = objectNodeFromElement((Element) value, propertyKeys, - showTypes ? GraphonMode.EXTENDED : GraphonMode.NORMAL); + showTypes ? GraphsonMode.EXTENDED : GraphsonMode.NORMAL); } else if (value.getClass().isArray()) { value = createJSONList(convertArrayToList(value), propertyKeys, showTypes); } @@ -313,24 +313,24 @@ class GraphsonUtil { if (hasEmbeddedTypes) { JSONObject json = (JSONObject) node; - if (json.get(GraphonTokens.TYPE).equals(GraphonTokens.TYPE_UNKNOWN)) { + if (json.get(GraphsonTokens.TYPE).equals(GraphsonTokens.TYPE_UNKNOWN)) { propertyValue = null; - } else if (json.get(GraphonTokens.TYPE).equals(GraphonTokens.TYPE_BOOLEAN)) { - propertyValue = json.get(GraphonTokens.VALUE); - } else if (json.get(GraphonTokens.TYPE).equals(GraphonTokens.TYPE_FLOAT)) { - propertyValue = ((Double) json.get(GraphonTokens.VALUE)).floatValue(); - } else if (json.get(GraphonTokens.TYPE).equals(GraphonTokens.TYPE_DOUBLE)) { - propertyValue = json.get(GraphonTokens.VALUE); - } else if (json.get(GraphonTokens.TYPE).equals(GraphonTokens.TYPE_INTEGER)) { - propertyValue = ((Long) json.get(GraphonTokens.VALUE)).intValue(); - } else if (json.get(GraphonTokens.TYPE).equals(GraphonTokens.TYPE_LONG)) { - propertyValue = json.get(GraphonTokens.VALUE); - } else if (json.get(GraphonTokens.TYPE).equals(GraphonTokens.TYPE_STRING)) { - propertyValue = json.get(GraphonTokens.VALUE); - } else if (json.get(GraphonTokens.TYPE).equals(GraphonTokens.TYPE_LIST)) { - propertyValue = readProperties(((JSONArray) json.get(GraphonTokens.VALUE)).iterator(), hasEmbeddedTypes); - } else if (json.get(GraphonTokens.TYPE).equals(GraphonTokens.TYPE_MAP)) { - propertyValue = readProperties((JSONObject) json.get(GraphonTokens.VALUE), false, hasEmbeddedTypes); + } else if (json.get(GraphsonTokens.TYPE).equals(GraphsonTokens.TYPE_BOOLEAN)) { + propertyValue = json.get(GraphsonTokens.VALUE); + } else if (json.get(GraphsonTokens.TYPE).equals(GraphsonTokens.TYPE_FLOAT)) { + propertyValue = ((Double) json.get(GraphsonTokens.VALUE)).floatValue(); + } else if (json.get(GraphsonTokens.TYPE).equals(GraphsonTokens.TYPE_DOUBLE)) { + propertyValue = json.get(GraphsonTokens.VALUE); + } else if (json.get(GraphsonTokens.TYPE).equals(GraphsonTokens.TYPE_INTEGER)) { + propertyValue = ((Long) json.get(GraphsonTokens.VALUE)).intValue(); + } else if (json.get(GraphsonTokens.TYPE).equals(GraphsonTokens.TYPE_LONG)) { + propertyValue = json.get(GraphsonTokens.VALUE); + } else if (json.get(GraphsonTokens.TYPE).equals(GraphsonTokens.TYPE_STRING)) { + propertyValue = json.get(GraphsonTokens.VALUE); + } else if (json.get(GraphsonTokens.TYPE).equals(GraphsonTokens.TYPE_LIST)) { + propertyValue = readProperties(((JSONArray) json.get(GraphsonTokens.VALUE)).iterator(), hasEmbeddedTypes); + } else if (json.get(GraphsonTokens.TYPE).equals(GraphsonTokens.TYPE_MAP)) { + propertyValue = readProperties((JSONObject) json.get(GraphsonTokens.VALUE), false, hasEmbeddedTypes); } else { propertyValue = node.toString(); } @@ -457,9 +457,9 @@ class GraphsonUtil { String type = determineType(value); JSONObject valueAndType = new JSONObject(); - valueAndType.put(GraphonTokens.TYPE, type); + valueAndType.put(GraphsonTokens.TYPE, type); - if (type.equals(GraphonTokens.TYPE_LIST)) { + if (type.equals(GraphsonTokens.TYPE_LIST)) { // values of lists must be accumulated as ObjectNode objects under the value key. // will return as a ArrayNode. called recursively to traverse the entire @@ -468,14 +468,14 @@ class GraphsonUtil { // there is a set of values that must be accumulated as an array under a key JSONArray valueArray = new JSONArray(); - valueAndType.put(GraphonTokens.VALUE, valueArray); + valueAndType.put(GraphsonTokens.VALUE, valueArray); for (int ix = 0; ix < list.size(); ix++) { // the value of each item in the array is a node object from an ArrayNode...must // get the value of it. addObject(valueArray, getValue(list.get(ix), includeType)); } - } else if (type.equals(GraphonTokens.TYPE_MAP)) { + } else if (type.equals(GraphsonTokens.TYPE_MAP)) { // maps are converted to a ObjectNode. called recursively to traverse // the entire object graph within the map. @@ -488,14 +488,14 @@ class GraphsonUtil { convertedMap.put(key, jsonObject.get(key)); } - valueAndType.put(GraphonTokens.VALUE, convertedMap); + valueAndType.put(GraphsonTokens.VALUE, convertedMap); } else { // this must be a primitive value or a complex object. if a complex // object it will be handled by a call to toString and stored as a // string value - putObject(valueAndType, GraphonTokens.VALUE, value); + putObject(valueAndType, GraphsonTokens.VALUE, value); } // this goes back as a JSONObject with data type and value @@ -542,23 +542,23 @@ class GraphsonUtil { } private static String determineType(Object value) { - String type = GraphonTokens.TYPE_STRING; + String type = GraphsonTokens.TYPE_STRING; if (value == null) { type = "unknown"; } else if (value instanceof Double) { - type = GraphonTokens.TYPE_DOUBLE; + type = GraphsonTokens.TYPE_DOUBLE; } else if (value instanceof Float) { - type = GraphonTokens.TYPE_FLOAT; + type = GraphsonTokens.TYPE_FLOAT; } else if (value instanceof Integer) { - type = GraphonTokens.TYPE_INTEGER; + type = GraphsonTokens.TYPE_INTEGER; } else if (value instanceof Long) { - type = GraphonTokens.TYPE_LONG; + type = GraphsonTokens.TYPE_LONG; } else if (value instanceof Boolean) { - type = GraphonTokens.TYPE_BOOLEAN; + type = GraphsonTokens.TYPE_BOOLEAN; } else if (value instanceof JSONArray) { - type = GraphonTokens.TYPE_LIST; + type = GraphsonTokens.TYPE_LIST; } else if (value instanceof JSONObject) { - type = GraphonTokens.TYPE_MAP; + type = GraphsonTokens.TYPE_MAP; } return type; @@ -591,10 +591,10 @@ class GraphsonUtil { Edge edgeFromJson(JSONObject json, Vertex out, Vertex in) throws IOException { Map props = GraphsonUtil.readProperties(json, true, this.hasEmbeddedTypes); -// Object edgeId = getTypedValueFromJsonNode(json.get(GraphonTokens._ID)); - Object edgeId = json.get(GraphonTokens._ID); +// Object edgeId = getTypedValueFromJsonNode(json.get(GraphsonTokens._ID)); + Object edgeId = json.get(GraphsonTokens._ID); - Object nodeLabel = json.get(GraphonTokens._LABEL); + Object nodeLabel = json.get(GraphsonTokens._LABEL); String label = nodeLabel == null ? null : nodeLabel.toString(); Edge e = factory.createEdge(edgeId, out, in, label); @@ -622,8 +622,8 @@ class GraphsonUtil { Vertex vertexFromJson(JSONObject json) { Map props = readProperties(json, true, this.hasEmbeddedTypes); - //Object vertexId = getTypedValueFromJsonNode((JSONObject)json.get(GraphonTokens._ID)); - Object vertexId = json.get(GraphonTokens._ID); + //Object vertexId = getTypedValueFromJsonNode((JSONObject)json.get(GraphsonTokens._ID)); + Object vertexId = json.get(GraphsonTokens._ID); Vertex v = factory.createVertex(vertexId); for (Map.Entry entry : props.entrySet()) { @@ -649,14 +649,14 @@ class GraphsonUtil { */ org.json.simple.JSONObject objectNodeFromElement(Element element) { boolean isEdge = element instanceof Edge; - boolean showTypes = mode == GraphonMode.EXTENDED; + boolean showTypes = mode == GraphsonMode.EXTENDED; Set propertyKeys = isEdge ? this.edgePropertyKeys : this.vertexPropertyKeys; ElementPropertiesRule elementPropertyConfig = isEdge ? this.edgePropertiesRule : this.vertexPropertiesRule; org.json.simple.JSONObject jsonElement = createJSONMap(createPropertyMap(element, propertyKeys, elementPropertyConfig), propertyKeys, showTypes); if ((isEdge && this.includeReservedEdgeId) || (!isEdge && this.includeReservedVertexId)) { - putObject(jsonElement, GraphonTokens._ID, element.getId()); + putObject(jsonElement, GraphsonTokens._ID, element.getId()); } // it's important to keep the order of these straight. check Edge first and then Vertex because there @@ -665,31 +665,31 @@ class GraphsonUtil { Edge edge = (Edge) element; if (this.includeReservedEdgeId) { - putObject(jsonElement, GraphonTokens._ID, element.getId()); + putObject(jsonElement, GraphsonTokens._ID, element.getId()); } if (this.includeReservedEdgeType) { - jsonElement.put(GraphonTokens._TYPE, GraphonTokens.EDGE); + jsonElement.put(GraphsonTokens._TYPE, GraphsonTokens.EDGE); } if (this.includeReservedEdgeOutV) { - putObject(jsonElement, GraphonTokens._OUT_V, edge.getVertex(Direction.OUT).getId()); + putObject(jsonElement, GraphsonTokens._OUT_V, edge.getVertex(Direction.OUT).getId()); } if (this.includeReservedEdgeInV) { - putObject(jsonElement, GraphonTokens._IN_V, edge.getVertex(Direction.IN).getId()); + putObject(jsonElement, GraphsonTokens._IN_V, edge.getVertex(Direction.IN).getId()); } if (this.includeReservedEdgeLabel) { - jsonElement.put(GraphonTokens._LABEL, edge.getLabel()); + jsonElement.put(GraphsonTokens._LABEL, edge.getLabel()); } } else if (element instanceof Vertex) { if (this.includeReservedVertexId) { - putObject(jsonElement, GraphonTokens._ID, element.getId()); + putObject(jsonElement, GraphsonTokens._ID, element.getId()); } if (this.includeReservedVertexType) { - jsonElement.put(GraphonTokens._TYPE, GraphonTokens.VERTEX); + jsonElement.put(GraphsonTokens._TYPE, GraphsonTokens.VERTEX); } } diff --git a/sonar-core/src/main/java/org/sonar/core/graph/graphson/GraphonWriter.java b/sonar-core/src/main/java/org/sonar/core/graph/graphson/GraphsonWriter.java similarity index 84% rename from sonar-core/src/main/java/org/sonar/core/graph/graphson/GraphonWriter.java rename to sonar-core/src/main/java/org/sonar/core/graph/graphson/GraphsonWriter.java index d1b2de8103d..ef97d89dc09 100644 --- a/sonar-core/src/main/java/org/sonar/core/graph/graphson/GraphonWriter.java +++ b/sonar-core/src/main/java/org/sonar/core/graph/graphson/GraphsonWriter.java @@ -31,13 +31,13 @@ import java.io.OutputStream; import java.util.Set; /** - * GraphonWriter writes a Graph to a TinkerPop JSON OutputStream. + * GraphsonWriter writes a Graph to a TinkerPop JSON OutputStream. * * @author Stephen Mallette */ -public class GraphonWriter { +public class GraphsonWriter { - public void write(Graph graph, OutputStream jsonOutputStream, GraphonMode mode) { + public void write(Graph graph, OutputStream jsonOutputStream, GraphsonMode mode) { write(graph, jsonOutputStream, mode, null, null); } @@ -50,28 +50,28 @@ public class GraphonWriter { * @param mode determines the format of the GraphSON * @throws java.io.IOException thrown if there is an error generating the JSON data */ - public void write(Graph graph, OutputStream jsonOutputStream, GraphonMode mode, @Nullable Set vertexPropertyKeys, @Nullable Set edgePropertyKeys) { + public void write(Graph graph, OutputStream jsonOutputStream, GraphsonMode mode, @Nullable Set vertexPropertyKeys, @Nullable Set edgePropertyKeys) { try { JSONObject root = new JSONObject(); GraphsonUtil graphson = new GraphsonUtil(mode, null, vertexPropertyKeys, edgePropertyKeys); - root.put(GraphonTokens.MODE, mode.toString()); + root.put(GraphsonTokens.MODE, mode.toString()); JSONArray verticesArray = new JSONArray(); for (Vertex v : graph.getVertices()) { verticesArray.add(graphson.objectNodeFromElement(v)); } - root.put(GraphonTokens.VERTICES, verticesArray); + root.put(GraphsonTokens.VERTICES, verticesArray); JSONArray edgesArray = new JSONArray(); for (Edge e : graph.getEdges()) { edgesArray.add(graphson.objectNodeFromElement(e)); } - root.put(GraphonTokens.EDGES, edgesArray); + root.put(GraphsonTokens.EDGES, edgesArray); jsonOutputStream.write(root.toString().getBytes("UTF-8")); } catch (Exception e) { - throw new GraphonException("Fail to generate GraphSON", e); + throw new GraphsonException("Fail to generate GraphSON", e); } } diff --git a/sonar-core/src/test/java/org/sonar/core/graph/graphson/GraphsonReaderTest.java b/sonar-core/src/test/java/org/sonar/core/graph/graphson/GraphsonReaderTest.java index 74cbdaa08f8..74713e288e4 100644 --- a/sonar-core/src/test/java/org/sonar/core/graph/graphson/GraphsonReaderTest.java +++ b/sonar-core/src/test/java/org/sonar/core/graph/graphson/GraphsonReaderTest.java @@ -47,7 +47,7 @@ public class GraphsonReaderTest { byte[] bytes = json.getBytes(); InputStream inputStream = new ByteArrayInputStream(bytes); - new GraphonReader().read(inputStream, graph); + new GraphsonReader().read(inputStream, graph); Assert.assertEquals(2, getIterableCount(graph.getVertices())); Assert.assertEquals(1, getIterableCount(graph.getEdges())); @@ -98,7 +98,7 @@ public class GraphsonReaderTest { byte[] bytes = json.getBytes(); InputStream inputStream = new ByteArrayInputStream(bytes); - new GraphonReader().read(inputStream, graph); + new GraphsonReader().read(inputStream, graph); Assert.assertEquals(2, getIterableCount(graph.getVertices())); Assert.assertEquals(1, getIterableCount(graph.getEdges())); @@ -149,7 +149,7 @@ public class GraphsonReaderTest { byte[] bytes = json.getBytes(); InputStream inputStream = new ByteArrayInputStream(bytes); - new GraphonReader().read(inputStream, graph); + new GraphsonReader().read(inputStream, graph); Assert.assertEquals(2, getIterableCount(graph.getVertices())); Assert.assertEquals(1, getIterableCount(graph.getEdges())); @@ -197,8 +197,8 @@ public class GraphsonReaderTest { ByteArrayOutputStream stream = new ByteArrayOutputStream(); - GraphonWriter writer = new GraphonWriter(); - writer.write(graph, stream, GraphonMode.EXTENDED); + GraphsonWriter writer = new GraphsonWriter(); + writer.write(graph, stream, GraphsonMode.EXTENDED); stream.flush(); stream.close(); @@ -209,7 +209,7 @@ public class GraphsonReaderTest { InputStream inputStream = new ByteArrayInputStream(bytes); TinkerGraph emptyGraph = new TinkerGraph(); - new GraphonReader().read(inputStream, emptyGraph); + new GraphsonReader().read(inputStream, emptyGraph); Assert.assertEquals(6, getIterableCount(emptyGraph.getVertices())); Assert.assertEquals(6, getIterableCount(emptyGraph.getEdges())); @@ -243,16 +243,16 @@ public class GraphsonReaderTest { ByteArrayOutputStream stream = new ByteArrayOutputStream(); Set edgeKeys = new HashSet(); - edgeKeys.add(GraphonTokens._ID); - edgeKeys.add(GraphonTokens._IN_V); - edgeKeys.add(GraphonTokens._OUT_V); - edgeKeys.add(GraphonTokens._LABEL); + edgeKeys.add(GraphsonTokens._ID); + edgeKeys.add(GraphsonTokens._IN_V); + edgeKeys.add(GraphsonTokens._OUT_V); + edgeKeys.add(GraphsonTokens._LABEL); Set vertexKeys = new HashSet(); - vertexKeys.add(GraphonTokens._ID); + vertexKeys.add(GraphsonTokens._ID); - GraphonWriter writer = new GraphonWriter(); - writer.write(graph, stream, GraphonMode.EXTENDED, vertexKeys, edgeKeys); + GraphsonWriter writer = new GraphsonWriter(); + writer.write(graph, stream, GraphsonMode.EXTENDED, vertexKeys, edgeKeys); stream.flush(); stream.close(); @@ -263,7 +263,7 @@ public class GraphsonReaderTest { InputStream inputStream = new ByteArrayInputStream(bytes); TinkerGraph emptyGraph = new TinkerGraph(); - new GraphonReader().read(inputStream, emptyGraph); + new GraphsonReader().read(inputStream, emptyGraph); Assert.assertEquals(6, getIterableCount(emptyGraph.getVertices())); Assert.assertEquals(6, getIterableCount(emptyGraph.getEdges())); @@ -296,21 +296,21 @@ public class GraphsonReaderTest { } - @Test(expected = GraphonException.class) + @Test(expected = GraphsonException.class) public void inputGraphCompactFullCycleBroken() throws Exception { TinkerGraph graph = TinkerGraphFactory.createTinkerGraph(); ByteArrayOutputStream stream = new ByteArrayOutputStream(); Set edgeKeys = new HashSet(); - edgeKeys.add(GraphonTokens._IN_V); - edgeKeys.add(GraphonTokens._OUT_V); - edgeKeys.add(GraphonTokens._LABEL); + edgeKeys.add(GraphsonTokens._IN_V); + edgeKeys.add(GraphsonTokens._OUT_V); + edgeKeys.add(GraphsonTokens._LABEL); Set vertexKeys = new HashSet(); - GraphonWriter writer = new GraphonWriter(); - writer.write(graph, stream, GraphonMode.COMPACT, vertexKeys, edgeKeys); + GraphsonWriter writer = new GraphsonWriter(); + writer.write(graph, stream, GraphsonMode.COMPACT, vertexKeys, edgeKeys); stream.flush(); stream.close(); @@ -321,7 +321,7 @@ public class GraphsonReaderTest { InputStream inputStream = new ByteArrayInputStream(bytes); TinkerGraph emptyGraph = new TinkerGraph(); - new GraphonReader().read(inputStream, emptyGraph); + new GraphsonReader().read(inputStream, emptyGraph); } diff --git a/sonar-core/src/test/java/org/sonar/core/graph/graphson/GraphsonUtilTest.java b/sonar-core/src/test/java/org/sonar/core/graph/graphson/GraphsonUtilTest.java index e06ac02136e..5f0ee2a954e 100644 --- a/sonar-core/src/test/java/org/sonar/core/graph/graphson/GraphsonUtilTest.java +++ b/sonar-core/src/test/java/org/sonar/core/graph/graphson/GraphsonUtilTest.java @@ -68,7 +68,7 @@ public class GraphsonUtilTest { Edge e = this.graph.addEdge(3, v1, v2, "test"); e.setProperty("weight", 0.5f); - JSONObject json = GraphsonUtil.jsonFromElement(e, null, GraphonMode.NORMAL); + JSONObject json = GraphsonUtil.jsonFromElement(e, null, GraphsonMode.NORMAL); assertThat(json).isNotNull(); assertThat(json.containsKey(GraphSONTokens._ID)).isTrue(); @@ -97,7 +97,7 @@ public class GraphsonUtilTest { add(GraphSONTokens._ID); }}; - JSONObject json = GraphsonUtil.jsonFromElement(e, propertiesToInclude, GraphonMode.COMPACT); + JSONObject json = GraphsonUtil.jsonFromElement(e, propertiesToInclude, GraphsonMode.COMPACT); assertThat(json).isNotNull(); assertThat(json.containsKey(GraphSONTokens._TYPE)).isFalse(); @@ -129,7 +129,7 @@ public class GraphsonUtilTest { ElementPropertyConfig config = new ElementPropertyConfig(null, propertiesToExclude, ElementPropertyConfig.ElementPropertiesRule.INCLUDE, ElementPropertyConfig.ElementPropertiesRule.EXCLUDE); - GraphsonUtil utility = new GraphsonUtil(GraphonMode.COMPACT, factory, config); + GraphsonUtil utility = new GraphsonUtil(GraphsonMode.COMPACT, factory, config); JSONObject json = utility.jsonFromElement(e); assertThat(json).isNotNull(); @@ -151,7 +151,7 @@ public class GraphsonUtilTest { Edge e = this.graph.addEdge(3, v1, v2, "test"); e.setProperty("weight", 0.5f); - JSONObject json = GraphsonUtil.jsonFromElement(e, null, GraphonMode.COMPACT); + JSONObject json = GraphsonUtil.jsonFromElement(e, null, GraphsonMode.COMPACT); assertThat(json).isNotNull(); assertThat(json.containsKey(GraphSONTokens._ID)).isTrue(); @@ -167,7 +167,7 @@ public class GraphsonUtilTest { Vertex v = this.graph.addVertex(1); v.setProperty("name", "marko"); - JSONObject json = GraphsonUtil.jsonFromElement(v, null, GraphonMode.NORMAL); + JSONObject json = GraphsonUtil.jsonFromElement(v, null, GraphsonMode.NORMAL); assertThat(json).isNotNull(); assertThat(json.containsKey(GraphSONTokens._ID)).isTrue(); @@ -186,7 +186,7 @@ public class GraphsonUtilTest { add(GraphSONTokens._ID); }}; - JSONObject json = GraphsonUtil.jsonFromElement(v, propertiesToInclude, GraphonMode.COMPACT); + JSONObject json = GraphsonUtil.jsonFromElement(v, propertiesToInclude, GraphsonMode.COMPACT); assertThat(json).isNotNull(); assertThat(json.containsKey(GraphSONTokens._TYPE)).isFalse(); @@ -208,7 +208,7 @@ public class GraphsonUtilTest { ElementPropertyConfig.ElementPropertiesRule.EXCLUDE, ElementPropertyConfig.ElementPropertiesRule.EXCLUDE); - GraphsonUtil utility = new GraphsonUtil(GraphonMode.COMPACT, factory, config); + GraphsonUtil utility = new GraphsonUtil(GraphsonMode.COMPACT, factory, config); JSONObject json = utility.jsonFromElement(v); assertThat(json).isNotNull(); @@ -222,7 +222,7 @@ public class GraphsonUtilTest { Vertex v = this.graph.addVertex(1); v.setProperty("name", "marko"); - JSONObject json = GraphsonUtil.jsonFromElement(v, null, GraphonMode.COMPACT); + JSONObject json = GraphsonUtil.jsonFromElement(v, null, GraphsonMode.COMPACT); assertThat(json).isNotNull(); assertThat(json.containsKey(GraphSONTokens._TYPE)).isTrue(); @@ -241,7 +241,7 @@ public class GraphsonUtilTest { v.setProperty("keyDouble", 4.4); v.setProperty("keyBoolean", true); - JSONObject json = GraphsonUtil.jsonFromElement(v, null, GraphonMode.NORMAL); + JSONObject json = GraphsonUtil.jsonFromElement(v, null, GraphsonMode.NORMAL); assertThat(json).isNotNull(); assertThat(json.containsKey(GraphSONTokens._ID)).isTrue(); @@ -271,7 +271,7 @@ public class GraphsonUtilTest { v.setProperty("keyMap", map); - JSONObject json = GraphsonUtil.jsonFromElement(v, null, GraphonMode.NORMAL); + JSONObject json = GraphsonUtil.jsonFromElement(v, null, GraphsonMode.NORMAL); assertThat(json).isNotNull(); assertThat(json.get(GraphSONTokens._ID)).isEqualTo("1"); @@ -296,7 +296,7 @@ public class GraphsonUtilTest { v.setProperty("keyList", list); - JSONObject json = GraphsonUtil.jsonFromElement(v, null, GraphonMode.NORMAL); + JSONObject json = GraphsonUtil.jsonFromElement(v, null, GraphsonMode.NORMAL); assertThat(json).isNotNull(); assertThat(json.get(GraphSONTokens._ID)).isEqualTo("1"); @@ -314,7 +314,7 @@ public class GraphsonUtilTest { v.setProperty("keyStringArray", stringArray); - JSONObject json = GraphsonUtil.jsonFromElement(v, null, GraphonMode.NORMAL); + JSONObject json = GraphsonUtil.jsonFromElement(v, null, GraphsonMode.NORMAL); assertThat(json).isNotNull(); assertThat(json.get(GraphSONTokens._ID)).isEqualTo("1"); @@ -332,7 +332,7 @@ public class GraphsonUtilTest { v.setProperty("keyDoubleArray", doubleArray); - JSONObject json = GraphsonUtil.jsonFromElement(v, null, GraphonMode.NORMAL); + JSONObject json = GraphsonUtil.jsonFromElement(v, null, GraphsonMode.NORMAL); assertThat(json).isNotNull(); assertThat(json.get(GraphSONTokens._ID)).isEqualTo("1"); @@ -350,7 +350,7 @@ public class GraphsonUtilTest { v.setProperty("keyIntArray", intArray); - JSONObject json = GraphsonUtil.jsonFromElement(v, null, GraphonMode.NORMAL); + JSONObject json = GraphsonUtil.jsonFromElement(v, null, GraphsonMode.NORMAL); assertThat(json).isNotNull(); assertThat(json.get(GraphSONTokens._ID)).isEqualTo("1"); @@ -368,7 +368,7 @@ public class GraphsonUtilTest { v.setProperty("keyLongArray", longArray); - JSONObject json = GraphsonUtil.jsonFromElement(v, null, GraphonMode.NORMAL); + JSONObject json = GraphsonUtil.jsonFromElement(v, null, GraphsonMode.NORMAL); assertThat(json).isNotNull(); assertThat(json.get(GraphSONTokens._ID)).isEqualTo("1"); @@ -386,7 +386,7 @@ public class GraphsonUtilTest { v.setProperty("keyFloatArray", floatArray); - JSONObject json = GraphsonUtil.jsonFromElement(v, null, GraphonMode.NORMAL); + JSONObject json = GraphsonUtil.jsonFromElement(v, null, GraphsonMode.NORMAL); assertThat(json).isNotNull(); assertThat(json.get(GraphSONTokens._ID)).isEqualTo("1"); @@ -404,7 +404,7 @@ public class GraphsonUtilTest { v.setProperty("keyBooleanArray", booleanArray); - JSONObject json = GraphsonUtil.jsonFromElement(v, null, GraphonMode.NORMAL); + JSONObject json = GraphsonUtil.jsonFromElement(v, null, GraphsonMode.NORMAL); assertThat(json).isNotNull(); assertThat(json.get(GraphSONTokens._ID)).isEqualTo("1"); @@ -420,7 +420,7 @@ public class GraphsonUtilTest { Vertex v = this.graph.addVertex(1); v.setProperty("mycat", new Cat("smithers")); - JSONObject json = GraphsonUtil.jsonFromElement(v, null, GraphonMode.NORMAL); + JSONObject json = GraphsonUtil.jsonFromElement(v, null, GraphsonMode.NORMAL); assertThat(json).isNotNull(); assertThat(json.get(GraphSONTokens._ID)).isEqualTo("1"); @@ -433,7 +433,7 @@ public class GraphsonUtilTest { Vertex v = this.graph.addVertex(1); v.setProperty("mycat", new Cat("smithers")); - JSONObject json = GraphsonUtil.jsonFromElement(v, null, GraphonMode.EXTENDED); + JSONObject json = GraphsonUtil.jsonFromElement(v, null, GraphsonMode.EXTENDED); assertThat(json).isNotNull(); assertThat(json.get(GraphSONTokens._ID)).isEqualTo("1"); @@ -453,7 +453,7 @@ public class GraphsonUtilTest { v.setProperty("cats", cats); - JSONObject json = GraphsonUtil.jsonFromElement(v, null, GraphonMode.NORMAL); + JSONObject json = GraphsonUtil.jsonFromElement(v, null, GraphsonMode.NORMAL); assertThat(json).isNotNull(); assertThat(json.get(GraphSONTokens._ID)).isEqualTo("1"); @@ -489,7 +489,7 @@ public class GraphsonUtilTest { v.setProperty("crazy-map", map); - JSONObject json = GraphsonUtil.jsonFromElement(v, null, GraphonMode.NORMAL); + JSONObject json = GraphsonUtil.jsonFromElement(v, null, GraphsonMode.NORMAL); assertThat(json).isNotNull(); assertThat(json.get(GraphSONTokens._ID)).isEqualTo("1"); @@ -523,7 +523,7 @@ public class GraphsonUtilTest { Set propertiesToInclude = new HashSet(); propertiesToInclude.add("y"); - JSONObject json = GraphsonUtil.jsonFromElement(v, propertiesToInclude, GraphonMode.NORMAL); + JSONObject json = GraphsonUtil.jsonFromElement(v, propertiesToInclude, GraphsonMode.NORMAL); assertThat(json).isNotNull(); assertThat(json.get(GraphSONTokens._ID)).isEqualTo("1"); @@ -551,7 +551,7 @@ public class GraphsonUtilTest { propertiesToInclude.add("y"); propertiesToInclude.add("v"); - JSONObject json = GraphsonUtil.jsonFromElement(v, propertiesToInclude, GraphonMode.NORMAL); + JSONObject json = GraphsonUtil.jsonFromElement(v, propertiesToInclude, GraphsonMode.NORMAL); assertThat(json).isNotNull(); assertThat(json.get(GraphSONTokens._ID)).isEqualTo("1"); @@ -578,7 +578,7 @@ public class GraphsonUtilTest { v.setProperty("keyDouble", 4.4); v.setProperty("keyBoolean", true); - JSONObject json = GraphsonUtil.jsonFromElement(v, null, GraphonMode.EXTENDED); + JSONObject json = GraphsonUtil.jsonFromElement(v, null, GraphsonMode.EXTENDED); assertThat(json).isNotNull(); assertThat(json.get(GraphSONTokens._ID)).isEqualTo("1"); @@ -631,7 +631,7 @@ public class GraphsonUtilTest { v.setProperty("keyList", list); - JSONObject json = GraphsonUtil.jsonFromElement(v, null, GraphonMode.EXTENDED); + JSONObject json = GraphsonUtil.jsonFromElement(v, null, GraphsonMode.EXTENDED); assertThat(json).isNotNull(); assertThat(json.get(GraphSONTokens._ID)).isEqualTo("1"); @@ -666,7 +666,7 @@ public class GraphsonUtilTest { v.setProperty("keyList", list); - JSONObject json = GraphsonUtil.jsonFromElement(v, null, GraphonMode.EXTENDED); + JSONObject json = GraphsonUtil.jsonFromElement(v, null, GraphsonMode.EXTENDED); assertThat(json).isNotNull(); assertThat(json.get(GraphSONTokens._ID)).isEqualTo("1"); @@ -701,7 +701,7 @@ public class GraphsonUtilTest { v.setProperty("keyList", list); - JSONObject json = GraphsonUtil.jsonFromElement(v, null, GraphonMode.EXTENDED); + JSONObject json = GraphsonUtil.jsonFromElement(v, null, GraphsonMode.EXTENDED); assertThat(json).isNotNull(); assertThat(json.get(GraphSONTokens._ID)).isEqualTo("1"); @@ -736,7 +736,7 @@ public class GraphsonUtilTest { v.setProperty("keyList", list); - JSONObject json = GraphsonUtil.jsonFromElement(v, null, GraphonMode.EXTENDED); + JSONObject json = GraphsonUtil.jsonFromElement(v, null, GraphsonMode.EXTENDED); assertThat(json).isNotNull(); assertThat(json.get(GraphSONTokens._ID)).isEqualTo("1"); @@ -774,7 +774,7 @@ public class GraphsonUtilTest { v.setProperty("keyList", listList); - JSONObject json = GraphsonUtil.jsonFromElement(v, null, GraphonMode.EXTENDED); + JSONObject json = GraphsonUtil.jsonFromElement(v, null, GraphsonMode.EXTENDED); assertThat(json).isNotNull(); assertThat(json.get(GraphSONTokens._ID)).isEqualTo("1"); @@ -811,7 +811,7 @@ public class GraphsonUtilTest { v.setProperty("keyMap", map); - JSONObject json = GraphsonUtil.jsonFromElement(v, null, GraphonMode.EXTENDED); + JSONObject json = GraphsonUtil.jsonFromElement(v, null, GraphsonMode.EXTENDED); assertThat(json).isNotNull(); assertThat(json.get(GraphSONTokens._ID)).isEqualTo("1"); @@ -861,7 +861,7 @@ public class GraphsonUtilTest { list.add("string"); v.setProperty("keyList", list); - JSONObject json = GraphsonUtil.jsonFromElement(v, null, GraphonMode.NORMAL); + JSONObject json = GraphsonUtil.jsonFromElement(v, null, GraphsonMode.NORMAL); assertThat(json).isNotNull(); assertThat(json.get("key")).isNull(); @@ -903,7 +903,7 @@ public class GraphsonUtilTest { list.add("string"); v.setProperty("keyList", list); - JSONObject json = GraphsonUtil.jsonFromElement(v, null, GraphonMode.EXTENDED); + JSONObject json = GraphsonUtil.jsonFromElement(v, null, GraphsonMode.EXTENDED); assertThat(json).isNotNull(); @@ -938,7 +938,7 @@ public class GraphsonUtilTest { Graph g = new TinkerGraph(); ElementFactory factory = new ElementFactory(g); - Vertex v = GraphsonUtil.vertexFromJson((JSONObject) JSONValue.parse(vertexJson1), factory, GraphonMode.NORMAL, null); + Vertex v = GraphsonUtil.vertexFromJson((JSONObject) JSONValue.parse(vertexJson1), factory, GraphsonMode.NORMAL, null); assertThat(v).isSameAs(g.getVertex(1)); @@ -953,7 +953,7 @@ public class GraphsonUtilTest { Graph g = new TinkerGraph(); ElementFactory factory = new ElementFactory(g); - Vertex v = GraphsonUtil.vertexFromJson(vertexJson1, factory, GraphonMode.NORMAL, null); + Vertex v = GraphsonUtil.vertexFromJson(vertexJson1, factory, GraphsonMode.NORMAL, null); assertThat(v).isSameAs(g.getVertex(1)); @@ -969,7 +969,7 @@ public class GraphsonUtilTest { ElementFactory factory = new ElementFactory(g); String vertexJson = "{\"person\":{\"value\":\"marko\",\"type\":\"string\"},\"_id\":1,\"_type\":\"vertex\"}"; - Vertex v = GraphsonUtil.vertexFromJson(vertexJson, factory, GraphonMode.EXTENDED, null); + Vertex v = GraphsonUtil.vertexFromJson(vertexJson, factory, GraphsonMode.EXTENDED, null); Assert.assertSame(v, g.getVertex(1)); @@ -983,7 +983,7 @@ public class GraphsonUtilTest { Graph g = new TinkerGraph(); ElementFactory factory = new ElementFactory(g); - Vertex v = GraphsonUtil.vertexFromJson(inputStreamVertexJson1, factory, GraphonMode.NORMAL, null); + Vertex v = GraphsonUtil.vertexFromJson(inputStreamVertexJson1, factory, GraphsonMode.NORMAL, null); Assert.assertSame(v, g.getVertex(1)); @@ -1001,7 +1001,7 @@ public class GraphsonUtilTest { Set ignoreAge = new HashSet(); ignoreAge.add("age"); ElementPropertyConfig config = ElementPropertyConfig.excludeProperties(ignoreAge, null); - GraphsonUtil utility = new GraphsonUtil(GraphonMode.NORMAL, factory, config); + GraphsonUtil utility = new GraphsonUtil(GraphsonMode.NORMAL, factory, config); Vertex v = utility.vertexFromJson((JSONObject) JSONValue.parse(vertexJson1)); Assert.assertSame(v, g.getVertex(1)); @@ -1017,9 +1017,9 @@ public class GraphsonUtilTest { Graph g = new TinkerGraph(); ElementFactory factory = new ElementFactory(g); - Vertex v1 = GraphsonUtil.vertexFromJson((JSONObject) JSONValue.parse(vertexJson1), factory, GraphonMode.NORMAL, null); - Vertex v2 = GraphsonUtil.vertexFromJson((JSONObject) JSONValue.parse(vertexJson2), factory, GraphonMode.NORMAL, null); - Edge e = GraphsonUtil.edgeFromJson((JSONObject) JSONValue.parse(edgeJson), v1, v2, factory, GraphonMode.NORMAL, null); + Vertex v1 = GraphsonUtil.vertexFromJson((JSONObject) JSONValue.parse(vertexJson1), factory, GraphsonMode.NORMAL, null); + Vertex v2 = GraphsonUtil.vertexFromJson((JSONObject) JSONValue.parse(vertexJson2), factory, GraphsonMode.NORMAL, null); + Edge e = GraphsonUtil.edgeFromJson((JSONObject) JSONValue.parse(edgeJson), v1, v2, factory, GraphsonMode.NORMAL, null); Assert.assertSame(v1, g.getVertex(1)); Assert.assertSame(v2, g.getVertex(2)); @@ -1038,9 +1038,9 @@ public class GraphsonUtilTest { Graph g = new TinkerGraph(); ElementFactory factory = new ElementFactory(g); - Vertex v1 = GraphsonUtil.vertexFromJson(vertexJson1, factory, GraphonMode.NORMAL, null); - Vertex v2 = GraphsonUtil.vertexFromJson(vertexJson2, factory, GraphonMode.NORMAL, null); - Edge e = GraphsonUtil.edgeFromJson(edgeJson, v1, v2, factory, GraphonMode.NORMAL, null); + Vertex v1 = GraphsonUtil.vertexFromJson(vertexJson1, factory, GraphsonMode.NORMAL, null); + Vertex v2 = GraphsonUtil.vertexFromJson(vertexJson2, factory, GraphsonMode.NORMAL, null); + Edge e = GraphsonUtil.edgeFromJson(edgeJson, v1, v2, factory, GraphsonMode.NORMAL, null); Assert.assertSame(v1, g.getVertex(1)); Assert.assertSame(v2, g.getVertex(2)); @@ -1059,13 +1059,13 @@ public class GraphsonUtilTest { Graph g = new TinkerGraph(); ElementFactory factory = new ElementFactory(g); - Vertex v1 = GraphsonUtil.vertexFromJson((JSONObject) JSONValue.parse(vertexJson1), factory, GraphonMode.NORMAL, null); - Vertex v2 = GraphsonUtil.vertexFromJson((JSONObject) JSONValue.parse(vertexJson2), factory, GraphonMode.NORMAL, null); + Vertex v1 = GraphsonUtil.vertexFromJson((JSONObject) JSONValue.parse(vertexJson1), factory, GraphsonMode.NORMAL, null); + Vertex v2 = GraphsonUtil.vertexFromJson((JSONObject) JSONValue.parse(vertexJson2), factory, GraphsonMode.NORMAL, null); Set ignoreWeight = new HashSet(); ignoreWeight.add("weight"); ElementPropertyConfig config = ElementPropertyConfig.excludeProperties(null, ignoreWeight); - GraphsonUtil utility = new GraphsonUtil(GraphonMode.NORMAL, factory, config); + GraphsonUtil utility = new GraphsonUtil(GraphsonMode.NORMAL, factory, config); Edge e = utility.edgeFromJson((JSONObject) JSONValue.parse(edgeJson), v1, v2); Assert.assertSame(v1, g.getVertex(1)); @@ -1085,9 +1085,9 @@ public class GraphsonUtilTest { Graph g = new TinkerGraph(); ElementFactory factory = new ElementFactory(g); - Vertex v1 = GraphsonUtil.vertexFromJson((JSONObject) JSONValue.parse(vertexJson1), factory, GraphonMode.NORMAL, null); - Vertex v2 = GraphsonUtil.vertexFromJson((JSONObject) JSONValue.parse(vertexJson2), factory, GraphonMode.NORMAL, null); - Edge e = GraphsonUtil.edgeFromJson((JSONObject) JSONValue.parse(edgeJsonLight), v1, v2, factory, GraphonMode.NORMAL, null); + Vertex v1 = GraphsonUtil.vertexFromJson((JSONObject) JSONValue.parse(vertexJson1), factory, GraphsonMode.NORMAL, null); + Vertex v2 = GraphsonUtil.vertexFromJson((JSONObject) JSONValue.parse(vertexJson2), factory, GraphsonMode.NORMAL, null); + Edge e = GraphsonUtil.edgeFromJson((JSONObject) JSONValue.parse(edgeJsonLight), v1, v2, factory, GraphsonMode.NORMAL, null); Assert.assertSame(v1, g.getVertex(1)); Assert.assertSame(v2, g.getVertex(2)); @@ -1099,9 +1099,9 @@ public class GraphsonUtilTest { Graph g = new TinkerGraph(); ElementFactory factory = new ElementFactory(g); - Vertex v1 = GraphsonUtil.vertexFromJson((JSONObject) JSONValue.parse(vertexJson1), factory, GraphonMode.COMPACT, null); - Vertex v2 = GraphsonUtil.vertexFromJson((JSONObject) JSONValue.parse(vertexJson2), factory, GraphonMode.COMPACT, null); - Edge e = GraphsonUtil.edgeFromJson(inputStreamEdgeJsonLight, v1, v2, factory, GraphonMode.COMPACT, null); + Vertex v1 = GraphsonUtil.vertexFromJson((JSONObject) JSONValue.parse(vertexJson1), factory, GraphsonMode.COMPACT, null); + Vertex v2 = GraphsonUtil.vertexFromJson((JSONObject) JSONValue.parse(vertexJson2), factory, GraphsonMode.COMPACT, null); + Edge e = GraphsonUtil.edgeFromJson(inputStreamEdgeJsonLight, v1, v2, factory, GraphsonMode.COMPACT, null); Assert.assertSame(v1, g.getVertex(1)); Assert.assertSame(v2, g.getVertex(2)); @@ -1121,7 +1121,7 @@ public class GraphsonUtilTest { add(GraphSONTokens._IN_V); }}; - GraphsonUtil graphson = new GraphsonUtil(GraphonMode.COMPACT, factory, vertexKeys, edgeKeys); + GraphsonUtil graphson = new GraphsonUtil(GraphsonMode.COMPACT, factory, vertexKeys, edgeKeys); Vertex v1 = graphson.vertexFromJson((JSONObject) JSONValue.parse(vertexJson1)); Vertex v2 = graphson.vertexFromJson((JSONObject) JSONValue.parse(vertexJson2)); diff --git a/sonar-core/src/test/java/org/sonar/core/graph/graphson/GraphsonWriterTest.java b/sonar-core/src/test/java/org/sonar/core/graph/graphson/GraphsonWriterTest.java index 77a7c2b1e45..edc716badea 100644 --- a/sonar-core/src/test/java/org/sonar/core/graph/graphson/GraphsonWriterTest.java +++ b/sonar-core/src/test/java/org/sonar/core/graph/graphson/GraphsonWriterTest.java @@ -38,8 +38,8 @@ public class GraphsonWriterTest { ByteArrayOutputStream stream = new ByteArrayOutputStream(); - GraphonWriter writer = new GraphonWriter(); - writer.write(g, stream, GraphonMode.NORMAL); + GraphsonWriter writer = new GraphsonWriter(); + writer.write(g, stream, GraphsonMode.NORMAL); stream.flush(); stream.close(); @@ -51,17 +51,17 @@ public class GraphsonWriterTest { // ensure that the JSON conforms to basic structure and that the right // number of graph elements are present. other tests already cover element formatting assertThat(rootNode).isNotNull(); - assertThat(rootNode.containsKey(GraphonTokens.MODE)).isTrue(); - assertThat(rootNode.get(GraphonTokens.MODE)).isEqualTo("NORMAL"); + assertThat(rootNode.containsKey(GraphsonTokens.MODE)).isTrue(); + assertThat(rootNode.get(GraphsonTokens.MODE)).isEqualTo("NORMAL"); - assertThat(rootNode.containsKey(GraphonTokens.VERTICES)).isTrue(); + assertThat(rootNode.containsKey(GraphsonTokens.VERTICES)).isTrue(); - JSONArray vertices = (JSONArray) rootNode.get(GraphonTokens.VERTICES); + JSONArray vertices = (JSONArray) rootNode.get(GraphsonTokens.VERTICES); assertThat(vertices).hasSize(6); - assertThat(rootNode.containsKey(GraphonTokens.EDGES)).isTrue(); + assertThat(rootNode.containsKey(GraphsonTokens.EDGES)).isTrue(); - JSONArray edges = (JSONArray) rootNode.get(GraphonTokens.EDGES); + JSONArray edges = (JSONArray) rootNode.get(GraphsonTokens.EDGES); assertThat(edges).hasSize(6); } @@ -71,8 +71,8 @@ public class GraphsonWriterTest { ByteArrayOutputStream stream = new ByteArrayOutputStream(); - GraphonWriter writer = new GraphonWriter(); - writer.write(g, stream, GraphonMode.EXTENDED); + GraphsonWriter writer = new GraphsonWriter(); + writer.write(g, stream, GraphsonMode.EXTENDED); stream.flush(); stream.close(); @@ -84,17 +84,17 @@ public class GraphsonWriterTest { // ensure that the JSON conforms to basic structure and that the right // number of graph elements are present. other tests already cover element formatting assertThat(rootNode).isNotNull(); - assertThat(rootNode.containsKey(GraphonTokens.MODE)).isTrue(); - assertThat(rootNode.get(GraphonTokens.MODE)).isEqualTo("EXTENDED"); + assertThat(rootNode.containsKey(GraphsonTokens.MODE)).isTrue(); + assertThat(rootNode.get(GraphsonTokens.MODE)).isEqualTo("EXTENDED"); - assertThat(rootNode.containsKey(GraphonTokens.VERTICES)).isTrue(); + assertThat(rootNode.containsKey(GraphsonTokens.VERTICES)).isTrue(); - JSONArray vertices = (JSONArray) rootNode.get(GraphonTokens.VERTICES); + JSONArray vertices = (JSONArray) rootNode.get(GraphsonTokens.VERTICES); assertThat(vertices).hasSize(6); - assertThat(rootNode.containsKey(GraphonTokens.EDGES)).isTrue(); + assertThat(rootNode.containsKey(GraphsonTokens.EDGES)).isTrue(); - JSONArray edges = (JSONArray) rootNode.get(GraphonTokens.EDGES); + JSONArray edges = (JSONArray) rootNode.get(GraphsonTokens.EDGES); assertThat(edges).hasSize(6); } @@ -104,8 +104,8 @@ public class GraphsonWriterTest { ByteArrayOutputStream stream = new ByteArrayOutputStream(); - GraphonWriter writer = new GraphonWriter(); - writer.write(g, stream, GraphonMode.COMPACT); + GraphsonWriter writer = new GraphsonWriter(); + writer.write(g, stream, GraphsonMode.COMPACT); stream.flush(); stream.close(); @@ -117,17 +117,17 @@ public class GraphsonWriterTest { // ensure that the JSON conforms to basic structure and that the right // number of graph elements are present. other tests already cover element formatting assertThat(rootNode).isNotNull(); - assertThat(rootNode.containsKey(GraphonTokens.MODE)).isTrue(); - assertThat(rootNode.get(GraphonTokens.MODE)).isEqualTo("COMPACT"); + assertThat(rootNode.containsKey(GraphsonTokens.MODE)).isTrue(); + assertThat(rootNode.get(GraphsonTokens.MODE)).isEqualTo("COMPACT"); - assertThat(rootNode.containsKey(GraphonTokens.VERTICES)).isTrue(); + assertThat(rootNode.containsKey(GraphsonTokens.VERTICES)).isTrue(); - JSONArray vertices = (JSONArray) rootNode.get(GraphonTokens.VERTICES); + JSONArray vertices = (JSONArray) rootNode.get(GraphsonTokens.VERTICES); assertThat(vertices).hasSize(6); - assertThat(rootNode.containsKey(GraphonTokens.EDGES)).isTrue(); + assertThat(rootNode.containsKey(GraphsonTokens.EDGES)).isTrue(); - JSONArray edges = (JSONArray) rootNode.get(GraphonTokens.EDGES); + JSONArray edges = (JSONArray) rootNode.get(GraphsonTokens.EDGES); assertThat(edges).hasSize(6); } } -- 2.39.5