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/05/18 20:03:21 UTC
[1/3] incubator-tinkerpop git commit: Minor update to javadoc.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master f9e2ee192 -> fcb8440a2
Minor update to 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/b6b4a938
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/b6b4a938
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/b6b4a938
Branch: refs/heads/master
Commit: b6b4a9383eb8153d9a36bd0e200e2ad376949560
Parents: e654493
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon May 18 13:51:28 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon May 18 13:51:28 2015 -0400
----------------------------------------------------------------------
.../org/apache/tinkerpop/gremlin/driver/MessageSerializer.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/b6b4a938/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/MessageSerializer.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/MessageSerializer.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/MessageSerializer.java
index f2bd8fd..af39cd4 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/MessageSerializer.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/MessageSerializer.java
@@ -28,12 +28,13 @@ import io.netty.buffer.ByteBufAllocator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.Iterator;
import java.util.Map;
import java.util.ServiceLoader;
/**
* Serializes data to and from Gremlin Server. Typically the object being serialized or deserialized will be an item
- * from an {@link java.util.Iterator} as returned from the {@code ScriptEngine} or an incoming {@link org.apache.tinkerpop.gremlin.driver.message.RequestMessage}.
+ * from an {@link Iterator} as returned from the {@code ScriptEngine} or an incoming {@link RequestMessage}.
* {@link MessageSerializer} instances are instantiated to a cache via {@link ServiceLoader} and indexed based on
* the mime types they support. If a mime type is supported more than once, the last {@link MessageSerializer}
* instance loaded for that mime type is assigned. If a mime type is not found the default
[2/3] incubator-tinkerpop git commit: Updates to javadocs.
Posted by sp...@apache.org.
Updates to javadocs.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/346187cd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/346187cd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/346187cd
Branch: refs/heads/master
Commit: 346187cd474031e1662e960fe4df0bdfdd4309ad
Parents: b6b4a93
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon May 18 14:02:55 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon May 18 14:02:55 2015 -0400
----------------------------------------------------------------------
.../apache/tinkerpop/gremlin/driver/Cluster.java | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/346187cd/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 0820110..af6c850 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
@@ -234,21 +234,37 @@ public class Cluster {
return this;
}
+ /**
+ * Set the {@link MessageSerializer} to use given its MIME type. Note that setting this value this way
+ * will not allow specific configuration of the serializer itself. If specific configuration is required
+ * please use {@link #serializer(MessageSerializer)}.
+ */
public Builder serializer(final String mimeType) {
serializer = Serializers.valueOf(mimeType).simpleInstance();
return this;
}
+ /**
+ * Set the {@link MessageSerializer} to use via the {@link Serializers} enum. If specific configuration is
+ * required please use {@link #serializer(MessageSerializer)}.
+ */
public Builder serializer(final Serializers mimeType) {
serializer = mimeType.simpleInstance();
return this;
}
+ /**
+ * Sets the {@link MessageSerializer} to use.
+ */
public Builder serializer(final MessageSerializer serializer) {
this.serializer = serializer;
return this;
}
+ /**
+ * Enables connectivity over SSL - note that the server should be configured with SSL turned on for this
+ * setting to work properly.
+ */
public Builder enableSsl(final boolean enable) {
this.enableSsl = enable;
return this;
[3/3] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/master'
Posted by sp...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/fcb8440a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/fcb8440a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/fcb8440a
Branch: refs/heads/master
Commit: fcb8440a2bcc010d68218942736a9c28053ba66f
Parents: 346187c f9e2ee1
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon May 18 14:03:11 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon May 18 14:03:11 2015 -0400
----------------------------------------------------------------------
.../hadoop/structure/io/HadoopPools.java | 22 ++++++++++-
.../structure/io/HadoopPoolsConfigurable.java | 41 ++++++++++++++++++++
.../hadoop/structure/io/ObjectWritable.java | 4 +-
.../hadoop/structure/io/VertexWritable.java | 4 +-
.../io/graphson/GraphSONInputFormat.java | 17 +-------
.../io/graphson/GraphSONOutputFormat.java | 3 +-
.../structure/io/gryo/GryoInputFormat.java | 16 +-------
.../structure/io/gryo/GryoOutputFormat.java | 3 +-
.../structure/io/script/ScriptInputFormat.java | 17 +-------
.../structure/io/script/ScriptOutputFormat.java | 3 +-
10 files changed, 78 insertions(+), 52 deletions(-)
----------------------------------------------------------------------