This is an automated email from the ASF dual-hosted git repository.
kenhuuu pushed a commit to branch TINKERPOP-2978-3
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
The following commit(s) were added to refs/heads/TINKERPOP-2978-3 by this push:
new a4da4fcc43 revert collectionutil
a4da4fcc43 is described below
commit a4da4fcc4369bb2eb503b379d8bbb0da0bffd081
Author: Ken Hu <[email protected]>
AuthorDate: Wed Oct 18 14:22:05 2023 -0700
revert collectionutil
remove traversal constructor, fix typo, remove unused file
---
.../process/traversal/step/map/CombineStep.java | 10 +--
.../process/traversal/step/map/DifferenceStep.java | 10 +--
.../process/traversal/step/map/DisjunctStep.java | 10 +--
.../process/traversal/step/map/IntersectStep.java | 10 +--
.../process/traversal/step/map/ProductStep.java | 10 +--
.../traversal/step/map/TraversalMergeStep.java | 10 +--
.../tinkerpop/gremlin/util/CollectionUtil.java | 2 -
.../traversal/step/map/ReverseLocalStepTest.java | 79 ----------------------
gremlin-go/driver/anonymousTraversal.go | 6 +-
.../tinkerpop/gremlin/features/StepDefinition.java | 6 --
10 files changed, 33 insertions(+), 120 deletions(-)
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/CombineStep.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/CombineStep.java
index 9bf9161ed0..7ee8a1bb5f 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/CombineStep.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/CombineStep.java
@@ -41,12 +41,12 @@ public final class CombineStep<S, E> extends
ScalarMapStep<S, List<?>> implement
public CombineStep(final Traversal.Admin traversal, final Object values) {
super(traversal);
- parameterItems = values;
- }
- public CombineStep(final Traversal.Admin traversal, final Traversal<S, E>
value) {
- super(traversal);
- valueTraversal = integrateChild(value.asAdmin());
+ if (values instanceof Traversal) {
+ valueTraversal = integrateChild(((Traversal<S, E>)
values).asAdmin());
+ } else {
+ parameterItems = values;
+ }
}
@Override
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DifferenceStep.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DifferenceStep.java
index e78c6290c5..f394bd799e 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DifferenceStep.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DifferenceStep.java
@@ -40,12 +40,12 @@ public final class DifferenceStep<S, E> extends
ScalarMapStep<S, Set<?>> impleme
private Object parameterItems;
public DifferenceStep(final Traversal.Admin traversal, final Object
values) {
super(traversal);
- parameterItems = values;
- }
- public DifferenceStep(final Traversal.Admin traversal, final Traversal<S,
E> value) {
- super(traversal);
- valueTraversal = this.integrateChild(value.asAdmin());
+ if (values instanceof Traversal) {
+ valueTraversal = integrateChild(((Traversal<S, E>)
values).asAdmin());
+ } else {
+ parameterItems = values;
+ }
}
@Override
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DisjunctStep.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DisjunctStep.java
index f4d7cec433..10725330f2 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DisjunctStep.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/DisjunctStep.java
@@ -38,12 +38,12 @@ public final class DisjunctStep<S, E> extends
ScalarMapStep<S, Set<?>> implement
private Object parameterItems;
public DisjunctStep(final Traversal.Admin traversal, final Object values) {
super(traversal);
- parameterItems = values;
- }
- public DisjunctStep(final Traversal.Admin traversal, final Traversal<S, E>
value) {
- super(traversal);
- this.valueTraversal = this.integrateChild(value.asAdmin());
+ if (values instanceof Traversal) {
+ valueTraversal = integrateChild(((Traversal<S, E>)
values).asAdmin());
+ } else {
+ parameterItems = values;
+ }
}
@Override
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/IntersectStep.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/IntersectStep.java
index fbabebc787..7a3ad16090 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/IntersectStep.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/IntersectStep.java
@@ -41,12 +41,12 @@ public final class IntersectStep<S, E> extends
ScalarMapStep<S, Set<?>> implemen
public IntersectStep(final Traversal.Admin traversal, final Object values)
{
super(traversal);
- parameterItems = values;
- }
- public IntersectStep(final Traversal.Admin traversal, final Traversal<S,
E> value) {
- super(traversal);
- valueTraversal = integrateChild(value.asAdmin());
+ if (values instanceof Traversal) {
+ valueTraversal = integrateChild(((Traversal<S, E>)
values).asAdmin());
+ } else {
+ parameterItems = values;
+ }
}
@Override
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProductStep.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProductStep.java
index a4e1ffdd82..c78794f8af 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProductStep.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProductStep.java
@@ -41,12 +41,12 @@ public final class ProductStep<S, E> extends
ScalarMapStep<S, List<List<?>>> imp
public ProductStep(final Traversal.Admin traversal, final Object values) {
super(traversal);
- parameterItems = values;
- }
- public ProductStep(final Traversal.Admin traversal, final Traversal<S, E>
value) {
- super(traversal);
- valueTraversal = integrateChild(value.asAdmin());
+ if (values instanceof Traversal) {
+ valueTraversal = integrateChild(((Traversal<S, E>)
values).asAdmin());
+ } else {
+ parameterItems = values;
+ }
}
@Override
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/TraversalMergeStep.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/TraversalMergeStep.java
index 7231dcd320..82400674e3 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/TraversalMergeStep.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/TraversalMergeStep.java
@@ -48,12 +48,12 @@ public final class TraversalMergeStep<S, E> extends
ScalarMapStep<S, E> implemen
private Object parameterItems;
public TraversalMergeStep(final Traversal.Admin traversal, final Object
values) {
super(traversal);
- parameterItems = values;
- }
- public TraversalMergeStep(final Traversal.Admin traversal, final
Traversal<S, E> value) {
- super(traversal);
- valueTraversal = integrateChild(value.asAdmin());
+ if (values instanceof Traversal) {
+ valueTraversal = integrateChild(((Traversal<S, E>)
values).asAdmin());
+ } else {
+ parameterItems = values;
+ }
}
@Override
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/CollectionUtil.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/CollectionUtil.java
index ff1ddad4ca..1242d16af7 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/CollectionUtil.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/CollectionUtil.java
@@ -19,8 +19,6 @@
package org.apache.tinkerpop.gremlin.util;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
diff --git
a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ReverseLocalStepTest.java
b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ReverseLocalStepTest.java
deleted file mode 100644
index 5d73ade94a..0000000000
---
a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ReverseLocalStepTest.java
+++ /dev/null
@@ -1,79 +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 org.junit.Test;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertTrue;
-
-public class ReverseLocalStepTest extends StepTest {
- @Override
- protected List<Traversal> getTraversals() {
- return Collections.singletonList(__.reverse());
- }
-//
-// @Test
-// public void testReturnTypes() {
-// assertTrue(__.__(new int[]{}).reverse().hasNext());
-// assertArrayEquals(new Object[] {7, 10}, __.__(new int[] {10,
7}).reverse().next().toArray());
-// }
-//
-// @Test
-// public void testSetTraverser() {
-// final Set<Integer> numbers = new HashSet<>();
-// numbers.add(10);
-// numbers.add(11);
-//
-// final Throwable thrown =
assertThrows(IllegalArgumentException.class, () ->
__.__(numbers).reverse().hasNext());
-// assertEquals("Incoming traverser for reverse step must be either a
list or an array.", thrown.getMessage());
-// }
-//
-// @Test
-// public void testArrayTraverser() {
-// final int[] numbers = new int[] {10, 11};
-//
-// final List result = __.__(numbers).reverse().next();
-// assertEquals(11, result.get(0));
-// assertEquals(10, result.get(1));
-// }
-//
-// @Test
-// public void testListTraverser() {
-// final List<Integer> numbers = new ArrayList<>();
-// numbers.add(10);
-// numbers.add(11);
-//
-// final List result = __.__(numbers).reverse().next();
-// assertEquals(11, result.get(0));
-// assertEquals(10, result.get(1));
-// }
-
-}
diff --git a/gremlin-go/driver/anonymousTraversal.go
b/gremlin-go/driver/anonymousTraversal.go
index c0c85c70d2..31a014c0ba 100644
--- a/gremlin-go/driver/anonymousTraversal.go
+++ b/gremlin-go/driver/anonymousTraversal.go
@@ -477,9 +477,9 @@ func (anonymousTraversal *anonymousTraversal) Dedup(args
...interface{}) *GraphT
return anonymousTraversal.graphTraversal().Dedup(args...)
}
-// Differece adds the differece step to the GraphTraversal.
-func (anonymousTraversal *anonymousTraversal) Differece(args ...interface{})
*GraphTraversal {
- return anonymousTraversal.graphTraversal().Differece(args...)
+// Difference adds the difference step to the GraphTraversal.
+func (anonymousTraversal *anonymousTraversal) Difference(args ...interface{})
*GraphTraversal {
+ return anonymousTraversal.graphTraversal().Difference(args...)
}
// Disjunct adds the disjunct step to the GraphTraversal.
diff --git
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/features/StepDefinition.java
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/features/StepDefinition.java
index 0b510b6a62..6a9155e2c5 100644
---
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/features/StepDefinition.java
+++
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/features/StepDefinition.java
@@ -238,12 +238,6 @@ public final class StepDefinition {
add(Pair.with(Pattern.compile("c\\[(.*)\\]"), s -> {
throw new AssumptionViolatedException("This test uses a lambda as
a parameter which is not supported by gremlin-language");
}));
-// add(Pair.with(Pattern.compile("s\\[\\]"), s -> {
-// throw new AssumptionViolatedException("This test uses a empty
Set as a parameter which is not supported by gremlin-language");
-// }));
-// add(Pair.with(Pattern.compile("s\\[(.*)\\]"), s -> {
-// throw new AssumptionViolatedException("This test uses a Set as a
parameter which is not supported by gremlin-language");
-// }));
add(Pair.with(Pattern.compile("(null)"), s -> null));
add(Pair.with(Pattern.compile("(true)"), s -> true));
