tinkerpop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From spmalle...@apache.org
Subject [02/11] tinkerpop git commit: TINKERPOP-1275 Removed previously deprecated max setting for :remote
Date Wed, 05 Jul 2017 15:45:52 GMT
TINKERPOP-1275 Removed previously deprecated max setting for :remote


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

Branch: refs/heads/master
Commit: 7c04cee8834233f977547d1fe5f19a94fd97a46a
Parents: 90c9a58
Author: Stephen Mallette <spmva@genoprime.com>
Authored: Mon Jun 26 16:01:35 2017 -0400
Committer: Stephen Mallette <spmva@genoprime.com>
Committed: Thu Jun 29 14:51:11 2017 -0400

----------------------------------------------------------------------
 CHANGELOG.asciidoc                                       |  1 +
 .../gremlin/console/jsr223/DriverRemoteAcceptor.java     | 11 ++---------
 2 files changed, 3 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7c04cee8/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 4179f10..9390acd 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+* Removed previously deprecated `:remote config timeout max`.
 * Removed previously deprecated `ConnectionPoolSettings.sessionId` and `ConnectionPoolSettings.optionalSessionId()`.
 * Removed previously deprecated `reconnectInitialDelay` setting from the Java driver.
 * Removed support for passing a byte array on the `sasl` parameter.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7c04cee8/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverRemoteAcceptor.java
----------------------------------------------------------------------
diff --git a/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverRemoteAcceptor.java
b/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverRemoteAcceptor.java
index 51272ba..d349971 100644
--- a/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverRemoteAcceptor.java
+++ b/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverRemoteAcceptor.java
@@ -63,11 +63,6 @@ public class DriverRemoteAcceptor implements RemoteAcceptor {
     private static final String TOKEN_RESET = "reset";
     private static final String TOKEN_SHOW = "show";
 
-    /**
-     * @deprecated As of 3.1.3, replaced by "none" option
-     */
-    @Deprecated
-    private static final String TOKEN_MAX = "max";
     private static final String TOKEN_NONE = "none";
     private static final String TOKEN_TIMEOUT = "timeout";
     private static final String TOKEN_ALIAS = "alias";
@@ -122,10 +117,8 @@ public class DriverRemoteAcceptor implements RemoteAcceptor {
             final String errorMessage = "The timeout option expects a positive integer representing
milliseconds or 'none' as an argument";
             if (arguments.size() != 1) throw new RemoteException(errorMessage);
             try {
-                // first check for MAX timeout then NONE and finally parse the config to
int. "max" is now "deprecated"
-                // in the sense that it will no longer be promoted. support for it will be
removed at a later date
-                timeout = arguments.get(0).equals(TOKEN_MAX) ? Integer.MAX_VALUE :
-                        arguments.get(0).equals(TOKEN_NONE) ? NO_TIMEOUT : Integer.parseInt(arguments.get(0));
+                // first check for MAX timeout then NONE and finally parse the config to
int.
+                timeout = arguments.get(0).equals(TOKEN_NONE) ? NO_TIMEOUT : Integer.parseInt(arguments.get(0));
                 if (timeout < NO_TIMEOUT) throw new RemoteException("The value for the
timeout cannot be less than " + NO_TIMEOUT);
                 return timeout == NO_TIMEOUT ? "Remote timeout is disabled" : "Set remote
timeout to " + timeout + "ms";
             } catch (Exception ignored) {


Mime
View raw message