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 2024/05/17 13:32:23 UTC
(tinkerpop) branch master updated (66e5a47ffd -> 459f32cfe3)
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
from 66e5a47ffd Merge branch '3.7-dev'
new 399741e7f4 fixed non-idempotent unit test
new 521d24c5ba Merge branch '3.6-dev' into 3.7-dev
new 9abcc918b9 Merge branch '3.7-dev'
new 1fa67c2c1e Fix generics for .NET
new 459f32cfe3 Merge branch '3.7-dev'
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../gremlin/process/TraversalStrategiesTest.java | 19 +++++++++----------
.../Gremlin.Net/Process/Traversal/GraphTraversal.cs | 4 ++--
2 files changed, 11 insertions(+), 12 deletions(-)
(tinkerpop) 03/05: Merge branch '3.7-dev'
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 9abcc918b9cfea76a7c9577af598b6b3f9f2ea11
Merge: 66e5a47ffd 521d24c5ba
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Fri May 17 08:58:14 2024 -0400
Merge branch '3.7-dev'
.../gremlin/process/TraversalStrategiesTest.java | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
(tinkerpop) 04/05: Fix generics for .NET
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 1fa67c2c1e721f1680a8acab5bce385f36ef981e
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Fri May 17 09:29:26 2024 -0400
Fix generics for .NET
Broke after a merge from 3.6-dev where generic names were a bit different. CTR
---
gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs
index ea6356761e..8050f0ad56 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs
@@ -1764,10 +1764,10 @@ namespace Gremlin.Net.Process.Traversal
/// <summary>
/// Adds the property step to this <see cref="GraphTraversal{SType, EType}" />.
/// </summary>
- public GraphTraversal<S, E> Property(IDictionary value)
+ public GraphTraversal<TStart, TEnd> Property(IDictionary value)
{
Bytecode.AddStep("property", value);
- return Wrap<S, E>(this);
+ return Wrap<TStart, TEnd>(this);
}
/// <summary>
(tinkerpop) 05/05: Merge branch '3.7-dev'
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 459f32cfe33cd0b68b68f9dff3fad04609904407
Merge: 9abcc918b9 1fa67c2c1e
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Fri May 17 09:32:12 2024 -0400
Merge branch '3.7-dev'
gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(tinkerpop) 01/05: fixed non-idempotent unit test
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 399741e7f4d628f6b72be3dca9cbb1c4fbd3f7fa
Author: kaiyaok2 <ka...@illinois.edu>
AuthorDate: Fri May 17 02:48:15 2024 -0500
fixed non-idempotent unit test
---
.../gremlin/process/TraversalStrategiesTest.java | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/TraversalStrategiesTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/TraversalStrategiesTest.java
index 07abfa8da4..7cefb6cc3d 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/TraversalStrategiesTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/TraversalStrategiesTest.java
@@ -33,6 +33,7 @@ import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.Property;
import org.apache.tinkerpop.gremlin.structure.Transaction;
import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.junit.Before;
import org.junit.Test;
import java.util.ArrayList;
@@ -59,6 +60,14 @@ import static org.junit.Assert.fail;
*/
public class TraversalStrategiesTest {
+ @Before
+ public void setup() {
+ TraversalStrategies.GlobalCache.registerStrategies(TestGraph.class,
+ TraversalStrategies.GlobalCache.getStrategies(Graph.class).clone().addStrategies(new StrategyA(), new StrategyB()));
+ TraversalStrategies.GlobalCache.registerStrategies(TestGraphComputer.class,
+ TraversalStrategies.GlobalCache.getStrategies(GraphComputer.class).clone().addStrategies(new StrategyC()));
+ }
+
@Test
public void shouldAllowUserManipulationOfGlobalCache() {
///////////
@@ -129,11 +138,6 @@ public class TraversalStrategiesTest {
public static class TestGraphComputer implements GraphComputer {
- static {
- TraversalStrategies.GlobalCache.registerStrategies(TestGraphComputer.class,
- TraversalStrategies.GlobalCache.getStrategies(GraphComputer.class).clone().addStrategies(new StrategyC()));
- }
-
@Override
public GraphComputer result(ResultGraph resultGraph) {
return this;
@@ -182,11 +186,6 @@ public class TraversalStrategiesTest {
public static class TestGraph implements Graph {
- static {
- TraversalStrategies.GlobalCache.registerStrategies(TestGraph.class,
- TraversalStrategies.GlobalCache.getStrategies(Graph.class).clone().addStrategies(new StrategyA(), new StrategyB()));
- }
-
@Override
public Vertex addVertex(Object... keyValues) {
return null;
(tinkerpop) 02/05: Merge branch '3.6-dev' into 3.7-dev
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 521d24c5ba5b51158c961a838d3be8e3c79e24a3
Merge: 225aeffc29 399741e7f4
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Fri May 17 08:57:59 2024 -0400
Merge branch '3.6-dev' into 3.7-dev
.../gremlin/process/TraversalStrategiesTest.java | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)