TINKERPOP-1996 Deprecated Graph.io() and related infrastructure.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ae796378 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ae796378 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ae796378 Branch: refs/heads/TINKERPOP-1774 Commit: ae796378e07925f9385f3ec65c10022b59aab8b5 Parents: 328737a Author: Stephen Mallette <sp...@genoprime.com> Authored: Thu Jul 12 14:33:03 2018 -0400 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Thu Jul 19 13:40:09 2018 -0400 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 2 ++ .../main/java/org/apache/tinkerpop/gremlin/structure/Graph.java | 3 +++ .../main/java/org/apache/tinkerpop/gremlin/structure/io/Io.java | 3 +++ .../java/org/apache/tinkerpop/gremlin/structure/io/IoCore.java | 3 +++ .../apache/tinkerpop/gremlin/structure/io/graphml/GraphMLIo.java | 3 +++ .../tinkerpop/gremlin/structure/io/graphson/GraphSONIo.java | 3 +++ .../org/apache/tinkerpop/gremlin/structure/io/gryo/GryoIo.java | 3 +++ 7 files changed, 20 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ae796378/CHANGELOG.asciidoc ---------------------------------------------------------------------- diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index c0cd27d..bc78bbe 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -27,6 +27,8 @@ This release also includes changes from <<release-3-3-3, 3.3.3>>. * Bumped to Netty 4.1.25. * Bumped to Spark 2.3.1. +* Added the `io()` start step and `read()` and `write()` termination steps to the Gremlin language. +* Deprecated `Graph.io()` and related infrastructure. * Moved `Parameterizing` interface to the `org.apache.tinkerpop.gremlin.process.traversal.step` package with other marker interfaces of its type. * Replaced `Parameterizing.addPropertyMutations()` with `Configuring.configure()`. * Changed interface hierarchy for `Parameterizing` and `Mutating` interfaces as they are tightly related. http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ae796378/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java index dc14cc6..f1fc54a 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java @@ -300,7 +300,10 @@ public interface Graph extends AutoCloseable, Host { * For those graphs that do not need to register any custom serializers, the default implementation should suffice. * If the default is overridden, take care to register the current graph via the * {@link org.apache.tinkerpop.gremlin.structure.io.Io.Builder#graph(Graph)} method. + * + * @deprecated As of release 3.4.0, replaced by {@link GraphTraversalSource#io(String)}. */ + @Deprecated public default <I extends Io> I io(final Io.Builder<I> builder) { return (I) builder.graph(this).create(); } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ae796378/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Io.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Io.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Io.java index bae56c5..0971e31 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Io.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Io.java @@ -18,6 +18,7 @@ */ package org.apache.tinkerpop.gremlin.structure.io; +import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; import org.apache.tinkerpop.gremlin.structure.Graph; import java.io.IOException; @@ -31,7 +32,9 @@ import java.util.function.Consumer; * internal {@link Mapper} (if the format has such capability). * * @author Stephen Mallette (http://stephen.genoprime.com) + * @deprecated As of release 3.4.0, replaced by {@link GraphTraversalSource#io(String)}. */ +@Deprecated public interface Io<R extends GraphReader.ReaderBuilder, W extends GraphWriter.WriterBuilder, M extends Mapper.Builder> { /** http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ae796378/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoCore.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoCore.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoCore.java index 9d9ad60..a357184 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoCore.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoCore.java @@ -18,6 +18,7 @@ */ package org.apache.tinkerpop.gremlin.structure.io; +import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; import org.apache.tinkerpop.gremlin.structure.io.graphml.GraphMLIo; import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONIo; import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoIo; @@ -27,7 +28,9 @@ import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoIo; * methods statically. * * @author Stephen Mallette (http://stephen.genoprime.com) + * @deprecated As of release 3.4.0, replaced by {@link GraphTraversalSource#io(String)}. */ +@Deprecated public final class IoCore { private IoCore() {} http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ae796378/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLIo.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLIo.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLIo.java index 88431bf..b6af646 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLIo.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphml/GraphMLIo.java @@ -18,6 +18,7 @@ */ package org.apache.tinkerpop.gremlin.structure.io.graphml; +import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; import org.apache.tinkerpop.gremlin.structure.Graph; import org.apache.tinkerpop.gremlin.structure.io.Io; import org.apache.tinkerpop.gremlin.structure.io.IoRegistry; @@ -37,7 +38,9 @@ import java.util.function.Consumer; * such things. * * @author Stephen Mallette (http://stephen.genoprime.com) + * @deprecated As of release 3.4.0, replaced by {@link GraphTraversalSource#io(String)}. */ +@Deprecated public final class GraphMLIo implements Io<GraphMLReader.Builder, GraphMLWriter.Builder, GraphMLMapper.Builder> { private final Graph graph; private Optional<Consumer<Mapper.Builder>> onMapper; http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ae796378/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONIo.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONIo.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONIo.java index a3923a1..7f8b835 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONIo.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONIo.java @@ -18,6 +18,7 @@ */ package org.apache.tinkerpop.gremlin.structure.io.graphson; +import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; import org.apache.tinkerpop.gremlin.structure.Graph; import org.apache.tinkerpop.gremlin.structure.io.Io; import org.apache.tinkerpop.gremlin.structure.io.IoRegistry; @@ -36,7 +37,9 @@ import java.util.function.Consumer; * interfaces should see the {@link GraphSONMapper} for information on the expectations for the {@link IoRegistry}. * * @author Stephen Mallette (http://stephen.genoprime.com) + * @deprecated As of release 3.4.0, replaced by {@link GraphTraversalSource#io(String)}. */ +@Deprecated public final class GraphSONIo implements Io<GraphSONReader.Builder, GraphSONWriter.Builder, GraphSONMapper.Builder> { private final Graph graph; private final Optional<Consumer<Mapper.Builder>> onMapper; http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ae796378/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoIo.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoIo.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoIo.java index 29e63de..a7dfe0d 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoIo.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoIo.java @@ -18,6 +18,7 @@ */ package org.apache.tinkerpop.gremlin.structure.io.gryo; +import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; import org.apache.tinkerpop.gremlin.structure.Graph; import org.apache.tinkerpop.gremlin.structure.io.Io; import org.apache.tinkerpop.gremlin.structure.io.IoRegistry; @@ -36,7 +37,9 @@ import java.util.function.Consumer; * interfaces should see the {@link GryoMapper} for information on the expectations for the {@link IoRegistry}. * * @author Stephen Mallette (http://stephen.genoprime.com) + * @deprecated As of release 3.4.0, replaced by {@link GraphTraversalSource#io(String)}. */ +@Deprecated public final class GryoIo implements Io<GryoReader.Builder, GryoWriter.Builder, GryoMapper.Builder> { private final Graph graph;