You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2017/07/11 14:07:47 UTC
tinkerpop git commit: fixed the string addV()-deprecated calls in
GremlinDriverIntegrateTest. Also,
added the link: to the ISSUE in release-3.3.x.asciidoc.
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-832 bbfd7a663 -> 7aff2b891
fixed the string addV()-deprecated calls in GremlinDriverIntegrateTest. Also, added the link: to the ISSUE in release-3.3.x.asciidoc.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/7aff2b89
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/7aff2b89
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/7aff2b89
Branch: refs/heads/TINKERPOP-832
Commit: 7aff2b8911c9080f4be3f78cc6b5afba8e0252e4
Parents: bbfd7a6
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Jul 11 08:07:44 2017 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Jul 11 08:07:44 2017 -0600
----------------------------------------------------------------------
docs/src/upgrade/release-3.3.x.asciidoc | 3 ++-
.../server/GremlinDriverIntegrateTest.java | 18 +++++++++---------
2 files changed, 11 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7aff2b89/docs/src/upgrade/release-3.3.x.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/upgrade/release-3.3.x.asciidoc b/docs/src/upgrade/release-3.3.x.asciidoc
index 13c1f6c..24bda76 100644
--- a/docs/src/upgrade/release-3.3.x.asciidoc
+++ b/docs/src/upgrade/release-3.3.x.asciidoc
@@ -308,7 +308,8 @@ link:https://issues.apache.org/jira/browse/TINKERPOP-1612[TINKERPOP-1612],
link:https://issues.apache.org/jira/browse/TINKERPOP-1622[TINKERPOP-1622],
link:https://issues.apache.org/jira/browse/TINKERPOP-1651[TINKERPOP-1651],
link:https://issues.apache.org/jira/browse/TINKERPOP-1694[TINKERPOP-1694],
-link:https://issues.apache.org/jira/browse/TINKERPOP-1700[TINKERPOP-1700]
+link:https://issues.apache.org/jira/browse/TINKERPOP-1700[TINKERPOP-1700],
+link:https://issues.apache.org/jira/browse/TINKERPOP-832[TINKERPOP-832]
Gremlin-server.sh and Init Scripts
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7aff2b89/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
index 746c6f8..12f780a 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
@@ -985,7 +985,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
final Client client = cluster.connect();
// this line is important because it tests GraphTraversal which has a certain transactional path
- final Vertex vertexRequest1 = client.submit("g.addV(\"name\",\"stephen\")").all().get().get(0).getVertex();
+ final Vertex vertexRequest1 = client.submit("g.addV().property(\"name\",\"stephen\")").all().get().get(0).getVertex();
assertEquals("stephen", vertexRequest1.values("name").next());
final Vertex vertexRequest2 = client.submit("graph.vertices().next()").all().get().get(0).getVertex();
@@ -1211,7 +1211,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
final Client client = cluster.connect();
try {
- client.submit("g.addV('name','stephen')").all().get().get(0).getVertex();
+ client.submit("g.addV().property('name','stephen')").all().get().get(0).getVertex();
fail("Should have tossed an exception because \"g\" is readonly in this context");
} catch (Exception ex) {
final Throwable root = ExceptionUtils.getRootCause(ex);
@@ -1222,11 +1222,11 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
// keep the testing here until "rebind" is completely removed
final Client clientLegacy = client.rebind("g1");
- final Vertex vLegacy = clientLegacy.submit("g.addV('name','stephen')").all().get().get(0).getVertex();
+ final Vertex vLegacy = clientLegacy.submit("g.addV().property('name','stephen')").all().get().get(0).getVertex();
assertEquals("stephen", vLegacy.value("name"));
final Client clientAliased = client.alias("g1");
- final Vertex v = clientAliased.submit("g.addV('name','jason')").all().get().get(0).getVertex();
+ final Vertex v = clientAliased.submit("g.addV().property('name','jason')").all().get().get(0).getVertex();
assertEquals("jason", v.value("name"));
cluster.close();
@@ -1267,7 +1267,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
final Client client = cluster.connect(name.getMethodName());
try {
- client.submit("g.addV('name','stephen')").all().get().get(0).getVertex();
+ client.submit("g.addV().property('name','stephen')").all().get().get(0).getVertex();
fail("Should have tossed an exception because \"g\" is readonly in this context");
} catch (Exception ex) {
final Throwable root = ExceptionUtils.getRootCause(ex);
@@ -1279,12 +1279,12 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
// keep the testing here until "rebind" is completely removed
final Client clientLegacy = client.rebind("g1");
assertEquals("stephen", clientLegacy.submit("n='stephen'").all().get().get(0).getString());
- final Vertex vLegacy = clientLegacy.submit("g.addV('name',n)").all().get().get(0).getVertex();
+ final Vertex vLegacy = clientLegacy.submit("g.addV().property('name',n)").all().get().get(0).getVertex();
assertEquals("stephen", vLegacy.value("name"));
final Client clientAliased = client.alias("g1");
assertEquals("jason", clientAliased.submit("n='jason'").all().get().get(0).getString());
- final Vertex v = clientAliased.submit("g.addV('name',n)").all().get().get(0).getVertex();
+ final Vertex v = clientAliased.submit("g.addV().property('name',n)").all().get().get(0).getVertex();
assertEquals("jason", v.value("name"));
cluster.close();
@@ -1300,7 +1300,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
final Client sessionWithoutManagedTx = cluster.connect(name.getMethodName() + "-not-managed");
// this should auto-commit
- final Vertex vStephen = sessionWithManagedTx.submit("v = g.addV('name','stephen').next()").all().get().get(0).getVertex();
+ final Vertex vStephen = sessionWithManagedTx.submit("v = g.addV().property('name','stephen').next()").all().get().get(0).getVertex();
assertEquals("stephen", vStephen.value("name"));
// the other clients should see that change because of auto-commit
@@ -1308,7 +1308,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
assertThat(sessionWithoutManagedTx.submit("g.V().has('name','stephen').hasNext()").all().get().get(0).getBoolean(), is(true));
// this should NOT auto-commit
- final Vertex vDaniel = sessionWithoutManagedTx.submit("v = g.addV('name','daniel').next()").all().get().get(0).getVertex();
+ final Vertex vDaniel = sessionWithoutManagedTx.submit("v = g.addV().property('name','daniel').next()").all().get().get(0).getVertex();
assertEquals("daniel", vDaniel.value("name"));
// the other clients should NOT see that change because of auto-commit