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/06/01 23:16:10 UTC
[1/4] incubator-tinkerpop git commit: Finalize some classes in
gremlin-driver.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 4d5519199 -> 0becf9f2f
Finalize some classes in gremlin-driver.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/0becf9f2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/0becf9f2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/0becf9f2
Branch: refs/heads/master
Commit: 0becf9f2f1d26b34986888a14682f8a281da1484
Parents: f6b0ec6
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Jun 1 16:48:26 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Jun 1 17:15:51 2015 -0400
----------------------------------------------------------------------
.../gremlin/driver/handler/NioGremlinRequestEncoder.java | 2 +-
.../gremlin/driver/handler/NioGremlinResponseDecoder.java | 2 +-
.../gremlin/driver/handler/WebSocketClientHandler.java | 2 +-
.../gremlin/driver/handler/WebSocketGremlinRequestEncoder.java | 2 +-
.../driver/handler/WebSocketGremlinResponseDecoder.java | 2 +-
.../driver/ser/AbstractGraphSONMessageSerializerV1d0.java | 6 +++---
.../driver/ser/GraphSONMessageSerializerGremlinV1d0.java | 2 +-
.../gremlin/driver/ser/GraphSONMessageSerializerV1d0.java | 2 +-
.../gremlin/driver/ser/GryoMessageSerializerV1d0.java | 2 +-
.../gremlin/driver/ser/JsonBuilderGryoSerializer.java | 2 +-
.../org/apache/tinkerpop/gremlin/driver/ser/SerTokens.java | 4 +++-
.../org/apache/tinkerpop/gremlin/driver/ser/Serializers.java | 2 +-
12 files changed, 16 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/0becf9f2/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/NioGremlinRequestEncoder.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/NioGremlinRequestEncoder.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/NioGremlinRequestEncoder.java
index ed1e6c0..f80e195 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/NioGremlinRequestEncoder.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/NioGremlinRequestEncoder.java
@@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory;
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
@ChannelHandler.Sharable
-public class NioGremlinRequestEncoder extends MessageToByteEncoder<Object> {
+public final class NioGremlinRequestEncoder extends MessageToByteEncoder<Object> {
private static final Logger logger = LoggerFactory.getLogger(WebSocketGremlinRequestEncoder.class);
private boolean binaryEncoding = false;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/0becf9f2/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/NioGremlinResponseDecoder.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/NioGremlinResponseDecoder.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/NioGremlinResponseDecoder.java
index d9db376..6f4a44d 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/NioGremlinResponseDecoder.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/NioGremlinResponseDecoder.java
@@ -28,7 +28,7 @@ import java.util.List;
/**
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
-public class NioGremlinResponseDecoder extends ByteToMessageDecoder {
+public final class NioGremlinResponseDecoder extends ByteToMessageDecoder {
private final MessageSerializer serializer;
public NioGremlinResponseDecoder(final MessageSerializer serializer) {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/0becf9f2/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketClientHandler.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketClientHandler.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketClientHandler.java
index 5078ac9..81f1e41 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketClientHandler.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketClientHandler.java
@@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
/**
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
-public class WebSocketClientHandler extends SimpleChannelInboundHandler<Object> {
+public final class WebSocketClientHandler extends SimpleChannelInboundHandler<Object> {
private static final Logger logger = LoggerFactory.getLogger(WebSocketClientHandler.class);
private final WebSocketClientHandshaker handshaker;
private ChannelPromise handshakeFuture;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/0becf9f2/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketGremlinRequestEncoder.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketGremlinRequestEncoder.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketGremlinRequestEncoder.java
index 5080b47..d8dd221 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketGremlinRequestEncoder.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketGremlinRequestEncoder.java
@@ -36,7 +36,7 @@ import java.util.List;
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
@ChannelHandler.Sharable
-public class WebSocketGremlinRequestEncoder extends MessageToMessageEncoder<RequestMessage> {
+public final class WebSocketGremlinRequestEncoder extends MessageToMessageEncoder<RequestMessage> {
private static final Logger logger = LoggerFactory.getLogger(WebSocketGremlinRequestEncoder.class);
private final boolean binaryEncoding;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/0becf9f2/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketGremlinResponseDecoder.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketGremlinResponseDecoder.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketGremlinResponseDecoder.java
index b07530d..0f24a9a 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketGremlinResponseDecoder.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/handler/WebSocketGremlinResponseDecoder.java
@@ -34,7 +34,7 @@ import java.util.List;
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
@ChannelHandler.Sharable
-public class WebSocketGremlinResponseDecoder extends MessageToMessageDecoder<WebSocketFrame> {
+public final class WebSocketGremlinResponseDecoder extends MessageToMessageDecoder<WebSocketFrame> {
private final MessageSerializer serializer;
public WebSocketGremlinResponseDecoder(final MessageSerializer serializer) {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/0becf9f2/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGraphSONMessageSerializerV1d0.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGraphSONMessageSerializerV1d0.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGraphSONMessageSerializerV1d0.java
index 4382da7..7e3948ea 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGraphSONMessageSerializerV1d0.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGraphSONMessageSerializerV1d0.java
@@ -170,7 +170,7 @@ public abstract class AbstractGraphSONMessageSerializerV1d0 implements MessageSe
}
}
- public static class GremlinServerModule extends SimpleModule {
+ public final static class GremlinServerModule extends SimpleModule {
public GremlinServerModule() {
super("graphson-gremlin-server");
addSerializer(JsonBuilder.class, new JsonBuilderJacksonSerializer());
@@ -178,7 +178,7 @@ public abstract class AbstractGraphSONMessageSerializerV1d0 implements MessageSe
}
}
- public static class JsonBuilderJacksonSerializer extends StdSerializer<JsonBuilder> {
+ public final static class JsonBuilderJacksonSerializer extends StdSerializer<JsonBuilder> {
public JsonBuilderJacksonSerializer() {
super(JsonBuilder.class);
}
@@ -194,7 +194,7 @@ public abstract class AbstractGraphSONMessageSerializerV1d0 implements MessageSe
}
}
- public static class ResponseMessageSerializer extends StdSerializer<ResponseMessage> {
+ public final static class ResponseMessageSerializer extends StdSerializer<ResponseMessage> {
public ResponseMessageSerializer() {
super(ResponseMessage.class);
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/0becf9f2/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerGremlinV1d0.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerGremlinV1d0.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerGremlinV1d0.java
index 7c6cc59..c8cf058 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerGremlinV1d0.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerGremlinV1d0.java
@@ -28,7 +28,7 @@ import java.nio.ByteBuffer;
*
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
-public class GraphSONMessageSerializerGremlinV1d0 extends AbstractGraphSONMessageSerializerV1d0 {
+public final class GraphSONMessageSerializerGremlinV1d0 extends AbstractGraphSONMessageSerializerV1d0 {
private static final String MIME_TYPE = SerTokens.MIME_GRAPHSON_V1D0;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/0becf9f2/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV1d0.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV1d0.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV1d0.java
index 672b4df..7451f6c 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV1d0.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GraphSONMessageSerializerV1d0.java
@@ -35,7 +35,7 @@ import java.util.UUID;
*
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
-public class GraphSONMessageSerializerV1d0 extends AbstractGraphSONMessageSerializerV1d0 implements MessageTextSerializer {
+public final class GraphSONMessageSerializerV1d0 extends AbstractGraphSONMessageSerializerV1d0 implements MessageTextSerializer {
private static final Logger logger = LoggerFactory.getLogger(GraphSONMessageSerializerV1d0.class);
private static final String MIME_TYPE = SerTokens.MIME_JSON;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/0becf9f2/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GryoMessageSerializerV1d0.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GryoMessageSerializerV1d0.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GryoMessageSerializerV1d0.java
index e71dad0..794d035 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GryoMessageSerializerV1d0.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GryoMessageSerializerV1d0.java
@@ -50,7 +50,7 @@ import java.util.stream.Collectors;
/**
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
-public class GryoMessageSerializerV1d0 implements MessageSerializer {
+public final class GryoMessageSerializerV1d0 implements MessageSerializer {
private GryoMapper gryoMapper;
private ThreadLocal<Kryo> kryoThreadLocal = new ThreadLocal<Kryo>() {
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/0becf9f2/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/JsonBuilderGryoSerializer.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/JsonBuilderGryoSerializer.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/JsonBuilderGryoSerializer.java
index 206483f..fc66e57 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/JsonBuilderGryoSerializer.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/JsonBuilderGryoSerializer.java
@@ -28,7 +28,7 @@ import org.apache.tinkerpop.shaded.kryo.io.Output;
/**
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
-public class JsonBuilderGryoSerializer extends Serializer<JsonBuilder> {
+public final class JsonBuilderGryoSerializer extends Serializer<JsonBuilder> {
final JsonSlurper slurper = new JsonSlurper();
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/0becf9f2/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/SerTokens.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/SerTokens.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/SerTokens.java
index 2f5b8be..779355a 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/SerTokens.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/SerTokens.java
@@ -21,7 +21,9 @@ package org.apache.tinkerpop.gremlin.driver.ser;
/**
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
-public class SerTokens {
+public final class SerTokens {
+ private SerTokens() {}
+
public static final String TOKEN_ATTRIBUTES = "attributes";
public static final String TOKEN_RESULT = "result";
public static final String TOKEN_STATUS = "status";
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/0becf9f2/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/Serializers.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/Serializers.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/Serializers.java
index 230dc38..11a180e 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/Serializers.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/Serializers.java
@@ -46,7 +46,7 @@ public enum Serializers {
*/
public static final MessageSerializer DEFAULT_REQUEST_SERIALIZER = new GraphSONMessageSerializerV1d0();
- private Serializers(final String mimeType) {
+ Serializers(final String mimeType) {
this.value = mimeType;
}
[3/4] incubator-tinkerpop git commit: Finalize some classes in
gremlin-driver.
Posted by sp...@apache.org.
Finalize some classes in gremlin-driver.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/f6b0ec6c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/f6b0ec6c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/f6b0ec6c
Branch: refs/heads/master
Commit: f6b0ec6cb06f75b8883fe2e335022a43083736c2
Parents: cd3d927
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Jun 1 15:54:45 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Jun 1 17:15:51 2015 -0400
----------------------------------------------------------------------
.../java/org/apache/tinkerpop/gremlin/driver/Channelizer.java | 4 ++--
.../main/java/org/apache/tinkerpop/gremlin/driver/Client.java | 4 ++--
.../main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java | 2 +-
.../java/org/apache/tinkerpop/gremlin/driver/Connection.java | 2 +-
.../java/org/apache/tinkerpop/gremlin/driver/ConnectionPool.java | 2 +-
.../main/java/org/apache/tinkerpop/gremlin/driver/Handler.java | 2 +-
.../src/main/java/org/apache/tinkerpop/gremlin/driver/Host.java | 2 +-
.../main/java/org/apache/tinkerpop/gremlin/driver/Result.java | 2 +-
.../java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java | 2 +-
.../main/java/org/apache/tinkerpop/gremlin/driver/ResultSet.java | 2 +-
10 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f6b0ec6c/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Channelizer.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Channelizer.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Channelizer.java
index 572a537..eaa8eff 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Channelizer.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Channelizer.java
@@ -113,7 +113,7 @@ public interface Channelizer extends ChannelHandler {
/**
* WebSocket {@link Channelizer} implementation.
*/
- class WebSocketChannelizer extends AbstractChannelizer {
+ final class WebSocketChannelizer extends AbstractChannelizer {
private WebSocketClientHandler handler;
private WebSocketGremlinRequestEncoder webSocketGremlinRequestEncoder;
@@ -166,7 +166,7 @@ public interface Channelizer extends ChannelHandler {
/**
* NIO {@link Channelizer} implementation.
*/
- class NioChannelizer extends AbstractChannelizer {
+ final class NioChannelizer extends AbstractChannelizer {
private NioGremlinRequestEncoder nioGremlinRequestEncoder;
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f6b0ec6c/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 9527294..1111f67 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
@@ -181,7 +181,7 @@ public abstract class Client {
* given a {@link LoadBalancingStrategy}. Transactions are automatically committed
* (or rolled-back on error) after each request.
*/
- public static class ClusteredClient extends Client {
+ public final static class ClusteredClient extends Client {
private ConcurrentMap<Host, ConnectionPool> hostConnectionPools = new ConcurrentHashMap<>();
@@ -238,7 +238,7 @@ public abstract class Client {
* server, where each request is bound to the same thread with the same set of bindings across requests.
* Transaction are not automatically committed. It is up the client to issue commit/rollback commands.
*/
- public static class SessionedClient extends Client {
+ public final static class SessionedClient extends Client {
private final String sessionId;
private ConnectionPool connectionPool;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f6b0ec6c/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 574cedd..46bc33e 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
@@ -49,7 +49,7 @@ import java.util.stream.Collectors;
*
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
-public class Cluster {
+public final class Cluster {
private Manager manager;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f6b0ec6c/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java
index dccc0c2..a8538ae 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java
@@ -42,7 +42,7 @@ import java.util.concurrent.atomic.AtomicReference;
*
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
-class Connection {
+final class Connection {
private static final Logger logger = LoggerFactory.getLogger(Connection.class);
private final Channel channel;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f6b0ec6c/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ConnectionPool.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ConnectionPool.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ConnectionPool.java
index 9ea3db6..7236e8c 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ConnectionPool.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ConnectionPool.java
@@ -40,7 +40,7 @@ import java.util.concurrent.locks.ReentrantLock;
/**
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
-class ConnectionPool {
+final class ConnectionPool {
private static final Logger logger = LoggerFactory.getLogger(ConnectionPool.class);
public static final int MIN_POOL_SIZE = 2;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f6b0ec6c/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 8b721ae..a4b1279 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
@@ -34,7 +34,7 @@ import java.util.concurrent.ConcurrentMap;
*
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
-class Handler {
+final class Handler {
/**
* Takes a map of requests pending responses and writes responses to the {@link ResultQueue} of a request
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f6b0ec6c/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Host.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Host.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Host.java
index 7ed7e4f..0e00817 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Host.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Host.java
@@ -32,7 +32,7 @@ import java.util.function.Function;
/**
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
-class Host {
+final class Host {
private static final Logger logger = LoggerFactory.getLogger(Host.class);
private final InetSocketAddress address;
private final URI hostUri;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f6b0ec6c/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Result.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Result.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Result.java
index bb3bf44..08ab3db 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Result.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Result.java
@@ -28,7 +28,7 @@ import org.apache.tinkerpop.gremlin.structure.Vertex;
*
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
-public class Result {
+public final class Result {
final Object resultObject;
/**
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f6b0ec6c/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java
index 35eaffe..5f1022f 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java
@@ -32,7 +32,7 @@ import java.util.concurrent.atomic.AtomicReference;
*
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
-class ResultQueue {
+final class ResultQueue {
public enum Status {
FETCHING,
COMPLETE
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/f6b0ec6c/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultSet.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultSet.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultSet.java
index 889864f..9f987bc 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultSet.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultSet.java
@@ -40,7 +40,7 @@ import java.util.stream.StreamSupport;
*
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
-public class ResultSet implements Iterable<Result> {
+public final class ResultSet implements Iterable<Result> {
private final ResultQueue resultQueue;
private final ExecutorService executor;
private final Channel channel;
[4/4] incubator-tinkerpop git commit: Finalize the message classes in
gremlin-driver.
Posted by sp...@apache.org.
Finalize the message classes in gremlin-driver.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/dde1ceff
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/dde1ceff
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/dde1ceff
Branch: refs/heads/master
Commit: dde1ceffb40d65442e29ca871d0f7e1cc3144cd3
Parents: 4d55191
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Jun 1 15:52:12 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Jun 1 17:15:51 2015 -0400
----------------------------------------------------------------------
.../apache/tinkerpop/gremlin/driver/message/RequestMessage.java | 2 +-
.../apache/tinkerpop/gremlin/driver/message/ResponseMessage.java | 2 +-
.../apache/tinkerpop/gremlin/driver/message/ResponseResult.java | 2 +-
.../apache/tinkerpop/gremlin/driver/message/ResponseStatus.java | 2 +-
.../tinkerpop/gremlin/driver/message/ResponseStatusCode.java | 4 +---
5 files changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/dde1ceff/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/RequestMessage.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/RequestMessage.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/RequestMessage.java
index dc1fbf3..3b9a0a5 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/RequestMessage.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/RequestMessage.java
@@ -30,7 +30,7 @@ import java.util.UUID;
*
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
-public class RequestMessage {
+public final class RequestMessage {
/**
* An "invalid" message. Used internally only.
*/
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/dde1ceff/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/ResponseMessage.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/ResponseMessage.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/ResponseMessage.java
index b8af742..c5a00f6 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/ResponseMessage.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/ResponseMessage.java
@@ -25,7 +25,7 @@ import java.util.UUID;
/**
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
-public class ResponseMessage {
+public final class ResponseMessage {
/**
* The current request that generated this response.
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/dde1ceff/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/ResponseResult.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/ResponseResult.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/ResponseResult.java
index a17c714..988de82 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/ResponseResult.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/ResponseResult.java
@@ -23,7 +23,7 @@ import java.util.Map;
/**
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
-public class ResponseResult {
+public final class ResponseResult {
private final Object data;
private final Map<String, Object> meta;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/dde1ceff/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/ResponseStatus.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/ResponseStatus.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/ResponseStatus.java
index c9bc597..ad9a36e 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/ResponseStatus.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/ResponseStatus.java
@@ -23,7 +23,7 @@ import java.util.Map;
/**
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
-public class ResponseStatus {
+public final class ResponseStatus {
private final ResponseStatusCode code;
private final String message;
private final Map<String, Object> attributes;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/dde1ceff/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/ResponseStatusCode.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/ResponseStatusCode.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/ResponseStatusCode.java
index 09f2402..ded0f95 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/ResponseStatusCode.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/message/ResponseStatusCode.java
@@ -18,8 +18,6 @@
*/
package org.apache.tinkerpop.gremlin.driver.message;
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
@@ -97,7 +95,7 @@ public enum ResponseStatusCode {
return codeValueMap.get(codeValue);
}
- private ResponseStatusCode(final int value) {
+ ResponseStatusCode(final int value) {
this.value = value;
}
[2/4] incubator-tinkerpop git commit: Finalie and limit scope for
classes in gremlin-driver.
Posted by sp...@apache.org.
Finalie and limit scope for classes in gremlin-driver.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/cd3d927e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/cd3d927e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/cd3d927e
Branch: refs/heads/master
Commit: cd3d927e25bc36c5f5f505003fa1e29fa1fd71a7
Parents: dde1cef
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Jun 1 15:52:37 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Jun 1 17:15:51 2015 -0400
----------------------------------------------------------------------
.../java/org/apache/tinkerpop/gremlin/driver/Settings.java | 2 +-
.../main/java/org/apache/tinkerpop/gremlin/driver/Tokens.java | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cd3d927e/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Settings.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Settings.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Settings.java
index d2fbad1..2b21a68 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Settings.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Settings.java
@@ -33,7 +33,7 @@ import java.util.Optional;
/**
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
-class Settings {
+final class Settings {
public int port = 8182;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cd3d927e/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Tokens.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Tokens.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Tokens.java
index 7cfbb47..260acff 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Tokens.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Tokens.java
@@ -22,9 +22,13 @@ import java.util.Arrays;
import java.util.List;
/**
+ * String constants used in gremlin-driver and gremlin-server.
+ *
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
-public class Tokens {
+public final class Tokens {
+ private Tokens() {}
+
public static final String OPS_SHOW = "show";
public static final String OPS_EVAL = "eval";
public static final String OPS_IMPORT = "import";
@@ -35,7 +39,6 @@ public class Tokens {
public static final String ARGS_BINDINGS = "bindings";
public static final String ARGS_COORDINATES = "coordinates";
- public static final String ARGS_GRAPH_NAME = "graphName";
public static final String ARGS_GREMLIN = "gremlin";
public static final String ARGS_IMPORTS = "imports";
public static final String ARGS_INFO_TYPE = "infoType";