removed deprecated GraphTraversal.mapKeys() and GraphTraversal.mapValues(). These steps were deprecated long ago and replaced with select(keys) and select(values), respectively.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/2b4ba78a Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/2b4ba78a Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/2b4ba78a Branch: refs/heads/TINKERPOP-1682 Commit: 2b4ba78a5e875b2226d2032f1421f1337754a1b4 Parents: c3cfaea Author: Marko A. Rodriguez <okramma...@gmail.com> Authored: Mon Jul 10 08:37:39 2017 -0600 Committer: Marko A. Rodriguez <okramma...@gmail.com> Committed: Mon Jul 10 08:37:39 2017 -0600 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 2 + docs/src/upgrade/release-3.3.x.asciidoc | 2 + .../traversal/dsl/graph/GraphTraversal.java | 18 ---- .../gremlin/process/traversal/dsl/graph/__.java | 16 ---- .../traversal/step/map/MapKeysStepTest.java | 37 -------- .../traversal/step/map/MapValuesStepTest.java | 37 -------- .../gremlin/process/ProcessComputerSuite.java | 4 - .../gremlin/process/ProcessStandardSuite.java | 6 -- .../process/traversal/step/map/MapKeysTest.java | 78 ---------------- .../traversal/step/map/MapValuesTest.java | 93 -------------------- 10 files changed, 4 insertions(+), 289 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2b4ba78a/CHANGELOG.asciidoc ---------------------------------------------------------------------- diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index bfdd43d..fd4363e 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -26,6 +26,8 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +* Removed previously deprecated `GraphTraversal.mapKeys()` step. +* Removed previously deprecated `GraphTraversal.mapValues()` step. * Removed previously deprecated `TraversalSource.Builder` class. * Removed previously deprecated `ConnectiveP`, `AndP`, `OrP` constructors. * Removed previously deprecated `TraversalScriptFunction` class. http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2b4ba78a/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 d729da8..3ca1532 100644 --- a/docs/src/upgrade/release-3.3.x.asciidoc +++ b/docs/src/upgrade/release-3.3.x.asciidoc @@ -211,6 +211,8 @@ 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` +** `org.apache.tinkerpop.gremlin.process.traversal.dsl.GraphTraversal.mapKeys()` +** `org.apache.tinkerpop.gremlin.process.traversal.dsl.GraphTraversal.mapValues()` ** `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` http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2b4ba78a/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 6254b0a..644742f 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 @@ -573,24 +573,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 GraphTraversal#select(Column)} - */ - @Deprecated - public default <E2> GraphTraversal<S, E2> mapValues() { - return this.select(Column.values).unfold(); - } - - /** - * @since 3.0.0-incubating - * @deprecated As of release 3.1.0, replaced by {@link GraphTraversal#select(Column)} - */ - @Deprecated - public default <E2> GraphTraversal<S, E2> mapKeys() { - return this.select(Column.keys).unfold(); - } - - /** * Map the {@link Property} to its {@link Property#key}. * * @return the traversal with an appended {@link PropertyKeyStep}. http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2b4ba78a/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 270eef3..e918d93 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 @@ -282,22 +282,6 @@ public class __ { } /** - * @see GraphTraversal#mapValues() - */ - @Deprecated - public static <A, B> GraphTraversal<A, B> mapValues() { - return __.<A>start().mapValues(); - } - - /** - * @see GraphTraversal#mapKeys() - */ - @Deprecated - public static <A, B> GraphTraversal<A, B> mapKeys() { - return __.<A>start().mapKeys(); - } - - /** * @see GraphTraversal#key() */ public static <A extends Property> GraphTraversal<A, String> key() { http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2b4ba78a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MapKeysStepTest.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MapKeysStepTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MapKeysStepTest.java deleted file mode 100644 index bb3bea9..0000000 --- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MapKeysStepTest.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tinkerpop.gremlin.process.traversal.step.map; - -import org.apache.tinkerpop.gremlin.process.traversal.Traversal; -import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__; -import org.apache.tinkerpop.gremlin.process.traversal.step.StepTest; - -import java.util.Arrays; -import java.util.List; - -/** - * @author Daniel Kuppitz (http://gremlin.guru) - */ -public class MapKeysStepTest extends StepTest { - - @Override - protected List<Traversal> getTraversals() { - return Arrays.asList(__.mapKeys()); - } -} http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2b4ba78a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MapValuesStepTest.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MapValuesStepTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MapValuesStepTest.java deleted file mode 100644 index 1f79bad..0000000 --- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MapValuesStepTest.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tinkerpop.gremlin.process.traversal.step.map; - -import org.apache.tinkerpop.gremlin.process.traversal.Traversal; -import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__; -import org.apache.tinkerpop.gremlin.process.traversal.step.StepTest; - -import java.util.Arrays; -import java.util.List; - -/** - * @author Daniel Kuppitz (http://gremlin.guru) - */ -public class MapValuesStepTest extends StepTest { - - @Override - protected List<Traversal> getTraversals() { - return Arrays.asList(__.mapValues()); - } -} http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2b4ba78a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessComputerSuite.java ---------------------------------------------------------------------- diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessComputerSuite.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessComputerSuite.java index 9f71cd4..bdd5559 100644 --- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessComputerSuite.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessComputerSuite.java @@ -55,9 +55,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.step.map.FlatMapTest; import org.apache.tinkerpop.gremlin.process.traversal.step.map.FoldTest; import org.apache.tinkerpop.gremlin.process.traversal.step.map.GraphTest; import org.apache.tinkerpop.gremlin.process.traversal.step.map.LoopsTest; -import org.apache.tinkerpop.gremlin.process.traversal.step.map.MapKeysTest; import org.apache.tinkerpop.gremlin.process.traversal.step.map.MapTest; -import org.apache.tinkerpop.gremlin.process.traversal.step.map.MapValuesTest; import org.apache.tinkerpop.gremlin.process.traversal.step.map.MatchTest; import org.apache.tinkerpop.gremlin.process.traversal.step.map.MaxTest; import org.apache.tinkerpop.gremlin.process.traversal.step.map.MeanTest; @@ -148,8 +146,6 @@ public class ProcessComputerSuite extends AbstractGremlinSuite { GraphTest.Traversals.class, LoopsTest.Traversals.class, MapTest.Traversals.class, - MapKeysTest.Traversals.class, - MapValuesTest.Traversals.class, MatchTest.CountMatchTraversals.class, MatchTest.GreedyMatchTraversals.class, MaxTest.Traversals.class, http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2b4ba78a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessStandardSuite.java ---------------------------------------------------------------------- diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessStandardSuite.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessStandardSuite.java index 5f469e0..b51fd1c 100644 --- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessStandardSuite.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessStandardSuite.java @@ -52,9 +52,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.step.map.FlatMapTest; import org.apache.tinkerpop.gremlin.process.traversal.step.map.FoldTest; import org.apache.tinkerpop.gremlin.process.traversal.step.map.GraphTest; import org.apache.tinkerpop.gremlin.process.traversal.step.map.LoopsTest; -import org.apache.tinkerpop.gremlin.process.traversal.step.map.MapKeysTest; import org.apache.tinkerpop.gremlin.process.traversal.step.map.MapTest; -import org.apache.tinkerpop.gremlin.process.traversal.step.map.MapValuesTest; import org.apache.tinkerpop.gremlin.process.traversal.step.map.MatchTest; import org.apache.tinkerpop.gremlin.process.traversal.step.map.MaxTest; import org.apache.tinkerpop.gremlin.process.traversal.step.map.MeanTest; @@ -142,8 +140,6 @@ public class ProcessStandardSuite extends AbstractGremlinSuite { GraphTest.Traversals.class, LoopsTest.Traversals.class, MapTest.Traversals.class, - MapKeysTest.Traversals.class, - MapValuesTest.Traversals.class, MatchTest.CountMatchTraversals.class, MatchTest.GreedyMatchTraversals.class, MaxTest.Traversals.class, @@ -228,8 +224,6 @@ public class ProcessStandardSuite extends AbstractGremlinSuite { FoldTest.class, LoopsTest.class, MapTest.class, - MapKeysTest.class, - MapValuesTest.class, MatchTest.class, MaxTest.class, MeanTest.class, http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2b4ba78a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MapKeysTest.java ---------------------------------------------------------------------- diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MapKeysTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MapKeysTest.java deleted file mode 100644 index 0798f72..0000000 --- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MapKeysTest.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tinkerpop.gremlin.process.traversal.step.map; - -import org.apache.tinkerpop.gremlin.LoadGraphWith; -import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest; -import org.apache.tinkerpop.gremlin.process.GremlinProcessRunner; -import org.apache.tinkerpop.gremlin.process.traversal.Traversal; -import org.apache.tinkerpop.gremlin.structure.Vertex; -import org.junit.Test; -import org.junit.runner.RunWith; - -import java.util.Arrays; -import java.util.List; - -import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; - -/** - * @author Daniel Kuppitz (http://gremlin.guru) - * @deprecated As of release 3.1.0-incubating - */ -@RunWith(GremlinProcessRunner.class) -@Deprecated -public abstract class MapKeysTest extends AbstractGremlinProcessTest { - - public abstract Traversal<Vertex, Double> get_g_V_outE_valuesXweightX_groupCount_mapKeys(); - - public abstract Traversal<Vertex, Double> get_g_V_outE_valuesXweightX_groupCount_unfold_mapKeys(); - - @Test - @LoadGraphWith(MODERN) - public void g_V_outE_valuesXweightX_groupCount_mapKeys() { - final Traversal<Vertex, Double> traversal = get_g_V_outE_valuesXweightX_groupCount_mapKeys(); - printTraversalForm(traversal); - checkResults(Arrays.asList(0.2, 0.4, 0.5, 1.0), traversal); - } - - @Test - @LoadGraphWith(MODERN) - public void g_V_outE_valuesXweightX_groupCount_unfold_mapKeys() { - final Traversal<Vertex, Double> traversal = get_g_V_outE_valuesXweightX_groupCount_unfold_mapKeys(); - printTraversalForm(traversal); - checkResults(Arrays.asList(0.2, 0.4, 0.5, 1.0), traversal); - } - - /** - * @deprecated As of release 3.1.0-incubating - */ - @Deprecated - public static class Traversals extends MapKeysTest { - - @Override - public Traversal<Vertex, Double> get_g_V_outE_valuesXweightX_groupCount_mapKeys() { - return g.V().outE().values("weight").groupCount().mapKeys(); - } - - @Override - public Traversal<Vertex, Double> get_g_V_outE_valuesXweightX_groupCount_unfold_mapKeys() { - return g.V().outE().values("weight").groupCount().unfold().mapKeys(); - } - } -} http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2b4ba78a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MapValuesTest.java ---------------------------------------------------------------------- diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MapValuesTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MapValuesTest.java deleted file mode 100644 index ddf7fde..0000000 --- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MapValuesTest.java +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.tinkerpop.gremlin.process.traversal.step.map; - -import org.apache.tinkerpop.gremlin.LoadGraphWith; -import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest; -import org.apache.tinkerpop.gremlin.process.GremlinProcessRunner; -import org.apache.tinkerpop.gremlin.process.traversal.Traversal; -import org.apache.tinkerpop.gremlin.structure.Vertex; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; - -import java.util.Arrays; - -import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN; - -/** - * @author Daniel Kuppitz (http://gremlin.guru) - * @deprecated As of release 3.1.0-incubating - */ -@Deprecated -@RunWith(GremlinProcessRunner.class) -public abstract class MapValuesTest extends AbstractGremlinProcessTest { - - public abstract Traversal<Vertex, Long> get_g_V_outE_valuesXweightX_groupCount_mapValues(); - - public abstract Traversal<Vertex, Long> get_g_V_outE_valuesXweightX_groupCount_unfold_mapValues(); - - public abstract Traversal<Vertex, Long> get_g_V_outE_valuesXweightX_groupCount_mapValues_groupCount_mapValues(); - - @Test - @LoadGraphWith(MODERN) - public void g_V_outE_valuesXweightX_groupCount_mapValues() { - final Traversal<Vertex, Long> traversal = get_g_V_outE_valuesXweightX_groupCount_mapValues(); - printTraversalForm(traversal); - checkResults(Arrays.asList(1l, 1l, 2l, 2l), traversal); - } - - @Test - @LoadGraphWith(MODERN) - public void g_V_outE_valuesXweightX_groupCount_unfold_mapValues() { - final Traversal<Vertex, Long> traversal = get_g_V_outE_valuesXweightX_groupCount_unfold_mapValues(); - printTraversalForm(traversal); - checkResults(Arrays.asList(1l, 1l, 2l, 2l), traversal); - } - - @Test - @LoadGraphWith(MODERN) - public void g_V_outE_valuesXweightX_groupCount_mapValues_groupCount_mapValues() { - final Traversal<Vertex, Long> traversal = get_g_V_outE_valuesXweightX_groupCount_mapValues_groupCount_mapValues(); - printTraversalForm(traversal); - checkResults(Arrays.asList(2l, 2l), traversal); - } - - /** - * @deprecated As of release 3.1.0-incubating - */ - @Deprecated - public static class Traversals extends MapValuesTest { - - @Override - public Traversal<Vertex, Long> get_g_V_outE_valuesXweightX_groupCount_mapValues() { - return g.V().outE().values("weight").groupCount().mapValues(); - } - - @Override - public Traversal<Vertex, Long> get_g_V_outE_valuesXweightX_groupCount_unfold_mapValues() { - return g.V().outE().values("weight").groupCount().unfold().mapValues(); - } - - @Override - public Traversal<Vertex, Long> get_g_V_outE_valuesXweightX_groupCount_mapValues_groupCount_mapValues() { - return g.V().outE().values("weight").groupCount().mapValues().groupCount().mapValues(); - } - } -}