You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2015/04/01 17:04:31 UTC
[1/3] incubator-tinkerpop git commit: gutted neo4j-gremlin from
master/ as it is a GPL dependency. Also removed from docs.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 815a378f0 -> c22400663
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c2240066/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/process/Neo4jCypherStartTest.java
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/process/Neo4jCypherStartTest.java b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/process/Neo4jCypherStartTest.java
deleted file mode 100644
index 498a2d8..0000000
--- a/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/process/Neo4jCypherStartTest.java
+++ /dev/null
@@ -1,117 +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.neo4j.process;
-
-import org.apache.tinkerpop.gremlin.neo4j.BaseNeo4jGraphTest;
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.junit.Test;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import static org.junit.Assert.*;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class Neo4jCypherStartTest extends BaseNeo4jGraphTest {
- @Test
- public void shouldExecuteCypher() throws Exception {
- this.graph.addVertex("name", "marko");
- this.graph.tx().commit();
- final Iterator<Map<String, Object>> result = graph.cypher("MATCH (a {name:\"marko\"}) RETURN a", Collections.emptyMap());
- assertNotNull(result);
- assertTrue(result.hasNext());
- }
-
- @Test
- public void shouldExecuteCypherWithArgs() throws Exception {
- this.graph.addVertex("name", "marko");
- this.graph.tx().commit();
- final Map<String, Object> bindings = new HashMap<>();
- bindings.put("n", "marko");
- final Iterator<Map<String, Object>> result = graph.cypher("MATCH (a {name:{n}}) RETURN a", bindings);
- assertNotNull(result);
- assertTrue(result.hasNext());
- }
-
- @Test
- public void shouldExecuteCypherWithArgsUsingVertexIdList() throws Exception {
- final Vertex v = this.graph.addVertex("name", "marko");
- final List<Object> idList = Arrays.asList(v.id());
- this.graph.tx().commit();
-
- final Map<String, Object> bindings = new HashMap<>();
- bindings.put("ids", idList);
- final Iterator<String> result = graph.cypher("START n=node({ids}) RETURN n", bindings).select("n").values("name");
- assertNotNull(result);
- assertTrue(result.hasNext());
- assertEquals("marko", result.next());
- }
-
- @Test
- public void shouldExecuteCypherAndBackToGremlin() throws Exception {
- this.graph.addVertex("name", "marko", "age", 29, "color", "red");
- this.graph.addVertex("name", "marko", "age", 30, "color", "yellow");
-
- this.graph.tx().commit();
- final Traversal result = graph.cypher("MATCH (a {name:\"marko\"}) RETURN a").select("a").has("age", 29).values("color");
- assertNotNull(result);
- assertTrue(result.hasNext());
- assertEquals("red", result.next().toString());
- }
-
- @Test
- public void shouldExecuteMultiIdWhereCypher() throws Exception {
- this.graph.addVertex("name", "marko", "age", 29, "color", "red");
- this.graph.addVertex("name", "marko", "age", 30, "color", "yellow");
- this.graph.addVertex("name", "marko", "age", 30, "color", "orange");
- this.graph.tx().commit();
-
- final List<Object> result = graph.cypher("MATCH n WHERE id(n) IN [1,2] RETURN n").select("n").id().toList();
- assertNotNull(result);
- assertEquals(2, result.size());
- assertTrue(result.contains(1l));
- assertTrue(result.contains(2l));
- }
-
- @Test
- public void shouldExecuteMultiIdWhereWithParamCypher() throws Exception {
- final Vertex v1 = this.graph.addVertex("name", "marko", "age", 29, "color", "red");
- final Vertex v2 = this.graph.addVertex("name", "marko", "age", 30, "color", "yellow");
- this.graph.addVertex("name", "marko", "age", 30, "color", "orange");
- this.graph.tx().commit();
-
- final List<Object> ids = Arrays.asList(v1.id(), v2.id());
- final Map<String, Object> m = new HashMap<>();
- m.put("ids", ids);
- final List<Object> result = graph.cypher("MATCH n WHERE id(n) IN {ids} RETURN n", m).select("n").id().toList();
- assertNotNull(result);
- assertEquals(2, result.size());
- assertTrue(result.contains(v1.id()));
- assertTrue(result.contains(v2.id()));
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c2240066/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/process/Neo4jGraphProcessStandardTest.java
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/process/Neo4jGraphProcessStandardTest.java b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/process/Neo4jGraphProcessStandardTest.java
deleted file mode 100644
index 65ef88f..0000000
--- a/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/process/Neo4jGraphProcessStandardTest.java
+++ /dev/null
@@ -1,35 +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.neo4j.process;
-
-import org.apache.tinkerpop.gremlin.neo4j.DefaultNeo4jGraphProvider;
-import org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jGraph;
-import org.apache.tinkerpop.gremlin.process.ProcessStandardSuite;
-import org.junit.runner.RunWith;
-
-
-/**
- * Executes the Standard Gremlin Structure Test Suite using Neo4j.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-@RunWith(ProcessStandardSuite.class)
-@ProcessStandardSuite.GraphProviderClass(provider = DefaultNeo4jGraphProvider.class, graph = Neo4jGraph.class)
-public class Neo4jGraphProcessStandardTest {
-}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c2240066/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/process/groovy/Neo4jGraphGroovyProcessStandardTest.java
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/process/groovy/Neo4jGraphGroovyProcessStandardTest.java b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/process/groovy/Neo4jGraphGroovyProcessStandardTest.java
deleted file mode 100644
index d6f1d13..0000000
--- a/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/process/groovy/Neo4jGraphGroovyProcessStandardTest.java
+++ /dev/null
@@ -1,33 +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.neo4j.process.groovy;
-
-import org.apache.tinkerpop.gremlin.neo4j.DefaultNeo4jGraphProvider;
-import org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jGraph;
-import org.apache.tinkerpop.gremlin.process.GroovyProcessStandardSuite;
-import org.apache.tinkerpop.gremlin.process.ProcessStandardSuite;
-import org.junit.runner.RunWith;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- */
-@RunWith(GroovyProcessStandardSuite.class)
-@ProcessStandardSuite.GraphProviderClass(provider = DefaultNeo4jGraphProvider.class, graph = Neo4jGraph.class)
-public class Neo4jGraphGroovyProcessStandardTest {
-}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c2240066/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jGraphStructureStandardTest.java
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jGraphStructureStandardTest.java b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jGraphStructureStandardTest.java
deleted file mode 100644
index a0dcd28..0000000
--- a/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jGraphStructureStandardTest.java
+++ /dev/null
@@ -1,34 +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.neo4j.structure;
-
-import org.apache.tinkerpop.gremlin.neo4j.DefaultNeo4jGraphProvider;
-import org.apache.tinkerpop.gremlin.structure.StructureStandardSuite;
-import org.junit.runner.RunWith;
-
-
-/**
- * Executes the Standard Gremlin Structure Test Suite using Neo4j.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-@RunWith(StructureStandardSuite.class)
-@StructureStandardSuite.GraphProviderClass(provider = DefaultNeo4jGraphProvider.class, graph = Neo4jGraph.class)
-public class Neo4jGraphStructureStandardTest {
-}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c2240066/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jGraphTest.java
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jGraphTest.java b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jGraphTest.java
deleted file mode 100644
index 8e0b917..0000000
--- a/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jGraphTest.java
+++ /dev/null
@@ -1,740 +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.neo4j.structure;
-
-import org.apache.tinkerpop.gremlin.groovy.jsr223.GremlinGroovyScriptEngine;
-import org.apache.tinkerpop.gremlin.neo4j.BaseNeo4jGraphTest;
-import org.apache.tinkerpop.gremlin.process.traversal.T;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.structure.Contains;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.util.StreamFactory;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.junit.Test;
-import org.neo4j.cypher.javacompat.ExecutionEngine;
-import org.neo4j.graphdb.ConstraintViolationException;
-import org.neo4j.graphdb.Direction;
-import org.neo4j.graphdb.DynamicLabel;
-import org.neo4j.graphdb.GraphDatabaseService;
-import org.neo4j.graphdb.Node;
-import org.neo4j.graphdb.Relationship;
-import org.neo4j.graphdb.Transaction;
-import org.neo4j.graphdb.index.AutoIndexer;
-import org.neo4j.graphdb.schema.ConstraintDefinition;
-import org.neo4j.graphdb.schema.Schema;
-import org.neo4j.tooling.GlobalGraphOperations;
-
-import javax.script.Bindings;
-import javax.script.ScriptException;
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import static org.junit.Assert.*;
-
-/**
- * These are tests specific to Neo4j.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- * @author Pieter Martin
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- */
-public class Neo4jGraphTest extends BaseNeo4jGraphTest {
-
- @Test
- public void shouldOpenWithOverriddenConfig() throws Exception {
- assertNotNull(this.graph);
- }
-
- @Test
- public void shouldNotThrowConcurrentModificationException() {
- this.graph.addVertex("name", "a");
- this.graph.addVertex("name", "b");
- this.graph.addVertex("name", "c");
- this.graph.addVertex("name", "d");
- this.graph.vertices().forEachRemaining(Vertex::remove);
- this.graph.tx().commit();
- assertEquals(0, IteratorUtils.count(this.graph.vertices()), 0);
- }
-
- /**
- * Neo4j upgrades from 1.x don't come with labels.
- */
- @Test
- public void shouldTraverseWithoutLabels() {
- final GraphDatabaseService service = graph.getBaseGraph();
-
- final Transaction tx = service.beginTx();
- final Node n = service.createNode();
- tx.success();
- tx.close();
-
- final Transaction tx2 = service.beginTx();
- assertEquals(0, IteratorUtils.count(n.getLabels().iterator()));
- assertEquals(1, IteratorUtils.count(graph.vertices()));
- graph.tx().close();
- tx2.close();
- }
-
- @Test
- public void shouldReturnResultsLabeledIndexOnVertexWithHasHas() {
- this.graph.tx().readWrite();
- final Schema schema = this.graph.getBaseGraph().schema();
- schema.indexFor(DynamicLabel.label("Person")).on("name").create();
- this.graph.tx().commit();
- this.graph.addVertex(T.label, "Person", "name", "marko");
- this.graph.addVertex(T.label, "Person", "name", "marko");
- this.graph.tx().commit();
- assertEquals(2, this.g.V().has(T.label, "Person").has("name", "marko").count().next(), 0);
- assertEquals(2, this.g.V().has("name", "marko").count().next(), 0);
- }
-
- @Test
- public void shouldEnsureColonedKeyIsTreatedAsNormalKey() {
- this.graph.tx().readWrite();
- final Schema schema = this.graph.getBaseGraph().schema();
- schema.indexFor(DynamicLabel.label("Person")).on("name").create();
- this.graph.tx().commit();
- this.graph.addVertex(T.label, "Person", "name", "marko");
- this.graph.addVertex(T.label, "Person", "name", "marko");
- this.graph.tx().commit();
- assertEquals(2, this.g.V().has(T.label, "Person").has("name", "marko").count().next(), 0);
- assertEquals(0, this.g.V().has("Person:name", "marko").count().next(), 0);
-
- }
-
- @Test
- public void shouldReturnResultsUsingLabeledIndexOnVertexWithHasHasHas() {
- this.graph.tx().readWrite();
- final Schema schema = this.graph.getBaseGraph().schema();
- schema.indexFor(DynamicLabel.label("Person")).on("name").create();
- this.graph.tx().commit();
- this.graph.addVertex(T.label, "Person", "name", "marko", "color", "blue");
- this.graph.addVertex(T.label, "Person", "name", "marko", "color", "green");
- this.graph.tx().commit();
- assertEquals(1, this.g.V().has(T.label, "Person").has("name", "marko").has("color", "blue").count().next(), 0);
- assertEquals(2, this.g.V().has("name", "marko").count().next(), 0);
- }
-
- @Test
- public void shouldReturnResultsOnVertexWithHasHasHasNoIndex() {
- this.graph.tx().commit();
- this.graph.addVertex(T.label, "Person", "name", "marko", "color", "blue");
- this.graph.addVertex(T.label, "Person", "name", "marko", "color", "green");
- this.graph.tx().commit();
- assertEquals(1, this.g.V().has(T.label, "Person").has("name", "marko").has("color", "blue").count().next(), 0);
- assertEquals(2, this.g.V().has("name", "marko").count().next(), 0);
- }
-
- @Test
- public void shouldReturnResultsUsingLabeledIndexOnVertexWithColonFails() {
- this.graph.tx().readWrite();
- final Schema schema = this.graph.getBaseGraph().schema();
- schema.indexFor(DynamicLabel.label("Person")).on("name").create();
- this.graph.tx().commit();
- this.graph.addVertex(T.label, "Person", "name", "marko");
- this.graph.addVertex(T.label, "Person", "name", "marko");
- this.graph.tx().commit();
- assertNotEquals(2l, this.g.V().has("Person:name", "marko").count().next().longValue());
- assertEquals(2, this.g.V().has("name", "marko").count().next(), 0);
- }
-
- @Test
- public void shouldReturnResultsUsingLegacyIndexOnVertex() {
- graph.tx().readWrite();
- final AutoIndexer<Node> nodeAutoIndexer = this.graph.getBaseGraph().index().getNodeAutoIndexer();
- nodeAutoIndexer.startAutoIndexingProperty("name");
- this.graph.tx().commit();
-
- this.graph.addVertex(T.label, "Person", "name", "marko");
- this.graph.addVertex(T.label, "Person", "name", "marko");
- this.graph.tx().commit();
- assertEquals(2, this.g.V().has("Person", "name", "marko").count().next(), 0);
- assertEquals(2, this.g.V().has("name", "marko").count().next(), 0);
- }
-
- @Test
- public void shouldUseLegacyIndexOnEdge() {
- graph.tx().readWrite();
- final AutoIndexer<Relationship> relAutoIndexer = this.graph.getBaseGraph().index().getRelationshipAutoIndexer();
- relAutoIndexer.startAutoIndexingProperty("weight");
- this.graph.tx().commit();
-
- Vertex marko = this.graph.addVertex(T.label, "Person", "name", "marko");
- Vertex john = this.graph.addVertex(T.label, "Person", "name", "john");
- Vertex pete = this.graph.addVertex(T.label, "Person", "name", "pete");
- marko.addEdge("friend", john, "weight", "a");
- marko.addEdge("friend", pete, "weight", "a");
- this.graph.tx().commit();
- assertEquals(2, this.g.E().has("weight", "a").count().next(), 0);
- }
-
- @Test
- public void shouldEnforceUniqueConstraint() {
- this.graph.tx().readWrite();
- final Schema schema = this.graph.getBaseGraph().schema();
- schema.constraintFor(DynamicLabel.label("Person")).assertPropertyIsUnique("name").create();
- this.graph.tx().commit();
- this.graph.addVertex(T.label, "Person", "name", "marko");
- this.graph.tx().commit();
- assertEquals("marko", g.V().has(T.label, "Person").has("name", "marko").next().value("name"));
- }
-
- @Test
- public void shouldEnforceMultipleUniqueConstraint() {
- this.graph.tx().readWrite();
- final Schema schema = this.graph.getBaseGraph().schema();
- schema.constraintFor(DynamicLabel.label("Person")).assertPropertyIsUnique("name").create();
- schema.constraintFor(DynamicLabel.label("Person")).assertPropertyIsUnique("surname").create();
- this.graph.tx().commit();
- this.graph.addVertex(T.label, "Person", "name", "marko");
- this.graph.addVertex(T.label, "Person", "surname", "aaaa");
- this.graph.tx().commit();
- boolean failSurname = false;
- try {
- this.graph.addVertex(T.label, "Person", "surname", "aaaa");
- } catch (ConstraintViolationException e) {
- failSurname = true;
- }
- assertTrue(failSurname);
- boolean failName = false;
- try {
- this.graph.addVertex(T.label, "Person", "name", "marko");
- } catch (ConstraintViolationException e) {
- failName = true;
- }
- assertTrue(failName);
- this.graph.tx().commit();
- }
-
- @Test
- public void shouldDropMultipleUniqueConstraint() {
- this.graph.tx().readWrite();
- final Schema schema = this.graph.getBaseGraph().schema();
- schema.constraintFor(DynamicLabel.label("Person")).assertPropertyIsUnique("name").create();
- schema.constraintFor(DynamicLabel.label("Person")).assertPropertyIsUnique("surname").create();
- this.graph.tx().commit();
-
- this.graph.addVertex(T.label, "Person", "name", "marko");
- this.graph.addVertex(T.label, "Person", "surname", "aaaa");
- this.graph.tx().commit();
- boolean failSurname = false;
- try {
- this.graph.addVertex(T.label, "Person", "surname", "aaaa");
- } catch (ConstraintViolationException e) {
- failSurname = true;
- }
- assertTrue(failSurname);
- boolean failName = false;
- try {
- this.graph.addVertex(T.label, "Person", "name", "marko");
- } catch (ConstraintViolationException e) {
- failName = true;
- }
- assertTrue(failName);
- this.graph.tx().commit();
-
- this.graph.tx().readWrite();
- for (ConstraintDefinition cd : schema.getConstraints(DynamicLabel.label("Person"))) {
- cd.drop();
- }
-
- this.graph.tx().commit();
- assertEquals(1, this.g.V().has(T.label, "Person").has("name", "marko").count().next(), 0);
- assertEquals(1, this.g.V().has(T.label, "Person").has("surname", "aaaa").count().next(), 0);
- this.graph.addVertex(T.label, "Person", "surname", "aaaa");
- this.graph.addVertex(T.label, "Person", "name", "marko");
- this.graph.tx().commit();
- assertEquals(2, this.g.V().has(T.label, "Person").has("name", "marko").count().next(), 0);
- assertEquals(2, this.g.V().has(T.label, "Person").has("surname", "aaaa").count().next(), 0);
- }
-
- @Test(expected = ConstraintViolationException.class)
- public void shouldFailUniqueConstraint() {
- this.graph.tx().readWrite();
- final Schema schema = this.graph.getBaseGraph().schema();
- schema.constraintFor(DynamicLabel.label("Person")).assertPropertyIsUnique("name").create();
- this.graph.tx().commit();
- this.graph.addVertex(T.label, "Person", "name", "marko");
- this.graph.tx().commit();
- assertEquals("marko", g.V().has(T.label, "Person").has("name", "marko").next().value("name"));
- this.graph.addVertex(T.label, "Person", "name", "marko");
- }
-
- @Test
- public void shouldEnsureTraverseRelationshipNeedsTx() throws ScriptException {
- final GremlinGroovyScriptEngine engine = new GremlinGroovyScriptEngine();
- final Bindings bindings = engine.createBindings();
- bindings.put("g", graph.traversal(GraphTraversalSource.standard()));
- bindings.put("#jsr223.groovy.engine.keep.globals", "phantom");
-
- Vertex marko = this.graph.addVertex(T.label, "Person", "name", "marko");
- Vertex john = this.graph.addVertex(T.label, "Person", "name", "john");
- Vertex pete = this.graph.addVertex(T.label, "Person", "name", "pete");
- marko.addEdge("friend", john);
- marko.addEdge("friend", pete);
- this.graph.tx().commit();
-
- Object result = engine.eval("g.V(" + marko.id().toString() + ").outE('friend')", bindings);
- assertTrue(result instanceof GraphTraversal);
-
- this.graph.tx().commit();
- assertEquals(2L, ((GraphTraversal) result).count().next());
- }
-
- @Test
- public void shouldEnsureTraversalOfVerticesNeedsTx() throws ScriptException {
- final GremlinGroovyScriptEngine engine = new GremlinGroovyScriptEngine();
- final Bindings bindings = engine.createBindings();
- bindings.put("g", graph.traversal(GraphTraversalSource.standard()));
- bindings.put("#jsr223.groovy.engine.keep.globals", "phantom");
-
- Vertex marko = this.graph.addVertex(T.label, "Person", "name", "marko");
- Vertex john = this.graph.addVertex(T.label, "Person", "name", "john");
- Vertex pete = this.graph.addVertex(T.label, "Person", "name", "pete");
- marko.addEdge("friend", john);
- marko.addEdge("friend", pete);
- this.graph.tx().commit();
-
- Object result = engine.eval("g.V(" + marko.id().toString() + ").out('friend')", bindings);
- assertTrue(result instanceof GraphTraversal);
-
- this.graph.tx().commit();
- assertEquals(2L, ((GraphTraversal) result).count().next());
- }
-
- @Test
- public void shouldDoLabelSearch() {
- this.graph.addVertex(T.label, "Person", "name", "marko");
- this.graph.addVertex(T.label, "Person", "name", "john");
- Vertex pete = this.graph.addVertex(T.label, "Person", "name", "pete");
- this.graph.addVertex(T.label, "Monkey", "name", "pete");
- this.graph.tx().commit();
- assertEquals(3, this.g.V().has(T.label, "Person").count().next(), 0);
- pete.remove();
- this.graph.tx().commit();
- assertEquals(2, this.g.V().has(T.label, "Person").count().next(), 0);
- }
-
- @Test
- public void shouldDoLabelAndIndexSearch() {
- graph.tx().readWrite();
-
- final Schema schema = graph.getBaseGraph().schema();
- schema.indexFor(DynamicLabel.label("Person")).on("name").create();
- this.graph.tx().commit();
-
- this.graph.addVertex(T.label, "Person", "name", "marko");
- this.graph.addVertex(T.label, "Person", "name", "john");
- this.graph.addVertex(T.label, "Person", "name", "pete");
- this.graph.tx().commit();
- assertEquals(1, this.g.V().has("Person", "name", "marko").count().next(), 0);
- assertEquals(3, this.g.V().has(T.label, "Person").count().next(), 0);
- assertEquals(1, this.g.V().has(T.label, "Person").has("name", "marko").count().next(), 0);
- }
-
- @Test
- public void shouldDoLabelAndLegacyIndexSearch() {
- graph.tx().readWrite();
-
- final Schema schema = graph.getBaseGraph().schema();
- schema.indexFor(DynamicLabel.label("Person")).on("name").create();
-
- final AutoIndexer<Node> nodeAutoIndexer = this.graph.getBaseGraph().index().getNodeAutoIndexer();
- nodeAutoIndexer.startAutoIndexingProperty("name");
-
- this.graph.tx().commit();
- this.graph.addVertex(T.label, "Person", "name", "marko");
- this.graph.addVertex(T.label, "Person", "name", "john");
- this.graph.addVertex(T.label, "Person", "name", "pete");
- this.graph.tx().commit();
- assertEquals(1, this.g.V().has(T.label, "Person").has("name", "marko").count().next(), 0);
- assertEquals(3, this.g.V().has(T.label, "Person").count().next(), 0);
- assertEquals(1, this.g.V().has("name", "john").count().next(), 0);
-
- }
-
- @Test
- public void shouldSupportVertexPropertyToVertexMappingOnIndexCalls() {
- // todo: review this feature check - this test does a lot of stuff - maybe losing some important assertions this way
- if (graph.features().vertex().supportsMultiProperties()) {
- graph.tx().readWrite();
- final Schema schema = graph.getBaseGraph().schema();
- schema.indexFor(DynamicLabel.label("person")).on("name").create();
- schema.indexFor(DynamicLabel.label("name")).on(T.value.getAccessor()).create();
- this.graph.tx().commit();
-
- final Vertex a = graph.addVertex(T.label, "person", "name", "marko", "age", 34);
- a.property(VertexProperty.Cardinality.list,"name", "okram");
- a.property(VertexProperty.Cardinality.list,"name", "marko a. rodriguez");
- final Vertex b = graph.addVertex(T.label, "person", "name", "stephen");
- final Vertex c = graph.addVertex("name", "matthias", "name", "mbroecheler");
-
- tryCommit(graph, graph -> {
- assertEquals(a.id(), graph.traversal().V().has("person", "name", "okram").id().next());
- assertEquals(1, graph.traversal().V().has("person", "name", "okram").count().next().intValue());
- assertEquals(34, ((Neo4jVertex) graph.traversal().V().has("person", "name", "okram").next()).getBaseVertex().getProperty("age"));
- assertEquals(Neo4jVertexProperty.VERTEX_PROPERTY_TOKEN, ((Neo4jVertex) graph.traversal().V().has("person", "name", "okram").next()).getBaseVertex().getProperty("name"));
- ///
- assertEquals(b.id(), graph.traversal().V().has("person", "name", "stephen").id().next());
- assertEquals(1, graph.traversal().V().has("person", "name", "stephen").count().next().intValue());
- assertEquals("stephen", ((Neo4jVertex) graph.traversal().V().has("person", "name", "stephen").next()).getBaseVertex().getProperty("name"));
- ///
- assertEquals(c.id(), graph.traversal().V().has("name", "matthias").id().next());
- assertEquals(c.id(), graph.traversal().V().has("name", "mbroecheler").id().next());
- assertEquals(1, graph.traversal().V().has("name", "matthias").count().next().intValue());
- assertEquals(1, graph.traversal().V().has("name", "mbroecheler").count().next().intValue());
- assertEquals(0, graph.traversal().V().has("person", "name", "matthias").count().next().intValue());
- assertEquals(0, graph.traversal().V().has("person", "name", "mbroecheler").count().next().intValue());
- });
-
- final Vertex d = graph.addVertex(T.label, "person", "name", "kuppitz");
- tryCommit(graph, graph -> {
- assertEquals(d.id(), graph.traversal().V().has("person", "name", "kuppitz").id().next());
- assertEquals("kuppitz", ((Neo4jVertex) graph.traversal().V().has("person", "name", "kuppitz").next()).getBaseVertex().getProperty("name"));
- });
- d.property(VertexProperty.Cardinality.list,"name", "daniel", "acl", "private");
- tryCommit(graph, graph -> {
- assertEquals(d.id(), graph.traversal().V().has("person", "name", Contains.within, Arrays.asList("daniel", "kuppitz")).id().next());
- assertEquals(d.id(), graph.traversal().V().has("person", "name", "kuppitz").id().next());
- assertEquals(d.id(), graph.traversal().V().has("person", "name", "daniel").id().next());
- assertEquals(Neo4jVertexProperty.VERTEX_PROPERTY_TOKEN, ((Neo4jVertex) graph.traversal().V().has("person", "name", "kuppitz").next()).getBaseVertex().getProperty("name"));
- });
- d.property(VertexProperty.Cardinality.list,"name", "marko", "acl", "private");
- tryCommit(graph, g -> {
- assertEquals(2, g.traversal().V().has("person", "name", "marko").count().next().intValue());
- assertEquals(1, g.traversal().V().has("person", "name", "marko").properties("name").has(T.value, "marko").has("acl", "private").count().next().intValue());
- g.traversal().V().has("person", "name", "marko").forEachRemaining(v -> {
- assertEquals(Neo4jVertexProperty.VERTEX_PROPERTY_TOKEN, ((Neo4jVertex) v).getBaseVertex().getProperty("name"));
- });
-
- });
- }
- }
-
- @Test
- public void shouldDoLabelsNamespaceBehavior() {
- graph.tx().readWrite();
-
- final Schema schema = graph.getBaseGraph().schema();
- schema.indexFor(DynamicLabel.label("Person")).on("name").create();
- schema.indexFor(DynamicLabel.label("Product")).on("name").create();
- schema.indexFor(DynamicLabel.label("Corporate")).on("name").create();
-
- this.graph.tx().commit();
- this.graph.addVertex(T.label, "Person", "name", "marko");
- this.graph.addVertex(T.label, "Person", "name", "john");
- this.graph.addVertex(T.label, "Person", "name", "pete");
- this.graph.addVertex(T.label, "Product", "name", "marko");
- this.graph.addVertex(T.label, "Product", "name", "john");
- this.graph.addVertex(T.label, "Product", "name", "pete");
- this.graph.addVertex(T.label, "Corporate", "name", "marko");
- this.graph.addVertex(T.label, "Corporate", "name", "john");
- this.graph.addVertex(T.label, "Corporate", "name", "pete");
- this.graph.tx().commit();
- assertEquals(1, this.g.V().has(T.label, "Person").has("name", "marko").has(T.label, "Person").count().next(), 0);
- assertEquals(1, this.g.V().has(T.label, "Product").has("name", "marko").has(T.label, "Product").count().next(), 0);
- assertEquals(1, this.g.V().has(T.label, "Corporate").has("name", "marko").has(T.label, "Corporate").count().next(), 0);
- assertEquals(0, this.g.V().has(T.label, "Person").has("name", "marko").has(T.label, "Product").count().next(), 0);
- assertEquals(0, this.g.V().has(T.label, "Product").has("name", "marko").has(T.label, "Person").count().next(), 0);
- assertEquals(0, this.g.V().has(T.label, "Corporate").has("name", "marko").has(T.label, "Person").count().next(), 0);
- }
-
- @Test
- public void shouldNotGenerateVerticesOrEdgesForGraphVariables() {
- graph.tx().readWrite();
- graph.variables().set("namespace", "rdf-xml");
- tryCommit(graph, graph -> {
- assertEquals("rdf-xml", graph.variables().get("namespace").get());
- assertEquals(0, graph.traversal().V().count().next().intValue());
- assertEquals(0, graph.traversal().E().count().next().intValue());
- assertEquals(0, IteratorUtils.count(GlobalGraphOperations.at(graph.getBaseGraph()).getAllNodes().iterator()));
- assertEquals(0, IteratorUtils.count(GlobalGraphOperations.at(graph.getBaseGraph()).getAllRelationships().iterator()));
- });
- }
-
- @Test
- public void shouldNotGenerateNodesAndRelationshipsForNoMultiPropertiesNoMetaProperties() {
- graph.tx().readWrite();
- tryCommit(graph, g -> validateCounts(g, 0, 0, 0, 0));
- Vertex vertex = graph.addVertex(T.label, "person");
- tryCommit(graph, g -> validateCounts(g, 1, 0, 1, 0));
- vertex.property(VertexProperty.Cardinality.list,"name", "marko");
- assertEquals("marko", vertex.value("name"));
- tryCommit(graph, g -> validateCounts(g, 1, 0, 1, 0));
- vertex.property(VertexProperty.Cardinality.list,"name", "okram");
- tryCommit(graph, g -> {
- validateCounts(g, 1, 0, 1, 0);
- assertEquals("okram", vertex.value("name"));
- });
- VertexProperty vertexProperty = vertex.property("name");
- tryCommit(graph, g -> {
- assertTrue(vertexProperty.isPresent());
- assertEquals("name", vertexProperty.key());
- assertEquals("okram", vertexProperty.value());
- validateCounts(g, 1, 0, 1, 0);
- });
- try {
- vertexProperty.property("acl", "private");
- } catch (UnsupportedOperationException e) {
- assertEquals(VertexProperty.Exceptions.metaPropertiesNotSupported().getMessage(), e.getMessage());
- }
- }
-
- @Test
- public void shouldNotGenerateNodesAndRelationshipsForMultiPropertiesWithSingle() {
- graph.tx().readWrite();
- tryCommit(graph, g -> validateCounts(g, 0, 0, 0, 0));
- Vertex vertex = graph.addVertex(T.label, "person");
- tryCommit(graph, g -> validateCounts(g, 1, 0, 1, 0));
- vertex.property(VertexProperty.Cardinality.list,"name", "marko");
- assertEquals("marko", vertex.value("name"));
- tryCommit(graph, g -> validateCounts(g, 1, 0, 1, 0));
- vertex.property(VertexProperty.Cardinality.single, "name", "okram");
- tryCommit(graph, g -> {
- validateCounts(g, 1, 0, 1, 0);
- assertEquals("okram", vertex.value("name"));
- });
- VertexProperty vertexProperty = vertex.property("name");
- tryCommit(graph, g -> {
- assertTrue(vertexProperty.isPresent());
- assertEquals("name", vertexProperty.key());
- assertEquals("okram", vertexProperty.value());
- validateCounts(g, 1, 0, 1, 0);
- });
-
- // now make it a meta property (and thus, force node/relationship creation)
- vertexProperty.property("acl", "private");
- tryCommit(graph, g -> {
- assertEquals("private", vertexProperty.value("acl"));
- validateCounts(g, 1, 0, 2, 1);
- });
-
- }
-
-
- @Test
- public void shouldGenerateNodesAndRelationshipsCorrectlyForVertexProperties() {
- // todo: review this feature check - this test does a lot of stuff - maybe losing some important assertions this way
- if (graph.features().vertex().supportsMultiProperties()) {
- graph.tx().readWrite();
- ExecutionEngine cypher = Neo4jHelper.getCypher(graph);
- Neo4jVertex a = (Neo4jVertex) graph.addVertex("name", "marko", "name", "okram");
- Neo4jVertex b = (Neo4jVertex) graph.addVertex("name", "stephen", "location", "virginia");
-
- tryCommit(graph, graph -> {
- assertEquals(2, graph.traversal().V().count().next().intValue());
- // assertEquals(2, a.properties("name").count().next().intValue());
- // assertEquals(1, b.properties("name").count().next().intValue());
- // assertEquals(1, b.properties("location").count().next().intValue());
- // assertEquals(0, g.E().count().next().intValue());
-
- assertEquals(4l, cypher.execute("MATCH n RETURN COUNT(n)").iterator().next().get("COUNT(n)"));
- assertEquals(2l, cypher.execute("MATCH (n)-[r]->(m) RETURN COUNT(r)").iterator().next().get("COUNT(r)"));
- assertEquals(2l, cypher.execute("MATCH (a)-[r]->() WHERE id(a) = " + a.id() + " RETURN COUNT(r)").iterator().next().get("COUNT(r)"));
- final AtomicInteger counter = new AtomicInteger(0);
- a.getBaseVertex().getRelationships(Direction.OUTGOING).forEach(relationship -> {
- assertEquals(Neo4jVertexProperty.VERTEX_PROPERTY_PREFIX.concat("name"), relationship.getType().name());
- counter.incrementAndGet();
- });
- assertEquals(2, counter.getAndSet(0));
- cypher.execute("MATCH (a)-[]->(m) WHERE id(a) = " + a.id() + " RETURN labels(m)").forEach(results -> {
- assertEquals(VertexProperty.DEFAULT_LABEL, ((List<String>) results.get("labels(m)")).get(0));
- counter.incrementAndGet();
- });
- assertEquals(2, counter.getAndSet(0));
- StreamFactory.stream(a.getBaseVertex().getRelationships(Direction.OUTGOING)).map(Relationship::getEndNode).forEach(node -> {
- assertEquals(2, StreamFactory.stream(node.getPropertyKeys()).count());
- assertEquals("name", node.getProperty(T.key.getAccessor()));
- assertTrue("marko".equals(node.getProperty(T.value.getAccessor())) || "okram".equals(node.getProperty(T.value.getAccessor())));
- assertEquals(0, node.getDegree(Direction.OUTGOING));
- assertEquals(1, node.getDegree(Direction.INCOMING));
- assertEquals(Neo4jVertexProperty.VERTEX_PROPERTY_PREFIX.concat("name"), node.getRelationships(Direction.INCOMING).iterator().next().getType().name());
- counter.incrementAndGet();
- });
- assertEquals(2, counter.getAndSet(0));
-
- assertEquals(2, StreamFactory.stream(b.getBaseVertex().getPropertyKeys()).count());
- assertEquals("stephen", b.getBaseVertex().getProperty("name"));
- assertEquals("virginia", b.getBaseVertex().getProperty("location"));
- });
-
- a.property("name", "the marko");
- tryCommit(graph, g -> {
- assertEquals(2, g.traversal().V().count().next().intValue());
- //assertEquals(1, a.properties().count().next().intValue());
- // assertEquals(1, b.properties("name").count().next().intValue());
- // assertEquals(1, b.properties("location").count().next().intValue());
- // assertEquals(0, g.E().count().next().intValue());
-
- assertEquals(2l, cypher.execute("MATCH n RETURN COUNT(n)").iterator().next().get("COUNT(n)"));
- assertEquals(0l, cypher.execute("MATCH (n)-[r]->(m) RETURN COUNT(r)").iterator().next().get("COUNT(r)"));
-
- assertEquals(1, StreamFactory.stream(a.getBaseVertex().getPropertyKeys()).count());
- assertEquals("the marko", a.getBaseVertex().getProperty("name"));
- assertEquals(2, StreamFactory.stream(b.getBaseVertex().getPropertyKeys()).count());
- assertEquals("stephen", b.getBaseVertex().getProperty("name"));
- assertEquals("virginia", b.getBaseVertex().getProperty("location"));
- });
-
- a.property("name").remove();
- tryCommit(graph, g -> {
- assertEquals(2, g.traversal().V().count().next().intValue());
- // assertEquals(0, a.properties().count().next().intValue());
- // assertEquals(2, b.properties().count().next().intValue());
- // assertEquals(0, g.E().count().next().intValue());
- assertEquals(2l, cypher.execute("MATCH n RETURN COUNT(n)").iterator().next().get("COUNT(n)"));
- assertEquals(0l, cypher.execute("MATCH (n)-[r]->(m) RETURN COUNT(r)").iterator().next().get("COUNT(r)"));
- assertEquals(0, StreamFactory.stream(a.getBaseVertex().getPropertyKeys()).count());
- assertEquals(2, StreamFactory.stream(b.getBaseVertex().getPropertyKeys()).count());
- });
-
- graph.tx().commit();
- a.property("name", "the marko", "acl", "private");
- tryCommit(graph, g -> {
- assertEquals(2, g.traversal().V().count().next().intValue());
- // assertEquals(1, a.properties("name").count().next().intValue());
- // assertEquals(1, b.properties("name").count().next().intValue());
- // assertEquals(1, b.properties("location").count().next().intValue());
- // assertEquals(0, g.E().count().next().intValue());
-
- assertEquals(3l, cypher.execute("MATCH n RETURN COUNT(n)").iterator().next().get("COUNT(n)"));
- assertEquals(1l, cypher.execute("MATCH (n)-[r]->(m) RETURN COUNT(r)").iterator().next().get("COUNT(r)"));
- assertEquals(1l, cypher.execute("MATCH (a)-[r]->() WHERE id(a) = " + a.id() + " RETURN COUNT(r)").iterator().next().get("COUNT(r)"));
- final AtomicInteger counter = new AtomicInteger(0);
- a.getBaseVertex().getRelationships(Direction.OUTGOING).forEach(relationship -> {
- assertEquals(Neo4jVertexProperty.VERTEX_PROPERTY_PREFIX.concat("name"), relationship.getType().name());
- counter.incrementAndGet();
- });
- assertEquals(1, counter.getAndSet(0));
- cypher.execute("MATCH (a)-[]->(m) WHERE id(a) = " + a.id() + " RETURN labels(m)").forEach(results -> {
- assertEquals(VertexProperty.DEFAULT_LABEL, ((List<String>) results.get("labels(m)")).get(0));
- counter.incrementAndGet();
- });
- assertEquals(1, counter.getAndSet(0));
- StreamFactory.stream(a.getBaseVertex().getRelationships(Direction.OUTGOING)).map(Relationship::getEndNode).forEach(node -> {
- assertEquals(3, StreamFactory.stream(node.getPropertyKeys()).count());
- assertEquals("name", node.getProperty(T.key.getAccessor()));
- assertEquals("the marko", node.getProperty(T.value.getAccessor()));
- assertEquals("private", node.getProperty("acl"));
- assertEquals(0, node.getDegree(Direction.OUTGOING));
- assertEquals(1, node.getDegree(Direction.INCOMING));
- assertEquals(Neo4jVertexProperty.VERTEX_PROPERTY_PREFIX.concat("name"), node.getRelationships(Direction.INCOMING).iterator().next().getType().name());
- counter.incrementAndGet();
- });
- assertEquals(1, counter.getAndSet(0));
-
- assertEquals(1, StreamFactory.stream(a.getBaseVertex().getPropertyKeys()).count());
- assertTrue(a.getBaseVertex().hasProperty("name"));
- assertEquals(Neo4jVertexProperty.VERTEX_PROPERTY_TOKEN, a.getBaseVertex().getProperty("name"));
- assertEquals(2, StreamFactory.stream(b.getBaseVertex().getPropertyKeys()).count());
- assertEquals("stephen", b.getBaseVertex().getProperty("name"));
- assertEquals("virginia", b.getBaseVertex().getProperty("location"));
- });
-
- a.property(VertexProperty.Cardinality.list,"name", "marko", "acl", "private");
- a.property(VertexProperty.Cardinality.list,"name", "okram", "acl", "public");
- graph.tx().commit(); // TODO tx.commit() THIS IS REQUIRED: ?! Why does Neo4j not delete vertices correctly?
- a.property(VertexProperty.Cardinality.single, "name", "the marko", "acl", "private");
- tryCommit(graph, g -> {
- assertEquals(2, g.traversal().V().count().next().intValue());
- // assertEquals(1, a.properties("name").count().next().intValue());
- // assertEquals(1, b.properties("name").count().next().intValue());
- // assertEquals(1, b.properties("location").count().next().intValue());
- // assertEquals(0, g.E().count().next().intValue());
-
- assertEquals(3l, cypher.execute("MATCH n RETURN COUNT(n)").iterator().next().get("COUNT(n)"));
- assertEquals(1l, cypher.execute("MATCH (n)-[r]->(m) RETURN COUNT(r)").iterator().next().get("COUNT(r)"));
- assertEquals(1l, cypher.execute("MATCH (a)-[r]->() WHERE id(a) = " + a.id() + " RETURN COUNT(r)").iterator().next().get("COUNT(r)"));
- final AtomicInteger counter = new AtomicInteger(0);
- a.getBaseVertex().getRelationships(Direction.OUTGOING).forEach(relationship -> {
- assertEquals(Neo4jVertexProperty.VERTEX_PROPERTY_PREFIX.concat("name"), relationship.getType().name());
- counter.incrementAndGet();
- });
- assertEquals(1, counter.getAndSet(0));
- cypher.execute("MATCH (a)-[]->(m) WHERE id(a) = " + a.id() + " RETURN labels(m)").forEach(results -> {
- assertEquals(VertexProperty.DEFAULT_LABEL, ((List<String>) results.get("labels(m)")).get(0));
- counter.incrementAndGet();
- });
- assertEquals(1, counter.getAndSet(0));
- StreamFactory.stream(a.getBaseVertex().getRelationships(Direction.OUTGOING)).map(Relationship::getEndNode).forEach(node -> {
- assertEquals(3, StreamFactory.stream(node.getPropertyKeys()).count());
- assertEquals("name", node.getProperty(T.key.getAccessor()));
- assertEquals("the marko", node.getProperty(T.value.getAccessor()));
- assertEquals("private", node.getProperty("acl"));
- assertEquals(0, node.getDegree(Direction.OUTGOING));
- assertEquals(1, node.getDegree(Direction.INCOMING));
- assertEquals(Neo4jVertexProperty.VERTEX_PROPERTY_PREFIX.concat("name"), node.getRelationships(Direction.INCOMING).iterator().next().getType().name());
- counter.incrementAndGet();
- });
- assertEquals(1, counter.getAndSet(0));
-
- assertEquals(1, StreamFactory.stream(a.getBaseVertex().getPropertyKeys()).count());
- assertTrue(a.getBaseVertex().hasProperty("name"));
- assertEquals(Neo4jVertexProperty.VERTEX_PROPERTY_TOKEN, a.getBaseVertex().getProperty("name"));
- assertEquals(2, StreamFactory.stream(b.getBaseVertex().getPropertyKeys()).count());
- assertEquals("stephen", b.getBaseVertex().getProperty("name"));
- assertEquals("virginia", b.getBaseVertex().getProperty("location"));
- });
- }
- }
-
- @Test
- public void shouldSupportNeo4jMultiLabels() {
- final Neo4jVertex vertex = (Neo4jVertex) graph.addVertex(T.label, "animal::person", "name", "marko");
- tryCommit(graph, g -> {
- assertTrue(vertex.label().equals("animal::person"));
- assertEquals(2, vertex.labels().size());
- assertTrue(vertex.labels().contains("person"));
- assertTrue(vertex.labels().contains("animal"));
- assertEquals(2, IteratorUtils.count(vertex.getBaseVertex().getLabels().iterator()));
- });
-
- vertex.addLabel("organism");
- tryCommit(graph, g -> {
- assertTrue(vertex.label().equals("animal::organism::person"));
- assertEquals(3, vertex.labels().size());
- assertTrue(vertex.labels().contains("person"));
- assertTrue(vertex.labels().contains("animal"));
- assertTrue(vertex.labels().contains("organism"));
- assertEquals(3, IteratorUtils.count(vertex.getBaseVertex().getLabels().iterator()));
- });
-
- vertex.removeLabel("person");
- tryCommit(graph, g -> {
- assertTrue(vertex.label().equals("animal::organism"));
- assertEquals(2, vertex.labels().size());
- assertTrue(vertex.labels().contains("animal"));
- assertTrue(vertex.labels().contains("organism"));
- });
-
- vertex.addLabel("organism"); // repeat add
- vertex.removeLabel("person"); // repeat remove
- tryCommit(graph, g -> {
- assertTrue(vertex.label().equals("animal::organism"));
- assertEquals(2, vertex.labels().size());
- assertTrue(vertex.labels().contains("animal"));
- assertTrue(vertex.labels().contains("organism"));
- assertEquals(2, IteratorUtils.count(vertex.getBaseVertex().getLabels().iterator()));
- });
-
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c2240066/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/structure/NoMetaMultiNeo4jGraphStructureStandardIntegrateTest.java
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/structure/NoMetaMultiNeo4jGraphStructureStandardIntegrateTest.java b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/structure/NoMetaMultiNeo4jGraphStructureStandardIntegrateTest.java
deleted file mode 100644
index 0cd3ad5..0000000
--- a/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/structure/NoMetaMultiNeo4jGraphStructureStandardIntegrateTest.java
+++ /dev/null
@@ -1,34 +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.neo4j.structure;
-
-import org.apache.tinkerpop.gremlin.neo4j.NoMetaMultiPropertyNeo4jGraphProvider;
-import org.apache.tinkerpop.gremlin.structure.StructureStandardSuite;
-import org.junit.runner.RunWith;
-
-
-/**
- * Executes the Standard Gremlin Structure Test Suite using Neo4j.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-@RunWith(StructureStandardSuite.class)
-@StructureStandardSuite.GraphProviderClass(provider = NoMetaMultiPropertyNeo4jGraphProvider.class, graph = Neo4jGraph.class)
-public class NoMetaMultiNeo4jGraphStructureStandardIntegrateTest {
-}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c2240066/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2cea533..6a9f8a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,7 +80,6 @@ limitations under the License.
<module>gremlin-groovy</module>
<module>gremlin-groovy-test</module>
<module>tinkergraph-gremlin</module>
- <module>neo4j-gremlin</module>
<module>hadoop-gremlin</module>
<module>gremlin-driver</module>
<module>gremlin-console</module>
[2/3] incubator-tinkerpop git commit: gutted neo4j-gremlin from
master/ as it is a GPL dependency. Also removed from docs.
Posted by ok...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c2240066/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jElement.java
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jElement.java b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jElement.java
deleted file mode 100644
index afd0c12..0000000
--- a/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jElement.java
+++ /dev/null
@@ -1,111 +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.neo4j.structure;
-
-import org.apache.tinkerpop.gremlin.structure.Element;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.Property;
-import org.apache.tinkerpop.gremlin.structure.util.ElementHelper;
-import org.apache.tinkerpop.gremlin.structure.util.wrapped.WrappedElement;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.neo4j.graphdb.Node;
-import org.neo4j.graphdb.PropertyContainer;
-import org.neo4j.graphdb.Relationship;
-
-import java.util.Iterator;
-import java.util.Set;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public abstract class Neo4jElement implements Element, WrappedElement<PropertyContainer> {
- protected final Neo4jGraph graph;
- protected final PropertyContainer baseElement;
- protected boolean removed = false;
-
- public Neo4jElement(final PropertyContainer baseElement, final Neo4jGraph graph) {
- this.baseElement = baseElement;
- this.graph = graph;
- }
-
- @Override
- public Graph graph() {
- return this.graph;
- }
-
- @Override
- public Object id() {
- this.graph.tx().readWrite();
- return this.baseElement instanceof Node ? ((Node) this.baseElement).getId() : ((Relationship) this.baseElement).getId();
- }
-
- @Override
- public Set<String> keys() {
- this.graph.tx().readWrite();
- return Element.super.keys();
- }
-
- @Override
- public <V> Property<V> property(final String key) {
- this.graph.tx().readWrite();
- try {
- if (this.baseElement.hasProperty(key))
- return new Neo4jProperty<>(this, key, (V) this.baseElement.getProperty(key));
- else
- return Property.empty();
- } catch (final IllegalStateException e) {
- throw Element.Exceptions.elementAlreadyRemoved(this.getClass(), this.id());
- }
- }
-
- @Override
- public <V> Property<V> property(final String key, final V value) {
- ElementHelper.validateProperty(key, value);
- this.graph.tx().readWrite();
-
- try {
- this.baseElement.setProperty(key, value);
- return new Neo4jProperty<>(this, key, value);
- } catch (final IllegalArgumentException e) {
- throw Property.Exceptions.dataTypeOfPropertyValueNotSupported(value);
- }
- }
-
- @Override
- public boolean equals(final Object object) {
- return ElementHelper.areEqual(this, object);
- }
-
- @Override
- public int hashCode() {
- return ElementHelper.hashCode(this);
- }
-
- @Override
- public PropertyContainer getBaseElement() {
- return this.baseElement;
- }
-
- @Override
- public <V> Iterator<? extends Property<V>> properties(final String... propertyKeys) {
- this.graph.tx().readWrite();
- return IteratorUtils.map(IteratorUtils.filter(this.baseElement.getPropertyKeys().iterator(), key -> ElementHelper.keyExists(key, propertyKeys)), key -> new Neo4jProperty<>(this, key, (V) this.baseElement.getProperty(key)));
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c2240066/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jGraph.java
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jGraph.java b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jGraph.java
deleted file mode 100644
index d52ff78..0000000
--- a/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jGraph.java
+++ /dev/null
@@ -1,600 +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.neo4j.structure;
-
-import org.apache.commons.configuration.BaseConfiguration;
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.ConfigurationConverter;
-import org.apache.tinkerpop.gremlin.neo4j.process.traversal.step.util.Neo4jCypherIterator;
-import org.apache.tinkerpop.gremlin.neo4j.process.traversal.strategy.optimization.Neo4jGraphStepStrategy;
-import org.apache.tinkerpop.gremlin.process.computer.GraphComputer;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategies;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.DefaultGraphTraversal;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
-import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.StartStep;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.Transaction;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.structure.util.AbstractTransaction;
-import org.apache.tinkerpop.gremlin.structure.util.ElementHelper;
-import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
-import org.apache.tinkerpop.gremlin.structure.util.wrapped.WrappedGraph;
-import org.apache.tinkerpop.gremlin.util.StreamFactory;
-import org.neo4j.cypher.javacompat.ExecutionEngine;
-import org.neo4j.graphdb.GraphDatabaseService;
-import org.neo4j.graphdb.NotFoundException;
-import org.neo4j.graphdb.ResourceIterator;
-import org.neo4j.graphdb.factory.GraphDatabaseFactory;
-import org.neo4j.graphdb.factory.HighlyAvailableGraphDatabaseFactory;
-import org.neo4j.graphdb.schema.Schema;
-import org.neo4j.kernel.GraphDatabaseAPI;
-import org.neo4j.tooling.GlobalGraphOperations;
-
-import javax.transaction.SystemException;
-import javax.transaction.TransactionManager;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Stream;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- * @author Pieter Martin
- */
-@Graph.OptIn(Graph.OptIn.SUITE_PROCESS_STANDARD)
-@Graph.OptIn(Graph.OptIn.SUITE_STRUCTURE_STANDARD)
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.structure.VertexTest$ExceptionConsistencyWhenVertexRemovedTest",
- method = "shouldThrowExceptionIfVertexWasRemovedWhenCallingProperty",
- specific = "property(single,k,v)",
- reason = "Neo4j throws a NodeNotFoundException instead of the desired IllegalStateException.")
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.AddVertexTest$Traversals",
- method = "g_V_addVXlabel_animal_age_0X",
- reason = "Neo4j global graph operators stream created vertices created after the access to the global iterator."
-)
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.GroovyAddVertexTest$StandardTraversals",
- method = "g_V_addVXlabel_animal_age_0X",
- reason = "Neo4j global graph operators stream created vertices created after the access to the global iterator."
-)
-@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.structure.GraphTest",
- method = "shouldRemoveEdgesWithoutConcurrentModificationException",
- reason = "Neo4j global graph operators stream removes edges after access to the global iterator."
-)
-public class Neo4jGraph implements Graph, WrappedGraph<GraphDatabaseService> {
-
- static {
- TraversalStrategies.GlobalCache.registerStrategies(Neo4jGraph.class, TraversalStrategies.GlobalCache.getStrategies(Graph.class).clone().addStrategies(Neo4jGraphStepStrategy.instance()));
- }
-
- private static final Configuration EMPTY_CONFIGURATION = new BaseConfiguration() {{
- this.setProperty(Graph.GRAPH, Neo4jGraph.class.getName());
- }};
-
- private final Features features = new Neo4jGraphFeatures();
-
- private GraphDatabaseService baseGraph;
- private BaseConfiguration configuration = new BaseConfiguration();
-
- public static final String CONFIG_DIRECTORY = "gremlin.neo4j.directory";
- public static final String CONFIG_HA = "gremlin.neo4j.ha";
- public static final String CONFIG_CONF = "gremlin.neo4j.conf";
- public static final String CONFIG_META_PROPERTIES = "gremlin.neo4j.metaProperties";
- public static final String CONFIG_MULTI_PROPERTIES = "gremlin.neo4j.multiProperties";
- public static final String CONFIG_CHECK_ELEMENTS_IN_TRANSACTION = "gremlin.neo4j.checkElementsInTransaction";
-
- private final Neo4jTransaction neo4jTransaction = new Neo4jTransaction();
- private final Neo4jGraphVariables neo4jGraphVariables;
-
- protected final boolean supportsMetaProperties;
- protected final boolean supportsMultiProperties;
- protected boolean checkElementsInTransaction = false;
-
- protected final TransactionManager transactionManager;
- protected final ExecutionEngine cypher;
-
- private Neo4jGraph(final GraphDatabaseService baseGraph) {
- this.configuration.copy(EMPTY_CONFIGURATION);
- this.baseGraph = baseGraph;
- this.transactionManager = ((GraphDatabaseAPI) baseGraph).getDependencyResolver().resolveDependency(TransactionManager.class);
- this.cypher = new ExecutionEngine(this.baseGraph);
- this.neo4jGraphVariables = new Neo4jGraphVariables(this);
-
- ///////////
- final Optional<Boolean> metaProperties = this.neo4jGraphVariables.get(Hidden.hide(CONFIG_META_PROPERTIES));
- if (metaProperties.isPresent()) {
- this.supportsMetaProperties = metaProperties.get();
- } else {
- this.supportsMetaProperties = false;
- this.neo4jGraphVariables.set(Hidden.hide(CONFIG_META_PROPERTIES), false);
- }
- final Optional<Boolean> multiProperties = this.neo4jGraphVariables.get(Hidden.hide(CONFIG_MULTI_PROPERTIES));
- if (multiProperties.isPresent()) {
- this.supportsMultiProperties = multiProperties.get();
- } else {
- this.supportsMultiProperties = false;
- this.neo4jGraphVariables.set(Hidden.hide(CONFIG_MULTI_PROPERTIES), false);
- }
- if ((this.supportsMetaProperties && !this.supportsMultiProperties) || (!this.supportsMetaProperties && this.supportsMultiProperties)) {
- tx().rollback();
- throw new UnsupportedOperationException("Neo4jGraph currently requires either both meta- and multi-properties activated or neither activated");
- }
- final Optional<Boolean> elementsInTransaction = this.neo4jGraphVariables.get(Hidden.hide(CONFIG_CHECK_ELEMENTS_IN_TRANSACTION));
- if (elementsInTransaction.isPresent()) {
- this.checkElementsInTransaction = elementsInTransaction.get();
- } else {
- this.checkElementsInTransaction = false;
- this.neo4jGraphVariables.set(Hidden.hide(CONFIG_CHECK_ELEMENTS_IN_TRANSACTION), false);
- }
- tx().commit();
- ///////////
- }
-
- private Neo4jGraph(final Configuration configuration) {
- try {
- this.configuration.copy(EMPTY_CONFIGURATION);
- this.configuration.copy(configuration);
- final String directory = this.configuration.getString(CONFIG_DIRECTORY);
- final Map neo4jSpecificConfig = ConfigurationConverter.getMap(this.configuration.subset(CONFIG_CONF));
- final boolean ha = this.configuration.getBoolean(CONFIG_HA, false);
- // if HA is enabled then use the correct factory to instantiate the GraphDatabaseService
- this.baseGraph = ha ?
- new HighlyAvailableGraphDatabaseFactory().newHighlyAvailableDatabaseBuilder(directory).setConfig(neo4jSpecificConfig).newGraphDatabase() :
- new GraphDatabaseFactory().newEmbeddedDatabaseBuilder(directory).
- setConfig(neo4jSpecificConfig).newGraphDatabase();
- this.transactionManager = ((GraphDatabaseAPI) this.baseGraph).getDependencyResolver().resolveDependency(TransactionManager.class);
- this.cypher = new ExecutionEngine(this.baseGraph);
- this.neo4jGraphVariables = new Neo4jGraphVariables(this);
- ///////////
- if (!this.neo4jGraphVariables.get(Hidden.hide(CONFIG_META_PROPERTIES)).isPresent())
- this.neo4jGraphVariables.set(Hidden.hide(CONFIG_META_PROPERTIES), this.configuration.getBoolean(CONFIG_META_PROPERTIES, false));
- // TODO: Logger saying the configuration properties are ignored if already in Graph.Variables
- if (!this.neo4jGraphVariables.get(Hidden.hide(CONFIG_MULTI_PROPERTIES)).isPresent())
- this.neo4jGraphVariables.set(Hidden.hide(CONFIG_MULTI_PROPERTIES), this.configuration.getBoolean(CONFIG_MULTI_PROPERTIES, false));
- // TODO: Logger saying the configuration properties are ignored if already in Graph.Variables
- this.supportsMetaProperties = this.neo4jGraphVariables.<Boolean>get(Hidden.hide(CONFIG_META_PROPERTIES)).get();
- this.supportsMultiProperties = this.neo4jGraphVariables.<Boolean>get(Hidden.hide(CONFIG_MULTI_PROPERTIES)).get();
- if ((this.supportsMetaProperties && !this.supportsMultiProperties) || (!this.supportsMetaProperties && this.supportsMultiProperties)) {
- tx().rollback();
- throw new UnsupportedOperationException("Neo4jGraph currently requires either both meta- and multi-properties activated or neither activated");
- }
- //
- // TODO: Logger saying the configuration properties are ignored if already in Graph.Variables
- if (!this.neo4jGraphVariables.get(Hidden.hide(CONFIG_CHECK_ELEMENTS_IN_TRANSACTION)).isPresent())
- this.neo4jGraphVariables.set(Hidden.hide(CONFIG_CHECK_ELEMENTS_IN_TRANSACTION), this.configuration.getBoolean(CONFIG_CHECK_ELEMENTS_IN_TRANSACTION, false));
- this.checkElementsInTransaction = this.neo4jGraphVariables.<Boolean>get(Hidden.hide(CONFIG_CHECK_ELEMENTS_IN_TRANSACTION)).get();
- tx().commit();
- ///////////
- } catch (Exception e) {
- if (this.baseGraph != null)
- this.baseGraph.shutdown();
- throw new RuntimeException(e.getMessage(), e);
- }
- }
-
- /**
- * Open a new {@link Neo4jGraph} instance.
- *
- * @param configuration the configuration for the instance
- * @return a newly opened {@link org.apache.tinkerpop.gremlin.structure.Graph}
- */
- public static Neo4jGraph open(final Configuration configuration) {
- if (null == configuration) throw Graph.Exceptions.argumentCanNotBeNull("configuration");
- if (!configuration.containsKey(CONFIG_DIRECTORY))
- throw new IllegalArgumentException(String.format("Neo4j configuration requires that the %s be set", CONFIG_DIRECTORY));
-
- return new Neo4jGraph(configuration);
- }
-
- /**
- * Construct a Neo4jGraph instance by specifying the directory to create the database in..
- */
- public static Neo4jGraph open(final String directory) {
- final Configuration config = new BaseConfiguration();
- config.setProperty(CONFIG_DIRECTORY, directory);
- return open(config);
- }
-
- /**
- * Construct a Neo4jGraph instance using an existing Neo4j raw instance.
- */
- public static Neo4jGraph open(final GraphDatabaseService baseGraph) {
- return new Neo4jGraph(Optional.ofNullable(baseGraph).orElseThrow(() -> Graph.Exceptions.argumentCanNotBeNull("baseGraph")));
- }
-
- @Override
- public Vertex addVertex(final Object... keyValues) {
- ElementHelper.legalPropertyKeyValueArray(keyValues);
- if (ElementHelper.getIdValue(keyValues).isPresent())
- throw Vertex.Exceptions.userSuppliedIdsNotSupported();
-
- final String label = ElementHelper.getLabelValue(keyValues).orElse(Vertex.DEFAULT_LABEL);
-
- this.tx().readWrite();
- final Neo4jVertex vertex = new Neo4jVertex(this.baseGraph.createNode(Neo4jHelper.makeLabels(label)), this);
- ElementHelper.attachProperties(vertex, VertexProperty.Cardinality.list, keyValues);
- return vertex;
- }
-
- @Override
- public <C extends GraphComputer> C compute(final Class<C> graphComputerClass) {
- throw Graph.Exceptions.graphComputerNotSupported();
- }
-
- @Override
- public GraphComputer compute() {
- throw Graph.Exceptions.graphComputerNotSupported();
- }
-
- @Override
- public Transaction tx() {
- return this.neo4jTransaction;
- }
-
- @Override
- public Variables variables() {
- return this.neo4jGraphVariables;
- }
-
- @Override
- public Configuration configuration() {
- return this.configuration;
- }
-
- @Override
- public Iterator<Vertex> vertices(final Object... vertexIds) {
- this.tx().readWrite();
- if (0 == vertexIds.length) {
- return StreamFactory.stream(GlobalGraphOperations.at(this.getBaseGraph()).getAllNodes())
- .filter(node -> !this.checkElementsInTransaction || !Neo4jHelper.isDeleted(node))
- .filter(node -> !node.hasLabel(Neo4jVertexProperty.VERTEX_PROPERTY_LABEL))
- .map(node -> (Vertex) new Neo4jVertex(node, this)).iterator();
- } else {
- return Stream.of(vertexIds)
- .filter(id -> id instanceof Number)
- .flatMap(id -> {
- try {
- return Stream.of((Vertex) new Neo4jVertex(this.getBaseGraph().getNodeById(((Number) id).longValue()), this));
- } catch (final NotFoundException e) {
- return Stream.empty();
- }
- }).iterator();
- }
- }
-
- @Override
- public Iterator<Edge> edges(final Object... edgeIds) {
- this.tx().readWrite();
- if (0 == edgeIds.length) {
- return StreamFactory.stream(GlobalGraphOperations.at(this.getBaseGraph()).getAllRelationships())
- .filter(relationship -> !this.checkElementsInTransaction || !Neo4jHelper.isDeleted(relationship))
- .filter(relationship -> !relationship.getType().name().startsWith(Neo4jVertexProperty.VERTEX_PROPERTY_PREFIX))
- .map(relationship -> (Edge) new Neo4jEdge(relationship, this)).iterator();
- } else {
- return Stream.of(edgeIds)
- .filter(id -> id instanceof Number)
- .flatMap(id -> {
- try {
- return Stream.of((Edge) new Neo4jEdge(this.getBaseGraph().getRelationshipById(((Number) id).longValue()), this));
- } catch (final NotFoundException e) {
- return Stream.empty();
- }
- }).iterator();
- }
-
- }
-
- /**
- * This implementation of {@code close} will also close the current transaction on the the thread, but it
- * is up to the caller to deal with dangling transactions in other threads prior to calling this method.
- */
- @Override
- public void close() throws Exception {
- this.tx().close();
- if (this.baseGraph != null) this.baseGraph.shutdown();
- }
-
- public String toString() {
- return StringFactory.graphString(this, baseGraph.toString());
- }
-
- @Override
- public Features features() {
- return features;
- }
-
- @Override
- public GraphDatabaseService getBaseGraph() {
- return this.baseGraph;
- }
-
- /**
- * Provides access to Neo4j's schema system for managing indices.
- *
- * @return Neo4j's schema/index manager.
- */
- public Schema getSchema() {
- return this.baseGraph.schema();
- }
-
- /**
- * Neo4j's transactions are not consistent between the graph and the graph
- * indices. Moreover, global graph operations are not consistent. For
- * example, if a vertex is removed and then an index is queried in the same
- * transaction, the removed vertex can be returned. This method allows the
- * developer to turn on/off a Neo4jGraph 'hack' that ensures transactional
- * consistency. The default behavior for Neo4jGraph is {@code true}.
- *
- * @param checkElementsInTransaction check whether an element is in the transaction between
- * returning it
- */
- public void checkElementsInTransaction(final boolean checkElementsInTransaction) {
- this.checkElementsInTransaction = checkElementsInTransaction;
- }
-
- /**
- * Execute the Cypher query and get the result set as a {@link GraphTraversal}.
- *
- * @param query the Cypher query to execute
- * @return a fluent Gremlin traversal
- */
- public <S, E> GraphTraversal<S, E> cypher(final String query) {
- return cypher(query, Collections.emptyMap());
- }
-
- /**
- * Execute the Cypher query with provided parameters and get the result set as a {@link GraphTraversal}.
- *
- * @param query the Cypher query to execute
- * @param parameters the parameters of the Cypher query
- * @return a fluent Gremlin traversal
- */
- public <S, E> GraphTraversal<S, E> cypher(final String query, final Map<String, Object> parameters) {
- this.tx().readWrite();
- final GraphTraversal.Admin<S, E> traversal = new DefaultGraphTraversal<>(this);
- traversal.addStep(new StartStep(traversal, new Neo4jCypherIterator<S>((ResourceIterator) this.cypher.execute(query, parameters).iterator(), this)));
- return traversal;
- }
-
- class Neo4jTransaction extends AbstractTransaction {
-
- protected final ThreadLocal<org.neo4j.graphdb.Transaction> threadLocalTx = ThreadLocal.withInitial(() -> null);
-
- public Neo4jTransaction() {
- super(Neo4jGraph.this);
- }
-
- @Override
- public void doOpen() {
- threadLocalTx.set(getBaseGraph().beginTx());
- }
-
- @Override
- public void doCommit() throws TransactionException {
- try {
- threadLocalTx.get().success();
- } catch (Exception ex) {
- throw new TransactionException(ex);
- } finally {
- threadLocalTx.get().close();
- threadLocalTx.remove();
- }
- }
-
- @Override
- public void doRollback() throws TransactionException {
- try {
- javax.transaction.Transaction t = transactionManager.getTransaction();
- if (null == t || t.getStatus() == javax.transaction.Status.STATUS_ROLLEDBACK)
- return;
-
- threadLocalTx.get().failure();
- } catch (SystemException e) {
- throw new TransactionException(e);
- } finally {
- threadLocalTx.get().close();
- threadLocalTx.remove();
- }
- }
-
- @Override
- public boolean isOpen() {
- return (threadLocalTx.get() != null);
- }
- }
-
- public class Neo4jGraphFeatures implements Features {
- private final GraphFeatures graphFeatures = new Neo4jGraphGraphFeatures();
- private final VertexFeatures vertexFeatures = new Neo4jVertexFeatures();
- private final EdgeFeatures edgeFeatures = new Neo4jEdgeFeatures();
-
- @Override
- public GraphFeatures graph() {
- return graphFeatures;
- }
-
- @Override
- public VertexFeatures vertex() {
- return vertexFeatures;
- }
-
- @Override
- public EdgeFeatures edge() {
- return edgeFeatures;
- }
-
- @Override
- public String toString() {
- return StringFactory.featureString(this);
- }
-
- public class Neo4jGraphGraphFeatures implements GraphFeatures {
-
- private VariableFeatures variableFeatures = new Neo4jGraphVariables.Neo4jVariableFeatures();
-
- Neo4jGraphGraphFeatures() {
- }
-
- @Override
- public boolean supportsComputer() {
- return false;
- }
-
- @Override
- public VariableFeatures variables() {
- return variableFeatures;
- }
-
- @Override
- public boolean supportsThreadedTransactions() {
- return false;
- }
- }
-
- public class Neo4jVertexFeatures extends Neo4jElementFeatures implements VertexFeatures {
-
- private final VertexPropertyFeatures vertexPropertyFeatures = new Neo4jVertexPropertyFeatures();
-
- Neo4jVertexFeatures() {
- }
-
- @Override
- public VertexPropertyFeatures properties() {
- return vertexPropertyFeatures;
- }
-
- @Override
- public boolean supportsMetaProperties() {
- return Neo4jGraph.this.supportsMetaProperties;
- }
-
- @Override
- public boolean supportsMultiProperties() {
- return Neo4jGraph.this.supportsMultiProperties;
- }
- }
-
- public class Neo4jEdgeFeatures extends Neo4jElementFeatures implements EdgeFeatures {
-
- private final EdgePropertyFeatures edgePropertyFeatures = new Neo4jEdgePropertyFeatures();
-
- Neo4jEdgeFeatures() {
- }
-
- @Override
- public EdgePropertyFeatures properties() {
- return edgePropertyFeatures;
- }
- }
-
- public class Neo4jElementFeatures implements ElementFeatures {
-
- Neo4jElementFeatures() {
- }
-
- @Override
- public boolean supportsUserSuppliedIds() {
- return false;
- }
-
- @Override
- public boolean supportsStringIds() {
- return false;
- }
-
- @Override
- public boolean supportsUuidIds() {
- return false;
- }
-
- @Override
- public boolean supportsAnyIds() {
- return false;
- }
-
- @Override
- public boolean supportsCustomIds() {
- return false;
- }
- }
-
- public class Neo4jVertexPropertyFeatures implements VertexPropertyFeatures {
-
- Neo4jVertexPropertyFeatures() {
- }
-
- @Override
- public boolean supportsMapValues() {
- return false;
- }
-
- @Override
- public boolean supportsMixedListValues() {
- return false;
- }
-
- @Override
- public boolean supportsSerializableValues() {
- return false;
- }
-
- @Override
- public boolean supportsUniformListValues() {
- return false;
- }
-
- @Override
- public boolean supportsUserSuppliedIds() {
- return false;
- }
- }
-
- public class Neo4jEdgePropertyFeatures implements EdgePropertyFeatures {
-
- Neo4jEdgePropertyFeatures() {
- }
-
- @Override
- public boolean supportsMapValues() {
- return false;
- }
-
- @Override
- public boolean supportsMixedListValues() {
- return false;
- }
-
- @Override
- public boolean supportsSerializableValues() {
- return false;
- }
-
- @Override
- public boolean supportsUniformListValues() {
- return false;
- }
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c2240066/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jGraphVariables.java
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jGraphVariables.java b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jGraphVariables.java
deleted file mode 100644
index 87776af..0000000
--- a/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jGraphVariables.java
+++ /dev/null
@@ -1,178 +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.neo4j.structure;
-
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.util.GraphVariableHelper;
-import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
-import org.neo4j.graphdb.PropertyContainer;
-import org.neo4j.kernel.GraphDatabaseAPI;
-import org.neo4j.kernel.impl.core.NodeManager;
-
-import java.util.HashSet;
-import java.util.Optional;
-import java.util.Set;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- */
-public class Neo4jGraphVariables implements Graph.Variables {
-
- private final PropertyContainer graphVariables;
- private final Neo4jGraph graph;
-
- protected Neo4jGraphVariables(final Neo4jGraph graph) {
- this.graph = graph;
- this.graphVariables = ((GraphDatabaseAPI) this.graph.getBaseGraph()).getDependencyResolver().resolveDependency(NodeManager.class).getGraphProperties();
- }
-
- @Override
- public Set<String> keys() {
- this.graph.tx().readWrite();
- final Set<String> keys = new HashSet<>();
- for (final String key : this.graphVariables.getPropertyKeys()) {
- if (!Graph.Hidden.isHidden(key))
- keys.add(key);
- }
- return keys;
- }
-
- @Override
- public <R> Optional<R> get(final String key) {
- this.graph.tx().readWrite();
- return this.graphVariables.hasProperty(key) ?
- Optional.of((R) this.graphVariables.getProperty(key)) :
- Optional.<R>empty();
- }
-
- @Override
- public void set(final String key, final Object value) {
- GraphVariableHelper.validateVariable(key, value);
- this.graph.tx().readWrite();
- try {
- this.graphVariables.setProperty(key, value);
- } catch (final IllegalArgumentException e) {
- throw Graph.Variables.Exceptions.dataTypeOfVariableValueNotSupported(value);
- }
- }
-
- @Override
- public void remove(final String key) {
- this.graph.tx().readWrite();
- if (this.graphVariables.hasProperty(key))
- this.graphVariables.removeProperty(key);
- }
-
- @Override
- public String toString() {
- return StringFactory.graphVariablesString(this);
- }
-
- public static class Neo4jVariableFeatures implements Graph.Features.VariableFeatures {
- @Override
- public boolean supportsBooleanValues() {
- return true;
- }
-
- @Override
- public boolean supportsDoubleValues() {
- return true;
- }
-
- @Override
- public boolean supportsFloatValues() {
- return true;
- }
-
- @Override
- public boolean supportsIntegerValues() {
- return true;
- }
-
- @Override
- public boolean supportsLongValues() {
- return true;
- }
-
- @Override
- public boolean supportsMapValues() {
- return false;
- }
-
- @Override
- public boolean supportsMixedListValues() {
- return false;
- }
-
- @Override
- public boolean supportsByteValues() {
- return false;
- }
-
- @Override
- public boolean supportsBooleanArrayValues() {
- return true;
- }
-
- @Override
- public boolean supportsByteArrayValues() {
- return false;
- }
-
- @Override
- public boolean supportsDoubleArrayValues() {
- return true;
- }
-
- @Override
- public boolean supportsFloatArrayValues() {
- return true;
- }
-
- @Override
- public boolean supportsIntegerArrayValues() {
- return true;
- }
-
- @Override
- public boolean supportsLongArrayValues() {
- return true;
- }
-
- @Override
- public boolean supportsStringArrayValues() {
- return true;
- }
-
- @Override
- public boolean supportsSerializableValues() {
- return false;
- }
-
- @Override
- public boolean supportsStringValues() {
- return true;
- }
-
- @Override
- public boolean supportsUniformListValues() {
- return false;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c2240066/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jHelper.java
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jHelper.java b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jHelper.java
deleted file mode 100644
index 6ec9574..0000000
--- a/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jHelper.java
+++ /dev/null
@@ -1,85 +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.neo4j.structure;
-
-import org.apache.tinkerpop.gremlin.structure.Direction;
-import org.neo4j.cypher.javacompat.ExecutionEngine;
-import org.neo4j.graphdb.DynamicLabel;
-import org.neo4j.graphdb.DynamicRelationshipType;
-import org.neo4j.graphdb.Label;
-import org.neo4j.graphdb.Node;
-import org.neo4j.graphdb.Relationship;
-import org.neo4j.graphdb.RelationshipType;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- */
-public final class Neo4jHelper {
-
- private Neo4jHelper() {
- }
-
- public static ExecutionEngine getCypher(final Neo4jGraph graph) {
- return graph.cypher;
- }
-
- public static org.neo4j.graphdb.Direction mapDirection(final Direction direction) {
- if (direction.equals(Direction.OUT))
- return org.neo4j.graphdb.Direction.OUTGOING;
- else if (direction.equals(Direction.IN))
- return org.neo4j.graphdb.Direction.INCOMING;
- else
- return org.neo4j.graphdb.Direction.BOTH;
- }
-
- public static RelationshipType[] mapEdgeLabels(final String... edgeLabels) {
- final RelationshipType[] relationshipTypes = new RelationshipType[edgeLabels.length];
- for (int i = 0; i < relationshipTypes.length; i++) {
- relationshipTypes[i] = DynamicRelationshipType.withName(edgeLabels[i]);
- }
- return relationshipTypes;
- }
-
- public static boolean isDeleted(final Node node) {
- try {
- node.getPropertyKeys();
- return false;
- } catch (final IllegalStateException e) {
- return true;
- }
- }
-
- public static boolean isDeleted(final Relationship relationship) {
- try {
- relationship.getType();
- return false;
- } catch (final IllegalStateException e) {
- return true;
- }
- }
-
- public static Label[] makeLabels(final String potentialMultiLabel) {
- final String[] splitLabels = potentialMultiLabel.split(Neo4jVertex.LABEL_DELIMINATOR);
- final Label[] labels = new Label[splitLabels.length];
- for (int i = 0; i < splitLabels.length; i++) {
- labels[i] = DynamicLabel.label(splitLabels[i]);
- }
- return labels;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c2240066/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jProperty.java
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jProperty.java b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jProperty.java
deleted file mode 100644
index 2257252..0000000
--- a/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jProperty.java
+++ /dev/null
@@ -1,99 +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.neo4j.structure;
-
-import org.apache.tinkerpop.gremlin.structure.Element;
-import org.apache.tinkerpop.gremlin.structure.Property;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.structure.util.ElementHelper;
-import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
-import org.neo4j.graphdb.Node;
-import org.neo4j.graphdb.PropertyContainer;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class Neo4jProperty<V> implements Property<V> {
-
- private final Element element;
- private final String key;
- private final Neo4jGraph graph;
- private V value;
-
- public Neo4jProperty(final Element element, final String key, final V value) {
- this.element = element;
- this.key = key;
- this.value = value;
- this.graph = element instanceof Neo4jVertexProperty ?
- ((Neo4jVertex) (((Neo4jVertexProperty) element).element())).graph :
- ((Neo4jElement) element).graph;
- }
-
- @Override
- public Element element() {
- return this.element;
- }
-
- @Override
- public String key() {
- return this.key;
- }
-
- @Override
- public V value() {
- return this.value;
- }
-
- @Override
- public boolean isPresent() {
- return null != this.value;
- }
-
- @Override
- public String toString() {
- return StringFactory.propertyString(this);
- }
-
- @Override
- public boolean equals(final Object object) {
- return ElementHelper.areEqual(this, object);
- }
-
- @Override
- public int hashCode() {
- return ElementHelper.hashCode(this);
- }
-
- @Override
- public void remove() {
- this.graph.tx().readWrite();
- if (this.element instanceof VertexProperty) {
- final Node node = ((Neo4jVertexProperty) this.element).getBaseVertex();
- if (null != node && node.hasProperty(this.key)) {
- node.removeProperty(this.key);
- }
- } else {
- final PropertyContainer propertyContainer = ((Neo4jElement) this.element).getBaseElement();
- if (propertyContainer.hasProperty(this.key)) {
- propertyContainer.removeProperty(this.key);
- }
- }
- }
-
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c2240066/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jVertex.java
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jVertex.java b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jVertex.java
deleted file mode 100644
index 48f1b0b..0000000
--- a/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jVertex.java
+++ /dev/null
@@ -1,276 +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.neo4j.structure;
-
-import org.apache.tinkerpop.gremlin.process.traversal.T;
-import org.apache.tinkerpop.gremlin.structure.Direction;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Element;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.Property;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.structure.util.ElementHelper;
-import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
-import org.apache.tinkerpop.gremlin.structure.util.wrapped.WrappedVertex;
-import org.apache.tinkerpop.gremlin.util.StreamFactory;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.neo4j.graphdb.DynamicLabel;
-import org.neo4j.graphdb.DynamicRelationshipType;
-import org.neo4j.graphdb.Label;
-import org.neo4j.graphdb.Node;
-import org.neo4j.graphdb.NotFoundException;
-import org.neo4j.graphdb.Relationship;
-
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.Optional;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.stream.Stream;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class Neo4jVertex extends Neo4jElement implements Vertex, WrappedVertex<Node> {
-
- protected static final String LABEL_DELIMINATOR = "::";
-
- public Neo4jVertex(final Node node, final Neo4jGraph graph) {
- super(node, graph);
- }
-
- @Override
- public <V> VertexProperty<V> property(final String key) {
- if (this.removed) throw Element.Exceptions.elementAlreadyRemoved(Vertex.class, this.getBaseVertex().getId());
- this.graph.tx().readWrite();
- if (!this.graph.supportsMultiProperties) {
- return existsInNeo4j(key) ? new Neo4jVertexProperty<V>(this, key, (V) this.getBaseVertex().getProperty(key)) : VertexProperty.<V>empty();
- } else {
- if (existsInNeo4j(key)) {
- if (this.getBaseVertex().getProperty(key).equals(Neo4jVertexProperty.VERTEX_PROPERTY_TOKEN)) {
- if (this.getBaseVertex().getDegree(DynamicRelationshipType.withName(Neo4jVertexProperty.VERTEX_PROPERTY_PREFIX.concat(key)), org.neo4j.graphdb.Direction.OUTGOING) > 1)
- throw Vertex.Exceptions.multiplePropertiesExistForProvidedKey(key);
- else
- return new Neo4jVertexProperty<>(this, this.getBaseVertex().getRelationships(org.neo4j.graphdb.Direction.OUTGOING, DynamicRelationshipType.withName(Neo4jVertexProperty.VERTEX_PROPERTY_PREFIX.concat(key))).iterator().next().getEndNode());
- } else {
- return new Neo4jVertexProperty<>(this, key, (V) this.getBaseVertex().getProperty(key));
- }
- } else
- return VertexProperty.<V>empty();
- }
- }
-
- @Override
- public <V> VertexProperty<V> property(final String key, final V value) {
- return this.property(VertexProperty.Cardinality.single, key, value);
- }
-
- @Override
- public <V> VertexProperty<V> property(final VertexProperty.Cardinality cardinality, final String key, final V value, final Object... keyValues) {
- if (this.removed) throw Element.Exceptions.elementAlreadyRemoved(Vertex.class, this.getBaseVertex().getId());
- ElementHelper.validateProperty(key, value);
- if (ElementHelper.getIdValue(keyValues).isPresent())
- throw VertexProperty.Exceptions.userSuppliedIdsNotSupported();
- this.graph.tx().readWrite();
- try {
- if (!this.graph.supportsMultiProperties) {
- this.getBaseVertex().setProperty(key, value);
- return new Neo4jVertexProperty<>(this, key, value);
- } else {
- final Optional<VertexProperty<V>> optionalVertexProperty = ElementHelper.stageVertexProperty(this, cardinality, key, value, keyValues);
- if (optionalVertexProperty.isPresent()) return optionalVertexProperty.get();
-
- final String prefixedKey = Neo4jVertexProperty.VERTEX_PROPERTY_PREFIX.concat(key);
- if (this.getBaseVertex().hasProperty(key)) {
- if (this.getBaseVertex().getProperty(key).equals(Neo4jVertexProperty.VERTEX_PROPERTY_TOKEN)) {
- final Node node = this.graph.getBaseGraph().createNode(Neo4jVertexProperty.VERTEX_PROPERTY_LABEL, DynamicLabel.label(key));
- node.setProperty(T.key.getAccessor(), key);
- node.setProperty(T.value.getAccessor(), value);
- this.getBaseVertex().createRelationshipTo(node, DynamicRelationshipType.withName(prefixedKey));
- final Neo4jVertexProperty<V> property = new Neo4jVertexProperty<>(this, node);
- ElementHelper.attachProperties(property, keyValues); // TODO: make this inlined
- return property;
- } else {
- Node node = this.graph.getBaseGraph().createNode(Neo4jVertexProperty.VERTEX_PROPERTY_LABEL, DynamicLabel.label(key));
- node.setProperty(T.key.getAccessor(), key);
- node.setProperty(T.value.getAccessor(), this.getBaseVertex().removeProperty(key));
- this.getBaseVertex().createRelationshipTo(node, DynamicRelationshipType.withName(prefixedKey));
- this.getBaseVertex().setProperty(key, Neo4jVertexProperty.VERTEX_PROPERTY_TOKEN);
- node = this.graph.getBaseGraph().createNode(Neo4jVertexProperty.VERTEX_PROPERTY_LABEL, DynamicLabel.label(key));
- node.setProperty(T.key.getAccessor(), key);
- node.setProperty(T.value.getAccessor(), value);
- this.getBaseVertex().createRelationshipTo(node, DynamicRelationshipType.withName(prefixedKey));
- final Neo4jVertexProperty<V> property = new Neo4jVertexProperty<>(this, node);
- ElementHelper.attachProperties(property, keyValues); // TODO: make this inlined
- return property;
- }
- } else {
- this.getBaseVertex().setProperty(key, value);
- final Neo4jVertexProperty<V> property = new Neo4jVertexProperty<>(this, key, value);
- ElementHelper.attachProperties(property, keyValues); // TODO: make this inlined
- return property;
- }
- }
- } catch (IllegalArgumentException iae) {
- throw Property.Exceptions.dataTypeOfPropertyValueNotSupported(value);
- }
- }
-
- @Override
- public void remove() {
- if (this.removed) throw Element.Exceptions.elementAlreadyRemoved(Vertex.class, this.getBaseVertex().getId());
- this.removed = true;
- this.graph.tx().readWrite();
- try {
- final Node node = this.getBaseVertex();
- for (final Relationship relationship : node.getRelationships(org.neo4j.graphdb.Direction.BOTH)) {
- final Node otherNode = relationship.getOtherNode(node);
- if (otherNode.hasLabel(Neo4jVertexProperty.VERTEX_PROPERTY_LABEL)) {
- otherNode.getRelationships().forEach(Relationship::delete);
- otherNode.delete(); // meta property node
- } else
- relationship.delete();
- }
- node.delete();
- } catch (final NotFoundException ignored) {
- // this one happens if the vertex is committed
- } catch (final IllegalStateException ignored) {
- // this one happens if the vertex is still chilling in the tx
- }
- }
-
- @Override
- public Edge addEdge(final String label, final Vertex inVertex, final Object... keyValues) {
- if (null == inVertex) throw Graph.Exceptions.argumentCanNotBeNull("vertex");
- if (this.removed) throw Element.Exceptions.elementAlreadyRemoved(Vertex.class, this.getBaseVertex().getId());
- ElementHelper.validateLabel(label);
- ElementHelper.legalPropertyKeyValueArray(keyValues);
- if (ElementHelper.getIdValue(keyValues).isPresent())
- throw Edge.Exceptions.userSuppliedIdsNotSupported();
-
- this.graph.tx().readWrite();
- final Node node = (Node) this.baseElement;
- final Neo4jEdge edge = new Neo4jEdge(node.createRelationshipTo(((Neo4jVertex) inVertex).getBaseVertex(),
- DynamicRelationshipType.withName(label)), this.graph);
- ElementHelper.attachProperties(edge, keyValues);
- return edge;
- }
-
- @Override
- public Node getBaseVertex() {
- return (Node) this.baseElement;
- }
-
- @Override
- public String label() {
- this.graph.tx().readWrite();
- return String.join(LABEL_DELIMINATOR, this.labels());
- }
-
- /////////////// Neo4jVertex Specific Methods for Multi-Label Support ///////////////
- public Set<String> labels() {
- this.graph.tx().readWrite();
- final Set<String> labels = new TreeSet<>();
- final Iterator<String> itty = IteratorUtils.map(this.getBaseVertex().getLabels().iterator(), Label::name);
- while (itty.hasNext()) {
- labels.add(itty.next());
- }
- return Collections.unmodifiableSet(labels);
- }
-
- public void addLabel(final String label) {
- this.graph.tx().readWrite();
- this.getBaseVertex().addLabel(DynamicLabel.label(label));
- }
-
- public void removeLabel(final String label) {
- this.graph.tx().readWrite();
- this.getBaseVertex().removeLabel(DynamicLabel.label(label));
- }
- //////////////////////////////////////////////////////////////////////////////////////
-
- @Override
- public String toString() {
- return StringFactory.vertexString(this);
- }
-
- @Override
- public Iterator<Vertex> vertices(final Direction direction, final String... edgeLabels) {
- this.graph.tx().readWrite();
- return new Iterator<Vertex>() {
- final Iterator<Relationship> relationshipIterator = IteratorUtils.filter(0 == edgeLabels.length ?
- getBaseVertex().getRelationships(Neo4jHelper.mapDirection(direction)).iterator() :
- getBaseVertex().getRelationships(Neo4jHelper.mapDirection(direction), Neo4jHelper.mapEdgeLabels(edgeLabels)).iterator(), r -> !r.getType().name().startsWith(Neo4jVertexProperty.VERTEX_PROPERTY_PREFIX));
-
- @Override
- public boolean hasNext() {
- return this.relationshipIterator.hasNext();
- }
-
- @Override
- public Neo4jVertex next() {
- return new Neo4jVertex(this.relationshipIterator.next().getOtherNode(getBaseVertex()), graph);
- }
- };
- }
-
- @Override
- public Iterator<Edge> edges(final Direction direction, final String... edgeLabels) {
- this.graph.tx().readWrite();
- return new Iterator<Edge>() {
- final Iterator<Relationship> relationshipIterator = IteratorUtils.filter(0 == edgeLabels.length ?
- getBaseVertex().getRelationships(Neo4jHelper.mapDirection(direction)).iterator() :
- getBaseVertex().getRelationships(Neo4jHelper.mapDirection(direction), Neo4jHelper.mapEdgeLabels(edgeLabels)).iterator(), r -> !r.getType().name().startsWith(Neo4jVertexProperty.VERTEX_PROPERTY_PREFIX));
-
- @Override
- public boolean hasNext() {
- return this.relationshipIterator.hasNext();
- }
-
- @Override
- public Neo4jEdge next() {
- return new Neo4jEdge(this.relationshipIterator.next(), graph);
- }
- };
- }
-
- @Override
- public <V> Iterator<VertexProperty<V>> properties(final String... propertyKeys) {
- this.graph.tx().readWrite();
- return StreamFactory.stream(getBaseVertex().getPropertyKeys())
- .filter(key -> ElementHelper.keyExists(key, propertyKeys))
- .flatMap(key -> {
- if (getBaseVertex().getProperty(key).equals(Neo4jVertexProperty.VERTEX_PROPERTY_TOKEN))
- return StreamFactory.stream(getBaseVertex().getRelationships(org.neo4j.graphdb.Direction.OUTGOING, DynamicRelationshipType.withName(Neo4jVertexProperty.VERTEX_PROPERTY_PREFIX.concat(key))))
- .map(relationship -> (VertexProperty<V>) new Neo4jVertexProperty(Neo4jVertex.this, relationship.getEndNode()));
- else
- return Stream.of(new Neo4jVertexProperty<>(Neo4jVertex.this, key, (V) this.getBaseVertex().getProperty(key)));
- }).iterator();
- }
-
- private boolean existsInNeo4j(final String key) {
- try {
- return this.getBaseVertex().hasProperty(key);
- } catch (IllegalStateException | NotFoundException ex) {
- // if vertex is removed before/after transaction close
- throw Element.Exceptions.elementAlreadyRemoved(Vertex.class, this.id());
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c2240066/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jVertexProperty.java
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jVertexProperty.java b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jVertexProperty.java
deleted file mode 100644
index c665c0b..0000000
--- a/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jVertexProperty.java
+++ /dev/null
@@ -1,211 +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.neo4j.structure;
-
-import org.apache.tinkerpop.gremlin.process.traversal.T;
-import org.apache.tinkerpop.gremlin.structure.Element;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.structure.Property;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.structure.util.ElementHelper;
-import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
-import org.apache.tinkerpop.gremlin.structure.util.wrapped.WrappedVertex;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.neo4j.graphdb.Direction;
-import org.neo4j.graphdb.DynamicLabel;
-import org.neo4j.graphdb.DynamicRelationshipType;
-import org.neo4j.graphdb.Label;
-import org.neo4j.graphdb.Node;
-import org.neo4j.graphdb.NotFoundException;
-import org.neo4j.graphdb.Relationship;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.NoSuchElementException;
-import java.util.Set;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- */
-public class Neo4jVertexProperty<V> implements VertexProperty<V>, WrappedVertex<Node> {
-
- public static final Label VERTEX_PROPERTY_LABEL = DynamicLabel.label("vertexProperty");
- public static final String VERTEX_PROPERTY_PREFIX = Graph.Hidden.hide("");
- public static final String VERTEX_PROPERTY_TOKEN = Graph.Hidden.hide("vertexProperty");
-
-
- private Node node;
- private final Neo4jVertex vertex;
- private final String key;
- private final V value;
-
-
- public Neo4jVertexProperty(final Neo4jVertex vertex, final String key, final V value) {
- this.vertex = vertex;
- this.key = key;
- this.value = value;
- this.node = null;
- }
-
- public Neo4jVertexProperty(final Neo4jVertex vertex, final Node node) {
- this.vertex = vertex;
- this.node = node;
- this.key = (String) node.getProperty(T.key.getAccessor());
- this.value = (V) node.getProperty(T.value.getAccessor());
- }
-
- @Override
- public Vertex element() {
- return this.vertex;
- }
-
- @Override
- public Object id() {
- // TODO: Neo4j needs a better ID system for VertexProperties
- return (long) (this.key.hashCode() + this.value.hashCode() + this.vertex.id().hashCode());
- }
-
- @Override
- public boolean equals(final Object object) {
- return ElementHelper.areEqual(this, object);
- }
-
- @Override
- public int hashCode() {
- return ElementHelper.hashCode((Element) this);
- }
-
- @Override
- public Node getBaseVertex() {
- return this.node;
- }
-
- @Override
- public <U> Property<U> property(String key, U value) {
- if (!this.vertex.graph.supportsMetaProperties)
- throw VertexProperty.Exceptions.metaPropertiesNotSupported();
-
- ElementHelper.validateProperty(key, value);
- this.vertex.graph.tx().readWrite();
- if (isNode()) {
- this.node.setProperty(key, value);
- return new Neo4jProperty<>(this, key, value);
- } else {
- this.node = this.vertex.graph.getBaseGraph().createNode(VERTEX_PROPERTY_LABEL, DynamicLabel.label(this.label()));
- this.node.setProperty(T.key.getAccessor(), this.key);
- this.node.setProperty(T.value.getAccessor(), this.value);
- this.node.setProperty(key, value);
- this.vertex.getBaseVertex().createRelationshipTo(this.node, DynamicRelationshipType.withName(VERTEX_PROPERTY_PREFIX.concat(this.key)));
- this.vertex.getBaseVertex().setProperty(this.key, VERTEX_PROPERTY_TOKEN);
- return new Neo4jProperty<>(this, key, value);
- }
- }
-
- @Override
- public <U> Property<U> property(final String key) {
- if (!this.vertex.graph.supportsMetaProperties)
- throw VertexProperty.Exceptions.metaPropertiesNotSupported();
-
- this.vertex.graph.tx().readWrite();
- try {
- if (isNode() && this.node.hasProperty(key))
- return new Neo4jProperty<>(this, key, (U) this.node.getProperty(key));
- else
- return Property.empty();
- } catch (IllegalStateException | NotFoundException ex) {
- throw Element.Exceptions.elementAlreadyRemoved(this.getClass(), this.id());
- }
- }
-
- @Override
- public String key() {
- return this.key;
- }
-
- @Override
- public V value() throws NoSuchElementException {
- return this.value;
- }
-
- @Override
- public Set<String> keys() {
- if (!this.vertex.graph.supportsMetaProperties)
- throw VertexProperty.Exceptions.metaPropertiesNotSupported();
-
- if (isNode()) {
- this.vertex.graph.tx().readWrite();
- final Set<String> keys = new HashSet<>();
- for (final String key : this.node.getPropertyKeys()) {
- if (!Graph.Hidden.isHidden(key))
- keys.add(key);
- }
- return keys;
- } else {
- return Collections.emptySet();
- }
- }
-
- @Override
- public boolean isPresent() {
- return null != this.value;
- }
-
- @Override
- public void remove() {
- this.vertex.graph.tx().readWrite();
- if (!this.vertex.graph.supportsMetaProperties) {
- if (this.vertex.getBaseVertex().hasProperty(this.key))
- this.vertex.getBaseVertex().removeProperty(this.key);
- } else {
- if (isNode()) {
- this.node.getRelationships().forEach(Relationship::delete);
- this.node.delete();
- if (this.vertex.getBaseVertex().getDegree(DynamicRelationshipType.withName(VERTEX_PROPERTY_PREFIX.concat(this.key)), Direction.OUTGOING) == 0) {
- if (this.vertex.getBaseVertex().hasProperty(this.key))
- this.vertex.getBaseVertex().removeProperty(this.key);
- }
- } else {
- if (this.vertex.getBaseVertex().getDegree(DynamicRelationshipType.withName(VERTEX_PROPERTY_PREFIX.concat(this.key)), Direction.OUTGOING) == 0) {
- if (this.vertex.getBaseVertex().hasProperty(this.key))
- this.vertex.getBaseVertex().removeProperty(this.key);
- }
- }
- }
- }
-
- private boolean isNode() {
- return null != this.node;
- }
-
- @Override
- public String toString() {
- return StringFactory.propertyString(this);
- }
-
- @Override
- public <U> Iterator<Property<U>> properties(final String... propertyKeys) {
- if (!isNode()) return Collections.emptyIterator();
- else {
- this.vertex.graph().tx().readWrite();
- return IteratorUtils.map(IteratorUtils.filter(this.node.getPropertyKeys().iterator(), key -> !key.equals(T.key.getAccessor()) && !key.equals(T.value.getAccessor()) && ElementHelper.keyExists(key, propertyKeys)), key -> (Property<U>) new Neo4jProperty<>(Neo4jVertexProperty.this, key, (V) this.node.getProperty(key)));
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c2240066/neo4j-gremlin/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin b/neo4j-gremlin/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin
deleted file mode 100644
index f4cbea8..0000000
--- a/neo4j-gremlin/src/main/resources/META-INF/services/org.apache.tinkerpop.gremlin.groovy.plugin.GremlinPlugin
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.tinkerpop.gremlin.neo4j.groovy.plugin.Neo4jGremlinPlugin
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c2240066/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/AbstractNeo4jGraphProvider.java
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/AbstractNeo4jGraphProvider.java b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/AbstractNeo4jGraphProvider.java
deleted file mode 100644
index 1aa6118..0000000
--- a/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/AbstractNeo4jGraphProvider.java
+++ /dev/null
@@ -1,156 +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.neo4j;
-
-import org.apache.tinkerpop.gremlin.AbstractGraphProvider;
-import org.apache.tinkerpop.gremlin.LoadGraphWith;
-import org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jEdge;
-import org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jElement;
-import org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jGraph;
-import org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jGraphVariables;
-import org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jProperty;
-import org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jVertex;
-import org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jVertexProperty;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.commons.configuration.Configuration;
-import org.neo4j.graphdb.DynamicLabel;
-
-import java.io.File;
-import java.util.HashSet;
-import java.util.Random;
-import java.util.Set;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public abstract class AbstractNeo4jGraphProvider extends AbstractGraphProvider {
- private static final Set<Class> IMPLEMENTATIONS = new HashSet<Class>() {{
- add(Neo4jEdge.class);
- add(Neo4jElement.class);
- add(Neo4jGraph.class);
- add(Neo4jGraphVariables.class);
- add(Neo4jProperty.class);
- add(Neo4jVertex.class);
- add(Neo4jVertexProperty.class);
- }};
-
- @Override
- public void clear(final Graph graph, final Configuration configuration) throws Exception {
- if (null != graph) {
- if (graph.features().graph().supportsTransactions() && graph.tx().isOpen())
- graph.tx().rollback();
- graph.close();
- }
-
- if (configuration.containsKey("gremlin.neo4j.directory")) {
- // this is a non-in-sideEffects configuration so blow away the directory
- final File graphDirectory = new File(configuration.getString("gremlin.neo4j.directory"));
- deleteDirectory(graphDirectory);
- }
- }
-
- @Override
- public void loadGraphData(final Graph graph, final LoadGraphWith loadGraphWith, final Class testClass, final String testName) {
- if (loadGraphWith != null) this.createIndices((Neo4jGraph) graph, loadGraphWith.value());
- super.loadGraphData(graph, loadGraphWith, testClass, testName);
- }
-
- private void createIndices(final Neo4jGraph g, final LoadGraphWith.GraphData graphData) {
- final Random random = new Random();
- final int pick = random.nextInt(3);
- //final int pick = 2;
- if (graphData.equals(LoadGraphWith.GraphData.GRATEFUL)) {
- if (pick == 1) {
- g.tx().readWrite();
- if (random.nextBoolean())
- g.getBaseGraph().schema().indexFor(DynamicLabel.label("artist")).on("name").create();
- if (random.nextBoolean())
- g.getBaseGraph().schema().indexFor(DynamicLabel.label("song")).on("name").create();
- if (random.nextBoolean())
- g.getBaseGraph().schema().indexFor(DynamicLabel.label("song")).on("songType").create();
- if (random.nextBoolean())
- g.getBaseGraph().schema().indexFor(DynamicLabel.label("song")).on("performances").create();
- g.tx().commit();
- } else if (pick == 2) {
- g.tx().readWrite();
- g.getBaseGraph().index().getNodeAutoIndexer().setEnabled(true);
- if (random.nextBoolean())
- g.getBaseGraph().index().getNodeAutoIndexer().startAutoIndexingProperty("name");
- if (random.nextBoolean())
- g.getBaseGraph().index().getNodeAutoIndexer().startAutoIndexingProperty("songType");
- if (random.nextBoolean())
- g.getBaseGraph().index().getNodeAutoIndexer().startAutoIndexingProperty("performances");
- g.tx().commit();
- }
- } else if (graphData.equals(LoadGraphWith.GraphData.MODERN)) {
- if (pick == 1) {
- g.tx().readWrite();
- if (random.nextBoolean())
- g.getBaseGraph().schema().indexFor(DynamicLabel.label("person")).on("name").create();
- if (random.nextBoolean())
- g.getBaseGraph().schema().indexFor(DynamicLabel.label("person")).on("age").create();
- if (random.nextBoolean())
- g.getBaseGraph().schema().indexFor(DynamicLabel.label("software")).on("name").create();
- if (random.nextBoolean())
- g.getBaseGraph().schema().indexFor(DynamicLabel.label("software")).on("lang").create();
- g.tx().commit();
- } else if (pick == 2) {
- g.tx().readWrite();
- g.getBaseGraph().index().getNodeAutoIndexer().setEnabled(true);
- if (random.nextBoolean())
- g.getBaseGraph().index().getNodeAutoIndexer().startAutoIndexingProperty("name");
- if (random.nextBoolean())
- g.getBaseGraph().index().getNodeAutoIndexer().startAutoIndexingProperty("age");
- if (random.nextBoolean())
- g.getBaseGraph().index().getNodeAutoIndexer().startAutoIndexingProperty("lang");
- g.tx().commit();
- }
- } else if (graphData.equals(LoadGraphWith.GraphData.CLASSIC)) {
- if (pick == 1) {
- g.tx().readWrite();
- if (random.nextBoolean())
- g.getBaseGraph().schema().indexFor(DynamicLabel.label("vertex")).on("name").create();
- if (random.nextBoolean())
- g.getBaseGraph().schema().indexFor(DynamicLabel.label("vertex")).on("age").create();
- if (random.nextBoolean())
- g.getBaseGraph().schema().indexFor(DynamicLabel.label("vertex")).on("lang").create();
- g.tx().commit();
- } else if (pick == 2) {
- g.tx().readWrite();
- g.getBaseGraph().index().getNodeAutoIndexer().setEnabled(true);
- if (random.nextBoolean())
- g.getBaseGraph().index().getNodeAutoIndexer().startAutoIndexingProperty("name");
- if (random.nextBoolean())
- g.getBaseGraph().index().getNodeAutoIndexer().startAutoIndexingProperty("age");
- if (random.nextBoolean())
- g.getBaseGraph().index().getNodeAutoIndexer().startAutoIndexingProperty("lang");
- g.tx().commit();
- }
- } else {
- // TODO: add CREW work here.
- // TODO: add meta_property indices when meta_property graph is provided
- //throw new RuntimeException("Could not load graph with " + graphData);
- }
- }
-
- @Override
- public Set<Class> getImplementations() {
- return IMPLEMENTATIONS;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c2240066/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/BaseNeo4jGraphTest.java
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/BaseNeo4jGraphTest.java b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/BaseNeo4jGraphTest.java
deleted file mode 100644
index 48fbf4e..0000000
--- a/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/BaseNeo4jGraphTest.java
+++ /dev/null
@@ -1,101 +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.neo4j;
-
-import org.apache.commons.configuration.Configuration;
-import org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jGraph;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.rules.TestName;
-import org.neo4j.tooling.GlobalGraphOperations;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.Consumer;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * This should only be used for Neo4j-specific testing that is not related to the Gremlin test suite.
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class BaseNeo4jGraphTest {
- protected Configuration conf;
- protected final DefaultNeo4jGraphProvider graphProvider = new DefaultNeo4jGraphProvider();
- protected Neo4jGraph graph;
- protected GraphTraversalSource g;
-
- @Rule
- public TestName name = new TestName();
-
- @Before
- public void before() throws Exception {
- // tests that involve legacy indices need legacy indices turned on at startup of the graph.
- final Map<String, Object> neo4jSettings = new HashMap<>();
- if (name.getMethodName().contains("NoMultiProperties"))
- neo4jSettings.put(Neo4jGraph.CONFIG_MULTI_PROPERTIES, false);
- if (name.getMethodName().contains("NoMetaProperties"))
- neo4jSettings.put(Neo4jGraph.CONFIG_META_PROPERTIES, false);
- if (name.getMethodName().contains("Legacy")) {
- neo4jSettings.put("gremlin.neo4j.conf.node_auto_indexing", "true");
- neo4jSettings.put("gremlin.neo4j.conf.relationship_auto_indexing", "true");
- }
-
- this.conf = neo4jSettings.size() == 0 ?
- this.graphProvider.newGraphConfiguration("standard", this.getClass(), name.getMethodName()) :
- this.graphProvider.newGraphConfiguration("standard", this.getClass(), name.getMethodName(), neo4jSettings);
-
- this.graphProvider.clear(this.conf);
- this.graph = Neo4jGraph.open(this.conf);
- this.g = this.graph.traversal();
-
- }
-
- @After
- public void after() throws Exception {
- this.graphProvider.clear(this.graph, this.conf);
- }
-
- protected void tryCommit(final Neo4jGraph g, final Consumer<Neo4jGraph> assertFunction) {
- assertFunction.accept(g);
- if (g.features().graph().supportsTransactions()) {
- g.tx().commit();
- assertFunction.accept(g);
- }
- }
-
- protected static int countIterable(final Iterable iterable) {
- int count = 0;
- for (Object object : iterable) {
- count++;
- }
- return count;
- }
-
- protected static void validateCounts(final Neo4jGraph graph, int gV, int gE, int gN, int gR) {
- assertEquals(gV, IteratorUtils.count(graph.vertices()));
- assertEquals(gE, IteratorUtils.count(graph.edges()));
- assertEquals(gN, countIterable(GlobalGraphOperations.at(graph.getBaseGraph()).getAllNodes()));
- assertEquals(gR, countIterable(GlobalGraphOperations.at(graph.getBaseGraph()).getAllRelationships()));
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c2240066/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/DefaultNeo4jGraphProvider.java
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/DefaultNeo4jGraphProvider.java b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/DefaultNeo4jGraphProvider.java
deleted file mode 100644
index 52d1766..0000000
--- a/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/DefaultNeo4jGraphProvider.java
+++ /dev/null
@@ -1,43 +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.neo4j;
-
-import org.apache.tinkerpop.gremlin.TestHelper;
-import org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jGraph;
-import org.apache.tinkerpop.gremlin.structure.Graph;
-
-import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class DefaultNeo4jGraphProvider extends AbstractNeo4jGraphProvider {
- @Override
- public Map<String, Object> getBaseConfiguration(final String graphName, final Class<?> test, final String testMethodName) {
- return new HashMap<String, Object>() {{
- put(Graph.GRAPH, Neo4jGraph.class.getName());
- put(Neo4jGraph.CONFIG_DIRECTORY, getWorkingDirectory() + File.separator + TestHelper.cleanPathSegment(graphName) + File.separator + TestHelper.cleanPathSegment(testMethodName));
- put(Neo4jGraph.CONFIG_META_PROPERTIES, true);
- put(Neo4jGraph.CONFIG_MULTI_PROPERTIES, true);
- put(Neo4jGraph.CONFIG_CHECK_ELEMENTS_IN_TRANSACTION, true);
- }};
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c2240066/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/NoMetaMultiPropertyNeo4jGraphProvider.java
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/NoMetaMultiPropertyNeo4jGraphProvider.java b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/NoMetaMultiPropertyNeo4jGraphProvider.java
deleted file mode 100644
index c94d6ae..0000000
--- a/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/NoMetaMultiPropertyNeo4jGraphProvider.java
+++ /dev/null
@@ -1,42 +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.neo4j;
-
-import org.apache.tinkerpop.gremlin.TestHelper;
-import org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jGraph;
-
-import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class NoMetaMultiPropertyNeo4jGraphProvider extends AbstractNeo4jGraphProvider {
- @Override
- public Map<String, Object> getBaseConfiguration(final String graphName, final Class<?> test, final String testMethodName) {
- return new HashMap<String, Object>() {{
- put("gremlin.graph", Neo4jGraph.class.getName());
- put(Neo4jGraph.CONFIG_DIRECTORY, getWorkingDirectory() + File.separator + TestHelper.cleanPathSegment(graphName) + File.separator + TestHelper.cleanPathSegment(testMethodName));
- put(Neo4jGraph.CONFIG_META_PROPERTIES, false);
- put(Neo4jGraph.CONFIG_MULTI_PROPERTIES, false);
- put(Neo4jGraph.CONFIG_CHECK_ELEMENTS_IN_TRANSACTION, true);
- }};
- }
-}
[3/3] incubator-tinkerpop git commit: gutted neo4j-gremlin from
master/ as it is a GPL dependency. Also removed from docs.
Posted by ok...@apache.org.
gutted neo4j-gremlin from master/ as it is a GPL dependency. Also removed from docs.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/c2240066
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/c2240066
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/c2240066
Branch: refs/heads/master
Commit: c2240066302121879ae7389768a0682330caab66
Parents: 815a378
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Wed Apr 1 09:04:28 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Wed Apr 1 09:04:28 2015 -0600
----------------------------------------------------------------------
docs/src/implementations.asciidoc | 186 -----
neo4j-gremlin/LICENSE.txt | 687 -----------------
neo4j-gremlin/pom.xml | 203 -----
.../neo4j/groovy/plugin/Neo4jGremlinPlugin.java | 53 --
.../step/sideEffect/Neo4jGraphStep.java | 242 ------
.../step/util/Neo4jCypherIterator.java | 66 --
.../optimization/Neo4jGraphStepStrategy.java | 76 --
.../gremlin/neo4j/structure/Neo4jEdge.java | 88 ---
.../gremlin/neo4j/structure/Neo4jElement.java | 111 ---
.../gremlin/neo4j/structure/Neo4jGraph.java | 600 ---------------
.../neo4j/structure/Neo4jGraphVariables.java | 178 -----
.../gremlin/neo4j/structure/Neo4jHelper.java | 85 ---
.../gremlin/neo4j/structure/Neo4jProperty.java | 99 ---
.../gremlin/neo4j/structure/Neo4jVertex.java | 276 -------
.../neo4j/structure/Neo4jVertexProperty.java | 211 ------
...inkerpop.gremlin.groovy.plugin.GremlinPlugin | 1 -
.../neo4j/AbstractNeo4jGraphProvider.java | 156 ----
.../gremlin/neo4j/BaseNeo4jGraphTest.java | 101 ---
.../neo4j/DefaultNeo4jGraphProvider.java | 43 --
.../NoMetaMultiPropertyNeo4jGraphProvider.java | 42 --
.../neo4j/process/Neo4jCypherStartTest.java | 117 ---
.../process/Neo4jGraphProcessStandardTest.java | 35 -
.../Neo4jGraphGroovyProcessStandardTest.java | 33 -
.../Neo4jGraphStructureStandardTest.java | 34 -
.../gremlin/neo4j/structure/Neo4jGraphTest.java | 740 -------------------
...eo4jGraphStructureStandardIntegrateTest.java | 34 -
pom.xml | 1 -
27 files changed, 4498 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c2240066/docs/src/implementations.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/implementations.asciidoc b/docs/src/implementations.asciidoc
index c9134ca..7a3b092 100644
--- a/docs/src/implementations.asciidoc
+++ b/docs/src/implementations.asciidoc
@@ -424,192 +424,6 @@ IMPORTANT: Each graph vendor will have different mechanism by which indices and
NOTE: TinkerGraph is distributed with Gremlin Server and is therefore automatically available to it for configuration.
-[[neo4j-gremlin]]
-Neo4j-Gremlin
--------------
-
-[source,xml]
-----
-<dependency>
- <groupId>org.apache.tinkerpop</groupId>
- <artifactId>neo4j-gremlin</artifactId>
- <version>x.y.z</version>
-</dependency>
-----
-
-link:http://neotechnology.com[Neo Technology] are the developers of the OLTP-based link:http://neo4j.org[Neo4j graph database].
-
-CAUTION: Unless under a commercial agreement with Neo Technology, Neo4j is licensed as link:http://en.wikipedia.org/wiki/Affero_General_Public_License[AGPL]. Thus, `gremlin-neo4j` (source and binaries) are licensed as such due to their dependency on the Neo4j library. Note that neither the <<gremlin-console,Gremlin Console>> nor <<gremlin-server,Gremlin Server>> distribute with the Neo4j binaries. To access the Neo4j binaries, use the `:install` command to download binaries from link:http://search.maven.org/[Maven Central Repository].
-
-[source,groovy]
-----
-gremlin> :install org.apache.tinkerpop neo4j-gremlin x.y.z
-==>loaded: [org.apache.tinkerpop, neo4j-gremlin, x.y.z]
-gremlin> :plugin use tinkerpop.neo4j
-==>tinkerpop.neo4j activated
-gremlin> g = Neo4jGraph.open('/tmp/neo4j')
-==>neo4jgraph[EmbeddedGraphDatabase [/tmp/neo4j]]
-----
-
-For those leveraging Neo4j High Availability, configure `Neo4jGraph` for "HA mode" by setting the `gremlin.neo4j.ha` flag to `true` in the `Configuration` object passed to `Neo4jGraph.open()`. Note that when the flag is set (by default it is `false`), the `Neo4jGraph` instance expects HA configuration settings to be present. As with embedded Neo4j, HA configuration keys should be prefixed with `gremlin.neo4j.conf`. Please consult Neo4j documentation for more information on link:http://docs.neo4j.org/chunked/stable/ha.html[High Availability] configuration.
-
-IMPORTANT: `Neo4jGraph` supports both meta- and multi-properties (see <<_vertex_properties,vertex properties>>). However, these are implemented by making use of "hidden" Neo4j nodes. For example, when a vertex has multiple "name" properties, each property is a new node (multi-properties) which can have properties attached to it (meta-properties). As such, the underlying representation may become difficult to query directly using another graph language such as Cypher. The default setting is to disable multi- and meta-properties. However, if this feature is desired, then it can be activated via `gremlin.neo4j.metaProperties` and `gremlin.neo4j.multiProperties` configurations being set to `true`. Once the configuration is set, it can not be changed for the lifetime of the graph.
-
-TIP: To host Neo4j in Gremlin Server, the dependencies must first be "installed" or otherwise copied to the Gremlin Server path. The automated method for doing this would be to execute `bin/gremlin-server.sh -i org.apache.tinkerpop neo4j-gremlin x.y.z`.
-
-Indices
-~~~~~~~
-
-Neo4j 2.x supports two types of indices: link:http://docs.neo4j.org/chunked/stable/query-schema-index.html[schema indices] and link:http://docs.neo4j.org/chunked/stable/auto-indexing.html[automatic indices]. Automatic indices have been around since Neo4j 1.x and automatically index an element based on a pre-defined property keys. Schema indices are new to Neo4j 2.x and leverage vertex labels to partition the index space. TinkerPop3 does not provide method interfaces for defining schemas/indices for the underlying graph system. Thus, in order to create indices, the Neo4j API is leveraged.
-
-NOTE: `Neo4jGraph` will attempt to discern which indices to use when executing a traversal of the form `g.V().has()`. The general order of checking is: schema indices, automatic indices, label grouping linear-scan iteration, full linear-scan iteration.
-
-Using Schema Indices
-^^^^^^^^^^^^^^^^^^^^
-
-The Gremlin-Console session below demonstrates schema indices. For more information, please refer to the Neo4j documentation:
-
-* Manipulating schema indices with link:http://docs.neo4j.org/chunked/stable/query-schema-index.html[Cypher].
-* Manipulating schema indices with the Neo4j link:http://docs.neo4j.org/chunked/stable/tutorials-java-embedded-new-index.html[Java API].
-
-[source,groovy]
-gremlin> graph = Neo4jGraph.open('/tmp/neo4j')
-==>neo4jgraph[EmbeddedGraphDatabase [/tmp/neo4j]]
-gremlin> graph.tx().open() // direct Neo4j access requires explicit transaction creation
-==>null
-gremlin> import org.neo4j.graphdb.*
-...
-gremlin> graph.getBaseGraph().schema().indexFor(DynamicLabel.label('person')).on('name').create()
-==>IndexDefinition[label:person, on:name]
-gremlin> graph.tx().commit()
-==>null
-gremlin> graph.addVertex(label,'person','name','marko')
-==>v[0]
-gremlin> graph.addVertex(label,'dog','name','puppy')
-==>v[1]
-gremlin> g = graph.traversal(standard())
-==>graphtraversalsource[neo4jgraph[EmbeddedGraphDatabase [/tmp/neo4j]], standard]
-gremlin> g.V().hasLabel('person').has('name','marko').values('name')
-==>marko
-
-Below demonstrates the runtime benefits of indices and demonstrates how if there is no defined schema index (only vertex labels), a linear scan of the vertex-label partition is still faster than a linear scan of all vertices.
-
-[source,groovy]
-gremlin> graph = Neo4jGraph.open('/tmp/neo4j')
-==>neo4jgraph[EmbeddedGraphDatabase [/tmp/neo4j]]
-gremlin> graph.tx().open()
-==>null
-gremlin> import org.neo4j.graphdb.*
-...
-gremlin> graph.getBaseGraph().schema().indexFor(DynamicLabel.label('artist')).on('name').create() <1>
-==>IndexDefinition[label:artist, on:name]
-gremlin> graph.tx().commit()
-==>null
-gremlin> graph.io().readGraphML('data/grateful-dead.xml')
-==>null
-gremlin> g = graph.traversal(standard())
-==>graphtraversalsource[neo4jgraph[EmbeddedGraphDatabase [/tmp/neo4j]], standard]
-gremlin> clock(1000){g.V().hasLabel('artist').has('name','Garcia').next()} <2>
-==>0.0585639999999997
-gremlin> clock(1000){g.V().has('name','Garcia').next()} <3>
-==>0.6039889999999992
-gremlin> g.getBaseGraph().schema().getIndexes(DynamicLabel.label('artist')).iterator().next().drop() <4>
-==>null
-gremlin> g.tx().commit()
-==>null
-gremlin> clock(1000){g.V().hasLabel('artist').has('name','Garcia').next()} <5>
-==>0.26470499999999936
-gremlin> clock(1000){g.V().has('name','Garcia').next()} <6>
-==>0.6293959999999993
-
-<1> Create a schema index for all artist vertices on their name property.
-<2> Find all artists whose name is Garcia which uses the pre-defined schema index.
-<3> Find all vertices whose name is Garcia which requires a linear scan of all the data in the graph.
-<4> Drop the created index schema.
-<5> Find all artists whose name is Garcia which does a linear scan of the artist vertex-label partition.
-<6> Find all vertices whose name is Garcia which requires a linear scan of all the data in the graph.
-
-
-Using Automatic Indices
-^^^^^^^^^^^^^^^^^^^^^^^
-
-The Gremlin-Console session below demonstrates automatic indices. For more information, please refer to the Neo4j documentation:
-
-* Manipulating automatic indices with the Neo4j link:http://docs.neo4j.org/chunked/stable/auto-indexing.html[Java API].
-
-[source,groovy]
-gremlin> graph = Neo4jGraph.open('/tmp/neo4j')
-==>neo4jgraph[EmbeddedGraphDatabase [/tmp/neo4j]]
-gremlin> graph.getBaseGraph().index().getNodeAutoIndexer().startAutoIndexingProperty('name')
-==>null
-gremlin> graph.getBaseGraph().index().getNodeAutoIndexer().setEnabled(true)
-==>null
-gremlin> graph.addVertex(label,'person','name','marko')
-==>v[0]
-gremlin> graph.addVertex(label,'dog','name','puppy')
-==>v[1]
-gremlin> g = graph.traversal(standard())
-==>graphtraversalsource[neo4jgraph[EmbeddedGraphDatabase [/tmp/neo4j]], standard]
-gremlin> g.V().hasLabel('person').has('name','marko').values('name')
-==>marko
-
-WARNING: The preferred method for dealing with automatic indices in Neo4j is via `Neo4jGraph.open()` configuration as opposed to runtime updating as demonstrated above. This is because with runtime updating, index information is not propagated across Neo4j connections.
-
-Cypher
-~~~~~~
-
-image::gremlin-loves-cypher.png[width=400]
-
-NeoTechnology are the creators of the graph pattern-match query language link:http://www.neo4j.org/learn/cypher[Cypher]. It is possible to leverage Cypher from within Gremlin by using the `Neo4jGraph.cypher()` graph traversal method.
-
-[source,groovy]
-gremlin> graph = Neo4jGraph.open('/tmp/neo4j')
-==>neo4jgraph[EmbeddedGraphDatabase [/tmp/neo4j]]
-gremlin> graph.io().readGryo('data/tinkerpop-modern.kryo')
-==>null
-gremlin> graph.cypher('MATCH (a {name:"marko"}) RETURN a')
-==>[a:v[0]]
-gremlin> graph.cypher('MATCH (a {name:"marko"}) RETURN a').select('a').out('knows').values('name')
-==>vadas
-==>josh
-
-Thus, like <<match-step,`match()`>> in Gremlin, it is possible to do a declarative pattern match and then move back into imperative Gremlin.
-
-IMPORTANT: For those developers using <<gremlin-server,Gremlin Server>> against Neo4j, it is possible to do Cypher queries by simply placing the Cypher string in `g.cypher(...)` before submission to the server.
-
-Multi-Label
-~~~~~~~~~~~
-
-TinkerPop3 requires every `Element` to have a single string label (i.e. a `Vertex`, `Edge`, and `VertexProperty`). In Neo4j, a `Node` (vertex) can have an link:http://neo4j.com/docs/stable/graphdb-neo4j-labels.html[arbitrary number of labels] while a `Relationship` (edge) can have one and only one. Furthermore, in Neo4j, `Node` labels are mutable while `Relationship` labels are not. In order to handle this mismatch, three `Neo4jVertex` specific methods exist in Neo4j-Gremlin.
-
-[source,java]
-public Set<String> labels() // get all the labels of the vertex
-public void addLabel(final String label) // add a label to the vertex
-public void removeLabel(final String label) // remove a label from the vertex
-
-An example use case is presented below.
-
-[source,java]
-----
-Neo4jVertex v = (Neo4jVertex) graph.addVertex("human::animal");
-assertEquals("animal::human",v.label()) // standard Vertex.label() method (note that labels are alphabetically sorted)
-assertEquals(2, v.labels().size()) // specific Neo4jVertex.labels() method
-assertTrue(v.labels().contains("human"))
-assertTrue(v.labels().contains("animal"))
-
-v.addLabel("organism") // specific Neo4jVertex.addLabel() method
-v.removeLabel("human") // specific Neo4jVertex.removeLabel() method
-assertEquals(2, v.labels().size()) // specific Neo4jVertex.labels() method
-assertTrue(v.labels().contains("animal"))
-assertTrue(v.labels().contains("organism"))
-
-v.addLabel("organism") // add a repeat
-v.addLabel("human") // remove a label that doesn't exist
-assertEquals(2, v.labels().size()) // specific Neo4jVertex.labels() method
-assertTrue(v.labels().contains("animal"))
-assertTrue(v.labels().contains("organism"))
-----
-
[[hadoop-gremlin]]
Hadoop-Gremlin
--------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c2240066/neo4j-gremlin/LICENSE.txt
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/LICENSE.txt b/neo4j-gremlin/LICENSE.txt
deleted file mode 100644
index 4399c41..0000000
--- a/neo4j-gremlin/LICENSE.txt
+++ /dev/null
@@ -1,687 +0,0 @@
-======================= NOTES ON GNU LICENSE ========================
-
-Neo4j software is licensed as AGPL. However, if you have executed an
-End User Software License and Services Agreement or an OEM Software
-License and Support Services Agreement, or another commercial license
-agreement with Neo Technology or one of its affiliates (each, a
-"Commercial Agreement"), the terms of the license in such Commercial
-Agreement will supersede the GNU GENERAL PUBLIC LICENSE Version 3 and
-you may use the Software solely pursuant to the terms of the relevant
-Commercial Agreement.
-
-=====================================================================
-
- GNU GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
- The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works. By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users. We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors. You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
- To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights. Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received. You must make sure that they, too, receive
-or can get the source code. And you must show them these terms so they
-know their rights.
-
- Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
- For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software. For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
- Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so. This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software. The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable. Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products. If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
- Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary. To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- TERMS AND CONDITIONS
-
- 0. Definitions.
-
- "This License" refers to version 3 of the GNU General Public License.
-
- "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
- "The Program" refers to any copyrightable work licensed under this
-License. Each licensee is addressed as "you". "Licensees" and
-"recipients" may be individuals or organizations.
-
- To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy. The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
- A "covered work" means either the unmodified Program or a work based
-on the Program.
-
- To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy. Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
- To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies. Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
- An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License. If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
- 1. Source Code.
-
- The "source code" for a work means the preferred form of the work
-for making modifications to it. "Object code" means any non-source
-form of a work.
-
- A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
- The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form. A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
- The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities. However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work. For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
- The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
- The Corresponding Source for a work in source code form is that
-same work.
-
- 2. Basic Permissions.
-
- All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met. This License explicitly affirms your unlimited
-permission to run the unmodified Program. The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work. This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
- You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force. You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright. Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
- Conveying under any other circumstances is permitted solely under
-the conditions stated below. Sublicensing is not allowed; section 10
-makes it unnecessary.
-
- 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
- No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
- When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
- 4. Conveying Verbatim Copies.
-
- You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
- You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
- 5. Conveying Modified Source Versions.
-
- You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
- a) The work must carry prominent notices stating that you modified
- it, and giving a relevant date.
-
- b) The work must carry prominent notices stating that it is
- released under this License and any conditions added under section
- 7. This requirement modifies the requirement in section 4 to
- "keep intact all notices".
-
- c) You must license the entire work, as a whole, under this
- License to anyone who comes into possession of a copy. This
- License will therefore apply, along with any applicable section 7
- additional terms, to the whole of the work, and all its parts,
- regardless of how they are packaged. This License gives no
- permission to license the work in any other way, but it does not
- invalidate such permission if you have separately received it.
-
- d) If the work has interactive user interfaces, each must display
- Appropriate Legal Notices; however, if the Program has interactive
- interfaces that do not display Appropriate Legal Notices, your
- work need not make them do so.
-
- A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit. Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
- 6. Conveying Non-Source Forms.
-
- You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
- a) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by the
- Corresponding Source fixed on a durable physical medium
- customarily used for software interchange.
-
- b) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by a
- written offer, valid for at least three years and valid for as
- long as you offer spare parts or customer support for that product
- model, to give anyone who possesses the object code either (1) a
- copy of the Corresponding Source for all the software in the
- product that is covered by this License, on a durable physical
- medium customarily used for software interchange, for a price no
- more than your reasonable cost of physically performing this
- conveying of source, or (2) access to copy the
- Corresponding Source from a network server at no charge.
-
- c) Convey individual copies of the object code with a copy of the
- written offer to provide the Corresponding Source. This
- alternative is allowed only occasionally and noncommercially, and
- only if you received the object code with such an offer, in accord
- with subsection 6b.
-
- d) Convey the object code by offering access from a designated
- place (gratis or for a charge), and offer equivalent access to the
- Corresponding Source in the same way through the same place at no
- further charge. You need not require recipients to copy the
- Corresponding Source along with the object code. If the place to
- copy the object code is a network server, the Corresponding Source
- may be on a different server (operated by you or a third party)
- that supports equivalent copying facilities, provided you maintain
- clear directions next to the object code saying where to find the
- Corresponding Source. Regardless of what server hosts the
- Corresponding Source, you remain obligated to ensure that it is
- available for as long as needed to satisfy these requirements.
-
- e) Convey the object code using peer-to-peer transmission, provided
- you inform other peers where the object code and Corresponding
- Source of the work are being offered to the general public at no
- charge under subsection 6d.
-
- A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
- A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling. In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage. For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product. A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
- "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source. The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
- If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information. But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
- The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed. Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
- Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
- 7. Additional Terms.
-
- "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law. If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
- When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it. (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.) You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
- Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
- a) Disclaiming warranty or limiting liability differently from the
- terms of sections 15 and 16 of this License; or
-
- b) Requiring preservation of specified reasonable legal notices or
- author attributions in that material or in the Appropriate Legal
- Notices displayed by works containing it; or
-
- c) Prohibiting misrepresentation of the origin of that material, or
- requiring that modified versions of such material be marked in
- reasonable ways as different from the original version; or
-
- d) Limiting the use for publicity purposes of names of licensors or
- authors of the material; or
-
- e) Declining to grant rights under trademark law for use of some
- trade names, trademarks, or service marks; or
-
- f) Requiring indemnification of licensors and authors of that
- material by anyone who conveys the material (or modified versions of
- it) with contractual assumptions of liability to the recipient, for
- any liability that these contractual assumptions directly impose on
- those licensors and authors.
-
- All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10. If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term. If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
- If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
- Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
- 8. Termination.
-
- You may not propagate or modify a covered work except as expressly
-provided under this License. Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
- However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
- Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
- Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License. If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
- 9. Acceptance Not Required for Having Copies.
-
- You are not required to accept this License in order to receive or
-run a copy of the Program. Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance. However,
-nothing other than this License grants you permission to propagate or
-modify any covered work. These actions infringe copyright if you do
-not accept this License. Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
- 10. Automatic Licensing of Downstream Recipients.
-
- Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License. You are not responsible
-for enforcing compliance by third parties with this License.
-
- An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations. If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
- You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License. For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
- 11. Patents.
-
- A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based. The
-work thus licensed is called the contributor's "contributor version".
-
- A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version. For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
- Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
- In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement). To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
- If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients. "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
- If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
- A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License. You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
- Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
- 12. No Surrender of Others' Freedom.
-
- If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all. For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
- 13. Use with the GNU Affero General Public License.
-
- Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work. The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
- 14. Revised Versions of this License.
-
- The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
- Each version is given a distinguishing version number. If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation. If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
- If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
- Later license versions may give you additional or different
-permissions. However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
- 15. Disclaimer of Warranty.
-
- THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. Limitation of Liability.
-
- IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
- 17. Interpretation of Sections 15 and 16.
-
- If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
- If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
- <program> Copyright (C) <year> <name of author>
- This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
- You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
- The GNU General Public License does not permit incorporating your program
-into proprietary programs. If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License. But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c2240066/neo4j-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/pom.xml b/neo4j-gremlin/pom.xml
deleted file mode 100644
index 59c0e07..0000000
--- a/neo4j-gremlin/pom.xml
+++ /dev/null
@@ -1,203 +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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tinkerpop</groupId>
- <artifactId>tinkerpop</artifactId>
- <version>3.0.0-SNAPSHOT</version>
- </parent>
- <artifactId>neo4j-gremlin</artifactId>
- <name>Neo4j Gremlin: An Implementation of TinkerPop3 for the Neo4j Graph Database</name>
- <properties>
- <neo4j.version>2.1.6</neo4j.version>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.tinkerpop</groupId>
- <artifactId>gremlin-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tinkerpop</groupId>
- <artifactId>gremlin-groovy</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.neo4j</groupId>
- <artifactId>neo4j</artifactId>
- <version>${neo4j.version}</version>
- <exclusions>
- <!-- neo4j self-conflicts -->
- <exclusion>
- <groupId>org.neo4j</groupId>
- <artifactId>neo4j-lucene-index</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.neo4j</groupId>
- <artifactId>neo4j-kernel</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-library</artifactId>
- </exclusion>
- <exclusion>
- <groupId>net.sf.opencsv</groupId>
- <artifactId>opencsv</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.neo4j</groupId>
- <artifactId>neo4j-graph-matching</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.neo4j</groupId>
- <artifactId>neo4j-graph-algo</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.neo4j</groupId>
- <artifactId>neo4j-ha</artifactId>
- <version>${neo4j.version}</version>
- <exclusions>
- <!-- conflicts with gremlin-core -->
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.neo4j</groupId>
- <artifactId>neo4j-management</artifactId>
- <version>${neo4j.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tinkerpop</groupId>
- <artifactId>gremlin-test</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tinkerpop</groupId>
- <artifactId>gremlin-groovy-test</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <!-- explicit Neo4j dependencies, needed due to internal Neo4j version conflicts.
- Bump the versions here when the Neo4j version is bumped. -->
- <dependency>
- <groupId>org.neo4j</groupId>
- <artifactId>neo4j-graph-matching</artifactId>
- <version>${neo4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.neo4j</groupId>
- <artifactId>neo4j-graph-algo</artifactId>
- <version>${neo4j.version}</version>
- </dependency>
- <dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-library</artifactId>
- <version>2.10.4</version>
- </dependency>
- <dependency>
- <groupId>net.sf.opencsv</groupId>
- <artifactId>opencsv</artifactId>
- <version>2.3</version>
- </dependency>
-
- </dependencies>
- <build>
- <directory>${basedir}/target</directory>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources
- </directory>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.gmavenplus</groupId>
- <artifactId>gmavenplus-plugin</artifactId>
- <version>1.2</version>
- <executions>
- <execution>
- <goals>
- <goal>addSources</goal>
- <goal>addTestSources</goal>
- <goal>generateStubs</goal>
- <goal>compile</goal>
- <goal>testGenerateStubs</goal>
- <goal>testCompile</goal>
- <goal>removeStubs</goal>
- <goal>removeTestStubs</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <invokeDynamic>true</invokeDynamic>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <profiles>
- <profile>
- <id>lucky</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- <property>
- <name>feelingLucky</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>true</skipTests>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <configuration>
- <skipTests>true</skipTests>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c2240066/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/groovy/plugin/Neo4jGremlinPlugin.java
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/groovy/plugin/Neo4jGremlinPlugin.java b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/groovy/plugin/Neo4jGremlinPlugin.java
deleted file mode 100644
index 306917d..0000000
--- a/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/groovy/plugin/Neo4jGremlinPlugin.java
+++ /dev/null
@@ -1,53 +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.neo4j.groovy.plugin;
-
-import org.apache.tinkerpop.gremlin.groovy.plugin.AbstractGremlinPlugin;
-import org.apache.tinkerpop.gremlin.groovy.plugin.IllegalEnvironmentException;
-import org.apache.tinkerpop.gremlin.groovy.plugin.PluginAcceptor;
-import org.apache.tinkerpop.gremlin.groovy.plugin.PluginInitializationException;
-import org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jGraph;
-
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class Neo4jGremlinPlugin extends AbstractGremlinPlugin {
-
- private static final Set<String> IMPORTS = new HashSet<String>() {{
- add(IMPORT_SPACE + Neo4jGraph.class.getPackage().getName() + DOT_STAR);
- }};
-
- @Override
- public String getName() {
- return "tinkerpop.neo4j";
- }
-
- @Override
- public void pluginTo(final PluginAcceptor pluginAcceptor) throws PluginInitializationException, IllegalEnvironmentException {
- pluginAcceptor.addImports(IMPORTS);
- }
-
- @Override
- public void afterPluginTo(final PluginAcceptor pluginAcceptor) throws IllegalEnvironmentException, PluginInitializationException {
-
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c2240066/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/process/traversal/step/sideEffect/Neo4jGraphStep.java
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/process/traversal/step/sideEffect/Neo4jGraphStep.java b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/process/traversal/step/sideEffect/Neo4jGraphStep.java
deleted file mode 100644
index 697dd83..0000000
--- a/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/process/traversal/step/sideEffect/Neo4jGraphStep.java
+++ /dev/null
@@ -1,242 +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.neo4j.process.traversal.step.sideEffect;
-
-import org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jEdge;
-import org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jGraph;
-import org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jVertex;
-import org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jVertexProperty;
-import org.apache.tinkerpop.gremlin.process.traversal.T;
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.GraphStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.util.HasContainer;
-import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
-import org.apache.tinkerpop.gremlin.structure.Compare;
-import org.apache.tinkerpop.gremlin.structure.Contains;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Element;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.util.ElementHelper;
-import org.apache.tinkerpop.gremlin.util.StreamFactory;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.javatuples.Pair;
-import org.neo4j.graphdb.Direction;
-import org.neo4j.graphdb.DynamicLabel;
-import org.neo4j.graphdb.Node;
-import org.neo4j.graphdb.ResourceIterator;
-import org.neo4j.graphdb.index.AutoIndexer;
-import org.neo4j.graphdb.schema.IndexDefinition;
-import org.neo4j.tooling.GlobalGraphOperations;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Stream;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- * @author Stephen Mallette (http://stephen.genoprime.com)
- * @author Pieter Martin
- */
-public class Neo4jGraphStep<S extends Element> extends GraphStep<S> {
-
- public final List<HasContainer> hasContainers = new ArrayList<>();
-
- public Neo4jGraphStep(final GraphStep<S> originalGraphStep) {
- super(originalGraphStep.getTraversal(), originalGraphStep.getReturnClass(), originalGraphStep.getIds());
- if (originalGraphStep.getLabel().isPresent())
- this.setLabel(originalGraphStep.getLabel().get());
- //No need to do anything if the first element is an Element, all elements are guaranteed to be an element and will be return as is
- if ((this.ids.length == 0 || !(this.ids[0] instanceof Element)))
- this.setIteratorSupplier(() -> (Iterator<S>) (Vertex.class.isAssignableFrom(this.returnClass) ? this.vertices() : this.edges()));
- }
-
- private Iterator<? extends Edge> edges() {
- final Neo4jGraph graph = (Neo4jGraph) this.getTraversal().getGraph().get();
- graph.tx().readWrite();
- // ids are present, filter on them first
- if (this.ids != null && this.ids.length > 0)
- return IteratorUtils.filter(graph.edges(this.ids), edge -> HasContainer.testAll((Edge) edge, this.hasContainers));
- final HasContainer hasContainer = this.getHasContainerForAutomaticIndex(Edge.class);
- return (null == hasContainer) ?
- IteratorUtils.filter(graph.edges(), edge -> HasContainer.testAll((Edge) edge, this.hasContainers)) :
- getEdgesUsingAutomaticIndex(hasContainer).filter(edge -> HasContainer.testAll((Edge) edge, this.hasContainers)).iterator();
- }
-
- private Iterator<? extends Vertex> vertices() {
- final Neo4jGraph graph = (Neo4jGraph) this.getTraversal().getGraph().get();
- graph.tx().readWrite();
- // ids are present, filter on them first
- if (this.ids != null && this.ids.length > 0)
- return IteratorUtils.filter(graph.vertices(this.ids), vertex -> HasContainer.testAll((Vertex) vertex, this.hasContainers));
- // a label and a property
- final Pair<String, HasContainer> labelHasPair = this.getHasContainerForLabelIndex();
- if (null != labelHasPair)
- return this.getVerticesUsingLabelAndProperty(labelHasPair.getValue0(), labelHasPair.getValue1())
- .filter(vertex -> HasContainer.testAll((Vertex) vertex, this.hasContainers)).iterator();
- // use automatic indices
- final HasContainer hasContainer = this.getHasContainerForAutomaticIndex(Vertex.class);
- if (null != hasContainer)
- return this.getVerticesUsingAutomaticIndex(hasContainer)
- .filter(vertex -> HasContainer.testAll((Vertex) vertex, this.hasContainers)).iterator();
- // only labels
- final List<String> labels = this.getLabels();
- if (null != labels)
- return this.getVerticesUsingOnlyLabels(labels).filter(vertex -> HasContainer.testAll((Vertex) vertex, this.hasContainers)).iterator();
- // linear scan
- return IteratorUtils.filter(graph.vertices(), vertex -> HasContainer.testAll((Vertex) vertex, this.hasContainers));
- }
-
-
- private Stream<Neo4jVertex> getVerticesUsingLabelAndProperty(final String label, final HasContainer hasContainer) {
- //System.out.println("labelProperty: " + label + ":" + hasContainer);
- final Neo4jGraph graph = (Neo4jGraph) this.getTraversal().getGraph().get();
- final ResourceIterator<Node> iterator1 = graph.getBaseGraph().findNodesByLabelAndProperty(DynamicLabel.label(label), hasContainer.key, hasContainer.value).iterator();
- final ResourceIterator<Node> iterator2 = graph.getBaseGraph().findNodesByLabelAndProperty(DynamicLabel.label(hasContainer.key), T.value.getAccessor(), hasContainer.value).iterator();
- final Stream<Neo4jVertex> stream1 = StreamFactory.stream(iterator1)
- .filter(node -> ElementHelper.idExists(node.getId(), this.ids))
- .map(node -> new Neo4jVertex(node, graph));
- final Stream<Neo4jVertex> stream2 = StreamFactory.stream(iterator2)
- .filter(node -> ElementHelper.idExists(node.getId(), this.ids))
- .filter(node -> node.getProperty(T.key.getAccessor()).equals(hasContainer.key))
- .map(node -> node.getRelationships(Direction.INCOMING).iterator().next().getStartNode())
- .map(node -> new Neo4jVertex(node, graph));
- return Stream.concat(stream1, stream2);
- }
-
- private Stream<Neo4jVertex> getVerticesUsingOnlyLabels(final List<String> labels) {
- //System.out.println("labels: " + labels);
- final Neo4jGraph graph = (Neo4jGraph) this.getTraversal().getGraph().get();
- return labels.stream()
- .filter(label -> !label.equals(Neo4jVertexProperty.VERTEX_PROPERTY_LABEL.name()))
- .flatMap(label -> StreamFactory.stream(GlobalGraphOperations.at(graph.getBaseGraph()).getAllNodesWithLabel(DynamicLabel.label(label)).iterator()))
- .filter(node -> !node.hasLabel(Neo4jVertexProperty.VERTEX_PROPERTY_LABEL))
- .filter(node -> ElementHelper.idExists(node.getId(), this.ids))
- .map(node -> new Neo4jVertex(node, graph));
- }
-
- private Stream<Neo4jVertex> getVerticesUsingAutomaticIndex(final HasContainer hasContainer) {
- //System.out.println("automatic index: " + hasContainer);
- final Neo4jGraph graph = (Neo4jGraph) this.getTraversal().getGraph().get();
- return StreamFactory.stream(graph.getBaseGraph().index().getNodeAutoIndexer().getAutoIndex().get(hasContainer.key, hasContainer.value).iterator())
- .map(node -> node.hasLabel(Neo4jVertexProperty.VERTEX_PROPERTY_LABEL) ?
- node.getRelationships(Direction.INCOMING).iterator().next().getStartNode() :
- node)
- .filter(node -> ElementHelper.idExists(node.getId(), this.ids))
- .map(node -> new Neo4jVertex(node, graph));
- }
-
- private Stream<Neo4jEdge> getEdgesUsingAutomaticIndex(final HasContainer hasContainer) {
- final Neo4jGraph graph = (Neo4jGraph) this.getTraversal().getGraph().get();
- return StreamFactory.stream(graph.getBaseGraph().index().getRelationshipAutoIndexer().getAutoIndex().get(hasContainer.key, hasContainer.value).iterator())
- .filter(relationship -> ElementHelper.idExists(relationship.getId(), this.ids))
- .filter(relationship -> !relationship.getType().name().startsWith(Neo4jVertexProperty.VERTEX_PROPERTY_PREFIX))
- .map(relationship -> new Neo4jEdge(relationship, graph));
- }
-
- private Pair<String, HasContainer> getHasContainerForLabelIndex() {
- final Neo4jGraph graph = (Neo4jGraph) this.getTraversal().getGraph().get();
- for (final HasContainer hasContainer : this.hasContainers) {
- if (hasContainer.key.equals(T.label.getAccessor()) && hasContainer.predicate.equals(Compare.eq)) {
- for (final IndexDefinition index : graph.getBaseGraph().schema().getIndexes(DynamicLabel.label((String) hasContainer.value))) {
- for (final HasContainer hasContainer1 : this.hasContainers) {
- if (!hasContainer1.key.equals(T.label.getAccessor()) && hasContainer1.predicate.equals(Compare.eq)) {
- for (final String key : index.getPropertyKeys()) {
- if (key.equals(hasContainer1.key))
- return Pair.with((String) hasContainer.value, hasContainer1);
- }
- }
- }
- }
- }
- }
- return null;
- }
-
- private List<String> getLabels() {
- for (final HasContainer hasContainer : this.hasContainers) {
- if (hasContainer.key.equals(T.label.getAccessor()) && hasContainer.predicate.equals(Compare.eq))
- return Arrays.asList(((String) hasContainer.value));
- else if (hasContainer.key.equals(T.label.getAccessor()) && hasContainer.predicate.equals(Contains.within))
- return new ArrayList<>((Collection<String>) hasContainer.value);
- }
- return null;
- }
-
- private HasContainer getHasContainerForAutomaticIndex(final Class<? extends Element> elementClass) {
- final Neo4jGraph graph = (Neo4jGraph) this.getTraversal().getGraph().get();
- final AutoIndexer<?> indexer = elementClass.equals(Vertex.class) ?
- graph.getBaseGraph().index().getNodeAutoIndexer() :
- graph.getBaseGraph().index().getRelationshipAutoIndexer();
-
- if (!indexer.isEnabled())
- return null;
- final Set<String> indexKeys = indexer.getAutoIndexedProperties();
- for (final HasContainer hasContainer : this.hasContainers) {
- if (hasContainer.predicate.equals(Compare.eq) && indexKeys.contains(hasContainer.key))
- return hasContainer;
- }
- return null;
- }
-
- @Override
- public String toString() {
- if (this.hasContainers.isEmpty())
- return super.toString();
- else
- return 0 == this.ids.length ?
- TraversalHelper.makeStepString(this, this.hasContainers) :
- TraversalHelper.makeStepString(this, Arrays.toString(this.ids), this.hasContainers);
- }
-
- /*private String makeCypherQuery() {
- final StringBuilder builder = new StringBuilder("MATCH node WHERE ");
- int counter = 0;
- for (final HasContainer hasContainer : this.hasContainers) {
- if (hasContainer.key.equals(T.label.getAccessor()) && hasContainer.predicate.equals(Compare.EQUAL)) {
- if (counter++ > 0) builder.append(" AND ");
- builder.append("node:").append(hasContainer.value);
- } else {
- if (counter++ > 0) builder.append(" AND ");
- builder.append("node.").append(hasContainer.key).append(" ");
- if (hasContainer.predicate instanceof Compare) {
- builder.append(((Compare) hasContainer.predicate).asString()).append(" ").append(toStringOfValue(hasContainer.value));
- } else if (hasContainer.predicate.equals(Contains.IN)) {
- builder.append("IN [");
- for (Object object : (Collection) hasContainer.value) {
- builder.append(toStringOfValue(object)).append(",");
- }
- builder.replace(builder.length() - 1, builder.length(), "").append("]");
- }
- }
-
- }
- System.out.println(builder);
- return builder.toString();
- }
-
- private String toStringOfValue(final Object value) {
- if (value instanceof String)
- return "'" + value + "'";
- else return value.toString();
- }*/
-}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c2240066/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/process/traversal/step/util/Neo4jCypherIterator.java
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/process/traversal/step/util/Neo4jCypherIterator.java b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/process/traversal/step/util/Neo4jCypherIterator.java
deleted file mode 100644
index dadf250..0000000
--- a/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/process/traversal/step/util/Neo4jCypherIterator.java
+++ /dev/null
@@ -1,66 +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.neo4j.process.traversal.step.util;
-
-import org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jEdge;
-import org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jGraph;
-import org.apache.tinkerpop.gremlin.neo4j.structure.Neo4jVertex;
-import org.neo4j.graphdb.Node;
-import org.neo4j.graphdb.Relationship;
-import org.neo4j.graphdb.ResourceIterator;
-
-import java.util.Iterator;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class Neo4jCypherIterator<T> implements Iterator<Map<String, T>> {
-
- private final ResourceIterator<Map<String, T>> iterator;
- private final Neo4jGraph graph;
-
- public Neo4jCypherIterator(final ResourceIterator<Map<String, T>> iterator, final Neo4jGraph graph) {
- this.iterator = iterator;
- this.graph = graph;
- }
-
- @Override
- public boolean hasNext() {
- return this.iterator.hasNext();
- }
-
- @Override
- public Map<String, T> next() {
- return this.iterator.next().entrySet().stream().collect(Collectors.toMap(
- Map.Entry::getKey,
- entry -> {
- final T val = entry.getValue();
- if (Node.class.isAssignableFrom(val.getClass())) {
- return (T) new Neo4jVertex((Node) val, this.graph);
- } else if (Relationship.class.isAssignableFrom(val.getClass())) {
- return (T) new Neo4jEdge((Relationship) val, this.graph);
- } else {
- return val;
- }
- }));
- }
-}
-
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c2240066/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/process/traversal/strategy/optimization/Neo4jGraphStepStrategy.java
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/process/traversal/strategy/optimization/Neo4jGraphStepStrategy.java b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/process/traversal/strategy/optimization/Neo4jGraphStepStrategy.java
deleted file mode 100644
index 2ecb24a..0000000
--- a/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/process/traversal/strategy/optimization/Neo4jGraphStepStrategy.java
+++ /dev/null
@@ -1,76 +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.neo4j.process.traversal.strategy.optimization;
-
-import org.apache.tinkerpop.gremlin.neo4j.process.traversal.step.sideEffect.Neo4jGraphStep;
-import org.apache.tinkerpop.gremlin.process.traversal.Step;
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.step.HasContainerHolder;
-import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.GraphStep;
-import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.IdentityStep;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.AbstractTraversalStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
-
-/**
- * @author Pieter Martin
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- */
-public class Neo4jGraphStepStrategy extends AbstractTraversalStrategy {
-
- private static final Neo4jGraphStepStrategy INSTANCE = new Neo4jGraphStepStrategy();
-
- private Neo4jGraphStepStrategy() {
- }
-
- @Override
- public void apply(final Traversal.Admin<?, ?> traversal) {
- if (traversal.getEngine().isComputer())
- return;
-
- final Step<?, ?> startStep = traversal.getStartStep();
- if (startStep instanceof GraphStep) {
- final GraphStep<?> originalGraphStep = (GraphStep) startStep;
- final Neo4jGraphStep<?> neo4jGraphStep = new Neo4jGraphStep<>(originalGraphStep);
- TraversalHelper.replaceStep(startStep, (Step) neo4jGraphStep, traversal);
-
- Step<?, ?> currentStep = neo4jGraphStep.getNextStep();
- while (true) {
- if (currentStep instanceof HasContainerHolder) {
- neo4jGraphStep.hasContainers.addAll(((HasContainerHolder) currentStep).getHasContainers());
- if (currentStep.getLabel().isPresent()) {
- final IdentityStep identityStep = new IdentityStep<>(traversal);
- identityStep.setLabel(currentStep.getLabel().get());
- TraversalHelper.insertAfterStep(identityStep, currentStep, traversal);
- }
- traversal.removeStep(currentStep);
- } else if (currentStep instanceof IdentityStep) {
- // do nothing
- } else {
- break;
- }
- currentStep = currentStep.getNextStep();
- }
- }
- }
-
- public static Neo4jGraphStepStrategy instance() {
- return INSTANCE;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c2240066/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jEdge.java
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jEdge.java b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jEdge.java
deleted file mode 100644
index c0cc70e..0000000
--- a/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jEdge.java
+++ /dev/null
@@ -1,88 +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.neo4j.structure;
-
-import org.apache.tinkerpop.gremlin.structure.Direction;
-import org.apache.tinkerpop.gremlin.structure.Edge;
-import org.apache.tinkerpop.gremlin.structure.Element;
-import org.apache.tinkerpop.gremlin.structure.Property;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
-import org.apache.tinkerpop.gremlin.structure.util.wrapped.WrappedEdge;
-import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import org.neo4j.graphdb.NotFoundException;
-import org.neo4j.graphdb.Relationship;
-
-import java.util.Iterator;
-
-/**
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public class Neo4jEdge extends Neo4jElement implements Edge, WrappedEdge<Relationship> {
-
- public Neo4jEdge(final Relationship relationship, final Neo4jGraph graph) {
- super(relationship, graph);
- }
-
- @Override
- public void remove() {
- if (this.removed) throw Element.Exceptions.elementAlreadyRemoved(Edge.class, this.getBaseEdge().getId());
- this.removed = true;
- this.graph.tx().readWrite();
- try {
- ((Relationship) this.baseElement).delete();
- } catch (IllegalStateException | NotFoundException ignored) {
- // NotFoundException happens if the edge is committed
- // IllegalStateException happens if the edge is still chilling in the tx
- }
- }
-
- public String toString() {
- return StringFactory.edgeString(this);
- }
-
- @Override
- public String label() {
- this.graph.tx().readWrite();
- return this.getBaseEdge().getType().name();
- }
-
- @Override
- public Relationship getBaseEdge() {
- return (Relationship) this.baseElement;
- }
-
- @Override
- public <V> Iterator<Property<V>> properties(final String... propertyKeys) {
- return (Iterator) super.properties(propertyKeys);
- }
-
- @Override
- public Iterator<Vertex> vertices(final Direction direction) {
- this.graph.tx().readWrite();
- switch (direction) {
- case OUT:
- return IteratorUtils.of(new Neo4jVertex(this.getBaseEdge().getStartNode(), this.graph));
- case IN:
- return IteratorUtils.of(new Neo4jVertex(this.getBaseEdge().getEndNode(), this.graph));
- default:
- return IteratorUtils.of(new Neo4jVertex(this.getBaseEdge().getStartNode(), this.graph), new Neo4jVertex(this.getBaseEdge().getEndNode(), this.graph));
- }
- }
-}
\ No newline at end of file