tinkerpop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ok...@apache.org
Subject [12/18] tinkerpop git commit: Merge branch 'tp31'
Date Wed, 15 Jun 2016 13:42:08 GMT
Merge branch 'tp31'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8147e119
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8147e119
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8147e119

Branch: refs/heads/TINKERPOP-1278
Commit: 8147e119e14798f81d70a65694a1c0b13f58a7c1
Parents: 7baad27 9c8c655
Author: Marko A. Rodriguez <okrammarko@gmail.com>
Authored: Tue Jun 14 14:18:51 2016 -0600
Committer: Marko A. Rodriguez <okrammarko@gmail.com>
Committed: Tue Jun 14 14:18:51 2016 -0600

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |  1 +
 .../structure/io/graphml/GraphMLReader.java     |  3 +-
 .../step/map/GroovyPropertiesTest.groovy        |  6 +++
 .../traversal/step/map/PropertiesTest.java      | 53 ++++++++++++++++++--
 .../tinkerpop/gremlin/structure/io/IoTest.java  | 40 +++++++++++++++
 .../io/graphml/tinkerpop-no-edge-labels.xml     | 25 +++++++++
 6 files changed, 122 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8147e119/CHANGELOG.asciidoc
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8147e119/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPropertiesTest.groovy
----------------------------------------------------------------------
diff --cc gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPropertiesTest.groovy
index 702b51f,ec57cd3..895eccd
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPropertiesTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPropertiesTest.groovy
@@@ -19,8 -19,9 +19,9 @@@
  package org.apache.tinkerpop.gremlin.process.traversal.step.map
  
  import org.apache.tinkerpop.gremlin.process.traversal.Traversal
 -import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptHelper
 +import org.apache.tinkerpop.gremlin.process.traversal.util.ScriptTraversal
  import org.apache.tinkerpop.gremlin.structure.Vertex
+ import org.apache.tinkerpop.gremlin.structure.VertexProperty
  
  /**
   * @author Marko A. Rodriguez (http://markorodriguez.com)
@@@ -41,8 -42,13 +42,13 @@@ public abstract class GroovyPropertiesT
  
          @Override
          public Traversal<Vertex, Object> get_g_V_hasXageX_properties_hasXid_nameIdX_value(final
Object nameId) {
 -            TraversalScriptHelper.compute("g.V.has('age').properties().has(T.id, nameId).value()",
g, "nameId", nameId)
 +            new ScriptTraversal<>(g, "gremlin-groovy", "g.V.has('age').properties().has(T.id,
nameId).value()", "nameId", nameId)
          }
+ 
+         @Override
+         public Traversal<Vertex, VertexProperty<String>> get_g_V_hasXageX_propertiesXnameX()
{
 -            TraversalScriptHelper.compute("g.V.has('age').properties('name')", g)
++            new ScriptTraversal<>(g, "gremlin-groovy", "g.V.has('age').properties('name')",
g)
+         }
      }
  
  }


Mime
View raw message