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/TINKERPOP-1603 Commit: 8105faa1f84062bff7639e0ebd366d3e7d12cc90 Parents: 6f5ae81 Author: Stephen Mallette <[email protected]> Authored: Thu Jun 29 16:32:38 2017 -0400 Committer: Stephen Mallette <[email protected]> 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);
