Merge branch 'S2GRAPH-180' of https://github.com/daewon/incubator-s2graph into daewon-S2GRAPH-180
Project: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/commit/6ff84142 Tree: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/tree/6ff84142 Diff: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/diff/6ff84142 Branch: refs/heads/master Commit: 6ff8414217692c491e7e87d6b77f6b1a746949b9 Parents: bb9738f ca7adee Author: DO YUNG YOON <[email protected]> Authored: Tue Mar 27 12:57:41 2018 +0900 Committer: DO YUNG YOON <[email protected]> Committed: Tue Mar 27 12:57:41 2018 +0900 ---------------------------------------------------------------------- .../org/apache/s2graph/core/Management.scala | 13 +- .../apache/s2graph/core/S2VertexProperty.scala | 3 + .../apache/s2graph/core/mysqls/LabelMeta.scala | 4 +- .../apache/s2graph/core/mysqls/Service.scala | 2 +- .../s2graph/core/mysqls/ServiceColumn.scala | 1 + s2graphql/README.md | 493 +++++++++----- s2graphql/build.sbt | 3 +- s2graphql/src/main/resources/application.conf | 3 +- s2graphql/src/main/scala/GraphQLServer.scala | 110 --- s2graphql/src/main/scala/GraphRepository.scala | 211 ------ s2graphql/src/main/scala/HttpServer.scala | 61 -- s2graphql/src/main/scala/S2Type.scala | 682 ------------------- .../main/scala/SangriaPlayJsonScalarType.scala | 76 --- s2graphql/src/main/scala/SchemaDef.scala | 36 - .../apache/s2graph/graphql/GraphQLServer.scala | 107 +++ .../org/apache/s2graph/graphql/HttpServer.scala | 62 ++ .../s2graph/graphql/marshaller/package.scala | 105 +++ .../graphql/repository/GraphRepository.scala | 226 ++++++ .../s2graph/graphql/resolver/Resolver.scala | 9 + .../graphql/types/S2ManagementType.scala | 341 ++++++++++ .../apache/s2graph/graphql/types/S2Type.scala | 336 +++++++++ .../types/SangriaPlayJsonScalarType.scala | 76 +++ .../s2graph/graphql/types/SchemaDef.scala | 51 ++ .../apache/s2graph/graphql/types/package.scala | 152 +++++ s2graphql/src/test/resources/application.conf | 16 +- .../apache/s2graph/graphql/ScenarioTest.scala | 597 ++++++++++++++++ .../org/apache/s2graph/graphql/SchemaTest.scala | 125 ++++ .../org/apache/s2graph/graphql/TestGraph.scala | 107 +++ 28 files changed, 2658 insertions(+), 1350 deletions(-) ----------------------------------------------------------------------
