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 2017/07/05 15:45:51 UTC
[01/11] tinkerpop git commit: TINKERPOP-1275 Removed test for max
timeout on :remote
Repository: tinkerpop
Updated Branches:
refs/heads/master c0d375cba -> bcd186cd3
TINKERPOP-1275 Removed test for max timeout on :remote
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/deeeb877
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/deeeb877
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/deeeb877
Branch: refs/heads/master
Commit: deeeb877f2603aa2283ea551d0989b9e36d72406
Parents: 7c04cee
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Jun 26 18:50:30 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Jun 29 14:51:11 2017 -0400
----------------------------------------------------------------------
.../gremlin/console/jsr223/DriverRemoteAcceptorTest.java | 6 ------
1 file changed, 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/deeeb877/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverRemoteAcceptorTest.java
----------------------------------------------------------------------
diff --git a/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverRemoteAcceptorTest.java b/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverRemoteAcceptorTest.java
index 01a7d73..edfa556 100644
--- a/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverRemoteAcceptorTest.java
+++ b/gremlin-console/src/test/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverRemoteAcceptorTest.java
@@ -109,12 +109,6 @@ public class DriverRemoteAcceptorTest {
}
@Test
- public void shouldConfigureTimeoutToMax() throws Exception {
- acceptor.configure(Arrays.asList("timeout", "max"));
- assertEquals(Integer.MAX_VALUE, acceptor.getTimeout());
- }
-
- @Test
public void shouldConfigureTimeoutToNone() throws Exception {
acceptor.configure(Arrays.asList("timeout", "none"));
assertEquals(DriverRemoteAcceptor.NO_TIMEOUT, acceptor.getTimeout());
[10/11] tinkerpop git commit: TINKERPOP-1699 Removed more instance of
useMapperFromGraph
Posted by sp...@apache.org.
TINKERPOP-1699 Removed more instance of useMapperFromGraph
Somehow these didn't get removed previously. Intellij didn't find them somehow when I had searched - weird.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8105faa1
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8105faa1
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8105faa1
Branch: refs/heads/master
Commit: 8105faa1f84062bff7639e0ebd366d3e7d12cc90
Parents: 6f5ae81
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Jun 29 16:32:38 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Jun 29 16:32:38 2017 -0400
----------------------------------------------------------------------
.../AbstractGraphSONMessageSerializerV1d0.java | 2 --
.../AbstractGraphSONMessageSerializerV2d0.java | 31 +-------------------
.../ser/AbstractGryoMessageSerializerV1d0.java | 1 -
.../ser/AbstractGryoMessageSerializerV3d0.java | 24 +--------------
4 files changed, 2 insertions(+), 56 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8105faa1/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 e09618e..10c1546 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
@@ -22,7 +22,6 @@ import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONIo;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
import groovy.json.JsonBuilder;
import io.netty.buffer.ByteBuf;
@@ -31,7 +30,6 @@ import io.netty.util.ReferenceCountUtil;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONTokens;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONUtil;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONVersion;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONXModuleV2d0;
import org.apache.tinkerpop.shaded.jackson.core.JsonGenerationException;
import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
import org.apache.tinkerpop.shaded.jackson.core.JsonProcessingException;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8105faa1/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGraphSONMessageSerializerV2d0.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGraphSONMessageSerializerV2d0.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGraphSONMessageSerializerV2d0.java
index 9527224..bb9c654 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGraphSONMessageSerializerV2d0.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGraphSONMessageSerializerV2d0.java
@@ -27,7 +27,6 @@ import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.io.graphson.AbstractObjectDeserializer;
-import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONIo;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONUtil;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONVersion;
@@ -55,13 +54,6 @@ public abstract class AbstractGraphSONMessageSerializerV2d0 extends AbstractMess
protected ObjectMapper mapper;
- /**
- * @deprecated As of release 3.2.6, replaced by functionality provided by {@link AbstractMessageSerializer#TOKEN_IO_REGISTRIES}.
- * @see <a href="https://issues.apache.org/jira/browse/TINKERPOP-1694">TINKERPOP-1694</a>
- */
- @Deprecated
- protected static final String TOKEN_USE_MAPPER_FROM_GRAPH = "useMapperFromGraph";
-
protected final TypeReference<Map<String, Object>> mapTypeReference = new TypeReference<Map<String, Object>>() {
};
@@ -80,29 +72,8 @@ public abstract class AbstractGraphSONMessageSerializerV2d0 extends AbstractMess
@Override
public void configure(final Map<String, Object> config, final Map<String, Graph> graphs) {
- final GraphSONMapper.Builder initialBuilder;
- final Object graphToUseForMapper = config.get(TOKEN_USE_MAPPER_FROM_GRAPH);
- if (graphToUseForMapper != null) {
- if (null == graphs) throw new IllegalStateException(String.format(
- "No graphs have been provided to the serializer and therefore %s is not a valid configuration", TOKEN_USE_MAPPER_FROM_GRAPH));
-
- final Graph g = graphs.get(graphToUseForMapper.toString());
- if (null == g) throw new IllegalStateException(String.format(
- "There is no graph named [%s] configured to be used in the %s setting",
- graphToUseForMapper, TOKEN_USE_MAPPER_FROM_GRAPH));
-
- // a graph was found so use the mapper it constructs. this allows graphson to be auto-configured with any
- // custom classes that the implementation allows for
- initialBuilder = initBuilder(g.io(GraphSONIo.build()).mapper());
- } else {
- // no graph was supplied so just use the default - this will likely be the case when using a graph
- // with no custom classes or a situation where the user needs complete control like when using two
- // distinct implementations each with their own custom classes.
- initialBuilder = initBuilder(null);
- }
-
+ final GraphSONMapper.Builder initialBuilder = initBuilder(null);
addIoRegistries(config, initialBuilder);
-
mapper = configureBuilder(initialBuilder).create().createMapper();
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8105faa1/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGryoMessageSerializerV1d0.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGryoMessageSerializerV1d0.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGryoMessageSerializerV1d0.java
index d263a87..1b4c180 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGryoMessageSerializerV1d0.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGryoMessageSerializerV1d0.java
@@ -25,7 +25,6 @@ import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoIo;
import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoMapper;
import org.apache.tinkerpop.shaded.kryo.ClassResolver;
import org.apache.tinkerpop.shaded.kryo.Kryo;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8105faa1/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGryoMessageSerializerV3d0.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGryoMessageSerializerV3d0.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGryoMessageSerializerV3d0.java
index 36c9a11..1bca386 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGryoMessageSerializerV3d0.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGryoMessageSerializerV3d0.java
@@ -24,7 +24,6 @@ import io.netty.util.ReferenceCountUtil;
import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoIo;
import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoMapper;
import org.apache.tinkerpop.shaded.kryo.ClassResolver;
import org.apache.tinkerpop.shaded.kryo.Kryo;
@@ -58,7 +57,6 @@ public abstract class AbstractGryoMessageSerializerV3d0 extends AbstractMessageS
public static final String TOKEN_CUSTOM = "custom";
public static final String TOKEN_SERIALIZE_RESULT_TO_STRING = "serializeResultToString";
- public static final String TOKEN_USE_MAPPER_FROM_GRAPH = "useMapperFromGraph";
public static final String TOKEN_BUFFER_SIZE = "bufferSize";
public static final String TOKEN_CLASS_RESOLVER_SUPPLIER = "classResolverSupplier";
@@ -84,27 +82,7 @@ public abstract class AbstractGryoMessageSerializerV3d0 extends AbstractMessageS
@Override
public final void configure(final Map<String, Object> config, final Map<String, Graph> graphs) {
- final GryoMapper.Builder builder;
- final Object graphToUseForMapper = config.get(TOKEN_USE_MAPPER_FROM_GRAPH);
- if (graphToUseForMapper != null) {
- if (null == graphs) throw new IllegalStateException(String.format(
- "No graphs have been provided to the serializer and therefore %s is not a valid configuration", TOKEN_USE_MAPPER_FROM_GRAPH));
-
- final Graph g = graphs.get(graphToUseForMapper.toString());
- if (null == g) throw new IllegalStateException(String.format(
- "There is no graph named [%s] configured to be used in the %s setting",
- graphToUseForMapper, TOKEN_USE_MAPPER_FROM_GRAPH));
-
- // a graph was found so use the mapper it constructs. this allows gryo to be auto-configured with any
- // custom classes that the implementation allows for
- builder = g.io(GryoIo.build()).mapper();
- } else {
- // no graph was supplied so just use the default - this will likely be the case when using a graph
- // with no custom classes or a situation where the user needs complete control like when using two
- // distinct implementations each with their own custom classes.
- builder = GryoMapper.build();
- }
-
+ final GryoMapper.Builder builder = GryoMapper.build();
addIoRegistries(config, builder);
addClassResolverSupplier(config, builder);
addCustomClasses(config, builder);
[11/11] tinkerpop git commit: Merge branch 'TINKERPOP-1603'
Posted by sp...@apache.org.
Merge branch 'TINKERPOP-1603'
Conflicts:
CHANGELOG.asciidoc
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/bcd186cd
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/bcd186cd
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/bcd186cd
Branch: refs/heads/master
Commit: bcd186cd3d732d200fcb1ffececdc6a6159bc44a
Parents: c0d375c 8105faa
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jul 5 11:45:41 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jul 5 11:45:41 2017 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 9 +-
.../src/reference/gremlin-applications.asciidoc | 3 +-
docs/src/reference/the-graph.asciidoc | 4 +-
docs/src/upgrade/release-3.3.x.asciidoc | 42 +++++++--
.../tinkerpop/gremlin/console/Console.groovy | 10 +--
.../console/jsr223/DriverRemoteAcceptor.java | 11 +--
.../jsr223/DriverRemoteAcceptorTest.java | 6 --
.../structure/io/graphson/GraphSONMapper.java | 41 ++-------
.../io/graphson/LegacyGraphSONReader.java | 2 +-
.../GraphSONMapperEmbeddedTypeTest.java | 2 +-
.../io/graphson/GraphSONMapperTest.java | 2 +-
...aphSONMapperV2d0PartialEmbeddedTypeTest.java | 4 +-
.../tinkerpop/gremlin/driver/Cluster.java | 21 -----
.../tinkerpop/gremlin/driver/Connection.java | 5 --
.../tinkerpop/gremlin/driver/Settings.java | 27 +-----
.../apache/tinkerpop/gremlin/driver/Tokens.java | 92 --------------------
.../AbstractGraphSONMessageSerializerV1d0.java | 32 +------
.../AbstractGraphSONMessageSerializerV2d0.java | 31 +------
.../ser/AbstractGryoMessageSerializerV1d0.java | 29 +-----
.../ser/AbstractGryoMessageSerializerV3d0.java | 24 +----
.../GraphSONMessageSerializerGremlinV1d0.java | 3 +-
.../ser/GraphSONMessageSerializerV1d0.java | 3 +-
.../tinkerpop/gremlin/driver/SettingsTest.java | 2 -
.../gremlin/server/AbstractChannelizer.java | 3 -
.../handler/SaslAuthenticationHandler.java | 6 +-
.../server/GremlinDriverIntegrateTest.java | 1 -
.../gremlin/structure/SerializationTest.java | 9 +-
.../gremlin/structure/io/IoCustomTest.java | 4 +-
.../gremlin/structure/io/IoEdgeTest.java | 4 +-
.../gremlin/structure/io/IoPropertyTest.java | 4 +-
.../tinkerpop/gremlin/structure/io/IoTest.java | 4 +-
.../gremlin/structure/io/IoVertexTest.java | 4 +-
.../structure/IoDataGenerationTest.java | 10 +--
.../tinkergraph/structure/TinkerGraphTest.java | 3 +-
34 files changed, 99 insertions(+), 358 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bcd186cd/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index 6f47550,8c62c29..bfdd43d
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -26,10 -26,7 +26,11 @@@ image::https://raw.githubusercontent.co
TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Removed previously deprecated `TraversalSource.Builder` class.
+* Removed previously deprecated `ConnectiveP`, `AndP`, `OrP` constructors.
+* Removed previously deprecated `TraversalScriptFunction` class.
+* Removed previously deprecated `TraversalScriptHelper` class.
+ * `gremlin.sh` and `gremln.bat` no longer support the option to pass a script as an argument for execution mode without using the `-i` option.
* Graphite and Ganglia are no longer packaged with the Gremlin Server distribution.
* `TransactionException` is no longer a class of `AbstractTransaction` and it extends `RuntimeException`.
* Included an ellipse on long property names that are truncated.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bcd186cd/docs/src/reference/gremlin-applications.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bcd186cd/docs/src/upgrade/release-3.3.x.asciidoc
----------------------------------------------------------------------
[08/11] tinkerpop git commit: TINKERPOP-1651 Removed ability to pass
a script to gremlin.sh without a flag
Posted by sp...@apache.org.
TINKERPOP-1651 Removed ability to pass a script to gremlin.sh without a flag
This feature was deprecated long ago, but we tried to maintain compatibility up until now
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1c39d670
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1c39d670
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1c39d670
Branch: refs/heads/master
Commit: 1c39d670a216a5ae694f2551504e90a826de6595
Parents: 6b50de5
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Jun 29 15:05:02 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Jun 29 15:05:02 2017 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
docs/src/upgrade/release-3.3.x.asciidoc | 13 +++++++------
.../apache/tinkerpop/gremlin/console/Console.groovy | 10 ++--------
3 files changed, 10 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1c39d670/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 0669888..8c62c29 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* `gremlin.sh` and `gremln.bat` no longer support the option to pass a script as an argument for execution mode without using the `-i` option.
* Graphite and Ganglia are no longer packaged with the Gremlin Server distribution.
* `TransactionException` is no longer a class of `AbstractTransaction` and it extends `RuntimeException`.
* Included an ellipse on long property names that are truncated.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1c39d670/docs/src/upgrade/release-3.3.x.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/upgrade/release-3.3.x.asciidoc b/docs/src/upgrade/release-3.3.x.asciidoc
index d87f3bb..cc959fc 100644
--- a/docs/src/upgrade/release-3.3.x.asciidoc
+++ b/docs/src/upgrade/release-3.3.x.asciidoc
@@ -151,11 +151,11 @@ used in `optional()`. However, the behavior would be unpredictable so this backw
See link:https://issues.apache.org/jira/browse/TINKERPOP-1506[TINKERPOP-1506]
-Gremlin Console Script Execution
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Gremlin Console Initialization
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-It is no longer possible to run a script in execution mode in the Gremlin Console from the terminal without use of `-e`.
-In other words, prior versions allowed:
+It is no longer possible to intialize the Gremlin Console with a script without use of `-e`. In other words, prior
+versions allowed:
[source,text]
bin/gremlin.sh gremlin.groovy
@@ -163,9 +163,10 @@ bin/gremlin.sh gremlin.groovy
Such a command must now be written as:
[source,text]
-bin/gremlin.sh -e gremlin.groovy
+bin/gremlin.sh -i gremlin.groovy
-See: link:https://issues.apache.org/jira/browse/TINKERPOP-1283[TINKERPOP-1283]
+See: link:https://issues.apache.org/jira/browse/TINKERPOP-1283[TINKERPOP-1283],
+link:https://issues.apache.org/jira/browse/TINKERPOP-1651[TINKERPOP-1651]
GraphTraversal valueMap() Signature Updated
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1c39d670/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
----------------------------------------------------------------------
diff --git a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
index 1b6100b..7a1837e 100644
--- a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
+++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
@@ -446,14 +446,8 @@ class Console {
System.exit(0)
}
- // need to do some up front processing to try to support "bin/gremlin.sh init.groovy" until this deprecated
- // feature can be removed. ultimately this should be removed when a breaking change can go in
- if (args.length == 1 && !args[0].startsWith("-")) {
- new Console(io, [[args[0]]], true)
- } else {
- def scriptAndArgs = parseArgs(options.e ? "-e" : "-i", args, cli)
- new Console(io, scriptAndArgs, !options.e)
- }
+ def scriptAndArgs = parseArgs(options.e ? "-e" : "-i", args, cli)
+ new Console(io, scriptAndArgs, !options.e)
}
/**
[04/11] tinkerpop git commit: TINKERPOP-1603 Removed support for byte
array sasl argument
Posted by sp...@apache.org.
TINKERPOP-1603 Removed support for byte array sasl argument
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/7a29c6ba
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/7a29c6ba
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/7a29c6ba
Branch: refs/heads/master
Commit: 7a29c6ba1a73315c53b8002d41e7892963b3e8b5
Parents: 1d3e9a1
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Jun 26 14:28:09 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Jun 29 14:51:11 2017 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
docs/src/upgrade/release-3.3.x.asciidoc | 11 +++++++++++
.../server/handler/SaslAuthenticationHandler.java | 6 ++----
3 files changed, 14 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7a29c6ba/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 7a93c45..3bb8347 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Removed support for passing a byte array on the `sasl` parameter.
* Graphite and Ganglia are no longer packaged with the Gremlin Server distribution.
* `TransactionException` is no longer a class of `AbstractTransaction` and it extends `RuntimeException`.
* Included an ellipse on long property names that are truncated.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7a29c6ba/docs/src/upgrade/release-3.3.x.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/upgrade/release-3.3.x.asciidoc b/docs/src/upgrade/release-3.3.x.asciidoc
index 0f71714..33ef7e0 100644
--- a/docs/src/upgrade/release-3.3.x.asciidoc
+++ b/docs/src/upgrade/release-3.3.x.asciidoc
@@ -352,3 +352,14 @@ rather than `Exception`. Providers should consider using this exception to wrap
to transaction problems and it allows for more common, generalized error handling for users.
See: link:https://issues.apache.org/jira/browse/TINKERPOP-1004[TINKERPOP-1004]
+
+Driver Providers
+^^^^^^^^^^^^^^^^
+
+SASL Byte Array
++++++++++++++++
+
+Gremlin Server no longer supports accepting a byte array for the value passed to the "sasl" parameter in
+authentication messages. It only accepts a Base64 encoded string.
+
+See: link:https://issues.apache.org/jira/browse/TINKERPOP-1603[TINKERPOP-1603]
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7a29c6ba/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SaslAuthenticationHandler.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SaslAuthenticationHandler.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SaslAuthenticationHandler.java
index 76af7db..778a003 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SaslAuthenticationHandler.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/handler/SaslAuthenticationHandler.java
@@ -87,13 +87,11 @@ public class SaslAuthenticationHandler extends AbstractAuthenticationHandler {
final Object saslObject = requestMessage.getArgs().get(Tokens.ARGS_SASL);
final byte[] saslResponse;
- if (saslObject instanceof byte[]) {
- saslResponse = (byte[]) saslObject;
- } else if(saslObject instanceof String) {
+ if(saslObject instanceof String) {
saslResponse = BASE64_DECODER.decode((String) saslObject);
} else {
final ResponseMessage error = ResponseMessage.build(request.get())
- .statusMessage("Incorrect type for : " + Tokens.ARGS_SASL + " - byte[] or base64 encoded String is expected")
+ .statusMessage("Incorrect type for : " + Tokens.ARGS_SASL + " - base64 encoded String is expected")
.code(ResponseStatusCode.REQUEST_ERROR_MALFORMED_REQUEST).create();
ctx.writeAndFlush(error);
return;
[02/11] tinkerpop git commit: TINKERPOP-1275 Removed previously
deprecated max setting for :remote
Posted by sp...@apache.org.
TINKERPOP-1275 Removed previously deprecated max setting for :remote
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/7c04cee8
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/7c04cee8
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/7c04cee8
Branch: refs/heads/master
Commit: 7c04cee8834233f977547d1fe5f19a94fd97a46a
Parents: 90c9a58
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Jun 26 16:01:35 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Jun 29 14:51:11 2017 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../gremlin/console/jsr223/DriverRemoteAcceptor.java | 11 ++---------
2 files changed, 3 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7c04cee8/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 4179f10..9390acd 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Removed previously deprecated `:remote config timeout max`.
* Removed previously deprecated `ConnectionPoolSettings.sessionId` and `ConnectionPoolSettings.optionalSessionId()`.
* Removed previously deprecated `reconnectInitialDelay` setting from the Java driver.
* Removed support for passing a byte array on the `sasl` parameter.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7c04cee8/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverRemoteAcceptor.java
----------------------------------------------------------------------
diff --git a/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverRemoteAcceptor.java b/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverRemoteAcceptor.java
index 51272ba..d349971 100644
--- a/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverRemoteAcceptor.java
+++ b/gremlin-console/src/main/java/org/apache/tinkerpop/gremlin/console/jsr223/DriverRemoteAcceptor.java
@@ -63,11 +63,6 @@ public class DriverRemoteAcceptor implements RemoteAcceptor {
private static final String TOKEN_RESET = "reset";
private static final String TOKEN_SHOW = "show";
- /**
- * @deprecated As of 3.1.3, replaced by "none" option
- */
- @Deprecated
- private static final String TOKEN_MAX = "max";
private static final String TOKEN_NONE = "none";
private static final String TOKEN_TIMEOUT = "timeout";
private static final String TOKEN_ALIAS = "alias";
@@ -122,10 +117,8 @@ public class DriverRemoteAcceptor implements RemoteAcceptor {
final String errorMessage = "The timeout option expects a positive integer representing milliseconds or 'none' as an argument";
if (arguments.size() != 1) throw new RemoteException(errorMessage);
try {
- // first check for MAX timeout then NONE and finally parse the config to int. "max" is now "deprecated"
- // in the sense that it will no longer be promoted. support for it will be removed at a later date
- timeout = arguments.get(0).equals(TOKEN_MAX) ? Integer.MAX_VALUE :
- arguments.get(0).equals(TOKEN_NONE) ? NO_TIMEOUT : Integer.parseInt(arguments.get(0));
+ // first check for MAX timeout then NONE and finally parse the config to int.
+ timeout = arguments.get(0).equals(TOKEN_NONE) ? NO_TIMEOUT : Integer.parseInt(arguments.get(0));
if (timeout < NO_TIMEOUT) throw new RemoteException("The value for the timeout cannot be less than " + NO_TIMEOUT);
return timeout == NO_TIMEOUT ? "Remote timeout is disabled" : "Set remote timeout to " + timeout + "ms";
} catch (Exception ignored) {
[03/11] tinkerpop git commit: TINKERPOP-1481 Removed previously
deprecated reconnectInitialDelay
Posted by sp...@apache.org.
TINKERPOP-1481 Removed previously deprecated reconnectInitialDelay
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/cd1b457c
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/cd1b457c
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/cd1b457c
Branch: refs/heads/master
Commit: cd1b457cb9c8df1bbd99076209bfaf636f6fab37
Parents: 7a29c6b
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Jun 26 15:10:58 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Jun 29 14:51:11 2017 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../src/reference/gremlin-applications.asciidoc | 3 +--
docs/src/upgrade/release-3.3.x.asciidoc | 1 +
.../tinkerpop/gremlin/driver/Cluster.java | 21 --------------------
.../tinkerpop/gremlin/driver/Connection.java | 5 -----
.../tinkerpop/gremlin/driver/Settings.java | 11 +---------
.../tinkerpop/gremlin/driver/SettingsTest.java | 2 --
.../server/GremlinDriverIntegrateTest.java | 1 -
8 files changed, 4 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cd1b457c/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 3bb8347..24160b0 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Removed previously deprecated `reconnectInitialDelay` setting from the Java driver.
* Removed support for passing a byte array on the `sasl` parameter.
* Graphite and Ganglia are no longer packaged with the Gremlin Server distribution.
* `TransactionException` is no longer a class of `AbstractTransaction` and it extends `RuntimeException`.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cd1b457c/docs/src/reference/gremlin-applications.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/gremlin-applications.asciidoc b/docs/src/reference/gremlin-applications.asciidoc
index c2ba08f..589390b 100644
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@ -732,8 +732,7 @@ The following table describes the various configuration options for the Gremlin
|connectionPool.minInProcessPerConnection |The minimum number of in-flight requests that can occur on a connection. |1
|connectionPool.minSimultaneousUsagePerConnection |The maximum number of times that a connection can be borrowed from the pool simultaneously. |8
|connectionPool.minSize |The minimum size of a connection pool for a host. |2
-|connectionPool.reconnectInitialDelay |The amount of time in milliseconds to wait before trying to reconnect to a dead host for the first time. |1000
-|connectionPool.reconnectInterval |The amount of time in milliseconds to wait before trying to reconnect to a dead host. This interval occurs after the time specified by the `reconnectInitialDelay`. |1000
+|connectionPool.reconnectInterval |The amount of time in milliseconds to wait before trying to reconnect to a dead host. |1000
|connectionPool.resultIterationBatchSize |The override value for the size of the result batches to be returned from the server. |64
|connectionPool.trustCertChainFile |File location for a SSL Certificate Chain to use when SSL is enabled. If this value is not provided and SSL is enabled, the `TrustManager` will be established with a self-signed certificate which is NOT suitable for production purposes. |_none_
|hosts |The list of hosts that the driver will connect to. |localhost
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cd1b457c/docs/src/upgrade/release-3.3.x.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/upgrade/release-3.3.x.asciidoc b/docs/src/upgrade/release-3.3.x.asciidoc
index 33ef7e0..a772fb4 100644
--- a/docs/src/upgrade/release-3.3.x.asciidoc
+++ b/docs/src/upgrade/release-3.3.x.asciidoc
@@ -211,6 +211,7 @@ The following deprecated classes, methods or fields have been removed in this ve
** `org.apache.tinkerpop.gremlin.structure.io.Io.Builder#registry(IoRegistry)`
** `org.apache.tinkerpop.gremlin.structure.Transaction.submit(Function)`
* `gremlin-driver`
+** `org.apache.tinkerpop.gremlin.driver.Cluster$Builder#reconnectIntialDelay(int)`
** `org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0(GryoMapper)`
* `gremlin-groovy`
** `org.apache.tinkerpop.gremlin.groovy.AbstractImportCustomizerProvider`
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cd1b457c/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 567bfb4..fa59b22 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
@@ -175,7 +175,6 @@ public final class Cluster {
.nioPoolSize(settings.nioPoolSize)
.workerPoolSize(settings.workerPoolSize)
.reconnectInterval(settings.connectionPool.reconnectInterval)
- .reconnectIntialDelay(settings.connectionPool.reconnectInitialDelay)
.resultIterationBatchSize(settings.connectionPool.resultIterationBatchSize)
.channelizer(settings.connectionPool.channelizer)
.maxContentLength(settings.connectionPool.maxContentLength)
@@ -380,13 +379,6 @@ public final class Cluster {
}
/**
- * Gets time in milliseconds to wait before attempting to reconnect to a dead host after it has been marked dead.
- */
- public int getReconnectIntialDelay() {
- return manager.connectionPoolSettings.reconnectInitialDelay;
- }
-
- /**
* Gets time in milliseconds to wait between retries when attempting to reconnect to a dead host.
*/
public int getReconnectInterval() {
@@ -489,7 +481,6 @@ public final class Cluster {
private int maxWaitForConnection = Connection.MAX_WAIT_FOR_CONNECTION;
private int maxWaitForSessionClose = Connection.MAX_WAIT_FOR_SESSION_CLOSE;
private int maxContentLength = Connection.MAX_CONTENT_LENGTH;
- private int reconnectInitialDelay = Connection.RECONNECT_INITIAL_DELAY;
private int reconnectInterval = Connection.RECONNECT_INTERVAL;
private int resultIterationBatchSize = Connection.RESULT_ITERATION_BATCH_SIZE;
private long keepAliveInterval = Connection.KEEP_ALIVE_INTERVAL;
@@ -734,17 +725,6 @@ public final class Cluster {
}
/**
- * Time in milliseconds to wait before attempting to reconnect to a dead host after it has been marked dead.
- *
- * @deprecated As of release 3.2.3, the value of the initial delay is now the same as the {@link #reconnectInterval}.
- */
- @Deprecated
- public Builder reconnectIntialDelay(final int initialDelay) {
- this.reconnectInitialDelay = initialDelay;
- return this;
- }
-
- /**
* Time in milliseconds to wait between retries when attempting to reconnect to a dead host.
*/
public Builder reconnectInterval(final int interval) {
@@ -893,7 +873,6 @@ public final class Cluster {
connectionPoolSettings.maxWaitForConnection = builder.maxWaitForConnection;
connectionPoolSettings.maxWaitForSessionClose = builder.maxWaitForSessionClose;
connectionPoolSettings.maxContentLength = builder.maxContentLength;
- connectionPoolSettings.reconnectInitialDelay = builder.reconnectInitialDelay;
connectionPoolSettings.reconnectInterval = builder.reconnectInterval;
connectionPoolSettings.resultIterationBatchSize = builder.resultIterationBatchSize;
connectionPoolSettings.enableSsl = builder.enableSsl;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cd1b457c/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 9a2180e..30725cc 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
@@ -65,11 +65,6 @@ final class Connection {
public static final int MAX_WAIT_FOR_SESSION_CLOSE = 3000;
public static final int MAX_CONTENT_LENGTH = 65536;
- /**
- * @deprecated As of release 3.2.3, replaced by {@link #RECONNECT_INTERVAL}.
- */
- @Deprecated
- public static final int RECONNECT_INITIAL_DELAY = 1000;
public static final int RECONNECT_INTERVAL = 1000;
public static final int RESULT_ITERATION_BATCH_SIZE = 64;
public static final long KEEP_ALIVE_INTERVAL = 1800000;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cd1b457c/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 41a697c..3da08b8 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
@@ -199,9 +199,6 @@ final class Settings {
if (connectionPoolConf.containsKey("reconnectInterval"))
cpSettings.reconnectInterval = connectionPoolConf.getInt("reconnectInterval");
- if (connectionPoolConf.containsKey("reconnectInitialDelay"))
- cpSettings.reconnectInitialDelay = connectionPoolConf.getInt("reconnectInitialDelay");
-
if (connectionPoolConf.containsKey("resultIterationBatchSize"))
cpSettings.resultIterationBatchSize = connectionPoolConf.getInt("resultIterationBatchSize");
@@ -304,17 +301,11 @@ final class Settings {
/**
* The amount of time in milliseconds to wait before trying to reconnect to a dead host. The default value is
- * 1000. This interval occurs after the time specified by the {@link #reconnectInitialDelay}.
+ * 1000.
*/
public int reconnectInterval = Connection.RECONNECT_INTERVAL;
/**
- * The amount of time in milliseconds to wait before trying to reconnect to a dead host for the first time.
- * The default value is 1000.
- */
- public int reconnectInitialDelay = Connection.RECONNECT_INITIAL_DELAY;
-
- /**
* The override value for the size of the result batches to be returned from the server. This value is set to
* 64 by default.
*/
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cd1b457c/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/SettingsTest.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/SettingsTest.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/SettingsTest.java
index a6a2298..038353b 100644
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/SettingsTest.java
+++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/SettingsTest.java
@@ -55,7 +55,6 @@ public class SettingsTest {
conf.setProperty("connectionPool.maxWaitForConnection", 700);
conf.setProperty("connectionPool.maxContentLength", 800);
conf.setProperty("connectionPool.reconnectInterval", 900);
- conf.setProperty("connectionPool.reconnectInitialDelay", 1000);
conf.setProperty("connectionPool.resultIterationBatchSize", 1100);
conf.setProperty("connectionPool.channelizer", "channelizer0");
@@ -81,7 +80,6 @@ public class SettingsTest {
assertEquals(700, settings.connectionPool.maxWaitForConnection);
assertEquals(800, settings.connectionPool.maxContentLength);
assertEquals(900, settings.connectionPool.reconnectInterval);
- assertEquals(1000, settings.connectionPool.reconnectInitialDelay);
assertEquals(1100, settings.connectionPool.resultIterationBatchSize);
assertEquals("channelizer0", settings.connectionPool.channelizer);
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cd1b457c/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
index 41daf5b..746c6f8 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
@@ -212,7 +212,6 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
@Test
public void shouldEventuallySucceedAfterChannelLevelError() throws Exception {
final Cluster cluster = TestClientFactory.build()
- .reconnectIntialDelay(500)
.reconnectInterval(500)
.maxContentLength(1024).create();
final Client client = cluster.connect();
[06/11] tinkerpop git commit: TINKERPOP-1700 Removed previously
deprecated embedTypes option for GraphSON
Posted by sp...@apache.org.
TINKERPOP-1700 Removed previously deprecated embedTypes option for GraphSON
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6b50de53
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6b50de53
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6b50de53
Branch: refs/heads/master
Commit: 6b50de534793807b1e8d885f02524bfb62de0410
Parents: 851a8de
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Jun 29 14:06:36 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Jun 29 14:52:56 2017 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 9 +++--
docs/src/reference/the-graph.asciidoc | 4 +-
docs/src/upgrade/release-3.3.x.asciidoc | 2 +
.../structure/io/graphson/GraphSONMapper.java | 41 +++++---------------
.../io/graphson/LegacyGraphSONReader.java | 2 +-
.../GraphSONMapperEmbeddedTypeTest.java | 2 +-
.../io/graphson/GraphSONMapperTest.java | 2 +-
...aphSONMapperV2d0PartialEmbeddedTypeTest.java | 4 +-
.../GraphSONMessageSerializerGremlinV1d0.java | 3 +-
.../ser/GraphSONMessageSerializerV1d0.java | 3 +-
.../gremlin/structure/SerializationTest.java | 9 +++--
.../gremlin/structure/io/IoCustomTest.java | 4 +-
.../gremlin/structure/io/IoEdgeTest.java | 4 +-
.../gremlin/structure/io/IoPropertyTest.java | 4 +-
.../tinkerpop/gremlin/structure/io/IoTest.java | 4 +-
.../gremlin/structure/io/IoVertexTest.java | 4 +-
.../structure/IoDataGenerationTest.java | 10 ++---
.../tinkergraph/structure/TinkerGraphTest.java | 3 +-
18 files changed, 50 insertions(+), 64 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6b50de53/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 2f4c242..0669888 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,10 +26,6 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-* Removed previously deprecated `:remote config timeout max`.
-* Removed previously deprecated `ConnectionPoolSettings.sessionId` and `ConnectionPoolSettings.optionalSessionId()`.
-* Removed previously deprecated `reconnectInitialDelay` setting from the Java driver.
-* Removed support for passing a byte array on the `sasl` parameter.
* Graphite and Ganglia are no longer packaged with the Gremlin Server distribution.
* `TransactionException` is no longer a class of `AbstractTransaction` and it extends `RuntimeException`.
* Included an ellipse on long property names that are truncated.
@@ -40,6 +36,11 @@ TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET)
* GraphSON 3.0 is now the default serialization format in TinkerGraph and Gremlin Server.
* Established the GraphSON 3.0 format.
* Changed `ServerGremlinExecutor` to not use generics since there really is no flexibility in the kind of `ScheduledExecutorService` that will be used.
+* Removed support for passing a byte array on the `sasl` parameter.
+* Removed previously deprecated `GraphSONMapper$Builder#embedTypes` option.
+* Removed previously deprecated `:remote config timeout max`.
+* Removed previously deprecated `ConnectionPoolSettings.sessionId` and `ConnectionPoolSettings.optionalSessionId()`.
+* Removed previously deprecated `reconnectInitialDelay` setting from the Java driver.
* Removed previously deprecated `useMapperFromGraph` option.
* Removed previously deprecated `Io.Builder#registry(IoRegistry)` method.
* Removed previously deprecated `GryoMessageSerializerV1d0(GryoMapper)` constructor.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6b50de53/docs/src/reference/the-graph.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/the-graph.asciidoc b/docs/src/reference/the-graph.asciidoc
index cc72743..c9ee062 100644
--- a/docs/src/reference/the-graph.asciidoc
+++ b/docs/src/reference/the-graph.asciidoc
@@ -582,12 +582,12 @@ GraphSON 1.0:
graph = TinkerFactory.createModern()
g = graph.traversal()
f = new ByteArrayOutputStream()
-mapper = graph.io(graphson()).mapper().embedTypes(true).create()
+mapper = graph.io(graphson()).mapper().typeInfo(TypeInfo.PARTIAL_TYPES).create()
graph.io(graphson()).writer().mapper(mapper).create().writeVertex(f, g.V(1).next(), BOTH)
f.close()
----
-In the above code, the `embedTypes` option is set to `true` and the output below shows the difference in the output:
+In the above code, the `typeInfo` option is set to `true` and the output below shows the difference in the output:
[source,json]
----
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6b50de53/docs/src/upgrade/release-3.3.x.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/upgrade/release-3.3.x.asciidoc b/docs/src/upgrade/release-3.3.x.asciidoc
index 35e27d7..d87f3bb 100644
--- a/docs/src/upgrade/release-3.3.x.asciidoc
+++ b/docs/src/upgrade/release-3.3.x.asciidoc
@@ -113,6 +113,8 @@ Changes to IO
* Gryo incompatibilities with 3.2.x:
** `RequestMessage`
** `ResponseMessage`
+* GraphSON
+** embedTypes is gone, use typeInfo setting. will default to no types for GraphSON 1.0 and partial types for graphson 2.0 TINKERPOP-1700
Graphite and Ganglia
^^^^^^^^^^^^^^^^^^^^
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6b50de53/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java
index d442dbc..6b6bbf7 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java
@@ -65,7 +65,6 @@ public class GraphSONMapper implements Mapper<ObjectMapper> {
private final List<SimpleModule> customModules;
private final boolean loadCustomSerializers;
private final boolean normalize;
- private final boolean embedTypes;
private final GraphSONVersion version;
private final TypeInfo typeInfo;
@@ -73,9 +72,12 @@ public class GraphSONMapper implements Mapper<ObjectMapper> {
this.customModules = builder.customModules;
this.loadCustomSerializers = builder.loadCustomModules;
this.normalize = builder.normalize;
- this.embedTypes = builder.embedTypes;
this.version = builder.version;
- this.typeInfo = builder.typeInfo;
+
+ if (null == builder.typeInfo)
+ this.typeInfo = builder.version == GraphSONVersion.V1_0 ? TypeInfo.NO_TYPES : TypeInfo.PARTIAL_TYPES;
+ else
+ this.typeInfo = builder.typeInfo;
}
@Override
@@ -125,7 +127,7 @@ public class GraphSONMapper implements Mapper<ObjectMapper> {
});
om.setDefaultTyping(typer);
} else if (version == GraphSONVersion.V1_0 || version == GraphSONVersion.V2_0) {
- if (embedTypes) {
+ if (typeInfo == TypeInfo.PARTIAL_TYPES) {
final TypeResolverBuilder<?> typer = new StdTypeResolverBuilder()
.init(JsonTypeInfo.Id.CLASS, null)
.inclusion(JsonTypeInfo.As.PROPERTY)
@@ -160,7 +162,6 @@ public class GraphSONMapper implements Mapper<ObjectMapper> {
return this.typeInfo;
}
-
private void registerJavaBaseTypes(final GraphSONTypeIdResolver graphSONTypeIdResolver) {
Arrays.asList(
UUID.class,
@@ -176,11 +177,10 @@ public class GraphSONMapper implements Mapper<ObjectMapper> {
private List<SimpleModule> customModules = new ArrayList<>();
private boolean loadCustomModules = false;
private boolean normalize = false;
- private boolean embedTypes = false;
private List<IoRegistry> registries = new ArrayList<>();
private GraphSONVersion version = GraphSONVersion.V2_0;
- // GraphSON 2.0 should have types activated by default, otherwise use there's no point in using it instead of 1.0.
- private TypeInfo typeInfo = TypeInfo.PARTIAL_TYPES;
+ // GraphSON 2.0 should have types activated by default, and 1.0 should use no types by default
+ private TypeInfo typeInfo = null;
private Builder() {
}
@@ -236,36 +236,13 @@ public class GraphSONMapper implements Mapper<ObjectMapper> {
}
/**
- * Embeds Java types into generated JSON to clarify their origins. Setting this value will override the value
- * of {@link #typeInfo(TypeInfo)} where true will set it to {@link TypeInfo#PARTIAL_TYPES} and false will set
- * it to {@link TypeInfo#NO_TYPES}.
- *
- * @deprecated As of release 3.2.1, replaced by {@link #typeInfo(TypeInfo)}.
- */
- @Deprecated
- public Builder embedTypes(final boolean embedTypes) {
- this.embedTypes = embedTypes;
- this.typeInfo = embedTypes ? TypeInfo.PARTIAL_TYPES : TypeInfo.NO_TYPES;
- return this;
- }
-
- /**
- * Specify if the values are going to be typed or not, and at which level. Setting this value will override
- * the value of {@link #embedTypes(boolean)} where {@link TypeInfo#PARTIAL_TYPES} will set it to true and
- * {@link TypeInfo#NO_TYPES} will set it to false.
+ * Specify if the values are going to be typed or not, and at which level.
*
* The level can be {@link TypeInfo#NO_TYPES} or {@link TypeInfo#PARTIAL_TYPES}, and could be extended in the
* future.
*/
public Builder typeInfo(final TypeInfo typeInfo) {
this.typeInfo = typeInfo;
- if (typeInfo.equals(TypeInfo.PARTIAL_TYPES))
- this.embedTypes = true;
- else if (typeInfo.equals(TypeInfo.NO_TYPES))
- this.embedTypes = false;
- else
- throw new IllegalArgumentException("This value can only be set to PARTIAL_TYPES and NO_TYPES");
-
return this;
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6b50de53/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/LegacyGraphSONReader.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/LegacyGraphSONReader.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/LegacyGraphSONReader.java
index 679c827..3125e73 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/LegacyGraphSONReader.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/LegacyGraphSONReader.java
@@ -238,7 +238,7 @@ public final class LegacyGraphSONReader implements GraphReader {
public LegacyGraphSONReader create() {
final GraphSONMapper.Builder builder = GraphSONMapper.build();
customModules.forEach(builder::addCustomModule);
- final GraphSONMapper mapper = builder.embedTypes(embedTypes)
+ final GraphSONMapper mapper = builder.typeInfo(embedTypes ? TypeInfo.PARTIAL_TYPES : TypeInfo.NO_TYPES)
.loadCustomModules(loadCustomModules).create();
return new LegacyGraphSONReader(mapper.createMapper(), batchSize);
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6b50de53/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperEmbeddedTypeTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperEmbeddedTypeTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperEmbeddedTypeTest.java
index 9079c8a..66bab80 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperEmbeddedTypeTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperEmbeddedTypeTest.java
@@ -57,7 +57,7 @@ public class GraphSONMapperEmbeddedTypeTest extends AbstractGraphSONTest {
@Parameterized.Parameters(name = "{0}")
public static Iterable<Object[]> data() {
return Arrays.asList(new Object[][]{
- {"v1", GraphSONMapper.build().version(GraphSONVersion.V1_0).embedTypes(true).create().createMapper()},
+ {"v1", GraphSONMapper.build().version(GraphSONVersion.V1_0).typeInfo(TypeInfo.PARTIAL_TYPES).create().createMapper()},
{"v2", GraphSONMapper.build().version(GraphSONVersion.V2_0)
.addCustomModule(GraphSONXModuleV2d0.build().create(false))
.typeInfo(TypeInfo.PARTIAL_TYPES).create().createMapper()},
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6b50de53/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperTest.java
index 217cc6f..96bd9d6 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperTest.java
@@ -51,7 +51,7 @@ public class GraphSONMapperTest {
@Parameterized.Parameters(name = "{0}")
public static Iterable<Object[]> data() {
return Arrays.asList(new Object[][]{
- {GraphSONMapper.build().version(GraphSONVersion.V1_0).embedTypes(false).create().createMapper()},
+ {GraphSONMapper.build().version(GraphSONVersion.V1_0).typeInfo(TypeInfo.NO_TYPES).create().createMapper()},
{GraphSONMapper.build().version(GraphSONVersion.V2_0).addCustomModule(GraphSONXModuleV2d0.build().create(false)).typeInfo(TypeInfo.NO_TYPES).create().createMapper()},
});
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6b50de53/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperV2d0PartialEmbeddedTypeTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperV2d0PartialEmbeddedTypeTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperV2d0PartialEmbeddedTypeTest.java
index 28107d0..45bb2b1 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperV2d0PartialEmbeddedTypeTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapperV2d0PartialEmbeddedTypeTest.java
@@ -148,7 +148,7 @@ public class GraphSONMapperV2d0PartialEmbeddedTypeTest extends AbstractGraphSONT
public void shouldHandleMapWithTypesUsingEmbedTypeSettingV2d0() throws Exception {
final ObjectMapper mapper = GraphSONMapper.build()
.version(GraphSONVersion.V2_0)
- .embedTypes(true)
+ .typeInfo(TypeInfo.PARTIAL_TYPES)
.create()
.createMapper();
@@ -165,7 +165,7 @@ public class GraphSONMapperV2d0PartialEmbeddedTypeTest extends AbstractGraphSONT
public void shouldNotHandleMapWithTypesUsingEmbedTypeSettingV2d0() throws Exception {
final ObjectMapper mapper = GraphSONMapper.build()
.version(GraphSONVersion.V2_0)
- .embedTypes(false)
+ .typeInfo(TypeInfo.NO_TYPES)
.create()
.createMapper();
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6b50de53/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 3564279..ef9e0ef 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
@@ -20,6 +20,7 @@ package org.apache.tinkerpop.gremlin.driver.ser;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONVersion;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.TypeInfo;
import java.nio.ByteBuffer;
@@ -63,6 +64,6 @@ public final class GraphSONMessageSerializerGremlinV1d0 extends AbstractGraphSON
GraphSONMapper.Builder configureBuilder(final GraphSONMapper.Builder builder) {
// already set to 1.0 in AbstractGraphSONMessageSerializerV1d0
return builder.addCustomModule(new GraphSONMessageSerializerV1d0.GremlinServerModule())
- .embedTypes(true);
+ .typeInfo(TypeInfo.PARTIAL_TYPES);
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6b50de53/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 e61e946..436b621 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
@@ -23,6 +23,7 @@ import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONVersion;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.TypeInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -65,7 +66,7 @@ public final class GraphSONMessageSerializerV1d0 extends AbstractGraphSONMessage
GraphSONMapper.Builder configureBuilder(final GraphSONMapper.Builder builder) {
// already set to 1.0 in AbstractGraphSONMessageSerializerV1d0
return builder.addCustomModule(new GremlinServerModule())
- .embedTypes(false);
+ .typeInfo(TypeInfo.NO_TYPES);
}
@Override
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6b50de53/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/SerializationTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/SerializationTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/SerializationTest.java
index a112777..f11c0cb 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/SerializationTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/SerializationTest.java
@@ -51,9 +51,12 @@ import java.util.Optional;
import java.util.concurrent.TimeUnit;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
import static org.hamcrest.CoreMatchers.instanceOf;
-
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
/**
* Serialization tests that occur at a lower level than IO. Note that there is no need to test GraphML here as
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6b50de53/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoCustomTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoCustomTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoCustomTest.java
index f7340f8..777c2ee 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoCustomTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoCustomTest.java
@@ -62,8 +62,8 @@ public class IoCustomTest extends AbstractGremlinTest {
return Arrays.asList(new Object[][]{
{"graphson-v1-embedded", true,
- (Function<Graph, GraphReader>) g -> g.io(IoCore.graphson()).reader().mapper(g.io(GraphSONIo.build(GraphSONVersion.V1_0)).mapper().addCustomModule(moduleV1d0).embedTypes(true).create()).create(),
- (Function<Graph, GraphWriter>) g -> g.io(IoCore.graphson()).writer().mapper(g.io(GraphSONIo.build(GraphSONVersion.V1_0)).mapper().addCustomModule(moduleV1d0).embedTypes(true).create()).create()},
+ (Function<Graph, GraphReader>) g -> g.io(IoCore.graphson()).reader().mapper(g.io(GraphSONIo.build(GraphSONVersion.V1_0)).mapper().addCustomModule(moduleV1d0).typeInfo(TypeInfo.PARTIAL_TYPES).create()).create(),
+ (Function<Graph, GraphWriter>) g -> g.io(IoCore.graphson()).writer().mapper(g.io(GraphSONIo.build(GraphSONVersion.V1_0)).mapper().addCustomModule(moduleV1d0).typeInfo(TypeInfo.PARTIAL_TYPES).create()).create()},
{"graphson-v2-embedded", true,
(Function<Graph, GraphReader>) g -> g.io(IoCore.graphson()).reader().mapper(g.io(GraphSONIo.build(GraphSONVersion.V2_0)).mapper().addCustomModule(moduleV2d0).typeInfo(TypeInfo.PARTIAL_TYPES).create()).create(),
(Function<Graph, GraphWriter>) g -> g.io(IoCore.graphson()).writer().mapper(g.io(GraphSONIo.build(GraphSONVersion.V2_0)).mapper().addCustomModule(moduleV2d0).typeInfo(TypeInfo.PARTIAL_TYPES).create()).create()},
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6b50de53/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoEdgeTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoEdgeTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoEdgeTest.java
index fa656a5..7902d0d 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoEdgeTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoEdgeTest.java
@@ -58,8 +58,8 @@ public class IoEdgeTest extends AbstractGremlinTest {
(Function<Graph,GraphReader>) g -> g.io(IoCore.graphson()).reader().create(),
(Function<Graph, GraphWriter>) g -> g.io(IoCore.graphson()).writer().create()},
{"graphson-v1-embedded", true, true,
- (Function<Graph,GraphReader>) g -> g.io(IoCore.graphson()).reader().mapper(g.io(IoCore.graphson()).mapper().embedTypes(true).create()).create(),
- (Function<Graph, GraphWriter>) g -> g.io(IoCore.graphson()).writer().mapper(g.io(IoCore.graphson()).mapper().embedTypes(true).create()).create()},
+ (Function<Graph,GraphReader>) g -> g.io(IoCore.graphson()).reader().mapper(g.io(IoCore.graphson()).mapper().typeInfo(TypeInfo.PARTIAL_TYPES).create()).create(),
+ (Function<Graph, GraphWriter>) g -> g.io(IoCore.graphson()).writer().mapper(g.io(IoCore.graphson()).mapper().typeInfo(TypeInfo.PARTIAL_TYPES).create()).create()},
{"graphson-v2", false, false,
(Function<Graph, GraphReader>) g -> g.io(IoCore.graphson()).reader().mapper(g.io(GraphSONIo.build(GraphSONVersion.V2_0)).mapper().typeInfo(TypeInfo.NO_TYPES).create()).create(),
(Function<Graph, GraphWriter>) g -> g.io(IoCore.graphson()).writer().mapper(g.io(GraphSONIo.build(GraphSONVersion.V2_0)).mapper().typeInfo(TypeInfo.NO_TYPES).create()).create()},
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6b50de53/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoPropertyTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoPropertyTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoPropertyTest.java
index d16339f..49cc2b2 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoPropertyTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoPropertyTest.java
@@ -55,8 +55,8 @@ public class IoPropertyTest extends AbstractGremlinTest {
(Function<Graph, GraphReader>) g -> g.io(IoCore.graphson()).reader().create(),
(Function<Graph, GraphWriter>) g -> g.io(IoCore.graphson()).writer().create()},
{"graphson-v1-embedded", true, true,
- (Function<Graph, GraphReader>) g -> g.io(IoCore.graphson()).reader().mapper(g.io(IoCore.graphson()).mapper().embedTypes(true).create()).create(),
- (Function<Graph, GraphWriter>) g -> g.io(IoCore.graphson()).writer().mapper(g.io(IoCore.graphson()).mapper().embedTypes(true).create()).create()},
+ (Function<Graph, GraphReader>) g -> g.io(IoCore.graphson()).reader().mapper(g.io(IoCore.graphson()).mapper().typeInfo(TypeInfo.PARTIAL_TYPES).create()).create(),
+ (Function<Graph, GraphWriter>) g -> g.io(IoCore.graphson()).writer().mapper(g.io(IoCore.graphson()).mapper().typeInfo(TypeInfo.PARTIAL_TYPES).create()).create()},
{"graphson-v2", false, false,
(Function<Graph, GraphReader>) g -> g.io(IoCore.graphson()).reader().mapper(g.io(GraphSONIo.build(GraphSONVersion.V2_0)).mapper().typeInfo(TypeInfo.NO_TYPES).create()).create(),
(Function<Graph, GraphWriter>) g -> g.io(IoCore.graphson()).writer().mapper(g.io(GraphSONIo.build(GraphSONVersion.V2_0)).mapper().typeInfo(TypeInfo.NO_TYPES).create()).create()},
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6b50de53/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoTest.java
index 1605708..7434f1f 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoTest.java
@@ -451,7 +451,7 @@ public class IoTest {
final SimpleModule module = new SimpleModule();
module.addSerializer(CustomId.class, new CustomId.CustomIdJacksonSerializerV1d0());
final GraphWriter writer = graph.io(graphson).writer().mapper(
- graph.io(graphson).mapper().version(GraphSONVersion.V1_0).addCustomModule(module).embedTypes(true).create()).create();
+ graph.io(graphson).mapper().version(GraphSONVersion.V1_0).addCustomModule(module).typeInfo(TypeInfo.PARTIAL_TYPES).create()).create();
try (final ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
writer.writeGraph(baos, graph);
@@ -470,7 +470,7 @@ public class IoTest {
try (final InputStream is = new ByteArrayInputStream(baos.toByteArray())) {
final GraphReader reader = graph.io(graphson).reader()
- .mapper(graph.io(graphson).mapper().version(GraphSONVersion.V1_0).embedTypes(true).addCustomModule(module).create()).create();
+ .mapper(graph.io(graphson).mapper().version(GraphSONVersion.V1_0).typeInfo(TypeInfo.PARTIAL_TYPES).addCustomModule(module).create()).create();
reader.readGraph(is, g2);
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6b50de53/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoVertexTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoVertexTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoVertexTest.java
index d3aaa81..e7d7dd6 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoVertexTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoVertexTest.java
@@ -75,8 +75,8 @@ public class IoVertexTest extends AbstractGremlinTest {
(Function<Graph, GraphReader>) g -> g.io(IoCore.graphson()).reader().create(),
(Function<Graph, GraphWriter>) g -> g.io(IoCore.graphson()).writer().create()},
{"graphson-v1-embedded", true, false,
- (Function<Graph, GraphReader>) g -> g.io(IoCore.graphson()).reader().mapper(g.io(IoCore.graphson()).mapper().embedTypes(true).create()).create(),
- (Function<Graph, GraphWriter>) g -> g.io(IoCore.graphson()).writer().mapper(g.io(IoCore.graphson()).mapper().embedTypes(true).create()).create()},
+ (Function<Graph, GraphReader>) g -> g.io(IoCore.graphson()).reader().mapper(g.io(IoCore.graphson()).mapper().typeInfo(TypeInfo.PARTIAL_TYPES).create()).create(),
+ (Function<Graph, GraphWriter>) g -> g.io(IoCore.graphson()).writer().mapper(g.io(IoCore.graphson()).mapper().typeInfo(TypeInfo.PARTIAL_TYPES).create()).create()},
{"graphson-v2", false, false,
(Function<Graph, GraphReader>) g -> g.io(IoCore.graphson()).reader().mapper(g.io(GraphSONIo.build(GraphSONVersion.V2_0)).mapper().typeInfo(TypeInfo.NO_TYPES).create()).create(),
(Function<Graph, GraphWriter>) g -> g.io(IoCore.graphson()).writer().mapper(g.io(GraphSONIo.build(GraphSONVersion.V2_0)).mapper().typeInfo(TypeInfo.NO_TYPES).create()).create()},
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6b50de53/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/IoDataGenerationTest.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/IoDataGenerationTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/IoDataGenerationTest.java
index d07105b..9902ead 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/IoDataGenerationTest.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/IoDataGenerationTest.java
@@ -170,7 +170,7 @@ public class IoDataGenerationTest {
@Test
public void shouldWriteClassicGraphAsGraphSONWithTypes() throws IOException {
final OutputStream os = new FileOutputStream(tempPath + "tinkerpop-classic-typed.json");
- GraphSONWriter.build().mapper(GraphSONMapper.build().embedTypes(true).create())
+ GraphSONWriter.build().mapper(GraphSONMapper.build().typeInfo(TypeInfo.PARTIAL_TYPES).create())
.create().writeGraph(os, TinkerFactory.createClassic());
os.close();
}
@@ -181,7 +181,7 @@ public class IoDataGenerationTest {
@Test
public void shouldWriteModernGraphAsGraphSONWithTypes() throws IOException {
final OutputStream os = new FileOutputStream(tempPath + "tinkerpop-modern-typed.json");
- GraphSONWriter.build().mapper(GraphSONMapper.build().embedTypes(true).create())
+ GraphSONWriter.build().mapper(GraphSONMapper.build().typeInfo(TypeInfo.PARTIAL_TYPES).create())
.create().writeGraph(os, TinkerFactory.createModern());
os.close();
}
@@ -192,7 +192,7 @@ public class IoDataGenerationTest {
@Test
public void shouldWriteCrewGraphAsGraphSONWithTypes() throws IOException {
final OutputStream os = new FileOutputStream(tempPath + "tinkerpop-crew-typed.json");
- GraphSONWriter.build().mapper(GraphSONMapper.build().embedTypes(true).create())
+ GraphSONWriter.build().mapper(GraphSONMapper.build().typeInfo(TypeInfo.PARTIAL_TYPES).create())
.create().writeGraph(os, TinkerFactory.createTheCrew());
os.close();
}
@@ -315,7 +315,7 @@ public class IoDataGenerationTest {
}
/* keep this hanging around because changes to gryo format will need grateful dead generated from json so you can generate the gio
- final GraphSONMapper mapper = GraphSONMapper.build().embedTypes(true).create();
+ final GraphSONMapper mapper = GraphSONMapper.build().typeInfo(TypeInfo.PARTIAL_TYPES).create();
final GraphReader reader = org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONReader.build().mapper(mapper).create();
try (final InputStream stream = AbstractGremlinTest.class.getResourceAsStream("/org/apache/tinkerpop/gremlin/structure/io/graphson/grateful-dead-typed.json")) {
reader.readGraph(stream, g);
@@ -369,7 +369,7 @@ public class IoDataGenerationTest {
os4.close();
final OutputStream os5 = new FileOutputStream(tempPath + "grateful-dead-typed.json");
- GraphSONWriter.build().mapper(GraphSONMapper.build().embedTypes(true).create()).create().writeGraph(os5, g);
+ GraphSONWriter.build().mapper(GraphSONMapper.build().typeInfo(TypeInfo.PARTIAL_TYPES).create()).create().writeGraph(os5, g);
os5.close();
final OutputStream os6 = new FileOutputStream(tempPath + "grateful-dead-v2d0-typed.json");
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6b50de53/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
index edf2127..ca11e17 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
@@ -36,6 +36,7 @@ import org.apache.tinkerpop.gremlin.structure.io.IoTest;
import org.apache.tinkerpop.gremlin.structure.io.Mapper;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONReader;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONWriter;
+import org.apache.tinkerpop.gremlin.structure.io.graphson.TypeInfo;
import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoClassResolver;
import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoMapper;
import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoWriter;
@@ -351,7 +352,7 @@ public class TinkerGraphTest {
@Test
public void shouldSerializeTinkerGraphToGraphSONWithTypes() throws Exception {
final TinkerGraph graph = TinkerFactory.createModern();
- final Mapper<ObjectMapper> mapper = graph.io(IoCore.graphson()).mapper().embedTypes(true).create();
+ final Mapper<ObjectMapper> mapper = graph.io(IoCore.graphson()).mapper().typeInfo(TypeInfo.PARTIAL_TYPES).create();
try (final ByteArrayOutputStream out = new ByteArrayOutputStream()) {
final GraphWriter writer = GraphSONWriter.build().mapper(mapper).create();
writer.writeObject(out, graph);
[05/11] tinkerpop git commit: TINKERPOP-1028 Removed previously
deprecated ConnectionPoolSettings session settings
Posted by sp...@apache.org.
TINKERPOP-1028 Removed previously deprecated ConnectionPoolSettings session settings
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/90c9a582
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/90c9a582
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/90c9a582
Branch: refs/heads/master
Commit: 90c9a582faa1806399865a476e8202492cff2a23
Parents: cd1b457
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Jun 26 15:57:12 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Jun 29 14:51:11 2017 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../apache/tinkerpop/gremlin/driver/Settings.java | 16 ----------------
2 files changed, 1 insertion(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/90c9a582/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 24160b0..4179f10 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Removed previously deprecated `ConnectionPoolSettings.sessionId` and `ConnectionPoolSettings.optionalSessionId()`.
* Removed previously deprecated `reconnectInitialDelay` setting from the Java driver.
* Removed support for passing a byte array on the `sasl` parameter.
* Graphite and Ganglia are no longer packaged with the Gremlin Server distribution.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/90c9a582/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 3da08b8..03374cc 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
@@ -317,22 +317,6 @@ final class Settings {
* {@link org.apache.tinkerpop.gremlin.driver.Channelizer.WebSocketChannelizer}.
*/
public String channelizer = Channelizer.WebSocketChannelizer.class.getName();
-
- /**
- * @deprecated as of 3.1.1-incubating, and not replaced as this property was never implemented internally
- * as the way to establish sessions
- */
- @Deprecated
- public String sessionId = null;
-
- /**
- * @deprecated as of 3.1.1-incubating, and not replaced as this property was never implemented internally
- * as the way to establish sessions
- */
- @Deprecated
- public Optional<String> optionalSessionId() {
- return Optional.ofNullable(sessionId);
- }
}
public static class SerializerSettings {
[09/11] tinkerpop git commit: Removed some tokens that are no longer
in use.
Posted by sp...@apache.org.
Removed some tokens that are no longer in use.
They were part of ControlOpProcessor which was deprecated and removed a long while back.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6f5ae816
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6f5ae816
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6f5ae816
Branch: refs/heads/master
Commit: 6f5ae81657a544ae571f9931c576215395a0066f
Parents: 1c39d67
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Jun 29 15:11:38 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Jun 29 15:11:38 2017 -0400
----------------------------------------------------------------------
.../apache/tinkerpop/gremlin/driver/Tokens.java | 92 --------------------
1 file changed, 92 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6f5ae816/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 9aee728..9dfc4bd 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
@@ -18,9 +18,6 @@
*/
package org.apache.tinkerpop.gremlin.driver;
-import java.util.Arrays;
-import java.util.List;
-
/**
* String constants used in gremlin-driver and gremlin-server.
*
@@ -37,36 +34,6 @@ public final class Tokens {
public static final String OPS_KEYS = "keys";
public static final String OPS_CLOSE = "close";
- /**
- * @deprecated As for release 3.2.2, not replaced as this feature was never really published as official.
- */
- @Deprecated
- public static final String OPS_SHOW = "show";
-
- /**
- * @deprecated As for release 3.2.2, not replaced as this feature was never really published as official.
- */
- @Deprecated
- public static final String OPS_IMPORT = "import";
-
- /**
- * @deprecated As for release 3.2.2, not replaced as this feature was never really published as official.
- */
- @Deprecated
- public static final String OPS_RESET = "reset";
-
- /**
- * @deprecated As for release 3.2.2, not replaced as this feature was never really published as official.
- */
- @Deprecated
- public static final String OPS_USE = "use";
-
- /**
- * @deprecated As for release 3.2.2, not replaced as this feature was never really published as official.
- */
- @Deprecated
- public static final String OPS_VERSION = "version";
-
public static final String ARGS_BATCH_SIZE = "batchSize";
public static final String ARGS_BINDINGS = "bindings";
public static final String ARGS_ALIASES = "aliases";
@@ -89,65 +56,6 @@ public final class Tokens {
@Deprecated
public static final String ARGS_REBINDINGS = "rebindings";
- /**
- * @deprecated As for release 3.2.2, not replaced as this feature was never really published as official.
- */
- public static final String ARGS_COORDINATES = "coordinates";
-
- /**
- * @deprecated As for release 3.2.2, not replaced as this feature was never really published as official.
- */
- @Deprecated
- public static final String ARGS_COORDINATES_GROUP = "group";
-
- /**
- * @deprecated As for release 3.2.2, not replaced as this feature was never really published as official.
- */
- @Deprecated
- public static final String ARGS_COORDINATES_ARTIFACT = "artifact";
-
- /**
- * @deprecated As for release 3.2.2, not replaced as this feature was never really published as official.
- */
- @Deprecated
- public static final String ARGS_COORDINATES_VERSION = "version";
-
- /**
- * @deprecated As for release 3.2.2, not replaced as this feature was never really published as official.
- */
- @Deprecated
- public static final String ARGS_IMPORTS = "imports";
-
- /**
- * @deprecated As for release 3.2.2, not replaced as this feature was never really published as official.
- */
- @Deprecated
- public static final String ARGS_INFO_TYPE_DEPENDENCIES = "dependencies";
-
- /**
- * @deprecated As for release 3.2.2, not replaced as this feature was never really published as official.
- */
- public static final String ARGS_INFO_TYPE = "infoType";
-
- /**
- * @deprecated As of release 3.1.1-incubating, replaced by {@link #ARGS_INFO_TYPE_DEPENDENCIES}
- */
- @Deprecated
- public static final String ARGS_INFO_TYPE_DEPDENENCIES = "dependencies";
-
- /**
- * @deprecated As for release 3.2.2, not replaced as this feature was never really published as official.
- */
- @Deprecated
- public static final String ARGS_INFO_TYPE_IMPORTS = "imports";
-
- /**
- * @deprecated As for release 3.2.2, not replaced as this feature was never really published as official.
- */
- @Deprecated
- public static final List<String> INFO_TYPES = Arrays.asList(ARGS_INFO_TYPE_DEPENDENCIES,
- ARGS_INFO_TYPE_IMPORTS);
-
public static final String VAL_AGGREGATE_TO_BULKSET = "bulkset";
public static final String VAL_AGGREGATE_TO_LIST = "list";
public static final String VAL_AGGREGATE_TO_MAP = "map";
[07/11] tinkerpop git commit: TINKERPOP-1699 Removed deprecated
userMapperFromGraph option
Posted by sp...@apache.org.
TINKERPOP-1699 Removed deprecated userMapperFromGraph option
Conflicts:
CHANGELOG.asciidoc
gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGraphSONMessageSerializerV1d0.java
gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGryoMessageSerializerV1d0.java
gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/851a8deb
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/851a8deb
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/851a8deb
Branch: refs/heads/master
Commit: 851a8debe859b9d6a39f4ce8461db7138c2246a0
Parents: deeeb87
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Jun 29 12:16:33 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Jun 29 14:52:56 2017 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 3 +-
docs/src/upgrade/release-3.3.x.asciidoc | 15 ++++++++++
.../AbstractGraphSONMessageSerializerV1d0.java | 30 +-------------------
.../ser/AbstractGryoMessageSerializerV1d0.java | 28 +-----------------
.../gremlin/server/AbstractChannelizer.java | 3 --
5 files changed, 19 insertions(+), 60 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/851a8deb/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 9390acd..2f4c242 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -39,13 +39,14 @@ TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET)
* Added "attachment requisite" `VertexProperty.element()` and `Property.element()` data in GraphSON serialization.
* GraphSON 3.0 is now the default serialization format in TinkerGraph and Gremlin Server.
* Established the GraphSON 3.0 format.
+* Changed `ServerGremlinExecutor` to not use generics since there really is no flexibility in the kind of `ScheduledExecutorService` that will be used.
+* Removed previously deprecated `useMapperFromGraph` option.
* Removed previously deprecated `Io.Builder#registry(IoRegistry)` method.
* Removed previously deprecated `GryoMessageSerializerV1d0(GryoMapper)` constructor.
* Removed previously deprecated `TinkerIoRegistry`.
* Removed previously deprecated `getInstance()` methods on all TinkerPop classes.
* Removed previously deprecated `VertexPropertyFeatures.supportsAddProperty()`.
* Removed previously deprecated TinkerGraph configuration member variables.
-* Changed `ServerGremlinExecutor` to not use generics since there really is no flexibility in the kind of `ScheduledExecutorService` that will be used.
* Removed previously deprecated `Transaction.submit(Function)`.
* Removed previously deprecated `OpSelectorHandler.errorMeter` and `AbstractEvalOpProcessor.errorMeter` fields.
* Removed previously deprecated `AbstractEvalOpProcessor.validBindingName` field.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/851a8deb/docs/src/upgrade/release-3.3.x.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/upgrade/release-3.3.x.asciidoc b/docs/src/upgrade/release-3.3.x.asciidoc
index a772fb4..35e27d7 100644
--- a/docs/src/upgrade/release-3.3.x.asciidoc
+++ b/docs/src/upgrade/release-3.3.x.asciidoc
@@ -289,6 +289,21 @@ The switch name has changed for installing dependencies. `-i` has been deprecate
See: link:https://issues.apache.org/jira/browse/TINKERPOP-980[TINKERPOP-980], link:http://tinkerpop.apache.org/docs/3.3.0/reference/#_configuring_2[Reference Documentation - Server Configuration].
+Removal of useMapperFromGraph
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The `userMapperFromGraph` serialization configuration option was used to allow the IO configurations of a specific
+graph to be assigned to a specific serializer. This feature has been removed completely now. Please use the
+`ioRegistries` configuration option to add one or more specific `Graph` serialization capabilities to a serializer.
+
+[source,yaml]
+----
+serializers:
+ - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerIoRegistryV1d0] }} # application/vnd.gremlin-v1.0+gryo
+----
+
+see: link:https://issues.apache.org/jira/browse/TINKERPOP-1699[TINKERPOP-1699]
+
Gremlin-server.bat
^^^^^^^^^^^^^^^^^^
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/851a8deb/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 10d104a..e09618e 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
@@ -57,13 +57,6 @@ public abstract class AbstractGraphSONMessageSerializerV1d0 extends AbstractMess
protected ObjectMapper mapper;
- /**
- * @deprecated As of release 3.2.6, replaced by functionality provided by {@link AbstractMessageSerializer#TOKEN_IO_REGISTRIES}.
- * @see <a href="https://issues.apache.org/jira/browse/TINKERPOP-1694">TINKERPOP-1694</a>
- */
- @Deprecated
- public static final String TOKEN_USE_MAPPER_FROM_GRAPH = "useMapperFromGraph";
-
protected final TypeReference<Map<String, Object>> mapTypeReference = new TypeReference<Map<String, Object>>() {
};
@@ -82,29 +75,8 @@ public abstract class AbstractGraphSONMessageSerializerV1d0 extends AbstractMess
@Override
public void configure(final Map<String, Object> config, final Map<String, Graph> graphs) {
- final GraphSONMapper.Builder initialBuilder;
- final Object graphToUseForMapper = config.get(TOKEN_USE_MAPPER_FROM_GRAPH);
- if (graphToUseForMapper != null) {
- if (null == graphs) throw new IllegalStateException(String.format(
- "No graphs have been provided to the serializer and therefore %s is not a valid configuration", TOKEN_USE_MAPPER_FROM_GRAPH));
-
- final Graph g = graphs.get(graphToUseForMapper.toString());
- if (null == g) throw new IllegalStateException(String.format(
- "There is no graph named [%s] configured to be used in the %s setting",
- graphToUseForMapper, TOKEN_USE_MAPPER_FROM_GRAPH));
-
- // a graph was found so use the mapper it constructs. this allows graphson to be auto-configured with any
- // custom classes that the implementation allows for
- initialBuilder = initBuilder(g.io(GraphSONIo.build()).mapper());
- } else {
- // no graph was supplied so just use the default - this will likely be the case when using a graph
- // with no custom classes or a situation where the user needs complete control like when using two
- // distinct implementations each with their own custom classes.
- initialBuilder = initBuilder(null);
- }
-
+ final GraphSONMapper.Builder initialBuilder = initBuilder(null);
addIoRegistries(config, initialBuilder);
-
mapper = configureBuilder(initialBuilder).create().createMapper();
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/851a8deb/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGryoMessageSerializerV1d0.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGryoMessageSerializerV1d0.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGryoMessageSerializerV1d0.java
index c79c124..d263a87 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGryoMessageSerializerV1d0.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractGryoMessageSerializerV1d0.java
@@ -62,12 +62,6 @@ public abstract class AbstractGryoMessageSerializerV1d0 extends AbstractMessageS
public static final String TOKEN_CUSTOM = "custom";
public static final String TOKEN_SERIALIZE_RESULT_TO_STRING = "serializeResultToString";
- /**
- * @deprecated As of release 3.2.6, replaced by functionality provided by {@link AbstractMessageSerializer#TOKEN_IO_REGISTRIES}.
- * @see <a href="https://issues.apache.org/jira/browse/TINKERPOP-1694">TINKERPOP-1694</a>
- */
- @Deprecated
- public static final String TOKEN_USE_MAPPER_FROM_GRAPH = "useMapperFromGraph";
public static final String TOKEN_BUFFER_SIZE = "bufferSize";
public static final String TOKEN_CLASS_RESOLVER_SUPPLIER = "classResolverSupplier";
@@ -93,27 +87,7 @@ public abstract class AbstractGryoMessageSerializerV1d0 extends AbstractMessageS
@Override
public final void configure(final Map<String, Object> config, final Map<String, Graph> graphs) {
- final GryoMapper.Builder builder;
- final Object graphToUseForMapper = config.get(TOKEN_USE_MAPPER_FROM_GRAPH);
- if (graphToUseForMapper != null) {
- if (null == graphs) throw new IllegalStateException(String.format(
- "No graphs have been provided to the serializer and therefore %s is not a valid configuration", TOKEN_USE_MAPPER_FROM_GRAPH));
-
- final Graph g = graphs.get(graphToUseForMapper.toString());
- if (null == g) throw new IllegalStateException(String.format(
- "There is no graph named [%s] configured to be used in the %s setting",
- graphToUseForMapper, TOKEN_USE_MAPPER_FROM_GRAPH));
-
- // a graph was found so use the mapper it constructs. this allows gryo to be auto-configured with any
- // custom classes that the implementation allows for
- builder = g.io(GryoIo.build()).mapper();
- } else {
- // no graph was supplied so just use the default - this will likely be the case when using a graph
- // with no custom classes or a situation where the user needs complete control like when using two
- // distinct implementations each with their own custom classes.
- builder = GryoMapper.build();
- }
-
+ final GryoMapper.Builder builder = GryoMapper.build();
addIoRegistries(config, builder);
addClassResolverSupplier(config, builder);
addCustomClasses(config, builder);
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/851a8deb/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java
index dca7055..936c770 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java
@@ -197,9 +197,6 @@ public abstract class AbstractChannelizer extends ChannelInitializer<SocketChann
graphsDefinedAtStartup.put(graphName, graphManager.getGraph(graphName));
}
- if (config.config.containsKey(AbstractGryoMessageSerializerV1d0.TOKEN_USE_MAPPER_FROM_GRAPH))
- logger.warn("{} utilizes the {} configuration setting which is deprecated - prefer use of {}", config.className, AbstractGryoMessageSerializerV1d0.TOKEN_USE_MAPPER_FROM_GRAPH, AbstractGryoMessageSerializerV1d0.TOKEN_IO_REGISTRIES);
-
if (config.config != null)
serializer.configure(config.config, graphsDefinedAtStartup);