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/13 17:24:58 UTC

[10/50] [abbrv] tinkerpop git commit: removed deprecated sack() function.

removed deprecated sack() function.


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/18eacfdc
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/18eacfdc
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/18eacfdc

Branch: refs/heads/TINKERPOP-1427
Commit: 18eacfdc015621c7127fb7ad495b36c84d70d47e
Parents: 849563f
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon Jul 10 13:52:09 2017 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Wed Jul 12 17:43:56 2017 -0600

----------------------------------------------------------------------
 CHANGELOG.asciidoc                                          | 1 +
 docs/src/upgrade/release-3.3.x.asciidoc                     | 7 ++++++-
 .../gremlin/process/traversal/dsl/graph/GraphTraversal.java | 9 ---------
 .../tinkerpop/gremlin/process/traversal/dsl/graph/__.java   | 8 --------
 4 files changed, 7 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/18eacfdc/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 31ea10e..ca690ab 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -29,6 +29,7 @@ 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()`.
+* Removed previously deprecated `GraphTraversal.sack(BiFunction,String)`.
 * 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`.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/18eacfdc/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 f1b3693..74b9c55 100644
--- a/docs/src/upgrade/release-3.3.x.asciidoc
+++ b/docs/src/upgrade/release-3.3.x.asciidoc
@@ -216,6 +216,7 @@ The following deprecated classes, methods or fields have been removed in this ve
 ** `org.apache.tinkerpop.gremlin.process.traversal.util.OrP(P...)`
 ** `org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptFunction`
 ** `org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptHelper`
+<<<<<<< 849563fe3773d504d6ba2f61ee640547277760de
 ** `org.apache.tinkerpop.gremlin.process.traversal.Order.keyIncr`
 ** `org.apache.tinkerpop.gremlin.process.traversal.Order.valueIncr`
 ** `org.apache.tinkerpop.gremlin.process.traversal.Order.keyDecr`
@@ -229,6 +230,9 @@ The following deprecated classes, methods or fields have been removed in this ve
 ** `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.process.traversal.dsl.graph.GraphTraversal#sack(BiFunction,String)`
+>>>>>>> removed deprecated sack() 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`
@@ -326,7 +330,8 @@ link:https://issues.apache.org/jira/browse/TINKERPOP-1700[TINKERPOP-1700],
 link:https://issues.apache.org/jira/browse/TINKERPOP-1142[TINKERPOP-1142],
 link:https://issues.apache.org/jira/browse/TINKERPOP-1291[TINKERPOP-1291],
 link:https://issues.apache.org/jira/browse/TINKERPOP-832[TINKERPOP-832],
-link:https://issues.apache.org/jira/browse/TINKERPOP-1721[TINKERPOP-1721]
+link:https://issues.apache.org/jira/browse/TINKERPOP-1721[TINKERPOP-1721],
+link:https://issues.apache.org/jira/browse/TINKERPOP-834[TINKERPOP-834]
 
 Gremlin-server.sh and Init Scripts
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/18eacfdc/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
index 182bd5f..b038bee 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
@@ -1950,15 +1950,6 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
     }
 
     /**
-     * @since 3.0.0-incubating
-     * @deprecated As of release 3.1.0, replaced by {@link #sack(BiFunction)} with {@link #by(String)}.
-     */
-    @Deprecated
-    public default <V, U> GraphTraversal<S, E> sack(final BiFunction<V, U, V> sackOperator, final String elementPropertyKey) {
-        return this.sack(sackOperator).by(elementPropertyKey);
-    }
-
-    /**
      * Lazily aggregates objects in the stream into a side-effect collection.
      *
      * @param sideEffectKey the name of the side-effect key that will hold the aggregate

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/18eacfdc/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
index 73acf13..142fd19 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
@@ -920,14 +920,6 @@ public class __ {
     }
 
     /**
-     * @deprecated As of release 3.1.0, replaced by {@link #sack(BiFunction)}.
-     */
-    @Deprecated
-    public static <A, V, U> GraphTraversal<A, A> sack(final BiFunction<V, U, V> sackOperator, final String elementPropertyKey) {
-        return __.<A>start().sack(sackOperator, elementPropertyKey);
-    }
-
-    /**
      * @see GraphTraversal#store(String)
      */
     public static <A> GraphTraversal<A, A> store(final String sideEffectKey) {