You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by dk...@apache.org on 2015/06/04 12:15:16 UTC

[02/43] incubator-tinkerpop git commit: Finalize some classes in gremlin-driver.

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/preprocessor
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;
     }