You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2015/09/08 19:26:44 UTC
[1/7] incubator-tinkerpop git commit: fixed the extra-whitespace
problem in the AsciiDoc preprocessor that occured with too small terminal
window dimensions
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master bddc44bcb -> e6430068f
fixed the extra-whitespace problem in the AsciiDoc preprocessor that occured with too small terminal window dimensions
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/93bc0a82
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/93bc0a82
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/93bc0a82
Branch: refs/heads/master
Commit: 93bc0a8208d1dd716bcba56f25284a1cad130b25
Parents: 847642e
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Thu Sep 3 19:45:47 2015 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Thu Sep 3 19:45:47 2015 +0200
----------------------------------------------------------------------
docs/preprocessor/preprocess.sh | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/93bc0a82/docs/preprocessor/preprocess.sh
----------------------------------------------------------------------
diff --git a/docs/preprocessor/preprocess.sh b/docs/preprocessor/preprocess.sh
index dbd3ef0..7d78efb 100755
--- a/docs/preprocessor/preprocess.sh
+++ b/docs/preprocessor/preprocess.sh
@@ -107,6 +107,11 @@ else
fi
# process *.asciidoc files
+COLS=${COLUMNS}
+[[ ${COLUMNS} -lt 240 ]] && stty cols 240
+
+tput rmam
+
echo
echo "============================"
echo "+ Processing AsciiDocs +"
@@ -123,6 +128,9 @@ for i in {0..7}; do
[ ${ec} -eq 0 ] || break
done
+tput smam
+stty cols ${COLS}
+
if [ ${ec} -ne 0 ]; then
exit 1
else
[7/7] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/tp30'
Posted by sp...@apache.org.
Merge remote-tracking branch 'origin/tp30'
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/e6430068
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/e6430068
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/e6430068
Branch: refs/heads/master
Commit: e6430068f9a54eb331badc4f8e0a616eb9dac48a
Parents: bddc44b 187ea93
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Sep 8 13:25:48 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Sep 8 13:25:48 2015 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
docs/preprocessor/preprocess.sh | 8 ++++
.../gremlin/driver/AuthProperties.java | 34 +++++++++++++--
.../tinkerpop/gremlin/driver/Cluster.java | 46 ++++++++++++++++++++
.../tinkerpop/gremlin/driver/Handler.java | 2 +-
.../step/branch/GroovyRepeatTest.groovy | 2 +-
.../step/sideEffect/GroovyStoreTest.groovy | 2 +-
.../server/GremlinDriverIntegrateTest.java | 11 +++--
8 files changed, 96 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/e6430068/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/e6430068/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/e6430068/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyRepeatTest.groovy
----------------------------------------------------------------------
diff --cc gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyRepeatTest.groovy
index c459740,8bdf020..691732f
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyRepeatTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyRepeatTest.groovy
@@@ -76,13 -76,8 +76,13 @@@ public abstract class GroovyRepeatTest
}
@Override
+ public Traversal<Vertex, Map<String, Vertex>> get_g_V_repeatXbothX_timesX10X_asXaX_out_asXbX_selectXa_bX() {
+ TraversalScriptHelper.compute("g.V.repeat(both()).times(10).as('a').out().as('b').select('a', 'b')", g);
+ }
+
+ @Override
public Traversal<Vertex, String> get_g_VX1X_repeatXoutX_untilXoutE_count_isX0XX_name(final Object v1Id) {
- TraversalScriptHelper.compute("g.V(${v1Id}).repeat(out()).until(__.outE.count.is(0)).name", g, "v1Id", v1Id)
+ TraversalScriptHelper.compute("g.V(v1Id).repeat(out()).until(__.outE.count.is(0)).name", g, "v1Id", v1Id)
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/e6430068/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
----------------------------------------------------------------------
[3/7] incubator-tinkerpop git commit: Added more javadoc.
Posted by sp...@apache.org.
Added more javadoc.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/7351675f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/7351675f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/7351675f
Branch: refs/heads/master
Commit: 7351675f39b2749f9b342b43497d3a2567de40ed
Parents: 27322ab
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Sep 4 12:18:24 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Sep 4 12:18:24 2015 -0400
----------------------------------------------------------------------
.../tinkerpop/gremlin/driver/Cluster.java | 46 ++++++++++++++++++++
1 file changed, 46 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/7351675f/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
index a732ad5..9aeb9bf 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
@@ -71,6 +71,11 @@ public final class Cluster {
* Creates a {@link Client.ClusteredClient} instance to this {@code Cluster}, meaning requests will be routed to
* one or more servers (depending on the cluster configuration), where each request represents the entirety of a
* transaction. A commit or rollback (in case of error) is automatically executed at the end of the request.
+ * <p/>
+ * Note that calling this method does not imply that a connection is made to the server itself at this point.
+ * Therefore, if there is only one server specified in the {@code Cluster} and that server is not available an
+ * error will not be raised at this point. Connections get initialized in the {@link Client} when a request is
+ * submitted or can be directly initialized via {@link Client#init()}.
*/
public Client connect() {
return new Client.ClusteredClient(this);
@@ -81,6 +86,11 @@ public final class Cluster {
* a single server (randomly selected from the cluster), where the same bindings will be available on each request.
* Requests are bound to the same thread on the server and thus transactions may extend beyond the bounds of a
* single request. The transactions are managed by the user and must be committed or rolledback manually.
+ * <p/>
+ * Note that calling this method does not imply that a connection is made to the server itself at this point.
+ * Therefore, if there is only one server specified in the {@code Cluster} and that server is not available an
+ * error will not be raised at this point. Connections get initialized in the {@link Client} when a request is
+ * submitted or can be directly initialized via {@link Client#init()}.
*
* @param sessionId user supplied id for the session which should be unique (a UUID is ideal).
*/
@@ -178,6 +188,13 @@ public final class Cluster {
return manager.isClosing() && manager.close().isDone();
}
+ /**
+ * Gets the list of hosts that the {@code Cluster} was able to connect to. A {@link Host} is assumed unavailable
+ * until a connection to it is proven to be present. This will not happen until the the {@link Client} submits
+ * requests that succeed in reaching a server at the {@link Host} or {@link Client#init()} is called which
+ * initializes the {@link ConnectionPool} for the {@link Client} itself. The number of available hosts returned
+ * from this method will change as different servers come on and offline.
+ */
public List<URI> availableHosts() {
return Collections.unmodifiableList(allHosts().stream()
.filter(Host::isAvailable)
@@ -402,31 +419,52 @@ public final class Cluster {
return this;
}
+ /**
+ * Specifies the load balancing strategy to use on the client side.
+ */
public Builder loadBalancingStrategy(final LoadBalancingStrategy loadBalancingStrategy) {
this.loadBalancingStrategy = loadBalancingStrategy;
return this;
}
+ /**
+ * Specifies parameters for authentication to Gremlin Server.
+ */
public Builder authProperties(final AuthProperties authProps) {
this.authProps = authProps;
return this;
}
+ /**
+ * Sets the {@link AuthProperties.Property#USERNAME} and {@link AuthProperties.Property#PASSWORD} properties
+ * for authentication to Gremlin Server.
+ */
public Builder credentials(final String username, final String password) {
authProps = authProps.with(AuthProperties.Property.USERNAME, username).with(AuthProperties.Property.PASSWORD, password);
return this;
}
+ /**
+ * Sets the {@link AuthProperties.Property#PROTOCOL} properties for authentication to Gremlin Server.
+ */
public Builder protocol(final String protocol) {
this.authProps = authProps.with(AuthProperties.Property.PROTOCOL, protocol);
return this;
}
+ /**
+ * Sets the {@link AuthProperties.Property#JAAS_ENTRY} properties for authentication to Gremlin Server.
+ */
public Builder jaasEntry(final String jaasEntry) {
this.authProps = authProps.with(AuthProperties.Property.JAAS_ENTRY, jaasEntry);
return this;
}
+ /**
+ * Adds the address of a Gremlin Server to the list of servers a {@link Client} will try to contact to send
+ * requests to. The address should be parseable by {@link InetAddress#getByName(String)}. That's the only
+ * validation performed at this point. No connection to the host is attempted.
+ */
public Builder addContactPoint(final String address) {
try {
this.addresses.add(InetAddress.getByName(address));
@@ -436,12 +474,20 @@ public final class Cluster {
}
}
+ /**
+ * Add one or more the addresses of a Gremlin Servers to the list of servers a {@link Client} will try to
+ * contact to send requests to. The address should be parseable by {@link InetAddress#getByName(String)}.
+ * That's the only validation performed at this point. No connection to the host is attempted.
+ */
public Builder addContactPoints(final String... addresses) {
for (String address : addresses)
addContactPoint(address);
return this;
}
+ /**
+ * Sets the port that the Gremlin Servers will be listening on.
+ */
public Builder port(final int port) {
this.port = port;
return this;
[6/7] incubator-tinkerpop git commit: Changed groovy tests which were
using string concatenation instead of bindings.
Posted by sp...@apache.org.
Changed groovy tests which were using string concatenation instead of bindings.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/187ea93f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/187ea93f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/187ea93f
Branch: refs/heads/master
Commit: 187ea93f61158ef56139a2a0efa1446fef0a48a3
Parents: b6784d9
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Sep 8 09:34:04 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Sep 8 09:34:04 2015 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../gremlin/process/traversal/step/branch/GroovyRepeatTest.groovy | 2 +-
.../process/traversal/step/sideEffect/GroovyStoreTest.groovy | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/187ea93f/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 3669d6c..60c555d 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -25,6 +25,7 @@ image::https://raw.githubusercontent.com/apache/incubator-tinkerpop/master/docs/
TinkerPop 3.0.2 (NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Fixed id parameter used in tests for `GroovyStoreTest` and `GroovyRepeatTest` to not be treated as an embedded string.
* `GraphStep` will convert any `Vertex` or `Edge` ids to their id `Object` prior to submission to `GraphComputer` (OLAP).
TinkerPop 3.0.1 (Release Date: September 2, 2015)
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/187ea93f/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyRepeatTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyRepeatTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyRepeatTest.groovy
index 42b7a77..8bdf020 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyRepeatTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyRepeatTest.groovy
@@ -77,7 +77,7 @@ public abstract class GroovyRepeatTest {
@Override
public Traversal<Vertex, String> get_g_VX1X_repeatXoutX_untilXoutE_count_isX0XX_name(final Object v1Id) {
- TraversalScriptHelper.compute("g.V(${v1Id}).repeat(out()).until(__.outE.count.is(0)).name", g, "v1Id", v1Id)
+ TraversalScriptHelper.compute("g.V(v1Id).repeat(out()).until(__.outE.count.is(0)).name", g, "v1Id", v1Id)
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/187ea93f/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovyStoreTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovyStoreTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovyStoreTest.groovy
index 808593b..0a9270a 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovyStoreTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovyStoreTest.groovy
@@ -37,7 +37,7 @@ public abstract class GroovyStoreTest {
@Override
public Traversal<Vertex, Collection> get_g_VX1X_storeXaX_byXnameX_out_storeXaX_byXnameX_name_capXaX(
final Object v1Id) {
- TraversalScriptHelper.compute("g.V(${v1Id}).store('a').by('name').out().store('a').by('name').name.cap('a')", g)
+ TraversalScriptHelper.compute("g.V(v1Id).store('a').by('name').out().store('a').by('name').name.cap('a')", g, "v1Id", v1Id)
}
@Override
[5/7] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/tp30' into tp30
Posted by sp...@apache.org.
Merge remote-tracking branch 'origin/tp30' into tp30
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/b6784d9c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/b6784d9c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/b6784d9c
Branch: refs/heads/master
Commit: b6784d9ccdc57fe41ea3b23542299b50241381c1
Parents: 8881caf 93bc0a8
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Sep 4 12:19:48 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Sep 4 12:19:48 2015 -0400
----------------------------------------------------------------------
docs/preprocessor/preprocess.sh | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
[2/7] incubator-tinkerpop git commit: Update javadoc.
Posted by sp...@apache.org.
Update javadoc.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/27322aba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/27322aba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/27322aba
Branch: refs/heads/master
Commit: 27322aba7d78f76547a42c740b2c75f931183d0c
Parents: 847642e
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Sep 4 10:14:45 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Sep 4 10:14:45 2015 -0400
----------------------------------------------------------------------
.../gremlin/driver/AuthProperties.java | 34 ++++++++++++++++++--
.../tinkerpop/gremlin/driver/Handler.java | 2 +-
2 files changed, 32 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/27322aba/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/AuthProperties.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/AuthProperties.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/AuthProperties.java
index 3fd464a..2c1b4d4 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/AuthProperties.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/AuthProperties.java
@@ -21,22 +21,50 @@ package org.apache.tinkerpop.gremlin.driver;
import java.util.HashMap;
import java.util.Map;
+/**
+ * Properties to supply to the {@link Cluster} for authentication purposes.
+ */
public class AuthProperties {
+
+ /**
+ * An enum of the available authorization properties.
+ */
public enum Property {
+ /**
+ * The username.
+ */
USERNAME,
+
+ /**
+ * The password.
+ */
PASSWORD,
+
+ /**
+ * The protocol for which the authentication is being performed (e.g., "ldap").
+ */
PROTOCOL,
+
+ /**
+ * The name used as the index into the configuration for the {@code LoginContext}.
+ */
JAAS_ENTRY
}
- private Map<Property, String> properties = new HashMap<>();
+ private final Map<Property, String> properties = new HashMap<>();
- public AuthProperties with(Property key, String value) {
+ /**
+ * Adds a {@link Property} with value to the authorization property set.
+ */
+ public AuthProperties with(final Property key, final String value) {
properties.put(key, value);
return this;
}
- public String get(Property key) {
+ /**
+ * Gets a property given the key.
+ */
+ public String get(final Property key) {
return properties.get(key);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/27322aba/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Handler.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Handler.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Handler.java
index 73df542..8871f13 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Handler.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Handler.java
@@ -129,7 +129,7 @@ final class Handler {
private Subject login() throws LoginException {
// Login if the user provided us with an entry into the JAAS config file
if (authProps.get(AuthProperties.Property.JAAS_ENTRY) != null) {
- LoginContext login = new LoginContext(authProps.get(AuthProperties.Property.JAAS_ENTRY));
+ final LoginContext login = new LoginContext(authProps.get(AuthProperties.Property.JAAS_ENTRY));
login.login();
return login.getSubject();
}
[4/7] incubator-tinkerpop git commit: Improve gremlin driver tests.
Posted by sp...@apache.org.
Improve gremlin driver tests.
Ensure that availableHosts is tested before init() of the Client, after init() of the client and after the server goes down.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/8881caff
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/8881caff
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/8881caff
Branch: refs/heads/master
Commit: 8881caffe1cc6bab2682b4876047a3a85d83f209
Parents: 7351675
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Sep 4 12:18:31 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Sep 4 12:18:31 2015 -0400
----------------------------------------------------------------------
.../gremlin/server/GremlinDriverIntegrateTest.java | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/8881caff/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 407436c..326d746 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
@@ -332,7 +332,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldCloseWithServerDown() throws Exception {
final Cluster cluster = Cluster.open();
- cluster.connect();
+ cluster.connect().init();
stopServer();
@@ -341,11 +341,14 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldMarkHostDeadSinceServerIsDown() throws Exception {
- stopServer();
-
final Cluster cluster = Cluster.open();
- cluster.connect();
+ assertEquals(0, cluster.availableHosts().size());
+ cluster.connect().init();
+ assertEquals(1, cluster.availableHosts().size());
+
+ stopServer();
+ cluster.connect().init();
assertEquals(0, cluster.availableHosts().size());
cluster.close();