tinkerpop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From spmalle...@apache.org
Subject incubator-tinkerpop git commit: Fixed what could only be a bad merge error around aliasing sessions.
Date Fri, 18 Mar 2016 20:38:50 GMT
Repository: incubator-tinkerpop
Updated Branches:
  refs/heads/master 60f977839 -> b6ed51577


Fixed what could only be a bad merge error around aliasing sessions.

Gremlin Driver integration tests should be working again.


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

Branch: refs/heads/master
Commit: b6ed515772d8ff4fdf61f17d10078960fe102128
Parents: 60f9778
Author: Stephen Mallette <spmva@genoprime.com>
Authored: Fri Mar 18 16:37:24 2016 -0400
Committer: Stephen Mallette <spmva@genoprime.com>
Committed: Fri Mar 18 16:38:40 2016 -0400

----------------------------------------------------------------------
 .../apache/tinkerpop/gremlin/driver/Client.java | 34 ++++----------------
 1 file changed, 6 insertions(+), 28 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/b6ed5157/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 ac8d5d8..9eb0b35 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
@@ -122,13 +122,13 @@ public abstract class Client {
     }
 
     /**
-     * Create a a new {@code Client} that aliases against multiple {@link Graph} or {@link
TraversalSource} instances,
-     * where the key to the supplied {@link Map} is the "alias" and the value is the name
of the {@link Graph} or
-     * {@link TraversalSource} on the server.
-     *
-     * @param aliases one or more aliases
+     * Creates a {@code Client} that supplies the specified set of aliases, thus allowing
the user to re-name
+     * one or more globally defined {@link Graph} or {@link TraversalSource} server bindings
for the context of
+     * the created {@code Client}.
      */
-    public abstract Client alias(final Map<String,String> aliases);
+    public Client alias(final Map<String,String> aliases) {
+        return new AliasClusteredClient(this, aliases, settings);
+    }
 
     /**
      * Submit a {@link Traversal} to the server for remote execution.
@@ -627,28 +627,6 @@ public abstract class Client {
         }
 
         /**
-         * The sessioned client does not support this feature.
-         *
-         * @throws UnsupportedOperationException
-         * @deprecated As of release 3.1.0, replaced by {@link #alias(String)}
-         */
-        @Deprecated
-        @Override
-        public Client rebind(final String graphOrTraversalSourceName){
-            throw new UnsupportedOperationException("Sessioned client does not support aliasing");
-        }
-
-        /**
-         * The sessioned client does not support this feature.
-         *
-         * @throws UnsupportedOperationException
-         */
-        @Override
-        public Client alias(final Map<String, String> aliases) {
-            throw new UnsupportedOperationException("Sessioned client does not support aliasing");
-        }
-
-        /**
          * Adds the {@link Tokens#ARGS_SESSION} value to every {@link RequestMessage}.
          */
         @Override


Mime
View raw message