Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ACC-335] upgrade blueprints neo4j to 2.3.1 #540

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[ACC-335] upgrade blueprints neo4j to 2.3.1 #540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion blueprints-neo4j2-graph/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<name>Blueprints-Neo4j2Graph</name>
<description>Blueprints property graph implementation for the Neo4j 2 graph database</description>
<properties>
<neo4j.version>2.2.1</neo4j.version>
<neo4j.version>2.3.1</neo4j.version>
</properties>
<dependencies>
<dependency>
Expand All @@ -25,6 +25,16 @@
<artifactId>neo4j</artifactId>
<version>${neo4j.version}</version>
<type>pom</type>
<exclusions>
<exclusion>
<groupId>org.scala-lang.modules</groupId>
<artifactId>scala-parser-combinators_2.11</artifactId>
</exclusion>
<exclusion>
<groupId>org.neo4j</groupId>
<artifactId>neo4j-cypher-compiler-2.2_2.11</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.neo4j</groupId>
Expand Down
4 changes: 2 additions & 2 deletions ...aph/src/test/java/com/tinkerpop/blueprints/impls/neo4j2/Neo4j2GraphSpecificTestSuite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import org.neo4j.graphdb.event.TransactionData;
import org.neo4j.graphdb.event.TransactionEventHandler;
import org.neo4j.index.impl.lucene.LowerCaseKeywordAnalyzer;
import org.neo4j.kernel.InternalAbstractGraphDatabase;
import org.neo4j.kernel.ha.HighlyAvailableGraphDatabase;

import com.tinkerpop.blueprints.Direction;
Expand All @@ -19,6 +18,7 @@
import com.tinkerpop.blueprints.Vertex;
import com.tinkerpop.blueprints.impls.GraphTest;
import com.tinkerpop.blueprints.impls.neo4j2.index.Neo4j2VertexIndex;
import org.neo4j.kernel.impl.factory.GraphDatabaseFacade;

/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
Expand Down Expand Up @@ -223,7 +223,7 @@ public void testIteratingDeletedElementsWithoutSCEIT() throws Exception {
}

public void testHaGraph() throws Exception {
assertTrue(InternalAbstractGraphDatabase.class.isAssignableFrom(HighlyAvailableGraphDatabase.class));
assertTrue(GraphDatabaseFacade.class.isAssignableFrom(HighlyAvailableGraphDatabase.class));

/*String directory = this.getWorkingDirectory();
Neo4j2HaGraph graph = new Neo4j2HaGraph(directory);
Expand Down
11 changes: 9 additions & 2 deletions ...tinkerpop/blueprints/impls/neo4j2/Neo4j2GraphUsingANonInternalAbstractGraphClassFail.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import org.neo4j.graphdb.*;
import org.neo4j.graphdb.event.KernelEventHandler;
import org.neo4j.graphdb.event.TransactionEventHandler;
import org.neo4j.kernel.security.URLAccessValidationError;
import org.neo4j.test.TestGraphDatabaseFactory;
import org.neo4j.graphdb.index.IndexManager;
import org.neo4j.graphdb.schema.Schema;
Expand All @@ -15,6 +16,7 @@
import org.neo4j.kernel.GraphDatabaseAPI;
import org.neo4j.kernel.impl.store.StoreId;

import java.net.URL;
import java.util.Map;

import static org.junit.Assert.assertThat;
Expand Down Expand Up @@ -220,6 +222,11 @@ public StoreId storeId() {
return ((GraphDatabaseAPI) getLazy()).storeId();
}

@Override
public URL validateURLAccess(URL url) throws URLAccessValidationError {
return url;
}

@Override
public ResourceIterator<Node> findNodes(Label label, String s, Object o) {
return ((GraphDatabaseAPI) getLazy()).findNodes(label, s, o);
Expand Down Expand Up @@ -247,7 +254,7 @@ public Result execute(String s, Map<String, Object> map) throws QueryExecutionEx
}

/**
* in this test, our class is a graph database service, but not an InternalAbstractGraphDatabase instance.As a consequence, {@link Neo4j2Graph#getInternalIndexKeys}
* in this test, our class is a graph database service, but not an InternalAbstractGraphDatabase instance.As a consequence, {@link Neo4j2Graph#getIndexedKeys(Class)}
* won't load any index, with an additional {@link ClassCastException}
*/
@Test
Expand All @@ -259,7 +266,7 @@ public void loadingANeo4jGraphFromAnyGraphDatabaseClassShouldWork() throws Class
}

/**
* in this test, our class is a graph database service, but not an InternalAbstractGraphDatabase instance.As a consequence, {@link Neo4j2Graph#getInternalIndexKeys}
* in this test, our class is a graph database service, but not an InternalAbstractGraphDatabase instance.As a consequence, {@link Neo4j2Graph#getIndexedKeys(Class)}
* won't load any index, with an additional {@link ClassCastException}
*/
@Test
Expand Down