Repository: tinkerpop Updated Branches: refs/heads/master abd79a20f -> 1526c2c55
Removed DetachedEdge constructor that was previously deprecated Should have been removed earlier on an older, long ago merged ticket CTR Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1526c2c5 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1526c2c5 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1526c2c5 Branch: refs/heads/master Commit: 1526c2c55de1c7fce8ae1448bab2ace07ca59f36 Parents: abd79a2 Author: Stephen Mallette <sp...@genoprime.com> Authored: Wed Jul 12 13:21:04 2017 -0400 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Wed Jul 12 13:25:03 2017 -0400 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 3 ++- docs/src/upgrade/release-3.3.x.asciidoc | 3 ++- .../io/graphson/GraphSONSerializersV3d0.java | 5 ++--- .../structure/util/detached/DetachedEdge.java | 23 -------------------- 4 files changed, 6 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1526c2c5/CHANGELOG.asciidoc ---------------------------------------------------------------------- diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 41de269..54c3d94 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -26,12 +26,13 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +* Removed previously deprecated `DetachedEdge(Object,String,Map,Pair,Pair)` constructor. * Removed previously deprecated `Bindings` constructor. It is now a private constructor. * Removed previously deprecated `TraversalSource.withBindings()`. * Established the Gryo 3.0 format. * `GryoVersion` now includes a default `ClassResolver` to supply to the `GryoMapper`. * `GryoClassResolver` renamed to `GryoClassResolverV1d0` which has an abstract class that for providers to extend in `AbstractGryoClassResolver`. -* Removed previously deprecatd `Order` enums of `keyIncr`, `keyDecr`, `valueIncr`, and `valueDecr.` +* Removed previously deprecated `Order` enums of `keyIncr`, `keyDecr`, `valueIncr`, and `valueDecr.` * Removed previously deprecated `GraphTraversal.mapKeys()` step. * Removed previously deprecated `GraphTraversal.mapValues()` step. * Removed previously deprecated `GraphTraversal#addV(Object...)`. http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1526c2c5/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 f58b4ae..f1b3693 100644 --- a/docs/src/upgrade/release-3.3.x.asciidoc +++ b/docs/src/upgrade/release-3.3.x.asciidoc @@ -228,6 +228,7 @@ The following deprecated classes, methods or fields have been removed in this ve ** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#addInV(String, String, Object...)` ** `org.apache.tinkerpop.gremlin.process.traversal.Bindings()` ** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource#withBindings(Bindings)` +** `org.apache.tinkerpop.gremlin.structure.Transaction.submit(Function)` ** `org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#supportsAddProperty()` ** `org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#FEATURE_ADD_PROPERTY` ** `org.apache.tinkerpop.gremlin.structure.Graph.OptIn#SUITE_GROOVY_PROCESS_STANDARD` @@ -236,7 +237,7 @@ The following deprecated classes, methods or fields have been removed in this ve ** `org.apache.tinkerpop.gremlin.structure.Graph.OptIn#SUITE_GROOVY_ENVIRONMENT_INTEGRATE` ** `org.apache.tinkerpop.gremlin.structure.io.Io.Builder#registry(IoRegistry)` ** `org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper.Builder#embedTypes(boolean)` -** `org.apache.tinkerpop.gremlin.structure.Transaction.submit(Function)` +** `org.apache.tinkerpop.gremlin.structure.util.detached.DetachedEdge(Object,String,Map,Pair,Pair)` * `gremlin-driver` ** `org.apache.tinkerpop.gremlin.driver.Cluster$Builder#reconnectIntialDelay(int)` ** `org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0(GryoMapper)` http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1526c2c5/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV3d0.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV3d0.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV3d0.java index b62094e..1584674 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV3d0.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV3d0.java @@ -446,9 +446,8 @@ class GraphSONSerializersV3d0 { edgeData.get(GraphSONTokens.ID), edgeData.get(GraphSONTokens.LABEL).toString(), (Map) edgeData.get(GraphSONTokens.PROPERTIES), - Pair.with(edgeData.get(GraphSONTokens.OUT), edgeData.get(GraphSONTokens.OUT_LABEL).toString()), - Pair.with(edgeData.get(GraphSONTokens.IN), edgeData.get(GraphSONTokens.IN_LABEL).toString()) - ); + edgeData.get(GraphSONTokens.OUT), edgeData.get(GraphSONTokens.OUT_LABEL).toString(), + edgeData.get(GraphSONTokens.IN), edgeData.get(GraphSONTokens.IN_LABEL).toString()); } } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1526c2c5/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedEdge.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedEdge.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedEdge.java index 367dbc9..fca1094 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedEdge.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedEdge.java @@ -89,29 +89,6 @@ public class DetachedEdge extends DetachedElement<Edge> implements Edge { } } - /** - * @deprecated As for release 3.2.5, replaced by {@link #DetachedEdge(Object, String, Map, Object, String, Object, String)}. - */ - @Deprecated - public DetachedEdge(final Object id, final String label, - final Map<String, Object> properties, - final Pair<Object, String> outV, - final Pair<Object, String> inV) { - super(id, label); - this.outVertex = new DetachedVertex(outV.getValue0(), outV.getValue1(), Collections.emptyMap()); - this.inVertex = new DetachedVertex(inV.getValue0(), inV.getValue1(), Collections.emptyMap()); - if (properties != null && !properties.isEmpty()) { - this.properties = new HashMap<>(); - properties.entrySet().iterator().forEachRemaining(entry -> { - if (Property.class.isAssignableFrom(entry.getValue().getClass())) { - this.properties.put(entry.getKey(), Collections.singletonList((Property)entry.getValue())); - } else { - this.properties.put(entry.getKey(), Collections.singletonList(new DetachedProperty<>(entry.getKey(), entry.getValue(), this))); - } - }); - } - } - @Override public String toString() { return StringFactory.edgeString(this);