Mailing-List: contact commits-help@tinkerpop.incubator.apache.org;
 run by ezmlm
Precedence: bulk
Reply-To: dev@tinkerpop.incubator.apache.org
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: okram@apache.org
To: commits@tinkerpop.incubator.apache.org
Date: Thu, 03 Dec 2015 16:43:06 -0000
Message-Id: <55c67d0cbe604be08b681c85a2d5e538@git.apache.org>
In-Reply-To: <7ddfc1cac2064448b504bfb82908f6f4@git.apache.org>
References: <7ddfc1cac2064448b504bfb82908f6f4@git.apache.org>
Subject: [10/50] incubator-tinkerpop git commit: Get rid of more internal
 "rebound" naming.

Get rid of more internal "rebound" naming.

The naming of "rebound" was deprecated for 3.1.0 so this deprecation was due.  Not a breaking changes as the new Alias client extends ReboundClient - should work as a compile timer replacement.


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

Branch: refs/heads/TINKERPOP3-982
Commit: 12e1250a55df841fbcd8aa37d1da998a17cd7fff
Parents: 5cb5911
Author: Stephen Mallette <spmva@genoprime.com>
Authored: Thu Nov 26 11:04:48 2015 -0500
Committer: Stephen Mallette <spmva@genoprime.com>
Committed: Thu Nov 26 11:04:48 2015 -0500

----------------------------------------------------------------------
 .../apache/tinkerpop/gremlin/driver/Client.java | 35 +++++++++++++++-----
 1 file changed, 26 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/12e1250a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java
index a2308f0..d8a6eca 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java
@@ -310,7 +310,7 @@ public abstract class Client {
          */
         @Override
         public Client alias(String graphOrTraversalSource) {
-            return new ReboundClusteredClient(this, graphOrTraversalSource);
+            return new AliasClusteredClient(this, graphOrTraversalSource);
         }
 
         /**
@@ -329,7 +329,7 @@ public abstract class Client {
          * the created {@code Client}.
          */
         public Client alias(final Map<String,String> aliases) {
-            return new ReboundClusteredClient(this, aliases);
+            return new AliasClusteredClient(this, aliases);
         }
 
         /**
@@ -386,21 +386,38 @@ public abstract class Client {
      * Uses a {@link org.apache.tinkerpop.gremlin.driver.Client.ClusteredClient} that rebinds requests to a
      * specified {@link Graph} or {@link TraversalSource} instances on the server-side.
      */
-    public final static class ReboundClusteredClient extends Client {
+    public final static class AliasClusteredClient extends ReboundClusteredClient {
+        public AliasClusteredClient(ClusteredClient clusteredClient, String graphOrTraversalSource) {
+            super(clusteredClient, graphOrTraversalSource);
+        }
+
+        public AliasClusteredClient(ClusteredClient clusteredClient, Map<String, String> rebindings) {
+            super(clusteredClient, rebindings);
+        }
+    }
+
+    /**
+     * Uses a {@link org.apache.tinkerpop.gremlin.driver.Client.ClusteredClient} that rebinds requests to a
+     * specified {@link Graph} or {@link TraversalSource} instances on the server-side.
+     *
+     * @deprecated As of release 3.1.1-incubating, replaced by {@link AliasClusteredClient}.
+     */
+    @Deprecated
+    public static class ReboundClusteredClient extends Client {
         private final ClusteredClient clusteredClient;
-        private final Map<String,String> rebindings = new HashMap<>();
+        private final Map<String,String> aliases = new HashMap<>();
         final CompletableFuture<Void> close = new CompletableFuture<>();
 
         ReboundClusteredClient(final ClusteredClient clusteredClient, final String graphOrTraversalSource) {
             super(clusteredClient.cluster);
             this.clusteredClient = clusteredClient;
-            rebindings.put("g", graphOrTraversalSource);
+            aliases.put("g", graphOrTraversalSource);
         }
 
         ReboundClusteredClient(final ClusteredClient clusteredClient, final Map<String,String> rebindings) {
             super(clusteredClient.cluster);
             this.clusteredClient = clusteredClient;
-            this.rebindings.putAll(rebindings);
+            this.aliases.putAll(rebindings);
         }
 
         @Override
@@ -416,8 +433,8 @@ public abstract class Client {
         @Override
         public RequestMessage buildMessage(final RequestMessage.Builder builder) {
             if (close.isDone()) throw new IllegalStateException("Client is closed");
-            if (!rebindings.isEmpty())
-                builder.addArg(Tokens.ARGS_ALIASES, rebindings);
+            if (!aliases.isEmpty())
+                builder.addArg(Tokens.ARGS_ALIASES, aliases);
 
             return builder.create();
         }
@@ -462,7 +479,7 @@ public abstract class Client {
         @Override
         public Client alias(String graphOrTraversalSource) {
             if (close.isDone()) throw new IllegalStateException("Client is closed");
-            return new ReboundClusteredClient(clusteredClient, graphOrTraversalSource);
+            return new AliasClusteredClient(clusteredClient, graphOrTraversalSource);
         }
     }