Repository: tinkerpop Updated Branches: refs/heads/TINKERPOP-1682 0867f1aef -> de5306301 (forced update)
TINKERPOP-929 Remove deprecated fields from TinkerGraph. Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/4d0a5fb3 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4d0a5fb3 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/4d0a5fb3 Branch: refs/heads/TINKERPOP-1682 Commit: 4d0a5fb3e070ac4db066537f8f89c10c021e731e Parents: 512ca3a Author: Stephen Mallette <[email protected]> Authored: Fri Jun 9 10:06:26 2017 -0400 Committer: Stephen Mallette <[email protected]> Committed: Fri Jun 9 10:06:26 2017 -0400 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 1 + docs/src/upgrade/release-3.3.x.asciidoc | 1 + .../tinkergraph/structure/TinkerGraph.java | 31 -------------------- 3 files changed, 2 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4d0a5fb3/CHANGELOG.asciidoc ---------------------------------------------------------------------- diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index b445a00..aa3ca46 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -32,6 +32,7 @@ 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. +* Removed previously deprecated TinkerGraph configuration member variables. * Removed previously deprecated `OpSelectorHandler.errorMeter` and `AbstractEvalOpProcessor.errorMeter` fields. * Removed previously deprecated `AbstractEvalOpProcessor.validBindingName` field. * Removed previously deprecated `SimpleAuthenticator.CONFIG_CREDENTIALS_LOCATION` field. http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4d0a5fb3/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 dbb40b4..800fd7a 100644 --- a/docs/src/upgrade/release-3.3.x.asciidoc +++ b/docs/src/upgrade/release-3.3.x.asciidoc @@ -244,6 +244,7 @@ The following deprecated classes, methods or fields have been removed in this ve ** `org.apache.tinkerpop.gremlin.spark.groovy.plugin.SparkGremlinPlugin` * `tinkergraph-gremlin` ** `org.apache.tinkerpop.gremlin.tinkergraph.groovy.plugin.TinkerGraphGremlinPlugin` +** `org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph.CONFIG_*` Please see the javadoc deprecation notes or upgrade documentation specific to when the deprecation took place to understand how to resolve this breaking change. http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4d0a5fb3/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java ---------------------------------------------------------------------- diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java index 79503ea..770cd6d 100644 --- a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java +++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java @@ -75,37 +75,6 @@ public final class TinkerGraph implements Graph { this.setProperty(Graph.GRAPH, TinkerGraph.class.getName()); }}; - /** - * @deprecated As of release 3.1.0, replaced by {@link TinkerGraph#GREMLIN_TINKERGRAPH_VERTEX_ID_MANAGER} - */ - @Deprecated - public static final String CONFIG_VERTEX_ID = "gremlin.tinkergraph.vertexIdManager"; - /** - * @deprecated As of release 3.1.0, replaced by {@link TinkerGraph#GREMLIN_TINKERGRAPH_EDGE_ID_MANAGER} - */ - @Deprecated - public static final String CONFIG_EDGE_ID = "gremlin.tinkergraph.edgeIdManager"; - /** - * @deprecated As of release 3.1.0, replaced by {@link TinkerGraph#GREMLIN_TINKERGRAPH_VERTEX_PROPERTY_ID_MANAGER} - */ - @Deprecated - public static final String CONFIG_VERTEX_PROPERTY_ID = "gremlin.tinkergraph.vertexPropertyIdManager"; - /** - * @deprecated As of release 3.1.0, replaced by {@link TinkerGraph#GREMLIN_TINKERGRAPH_DEFAULT_VERTEX_PROPERTY_CARDINALITY} - */ - @Deprecated - public static final String CONFIG_DEFAULT_VERTEX_PROPERTY_CARDINALITY = "gremlin.tinkergraph.defaultVertexPropertyCardinality"; - /** - * @deprecated As of release 3.1.0, replaced by {@link TinkerGraph#GREMLIN_TINKERGRAPH_GRAPH_LOCATION} - */ - @Deprecated - public static final String CONFIG_GRAPH_LOCATION = "gremlin.tinkergraph.graphLocation"; - /** - * @deprecated As of release 3.1.0, replaced by {@link TinkerGraph#GREMLIN_TINKERGRAPH_GRAPH_FORMAT} - */ - @Deprecated - public static final String CONFIG_GRAPH_FORMAT = "gremlin.tinkergraph.graphFormat"; - /////// public static final String GREMLIN_TINKERGRAPH_VERTEX_ID_MANAGER = "gremlin.tinkergraph.vertexIdManager"; public static final String GREMLIN_TINKERGRAPH_EDGE_ID_MANAGER = "gremlin.tinkergraph.edgeIdManager"; public static final String GREMLIN_TINKERGRAPH_VERTEX_PROPERTY_ID_MANAGER = "gremlin.tinkergraph.vertexPropertyIdManager";
