Repository: incubator-s2graph Updated Branches: refs/heads/master 2ce86fa82 -> 0520ffc17
fix wrong escaping of double quotation marks Project: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/commit/0abb56ad Tree: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/tree/0abb56ad Diff: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/diff/0abb56ad Branch: refs/heads/master Commit: 0abb56ad0038fdc7a23de6674f98963ffb6b0bde Parents: 2ce86fa Author: sandyskies <[email protected]> Authored: Wed Mar 21 21:48:45 2018 +0800 Committer: sandyskies <[email protected]> Committed: Wed Mar 21 21:48:45 2018 +0800 ---------------------------------------------------------------------- .../main/scala/org/apache/s2graph/core/rest/RequestParser.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/0abb56ad/s2core/src/main/scala/org/apache/s2graph/core/rest/RequestParser.scala ---------------------------------------------------------------------- diff --git a/s2core/src/main/scala/org/apache/s2graph/core/rest/RequestParser.scala b/s2core/src/main/scala/org/apache/s2graph/core/rest/RequestParser.scala index 55a3638..304cb82 100644 --- a/s2core/src/main/scala/org/apache/s2graph/core/rest/RequestParser.scala +++ b/s2core/src/main/scala/org/apache/s2graph/core/rest/RequestParser.scala @@ -582,12 +582,12 @@ class RequestParser(graph: S2GraphLike) { } def toVertex(jsValue: JsValue, operation: String, serviceName: Option[String] = None, columnName: Option[String] = None): S2VertexLike = { - val id = parse[JsValue](jsValue, "id") + val id = parse[String](jsValue, "id") val ts = parseOption[Long](jsValue, "timestamp").getOrElse(System.currentTimeMillis()) val sName = if (serviceName.isEmpty) parse[String](jsValue, "serviceName") else serviceName.get val cName = if (columnName.isEmpty) parse[String](jsValue, "columnName") else columnName.get val props = fromJsonToProperties((jsValue \ "props").asOpt[JsObject].getOrElse(Json.obj())) - graph.toVertex(sName, cName, id.toString, props, ts, operation) + graph.toVertex(sName, cName, id, props, ts, operation) } def toPropElements(jsObj: JsValue) = Try {
