diff --git a/pom.xml b/pom.xml index 4dec5ea44..182044f4f 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,6 @@ pom spring-data-graph-parent - spring-data-graph-core spring-data-neo4j spring-data-neo4j-rest diff --git a/spring-data-graph-parent/pom.xml b/spring-data-graph-parent/pom.xml index b8dd1a72c..d36db2269 100644 --- a/spring-data-graph-parent/pom.xml +++ b/spring-data-graph-parent/pom.xml @@ -136,11 +136,6 @@ spring-data-commons-core ${data.commons.version} - - org.springframework.data - spring-data-graph-core - ${project.version} - org.springframework.data spring-data-neo4j diff --git a/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/JsonHelper.java b/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/JsonHelper.java similarity index 97% rename from spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/JsonHelper.java rename to spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/JsonHelper.java index 166b351aa..4f8f0eca0 100644 --- a/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/JsonHelper.java +++ b/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/JsonHelper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.rest.support; +package org.springframework.data.neo4j.rest; /** * @author mh diff --git a/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/PropertiesMap.java b/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/PropertiesMap.java similarity index 98% rename from spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/PropertiesMap.java rename to spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/PropertiesMap.java index 6b1e00314..44eb6458d 100644 --- a/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/PropertiesMap.java +++ b/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/PropertiesMap.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.rest.support; +package org.springframework.data.neo4j.rest; /** * @author mh diff --git a/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RequestResult.java b/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RequestResult.java similarity index 96% rename from spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RequestResult.java rename to spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RequestResult.java index 5ccc24f30..e17350de5 100644 --- a/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RequestResult.java +++ b/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RequestResult.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.rest.support; +package org.springframework.data.neo4j.rest; import com.sun.jersey.api.client.ClientResponse; diff --git a/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestEntity.java b/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RestEntity.java similarity index 97% rename from spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestEntity.java rename to spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RestEntity.java index e9435f393..8f94fe728 100644 --- a/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestEntity.java +++ b/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RestEntity.java @@ -14,14 +14,15 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.rest.support; +package org.springframework.data.neo4j.rest; import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.NotFoundException; import org.neo4j.graphdb.PropertyContainer; import org.neo4j.helpers.collection.IterableWrapper; -import org.springframework.data.graph.neo4j.rest.support.util.ArrayConverter; +import org.springframework.data.neo4j.rest.util.ArrayConverter; +import org.springframework.data.neo4j.rest.util.ArrayConverter; import javax.ws.rs.core.Response.Status; import java.net.URI; diff --git a/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestGraphDatabase.java b/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RestGraphDatabase.java similarity index 92% rename from spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestGraphDatabase.java rename to spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RestGraphDatabase.java index b8c0ea774..33721ecfe 100644 --- a/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestGraphDatabase.java +++ b/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RestGraphDatabase.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.rest.support; +package org.springframework.data.neo4j.rest; import org.neo4j.graphdb.*; @@ -23,12 +23,13 @@ import org.neo4j.graphdb.event.TransactionEventHandler; import org.neo4j.graphdb.index.Index; import org.neo4j.graphdb.traversal.TraversalDescription; import org.springframework.core.convert.ConversionService; -import org.springframework.data.graph.core.GraphDatabase; -import org.springframework.data.graph.core.Property; -import org.springframework.data.graph.neo4j.conversion.ResultConverter; -import org.springframework.data.graph.neo4j.rest.support.index.RestIndexManager; -import org.springframework.data.graph.neo4j.support.query.ConversionServiceQueryResultConverter; -import org.springframework.data.graph.neo4j.support.query.QueryEngine; +import org.springframework.data.neo4j.core.GraphDatabase; +import org.springframework.data.neo4j.core.Property; +import org.springframework.data.neo4j.conversion.ResultConverter; +import org.springframework.data.neo4j.rest.index.RestIndexManager; +import org.springframework.data.neo4j.rest.index.RestIndexManager; +import org.springframework.data.neo4j.support.query.ConversionServiceQueryResultConverter; +import org.springframework.data.neo4j.support.query.QueryEngine; import javax.ws.rs.core.Response.Status; import java.net.URI; diff --git a/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestNode.java b/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RestNode.java similarity index 99% rename from spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestNode.java rename to spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RestNode.java index cd8f55122..8c1d768d9 100644 --- a/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestNode.java +++ b/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RestNode.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.rest.support; +package org.springframework.data.neo4j.rest; import org.neo4j.graphdb.*; diff --git a/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestPathParser.java b/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RestPathParser.java similarity index 97% rename from spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestPathParser.java rename to spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RestPathParser.java index 036e1c89b..0b604e987 100644 --- a/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestPathParser.java +++ b/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RestPathParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.rest.support; +package org.springframework.data.neo4j.rest; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Path; diff --git a/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestQueryEngine.java b/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RestQueryEngine.java similarity index 95% rename from spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestQueryEngine.java rename to spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RestQueryEngine.java index 240cc84c1..e922eae92 100644 --- a/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestQueryEngine.java +++ b/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RestQueryEngine.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.rest.support; +package org.springframework.data.neo4j.rest; -import org.springframework.data.graph.neo4j.conversion.*; -import org.springframework.data.graph.neo4j.support.query.QueryEngine; +import org.springframework.data.neo4j.conversion.*; +import org.springframework.data.neo4j.support.query.QueryEngine; import java.util.*; diff --git a/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestRelationship.java b/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RestRelationship.java similarity index 96% rename from spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestRelationship.java rename to spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RestRelationship.java index 1c3591559..a80071886 100644 --- a/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestRelationship.java +++ b/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RestRelationship.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.rest.support; +package org.springframework.data.neo4j.rest; import org.neo4j.graphdb.*; import org.neo4j.helpers.collection.MapUtil; -import org.springframework.data.graph.core.Property; +import org.springframework.data.neo4j.core.Property; import java.net.URI; import java.util.Map; diff --git a/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestRequest.java b/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RestRequest.java similarity index 98% rename from spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestRequest.java rename to spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RestRequest.java index 52035ac9c..5fc4ce2aa 100644 --- a/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestRequest.java +++ b/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RestRequest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.rest.support; +package org.springframework.data.neo4j.rest; import com.sun.jersey.api.client.Client; import com.sun.jersey.api.client.ClientResponse; diff --git a/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestTraversal.java b/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RestTraversal.java similarity index 99% rename from spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestTraversal.java rename to spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RestTraversal.java index 76b74c54f..7f4ef8db4 100644 --- a/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestTraversal.java +++ b/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RestTraversal.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.rest.support; +package org.springframework.data.neo4j.rest; import org.neo4j.graphdb.Direction; diff --git a/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestTraversalDescription.java b/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RestTraversalDescription.java similarity index 94% rename from spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestTraversalDescription.java rename to spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RestTraversalDescription.java index de71314c4..174ae0e79 100644 --- a/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestTraversalDescription.java +++ b/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RestTraversalDescription.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.rest.support; +package org.springframework.data.neo4j.rest; import org.neo4j.graphdb.traversal.TraversalDescription; diff --git a/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestTraverser.java b/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RestTraverser.java similarity index 97% rename from spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestTraverser.java rename to spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RestTraverser.java index 55c9ece78..f04ebdb4a 100644 --- a/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/RestTraverser.java +++ b/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/RestTraverser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.rest.support; +package org.springframework.data.neo4j.rest; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Path; diff --git a/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/SimplePath.java b/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/SimplePath.java similarity index 97% rename from spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/SimplePath.java rename to spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/SimplePath.java index 5a6946e5d..42a984842 100644 --- a/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/SimplePath.java +++ b/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/SimplePath.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.rest.support; +package org.springframework.data.neo4j.rest; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Path; diff --git a/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/index/RestIndex.java b/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/index/RestIndex.java similarity index 96% rename from spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/index/RestIndex.java rename to spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/index/RestIndex.java index 3452ee255..25c2b8bb7 100644 --- a/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/index/RestIndex.java +++ b/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/index/RestIndex.java @@ -14,13 +14,14 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.rest.support.index; +package org.springframework.data.neo4j.rest.index; import org.neo4j.graphdb.PropertyContainer; import org.neo4j.graphdb.index.Index; import org.neo4j.graphdb.index.IndexHits; -import org.springframework.data.graph.neo4j.rest.support.*; +import org.springframework.data.neo4j.rest.*; +import org.springframework.data.neo4j.support.*; import java.util.Collection; import java.util.Collections; diff --git a/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/index/RestIndexManager.java b/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/index/RestIndexManager.java similarity index 91% rename from spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/index/RestIndexManager.java rename to spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/index/RestIndexManager.java index e92136baa..dfacf8713 100644 --- a/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/index/RestIndexManager.java +++ b/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/index/RestIndexManager.java @@ -14,16 +14,15 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.rest.support.index; +package org.springframework.data.neo4j.rest.index; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.PropertyContainer; -import org.neo4j.graphdb.Relationship; import org.neo4j.graphdb.index.*; -import org.springframework.data.graph.neo4j.rest.support.RequestResult; -import org.springframework.data.graph.neo4j.rest.support.RestGraphDatabase; -import org.springframework.data.graph.neo4j.rest.support.RestRequest; +import org.springframework.data.neo4j.rest.RequestResult; +import org.springframework.data.neo4j.rest.RestGraphDatabase; +import org.springframework.data.neo4j.rest.RestRequest; import java.util.Collections; import java.util.Map; diff --git a/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/index/RestNodeIndex.java b/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/index/RestNodeIndex.java similarity index 81% rename from spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/index/RestNodeIndex.java rename to spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/index/RestNodeIndex.java index e691db491..623b996ec 100644 --- a/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/index/RestNodeIndex.java +++ b/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/index/RestNodeIndex.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.rest.support.index; +package org.springframework.data.neo4j.rest.index; import org.neo4j.graphdb.Node; -import org.springframework.data.graph.neo4j.rest.support.RestGraphDatabase; -import org.springframework.data.graph.neo4j.rest.support.RestNode; -import org.springframework.data.graph.neo4j.rest.support.RestRequest; +import org.springframework.data.neo4j.rest.RestGraphDatabase; +import org.springframework.data.neo4j.rest.RestNode; +import org.springframework.data.neo4j.rest.RestRequest; import java.util.Map; diff --git a/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/index/RestRelationshipIndex.java b/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/index/RestRelationshipIndex.java similarity index 87% rename from spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/index/RestRelationshipIndex.java rename to spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/index/RestRelationshipIndex.java index be9289003..a26fa9011 100644 --- a/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/index/RestRelationshipIndex.java +++ b/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/index/RestRelationshipIndex.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.rest.support.index; +package org.springframework.data.neo4j.rest.index; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Relationship; import org.neo4j.graphdb.index.RelationshipIndex; -import org.springframework.data.graph.neo4j.rest.support.RestGraphDatabase; -import org.springframework.data.graph.neo4j.rest.support.RestRelationship; -import org.springframework.data.graph.neo4j.rest.support.RestRequest; +import org.springframework.data.neo4j.rest.RestGraphDatabase; +import org.springframework.data.neo4j.rest.RestRelationship; +import org.springframework.data.neo4j.rest.RestRequest; import java.util.Map; diff --git a/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/util/ArrayConverter.java b/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/util/ArrayConverter.java similarity index 98% rename from spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/util/ArrayConverter.java rename to spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/util/ArrayConverter.java index 1843d29f1..50b69b303 100644 --- a/spring-data-neo4j-rest/src/main/java/org/springframework/data/graph/neo4j/rest/support/util/ArrayConverter.java +++ b/spring-data-neo4j-rest/src/main/java/org/springframework/data/neo4j/rest/util/ArrayConverter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.rest.support.util; +package org.springframework.data.neo4j.rest.util; import java.lang.reflect.Array; import java.util.Collection; diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestEntityPropertyValidationTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestEntityPropertyValidationTest.java similarity index 87% rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestEntityPropertyValidationTest.java rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestEntityPropertyValidationTest.java index b9f542cc8..59db401f8 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestEntityPropertyValidationTest.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestEntityPropertyValidationTest.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.rest.integration; +package org.springframework.data.neo4j.rest.integration; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.runner.RunWith; -import org.springframework.data.graph.neo4j.rest.support.RestTestBase; -import org.springframework.data.graph.neo4j.support.EntityPropertyValidationTest; +import org.springframework.data.neo4j.rest.support.RestTestBase; +import org.springframework.data.neo4j.support.EntityPropertyValidationTest; import org.springframework.test.context.CleanContextCacheTestExecutionListener; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestExecutionListeners; @@ -34,7 +34,7 @@ import org.springframework.test.context.transaction.TransactionalTestExecutionLi * @since 28.03.11 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/graph/neo4j/support/Neo4jGraphPersistenceTest-context.xml", +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml", "classpath:RestTest-context.xml"}) @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class}) public class RestEntityPropertyValidationTest extends EntityPropertyValidationTest { diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestFinderTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestFinderTest.java similarity index 87% rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestFinderTest.java rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestFinderTest.java index 574fd9df0..cac5bce36 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestFinderTest.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestFinderTest.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.rest.integration; +package org.springframework.data.neo4j.rest.integration; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.runner.RunWith; -import org.springframework.data.graph.neo4j.rest.support.RestTestBase; -import org.springframework.data.graph.neo4j.support.FinderTest; +import org.springframework.data.neo4j.rest.support.RestTestBase; +import org.springframework.data.neo4j.support.FinderTest; import org.springframework.test.context.CleanContextCacheTestExecutionListener; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestExecutionListeners; @@ -34,7 +34,7 @@ import org.springframework.test.context.transaction.TransactionalTestExecutionLi * @since 28.03.11 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/graph/neo4j/support/Neo4jGraphPersistenceTest-context.xml", +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml", "classpath:RestTest-context.xml"}) @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class}) public class RestFinderTest extends FinderTest { diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestIndexTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestIndexTest.java similarity index 86% rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestIndexTest.java rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestIndexTest.java index 71e9362c3..dce78c3e5 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestIndexTest.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestIndexTest.java @@ -14,14 +14,15 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.rest.integration; +package org.springframework.data.neo4j.rest.integration; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.runner.RunWith; -import org.springframework.data.graph.neo4j.rest.support.RestTestBase; -import org.springframework.data.graph.neo4j.support.IndexTest; +import org.springframework.data.neo4j.rest.support.RestTestBase; +import org.springframework.data.neo4j.rest.support.RestTestBase; +import org.springframework.data.neo4j.support.IndexTest; import org.springframework.test.context.CleanContextCacheTestExecutionListener; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestExecutionListeners; @@ -34,7 +35,7 @@ import org.springframework.test.context.transaction.TransactionalTestExecutionLi * @since 28.03.11 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/graph/neo4j/support/Neo4jGraphPersistenceTest-context.xml", +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml", "classpath:RestTest-context.xml"}) @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class}) public class RestIndexTest extends IndexTest { diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestNeo4jTemplateApiTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNeo4jTemplateApiTest.java similarity index 84% rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestNeo4jTemplateApiTest.java rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNeo4jTemplateApiTest.java index 6cf0e19e1..57ff2130e 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestNeo4jTemplateApiTest.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNeo4jTemplateApiTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.rest.integration; +package org.springframework.data.neo4j.rest.integration; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -22,10 +22,11 @@ import org.junit.Ignore; import org.junit.Test; import org.neo4j.graphdb.GraphDatabaseService; import org.springframework.dao.DataAccessException; -import org.springframework.data.graph.core.GraphDatabase; -import org.springframework.data.graph.neo4j.config.NullTransactionManager; -import org.springframework.data.graph.neo4j.rest.support.RestTestHelper; -import org.springframework.data.graph.neo4j.template.Neo4jTemplateApiTest; +import org.springframework.data.neo4j.core.GraphDatabase; +import org.springframework.data.neo4j.config.NullTransactionManager; +import org.springframework.data.neo4j.rest.support.RestTestHelper; +import org.springframework.data.neo4j.rest.support.RestTestHelper; +import org.springframework.data.neo4j.template.Neo4jTemplateApiTest; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.jta.JtaTransactionManager; diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestNeo4jTemplateTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNeo4jTemplateTest.java similarity index 83% rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestNeo4jTemplateTest.java rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNeo4jTemplateTest.java index c6fcba7db..8e1c345fd 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestNeo4jTemplateTest.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNeo4jTemplateTest.java @@ -14,13 +14,14 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.rest.integration; +package org.springframework.data.neo4j.rest.integration; import org.junit.AfterClass; import org.junit.BeforeClass; -import org.springframework.data.graph.neo4j.rest.support.RestTestHelper; -import org.springframework.data.graph.core.GraphDatabase; -import org.springframework.data.graph.neo4j.template.Neo4jTemplateTest; +import org.springframework.data.neo4j.rest.support.RestTestHelper; +import org.springframework.data.neo4j.rest.support.RestTestHelper; +import org.springframework.data.neo4j.core.GraphDatabase; +import org.springframework.data.neo4j.template.Neo4jTemplateTest; import org.springframework.transaction.PlatformTransactionManager; public class RestNeo4jTemplateTest extends Neo4jTemplateTest diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestNeoTraversalTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNeoTraversalTest.java similarity index 80% rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestNeoTraversalTest.java rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNeoTraversalTest.java index b94760798..2591fe0a7 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestNeoTraversalTest.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNeoTraversalTest.java @@ -14,14 +14,15 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.rest.integration; +package org.springframework.data.neo4j.rest.integration; import org.junit.AfterClass; import org.junit.BeforeClass; -import org.springframework.data.graph.core.GraphDatabase; -import org.springframework.data.graph.neo4j.config.NullTransactionManager; -import org.springframework.data.graph.neo4j.rest.support.RestTestHelper; -import org.springframework.data.graph.neo4j.template.NeoTraversalTest; +import org.springframework.data.neo4j.core.GraphDatabase; +import org.springframework.data.neo4j.config.NullTransactionManager; +import org.springframework.data.neo4j.rest.support.RestTestHelper; +import org.springframework.data.neo4j.rest.support.RestTestHelper; +import org.springframework.data.neo4j.template.NeoTraversalTest; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.jta.JtaTransactionManager; diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestNodeEntityRelationshipTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNodeEntityRelationshipTest.java similarity index 85% rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestNodeEntityRelationshipTest.java rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNodeEntityRelationshipTest.java index 42abea450..f069b3fb7 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestNodeEntityRelationshipTest.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNodeEntityRelationshipTest.java @@ -14,14 +14,15 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.rest.integration; +package org.springframework.data.neo4j.rest.integration; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.runner.RunWith; -import org.springframework.data.graph.neo4j.rest.support.RestTestBase; -import org.springframework.data.graph.neo4j.support.NodeEntityRelationshipTest; +import org.springframework.data.neo4j.rest.support.RestTestBase; +import org.springframework.data.neo4j.rest.support.RestTestBase; +import org.springframework.data.neo4j.support.NodeEntityRelationshipTest; import org.springframework.test.context.CleanContextCacheTestExecutionListener; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestExecutionListeners; @@ -34,7 +35,7 @@ import org.springframework.test.context.transaction.TransactionalTestExecutionLi * @since 28.03.11 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/graph/neo4j/support/Neo4jGraphPersistenceTest-context.xml", +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml", "classpath:RestTest-context.xml"}) @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class}) public class RestNodeEntityRelationshipTest extends NodeEntityRelationshipTest { diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestNodeEntityTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNodeEntityTest.java similarity index 86% rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestNodeEntityTest.java rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNodeEntityTest.java index 23ab60b4d..d9d1ae863 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestNodeEntityTest.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestNodeEntityTest.java @@ -14,15 +14,16 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.rest.integration; +package org.springframework.data.neo4j.rest.integration; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.runner.RunWith; -import org.springframework.data.graph.neo4j.rest.support.RestTestBase; -import org.springframework.data.graph.neo4j.support.NodeEntityTest; +import org.springframework.data.neo4j.rest.support.RestTestBase; +import org.springframework.data.neo4j.rest.support.RestTestBase; +import org.springframework.data.neo4j.support.NodeEntityTest; import org.springframework.test.context.CleanContextCacheTestExecutionListener; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestExecutionListeners; @@ -35,7 +36,7 @@ import org.springframework.test.context.transaction.TransactionalTestExecutionLi * @since 28.03.11 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/graph/neo4j/support/Neo4jGraphPersistenceTest-context.xml", +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml", "classpath:RestTest-context.xml"}) @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class}) public class RestNodeEntityTest extends NodeEntityTest { diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestProjectionTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestProjectionTest.java similarity index 85% rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestProjectionTest.java rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestProjectionTest.java index f98bb6e47..57cd4ccf2 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestProjectionTest.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestProjectionTest.java @@ -14,14 +14,15 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.rest.integration; +package org.springframework.data.neo4j.rest.integration; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.runner.RunWith; -import org.springframework.data.graph.neo4j.rest.support.RestTestBase; -import org.springframework.data.graph.neo4j.support.ProjectionTest; +import org.springframework.data.neo4j.rest.support.RestTestBase; +import org.springframework.data.neo4j.rest.support.RestTestBase; +import org.springframework.data.neo4j.support.ProjectionTest; import org.springframework.test.context.CleanContextCacheTestExecutionListener; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestExecutionListeners; @@ -34,7 +35,7 @@ import org.springframework.test.context.transaction.TransactionalTestExecutionLi * @since 28.03.11 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/graph/neo4j/support/Neo4jGraphPersistenceTest-context.xml", +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml", "classpath:RestTest-context.xml"}) @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class}) public class RestProjectionTest extends ProjectionTest { diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestPropertyTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestPropertyTest.java similarity index 85% rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestPropertyTest.java rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestPropertyTest.java index 78f2bade6..7673c9f2e 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestPropertyTest.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestPropertyTest.java @@ -14,14 +14,15 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.rest.integration; +package org.springframework.data.neo4j.rest.integration; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.runner.RunWith; -import org.springframework.data.graph.neo4j.rest.support.RestTestBase; -import org.springframework.data.graph.neo4j.support.PropertyTest; +import org.springframework.data.neo4j.rest.support.RestTestBase; +import org.springframework.data.neo4j.rest.support.RestTestBase; +import org.springframework.data.neo4j.support.PropertyTest; import org.springframework.test.context.CleanContextCacheTestExecutionListener; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestExecutionListeners; @@ -34,7 +35,7 @@ import org.springframework.test.context.transaction.TransactionalTestExecutionLi * @since 28.03.11 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/graph/neo4j/support/Neo4jGraphPersistenceTest-context.xml", +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml", "classpath:RestTest-context.xml"}) @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class}) public class RestPropertyTest extends PropertyTest { diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestRelationshipEntityTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestRelationshipEntityTest.java similarity index 85% rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestRelationshipEntityTest.java rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestRelationshipEntityTest.java index 620dff1f8..2c821bd6c 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestRelationshipEntityTest.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestRelationshipEntityTest.java @@ -14,14 +14,15 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.rest.integration; +package org.springframework.data.neo4j.rest.integration; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.runner.RunWith; -import org.springframework.data.graph.neo4j.rest.support.RestTestBase; -import org.springframework.data.graph.neo4j.support.RelationshipEntityTest; +import org.springframework.data.neo4j.rest.support.RestTestBase; +import org.springframework.data.neo4j.rest.support.RestTestBase; +import org.springframework.data.neo4j.support.RelationshipEntityTest; import org.springframework.test.context.CleanContextCacheTestExecutionListener; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestExecutionListeners; @@ -34,7 +35,7 @@ import org.springframework.test.context.transaction.TransactionalTestExecutionLi * @since 28.03.11 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/graph/neo4j/support/Neo4jGraphPersistenceTest-context.xml", +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml", "classpath:RestTest-context.xml"}) @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class}) public class RestRelationshipEntityTest extends RelationshipEntityTest { diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestTraversalTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestTraversalTest.java similarity index 85% rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestTraversalTest.java rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestTraversalTest.java index a9e3e3d36..ec2703424 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/integration/RestTraversalTest.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/integration/RestTraversalTest.java @@ -14,14 +14,15 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.rest.integration; +package org.springframework.data.neo4j.rest.integration; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.runner.RunWith; -import org.springframework.data.graph.neo4j.rest.support.RestTestBase; -import org.springframework.data.graph.neo4j.support.TraversalTest; +import org.springframework.data.neo4j.rest.support.RestTestBase; +import org.springframework.data.neo4j.rest.support.RestTestBase; +import org.springframework.data.neo4j.support.TraversalTest; import org.springframework.test.context.CleanContextCacheTestExecutionListener; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestExecutionListeners; @@ -34,7 +35,7 @@ import org.springframework.test.context.transaction.TransactionalTestExecutionLi * @since 28.03.11 */ @RunWith( SpringJUnit4ClassRunner.class ) -@ContextConfiguration( locations = {"classpath:org/springframework/data/graph/neo4j/support/Neo4jGraphPersistenceTest-context.xml", +@ContextConfiguration( locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml", "classpath:RestTest-context.xml"} ) @TestExecutionListeners( {CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class} ) public class RestTraversalTest extends TraversalTest diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/IsRelationshipToNodeMatcher.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/IsRelationshipToNodeMatcher.java similarity index 96% rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/IsRelationshipToNodeMatcher.java rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/IsRelationshipToNodeMatcher.java index 5265f7211..299558db5 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/IsRelationshipToNodeMatcher.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/IsRelationshipToNodeMatcher.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.rest.support; +package org.springframework.data.neo4j.rest.support; import org.hamcrest.Description; import org.junit.internal.matchers.TypeSafeMatcher; diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/LocalTestServer.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/LocalTestServer.java similarity index 98% rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/LocalTestServer.java rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/LocalTestServer.java index d75af9089..b3e6ea7ea 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/LocalTestServer.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/LocalTestServer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.rest.support; +package org.springframework.data.neo4j.rest.support; import org.apache.commons.configuration.Configuration; import org.neo4j.graphdb.GraphDatabaseService; diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/Neo4jDatabaseCleaner.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/Neo4jDatabaseCleaner.java similarity index 97% rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/Neo4jDatabaseCleaner.java rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/Neo4jDatabaseCleaner.java index 63a05734f..7dcde2ba2 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/Neo4jDatabaseCleaner.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/Neo4jDatabaseCleaner.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.rest.support; +package org.springframework.data.neo4j.rest.support; import org.neo4j.graphdb.*; import org.neo4j.graphdb.index.IndexManager; diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/RestEntityTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestEntityTest.java similarity index 98% rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/RestEntityTest.java rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestEntityTest.java index b06c082c9..b28dd023b 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/RestEntityTest.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestEntityTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.rest.support; +package org.springframework.data.neo4j.rest.support; import org.junit.Assert; import org.junit.Test; diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/RestGraphDbTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestGraphDbTest.java similarity index 98% rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/RestGraphDbTest.java rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestGraphDbTest.java index 4d3582d1e..c0847bca8 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/RestGraphDbTest.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestGraphDbTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.rest.support; +package org.springframework.data.neo4j.rest.support; import org.junit.Assert; import org.junit.Test; diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/RestIndexTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestIndexTest.java similarity index 98% rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/RestIndexTest.java rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestIndexTest.java index 05df4ca57..8e6588fcf 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/RestIndexTest.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestIndexTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.rest.support; +package org.springframework.data.neo4j.rest.support; import org.junit.Assert; import org.junit.Test; diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/RestQueryEngineTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestQueryEngineTest.java similarity index 88% rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/RestQueryEngineTest.java rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestQueryEngineTest.java index d3312843d..d39b179b5 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/RestQueryEngineTest.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestQueryEngineTest.java @@ -14,14 +14,15 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.rest.support; +package org.springframework.data.neo4j.rest.support; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.graph.core.GraphDatabase; -import org.springframework.data.graph.neo4j.support.query.QueryOperationsTest; +import org.springframework.data.neo4j.core.GraphDatabase; +import org.springframework.data.neo4j.rest.RestGraphDatabase; +import org.springframework.data.neo4j.support.query.QueryOperationsTest; import org.springframework.test.context.CleanContextCacheTestExecutionListener; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestExecutionListeners; @@ -35,7 +36,7 @@ import org.springframework.test.context.transaction.TransactionalTestExecutionLi * @since 23.06.11 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/graph/neo4j/support/Neo4jGraphPersistenceTest-context.xml", +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml", "classpath:RestTest-context.xml"}) @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class}) public class RestQueryEngineTest extends QueryOperationsTest { diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/RestTestBase.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestTestBase.java similarity index 94% rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/RestTestBase.java rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestTestBase.java index 5f34f7da1..ca25757ab 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/RestTestBase.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestTestBase.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.rest.support; +package org.springframework.data.neo4j.rest.support; import org.apache.log4j.BasicConfigurator; @@ -24,6 +24,7 @@ import org.junit.BeforeClass; import org.neo4j.graphdb.Direction; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Relationship; +import org.springframework.data.neo4j.rest.RestGraphDatabase; import java.net.URI; import java.util.Iterator; diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/RestTestHelper.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestTestHelper.java similarity index 89% rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/RestTestHelper.java rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestTestHelper.java index 79975a3c5..429725060 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/RestTestHelper.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestTestHelper.java @@ -14,11 +14,12 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.rest.support; +package org.springframework.data.neo4j.rest.support; import org.apache.log4j.BasicConfigurator; -import org.springframework.data.graph.core.GraphDatabase; +import org.springframework.data.neo4j.core.GraphDatabase; +import org.springframework.data.neo4j.rest.RestGraphDatabase; import java.net.URI; import java.net.URISyntaxException; diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/RestTraversalDescriptionTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestTraversalDescriptionTest.java similarity index 93% rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/RestTraversalDescriptionTest.java rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestTraversalDescriptionTest.java index 8e74cf425..b17887986 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/RestTraversalDescriptionTest.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestTraversalDescriptionTest.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.rest.support; +package org.springframework.data.neo4j.rest.support; import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.neo4j.kernel.Uniqueness; -import org.springframework.data.graph.neo4j.rest.support.RestTraversal; -import org.springframework.data.graph.neo4j.rest.support.RestTraversalDescription; +import org.springframework.data.neo4j.rest.RestTraversal; +import org.springframework.data.neo4j.rest.RestTraversalDescription; import java.util.Map; diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/RestTraversalExecutionTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestTraversalExecutionTest.java similarity index 92% rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/RestTraversalExecutionTest.java rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestTraversalExecutionTest.java index 970a4e478..9f5bdb002 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/RestTraversalExecutionTest.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/RestTraversalExecutionTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.rest.support; +package org.springframework.data.neo4j.rest.support; import org.junit.Assert; import org.junit.Test; @@ -22,6 +22,7 @@ import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Relationship; import org.neo4j.graphdb.traversal.TraversalDescription; import org.neo4j.graphdb.traversal.Traverser; +import org.springframework.data.neo4j.rest.RestTraversal; public class RestTraversalExecutionTest extends RestTestBase { @Test diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/ServerPluginTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/ServerPluginTest.java similarity index 86% rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/ServerPluginTest.java rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/ServerPluginTest.java index 7a01c78ea..eb9cdcf37 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/ServerPluginTest.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/ServerPluginTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.rest.support; +package org.springframework.data.neo4j.rest.support; import com.sun.jersey.api.client.Client; import com.sun.jersey.api.client.ClientResponse; @@ -23,15 +23,17 @@ import com.sun.jersey.api.client.WebResource; import org.codehaus.jackson.map.ObjectMapper; import org.junit.BeforeClass; import org.junit.Test; -import org.springframework.data.graph.neo4j.Person; -import org.springframework.data.graph.neo4j.server.ProvidedClassPathXmlApplicationContext; +import org.springframework.data.neo4j.Person; +import org.springframework.data.neo4j.Person; +import org.springframework.data.neo4j.rest.RequestResult; +import org.springframework.data.neo4j.server.ProvidedClassPathXmlApplicationContext; import javax.ws.rs.core.MediaType; import java.io.IOException; import java.util.Map; import static org.junit.Assert.assertEquals; -import static org.springframework.data.graph.neo4j.Person.persistedPerson; +import static org.springframework.data.neo4j.Person.persistedPerson; /** * @author mh diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/SpringPluginInitializerTest.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/SpringPluginInitializerTest.java similarity index 94% rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/SpringPluginInitializerTest.java rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/SpringPluginInitializerTest.java index 3dccdd947..e661d3160 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/SpringPluginInitializerTest.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/SpringPluginInitializerTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.rest.support; +package org.springframework.data.neo4j.rest.support; import com.sun.jersey.api.client.Client; import com.sun.jersey.api.client.ClientResponse; @@ -23,7 +23,8 @@ import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.springframework.data.graph.neo4j.server.SpringPluginInitializer; +import org.springframework.data.neo4j.rest.RequestResult; +import org.springframework.data.neo4j.server.SpringPluginInitializer; import javax.ws.rs.POST; import javax.ws.rs.Path; diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/TestInterface.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/TestInterface.java similarity index 92% rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/TestInterface.java rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/TestInterface.java index 8a9d742da..42af8cfc7 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/TestInterface.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/TestInterface.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.rest.support; +package org.springframework.data.neo4j.rest.support; public interface TestInterface { void thisIsARecording(); diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/TestServerPlugin.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/TestServerPlugin.java similarity index 86% rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/TestServerPlugin.java rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/TestServerPlugin.java index a291f73d8..103e512f6 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/TestServerPlugin.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/TestServerPlugin.java @@ -14,18 +14,19 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.rest.support; +package org.springframework.data.neo4j.rest.support; import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Node; import org.neo4j.helpers.collection.IterableWrapper; import org.neo4j.server.plugins.*; import org.springframework.context.ApplicationContext; -import org.springframework.data.graph.neo4j.Friendship; -import org.springframework.data.graph.neo4j.Person; -import org.springframework.data.graph.neo4j.PersonRepository; -import org.springframework.data.graph.neo4j.server.ProvidedClassPathXmlApplicationContext; -import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; +import org.springframework.data.neo4j.Friendship; +import org.springframework.data.neo4j.*; +import org.springframework.data.neo4j.Person; +import org.springframework.data.neo4j.PersonRepository; +import org.springframework.data.neo4j.server.ProvidedClassPathXmlApplicationContext; +import org.springframework.data.neo4j.support.GraphDatabaseContext; /** * @author mh diff --git a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/Type.java b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/Type.java similarity index 92% rename from spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/Type.java rename to spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/Type.java index 6b3ac8b58..7eface5a3 100644 --- a/spring-data-neo4j-rest/src/test/java/org/springframework/data/graph/neo4j/rest/support/Type.java +++ b/spring-data-neo4j-rest/src/test/java/org/springframework/data/neo4j/rest/support/Type.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.rest.support; +package org.springframework.data.neo4j.rest.support; import org.neo4j.graphdb.RelationshipType; diff --git a/spring-data-neo4j-rest/src/test/resources/META-INF/services/org.neo4j.server.plugins.PluginLifecycle b/spring-data-neo4j-rest/src/test/resources/META-INF/services/org.neo4j.server.plugins.PluginLifecycle index e32447946..69d72b68d 100644 --- a/spring-data-neo4j-rest/src/test/resources/META-INF/services/org.neo4j.server.plugins.PluginLifecycle +++ b/spring-data-neo4j-rest/src/test/resources/META-INF/services/org.neo4j.server.plugins.PluginLifecycle @@ -1 +1 @@ -org.springframework.data.graph.neo4j.rest.support.SpringPluginInitializerTest +org.springframework.data.neo4j.rest.support.SpringPluginInitializerTest diff --git a/spring-data-neo4j-rest/src/test/resources/META-INF/services/org.neo4j.server.plugins.ServerPlugin b/spring-data-neo4j-rest/src/test/resources/META-INF/services/org.neo4j.server.plugins.ServerPlugin index 55a834ac8..a368a3ac9 100644 --- a/spring-data-neo4j-rest/src/test/resources/META-INF/services/org.neo4j.server.plugins.ServerPlugin +++ b/spring-data-neo4j-rest/src/test/resources/META-INF/services/org.neo4j.server.plugins.ServerPlugin @@ -1 +1 @@ -org.springframework.data.graph.neo4j.rest.support.TestServerPlugin +org.springframework.data.neo4j.rest.support.TestServerPlugin diff --git a/spring-data-neo4j-rest/src/test/resources/Plugin-context.xml b/spring-data-neo4j-rest/src/test/resources/Plugin-context.xml index f217d36a4..a9e1e7309 100644 --- a/spring-data-neo4j-rest/src/test/resources/Plugin-context.xml +++ b/spring-data-neo4j-rest/src/test/resources/Plugin-context.xml @@ -17,6 +17,6 @@ - + diff --git a/spring-data-neo4j-rest/src/test/resources/RestTest-context.xml b/spring-data-neo4j-rest/src/test/resources/RestTest-context.xml index f88fa98b4..67dbc3e47 100644 --- a/spring-data-neo4j-rest/src/test/resources/RestTest-context.xml +++ b/spring-data-neo4j-rest/src/test/resources/RestTest-context.xml @@ -14,7 +14,7 @@ http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"> - + diff --git a/spring-data-neo4j-rest/src/test/resources/ServerTest-context.xml b/spring-data-neo4j-rest/src/test/resources/ServerTest-context.xml index 3dc0f2e91..5d9741bb5 100644 --- a/spring-data-neo4j-rest/src/test/resources/ServerTest-context.xml +++ b/spring-data-neo4j-rest/src/test/resources/ServerTest-context.xml @@ -14,6 +14,6 @@ http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"> - + diff --git a/spring-data-neo4j-rest/src/test/resources/log4j.properties b/spring-data-neo4j-rest/src/test/resources/log4j.properties index d8f54df4a..3597256a1 100644 --- a/spring-data-neo4j-rest/src/test/resources/log4j.properties +++ b/spring-data-neo4j-rest/src/test/resources/log4j.properties @@ -18,9 +18,9 @@ log4j.appender.R.layout.ConversionPattern=%p %t %c - %m%n log4j.category.org.springframework=WARN -#log4j.category.org.springframework.data.graph.neo4j.support.SubReferenceNodeTypeRepresentationStrategytegy=DEBUG -#log4j.category.org.springframework.data.graph.neo4j.fieldaccess=DEBUG +#log4j.category.org.springframework.data.neo4j.support.SubReferenceNodeTypeRepresentationStrategytegy=DEBUG +#log4j.category.org.springframework.data.neo4j.fieldaccess=DEBUG #log4j.category.org.springframework.data=TRACE #log4j.category.org.springframework.data.support=TRACE #log4j.category.org.springframework.persistence=TRACE -#log4j.category.org.springframework.data.graph.neo4j.support=DEBUG +#log4j.category.org.springframework.data.neo4j.support=DEBUG diff --git a/spring-data-neo4j-rest/src/test/resources/server-test-db.properties b/spring-data-neo4j-rest/src/test/resources/server-test-db.properties index 59f00e8e6..faba9ee75 100644 --- a/spring-data-neo4j-rest/src/test/resources/server-test-db.properties +++ b/spring-data-neo4j-rest/src/test/resources/server-test-db.properties @@ -1,2 +1,2 @@ org.neo4j.server.database.location=target/test-db -org.neo4j.server.thirdparty_jaxrs_classes=org.springframework.data.graph.neo4j.rest.support=/test +org.neo4j.server.thirdparty_jaxrs_classes=org.springframework.data.neo4j.rest.support=/test diff --git a/spring-data-neo4j-rest/template.mf b/spring-data-neo4j-rest/template.mf index df7cc1f31..a7fe7abfb 100644 --- a/spring-data-neo4j-rest/template.mf +++ b/spring-data-neo4j-rest/template.mf @@ -6,9 +6,9 @@ Import-Package: sun.reflect;version="0";resolution:=optional Import-Template: org.springframework.data.core.*;version="[1.0.0, 2.0.0)", - org.springframework.data.graph.neo4j.annotation.*;version="[1.0.0, 2.0.0)", + org.springframework.data.neo4j.annotation.*;version="[1.0.0, 2.0.0)", org.springframework.*;version="[3.0.0, 4.0.0)", - org.springframework.data.graph.*;version="0", + org.springframework.data.neo4j.*;version="0", org.neo4j.*;version="0", org.w3c.dom.*;version="0", org.apache.commons.logging.*;version="[1.1.1, 2.0.0)", diff --git a/spring-data-neo4j/pom.xml b/spring-data-neo4j/pom.xml index 246445e1a..b3a4a18ab 100644 --- a/spring-data-neo4j/pom.xml +++ b/spring-data-neo4j/pom.xml @@ -34,10 +34,6 @@ org.springframework.data spring-data-commons-core - - org.springframework.data - spring-data-graph-core - org.ow2.jotm diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/EndNode.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/EndNode.java similarity index 95% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/EndNode.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/EndNode.java index 8ae3ae60a..4b9ba1d37 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/EndNode.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/EndNode.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.annotation; +package org.springframework.data.neo4j.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/GraphId.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/GraphId.java similarity index 95% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/GraphId.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/GraphId.java index 88910e86a..b86af30e0 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/GraphId.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/GraphId.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.annotation; +package org.springframework.data.neo4j.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/GraphProperty.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/GraphProperty.java similarity index 95% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/GraphProperty.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/GraphProperty.java index 5a0914c29..4c95bc10c 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/GraphProperty.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/GraphProperty.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.annotation; +package org.springframework.data.neo4j.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/GraphTraversal.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/GraphTraversal.java similarity index 91% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/GraphTraversal.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/GraphTraversal.java index edeef4dd7..76463eb38 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/GraphTraversal.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/GraphTraversal.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.springframework.data.graph.annotation; +package org.springframework.data.neo4j.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.springframework.data.graph.core.FieldTraversalDescriptionBuilder; -import org.springframework.data.graph.core.NodeBacked; +import org.springframework.data.neo4j.core.FieldTraversalDescriptionBuilder; +import org.springframework.data.neo4j.core.NodeBacked; /** * Field that provides access to an iterator which is created by applying the traversal that is built by the supplied diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/Indexed.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/Indexed.java similarity index 97% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/Indexed.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/Indexed.java index 62ff42e49..32e742140 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/Indexed.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/Indexed.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.annotation; +package org.springframework.data.neo4j.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/NodeEntity.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/NodeEntity.java similarity index 81% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/NodeEntity.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/NodeEntity.java index b5a2520e5..85bbbc489 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/NodeEntity.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/NodeEntity.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.data.graph.annotation; +package org.springframework.data.neo4j.annotation; import java.lang.annotation.*; /** - * Annotation to declare an Pojo-Entity as graph backed. It is used by the {@link org.springframework.data.graph.neo4j.support.node.Neo4jNodeBacking} aspect to - * introduce constructor and field advices as well as add the {@link org.springframework.data.graph.core.NodeBacked} interface. + * Annotation to declare an Pojo-Entity as graph backed. It is used by the {@link org.springframework.data.neo4j.support.node.Neo4jNodeBacking} aspect to + * introduce constructor and field advices as well as add the {@link org.springframework.data.neo4j.core.NodeBacked} interface. * @author Michael Hunger * @since 27.08.2010 */ @@ -36,14 +36,14 @@ public @interface NodeEntity { /** *

* If partial is set, then construction of the node is delayed until the entity's id has been set by another persistent store. Only - * {@link org.springframework.data.graph.annotation.GraphProperty} annotated fields will be handled by the graph storage. + * {@link org.springframework.data.neo4j.annotation.GraphProperty} annotated fields will be handled by the graph storage. *

* *

* Currently, only JPA storage is supported for partial node entities. *

* - * @return true if the entity is only partially managed by the {@link org.springframework.data.graph.neo4j.support.node.Neo4jNodeBacking} aspect. + * @return true if the entity is only partially managed by the {@link org.springframework.data.neo4j.support.node.Neo4jNodeBacking} aspect. */ boolean partial() default false; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/Query.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/Query.java similarity index 97% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/Query.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/Query.java index 9061cba33..f9b5793e6 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/Query.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/Query.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.annotation; +package org.springframework.data.neo4j.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/RelatedTo.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/RelatedTo.java similarity index 89% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/RelatedTo.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/RelatedTo.java index e95cc756b..4f044ace8 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/RelatedTo.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/RelatedTo.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.data.graph.annotation; +package org.springframework.data.neo4j.annotation; -import org.springframework.data.graph.core.Direction; -import org.springframework.data.graph.core.NodeBacked; +import org.springframework.data.neo4j.core.Direction; +import org.springframework.data.neo4j.core.NodeBacked; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -25,7 +25,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; /** - * Annotation for {@link org.springframework.data.graph.annotation.NodeEntity} fields that relate to other entities via + * Annotation for {@link org.springframework.data.neo4j.annotation.NodeEntity} fields that relate to other entities via * relationships. Works for one-to-one and one-to-many relationships. It is optionally possible to define the relationship type, * relationship direction and target class (required for one-many-relationships). * diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/RelatedToVia.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/RelatedToVia.java similarity index 88% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/RelatedToVia.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/RelatedToVia.java index ac1c1dfc9..daa86c714 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/RelatedToVia.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/RelatedToVia.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package org.springframework.data.graph.annotation; +package org.springframework.data.neo4j.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.springframework.data.graph.core.Direction; -import org.springframework.data.graph.core.RelationshipBacked; +import org.springframework.data.neo4j.core.Direction; +import org.springframework.data.neo4j.core.RelationshipBacked; /** - * Annotation for {@link org.springframework.data.graph.annotation.NodeEntity} fields that relate to other entities via + * Annotation for {@link org.springframework.data.neo4j.annotation.NodeEntity} fields that relate to other entities via * relationships. The fields represent read only iterators that provide the relationship-entities * {@link org.springframework.persistence.RelatedEntity} of the relationships. The iterator reflects the underlying relationships. * diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/RelationshipEntity.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/RelationshipEntity.java similarity index 85% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/RelationshipEntity.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/RelationshipEntity.java index 56f7672b6..66d43b50d 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/RelationshipEntity.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/RelationshipEntity.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.data.graph.annotation; +package org.springframework.data.neo4j.annotation; import java.lang.annotation.*; /** * Annotation to declare a Pojo-Entity as graph backed relationship entity. - * It is used by the {@link org.springframework.data.graph.neo4j.support.relationship.Neo4jRelationshipBacking} aspect to add - * field advices as well as the {@link org.springframework.data.graph.core.RelationshipBacked} interface. + * It is used by the {@link org.springframework.data.neo4j.support.relationship.Neo4jRelationshipBacking} aspect to add + * field advices as well as the {@link org.springframework.data.neo4j.core.RelationshipBacked} interface. * * Relationship entities cannot be instantiated directly. The will be provided by relationship fields and the * methods relatedTo and getRelationshipTo introduced to the node entities. diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/StartNode.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/StartNode.java similarity index 95% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/StartNode.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/StartNode.java index b06c7340c..15fbd5317 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/annotation/StartNode.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/annotation/StartNode.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.annotation; +package org.springframework.data.neo4j.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/config/ConfigurationCheck.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/ConfigurationCheck.java similarity index 95% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/config/ConfigurationCheck.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/ConfigurationCheck.java index 228803291..995dc8a08 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/config/ConfigurationCheck.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/ConfigurationCheck.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.config; +package org.springframework.data.neo4j.config; import org.neo4j.graphdb.Transaction; -import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; +import org.springframework.data.neo4j.support.GraphDatabaseContext; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.TransactionStatus; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/config/DataGraphBeanDefinitionParser.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/DataGraphBeanDefinitionParser.java similarity index 98% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/config/DataGraphBeanDefinitionParser.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/DataGraphBeanDefinitionParser.java index 93e78d40c..76be46e32 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/config/DataGraphBeanDefinitionParser.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/DataGraphBeanDefinitionParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.config; +package org.springframework.data.neo4j.config; import org.neo4j.kernel.EmbeddedGraphDatabase; import org.springframework.beans.factory.annotation.Autowire; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/config/DataGraphNamespaceHandler.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/DataGraphNamespaceHandler.java similarity index 96% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/config/DataGraphNamespaceHandler.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/DataGraphNamespaceHandler.java index 23108d744..0bc0cc69d 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/config/DataGraphNamespaceHandler.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/DataGraphNamespaceHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.config; +package org.springframework.data.neo4j.config; /** * @author mh @@ -24,8 +24,8 @@ package org.springframework.data.graph.neo4j.config; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.beans.factory.xml.NamespaceHandlerSupport; -import org.springframework.data.graph.neo4j.repository.CRUDRepository; -import org.springframework.data.graph.neo4j.repository.GraphRepositoryFactoryBean; +import org.springframework.data.neo4j.repository.CRUDRepository; +import org.springframework.data.neo4j.repository.GraphRepositoryFactoryBean; import org.springframework.data.repository.config.*; import org.springframework.util.StringUtils; import org.w3c.dom.Element; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/config/Neo4jConfiguration.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/Neo4jConfiguration.java similarity index 84% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/config/Neo4jConfiguration.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/Neo4jConfiguration.java index 421b1a59a..85d33651f 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/config/Neo4jConfiguration.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/Neo4jConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.config; +package org.springframework.data.neo4j.config; import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Node; @@ -28,22 +28,22 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.convert.ConversionService; import org.springframework.dao.support.PersistenceExceptionTranslator; -import org.springframework.data.graph.core.NodeBacked; -import org.springframework.data.graph.core.RelationshipBacked; -import org.springframework.data.graph.neo4j.fieldaccess.Neo4jConversionServiceFactoryBean; -import org.springframework.data.graph.neo4j.fieldaccess.NodeDelegatingFieldAccessorFactory; -import org.springframework.data.graph.neo4j.repository.DirectGraphRepositoryFactory; -import org.springframework.data.graph.neo4j.support.node.NodeEntityStateFactory; -import org.springframework.data.graph.neo4j.support.relationship.RelationshipEntityStateFactory; -import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; -import org.springframework.data.graph.neo4j.support.typerepresentation.TypeRepresentationStrategyFactory; -import org.springframework.data.graph.neo4j.support.node.Neo4jNodeBacking; -import org.springframework.data.graph.neo4j.support.node.NodeEntityInstantiator; -import org.springframework.data.graph.neo4j.support.node.PartialNodeEntityInstantiator; -import org.springframework.data.graph.neo4j.support.relationship.Neo4jRelationshipBacking; -import org.springframework.data.graph.neo4j.support.relationship.RelationshipEntityInstantiator; -import org.springframework.data.graph.neo4j.template.Neo4jExceptionTranslator; -import org.springframework.data.graph.neo4j.transaction.ChainedTransactionManager; +import org.springframework.data.neo4j.core.NodeBacked; +import org.springframework.data.neo4j.core.RelationshipBacked; +import org.springframework.data.neo4j.fieldaccess.Neo4jConversionServiceFactoryBean; +import org.springframework.data.neo4j.fieldaccess.NodeDelegatingFieldAccessorFactory; +import org.springframework.data.neo4j.repository.DirectGraphRepositoryFactory; +import org.springframework.data.neo4j.support.node.NodeEntityStateFactory; +import org.springframework.data.neo4j.support.relationship.RelationshipEntityStateFactory; +import org.springframework.data.neo4j.support.GraphDatabaseContext; +import org.springframework.data.neo4j.support.typerepresentation.TypeRepresentationStrategyFactory; +import org.springframework.data.neo4j.support.node.Neo4jNodeBacking; +import org.springframework.data.neo4j.support.node.NodeEntityInstantiator; +import org.springframework.data.neo4j.support.node.PartialNodeEntityInstantiator; +import org.springframework.data.neo4j.support.relationship.Neo4jRelationshipBacking; +import org.springframework.data.neo4j.support.relationship.RelationshipEntityInstantiator; +import org.springframework.data.neo4j.template.Neo4jExceptionTranslator; +import org.springframework.data.neo4j.transaction.ChainedTransactionManager; import org.springframework.data.persistence.EntityInstantiator; import org.springframework.orm.jpa.JpaTransactionManager; import org.springframework.transaction.PlatformTransactionManager; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/config/NullTransactionManager.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/NullTransactionManager.java similarity index 98% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/config/NullTransactionManager.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/NullTransactionManager.java index a1ef00feb..179cff3a4 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/config/NullTransactionManager.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/config/NullTransactionManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.config; +package org.springframework.data.neo4j.config; import javax.transaction.*; import javax.transaction.xa.XAResource; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/conversion/ConvertedResult.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/conversion/ConvertedResult.java similarity index 93% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/conversion/ConvertedResult.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/conversion/ConvertedResult.java index 38d456b7c..71c46db72 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/conversion/ConvertedResult.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/conversion/ConvertedResult.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.conversion; +package org.springframework.data.neo4j.conversion; /** * @author mh diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/conversion/DefaultConverter.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/conversion/DefaultConverter.java similarity index 94% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/conversion/DefaultConverter.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/conversion/DefaultConverter.java index 1e9ac3bed..240d52bff 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/conversion/DefaultConverter.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/conversion/DefaultConverter.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.conversion; +package org.springframework.data.neo4j.conversion; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Path; import org.neo4j.graphdb.Relationship; -import org.springframework.data.graph.neo4j.support.path.NodePath; -import org.springframework.data.graph.neo4j.support.path.RelationshipPath; +import org.springframework.data.neo4j.support.path.NodePath; +import org.springframework.data.neo4j.support.path.RelationshipPath; import java.util.Iterator; import java.util.Map; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/conversion/Handler.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/conversion/Handler.java similarity index 92% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/conversion/Handler.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/conversion/Handler.java index 2b223621e..d610cd9ff 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/conversion/Handler.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/conversion/Handler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.conversion; +package org.springframework.data.neo4j.conversion; /** * @author mh diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/conversion/QueryResult.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/conversion/QueryResult.java similarity index 93% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/conversion/QueryResult.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/conversion/QueryResult.java index 002dd1be3..5a0eae281 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/conversion/QueryResult.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/conversion/QueryResult.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.conversion; +package org.springframework.data.neo4j.conversion; /** * @author mh diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/conversion/QueryResultBuilder.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/conversion/QueryResultBuilder.java similarity index 97% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/conversion/QueryResultBuilder.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/conversion/QueryResultBuilder.java index 931d0d8c7..0c8e63aed 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/conversion/QueryResultBuilder.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/conversion/QueryResultBuilder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.conversion; +package org.springframework.data.neo4j.conversion; import org.neo4j.helpers.collection.IteratorWrapper; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/conversion/ResultConverter.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/conversion/ResultConverter.java similarity index 94% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/conversion/ResultConverter.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/conversion/ResultConverter.java index 9c5d74111..7fd1371b9 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/conversion/ResultConverter.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/conversion/ResultConverter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.conversion; +package org.springframework.data.neo4j.conversion; /** * @author mh diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/core/Direction.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/Direction.java similarity index 92% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/core/Direction.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/Direction.java index 817cf9a45..9639ca47c 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/core/Direction.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/Direction.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.core; +package org.springframework.data.neo4j.core; public enum Direction { diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/core/EntityPath.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/EntityPath.java similarity index 84% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/core/EntityPath.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/EntityPath.java index a0cd1c86a..265d9d2f0 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/core/EntityPath.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/EntityPath.java @@ -14,12 +14,10 @@ * limitations under the License. */ -package org.springframework.data.graph.core; +package org.springframework.data.neo4j.core; import org.neo4j.graphdb.Path; -import org.springframework.data.graph.core.GraphBacked; -import org.springframework.data.graph.core.NodeBacked; -import org.springframework.data.graph.core.RelationshipBacked; +import org.springframework.data.neo4j.core.RelationshipBacked; /** * @author mh diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/core/EntityState.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/EntityState.java similarity index 91% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/core/EntityState.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/EntityState.java index 594c9ad94..ed73fabc5 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/core/EntityState.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/EntityState.java @@ -14,10 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.core; - -import org.springframework.data.graph.core.GraphBacked; -import org.springframework.data.graph.core.NodeBacked; +package org.springframework.data.neo4j.core; import java.lang.reflect.Field; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/core/FieldTraversalDescriptionBuilder.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/FieldTraversalDescriptionBuilder.java similarity index 93% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/core/FieldTraversalDescriptionBuilder.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/FieldTraversalDescriptionBuilder.java index cb8fe657a..e6df9d077 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/core/FieldTraversalDescriptionBuilder.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/FieldTraversalDescriptionBuilder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.core; +package org.springframework.data.neo4j.core; import org.neo4j.graphdb.traversal.TraversalDescription; @@ -22,7 +22,7 @@ import java.lang.reflect.Field; /** * Interface for classes that build traversal descriptions. Those classes can be referred to by - * {@link org.springframework.data.graph.annotation.GraphTraversal#traversalBuilder()} to provide fields that return + * {@link org.springframework.data.neo4j.annotation.GraphTraversal#traversalBuilder()} to provide fields that return * a dynamic traversal on access. * * @author Michael Hunger diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/core/GraphBacked.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/GraphBacked.java similarity index 97% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/core/GraphBacked.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/GraphBacked.java index b02bb263e..d548c7b7d 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/core/GraphBacked.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/GraphBacked.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.core; +package org.springframework.data.neo4j.core; /** * super interface denoting entities that are graph backed, the backing STATE can be a {@link org.neo4j.graphdb.Node} diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/core/GraphDatabase.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/GraphDatabase.java similarity index 95% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/core/GraphDatabase.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/GraphDatabase.java index c96facad3..c430630c6 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/core/GraphDatabase.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/GraphDatabase.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.core; +package org.springframework.data.neo4j.core; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.PropertyContainer; @@ -23,8 +23,8 @@ import org.neo4j.graphdb.RelationshipType; import org.neo4j.graphdb.index.Index; import org.neo4j.graphdb.traversal.TraversalDescription; import org.springframework.core.convert.ConversionService; -import org.springframework.data.graph.neo4j.support.query.EmbeddedQueryEngine; -import org.springframework.data.graph.neo4j.support.query.QueryEngine; +import org.springframework.data.neo4j.support.query.EmbeddedQueryEngine; +import org.springframework.data.neo4j.support.query.QueryEngine; public interface GraphDatabase { diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/core/NodeBacked.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/NodeBacked.java similarity index 95% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/core/NodeBacked.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/NodeBacked.java index ab86a1c0b..e9a64efb1 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/core/NodeBacked.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/NodeBacked.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.data.graph.core; +package org.springframework.data.neo4j.core; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Relationship; import org.neo4j.graphdb.traversal.TraversalDescription; /** - * Interface introduced to objects annotated with @NodeEntity by the {@link org.springframework.data.graph.neo4j.support.node.Neo4jNodeBacking} aspect. + * Interface introduced to objects annotated with @NodeEntity by the {@link org.springframework.data.neo4j.support.node.Neo4jNodeBacking} aspect. * annotation, to hold underlying Neo4j Node state. * * @author Rod Johnson @@ -104,9 +104,9 @@ public interface NodeBacked extends GraphBacked { /** * Removes the all relationships of the given type between this entity's underlying node and the target * entity's underlying node. Note that this is handled automatically by - * {@link org.springframework.data.graph.annotation.RelatedTo} fields, + * {@link org.springframework.data.neo4j.annotation.RelatedTo} fields, * single-relationship non-annotated fields, and - * {@link org.springframework.data.graph.annotation.RelatedToVia} fields. + * {@link org.springframework.data.neo4j.annotation.RelatedToVia} fields. * * @param target other node entity * @param relationshipType type to be removed diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/core/NodeTypeRepresentationStrategy.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/NodeTypeRepresentationStrategy.java similarity index 94% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/core/NodeTypeRepresentationStrategy.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/NodeTypeRepresentationStrategy.java index 8b3b4dadd..18f9d10c1 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/core/NodeTypeRepresentationStrategy.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/NodeTypeRepresentationStrategy.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.core; +package org.springframework.data.neo4j.core; import org.neo4j.graphdb.Node; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/core/Property.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/Property.java similarity index 98% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/core/Property.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/Property.java index 7426a36b5..62770d641 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/core/Property.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/Property.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.core; +package org.springframework.data.neo4j.core; import java.util.HashMap; import java.util.Map; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/core/RelationshipBacked.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/RelationshipBacked.java similarity index 90% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/core/RelationshipBacked.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/RelationshipBacked.java index addbcda7e..baaccd1d5 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/core/RelationshipBacked.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/RelationshipBacked.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.data.graph.core; +package org.springframework.data.neo4j.core; import org.neo4j.graphdb.Relationship; /** - * concrete interface introduced onto Relationship entities by the {@link org.springframework.data.graph.neo4j.support.relationship.Neo4jRelationshipBacking} + * concrete interface introduced onto Relationship entities by the {@link org.springframework.data.neo4j.support.relationship.Neo4jRelationshipBacking} * aspect, encapsulates a neo4j relationship as backing state */ public interface RelationshipBacked extends GraphBacked{ diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/core/RelationshipTypeRepresentationStrategy.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/RelationshipTypeRepresentationStrategy.java similarity index 94% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/core/RelationshipTypeRepresentationStrategy.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/RelationshipTypeRepresentationStrategy.java index aca11778d..1b74cd747 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/core/RelationshipTypeRepresentationStrategy.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/RelationshipTypeRepresentationStrategy.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.core; +package org.springframework.data.neo4j.core; import org.neo4j.graphdb.Relationship; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/core/TypeRepresentationStrategy.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/TypeRepresentationStrategy.java similarity index 98% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/core/TypeRepresentationStrategy.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/TypeRepresentationStrategy.java index 5a51108bd..93939ead1 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/core/TypeRepresentationStrategy.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/TypeRepresentationStrategy.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.core; +package org.springframework.data.neo4j.core; import org.neo4j.graphdb.PropertyContainer; import org.neo4j.helpers.collection.ClosableIterable; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/UncategorizedGraphStoreException.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/UncategorizedGraphStoreException.java similarity index 95% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/UncategorizedGraphStoreException.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/UncategorizedGraphStoreException.java index 26fdc7424..feb9bc39d 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/UncategorizedGraphStoreException.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/core/UncategorizedGraphStoreException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph; +package org.springframework.data.neo4j.core; import org.springframework.dao.UncategorizedDataAccessException; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/AbstractNodeRelationshipFieldAccessor.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/AbstractNodeRelationshipFieldAccessor.java similarity index 96% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/AbstractNodeRelationshipFieldAccessor.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/AbstractNodeRelationshipFieldAccessor.java index 2d9e14c5b..17abba39e 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/AbstractNodeRelationshipFieldAccessor.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/AbstractNodeRelationshipFieldAccessor.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.fieldaccess; +package org.springframework.data.neo4j.fieldaccess; import org.neo4j.graphdb.*; import org.springframework.dao.InvalidDataAccessApiUsageException; -import org.springframework.data.graph.core.GraphBacked; -import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; +import org.springframework.data.neo4j.core.GraphBacked; +import org.springframework.data.neo4j.support.GraphDatabaseContext; import java.lang.reflect.Field; import java.util.HashSet; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/ConvertingNodePropertyFieldAccessorFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/ConvertingNodePropertyFieldAccessorFactory.java similarity index 93% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/ConvertingNodePropertyFieldAccessorFactory.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/ConvertingNodePropertyFieldAccessorFactory.java index f65882aa6..218fabb68 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/ConvertingNodePropertyFieldAccessorFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/ConvertingNodePropertyFieldAccessorFactory.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.fieldaccess; +package org.springframework.data.neo4j.fieldaccess; import org.neo4j.graphdb.PropertyContainer; import org.springframework.beans.factory.annotation.Configurable; import org.springframework.core.convert.ConversionService; -import org.springframework.data.graph.core.GraphBacked; -import org.springframework.data.graph.core.NodeBacked; -import org.springframework.data.graph.core.RelationshipBacked; +import org.springframework.data.neo4j.core.GraphBacked; +import org.springframework.data.neo4j.core.NodeBacked; +import org.springframework.data.neo4j.core.RelationshipBacked; import java.lang.reflect.Field; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/DefaultEntityState.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/DefaultEntityState.java similarity index 96% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/DefaultEntityState.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/DefaultEntityState.java index cd8f42c2d..5a3f7dc4b 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/DefaultEntityState.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/DefaultEntityState.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.fieldaccess; +package org.springframework.data.neo4j.fieldaccess; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.data.graph.core.EntityState; -import org.springframework.data.graph.core.GraphBacked; +import org.springframework.data.neo4j.core.EntityState; +import org.springframework.data.neo4j.core.GraphBacked; import java.lang.reflect.Field; import java.util.HashMap; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/DelegatingFieldAccessorFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/DelegatingFieldAccessorFactory.java similarity index 95% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/DelegatingFieldAccessorFactory.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/DelegatingFieldAccessorFactory.java index 8b0f91afb..53c67ca63 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/DelegatingFieldAccessorFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/DelegatingFieldAccessorFactory.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.fieldaccess; +package org.springframework.data.neo4j.fieldaccess; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.data.graph.annotation.NodeEntity; -import org.springframework.data.graph.annotation.RelationshipEntity; -import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; +import org.springframework.data.neo4j.annotation.NodeEntity; +import org.springframework.data.neo4j.annotation.RelationshipEntity; +import org.springframework.data.neo4j.support.GraphDatabaseContext; import org.springframework.util.ReflectionUtils; import java.lang.reflect.Field; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/DetachedEntityState.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/DetachedEntityState.java similarity index 95% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/DetachedEntityState.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/DetachedEntityState.java index 1f9190d37..8c99f454d 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/DetachedEntityState.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/DetachedEntityState.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.fieldaccess; +package org.springframework.data.neo4j.fieldaccess; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.neo4j.graphdb.Transaction; -import org.springframework.data.graph.core.EntityState; -import org.springframework.data.graph.core.GraphBacked; -import org.springframework.data.graph.core.NodeBacked; -import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; +import org.springframework.data.neo4j.core.EntityState; +import org.springframework.data.neo4j.core.GraphBacked; +import org.springframework.data.neo4j.core.NodeBacked; +import org.springframework.data.neo4j.support.GraphDatabaseContext; import org.springframework.util.ObjectUtils; import java.lang.reflect.Field; @@ -31,7 +31,7 @@ import java.util.ConcurrentModificationException; import java.util.HashMap; import java.util.Map; -import static org.springframework.data.graph.neo4j.support.DoReturn.unwrap; +import static org.springframework.data.neo4j.support.DoReturn.unwrap; /** * @author Michael Hunger diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/FieldAccessListener.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/FieldAccessListener.java similarity index 94% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/FieldAccessListener.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/FieldAccessListener.java index e64a92f7d..d58dcede7 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/FieldAccessListener.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/FieldAccessListener.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.fieldaccess; +package org.springframework.data.neo4j.fieldaccess; /** * interface for listeners for field modifications, used for instance for indexing or tracing diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/FieldAccessor.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/FieldAccessor.java similarity index 84% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/FieldAccessor.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/FieldAccessor.java index 2515869d7..a78a77266 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/FieldAccessor.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/FieldAccessor.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.fieldaccess; +package org.springframework.data.neo4j.fieldaccess; /** * interface for field accessors, encapsulates reading and writing from fields and write support information about the field. - * It is used by the {@link org.springframework.data.graph.core.EntityState} which is delegated to by the - * {@link org.springframework.data.graph.neo4j.support.node.Neo4jNodeBacking} {@link org.springframework.data.graph.neo4j.support.relationship.Neo4jRelationshipBacking} + * It is used by the {@link org.springframework.data.neo4j.core.EntityState} which is delegated to by the + * {@link org.springframework.data.neo4j.support.node.Neo4jNodeBacking} {@link org.springframework.data.neo4j.support.relationship.Neo4jRelationshipBacking} * aspects. * @param */ diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/FieldAccessorFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/FieldAccessorFactory.java similarity index 95% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/FieldAccessorFactory.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/FieldAccessorFactory.java index defabf3d9..dc4f9d61a 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/FieldAccessorFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/FieldAccessorFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.fieldaccess; +package org.springframework.data.neo4j.fieldaccess; import java.lang.reflect.Field; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/FieldAccessorFactoryProviders.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/FieldAccessorFactoryProviders.java similarity index 98% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/FieldAccessorFactoryProviders.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/FieldAccessorFactoryProviders.java index 6ee0d18e2..07d68e111 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/FieldAccessorFactoryProviders.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/FieldAccessorFactoryProviders.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.fieldaccess; +package org.springframework.data.neo4j.fieldaccess; import java.lang.reflect.Field; import java.util.ArrayList; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/FieldAccessorListenerFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/FieldAccessorListenerFactory.java similarity index 95% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/FieldAccessorListenerFactory.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/FieldAccessorListenerFactory.java index c3ff24653..d1dbeeb45 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/FieldAccessorListenerFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/FieldAccessorListenerFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.fieldaccess; +package org.springframework.data.neo4j.fieldaccess; import java.lang.reflect.Field; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/IdFieldAccessorFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/IdFieldAccessorFactory.java similarity index 88% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/IdFieldAccessorFactory.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/IdFieldAccessorFactory.java index 4810394c2..a32087d56 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/IdFieldAccessorFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/IdFieldAccessorFactory.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.fieldaccess; +package org.springframework.data.neo4j.fieldaccess; -import org.springframework.data.graph.annotation.GraphId; -import org.springframework.data.graph.core.NodeBacked; +import org.springframework.data.neo4j.annotation.GraphId; +import org.springframework.data.neo4j.core.NodeBacked; import javax.persistence.Id; import java.lang.reflect.Field; -import static org.springframework.data.graph.neo4j.support.DoReturn.doReturn; +import static org.springframework.data.neo4j.support.DoReturn.doReturn; /** * @author Michael Hunger diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/IndexingPropertyFieldAccessorListenerFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/IndexingPropertyFieldAccessorListenerFactory.java similarity index 95% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/IndexingPropertyFieldAccessorListenerFactory.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/IndexingPropertyFieldAccessorListenerFactory.java index 5399546bd..4ce8c427e 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/IndexingPropertyFieldAccessorListenerFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/IndexingPropertyFieldAccessorListenerFactory.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.fieldaccess; +package org.springframework.data.neo4j.fieldaccess; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.neo4j.graphdb.PropertyContainer; import org.neo4j.graphdb.index.Index; import org.neo4j.index.lucene.ValueContext; -import org.springframework.data.graph.annotation.Indexed; -import org.springframework.data.graph.core.GraphBacked; -import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; +import org.springframework.data.neo4j.annotation.Indexed; +import org.springframework.data.neo4j.core.GraphBacked; +import org.springframework.data.neo4j.support.GraphDatabaseContext; import java.lang.reflect.AnnotatedElement; import java.lang.reflect.Field; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/JpaIdFieldAccessListenerFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/JpaIdFieldAccessListenerFactory.java similarity index 90% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/JpaIdFieldAccessListenerFactory.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/JpaIdFieldAccessListenerFactory.java index adb20fe02..f8178590a 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/JpaIdFieldAccessListenerFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/JpaIdFieldAccessListenerFactory.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.fieldaccess; +package org.springframework.data.neo4j.fieldaccess; -import org.springframework.data.graph.core.EntityState; -import org.springframework.data.graph.core.NodeBacked; +import org.springframework.data.neo4j.core.EntityState; +import org.springframework.data.neo4j.core.NodeBacked; import javax.persistence.Id; import java.lang.reflect.Field; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/ManagedFieldAccessorSet.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/ManagedFieldAccessorSet.java similarity index 92% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/ManagedFieldAccessorSet.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/ManagedFieldAccessorSet.java index 199bddd2d..c5fc53bd6 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/ManagedFieldAccessorSet.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/ManagedFieldAccessorSet.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.fieldaccess; +package org.springframework.data.neo4j.fieldaccess; import org.neo4j.graphdb.Node; -import org.springframework.data.graph.core.EntityState; -import org.springframework.data.graph.core.NodeBacked; -import org.springframework.data.graph.core.RelationshipBacked; -import org.springframework.data.graph.neo4j.support.DoReturn; +import org.springframework.data.neo4j.core.EntityState; +import org.springframework.data.neo4j.core.NodeBacked; +import org.springframework.data.neo4j.core.RelationshipBacked; +import org.springframework.data.neo4j.support.DoReturn; import java.lang.reflect.Field; import java.util.AbstractSet; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/Neo4jConversionServiceFactoryBean.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/Neo4jConversionServiceFactoryBean.java similarity index 98% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/Neo4jConversionServiceFactoryBean.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/Neo4jConversionServiceFactoryBean.java index 83fec8d2b..6d6adec9c 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/Neo4jConversionServiceFactoryBean.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/Neo4jConversionServiceFactoryBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.fieldaccess; +package org.springframework.data.neo4j.fieldaccess; import org.springframework.beans.factory.FactoryBean; import org.springframework.core.convert.ConversionService; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/NodeDelegatingFieldAccessorFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/NodeDelegatingFieldAccessorFactory.java similarity index 92% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/NodeDelegatingFieldAccessorFactory.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/NodeDelegatingFieldAccessorFactory.java index 750a819f4..588566f1b 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/NodeDelegatingFieldAccessorFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/NodeDelegatingFieldAccessorFactory.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.fieldaccess; +package org.springframework.data.neo4j.fieldaccess; -import org.springframework.data.graph.core.NodeBacked; -import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; +import org.springframework.data.neo4j.core.NodeBacked; +import org.springframework.data.neo4j.support.GraphDatabaseContext; import java.util.Arrays; import java.util.Collection; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/NodeRelationshipFieldAccessorFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/NodeRelationshipFieldAccessorFactory.java similarity index 88% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/NodeRelationshipFieldAccessorFactory.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/NodeRelationshipFieldAccessorFactory.java index ebea6f5a1..788010753 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/NodeRelationshipFieldAccessorFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/NodeRelationshipFieldAccessorFactory.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.fieldaccess; +package org.springframework.data.neo4j.fieldaccess; import org.neo4j.graphdb.Direction; import org.neo4j.graphdb.DynamicRelationshipType; -import org.springframework.data.graph.annotation.RelatedTo; -import org.springframework.data.graph.core.NodeBacked; -import org.springframework.data.graph.neo4j.support.GenericTypeExtractor; -import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; +import org.springframework.data.neo4j.annotation.RelatedTo; +import org.springframework.data.neo4j.core.NodeBacked; +import org.springframework.data.neo4j.support.GenericTypeExtractor; +import org.springframework.data.neo4j.support.GraphDatabaseContext; import java.lang.reflect.Field; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/NodeToNodesRelationshipFieldAccessor.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/NodeToNodesRelationshipFieldAccessor.java similarity index 90% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/NodeToNodesRelationshipFieldAccessor.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/NodeToNodesRelationshipFieldAccessor.java index 554f5163d..6436860ed 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/NodeToNodesRelationshipFieldAccessor.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/NodeToNodesRelationshipFieldAccessor.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.fieldaccess; +package org.springframework.data.neo4j.fieldaccess; import org.neo4j.graphdb.Direction; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Relationship; import org.neo4j.graphdb.RelationshipType; -import org.springframework.data.graph.core.GraphBacked; -import org.springframework.data.graph.core.NodeBacked; -import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; +import org.springframework.data.neo4j.core.GraphBacked; +import org.springframework.data.neo4j.core.NodeBacked; +import org.springframework.data.neo4j.support.GraphDatabaseContext; import java.lang.reflect.Field; import java.util.HashSet; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/OneToNRelationshipEntityFieldAccessorFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/OneToNRelationshipEntityFieldAccessorFactory.java similarity index 92% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/OneToNRelationshipEntityFieldAccessorFactory.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/OneToNRelationshipEntityFieldAccessorFactory.java index 06d2b2c0a..d19fedc0e 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/OneToNRelationshipEntityFieldAccessorFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/OneToNRelationshipEntityFieldAccessorFactory.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.fieldaccess; +package org.springframework.data.neo4j.fieldaccess; import org.neo4j.graphdb.*; import org.springframework.dao.InvalidDataAccessApiUsageException; -import org.springframework.data.graph.annotation.RelatedToVia; -import org.springframework.data.graph.core.NodeBacked; -import org.springframework.data.graph.core.RelationshipBacked; -import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; +import org.springframework.data.neo4j.annotation.RelatedToVia; +import org.springframework.data.neo4j.core.NodeBacked; +import org.springframework.data.neo4j.core.RelationshipBacked; +import org.springframework.data.neo4j.support.GraphDatabaseContext; import java.lang.reflect.Field; import java.util.HashSet; import java.util.Set; -import static org.springframework.data.graph.neo4j.support.DoReturn.doReturn; +import static org.springframework.data.neo4j.support.DoReturn.doReturn; public class OneToNRelationshipEntityFieldAccessorFactory implements FieldAccessorFactory { diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/OneToNRelationshipFieldAccessorFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/OneToNRelationshipFieldAccessorFactory.java similarity index 89% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/OneToNRelationshipFieldAccessorFactory.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/OneToNRelationshipFieldAccessorFactory.java index a000dcbe0..5cd57aec2 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/OneToNRelationshipFieldAccessorFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/OneToNRelationshipFieldAccessorFactory.java @@ -14,21 +14,21 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.fieldaccess; +package org.springframework.data.neo4j.fieldaccess; import org.neo4j.graphdb.Direction; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.RelationshipType; -import org.springframework.data.graph.annotation.RelatedTo; -import org.springframework.data.graph.core.NodeBacked; -import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; +import org.springframework.data.neo4j.annotation.RelatedTo; +import org.springframework.data.neo4j.core.NodeBacked; +import org.springframework.data.neo4j.support.GraphDatabaseContext; import java.lang.reflect.Field; import java.util.Collection; import java.util.Collections; import java.util.Set; -import static org.springframework.data.graph.neo4j.support.DoReturn.doReturn; +import static org.springframework.data.neo4j.support.DoReturn.doReturn; public class OneToNRelationshipFieldAccessorFactory extends NodeRelationshipFieldAccessorFactory { diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/PropertyFieldAccessorFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/PropertyFieldAccessorFactory.java similarity index 95% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/PropertyFieldAccessorFactory.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/PropertyFieldAccessorFactory.java index 0f0b6a804..2c7eb9d7a 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/PropertyFieldAccessorFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/PropertyFieldAccessorFactory.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.fieldaccess; +package org.springframework.data.neo4j.fieldaccess; import org.neo4j.graphdb.PropertyContainer; import org.springframework.core.convert.ConversionService; -import org.springframework.data.graph.core.GraphBacked; +import org.springframework.data.neo4j.core.GraphBacked; import java.lang.reflect.Field; -import static org.springframework.data.graph.neo4j.support.DoReturn.doReturn; +import static org.springframework.data.neo4j.support.DoReturn.doReturn; /** * @author Michael Hunger diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/QueryFieldAccessorFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/QueryFieldAccessorFactory.java similarity index 91% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/QueryFieldAccessorFactory.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/QueryFieldAccessorFactory.java index b1ecb7fc1..14058ed62 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/QueryFieldAccessorFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/QueryFieldAccessorFactory.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.fieldaccess; +package org.springframework.data.neo4j.fieldaccess; import org.springframework.dao.InvalidDataAccessApiUsageException; -import org.springframework.data.graph.annotation.Query; -import org.springframework.data.graph.core.NodeBacked; -import org.springframework.data.graph.neo4j.support.GenericTypeExtractor; +import org.springframework.data.neo4j.annotation.Query; +import org.springframework.data.neo4j.core.NodeBacked; +import org.springframework.data.neo4j.support.GenericTypeExtractor; import java.lang.reflect.Field; import java.util.Map; -import static org.springframework.data.graph.neo4j.support.DoReturn.doReturn; +import static org.springframework.data.neo4j.support.DoReturn.doReturn; public class QueryFieldAccessorFactory implements FieldAccessorFactory { @Override diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/ReadOnlyOneToNRelationshipFieldAccessorFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/ReadOnlyOneToNRelationshipFieldAccessorFactory.java similarity index 90% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/ReadOnlyOneToNRelationshipFieldAccessorFactory.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/ReadOnlyOneToNRelationshipFieldAccessorFactory.java index 5d8011033..d53d70307 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/ReadOnlyOneToNRelationshipFieldAccessorFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/ReadOnlyOneToNRelationshipFieldAccessorFactory.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.fieldaccess; +package org.springframework.data.neo4j.fieldaccess; import org.neo4j.graphdb.Direction; import org.neo4j.graphdb.RelationshipType; import org.springframework.dao.InvalidDataAccessApiUsageException; -import org.springframework.data.graph.annotation.RelatedTo; -import org.springframework.data.graph.core.NodeBacked; -import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; +import org.springframework.data.neo4j.annotation.RelatedTo; +import org.springframework.data.neo4j.core.NodeBacked; +import org.springframework.data.neo4j.support.GraphDatabaseContext; import java.lang.reflect.Field; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/RelationshipNodeFieldAccessorFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/RelationshipNodeFieldAccessorFactory.java similarity index 89% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/RelationshipNodeFieldAccessorFactory.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/RelationshipNodeFieldAccessorFactory.java index dc9c2d14c..b6eead600 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/RelationshipNodeFieldAccessorFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/RelationshipNodeFieldAccessorFactory.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.fieldaccess; +package org.springframework.data.neo4j.fieldaccess; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Relationship; import org.springframework.dao.InvalidDataAccessApiUsageException; -import org.springframework.data.graph.annotation.EndNode; -import org.springframework.data.graph.annotation.StartNode; -import org.springframework.data.graph.core.NodeBacked; -import org.springframework.data.graph.core.RelationshipBacked; -import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; +import org.springframework.data.neo4j.annotation.EndNode; +import org.springframework.data.neo4j.annotation.StartNode; +import org.springframework.data.neo4j.core.NodeBacked; +import org.springframework.data.neo4j.core.RelationshipBacked; +import org.springframework.data.neo4j.support.GraphDatabaseContext; import java.lang.reflect.Field; -import static org.springframework.data.graph.neo4j.support.DoReturn.doReturn; +import static org.springframework.data.neo4j.support.DoReturn.doReturn; /** * @author Michael Hunger diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/SingleRelationshipFieldAccessorFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/SingleRelationshipFieldAccessorFactory.java similarity index 89% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/SingleRelationshipFieldAccessorFactory.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/SingleRelationshipFieldAccessorFactory.java index 32544a330..137304388 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/SingleRelationshipFieldAccessorFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/SingleRelationshipFieldAccessorFactory.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.fieldaccess; +package org.springframework.data.neo4j.fieldaccess; import org.neo4j.graphdb.Direction; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.RelationshipType; -import org.springframework.data.graph.annotation.RelatedTo; -import org.springframework.data.graph.core.NodeBacked; -import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; +import org.springframework.data.neo4j.annotation.RelatedTo; +import org.springframework.data.neo4j.core.NodeBacked; +import org.springframework.data.neo4j.support.GraphDatabaseContext; import java.lang.reflect.Field; import java.util.Collections; import java.util.Set; -import static org.springframework.data.graph.neo4j.support.DoReturn.doReturn; +import static org.springframework.data.neo4j.support.DoReturn.doReturn; public class SingleRelationshipFieldAccessorFactory extends NodeRelationshipFieldAccessorFactory { diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/TransientFieldAccessorFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/TransientFieldAccessorFactory.java similarity index 94% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/TransientFieldAccessorFactory.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/TransientFieldAccessorFactory.java index 4402f389c..b3a6960bf 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/TransientFieldAccessorFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/TransientFieldAccessorFactory.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.fieldaccess; +package org.springframework.data.neo4j.fieldaccess; import org.neo4j.graphdb.PropertyContainer; -import org.springframework.data.graph.core.GraphBacked; +import org.springframework.data.neo4j.core.GraphBacked; import java.lang.reflect.Field; import java.lang.reflect.Modifier; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/TraversalFieldAccessorFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/TraversalFieldAccessorFactory.java similarity index 89% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/TraversalFieldAccessorFactory.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/TraversalFieldAccessorFactory.java index 4dab0f8a5..668c5578d 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/TraversalFieldAccessorFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/TraversalFieldAccessorFactory.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.fieldaccess; +package org.springframework.data.neo4j.fieldaccess; import org.neo4j.graphdb.traversal.TraversalDescription; import org.springframework.dao.InvalidDataAccessApiUsageException; -import org.springframework.data.graph.annotation.GraphTraversal; -import org.springframework.data.graph.core.FieldTraversalDescriptionBuilder; -import org.springframework.data.graph.core.NodeBacked; -import org.springframework.data.graph.neo4j.repository.DirectGraphRepositoryFactory; +import org.springframework.data.neo4j.annotation.GraphTraversal; +import org.springframework.data.neo4j.core.FieldTraversalDescriptionBuilder; +import org.springframework.data.neo4j.core.NodeBacked; +import org.springframework.data.neo4j.repository.DirectGraphRepositoryFactory; import java.lang.reflect.Constructor; import java.lang.reflect.Field; -import static org.springframework.data.graph.neo4j.support.DoReturn.doReturn; +import static org.springframework.data.neo4j.support.DoReturn.doReturn; public class TraversalFieldAccessorFactory implements FieldAccessorFactory { @Override diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/ValidatingNodePropertyFieldAccessorListenerFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/ValidatingNodePropertyFieldAccessorListenerFactory.java similarity index 94% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/ValidatingNodePropertyFieldAccessorListenerFactory.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/ValidatingNodePropertyFieldAccessorListenerFactory.java index 2d98c25e8..07628b4c4 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/fieldaccess/ValidatingNodePropertyFieldAccessorListenerFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/fieldaccess/ValidatingNodePropertyFieldAccessorListenerFactory.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.fieldaccess; +package org.springframework.data.neo4j.fieldaccess; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.neo4j.graphdb.PropertyContainer; -import org.springframework.data.graph.core.GraphBacked; -import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; +import org.springframework.data.neo4j.core.GraphBacked; +import org.springframework.data.neo4j.support.GraphDatabaseContext; import javax.validation.Constraint; import javax.validation.ConstraintViolation; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/mapping/AnnotationBasedRelationshipInfo.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/mapping/AnnotationBasedRelationshipInfo.java similarity index 80% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/mapping/AnnotationBasedRelationshipInfo.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/mapping/AnnotationBasedRelationshipInfo.java index 1f543accc..baa9eaee2 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/mapping/AnnotationBasedRelationshipInfo.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/mapping/AnnotationBasedRelationshipInfo.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.mapping; +package org.springframework.data.neo4j.mapping; -import org.springframework.data.graph.annotation.RelatedTo; -import org.springframework.data.graph.core.Direction; +import org.springframework.data.neo4j.annotation.RelatedTo; +import org.springframework.data.neo4j.core.Direction; import org.springframework.util.Assert; /** @@ -41,7 +41,7 @@ class AnnotationBasedRelationshipInfo implements RelationshipInfo { /* * (non-Javadoc) - * @see org.springframework.data.graph.neo4j.mapping.RelationshipInfo#getDirection() + * @see org.springframework.data.neo4j.mapping.RelationshipInfo#getDirection() */ @Override public Direction getDirection() { @@ -50,7 +50,7 @@ class AnnotationBasedRelationshipInfo implements RelationshipInfo { /* * (non-Javadoc) - * @see org.springframework.data.graph.neo4j.mapping.RelationshipInfo#getType() + * @see org.springframework.data.neo4j.mapping.RelationshipInfo#getType() */ @Override public String getType() { diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/mapping/Neo4JMappingContext.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/mapping/Neo4JMappingContext.java similarity index 97% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/mapping/Neo4JMappingContext.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/mapping/Neo4JMappingContext.java index 043beabc7..974ae767f 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/mapping/Neo4JMappingContext.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/mapping/Neo4JMappingContext.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.mapping; +package org.springframework.data.neo4j.mapping; import java.beans.PropertyDescriptor; import java.lang.reflect.Field; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/mapping/Neo4JPersistentEntity.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/mapping/Neo4JPersistentEntity.java similarity index 94% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/mapping/Neo4JPersistentEntity.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/mapping/Neo4JPersistentEntity.java index 10517cfdf..64608a98a 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/mapping/Neo4JPersistentEntity.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/mapping/Neo4JPersistentEntity.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.mapping; +package org.springframework.data.neo4j.mapping; import org.springframework.data.mapping.PersistentEntity; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/mapping/Neo4JPersistentEntityImpl.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/mapping/Neo4JPersistentEntityImpl.java similarity index 95% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/mapping/Neo4JPersistentEntityImpl.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/mapping/Neo4JPersistentEntityImpl.java index 67211ad48..6aa29adac 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/mapping/Neo4JPersistentEntityImpl.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/mapping/Neo4JPersistentEntityImpl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.mapping; +package org.springframework.data.neo4j.mapping; import org.springframework.data.mapping.model.BasicPersistentEntity; import org.springframework.data.util.TypeInformation; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/mapping/Neo4JPersistentProperty.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/mapping/Neo4JPersistentProperty.java similarity index 96% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/mapping/Neo4JPersistentProperty.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/mapping/Neo4JPersistentProperty.java index 37a7aa5a4..243cbf47a 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/mapping/Neo4JPersistentProperty.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/mapping/Neo4JPersistentProperty.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.mapping; +package org.springframework.data.neo4j.mapping; import org.springframework.data.mapping.PersistentProperty; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/mapping/Neo4JPersistentPropertyImpl.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/mapping/Neo4JPersistentPropertyImpl.java similarity index 88% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/mapping/Neo4JPersistentPropertyImpl.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/mapping/Neo4JPersistentPropertyImpl.java index b7d3c6725..9a6a5561c 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/mapping/Neo4JPersistentPropertyImpl.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/mapping/Neo4JPersistentPropertyImpl.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.mapping; +package org.springframework.data.neo4j.mapping; import java.beans.PropertyDescriptor; import java.lang.reflect.Field; -import org.springframework.data.graph.annotation.GraphId; -import org.springframework.data.graph.annotation.RelatedTo; +import org.springframework.data.neo4j.annotation.GraphId; +import org.springframework.data.neo4j.annotation.RelatedTo; import org.springframework.data.mapping.Association; import org.springframework.data.mapping.PersistentEntity; import org.springframework.data.mapping.model.AbstractPersistentProperty; @@ -75,7 +75,7 @@ Neo4JPersistentProperty { /* * (non-Javadoc) - * @see org.springframework.data.graph.neo4j.mapping.Neo4JPersistentProperty#isRelationship() + * @see org.springframework.data.neo4j.mapping.Neo4JPersistentProperty#isRelationship() */ @Override public boolean isRelationship() { @@ -84,7 +84,7 @@ Neo4JPersistentProperty { /* * (non-Javadoc) - * @see org.springframework.data.graph.neo4j.mapping.Neo4JPersistentProperty#getRelationShipInfo() + * @see org.springframework.data.neo4j.mapping.Neo4JPersistentProperty#getRelationShipInfo() */ @Override public RelationshipInfo getRelationshipInfo() { diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/mapping/RelationshipInfo.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/mapping/RelationshipInfo.java similarity index 89% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/mapping/RelationshipInfo.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/mapping/RelationshipInfo.java index 0e4bdfac4..1e5a749ef 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/mapping/RelationshipInfo.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/mapping/RelationshipInfo.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.mapping; +package org.springframework.data.neo4j.mapping; -import org.springframework.data.graph.core.Direction; +import org.springframework.data.neo4j.core.Direction; /** * Captures information about a relationship. diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/AbstractGraphRepository.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/AbstractGraphRepository.java similarity index 97% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/AbstractGraphRepository.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/AbstractGraphRepository.java index 68fe2fdb5..6a7c9a4fd 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/AbstractGraphRepository.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/AbstractGraphRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.repository; +package org.springframework.data.neo4j.repository; import org.apache.lucene.search.NumericRangeQuery; import org.neo4j.graphdb.NotFoundException; @@ -27,8 +27,8 @@ import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; -import org.springframework.data.graph.core.GraphBacked; -import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; +import org.springframework.data.neo4j.core.GraphBacked; +import org.springframework.data.neo4j.support.GraphDatabaseContext; import java.util.ArrayList; import java.util.Collections; @@ -36,7 +36,7 @@ import java.util.Iterator; import java.util.List; /** - * Repository like finder for Node and Relationship-Entities. Provides finder methods for direct access, access via {@link org.springframework.data.graph.core.TypeRepresentationStrategy} + * Repository like finder for Node and Relationship-Entities. Provides finder methods for direct access, access via {@link org.springframework.data.neo4j.core.TypeRepresentationStrategy} * and indexing. * * @param GraphBacked target of this finder, enables the finder methods to return this concrete type diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/CRUDRepository.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/CRUDRepository.java similarity index 96% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/CRUDRepository.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/CRUDRepository.java index 4abc456eb..2be6aec0f 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/CRUDRepository.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/CRUDRepository.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.repository; +package org.springframework.data.neo4j.repository; import org.neo4j.helpers.collection.ClosableIterable; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; -import org.springframework.data.graph.core.GraphBacked; +import org.springframework.data.neo4j.core.GraphBacked; import org.springframework.data.repository.NoRepositoryBean; import org.springframework.data.repository.PagingAndSortingRepository; import org.springframework.transaction.annotation.Transactional; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/DirectGraphRepositoryFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/DirectGraphRepositoryFactory.java similarity index 82% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/DirectGraphRepositoryFactory.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/DirectGraphRepositoryFactory.java index b14ff5a85..f5bf57deb 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/DirectGraphRepositoryFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/DirectGraphRepositoryFactory.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.repository; +package org.springframework.data.neo4j.repository; -import org.springframework.data.graph.core.GraphBacked; -import org.springframework.data.graph.core.NodeBacked; -import org.springframework.data.graph.core.RelationshipBacked; -import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; +import org.springframework.data.neo4j.core.GraphBacked; +import org.springframework.data.neo4j.core.NodeBacked; +import org.springframework.data.neo4j.core.RelationshipBacked; +import org.springframework.data.neo4j.support.GraphDatabaseContext; /** * Simple Factory for {@link NodeGraphRepository} instances. diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/GraphEntityInformation.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/GraphEntityInformation.java similarity index 89% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/GraphEntityInformation.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/GraphEntityInformation.java index 7ac59dd56..3ea397c7d 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/GraphEntityInformation.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/GraphEntityInformation.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.repository; +package org.springframework.data.neo4j.repository; import org.neo4j.graphdb.PropertyContainer; -import org.springframework.data.graph.core.GraphBacked; +import org.springframework.data.neo4j.core.GraphBacked; import org.springframework.data.repository.core.EntityInformation; /** diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/GraphMetamodelEntityInformation.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/GraphMetamodelEntityInformation.java similarity index 84% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/GraphMetamodelEntityInformation.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/GraphMetamodelEntityInformation.java index 59fd4d7ff..7a5120369 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/GraphMetamodelEntityInformation.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/GraphMetamodelEntityInformation.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.repository; +package org.springframework.data.neo4j.repository; /** * @author mh @@ -22,11 +22,11 @@ package org.springframework.data.graph.neo4j.repository; */ import org.neo4j.graphdb.PropertyContainer; -import org.springframework.data.graph.annotation.NodeEntity; -import org.springframework.data.graph.core.GraphBacked; -import org.springframework.data.graph.core.NodeBacked; -import org.springframework.data.graph.core.RelationshipBacked; -import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; +import org.springframework.data.neo4j.annotation.NodeEntity; +import org.springframework.data.neo4j.core.GraphBacked; +import org.springframework.data.neo4j.core.NodeBacked; +import org.springframework.data.neo4j.core.RelationshipBacked; +import org.springframework.data.neo4j.support.GraphDatabaseContext; import org.springframework.data.repository.core.support.AbstractEntityInformation; public class GraphMetamodelEntityInformation> extends AbstractEntityInformation implements GraphEntityInformation { diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/GraphRepository.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/GraphRepository.java similarity index 88% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/GraphRepository.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/GraphRepository.java index 6f503f856..3bac50697 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/GraphRepository.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/GraphRepository.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.repository; +package org.springframework.data.neo4j.repository; -import org.springframework.data.graph.core.GraphBacked; +import org.springframework.data.neo4j.core.GraphBacked; import org.springframework.data.repository.NoRepositoryBean; /** diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/GraphRepositoryFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/GraphRepositoryFactory.java similarity index 95% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/GraphRepositoryFactory.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/GraphRepositoryFactory.java index 319869601..3ef2d3fc4 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/GraphRepositoryFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/GraphRepositoryFactory.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.repository; +package org.springframework.data.neo4j.repository; import org.neo4j.helpers.collection.IteratorUtil; import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; -import org.springframework.data.graph.annotation.Query; -import org.springframework.data.graph.annotation.NodeEntity; -import org.springframework.data.graph.annotation.RelationshipEntity; -import org.springframework.data.graph.core.NodeBacked; -import org.springframework.data.graph.core.RelationshipBacked; -import org.springframework.data.graph.neo4j.support.GenericTypeExtractor; -import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; -import org.springframework.data.graph.neo4j.support.query.QueryExecutor; +import org.springframework.data.neo4j.annotation.Query; +import org.springframework.data.neo4j.annotation.NodeEntity; +import org.springframework.data.neo4j.annotation.RelationshipEntity; +import org.springframework.data.neo4j.core.NodeBacked; +import org.springframework.data.neo4j.core.RelationshipBacked; +import org.springframework.data.neo4j.support.GenericTypeExtractor; +import org.springframework.data.neo4j.support.GraphDatabaseContext; +import org.springframework.data.neo4j.support.query.QueryExecutor; import org.springframework.data.repository.core.EntityInformation; import org.springframework.data.repository.core.NamedQueries; import org.springframework.data.repository.core.RepositoryMetadata; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/GraphRepositoryFactoryBean.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/GraphRepositoryFactoryBean.java similarity index 90% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/GraphRepositoryFactoryBean.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/GraphRepositoryFactoryBean.java index 86d9ba52e..0b5380daa 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/GraphRepositoryFactoryBean.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/GraphRepositoryFactoryBean.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.repository; +package org.springframework.data.neo4j.repository; import org.neo4j.graphdb.PropertyContainer; -import org.springframework.data.graph.core.GraphBacked; -import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; +import org.springframework.data.neo4j.core.GraphBacked; +import org.springframework.data.neo4j.support.GraphDatabaseContext; import org.springframework.data.repository.core.support.RepositoryFactorySupport; import org.springframework.data.repository.core.support.TransactionalRepositoryFactoryBeanSupport; import org.springframework.util.Assert; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/IndexRepository.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/IndexRepository.java similarity index 90% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/IndexRepository.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/IndexRepository.java index 99adc41e4..bfad4d192 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/IndexRepository.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/IndexRepository.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.repository; +package org.springframework.data.neo4j.repository; import org.neo4j.helpers.collection.ClosableIterable; -import org.springframework.data.graph.core.GraphBacked; +import org.springframework.data.neo4j.core.GraphBacked; /** * @author mh diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/NamedIndexRepository.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/NamedIndexRepository.java similarity index 91% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/NamedIndexRepository.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/NamedIndexRepository.java index 3e881ffa0..62b9524df 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/NamedIndexRepository.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/NamedIndexRepository.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.repository; +package org.springframework.data.neo4j.repository; import org.neo4j.helpers.collection.ClosableIterable; -import org.springframework.data.graph.core.GraphBacked; +import org.springframework.data.neo4j.core.GraphBacked; /** * @author mh diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/NodeGraphRepository.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/NodeGraphRepository.java similarity index 90% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/NodeGraphRepository.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/NodeGraphRepository.java index 34658f153..c2cd5bc4d 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/NodeGraphRepository.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/NodeGraphRepository.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.repository; +package org.springframework.data.neo4j.repository; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.traversal.TraversalDescription; -import org.springframework.data.graph.core.NodeBacked; -import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; +import org.springframework.data.neo4j.core.NodeBacked; +import org.springframework.data.neo4j.support.GraphDatabaseContext; public class NodeGraphRepository extends AbstractGraphRepository implements GraphRepository { diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/RelationshipGraphRepository.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/RelationshipGraphRepository.java similarity index 86% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/RelationshipGraphRepository.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/RelationshipGraphRepository.java index f45c39ba6..2234d0f8b 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/RelationshipGraphRepository.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/RelationshipGraphRepository.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.repository; +package org.springframework.data.neo4j.repository; import org.neo4j.graphdb.Relationship; import org.neo4j.graphdb.traversal.TraversalDescription; -import org.springframework.data.graph.core.NodeBacked; -import org.springframework.data.graph.core.RelationshipBacked; -import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; +import org.springframework.data.neo4j.core.NodeBacked; +import org.springframework.data.neo4j.core.RelationshipBacked; +import org.springframework.data.neo4j.support.GraphDatabaseContext; public class RelationshipGraphRepository extends AbstractGraphRepository implements GraphRepository { diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/TraversalRepository.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/TraversalRepository.java similarity index 87% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/TraversalRepository.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/TraversalRepository.java index 8d988c9ec..3f4a0ca69 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/TraversalRepository.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/TraversalRepository.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.repository; +package org.springframework.data.neo4j.repository; import org.neo4j.graphdb.traversal.TraversalDescription; -import org.springframework.data.graph.core.GraphBacked; -import org.springframework.data.graph.core.NodeBacked; +import org.springframework.data.neo4j.core.GraphBacked; +import org.springframework.data.neo4j.core.NodeBacked; /** * @author mh diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/query/CypherQuery.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/query/CypherQuery.java similarity index 93% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/query/CypherQuery.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/query/CypherQuery.java index 0ada9f34f..6d81d3f11 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/query/CypherQuery.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/query/CypherQuery.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.repository.query; +package org.springframework.data.neo4j.repository.query; import java.util.HashSet; import java.util.Set; -import org.springframework.data.graph.neo4j.mapping.Neo4JMappingContext; +import org.springframework.data.neo4j.mapping.Neo4JMappingContext; import org.springframework.data.repository.query.parser.Part; import org.springframework.data.util.TypeInformation; import org.springframework.util.Assert; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/query/MatchClause.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/query/MatchClause.java similarity index 91% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/query/MatchClause.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/query/MatchClause.java index 68e77f3d4..f7795710d 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/query/MatchClause.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/query/MatchClause.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.repository.query; +package org.springframework.data.neo4j.repository.query; -import org.springframework.data.graph.neo4j.mapping.Neo4JMappingContext; -import org.springframework.data.graph.neo4j.mapping.Neo4JPersistentProperty; -import org.springframework.data.graph.neo4j.mapping.RelationshipInfo; +import org.springframework.data.neo4j.mapping.Neo4JMappingContext; +import org.springframework.data.neo4j.mapping.Neo4JPersistentProperty; +import org.springframework.data.neo4j.mapping.RelationshipInfo; import org.springframework.data.repository.query.parser.Property; import org.springframework.util.Assert; import org.springframework.util.StringUtils; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/query/StartClause.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/query/StartClause.java similarity index 91% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/query/StartClause.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/query/StartClause.java index 06098d063..8d49b22b8 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/repository/query/StartClause.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/repository/query/StartClause.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.repository.query; +package org.springframework.data.neo4j.repository.query; class StartClause { diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/server/ProvidedClassPathXmlApplicationContext.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/server/ProvidedClassPathXmlApplicationContext.java similarity index 97% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/server/ProvidedClassPathXmlApplicationContext.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/server/ProvidedClassPathXmlApplicationContext.java index 9cdf407c7..8fbb37e52 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/server/ProvidedClassPathXmlApplicationContext.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/server/ProvidedClassPathXmlApplicationContext.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.server; +package org.springframework.data.neo4j.server; import org.neo4j.graphdb.GraphDatabaseService; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/server/SpringPluginInitializer.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/server/SpringPluginInitializer.java similarity index 98% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/server/SpringPluginInitializer.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/server/SpringPluginInitializer.java index e81f9e75d..586f3ec25 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/server/SpringPluginInitializer.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/server/SpringPluginInitializer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.server; +package org.springframework.data.neo4j.server; import org.apache.commons.configuration.Configuration; import org.neo4j.graphdb.GraphDatabaseService; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/DelegatingGraphDatabase.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/DelegatingGraphDatabase.java similarity index 92% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/DelegatingGraphDatabase.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/DelegatingGraphDatabase.java index b141ff7db..523128bae 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/DelegatingGraphDatabase.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/DelegatingGraphDatabase.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.support; +package org.springframework.data.neo4j.support; import org.neo4j.graphdb.*; import org.neo4j.graphdb.index.Index; @@ -23,11 +23,11 @@ import org.neo4j.graphdb.traversal.TraversalDescription; import org.neo4j.index.impl.lucene.LuceneIndexImplementation; import org.neo4j.kernel.Traversal; import org.springframework.core.convert.ConversionService; -import org.springframework.data.graph.core.GraphDatabase; -import org.springframework.data.graph.core.Property; -import org.springframework.data.graph.neo4j.support.query.ConversionServiceQueryResultConverter; -import org.springframework.data.graph.neo4j.support.query.EmbeddedQueryEngine; -import org.springframework.data.graph.neo4j.support.query.QueryEngine; +import org.springframework.data.neo4j.core.GraphDatabase; +import org.springframework.data.neo4j.core.Property; +import org.springframework.data.neo4j.support.query.ConversionServiceQueryResultConverter; +import org.springframework.data.neo4j.support.query.EmbeddedQueryEngine; +import org.springframework.data.neo4j.support.query.QueryEngine; import java.util.Map; /** diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/DoReturn.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/DoReturn.java similarity index 96% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/DoReturn.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/DoReturn.java index 87be8e833..3cdc8e210 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/DoReturn.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/DoReturn.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.support; +package org.springframework.data.neo4j.support; /** * Wrapper for return values of FieldAccessor methods. diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/GenericTypeExtractor.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/GenericTypeExtractor.java similarity index 97% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/GenericTypeExtractor.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/GenericTypeExtractor.java index bb07e6cc1..d1f936642 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/GenericTypeExtractor.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/GenericTypeExtractor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.support; +package org.springframework.data.neo4j.support; import org.springframework.data.domain.Page; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/GraphDatabaseContext.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/GraphDatabaseContext.java similarity index 98% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/GraphDatabaseContext.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/GraphDatabaseContext.java index 2f4d3b226..5c4e4129b 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/GraphDatabaseContext.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/GraphDatabaseContext.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.support; +package org.springframework.data.neo4j.support; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -25,8 +25,8 @@ import org.neo4j.helpers.collection.ClosableIterable; import org.neo4j.index.impl.lucene.LuceneIndexImplementation; import org.neo4j.kernel.AbstractGraphDatabase; import org.springframework.core.convert.ConversionService; -import org.springframework.data.graph.annotation.Indexed; -import org.springframework.data.graph.core.*; +import org.springframework.data.neo4j.annotation.Indexed; +import org.springframework.data.neo4j.core.*; import javax.transaction.Status; import javax.transaction.SystemException; @@ -36,7 +36,7 @@ import java.util.Map; /** * Mediator class for the graph related services like the {@link GraphDatabaseService}, the used - * {@link org.springframework.data.graph.core.TypeRepresentationStrategy}, entity instantiators for nodes and relationships as well as a spring conversion service. + * {@link org.springframework.data.neo4j.core.TypeRepresentationStrategy}, entity instantiators for nodes and relationships as well as a spring conversion service. * * It delegates the appropriate methods to those services. The services are not intended to be accessible from outside. * diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/GraphDatabaseFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/GraphDatabaseFactory.java similarity index 96% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/GraphDatabaseFactory.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/GraphDatabaseFactory.java index 9f9615337..642ae5085 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/GraphDatabaseFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/GraphDatabaseFactory.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.support; +package org.springframework.data.neo4j.support; import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.kernel.EmbeddedGraphDatabase; import org.springframework.beans.factory.FactoryBean; -import org.springframework.data.graph.core.GraphDatabase; +import org.springframework.data.neo4j.core.GraphDatabase; import javax.annotation.PreDestroy; import java.io.File; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/Tuple2.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/Tuple2.java similarity index 95% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/Tuple2.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/Tuple2.java index 35cae71ed..e7da0ac10 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/Tuple2.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/Tuple2.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.support; +package org.springframework.data.neo4j.support; /** * A simple class for holding a tuple of two typed elements. Useful for instance for map construction. diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/conversion/EntityResultConverter.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/conversion/EntityResultConverter.java similarity index 80% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/conversion/EntityResultConverter.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/conversion/EntityResultConverter.java index 84a9a1157..6e17d347c 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/conversion/EntityResultConverter.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/conversion/EntityResultConverter.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.support.conversion; +package org.springframework.data.neo4j.support.conversion; import org.springframework.core.convert.ConversionService; -import org.springframework.data.graph.core.EntityPath; -import org.springframework.data.graph.core.NodeBacked; -import org.springframework.data.graph.core.RelationshipBacked; -import org.springframework.data.graph.neo4j.conversion.DefaultConverter; -import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; -import org.springframework.data.graph.neo4j.support.path.ConvertingEntityPath; +import org.springframework.data.neo4j.core.EntityPath; +import org.springframework.data.neo4j.core.NodeBacked; +import org.springframework.data.neo4j.core.RelationshipBacked; +import org.springframework.data.neo4j.conversion.DefaultConverter; +import org.springframework.data.neo4j.support.GraphDatabaseContext; +import org.springframework.data.neo4j.support.path.ConvertingEntityPath; /** * @author mh diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/node/Neo4jHelper.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/node/Neo4jHelper.java similarity index 94% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/node/Neo4jHelper.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/node/Neo4jHelper.java index 6cf636321..389901527 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/node/Neo4jHelper.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/node/Neo4jHelper.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.support.node; +package org.springframework.data.neo4j.support.node; import org.neo4j.graphdb.*; import org.neo4j.graphdb.index.IndexManager; -import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; +import org.springframework.data.neo4j.support.GraphDatabaseContext; public abstract class Neo4jHelper { diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/node/Neo4jNodeBacking.aj b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/node/Neo4jNodeBacking.aj similarity index 90% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/node/Neo4jNodeBacking.aj rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/node/Neo4jNodeBacking.aj index 4b907afb1..b126cbfad 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/node/Neo4jNodeBacking.aj +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/node/Neo4jNodeBacking.aj @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.support.node; +package org.springframework.data.neo4j.support.node; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -25,28 +25,36 @@ import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Relationship; import org.neo4j.graphdb.traversal.TraversalDescription; import org.neo4j.graphdb.traversal.Traverser; -import org.springframework.data.graph.core.NodeBacked; -import org.springframework.data.graph.core.RelationshipBacked; -import org.springframework.data.graph.neo4j.support.DoReturn; -import org.springframework.data.graph.core.EntityPath; -import org.springframework.data.graph.core.EntityState; -import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; -import org.springframework.data.graph.annotation.*; +import org.springframework.data.neo4j.annotation.NodeEntity; +import org.springframework.data.neo4j.annotation.RelationshipEntity; +import org.springframework.data.neo4j.annotation.RelatedTo; +import org.springframework.data.neo4j.annotation.GraphProperty; +import org.springframework.data.neo4j.annotation.GraphId; +import org.springframework.data.neo4j.annotation.RelatedToVia; +import org.springframework.data.neo4j.annotation.GraphTraversal; + +import org.springframework.data.neo4j.core.NodeBacked; +import org.springframework.data.neo4j.core.RelationshipBacked; +import org.springframework.data.neo4j.support.DoReturn; +import org.springframework.data.neo4j.core.EntityPath; +import org.springframework.data.neo4j.core.EntityState; +import org.springframework.data.neo4j.support.GraphDatabaseContext; + +import org.springframework.data.neo4j.support.path.EntityPathPathIterableWrapper; +import org.springframework.data.neo4j.support.query.QueryExecutor; + import javax.persistence.Transient; import javax.persistence.Entity; -import org.springframework.data.graph.neo4j.support.path.EntityPathPathIterableWrapper; -import org.springframework.data.graph.neo4j.support.query.QueryExecutor; - import java.lang.reflect.Field; import java.util.Map; -import static org.springframework.data.graph.neo4j.support.DoReturn.unwrap; +import static org.springframework.data.neo4j.support.DoReturn.unwrap; /** * Aspect for handling node entity creation and field access (read & write) - * puts the underlying state (Node) into and delegates field access to an {@link org.springframework.data.graph.core.EntityState} instance, + * puts the underlying state (Node) into and delegates field access to an {@link org.springframework.data.neo4j.core.EntityState} instance, * created by a configured {@link NodeEntityStateFactory}. * * Handles constructor invocation and partial entities as well. @@ -89,7 +97,7 @@ public aspect Neo4jNodeBacking { // extends AbstractTypeAnnotatingMixinFields RelationshipBacked.entityState; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/relationship/RelationshipEntityInstantiator.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/relationship/RelationshipEntityInstantiator.java similarity index 93% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/relationship/RelationshipEntityInstantiator.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/relationship/RelationshipEntityInstantiator.java index 9fa787f99..3dafe68ad 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/relationship/RelationshipEntityInstantiator.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/relationship/RelationshipEntityInstantiator.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.support.relationship; +package org.springframework.data.neo4j.support.relationship; import org.neo4j.graphdb.Relationship; -import org.springframework.data.graph.core.RelationshipBacked; +import org.springframework.data.neo4j.core.RelationshipBacked; import org.springframework.data.persistence.AbstractConstructorEntityInstantiator; import sun.reflect.ReflectionFactory; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/relationship/RelationshipEntityState.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/relationship/RelationshipEntityState.java similarity index 93% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/relationship/RelationshipEntityState.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/relationship/RelationshipEntityState.java index 820b0cba4..9862afc20 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/relationship/RelationshipEntityState.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/relationship/RelationshipEntityState.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.support.relationship; +package org.springframework.data.neo4j.support.relationship; import org.neo4j.graphdb.NotInTransactionException; import org.neo4j.graphdb.Relationship; import org.springframework.dao.InvalidDataAccessResourceUsageException; -import org.springframework.data.graph.core.RelationshipBacked; -import org.springframework.data.graph.neo4j.fieldaccess.*; -import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; +import org.springframework.data.neo4j.core.RelationshipBacked; +import org.springframework.data.neo4j.fieldaccess.*; +import org.springframework.data.neo4j.support.GraphDatabaseContext; import java.util.Arrays; import java.util.Collection; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/relationship/RelationshipEntityStateFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/relationship/RelationshipEntityStateFactory.java similarity index 85% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/relationship/RelationshipEntityStateFactory.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/relationship/RelationshipEntityStateFactory.java index e7d6666f0..25a0734ca 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/relationship/RelationshipEntityStateFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/relationship/RelationshipEntityStateFactory.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.support.relationship; +package org.springframework.data.neo4j.support.relationship; import org.neo4j.graphdb.Relationship; -import org.springframework.data.graph.core.EntityState; -import org.springframework.data.graph.core.RelationshipBacked; -import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; +import org.springframework.data.neo4j.core.EntityState; +import org.springframework.data.neo4j.core.RelationshipBacked; +import org.springframework.data.neo4j.support.GraphDatabaseContext; import javax.annotation.PostConstruct; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/typerepresentation/IndexingNodeTypeRepresentationStrategy.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/typerepresentation/IndexingNodeTypeRepresentationStrategy.java similarity index 95% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/typerepresentation/IndexingNodeTypeRepresentationStrategy.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/typerepresentation/IndexingNodeTypeRepresentationStrategy.java index 4ac60c335..ddc57ee3f 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/typerepresentation/IndexingNodeTypeRepresentationStrategy.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/typerepresentation/IndexingNodeTypeRepresentationStrategy.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.support.typerepresentation; +package org.springframework.data.neo4j.support.typerepresentation; import org.neo4j.graphdb.*; import org.neo4j.graphdb.index.Index; @@ -23,10 +23,10 @@ import org.neo4j.helpers.Predicate; import org.neo4j.helpers.collection.ClosableIterable; import org.neo4j.helpers.collection.FilteringIterable; import org.neo4j.helpers.collection.IterableWrapper; -import org.springframework.data.graph.annotation.NodeEntity; -import org.springframework.data.graph.core.GraphBacked; -import org.springframework.data.graph.core.NodeBacked; -import org.springframework.data.graph.core.NodeTypeRepresentationStrategy; +import org.springframework.data.neo4j.annotation.NodeEntity; +import org.springframework.data.neo4j.core.GraphBacked; +import org.springframework.data.neo4j.core.NodeBacked; +import org.springframework.data.neo4j.core.NodeTypeRepresentationStrategy; import org.springframework.data.persistence.EntityInstantiator; import java.util.HashMap; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/typerepresentation/IndexingRelationshipTypeRepresentationStrategy.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/typerepresentation/IndexingRelationshipTypeRepresentationStrategy.java similarity index 95% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/typerepresentation/IndexingRelationshipTypeRepresentationStrategy.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/typerepresentation/IndexingRelationshipTypeRepresentationStrategy.java index dc0a48b8c..81315a028 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/typerepresentation/IndexingRelationshipTypeRepresentationStrategy.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/typerepresentation/IndexingRelationshipTypeRepresentationStrategy.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.support.typerepresentation; +package org.springframework.data.neo4j.support.typerepresentation; import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Node; @@ -26,10 +26,10 @@ import org.neo4j.helpers.Predicate; import org.neo4j.helpers.collection.ClosableIterable; import org.neo4j.helpers.collection.FilteringIterable; import org.neo4j.helpers.collection.IterableWrapper; -import org.springframework.data.graph.annotation.RelationshipEntity; -import org.springframework.data.graph.core.GraphBacked; -import org.springframework.data.graph.core.RelationshipBacked; -import org.springframework.data.graph.core.RelationshipTypeRepresentationStrategy; +import org.springframework.data.neo4j.annotation.RelationshipEntity; +import org.springframework.data.neo4j.core.GraphBacked; +import org.springframework.data.neo4j.core.RelationshipBacked; +import org.springframework.data.neo4j.core.RelationshipTypeRepresentationStrategy; import org.springframework.data.persistence.EntityInstantiator; import java.util.HashMap; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/typerepresentation/NoopNodeTypeRepresentationStrategy.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/typerepresentation/NoopNodeTypeRepresentationStrategy.java similarity index 90% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/typerepresentation/NoopNodeTypeRepresentationStrategy.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/typerepresentation/NoopNodeTypeRepresentationStrategy.java index 8a65a7a03..c09b62860 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/typerepresentation/NoopNodeTypeRepresentationStrategy.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/typerepresentation/NoopNodeTypeRepresentationStrategy.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.support.typerepresentation; +package org.springframework.data.neo4j.support.typerepresentation; import org.neo4j.graphdb.Node; import org.neo4j.helpers.collection.ClosableIterable; -import org.springframework.data.graph.core.NodeBacked; -import org.springframework.data.graph.core.NodeTypeRepresentationStrategy; +import org.springframework.data.neo4j.core.NodeBacked; +import org.springframework.data.neo4j.core.NodeTypeRepresentationStrategy; public class NoopNodeTypeRepresentationStrategy implements NodeTypeRepresentationStrategy { diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/typerepresentation/NoopRelationshipTypeRepresentationStrategy.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/typerepresentation/NoopRelationshipTypeRepresentationStrategy.java similarity index 91% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/typerepresentation/NoopRelationshipTypeRepresentationStrategy.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/typerepresentation/NoopRelationshipTypeRepresentationStrategy.java index b50018000..2c293ab09 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/typerepresentation/NoopRelationshipTypeRepresentationStrategy.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/typerepresentation/NoopRelationshipTypeRepresentationStrategy.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.support.typerepresentation; +package org.springframework.data.neo4j.support.typerepresentation; import org.neo4j.graphdb.Relationship; import org.neo4j.helpers.collection.ClosableIterable; -import org.springframework.data.graph.core.RelationshipBacked; -import org.springframework.data.graph.core.RelationshipTypeRepresentationStrategy; +import org.springframework.data.neo4j.core.RelationshipBacked; +import org.springframework.data.neo4j.core.RelationshipTypeRepresentationStrategy; public class NoopRelationshipTypeRepresentationStrategy implements RelationshipTypeRepresentationStrategy { diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/typerepresentation/SubReferenceNodeTypeRepresentationStrategy.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/typerepresentation/SubReferenceNodeTypeRepresentationStrategy.java similarity index 97% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/typerepresentation/SubReferenceNodeTypeRepresentationStrategy.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/typerepresentation/SubReferenceNodeTypeRepresentationStrategy.java index 68591dbea..c1f0b0fd4 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/typerepresentation/SubReferenceNodeTypeRepresentationStrategy.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/typerepresentation/SubReferenceNodeTypeRepresentationStrategy.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.support.typerepresentation; +package org.springframework.data.neo4j.support.typerepresentation; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -24,8 +24,8 @@ import org.neo4j.helpers.collection.ClosableIterable; import org.neo4j.helpers.collection.CombiningIterable; import org.neo4j.helpers.collection.IterableWrapper; import org.neo4j.kernel.Traversal; -import org.springframework.data.graph.core.NodeBacked; -import org.springframework.data.graph.core.NodeTypeRepresentationStrategy; +import org.springframework.data.neo4j.core.NodeBacked; +import org.springframework.data.neo4j.core.NodeTypeRepresentationStrategy; import org.springframework.data.persistence.EntityInstantiator; import java.util.Collection; @@ -34,7 +34,7 @@ import java.util.LinkedList; import java.util.List; /** - * A {@link org.springframework.data.graph.core.TypeRepresentationStrategy} that uses a hierarchy of reference nodes to represent the java type of the entity in the + * A {@link org.springframework.data.neo4j.core.TypeRepresentationStrategy} that uses a hierarchy of reference nodes to represent the java type of the entity in the * graph database. Entity nodes are related to their concrete type via an INSTANCE_OF relationship, the type hierarchy is * related to supertypes via SUBCLASS_OF relationships. Each concrete subreference node keeps a count property with the number of * instances of this class in the graph. diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/typerepresentation/TypeRepresentationStrategyFactory.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/typerepresentation/TypeRepresentationStrategyFactory.java similarity index 96% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/typerepresentation/TypeRepresentationStrategyFactory.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/typerepresentation/TypeRepresentationStrategyFactory.java index 98efa7b5d..cede57cda 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/support/typerepresentation/TypeRepresentationStrategyFactory.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/typerepresentation/TypeRepresentationStrategyFactory.java @@ -14,13 +14,12 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.support.typerepresentation; +package org.springframework.data.neo4j.support.typerepresentation; import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Relationship; -import org.springframework.data.graph.core.*; -import org.springframework.data.graph.neo4j.support.typerepresentation.*; +import org.springframework.data.neo4j.core.*; import org.springframework.data.persistence.EntityInstantiator; public class TypeRepresentationStrategyFactory { diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/GraphCallback.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/template/GraphCallback.java similarity index 90% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/GraphCallback.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/template/GraphCallback.java index 826f41ad4..5584a48ff 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/GraphCallback.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/template/GraphCallback.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.template; +package org.springframework.data.neo4j.template; -import org.springframework.data.graph.core.GraphDatabase; +import org.springframework.data.neo4j.core.GraphDatabase; public interface GraphCallback { T doWithGraph(final GraphDatabase graph) throws Exception; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/Neo4jExceptionTranslator.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/template/Neo4jExceptionTranslator.java similarity index 91% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/Neo4jExceptionTranslator.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/template/Neo4jExceptionTranslator.java index f6f26bff4..420814618 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/Neo4jExceptionTranslator.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/template/Neo4jExceptionTranslator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.template; +package org.springframework.data.neo4j.template; import org.neo4j.graphdb.NotFoundException; import org.neo4j.graphdb.NotInTransactionException; @@ -26,10 +26,8 @@ import org.neo4j.kernel.impl.nioneo.store.StoreFailureException; import org.neo4j.kernel.impl.persistence.IdGenerationFailedException; import org.neo4j.kernel.impl.transaction.IllegalResourceException; import org.neo4j.kernel.impl.transaction.LockException; -import org.neo4j.kernel.impl.transaction.xaframework.ReadPastEndException; import org.springframework.dao.*; import org.springframework.dao.support.PersistenceExceptionTranslator; -import org.springframework.data.graph.UncategorizedGraphStoreException; /** * @author mh @@ -48,7 +46,7 @@ public class Neo4jExceptionTranslator implements PersistenceExceptionTranslator } catch(NotInTransactionException nit) { throw new InvalidDataAccessApiUsageException(nit.getMessage(), nit); } catch(TransactionFailureException tfe) { - throw new UncategorizedGraphStoreException(tfe.getMessage(), tfe); + throw new org.springframework.data.neo4j.core.UncategorizedGraphStoreException(tfe.getMessage(), tfe); } catch(ReadOnlyDbException rodbe) { throw new InvalidDataAccessResourceUsageException(rodbe.getMessage(), rodbe); } catch(IllegalResourceException ire) { diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/Neo4jOperations.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/template/Neo4jOperations.java similarity index 94% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/Neo4jOperations.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/template/Neo4jOperations.java index 43a52c925..be482b73a 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/Neo4jOperations.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/template/Neo4jOperations.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.template; +package org.springframework.data.neo4j.template; import org.neo4j.graphdb.*; import org.neo4j.graphdb.traversal.TraversalDescription; import org.neo4j.helpers.collection.ClosableIterable; -import org.springframework.data.graph.core.Property; -import org.springframework.data.graph.neo4j.support.path.PathMapper; -import org.springframework.data.graph.neo4j.support.query.QueryEngine; +import org.springframework.data.neo4j.core.Property; +import org.springframework.data.neo4j.support.path.PathMapper; +import org.springframework.data.neo4j.support.query.QueryEngine; import java.util.Map; @@ -98,7 +98,7 @@ public interface Neo4jOperations { * @param queryOrQueryObject a lucene query string or query object (if the neo4j-index provider is lucene) * @param pathMapper a mapper that translates from the resulting paths into some domain object, might use PathMapper.WithoutResult for a callback behaviour * @return a lazy (when mapped) or eagerly (when called back) iterable containing the results of the query result mapping - * @see org.springframework.data.graph.neo4j.support.path.IterationController for controlling eagerness of iteration + * @see org.springframework.data.neo4j.support.path.IterationController for controlling eagerness of iteration */ ClosableIterable lookup(String indexName, Object queryOrQueryObject, PathMapper pathMapper); @@ -112,7 +112,7 @@ public interface Neo4jOperations { * @param value value to supply to index query * @param pathMapper a mapper that translates from the resulting paths into some domain object, might use PathMapper.WithoutResult for a callback behaviour * @return a lazy (when mapped) or eagerly (when called back) iterable containing the results of the query result mapping - * @see org.springframework.data.graph.neo4j.support.path.IterationController for controlling eagerness of iteration + * @see org.springframework.data.neo4j.support.path.IterationController for controlling eagerness of iteration */ ClosableIterable lookup(String indexName, String field, String value, PathMapper pathMapper); diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/Neo4jTemplate.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/template/Neo4jTemplate.java similarity index 95% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/Neo4jTemplate.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/template/Neo4jTemplate.java index 02708f5be..f944b501c 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/Neo4jTemplate.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/template/Neo4jTemplate.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.template; +package org.springframework.data.neo4j.template; import org.neo4j.graphdb.*; import org.neo4j.graphdb.index.Index; @@ -24,16 +24,16 @@ import org.neo4j.helpers.collection.ClosableIterable; import org.neo4j.helpers.collection.IterableWrapper; import org.springframework.dao.DataAccessException; import org.springframework.dao.InvalidDataAccessApiUsageException; -import org.springframework.data.graph.UncategorizedGraphStoreException; -import org.springframework.data.graph.core.GraphDatabase; -import org.springframework.data.graph.core.Property; -import org.springframework.data.graph.neo4j.conversion.*; -import org.springframework.data.graph.neo4j.support.path.NodePath; -import org.springframework.data.graph.neo4j.support.path.PathMapper; -import org.springframework.data.graph.neo4j.support.path.PathMappingIterator; -import org.springframework.data.graph.neo4j.support.path.RelationshipPath; -import org.springframework.data.graph.neo4j.support.query.EmbeddedQueryEngine; -import org.springframework.data.graph.neo4j.support.query.QueryEngine; +import org.springframework.data.neo4j.conversion.QueryResult; +import org.springframework.data.neo4j.conversion.QueryResultBuilder; +import org.springframework.data.neo4j.core.GraphDatabase; +import org.springframework.data.neo4j.core.Property; +import org.springframework.data.neo4j.support.path.NodePath; +import org.springframework.data.neo4j.support.path.PathMapper; +import org.springframework.data.neo4j.support.path.PathMappingIterator; +import org.springframework.data.neo4j.support.path.RelationshipPath; +import org.springframework.data.neo4j.support.query.EmbeddedQueryEngine; +import org.springframework.data.neo4j.support.query.QueryEngine; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.TransactionStatus; import org.springframework.transaction.support.TransactionCallback; @@ -92,7 +92,7 @@ public class Neo4jTemplate implements Neo4jOperations { } catch (RuntimeException e) { throw translateExceptionIfPossible(e); } catch (Exception e) { - throw new UncategorizedGraphStoreException("Error executing callback",e); + throw new org.springframework.data.neo4j.core.UncategorizedGraphStoreException("Error executing callback",e); } } diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/PropertyMap.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/template/PropertyMap.java similarity index 95% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/PropertyMap.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/template/PropertyMap.java index 0172f41c8..c5e096130 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/PropertyMap.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/template/PropertyMap.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.template; +package org.springframework.data.neo4j.template; import java.util.Collections; import java.util.HashMap; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/util/Converter.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/template/util/Converter.java similarity index 96% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/util/Converter.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/template/util/Converter.java index eecda1edf..9b7a94aaa 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/util/Converter.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/template/util/Converter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.template.util; +package org.springframework.data.neo4j.template.util; import java.lang.reflect.Method; import java.util.HashMap; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/util/NodeEvaluator.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/template/util/NodeEvaluator.java similarity index 92% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/util/NodeEvaluator.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/template/util/NodeEvaluator.java index a93c3b634..fd54deee3 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/template/util/NodeEvaluator.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/template/util/NodeEvaluator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.template.util; +package org.springframework.data.neo4j.template.util; import org.neo4j.graphdb.Node; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/transaction/ChainedTransactionManager.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/transaction/ChainedTransactionManager.java similarity index 98% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/transaction/ChainedTransactionManager.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/transaction/ChainedTransactionManager.java index eed169519..f255827c3 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/transaction/ChainedTransactionManager.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/transaction/ChainedTransactionManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.transaction; +package org.springframework.data.neo4j.transaction; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/transaction/DefaultSynchronizationManager.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/transaction/DefaultSynchronizationManager.java similarity index 95% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/transaction/DefaultSynchronizationManager.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/transaction/DefaultSynchronizationManager.java index 905528ffa..4cca62b1d 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/transaction/DefaultSynchronizationManager.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/transaction/DefaultSynchronizationManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.transaction; +package org.springframework.data.neo4j.transaction; import org.springframework.transaction.support.TransactionSynchronizationManager; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/transaction/JotmFactoryBean.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/transaction/JotmFactoryBean.java similarity index 99% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/transaction/JotmFactoryBean.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/transaction/JotmFactoryBean.java index 88150006f..90f9ef609 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/transaction/JotmFactoryBean.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/transaction/JotmFactoryBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.transaction; +package org.springframework.data.neo4j.transaction; import org.objectweb.jotm.Current; import org.objectweb.jotm.Jotm; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/transaction/MultiTransactionStatus.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/transaction/MultiTransactionStatus.java similarity index 98% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/transaction/MultiTransactionStatus.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/transaction/MultiTransactionStatus.java index 7a2754eca..453bb277c 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/transaction/MultiTransactionStatus.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/transaction/MultiTransactionStatus.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.transaction; +package org.springframework.data.neo4j.transaction; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.TransactionDefinition; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/transaction/SpringProvider.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/transaction/SpringProvider.java similarity index 96% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/transaction/SpringProvider.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/transaction/SpringProvider.java index c551f2e12..d82d96a68 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/transaction/SpringProvider.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/transaction/SpringProvider.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.transaction; +package org.springframework.data.neo4j.transaction; import org.neo4j.helpers.Service; import org.neo4j.kernel.impl.core.KernelPanicEventGenerator; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/transaction/SpringServiceImpl.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/transaction/SpringServiceImpl.java similarity index 97% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/transaction/SpringServiceImpl.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/transaction/SpringServiceImpl.java index a37cfcd19..3016c9a4c 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/transaction/SpringServiceImpl.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/transaction/SpringServiceImpl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.transaction; +package org.springframework.data.neo4j.transaction; import org.neo4j.kernel.impl.transaction.AbstractTransactionManager; import org.neo4j.kernel.impl.transaction.XaDataSourceManager; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/transaction/SynchronizationManager.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/transaction/SynchronizationManager.java similarity index 93% rename from spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/transaction/SynchronizationManager.java rename to spring-data-neo4j/src/main/java/org/springframework/data/neo4j/transaction/SynchronizationManager.java index 9e19763af..b4159ed9f 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/graph/neo4j/transaction/SynchronizationManager.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/transaction/SynchronizationManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.transaction; +package org.springframework.data.neo4j.transaction; /** * @author mh diff --git a/spring-data-neo4j/src/main/resources/META-INF/services/org.neo4j.kernel.impl.transaction.TransactionManagerProvider b/spring-data-neo4j/src/main/resources/META-INF/services/org.neo4j.kernel.impl.transaction.TransactionManagerProvider index 540a6813d..b2e2cb1e6 100644 --- a/spring-data-neo4j/src/main/resources/META-INF/services/org.neo4j.kernel.impl.transaction.TransactionManagerProvider +++ b/spring-data-neo4j/src/main/resources/META-INF/services/org.neo4j.kernel.impl.transaction.TransactionManagerProvider @@ -1 +1 @@ -org.springframework.data.graph.neo4j.transaction.SpringProvider +org.springframework.data.neo4j.transaction.SpringProvider diff --git a/spring-data-neo4j/src/main/resources/META-INF/spring.handlers b/spring-data-neo4j/src/main/resources/META-INF/spring.handlers index 243629c8a..956f9be20 100644 --- a/spring-data-neo4j/src/main/resources/META-INF/spring.handlers +++ b/spring-data-neo4j/src/main/resources/META-INF/spring.handlers @@ -1 +1 @@ -http\://www.springframework.org/schema/data/graph=org.springframework.data.graph.neo4j.config.DataGraphNamespaceHandler +http\://www.springframework.org/schema/data/graph=org.springframework.data.neo4j.config.DataGraphNamespaceHandler diff --git a/spring-data-neo4j/src/main/resources/org/springframework/data/graph/neo4j/config/datagraph-1.0.xsd b/spring-data-neo4j/src/main/resources/org/springframework/data/neo4j/config/datagraph-1.0.xsd similarity index 97% rename from spring-data-neo4j/src/main/resources/org/springframework/data/graph/neo4j/config/datagraph-1.0.xsd rename to spring-data-neo4j/src/main/resources/org/springframework/data/neo4j/config/datagraph-1.0.xsd index d1da383c4..cdd93707b 100644 --- a/spring-data-neo4j/src/main/resources/org/springframework/data/graph/neo4j/config/datagraph-1.0.xsd +++ b/spring-data-neo4j/src/main/resources/org/springframework/data/neo4j/config/datagraph-1.0.xsd @@ -60,7 +60,7 @@ - + diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Attribute.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/Attribute.java similarity index 83% rename from spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Attribute.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/Attribute.java index 08baceb3f..e90f699d9 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Attribute.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/Attribute.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j; +package org.springframework.data.neo4j; -import org.springframework.data.graph.annotation.Indexed; -import org.springframework.data.graph.annotation.NodeEntity; +import org.springframework.data.neo4j.annotation.Indexed; +import org.springframework.data.neo4j.annotation.NodeEntity; /** * @author mh diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Car.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/Car.java similarity index 87% rename from spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Car.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/Car.java index 56497188a..505742632 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Car.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/Car.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j; +package org.springframework.data.neo4j; import org.neo4j.graphdb.Node; -import org.springframework.data.graph.annotation.NodeEntity; +import org.springframework.data.neo4j.annotation.NodeEntity; @NodeEntity public abstract class Car { diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Developer.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/Developer.java similarity index 90% rename from spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Developer.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/Developer.java index 7c9c97e4f..3ceb00edf 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Developer.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/Developer.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j; +package org.springframework.data.neo4j; -import org.springframework.data.graph.annotation.NodeEntity; +import org.springframework.data.neo4j.annotation.NodeEntity; /** * @author mh diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Friendship.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/Friendship.java similarity index 86% rename from spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Friendship.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/Friendship.java index a1b2b7966..f75e3c008 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Friendship.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/Friendship.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j; +package org.springframework.data.neo4j; -import org.springframework.data.graph.annotation.EndNode; -import org.springframework.data.graph.annotation.Indexed; -import org.springframework.data.graph.annotation.RelationshipEntity; -import org.springframework.data.graph.annotation.StartNode; +import org.springframework.data.neo4j.annotation.EndNode; +import org.springframework.data.neo4j.annotation.Indexed; +import org.springframework.data.neo4j.annotation.RelationshipEntity; +import org.springframework.data.neo4j.annotation.StartNode; import java.util.Date; diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/FriendshipRepository.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/FriendshipRepository.java similarity index 85% rename from spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/FriendshipRepository.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/FriendshipRepository.java index 5f8a4df2d..a13ce8d8a 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/FriendshipRepository.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/FriendshipRepository.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j; +package org.springframework.data.neo4j; -import org.springframework.data.graph.neo4j.repository.GraphRepository; +import org.springframework.data.neo4j.repository.GraphRepository; public interface FriendshipRepository extends GraphRepository { } diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Group.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/Group.java similarity index 91% rename from spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Group.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/Group.java index c19cfb242..bc325949a 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Group.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/Group.java @@ -14,17 +14,16 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j; +package org.springframework.data.neo4j; import org.neo4j.graphdb.DynamicRelationshipType; import org.neo4j.graphdb.traversal.TraversalDescription; import org.neo4j.kernel.Traversal; import org.neo4j.kernel.impl.traversal.TraversalDescriptionImpl; -import org.springframework.data.graph.annotation.*; -import org.springframework.data.graph.core.Direction; -import org.springframework.data.graph.core.FieldTraversalDescriptionBuilder; -import org.springframework.data.graph.core.NodeBacked; -import org.springframework.data.graph.annotation.Indexed; +import org.springframework.data.neo4j.annotation.*; +import org.springframework.data.neo4j.core.Direction; +import org.springframework.data.neo4j.core.FieldTraversalDescriptionBuilder; +import org.springframework.data.neo4j.core.NodeBacked; import java.lang.reflect.Field; import java.util.Collection; diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/GroupRepository.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/GroupRepository.java similarity index 79% rename from spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/GroupRepository.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/GroupRepository.java index fb3c0f6d8..ca58ecde9 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/GroupRepository.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/GroupRepository.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j; +package org.springframework.data.neo4j; -import org.springframework.data.graph.neo4j.repository.NamedIndexRepository; -import org.springframework.data.graph.neo4j.repository.GraphRepository; +import org.springframework.data.neo4j.repository.NamedIndexRepository; +import org.springframework.data.neo4j.repository.GraphRepository; /** * @author mh diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/InvalidOneToNEntity.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/InvalidOneToNEntity.java similarity index 82% rename from spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/InvalidOneToNEntity.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/InvalidOneToNEntity.java index 0b81d3720..1fbe45eeb 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/InvalidOneToNEntity.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/InvalidOneToNEntity.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j; +package org.springframework.data.neo4j; -import org.springframework.data.graph.annotation.NodeEntity; -import org.springframework.data.graph.annotation.RelatedTo; +import org.springframework.data.neo4j.annotation.NodeEntity; +import org.springframework.data.neo4j.annotation.RelatedTo; import java.util.Collection; diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/InvalidReadOnlyOneToNEntity.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/InvalidReadOnlyOneToNEntity.java similarity index 81% rename from spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/InvalidReadOnlyOneToNEntity.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/InvalidReadOnlyOneToNEntity.java index 7aac8be49..cd257c05f 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/InvalidReadOnlyOneToNEntity.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/InvalidReadOnlyOneToNEntity.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j; +package org.springframework.data.neo4j; -import org.springframework.data.graph.annotation.NodeEntity; -import org.springframework.data.graph.annotation.RelatedTo; +import org.springframework.data.neo4j.annotation.NodeEntity; +import org.springframework.data.neo4j.annotation.RelatedTo; @NodeEntity public class InvalidReadOnlyOneToNEntity { diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Named.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/Named.java similarity index 87% rename from spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Named.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/Named.java index 71421b00b..247f2bfae 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Named.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/Named.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j; +package org.springframework.data.neo4j; -import org.springframework.data.graph.annotation.NodeEntity; +import org.springframework.data.neo4j.annotation.NodeEntity; /** * @author mh diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Person.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/Person.java similarity index 95% rename from spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Person.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/Person.java index 4700512e7..338a34826 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Person.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/Person.java @@ -14,11 +14,10 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j; +package org.springframework.data.neo4j; -import org.springframework.data.graph.annotation.*; -import org.springframework.data.graph.core.Direction; -import org.springframework.data.graph.annotation.Indexed; +import org.springframework.data.neo4j.annotation.*; +import org.springframework.data.neo4j.core.Direction; import javax.validation.constraints.Max; import javax.validation.constraints.Min; diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/PersonCreator.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/PersonCreator.java similarity index 95% rename from spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/PersonCreator.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/PersonCreator.java index b0ef7f303..dc0233e2e 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/PersonCreator.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/PersonCreator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j; +package org.springframework.data.neo4j; import org.neo4j.graphdb.Node; import org.springframework.data.persistence.StateBackedCreator; diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/PersonRepository.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/PersonRepository.java similarity index 86% rename from spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/PersonRepository.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/PersonRepository.java index 8a5e032ad..19e57094f 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/PersonRepository.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/PersonRepository.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j; +package org.springframework.data.neo4j; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; -import org.springframework.data.graph.annotation.Query; -import org.springframework.data.graph.neo4j.repository.GraphRepository; -import org.springframework.data.graph.neo4j.repository.NamedIndexRepository; +import org.springframework.data.neo4j.annotation.Query; +import org.springframework.data.neo4j.repository.GraphRepository; +import org.springframework.data.neo4j.repository.NamedIndexRepository; import java.util.Map; diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Personality.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/Personality.java similarity index 93% rename from spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Personality.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/Personality.java index 7e54658dc..74893c299 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Personality.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/Personality.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j; +package org.springframework.data.neo4j; public enum Personality { EXTROVERT, INTROVERT diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Toyota.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/Toyota.java similarity index 93% rename from spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Toyota.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/Toyota.java index 7bd2f45c5..49a1983a7 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Toyota.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/Toyota.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j; +package org.springframework.data.neo4j; public class Toyota extends Car { public Toyota() { diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Volvo.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/Volvo.java similarity index 78% rename from spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Volvo.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/Volvo.java index 1cdd357ec..81ed1912f 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/Volvo.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/Volvo.java @@ -14,11 +14,9 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j; +package org.springframework.data.neo4j; -import org.neo4j.graphdb.Node; -import org.springframework.data.graph.annotation.NodeEntity; -import org.springframework.data.graph.neo4j.Car; +import org.springframework.data.neo4j.annotation.NodeEntity; public class Volvo extends Car { public Volvo() { diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/config/ConfigurationConfirmationTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/config/ConfigurationConfirmationTest.java similarity index 85% rename from spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/config/ConfigurationConfirmationTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/config/ConfigurationConfirmationTest.java index e9f5f3d81..4a7958335 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/config/ConfigurationConfirmationTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/config/ConfigurationConfirmationTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.config; +package org.springframework.data.neo4j.config; import org.junit.Test; import org.springframework.beans.factory.BeanCreationException; @@ -27,6 +27,6 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; public class ConfigurationConfirmationTest { @Test(expected = BeanCreationException.class) public void testInvalidTransactionManagerFails() { - ClassPathXmlApplicationContext appCtx = new ClassPathXmlApplicationContext("classpath:org/springframework/data/graph/neo4j/config/ConfigurationCofirmationTest-context.xml"); + ClassPathXmlApplicationContext appCtx = new ClassPathXmlApplicationContext("classpath:org/springframework/data/neo4j/config/ConfigurationCofirmationTest-context.xml"); } } diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/config/DataGraphNamespaceHandlerTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTest.java similarity index 86% rename from spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/config/DataGraphNamespaceHandlerTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTest.java index 572773571..4965c4346 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/config/DataGraphNamespaceHandlerTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.config; +package org.springframework.data.neo4j.config; import org.junit.Assert; import org.junit.Test; @@ -22,9 +22,10 @@ import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.kernel.EmbeddedGraphDatabase; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.data.graph.neo4j.PersonRepository; -import org.springframework.data.graph.neo4j.repository.DirectGraphRepositoryFactory; -import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; +import org.springframework.data.neo4j.PersonRepository; +import org.springframework.data.neo4j.PersonRepository; +import org.springframework.data.neo4j.repository.DirectGraphRepositoryFactory; +import org.springframework.data.neo4j.support.GraphDatabaseContext; import org.springframework.transaction.PlatformTransactionManager; /** @@ -68,7 +69,7 @@ public class DataGraphNamespaceHandlerTest { } private Config assertInjected(String testCase) { - ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("classpath:org/springframework/data/graph/neo4j/config/DataGraphNamespaceHandlerTest" + testCase + "-context.xml"); + ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("classpath:org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTest" + testCase + "-context.xml"); Config config = ctx.getBean("config", Config.class); GraphDatabaseContext graphDatabaseContext = config.graphDatabaseContext; Assert.assertNotNull("graphDatabaseContext", graphDatabaseContext); diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/config/TestTransactionManagerFactoryBean.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/config/TestTransactionManagerFactoryBean.java similarity index 97% rename from spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/config/TestTransactionManagerFactoryBean.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/config/TestTransactionManagerFactoryBean.java index 08e050416..6acc96016 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/config/TestTransactionManagerFactoryBean.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/config/TestTransactionManagerFactoryBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.config; +package org.springframework.data.neo4j.config; import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.kernel.AbstractGraphDatabase; diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/partial/Cuisine.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/partial/Cuisine.java similarity index 93% rename from spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/partial/Cuisine.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/partial/Cuisine.java index 9199154d6..e0f985b07 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/partial/Cuisine.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/partial/Cuisine.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.partial; +package org.springframework.data.neo4j.partial; /** * @author Michael Hunger diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/partial/Recommendation.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/partial/Recommendation.java similarity index 81% rename from spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/partial/Recommendation.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/partial/Recommendation.java index a141595ac..3180e806a 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/partial/Recommendation.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/partial/Recommendation.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.partial; +package org.springframework.data.neo4j.partial; -import org.springframework.data.graph.annotation.EndNode; -import org.springframework.data.graph.annotation.RelationshipEntity; -import org.springframework.data.graph.annotation.StartNode; +import org.springframework.data.neo4j.annotation.EndNode; +import org.springframework.data.neo4j.annotation.RelationshipEntity; +import org.springframework.data.neo4j.annotation.StartNode; /** * @author Michael Hunger diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/partial/RecommendationTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/partial/RecommendationTest.java similarity index 87% rename from spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/partial/RecommendationTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/partial/RecommendationTest.java index 3ecf172be..113f10f56 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/partial/RecommendationTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/partial/RecommendationTest.java @@ -14,27 +14,22 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.partial; +package org.springframework.data.neo4j.partial; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; -import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; -import org.springframework.data.graph.neo4j.support.node.Neo4jHelper; +import org.springframework.data.neo4j.support.GraphDatabaseContext; +import org.springframework.data.neo4j.support.node.Neo4jHelper; -import org.springframework.test.annotation.DirtiesContext; -import org.springframework.test.annotation.Rollback; import org.springframework.test.context.CleanContextCacheTestExecutionListener; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestExecutionListeners; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.support.DependencyInjectionTestExecutionListener; -import org.springframework.test.context.support.DirtiesContextTestExecutionListener; import org.springframework.test.context.transaction.BeforeTransaction; import org.springframework.test.context.transaction.TransactionalTestExecutionListener; import org.springframework.transaction.PlatformTransactionManager; @@ -45,7 +40,7 @@ import javax.persistence.PersistenceContext; import javax.sql.DataSource; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/graph/neo4j/partial/Neo4jGraphRecommendationTest-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/partial/Neo4jGraphRecommendationTest-context.xml"}) @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class}) public class RecommendationTest { diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/partial/Restaurant.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/partial/Restaurant.java similarity index 82% rename from spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/partial/Restaurant.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/partial/Restaurant.java index 09ffeb0c3..50d034f04 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/partial/Restaurant.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/partial/Restaurant.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.partial; +package org.springframework.data.neo4j.partial; -import org.springframework.data.graph.annotation.GraphProperty; -import org.springframework.data.graph.annotation.Indexed; -import org.springframework.data.graph.annotation.NodeEntity; +import org.springframework.data.neo4j.annotation.GraphProperty; +import org.springframework.data.neo4j.annotation.Indexed; +import org.springframework.data.neo4j.annotation.NodeEntity; import javax.persistence.*; diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/partial/User.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/partial/User.java similarity index 93% rename from spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/partial/User.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/partial/User.java index c1d38f0e2..dc5701ac5 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/partial/User.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/partial/User.java @@ -14,10 +14,9 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.partial; +package org.springframework.data.neo4j.partial; -import org.springframework.data.graph.annotation.*; -import org.springframework.data.graph.annotation.Indexed; +import org.springframework.data.neo4j.annotation.*; import javax.persistence.*; import java.util.Set; diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/repository/query/MatchClauseUnitTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/query/MatchClauseUnitTest.java similarity index 85% rename from spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/repository/query/MatchClauseUnitTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/query/MatchClauseUnitTest.java index 330d452f7..7a24c9006 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/repository/query/MatchClauseUnitTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/repository/query/MatchClauseUnitTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.repository.query; +package org.springframework.data.neo4j.repository.query; import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.*; @@ -24,11 +24,11 @@ import java.util.Set; import org.junit.Before; import org.junit.Test; -import org.springframework.data.graph.annotation.Indexed; -import org.springframework.data.graph.annotation.NodeEntity; -import org.springframework.data.graph.annotation.RelatedTo; -import org.springframework.data.graph.core.Direction; -import org.springframework.data.graph.neo4j.mapping.Neo4JMappingContext; +import org.springframework.data.neo4j.annotation.Indexed; +import org.springframework.data.neo4j.annotation.NodeEntity; +import org.springframework.data.neo4j.annotation.RelatedTo; +import org.springframework.data.neo4j.core.Direction; +import org.springframework.data.neo4j.mapping.Neo4JMappingContext; import org.springframework.data.repository.query.parser.Property; /** diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/AttachEntityTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/AttachEntityTest.java similarity index 84% rename from spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/AttachEntityTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/AttachEntityTest.java index 618e22c7b..973d0fc63 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/AttachEntityTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/AttachEntityTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.support; +package org.springframework.data.neo4j.support; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -22,9 +22,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.neo4j.graphdb.Node; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.graph.core.NodeBacked; -import org.springframework.data.graph.neo4j.Developer; -import org.springframework.data.graph.neo4j.repository.DirectGraphRepositoryFactory; +import org.springframework.data.neo4j.Developer; +import org.springframework.data.neo4j.core.NodeBacked; +import org.springframework.data.neo4j.Developer; +import org.springframework.data.neo4j.repository.DirectGraphRepositoryFactory; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -34,7 +35,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/graph/neo4j/support/Neo4jGraphPersistenceTest-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml"}) public class AttachEntityTest { diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/EntityEvaluatorTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/EntityEvaluatorTest.java similarity index 93% rename from spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/EntityEvaluatorTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/EntityEvaluatorTest.java index 7f30c9603..406cc78af 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/EntityEvaluatorTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/EntityEvaluatorTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.support; +package org.springframework.data.neo4j.support; import org.junit.Test; diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/EntityPropertyValidationTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/EntityPropertyValidationTest.java similarity index 85% rename from spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/EntityPropertyValidationTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/EntityPropertyValidationTest.java index 02c3e792b..018f1c646 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/EntityPropertyValidationTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/EntityPropertyValidationTest.java @@ -14,17 +14,16 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.support; +package org.springframework.data.neo4j.support; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.graph.neo4j.Person; -import static org.springframework.data.graph.neo4j.Person.persistedPerson; -import org.springframework.data.graph.neo4j.support.node.Neo4jHelper; + +import static org.springframework.data.neo4j.Person.persistedPerson; +import org.springframework.data.neo4j.support.node.Neo4jHelper; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -36,7 +35,7 @@ import javax.validation.ValidationException; import static org.junit.Assert.assertEquals; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/graph/neo4j/support/Neo4jGraphPersistenceTest-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml"}) public class EntityPropertyValidationTest { diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/FinderTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/FinderTest.java similarity index 96% rename from spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/FinderTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/FinderTest.java index 6ef0d94ec..7a2137f3b 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/FinderTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/FinderTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.support; +package org.springframework.data.neo4j.support; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -25,8 +25,8 @@ import org.neo4j.helpers.collection.IteratorUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; -import org.springframework.data.graph.neo4j.*; -import org.springframework.data.graph.neo4j.support.node.Neo4jHelper; +import org.springframework.data.neo4j.*; +import org.springframework.data.neo4j.support.node.Neo4jHelper; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.transaction.BeforeTransaction; @@ -43,11 +43,11 @@ import static org.junit.Assert.*; import static org.junit.Assert.assertEquals; import static org.junit.internal.matchers.IsCollectionContaining.hasItems; import static org.neo4j.helpers.collection.IteratorUtil.asCollection; -import static org.springframework.data.graph.neo4j.Person.persistedPerson; +import static org.springframework.data.neo4j.Person.persistedPerson; @RunWith(SpringJUnit4ClassRunner.class) //@ContextConfiguration(locations = {"classpath:repository-namespace-config-context.xml"}) -@ContextConfiguration(locations = {"classpath:org/springframework/data/graph/neo4j/support/Neo4jGraphPersistenceTest-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml"}) public class FinderTest { protected final Log log = LogFactory.getLog(getClass()); diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/GraphDatabaseFactoryTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/GraphDatabaseFactoryTest.java similarity index 94% rename from spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/GraphDatabaseFactoryTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/GraphDatabaseFactoryTest.java index 1b256737b..699b71eea 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/GraphDatabaseFactoryTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/GraphDatabaseFactoryTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.support; +package org.springframework.data.neo4j.support; import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.data.graph.core.GraphDatabase; +import org.springframework.data.neo4j.core.GraphDatabase; import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsInstanceOf.instanceOf; diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/GraphRepositoryTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/GraphRepositoryTest.java similarity index 93% rename from spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/GraphRepositoryTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/GraphRepositoryTest.java index 3a72dc83b..5e7a7c92b 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/GraphRepositoryTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/GraphRepositoryTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.support; +package org.springframework.data.neo4j.support; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -25,20 +25,19 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Sort; -import org.springframework.data.graph.neo4j.Group; -import org.springframework.data.graph.neo4j.Person; -import org.springframework.data.graph.neo4j.PersonRepository; -import org.springframework.data.graph.neo4j.support.node.Neo4jHelper; +import org.springframework.data.neo4j.Group; +import org.springframework.data.neo4j.*; +import org.springframework.data.neo4j.Person; +import org.springframework.data.neo4j.PersonRepository; +import org.springframework.data.neo4j.support.node.Neo4jHelper; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.transaction.BeforeTransaction; import org.springframework.transaction.annotation.Transactional; -import java.util.List; import java.util.Map; import static java.util.Arrays.asList; -import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/HasRelationshipMatcher.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/HasRelationshipMatcher.java similarity index 98% rename from spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/HasRelationshipMatcher.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/HasRelationshipMatcher.java index bc2f9780d..ad7ff6e60 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/HasRelationshipMatcher.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/HasRelationshipMatcher.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.support; +package org.springframework.data.neo4j.support; import org.hamcrest.CoreMatchers; import org.hamcrest.Description; diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/IndexTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/IndexTest.java similarity index 95% rename from spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/IndexTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/IndexTest.java index 4a065bee2..460252a84 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/IndexTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/IndexTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.support; +package org.springframework.data.neo4j.support; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -29,12 +29,12 @@ import org.neo4j.graphdb.Transaction; import org.neo4j.graphdb.index.Index; import org.neo4j.helpers.collection.IteratorUtil; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.graph.annotation.Indexed; -import org.springframework.data.graph.annotation.NodeEntity; -import org.springframework.data.graph.neo4j.*; -import org.springframework.data.graph.neo4j.repository.DirectGraphRepositoryFactory; -import org.springframework.data.graph.neo4j.repository.GraphRepository; -import org.springframework.data.graph.neo4j.support.node.Neo4jHelper; +import org.springframework.data.neo4j.*; +import org.springframework.data.neo4j.annotation.Indexed; +import org.springframework.data.neo4j.annotation.NodeEntity; +import org.springframework.data.neo4j.repository.DirectGraphRepositoryFactory; +import org.springframework.data.neo4j.repository.GraphRepository; +import org.springframework.data.neo4j.support.node.Neo4jHelper; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.transaction.BeforeTransaction; @@ -45,11 +45,11 @@ import java.util.Collection; import java.util.HashSet; import static org.junit.Assert.*; -import static org.springframework.data.graph.neo4j.Person.NAME_INDEX; -import static org.springframework.data.graph.neo4j.Person.persistedPerson; +import static org.springframework.data.neo4j.Person.NAME_INDEX; +import static org.springframework.data.neo4j.Person.persistedPerson; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/graph/neo4j/support/Neo4jGraphPersistenceTest-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml"}) public class IndexTest { private static final String NAME = "name"; diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/IndexingNodeTypeRepresentationStrategyTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/IndexingNodeTypeRepresentationStrategyTest.java similarity index 93% rename from spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/IndexingNodeTypeRepresentationStrategyTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/IndexingNodeTypeRepresentationStrategyTest.java index 334192386..69694178e 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/IndexingNodeTypeRepresentationStrategyTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/IndexingNodeTypeRepresentationStrategyTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.support; +package org.springframework.data.neo4j.support; import org.junit.Before; import org.junit.Test; @@ -26,10 +26,9 @@ import org.neo4j.graphdb.index.Index; import org.neo4j.graphdb.index.IndexHits; import org.neo4j.helpers.collection.IteratorUtil; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.graph.annotation.NodeEntity; -import org.springframework.data.graph.core.NodeBacked; -import org.springframework.data.graph.neo4j.support.node.Neo4jHelper; -import org.springframework.data.graph.neo4j.support.typerepresentation.IndexingNodeTypeRepresentationStrategy; +import org.springframework.data.neo4j.annotation.NodeEntity; +import org.springframework.data.neo4j.support.node.Neo4jHelper; +import org.springframework.data.neo4j.support.typerepresentation.IndexingNodeTypeRepresentationStrategy; import org.springframework.test.context.CleanContextCacheTestExecutionListener; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestExecutionListeners; @@ -47,8 +46,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/graph/neo4j/support/Neo4jGraphPersistenceTest-context.xml", - "classpath:org/springframework/data/graph/neo4j/support/IndexingTypeRepresentationStrategyOverride-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml", + "classpath:org/springframework/data/neo4j/support/IndexingTypeRepresentationStrategyOverride-context.xml"}) @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class}) public class IndexingNodeTypeRepresentationStrategyTest { diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/IndexingRelationshipTypeRepresentationStrategyTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/IndexingRelationshipTypeRepresentationStrategyTest.java similarity index 89% rename from spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/IndexingRelationshipTypeRepresentationStrategyTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/IndexingRelationshipTypeRepresentationStrategyTest.java index aba991322..a0317c3ce 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/IndexingRelationshipTypeRepresentationStrategyTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/IndexingRelationshipTypeRepresentationStrategyTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.support; +package org.springframework.data.neo4j.support; import org.junit.Before; import org.junit.Test; @@ -24,13 +24,10 @@ import org.neo4j.graphdb.index.Index; import org.neo4j.graphdb.index.IndexHits; import org.neo4j.helpers.collection.IteratorUtil; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.graph.annotation.EndNode; -import org.springframework.data.graph.annotation.NodeEntity; -import org.springframework.data.graph.annotation.RelationshipEntity; -import org.springframework.data.graph.annotation.StartNode; -import org.springframework.data.graph.neo4j.support.node.Neo4jHelper; -import org.springframework.data.graph.neo4j.support.typerepresentation.IndexingNodeTypeRepresentationStrategy; -import org.springframework.data.graph.neo4j.support.typerepresentation.IndexingRelationshipTypeRepresentationStrategy; +import org.springframework.data.neo4j.annotation.RelationshipEntity; +import org.springframework.data.neo4j.support.node.Neo4jHelper; +import org.springframework.data.neo4j.support.typerepresentation.IndexingNodeTypeRepresentationStrategy; +import org.springframework.data.neo4j.support.typerepresentation.IndexingRelationshipTypeRepresentationStrategy; import org.springframework.test.context.CleanContextCacheTestExecutionListener; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestExecutionListeners; @@ -49,8 +46,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/graph/neo4j/support/Neo4jGraphPersistenceTest-context.xml", - "classpath:org/springframework/data/graph/neo4j/support/IndexingTypeRepresentationStrategyOverride-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml", + "classpath:org/springframework/data/neo4j/support/IndexingTypeRepresentationStrategyOverride-context.xml"}) @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class}) public class IndexingRelationshipTypeRepresentationStrategyTest { diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/ModificationOutsideOfTransactionTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/ModificationOutsideOfTransactionTest.java similarity index 90% rename from spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/ModificationOutsideOfTransactionTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/ModificationOutsideOfTransactionTest.java index dbd9072ee..ee9ab67c2 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/ModificationOutsideOfTransactionTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/ModificationOutsideOfTransactionTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.support; +package org.springframework.data.neo4j.support; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -23,15 +23,15 @@ import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.neo4j.graphdb.Node; -import org.neo4j.graphdb.NotFoundException; import org.neo4j.graphdb.NotInTransactionException; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.graph.neo4j.Friendship; -import org.springframework.data.graph.neo4j.Group; -import org.springframework.data.graph.neo4j.Person; -import org.springframework.data.graph.neo4j.repository.DirectGraphRepositoryFactory; -import org.springframework.data.graph.neo4j.repository.GraphRepository; -import org.springframework.data.graph.neo4j.support.node.Neo4jHelper; +import org.springframework.data.neo4j.Friendship; +import org.springframework.data.neo4j.*; +import org.springframework.data.neo4j.Group; +import org.springframework.data.neo4j.Person; +import org.springframework.data.neo4j.repository.DirectGraphRepositoryFactory; +import org.springframework.data.neo4j.repository.GraphRepository; +import org.springframework.data.neo4j.support.node.Neo4jHelper; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -40,12 +40,12 @@ import java.util.Collections; import java.util.HashSet; import static org.junit.Assert.*; -import static org.springframework.data.graph.neo4j.Person.persistedPerson; -import static org.springframework.data.graph.neo4j.support.HasRelationshipMatcher.hasNoRelationship; -import static org.springframework.data.graph.neo4j.support.HasRelationshipMatcher.hasRelationship; +import static org.springframework.data.neo4j.Person.persistedPerson; +import static org.springframework.data.neo4j.support.HasRelationshipMatcher.hasNoRelationship; +import static org.springframework.data.neo4j.support.HasRelationshipMatcher.hasRelationship; @RunWith( SpringJUnit4ClassRunner.class ) -@ContextConfiguration( locations = {"classpath:org/springframework/data/graph/neo4j/support/Neo4jGraphPersistenceTest-context.xml"} ) +@ContextConfiguration( locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml"} ) public class ModificationOutsideOfTransactionTest { diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/NodeEntityInstantiationTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/NodeEntityInstantiationTest.java similarity index 82% rename from spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/NodeEntityInstantiationTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/NodeEntityInstantiationTest.java index 986dd7205..1f4327850 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/NodeEntityInstantiationTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/NodeEntityInstantiationTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.support; +package org.springframework.data.neo4j.support; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -22,10 +22,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.neo4j.graphdb.Node; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.graph.neo4j.Person; -import org.springframework.data.graph.neo4j.repository.DirectGraphRepositoryFactory; -import org.springframework.data.graph.neo4j.repository.GraphRepository; -import org.springframework.data.graph.neo4j.support.node.Neo4jHelper; +import org.springframework.data.neo4j.Person; +import org.springframework.data.neo4j.Person; +import org.springframework.data.neo4j.repository.DirectGraphRepositoryFactory; +import org.springframework.data.neo4j.repository.GraphRepository; +import org.springframework.data.neo4j.support.node.Neo4jHelper; import org.springframework.test.context.CleanContextCacheTestExecutionListener; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestExecutionListeners; @@ -36,12 +37,12 @@ import org.springframework.test.context.transaction.TransactionalTestExecutionLi import org.springframework.transaction.annotation.Transactional; import static org.junit.Assert.assertEquals; -import static org.springframework.data.graph.neo4j.Person.persistedPerson; +import static org.springframework.data.neo4j.Person.persistedPerson; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(locations = { - "classpath:org/springframework/data/graph/neo4j/support/Neo4jGraphPersistenceTest-context.xml", - "classpath:org/springframework/data/graph/neo4j/support/PersonDirectCreator-context.xml" }) + "classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml", + "classpath:org/springframework/data/neo4j/support/PersonDirectCreator-context.xml" }) @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class}) public class NodeEntityInstantiationTest { diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/NodeEntityQueryTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/NodeEntityQueryTest.java similarity index 92% rename from spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/NodeEntityQueryTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/NodeEntityQueryTest.java index b675a5af1..e6c03e6b1 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/NodeEntityQueryTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/NodeEntityQueryTest.java @@ -14,14 +14,15 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.support; +package org.springframework.data.neo4j.support; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.neo4j.helpers.collection.IteratorUtil; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.graph.neo4j.Person; +import org.springframework.data.neo4j.Person; +import org.springframework.data.neo4j.Person; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.transaction.annotation.Transactional; @@ -38,7 +39,7 @@ import static org.junit.internal.matchers.IsCollectionContaining.hasItems; * @since 13.06.11 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/graph/neo4j/support/Neo4jGraphPersistenceTest-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml"}) @Transactional public class NodeEntityQueryTest { @Autowired diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/NodeEntityRelationshipTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/NodeEntityRelationshipTest.java similarity index 95% rename from spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/NodeEntityRelationshipTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/NodeEntityRelationshipTest.java index 76e2a5426..573755f10 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/NodeEntityRelationshipTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/NodeEntityRelationshipTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.support; +package org.springframework.data.neo4j.support; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -25,12 +25,15 @@ import org.neo4j.graphdb.*; import org.neo4j.helpers.collection.IteratorUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.InvalidDataAccessApiUsageException; -import org.springframework.data.graph.neo4j.Friendship; -import org.springframework.data.graph.neo4j.Group; -import org.springframework.data.graph.neo4j.Person; -import static org.springframework.data.graph.neo4j.Person.persistedPerson; -import org.springframework.data.graph.neo4j.repository.DirectGraphRepositoryFactory; -import org.springframework.data.graph.neo4j.support.node.Neo4jHelper; +import org.springframework.data.neo4j.Friendship; +import org.springframework.data.neo4j.*; +import org.springframework.data.neo4j.Group; + +import static org.springframework.data.neo4j.Person.persistedPerson; + +import org.springframework.data.neo4j.Person; +import org.springframework.data.neo4j.repository.DirectGraphRepositoryFactory; +import org.springframework.data.neo4j.support.node.Neo4jHelper; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -42,7 +45,7 @@ import java.util.*; import static org.junit.Assert.assertEquals; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/graph/neo4j/support/Neo4jGraphPersistenceTest-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml"}) public class NodeEntityRelationshipTest { diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/NodeEntityTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/NodeEntityTest.java similarity index 88% rename from spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/NodeEntityTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/NodeEntityTest.java index 736b161a7..83f44998e 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/NodeEntityTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/NodeEntityTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.support; +package org.springframework.data.neo4j.support; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -24,23 +24,24 @@ import org.junit.runner.RunWith; import org.neo4j.graphdb.NotFoundException; import org.neo4j.graphdb.Transaction; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.graph.neo4j.Attribute; -import org.springframework.data.graph.neo4j.Group; -import org.springframework.data.graph.neo4j.Person; -import org.springframework.data.graph.neo4j.PersonRepository; -import org.springframework.data.graph.neo4j.repository.DirectGraphRepositoryFactory; -import org.springframework.data.graph.neo4j.repository.GraphRepository; -import org.springframework.data.graph.neo4j.support.node.Neo4jHelper; +import org.springframework.data.neo4j.Attribute; +import org.springframework.data.neo4j.Group; +import org.springframework.data.neo4j.*; +import org.springframework.data.neo4j.Person; +import org.springframework.data.neo4j.PersonRepository; +import org.springframework.data.neo4j.repository.DirectGraphRepositoryFactory; +import org.springframework.data.neo4j.repository.GraphRepository; +import org.springframework.data.neo4j.support.node.Neo4jHelper; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.transaction.BeforeTransaction; import org.springframework.transaction.annotation.Transactional; import static org.junit.Assert.assertEquals; -import static org.springframework.data.graph.neo4j.Person.persistedPerson; +import static org.springframework.data.neo4j.Person.persistedPerson; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/graph/neo4j/support/Neo4jGraphPersistenceTest-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml"}) public class NodeEntityTest { diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/NoopTypeRepresentationStrategyTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/NoopTypeRepresentationStrategyTest.java similarity index 88% rename from spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/NoopTypeRepresentationStrategyTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/NoopTypeRepresentationStrategyTest.java index 35bdfad35..200fdab6f 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/NoopTypeRepresentationStrategyTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/NoopTypeRepresentationStrategyTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.support; +package org.springframework.data.neo4j.support; import org.junit.Before; import org.junit.Test; @@ -24,10 +24,10 @@ import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Relationship; import org.neo4j.graphdb.Transaction; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.graph.annotation.NodeEntity; -import org.springframework.data.graph.annotation.RelationshipEntity; -import org.springframework.data.graph.neo4j.support.typerepresentation.NoopNodeTypeRepresentationStrategy; -import org.springframework.data.graph.neo4j.support.typerepresentation.NoopRelationshipTypeRepresentationStrategy; +import org.springframework.data.neo4j.annotation.NodeEntity; +import org.springframework.data.neo4j.annotation.RelationshipEntity; +import org.springframework.data.neo4j.support.typerepresentation.NoopNodeTypeRepresentationStrategy; +import org.springframework.data.neo4j.support.typerepresentation.NoopRelationshipTypeRepresentationStrategy; import org.springframework.test.context.CleanContextCacheTestExecutionListener; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestExecutionListeners; @@ -36,8 +36,8 @@ import org.springframework.test.context.support.DependencyInjectionTestExecution import org.springframework.test.context.transaction.TransactionalTestExecutionListener; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/graph/neo4j/support/Neo4jGraphPersistenceTest-context.xml", - "classpath:org/springframework/data/graph/neo4j/support/NoopTypeRepresentationStrategyOverride-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml", + "classpath:org/springframework/data/neo4j/support/NoopTypeRepresentationStrategyOverride-context.xml"}) @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class}) public class NoopTypeRepresentationStrategyTest { diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/ProjectionTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/ProjectionTest.java similarity index 82% rename from spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/ProjectionTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/ProjectionTest.java index 3424d689b..3b3cb819e 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/ProjectionTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/ProjectionTest.java @@ -14,17 +14,19 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.support; +package org.springframework.data.neo4j.support; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.graph.neo4j.Group; -import org.springframework.data.graph.neo4j.Named; -import org.springframework.data.graph.neo4j.repository.DirectGraphRepositoryFactory; -import org.springframework.data.graph.neo4j.support.node.Neo4jHelper; +import org.springframework.data.neo4j.Group; +import org.springframework.data.neo4j.Group; +import org.springframework.data.neo4j.Named; +import org.springframework.data.neo4j.Named; +import org.springframework.data.neo4j.repository.DirectGraphRepositoryFactory; +import org.springframework.data.neo4j.support.node.Neo4jHelper; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -34,7 +36,7 @@ import org.springframework.transaction.annotation.Transactional; import static org.junit.Assert.assertEquals; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/graph/neo4j/support/Neo4jGraphPersistenceTest-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml"}) public class ProjectionTest { diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/PropertyTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/PropertyTest.java similarity index 91% rename from spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/PropertyTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/PropertyTest.java index be05c1cc3..74ca718fe 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/PropertyTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/PropertyTest.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.support; +package org.springframework.data.neo4j.support; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.neo4j.graphdb.NotFoundException; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.dao.InvalidDataAccessApiUsageException; -import org.springframework.data.graph.neo4j.*; -import org.springframework.data.graph.neo4j.repository.DirectGraphRepositoryFactory; -import org.springframework.data.graph.neo4j.support.node.Neo4jHelper; +import org.springframework.data.neo4j.Friendship; +import org.springframework.data.neo4j.Person; +import org.springframework.data.neo4j.Personality; +import org.springframework.data.neo4j.repository.DirectGraphRepositoryFactory; +import org.springframework.data.neo4j.support.node.Neo4jHelper; import org.springframework.test.annotation.Rollback; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -36,10 +36,10 @@ import org.springframework.transaction.annotation.Transactional; import java.util.Date; import static org.junit.Assert.assertEquals; -import static org.springframework.data.graph.neo4j.Person.persistedPerson; +import static org.springframework.data.neo4j.Person.persistedPerson; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/graph/neo4j/support/Neo4jGraphPersistenceTest-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml"}) public class PropertyTest { diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/RelationshipEntityTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/RelationshipEntityTest.java similarity index 91% rename from spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/RelationshipEntityTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/RelationshipEntityTest.java index 8ab11685a..9e73bf519 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/RelationshipEntityTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/RelationshipEntityTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.support; +package org.springframework.data.neo4j.support; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -23,15 +23,16 @@ import org.junit.runner.RunWith; import org.neo4j.graphdb.*; import org.neo4j.helpers.collection.IteratorUtil; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.graph.neo4j.Friendship; -import org.springframework.data.graph.neo4j.FriendshipRepository; -import org.springframework.data.graph.neo4j.Person; +import org.springframework.data.neo4j.Friendship; +import org.springframework.data.neo4j.*; +import org.springframework.data.neo4j.FriendshipRepository; import static org.junit.Assert.assertFalse; -import static org.springframework.data.graph.neo4j.Person.persistedPerson; +import static org.springframework.data.neo4j.Person.persistedPerson; -import org.springframework.data.graph.neo4j.repository.DirectGraphRepositoryFactory; -import org.springframework.data.graph.neo4j.support.node.Neo4jHelper; +import org.springframework.data.neo4j.Person; +import org.springframework.data.neo4j.repository.DirectGraphRepositoryFactory; +import org.springframework.data.neo4j.support.node.Neo4jHelper; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -41,7 +42,7 @@ import org.springframework.transaction.annotation.Transactional; import static org.junit.Assert.assertEquals; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/graph/neo4j/support/Neo4jGraphPersistenceTest-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml"}) public class RelationshipEntityTest { diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/SubReferenceNodeTypeRepresentationStrategyTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/SubReferenceNodeTypeRepresentationStrategyTest.java similarity index 91% rename from spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/SubReferenceNodeTypeRepresentationStrategyTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/SubReferenceNodeTypeRepresentationStrategyTest.java index 5fd0db037..a6d7143bf 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/SubReferenceNodeTypeRepresentationStrategyTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/SubReferenceNodeTypeRepresentationStrategyTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.support; +package org.springframework.data.neo4j.support; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -27,15 +27,16 @@ import org.neo4j.graphdb.Relationship; import org.neo4j.graphdb.Transaction; import org.neo4j.helpers.collection.IteratorUtil; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.graph.annotation.NodeEntity; -import org.springframework.data.graph.neo4j.Car; -import org.springframework.data.graph.neo4j.Person; -import org.springframework.data.graph.neo4j.Toyota; -import org.springframework.data.graph.neo4j.Volvo; -import org.springframework.data.graph.neo4j.repository.DirectGraphRepositoryFactory; -import org.springframework.data.graph.neo4j.repository.GraphRepository; -import org.springframework.data.graph.neo4j.support.node.Neo4jHelper; -import org.springframework.data.graph.neo4j.support.typerepresentation.SubReferenceNodeTypeRepresentationStrategy; +import org.springframework.data.neo4j.*; +import org.springframework.data.neo4j.annotation.NodeEntity; +import org.springframework.data.neo4j.Car; +import org.springframework.data.neo4j.Person; +import org.springframework.data.neo4j.Toyota; +import org.springframework.data.neo4j.Volvo; +import org.springframework.data.neo4j.repository.DirectGraphRepositoryFactory; +import org.springframework.data.neo4j.repository.GraphRepository; +import org.springframework.data.neo4j.support.node.Neo4jHelper; +import org.springframework.data.neo4j.support.typerepresentation.SubReferenceNodeTypeRepresentationStrategy; import org.springframework.test.context.CleanContextCacheTestExecutionListener; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestExecutionListeners; @@ -50,15 +51,15 @@ import java.util.Collections; import java.util.HashSet; import static org.junit.Assert.*; -import static org.springframework.data.graph.neo4j.Person.persistedPerson; +import static org.springframework.data.neo4j.Person.persistedPerson; /** * @author mh * @since 20.01.11 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/graph/neo4j/support/Neo4jGraphPersistenceTest-context.xml", - "classpath:org/springframework/data/graph/neo4j/support/SubReferenceTypeRepresentationStrategyOverride-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml", + "classpath:org/springframework/data/neo4j/support/SubReferenceTypeRepresentationStrategyOverride-context.xml"}) @TestExecutionListeners({CleanContextCacheTestExecutionListener.class, DependencyInjectionTestExecutionListener.class, TransactionalTestExecutionListener.class}) public class SubReferenceNodeTypeRepresentationStrategyTest { diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/TestTeam.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/TestTeam.java similarity index 86% rename from spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/TestTeam.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/TestTeam.java index 264c7925b..ac8a24dbb 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/TestTeam.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/TestTeam.java @@ -14,12 +14,13 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.support; +package org.springframework.data.neo4j.support; import org.neo4j.helpers.collection.MapUtil; -import org.springframework.data.graph.neo4j.Group; -import org.springframework.data.graph.neo4j.Person; -import org.springframework.data.graph.neo4j.Personality; +import org.springframework.data.neo4j.Group; +import org.springframework.data.neo4j.*; +import org.springframework.data.neo4j.Person; +import org.springframework.data.neo4j.Personality; import java.util.Map; diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/TraversalTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/TraversalTest.java similarity index 88% rename from spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/TraversalTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/TraversalTest.java index 093724072..11367b41c 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/TraversalTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/TraversalTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.support; +package org.springframework.data.neo4j.support; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -27,14 +27,16 @@ import org.neo4j.graphdb.traversal.TraversalDescription; import org.neo4j.kernel.Traversal; import org.neo4j.kernel.impl.traversal.TraversalDescriptionImpl; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.graph.core.EntityPath; -import org.springframework.data.graph.neo4j.Group; -import org.springframework.data.graph.neo4j.Person; -import static org.springframework.data.graph.neo4j.Person.persistedPerson; +import org.springframework.data.neo4j.Group; +import org.springframework.data.neo4j.Person; +import org.springframework.data.neo4j.core.EntityPath; +import org.springframework.data.neo4j.Group; +import org.springframework.data.neo4j.Person; +import static org.springframework.data.neo4j.Person.persistedPerson; -import org.springframework.data.graph.neo4j.repository.DirectGraphRepositoryFactory; -import org.springframework.data.graph.neo4j.repository.GraphRepository; -import org.springframework.data.graph.neo4j.support.node.Neo4jHelper; +import org.springframework.data.neo4j.repository.DirectGraphRepositoryFactory; +import org.springframework.data.neo4j.repository.GraphRepository; +import org.springframework.data.neo4j.support.node.Neo4jHelper; import org.springframework.test.annotation.Rollback; import org.springframework.test.context.ContextConfiguration; @@ -48,7 +50,7 @@ import java.util.HashSet; import static org.junit.Assert.assertEquals; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/graph/neo4j/support/Neo4jGraphPersistenceTest-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml"}) public class TraversalTest { diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/path/EntityMapperTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/path/EntityMapperTest.java similarity index 84% rename from spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/path/EntityMapperTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/path/EntityMapperTest.java index 558e471f8..0f1d58cdf 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/path/EntityMapperTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/path/EntityMapperTest.java @@ -14,15 +14,16 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.support.path; +package org.springframework.data.neo4j.support.path; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.graph.core.EntityPath; -import org.springframework.data.graph.neo4j.Person; -import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; +import org.springframework.data.neo4j.Person; +import org.springframework.data.neo4j.core.EntityPath; +import org.springframework.data.neo4j.Person; +import org.springframework.data.neo4j.support.GraphDatabaseContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.transaction.annotation.Transactional; @@ -32,7 +33,7 @@ import org.springframework.transaction.annotation.Transactional; * @since 26.02.11 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/graph/neo4j/support/Neo4jGraphPersistenceTest-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml"}) public class EntityMapperTest { @Autowired diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/path/EntityPathTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/path/EntityPathTest.java similarity index 86% rename from spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/path/EntityPathTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/path/EntityPathTest.java index 7bfef674d..704b8876b 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/path/EntityPathTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/path/EntityPathTest.java @@ -14,16 +14,17 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.support.path; +package org.springframework.data.neo4j.support.path; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.neo4j.graphdb.Node; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.graph.core.EntityPath; -import org.springframework.data.graph.neo4j.Person; -import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; +import org.springframework.data.neo4j.Person; +import org.springframework.data.neo4j.core.EntityPath; +import org.springframework.data.neo4j.Person; +import org.springframework.data.neo4j.support.GraphDatabaseContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.transaction.annotation.Transactional; @@ -33,7 +34,7 @@ import org.springframework.transaction.annotation.Transactional; * @since 26.02.11 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/graph/neo4j/support/Neo4jGraphPersistenceTest-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml"}) public class EntityPathTest { @Autowired diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/path/PathMappingIteratorTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/path/PathMappingIteratorTest.java similarity index 98% rename from spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/path/PathMappingIteratorTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/path/PathMappingIteratorTest.java index 7c8059515..70e9a1318 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/path/PathMappingIteratorTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/path/PathMappingIteratorTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.support.path; +package org.springframework.data.neo4j.support.path; import org.junit.Test; import org.neo4j.graphdb.Path; diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/query/QueryEngineTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/query/QueryEngineTest.java similarity index 87% rename from spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/query/QueryEngineTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/query/QueryEngineTest.java index 8d6d0fef0..c502191e5 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/query/QueryEngineTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/query/QueryEngineTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.support.query; +package org.springframework.data.neo4j.support.query; import org.junit.Before; import org.junit.Test; @@ -23,16 +23,18 @@ import org.neo4j.graphdb.Node; import org.neo4j.helpers.collection.IteratorUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.convert.ConversionService; -import org.springframework.data.graph.core.GraphDatabase; -import org.springframework.data.graph.core.NodeBacked; -import org.springframework.data.graph.neo4j.Person; -import org.springframework.data.graph.neo4j.Personality; -import org.springframework.data.graph.neo4j.conversion.ResultConverter; -import org.springframework.data.graph.neo4j.support.DelegatingGraphDatabase; -import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; -import org.springframework.data.graph.neo4j.support.TestTeam; -import org.springframework.data.graph.neo4j.support.conversion.EntityResultConverter; -import org.springframework.data.graph.neo4j.support.node.Neo4jHelper; +import org.springframework.data.neo4j.Person; +import org.springframework.data.neo4j.Personality; +import org.springframework.data.neo4j.core.GraphDatabase; +import org.springframework.data.neo4j.core.NodeBacked; +import org.springframework.data.neo4j.Person; +import org.springframework.data.neo4j.Personality; +import org.springframework.data.neo4j.conversion.ResultConverter; +import org.springframework.data.neo4j.support.DelegatingGraphDatabase; +import org.springframework.data.neo4j.support.GraphDatabaseContext; +import org.springframework.data.neo4j.support.TestTeam; +import org.springframework.data.neo4j.support.conversion.EntityResultConverter; +import org.springframework.data.neo4j.support.node.Neo4jHelper; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.transaction.BeforeTransaction; @@ -50,7 +52,7 @@ import static org.junit.Assert.assertEquals; * @since 13.06.11 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/graph/neo4j/support/Neo4jGraphPersistenceTest-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml"}) @Transactional public class QueryEngineTest { @Autowired diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/query/QueryExecutorTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/query/QueryExecutorTest.java similarity index 91% rename from spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/query/QueryExecutorTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/query/QueryExecutorTest.java index cfa9a2748..d705ab4f7 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/query/QueryExecutorTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/query/QueryExecutorTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.support.query; +package org.springframework.data.neo4j.support.query; import org.junit.Before; import org.junit.Test; @@ -22,11 +22,12 @@ import org.junit.internal.matchers.IsCollectionContaining; import org.junit.runner.RunWith; import org.neo4j.helpers.collection.IteratorUtil; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.graph.neo4j.Group; -import org.springframework.data.graph.neo4j.Person; -import org.springframework.data.graph.neo4j.Personality; -import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; -import org.springframework.data.graph.neo4j.support.TestTeam; +import org.springframework.data.neo4j.Group; +import org.springframework.data.neo4j.*; +import org.springframework.data.neo4j.Person; +import org.springframework.data.neo4j.Personality; +import org.springframework.data.neo4j.support.GraphDatabaseContext; +import org.springframework.data.neo4j.support.TestTeam; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.transaction.annotation.Transactional; @@ -43,7 +44,7 @@ import static org.junit.Assert.assertThat; * @since 13.06.11 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/graph/neo4j/support/Neo4jGraphPersistenceTest-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml"}) @Transactional public class QueryExecutorTest { @Autowired diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/query/QueryOperationsTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/query/QueryOperationsTest.java similarity index 89% rename from spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/query/QueryOperationsTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/query/QueryOperationsTest.java index a5188115e..6749775c3 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/support/query/QueryOperationsTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/support/query/QueryOperationsTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.support.query; +package org.springframework.data.neo4j.support.query; import org.junit.Before; import org.junit.Test; @@ -24,14 +24,16 @@ import org.neo4j.graphdb.Node; import org.neo4j.helpers.collection.IteratorUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.convert.ConversionService; -import org.springframework.data.graph.core.GraphDatabase; -import org.springframework.data.graph.core.NodeBacked; -import org.springframework.data.graph.neo4j.Person; -import org.springframework.data.graph.neo4j.Personality; -import org.springframework.data.graph.neo4j.support.DelegatingGraphDatabase; -import org.springframework.data.graph.neo4j.support.GraphDatabaseContext; -import org.springframework.data.graph.neo4j.support.TestTeam; -import org.springframework.data.graph.neo4j.support.node.Neo4jHelper; +import org.springframework.data.neo4j.Person; +import org.springframework.data.neo4j.Personality; +import org.springframework.data.neo4j.core.GraphDatabase; +import org.springframework.data.neo4j.core.NodeBacked; +import org.springframework.data.neo4j.Person; +import org.springframework.data.neo4j.Personality; +import org.springframework.data.neo4j.support.DelegatingGraphDatabase; +import org.springframework.data.neo4j.support.GraphDatabaseContext; +import org.springframework.data.neo4j.support.TestTeam; +import org.springframework.data.neo4j.support.node.Neo4jHelper; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.transaction.BeforeTransaction; @@ -50,7 +52,7 @@ import static org.junit.Assert.assertThat; * @since 13.06.11 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:org/springframework/data/graph/neo4j/support/Neo4jGraphPersistenceTest-context.xml"}) +@ContextConfiguration(locations = {"classpath:org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml"}) @Transactional public class QueryOperationsTest { @Autowired diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/template/Neo4jTemplateApiTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/template/Neo4jTemplateApiTest.java similarity index 97% rename from spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/template/Neo4jTemplateApiTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/template/Neo4jTemplateApiTest.java index e8c86b1e3..f21280d8f 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/template/Neo4jTemplateApiTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/template/Neo4jTemplateApiTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.template; +package org.springframework.data.neo4j.template; import org.apache.lucene.index.Term; import org.apache.lucene.search.TermQuery; @@ -28,9 +28,9 @@ import org.neo4j.test.ImpermanentGraphDatabase; import org.neo4j.kernel.Traversal; import org.neo4j.kernel.impl.transaction.SpringTransactionManager; import org.springframework.dao.DataAccessException; -import org.springframework.data.graph.core.GraphDatabase; -import org.springframework.data.graph.neo4j.support.DelegatingGraphDatabase; -import org.springframework.data.graph.neo4j.support.path.PathMapper; +import org.springframework.data.neo4j.core.GraphDatabase; +import org.springframework.data.neo4j.support.DelegatingGraphDatabase; +import org.springframework.data.neo4j.support.path.PathMapper; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.TransactionStatus; import org.springframework.transaction.jta.JtaTransactionManager; @@ -43,7 +43,7 @@ import java.util.Iterator; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.*; -import static org.springframework.data.graph.core.Property._; +import static org.springframework.data.neo4j.core.Property._; public class Neo4jTemplateApiTest { diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/template/Neo4jTemplateTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/template/Neo4jTemplateTest.java similarity index 93% rename from spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/template/Neo4jTemplateTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/template/Neo4jTemplateTest.java index 2dd231e0c..75ea8fc6e 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/template/Neo4jTemplateTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/template/Neo4jTemplateTest.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.template; +package org.springframework.data.neo4j.template; import org.junit.Test; import org.neo4j.graphdb.Direction; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Relationship; import org.neo4j.graphdb.RelationshipType; -import org.springframework.data.graph.core.GraphDatabase; -import org.springframework.data.graph.core.Property; +import org.springframework.data.neo4j.core.GraphDatabase; +import org.springframework.data.neo4j.core.Property; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -import static org.springframework.data.graph.neo4j.template.Neo4jTemplateTest.Type.HAS; +import static org.springframework.data.neo4j.template.Neo4jTemplateTest.Type.HAS; public class Neo4jTemplateTest extends NeoApiTest { diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/template/NeoApiTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/template/NeoApiTest.java similarity index 88% rename from spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/template/NeoApiTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/template/NeoApiTest.java index b4f3a9e60..cfd9ff2ef 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/template/NeoApiTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/template/NeoApiTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.template; +package org.springframework.data.neo4j.template; import org.junit.After; import org.junit.Before; @@ -22,9 +22,9 @@ import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.test.ImpermanentGraphDatabase; import org.neo4j.kernel.impl.transaction.SpringTransactionManager; import org.springframework.core.convert.ConversionService; -import org.springframework.data.graph.core.GraphDatabase; -import org.springframework.data.graph.neo4j.fieldaccess.Neo4jConversionServiceFactoryBean; -import org.springframework.data.graph.neo4j.support.DelegatingGraphDatabase; +import org.springframework.data.neo4j.core.GraphDatabase; +import org.springframework.data.neo4j.fieldaccess.Neo4jConversionServiceFactoryBean; +import org.springframework.data.neo4j.support.DelegatingGraphDatabase; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.jta.JtaTransactionManager; diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/template/NeoTraversalTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/template/NeoTraversalTest.java similarity index 91% rename from spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/template/NeoTraversalTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/template/NeoTraversalTest.java index f727d71bb..7236658c4 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/template/NeoTraversalTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/template/NeoTraversalTest.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.template; +package org.springframework.data.neo4j.template; import org.junit.Test; -import org.springframework.data.graph.core.GraphDatabase; +import org.springframework.data.neo4j.core.GraphDatabase; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Path; import org.neo4j.graphdb.RelationshipType; import org.neo4j.kernel.Traversal; -import org.springframework.data.graph.neo4j.support.path.PathMapper; +import org.springframework.data.neo4j.support.path.PathMapper; import java.util.HashSet; import java.util.Set; @@ -30,8 +30,8 @@ import java.util.Set; import static java.util.Arrays.asList; import static org.junit.Assert.assertEquals; import static org.neo4j.kernel.Traversal.returnAllButStartNode; -import static org.springframework.data.graph.core.Property._; -import static org.springframework.data.graph.neo4j.template.NeoTraversalTest.Type.HAS; +import static org.springframework.data.neo4j.core.Property._; +import static org.springframework.data.neo4j.template.NeoTraversalTest.Type.HAS; public class NeoTraversalTest extends NeoApiTest { diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/transaction/ChainedTransactionManagerTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transaction/ChainedTransactionManagerTest.java similarity index 93% rename from spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/transaction/ChainedTransactionManagerTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transaction/ChainedTransactionManagerTest.java index 124cfaf02..cdf047d4b 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/transaction/ChainedTransactionManagerTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transaction/ChainedTransactionManagerTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.transaction; +package org.springframework.data.neo4j.transaction; import org.hamcrest.Description; import org.hamcrest.Factory; @@ -25,10 +25,10 @@ import org.springframework.transaction.support.DefaultTransactionDefinition; import static junit.framework.Assert.*; import static org.junit.Assert.assertThat; -import static org.springframework.data.graph.neo4j.transaction.ChainedTransactionManagerTest.TestPlatformTransactionManager.createFailingTransactionManager; -import static org.springframework.data.graph.neo4j.transaction.ChainedTransactionManagerTest.TestPlatformTransactionManager.createNonFailingTransactionManager; -import static org.springframework.data.graph.neo4j.transaction.ChainedTransactionManagerTest.TransactionManagerMatcher.isCommitted; -import static org.springframework.data.graph.neo4j.transaction.ChainedTransactionManagerTest.TransactionManagerMatcher.wasRolledback; +import static org.springframework.data.neo4j.transaction.ChainedTransactionManagerTest.TestPlatformTransactionManager.createFailingTransactionManager; +import static org.springframework.data.neo4j.transaction.ChainedTransactionManagerTest.TestPlatformTransactionManager.createNonFailingTransactionManager; +import static org.springframework.data.neo4j.transaction.ChainedTransactionManagerTest.TransactionManagerMatcher.isCommitted; +import static org.springframework.data.neo4j.transaction.ChainedTransactionManagerTest.TransactionManagerMatcher.wasRolledback; import static org.springframework.transaction.HeuristicCompletionException.getStateString; /** diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/transaction/JOTMIntegrationTest.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transaction/JOTMIntegrationTest.java similarity index 95% rename from spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/transaction/JOTMIntegrationTest.java rename to spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transaction/JOTMIntegrationTest.java index f9b66e353..74ea4b7f9 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/graph/neo4j/transaction/JOTMIntegrationTest.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transaction/JOTMIntegrationTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.graph.neo4j.transaction; +package org.springframework.data.neo4j.transaction; import org.junit.After; import org.junit.Before; @@ -22,13 +22,11 @@ import org.junit.Test; import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.NotFoundException; -import org.neo4j.graphdb.Relationship; -import org.neo4j.graphdb.index.IndexHits; import org.neo4j.kernel.Config; import org.neo4j.kernel.EmbeddedGraphDatabase; import org.objectweb.jotm.Current; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.data.graph.neo4j.support.node.Neo4jHelper; +import org.springframework.data.neo4j.support.node.Neo4jHelper; import org.springframework.transaction.jta.JtaTransactionManager; import org.springframework.transaction.jta.ManagedTransactionAdapter; diff --git a/spring-data-neo4j/src/test/resources/GraphDatabaseFactory-context.xml b/spring-data-neo4j/src/test/resources/GraphDatabaseFactory-context.xml index 2c14203aa..d47c78760 100644 --- a/spring-data-neo4j/src/test/resources/GraphDatabaseFactory-context.xml +++ b/spring-data-neo4j/src/test/resources/GraphDatabaseFactory-context.xml @@ -17,7 +17,7 @@ - + diff --git a/spring-data-neo4j/src/test/resources/META-INF/persistence-neo4j.xml b/spring-data-neo4j/src/test/resources/META-INF/persistence-neo4j.xml deleted file mode 100644 index 5b4ee42c8..000000000 --- a/spring-data-neo4j/src/test/resources/META-INF/persistence-neo4j.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - org.springframework.data.graph.neo4j.jpa.Neo4jPersistenceProvider - org.springframework.data.graph.neo4j.Person - org.springframework.data.graph.neo4j.Group - org.springframework.data.graph.neo4j.Friendship - - - - - diff --git a/spring-data-neo4j/src/test/resources/META-INF/persistence.xml b/spring-data-neo4j/src/test/resources/META-INF/persistence.xml index 381d7c104..11ecf5ca2 100644 --- a/spring-data-neo4j/src/test/resources/META-INF/persistence.xml +++ b/spring-data-neo4j/src/test/resources/META-INF/persistence.xml @@ -5,8 +5,8 @@ org.hibernate.ejb.HibernatePersistence - org.springframework.data.graph.neo4j.partial.User - org.springframework.data.graph.neo4j.partial.Restaurant + org.springframework.data.neo4j.partial.User + org.springframework.data.neo4j.partial.Restaurant diff --git a/spring-data-neo4j/src/test/resources/log4j.properties b/spring-data-neo4j/src/test/resources/log4j.properties index c33528705..93542b175 100644 --- a/spring-data-neo4j/src/test/resources/log4j.properties +++ b/spring-data-neo4j/src/test/resources/log4j.properties @@ -18,9 +18,9 @@ log4j.appender.R.layout.ConversionPattern=%p %t %c - %m%n log4j.category.org.springframework=WARN -#log4j.category.org.springframework.data.graph.neo4j.support.SubReferenceTypeRepresentationStrategyonStrategy=DEBUG -#log4j.category.org.springframework.data.graph.neo4j.fieldaccess=DEBUG +#log4j.category.org.springframework.data.neo4j.support.SubReferenceTypeRepresentationStrategyonStrategy=DEBUG +#log4j.category.org.springframework.data.neo4j.fieldaccess=DEBUG #log4j.category.org.springframework.data=TRACE #log4j.category.org.springframework.data.support=TRACE #log4j.category.org.springframework.persistence=TRACE -#log4j.category.org.springframework.data.graph.neo4j.support=DEBUG +#log4j.category.org.springframework.data.neo4j.support=DEBUG diff --git a/spring-data-neo4j/src/test/resources/org/springframework/data/graph/neo4j/config/ConfigurationCofirmationTest-context.xml b/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/ConfigurationCofirmationTest-context.xml similarity index 100% rename from spring-data-neo4j/src/test/resources/org/springframework/data/graph/neo4j/config/ConfigurationCofirmationTest-context.xml rename to spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/ConfigurationCofirmationTest-context.xml diff --git a/spring-data-neo4j/src/test/resources/org/springframework/data/graph/neo4j/config/DataGraphNamespaceHandlerTest-code-context.xml b/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTest-code-context.xml similarity index 81% rename from spring-data-neo4j/src/test/resources/org/springframework/data/graph/neo4j/config/DataGraphNamespaceHandlerTest-code-context.xml rename to spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTest-code-context.xml index 8225ee6f4..963c4fc70 100644 --- a/spring-data-neo4j/src/test/resources/org/springframework/data/graph/neo4j/config/DataGraphNamespaceHandlerTest-code-context.xml +++ b/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTest-code-context.xml @@ -9,7 +9,7 @@ - + @@ -17,6 +17,6 @@ - + \ No newline at end of file diff --git a/spring-data-neo4j/src/test/resources/org/springframework/data/graph/neo4j/config/DataGraphNamespaceHandlerTest-context.xml b/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTest-context.xml similarity index 86% rename from spring-data-neo4j/src/test/resources/org/springframework/data/graph/neo4j/config/DataGraphNamespaceHandlerTest-context.xml rename to spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTest-context.xml index c9f2da40e..ccd6c69c6 100644 --- a/spring-data-neo4j/src/test/resources/org/springframework/data/graph/neo4j/config/DataGraphNamespaceHandlerTest-context.xml +++ b/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTest-context.xml @@ -11,7 +11,7 @@ - + - + \ No newline at end of file diff --git a/spring-data-neo4j/src/test/resources/org/springframework/data/graph/neo4j/config/DataGraphNamespaceHandlerTest-cross-store-context.xml b/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTest-cross-store-context.xml similarity index 92% rename from spring-data-neo4j/src/test/resources/org/springframework/data/graph/neo4j/config/DataGraphNamespaceHandlerTest-cross-store-context.xml rename to spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTest-cross-store-context.xml index 5a16f6cc7..a1cde923e 100644 --- a/spring-data-neo4j/src/test/resources/org/springframework/data/graph/neo4j/config/DataGraphNamespaceHandlerTest-cross-store-context.xml +++ b/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTest-cross-store-context.xml @@ -24,6 +24,6 @@ - + \ No newline at end of file diff --git a/spring-data-neo4j/src/test/resources/org/springframework/data/graph/neo4j/config/DataGraphNamespaceHandlerTest-external-embedded-context.xml b/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTest-external-embedded-context.xml similarity index 89% rename from spring-data-neo4j/src/test/resources/org/springframework/data/graph/neo4j/config/DataGraphNamespaceHandlerTest-external-embedded-context.xml rename to spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTest-external-embedded-context.xml index a83d26e5d..5e08b6c33 100644 --- a/spring-data-neo4j/src/test/resources/org/springframework/data/graph/neo4j/config/DataGraphNamespaceHandlerTest-external-embedded-context.xml +++ b/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/config/DataGraphNamespaceHandlerTest-external-embedded-context.xml @@ -17,5 +17,5 @@ - + \ No newline at end of file diff --git a/spring-data-neo4j/src/test/resources/org/springframework/data/graph/neo4j/partial/Neo4jGraphRecommendationTest-context.xml b/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/partial/Neo4jGraphRecommendationTest-context.xml similarity index 87% rename from spring-data-neo4j/src/test/resources/org/springframework/data/graph/neo4j/partial/Neo4jGraphRecommendationTest-context.xml rename to spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/partial/Neo4jGraphRecommendationTest-context.xml index 8f9ad5cba..9d239cd92 100644 --- a/spring-data-neo4j/src/test/resources/org/springframework/data/graph/neo4j/partial/Neo4jGraphRecommendationTest-context.xml +++ b/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/partial/Neo4jGraphRecommendationTest-context.xml @@ -59,7 +59,7 @@ The most commonly used annotation is @Autowired, which instructs Spring to dependency inject an object into your class. --> - + @@ -70,12 +70,12 @@ Start datastore config --> - + - + @@ -86,24 +86,24 @@ - + - + - + - + + class="org.springframework.data.neo4j.support.relationship.RelationshipEntityInstantiator"/> - + @@ -112,9 +112,9 @@ - + - + @@ -122,12 +122,12 @@ - + - + @@ -135,7 +135,7 @@ - + diff --git a/spring-data-neo4j/src/test/resources/org/springframework/data/graph/neo4j/support/IndexingTypeRepresentationStrategyOverride-context.xml b/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/support/IndexingTypeRepresentationStrategyOverride-context.xml similarity index 88% rename from spring-data-neo4j/src/test/resources/org/springframework/data/graph/neo4j/support/IndexingTypeRepresentationStrategyOverride-context.xml rename to spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/support/IndexingTypeRepresentationStrategyOverride-context.xml index 1d654a4f3..f88d8dee5 100644 --- a/spring-data-neo4j/src/test/resources/org/springframework/data/graph/neo4j/support/IndexingTypeRepresentationStrategyOverride-context.xml +++ b/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/support/IndexingTypeRepresentationStrategyOverride-context.xml @@ -14,11 +14,11 @@ http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"> - + - + diff --git a/spring-data-neo4j/src/test/resources/org/springframework/data/graph/neo4j/support/Neo4jGraphPersistenceTest-context.xml b/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml similarity index 85% rename from spring-data-neo4j/src/test/resources/org/springframework/data/graph/neo4j/support/Neo4jGraphPersistenceTest-context.xml rename to spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml index 9a8dd9397..198b29d6f 100644 --- a/spring-data-neo4j/src/test/resources/org/springframework/data/graph/neo4j/support/Neo4jGraphPersistenceTest-context.xml +++ b/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/support/Neo4jGraphPersistenceTest-context.xml @@ -60,19 +60,19 @@ The most commonly used annotation is @Autowired, which instructs Spring to dependency inject an object into your class. --> - + - + - + @@ -82,8 +82,8 @@ - - + + @@ -94,12 +94,12 @@ + class="org.springframework.data.neo4j.support.relationship.RelationshipEntityInstantiator"/> + class="org.springframework.data.neo4j.support.node.NodeEntityInstantiator"/> - + @@ -108,20 +108,20 @@ - + - + - + - + @@ -138,14 +138,14 @@ - + - - + + @@ -155,12 +155,12 @@ - - + + - - + + @@ -170,5 +170,5 @@ - + diff --git a/spring-data-neo4j/src/test/resources/org/springframework/data/graph/neo4j/support/NoopTypeRepresentationStrategyOverride-context.xml b/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/support/NoopTypeRepresentationStrategyOverride-context.xml similarity index 88% rename from spring-data-neo4j/src/test/resources/org/springframework/data/graph/neo4j/support/NoopTypeRepresentationStrategyOverride-context.xml rename to spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/support/NoopTypeRepresentationStrategyOverride-context.xml index dff60c3e5..18e29e509 100644 --- a/spring-data-neo4j/src/test/resources/org/springframework/data/graph/neo4j/support/NoopTypeRepresentationStrategyOverride-context.xml +++ b/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/support/NoopTypeRepresentationStrategyOverride-context.xml @@ -14,6 +14,6 @@ http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"> - - + + \ No newline at end of file diff --git a/spring-data-neo4j/src/test/resources/org/springframework/data/graph/neo4j/support/PersonDirectCreator-context.xml b/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/support/PersonDirectCreator-context.xml similarity index 84% rename from spring-data-neo4j/src/test/resources/org/springframework/data/graph/neo4j/support/PersonDirectCreator-context.xml rename to spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/support/PersonDirectCreator-context.xml index 383f2cf03..e39c231e5 100644 --- a/spring-data-neo4j/src/test/resources/org/springframework/data/graph/neo4j/support/PersonDirectCreator-context.xml +++ b/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/support/PersonDirectCreator-context.xml @@ -15,11 +15,11 @@ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"> + class="org.springframework.data.neo4j.support.node.NodeEntityInstantiator"> - - + + diff --git a/spring-data-neo4j/src/test/resources/org/springframework/data/graph/neo4j/support/SubReferenceTypeRepresentationStrategyOverride-context.xml b/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/support/SubReferenceTypeRepresentationStrategyOverride-context.xml similarity index 93% rename from spring-data-neo4j/src/test/resources/org/springframework/data/graph/neo4j/support/SubReferenceTypeRepresentationStrategyOverride-context.xml rename to spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/support/SubReferenceTypeRepresentationStrategyOverride-context.xml index 0bc1dae1a..3f19fb57b 100644 --- a/spring-data-neo4j/src/test/resources/org/springframework/data/graph/neo4j/support/SubReferenceTypeRepresentationStrategyOverride-context.xml +++ b/spring-data-neo4j/src/test/resources/org/springframework/data/neo4j/support/SubReferenceTypeRepresentationStrategyOverride-context.xml @@ -14,7 +14,7 @@ http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"> - + diff --git a/spring-data-neo4j/src/test/resources/repository-namespace-config-context.xml b/spring-data-neo4j/src/test/resources/repository-namespace-config-context.xml index 2371dd7bf..b4972b481 100644 --- a/spring-data-neo4j/src/test/resources/repository-namespace-config-context.xml +++ b/spring-data-neo4j/src/test/resources/repository-namespace-config-context.xml @@ -11,6 +11,6 @@ - + \ No newline at end of file diff --git a/spring-data-neo4j/src/test/resources/spring-tx-text-context.xml b/spring-data-neo4j/src/test/resources/spring-tx-text-context.xml index a31f4b63d..d60a22205 100644 --- a/spring-data-neo4j/src/test/resources/spring-tx-text-context.xml +++ b/spring-data-neo4j/src/test/resources/spring-tx-text-context.xml @@ -19,7 +19,7 @@ - + diff --git a/spring-data-neo4j/template.mf b/spring-data-neo4j/template.mf index 3b095d784..a21ddae63 100644 --- a/spring-data-neo4j/template.mf +++ b/spring-data-neo4j/template.mf @@ -16,7 +16,7 @@ Import-Template: org.springframework.util.*;version="[3.0.0, 4.0.0)", org.springframework.data.*;version="[1.0.0, 2.0.0)", org.springframework.persistence.*;version="[1.0.0, 2.0.0)", - org.springframework.data.graph.*;version="0", + org.springframework.data.neo4j.*;version="0", org.neo4j.*;version="0", org.w3c.dom.*;version="0", org.aspectj.*;version="[1.6.5, 2.0.0)", diff --git a/src/assembly/distribution.xml b/src/assembly/distribution.xml index c7c6c6fb4..a7b9332ee 100644 --- a/src/assembly/distribution.xml +++ b/src/assembly/distribution.xml @@ -42,7 +42,6 @@ - org.springframework.data:spring-data-graph-core org.springframework.data:spring-data-neo4j org.springframework.data:spring-data-neo4j-rest @@ -56,7 +55,6 @@ - org.springframework.data:spring-data-graph-core org.springframework.data:spring-data-neo4j org.springframework.data:spring-data-neo4j-rest diff --git a/src/docbkx/reference/programming-model/indexing.xml b/src/docbkx/reference/programming-model/indexing.xml index c7d60aeb7..9096d28c2 100644 --- a/src/docbkx/reference/programming-model/indexing.xml +++ b/src/docbkx/reference/programming-model/indexing.xml @@ -32,7 +32,7 @@ The indexes can be queried by using a repository (see ). Typically, the repository is an instance of - org.springframework.data.graph.neo4j.repository.DirectGraphRepositoryFactory. + org.springframework.data.neo4j.repository.DirectGraphRepositoryFactory. The methods findByPropertyValue() and findAllByPropertyValue() work on the exact indexes and return the first or all matches. To do range queries, use findAllByRange() (please note that currently both values are inclusive). diff --git a/src/docbkx/reference/programming-model/repositories.xml b/src/docbkx/reference/programming-model/repositories.xml index 7a52a30bf..d464b1ad9 100644 --- a/src/docbkx/reference/programming-model/repositories.xml +++ b/src/docbkx/reference/programming-model/repositories.xml @@ -252,7 +252,7 @@ public class PersonRepositoryImpl implements PersonRepositoryExtension { // configure the repositories, preferably via the datagraph:repositories namespace // (graphDatabaseContext reference is optional) - // have it injected diff --git a/src/docbkx/reference/programming-model/transactions.xml b/src/docbkx/reference/programming-model/transactions.xml index afb2dfe50..e258057c8 100644 --- a/src/docbkx/reference/programming-model/transactions.xml +++ b/src/docbkx/reference/programming-model/transactions.xml @@ -46,12 +46,12 @@ Neo4j Spring integration - + - + @@ -65,7 +65,7 @@ -]]> +]]>]]> One can also configure a stock XA transaction manager (e.g. Atomikos, JOTM, App-Server-TM) to be @@ -76,7 +76,7 @@ ChainedTransactionManager example - @@ -94,7 +94,7 @@ + class="org.springframework.data.neo4j.transaction.ChainedTransactionManager"> @@ -104,7 +104,7 @@ -]]> +]]>]]> diff --git a/src/docbkx/reference/setup.xml b/src/docbkx/reference/setup.xml index b31239771..8d666c07f 100644 --- a/src/docbkx/reference/setup.xml +++ b/src/docbkx/reference/setup.xml @@ -264,10 +264,10 @@ repositories { @Configuration class to bean definitions. Java-based bean configuration - + ... - + @@ -277,7 +277,7 @@ repositories { ... -]]> +]]>]]> diff --git a/src/docbkx/reference/template.xml b/src/docbkx/reference/template.xml index f977d5664..6907fb19f 100644 --- a/src/docbkx/reference/template.xml +++ b/src/docbkx/reference/template.xml @@ -18,7 +18,7 @@ Neo4j template - +]]>]]>