From 993969e123086c9f57fff9c84f84f0dbf1e86b44 Mon Sep 17 00:00:00 2001 From: Gerrit Meier Date: Fri, 20 Oct 2017 13:18:22 +0200 Subject: [PATCH] DATAGRAPH-1044 - Adapt OGM package refactoring. (cherry picked from commit 44a0f8d) --- .../data/neo4j/mapping/Neo4jPersistentProperty.java | 6 +----- .../data/neo4j/transaction/SessionFactoryUtils.java | 13 ++++++++++++- .../data/neo4j/util/IterableUtils.java | 2 +- .../neo4j/transaction/SessionFactoryUtilsTests.java | 4 ++-- .../data/neo4j/util/IterableUtilsTests.java | 4 +--- 5 files changed, 17 insertions(+), 12 deletions(-) diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/mapping/Neo4jPersistentProperty.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/mapping/Neo4jPersistentProperty.java index 9605efd6e..1d663c652 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/mapping/Neo4jPersistentProperty.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/mapping/Neo4jPersistentProperty.java @@ -12,14 +12,10 @@ */ package org.springframework.data.neo4j.mapping; -import java.beans.PropertyDescriptor; -import java.lang.reflect.Field; - import org.neo4j.ogm.annotation.EndNode; import org.neo4j.ogm.annotation.Relationship; import org.neo4j.ogm.annotation.StartNode; -import org.neo4j.ogm.exception.MappingException; -import org.neo4j.ogm.exception.MetadataException; +import org.neo4j.ogm.exception.core.MetadataException; import org.neo4j.ogm.metadata.ClassInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/transaction/SessionFactoryUtils.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/transaction/SessionFactoryUtils.java index 9d50cc7bd..53a63d1b0 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/transaction/SessionFactoryUtils.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/transaction/SessionFactoryUtils.java @@ -17,7 +17,18 @@ import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import org.neo4j.ogm.autoindex.MissingIndexException; -import org.neo4j.ogm.exception.*; +import org.neo4j.ogm.exception.ConnectionException; +import org.neo4j.ogm.exception.CypherException; +import org.neo4j.ogm.exception.ResultErrorsException; +import org.neo4j.ogm.exception.ResultProcessingException; +import org.neo4j.ogm.exception.ServiceNotFoundException; +import org.neo4j.ogm.exception.TransactionException; +import org.neo4j.ogm.exception.core.InvalidDepthException; +import org.neo4j.ogm.exception.core.MappingException; +import org.neo4j.ogm.exception.core.MissingOperatorException; +import org.neo4j.ogm.exception.core.NotFoundException; +import org.neo4j.ogm.exception.core.TransactionManagerException; +import org.neo4j.ogm.exception.core.UnknownStatementTypeException; import org.neo4j.ogm.session.Neo4jException; import org.neo4j.ogm.session.Session; import org.neo4j.ogm.session.SessionFactory; diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/util/IterableUtils.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/util/IterableUtils.java index a9916a380..590ebe74c 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/util/IterableUtils.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/util/IterableUtils.java @@ -13,7 +13,7 @@ package org.springframework.data.neo4j.util; -import org.neo4j.ogm.exception.NotFoundException; +import org.neo4j.ogm.exception.core.NotFoundException; import java.util.ArrayList; import java.util.Collection; diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transaction/SessionFactoryUtilsTests.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transaction/SessionFactoryUtilsTests.java index 796d2f09e..457280dad 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transaction/SessionFactoryUtilsTests.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/transaction/SessionFactoryUtilsTests.java @@ -16,9 +16,9 @@ import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.*; import org.junit.Test; -import org.neo4j.ogm.exception.BaseClassNotFoundException; import org.neo4j.ogm.exception.CypherException; -import org.neo4j.ogm.exception.NotFoundException; +import org.neo4j.ogm.exception.core.BaseClassNotFoundException; +import org.neo4j.ogm.exception.core.NotFoundException; import org.springframework.core.NestedRuntimeException; import org.springframework.dao.DataAccessException; import org.springframework.dao.DataIntegrityViolationException; diff --git a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/util/IterableUtilsTests.java b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/util/IterableUtilsTests.java index e9572f08d..700acc3c9 100644 --- a/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/util/IterableUtilsTests.java +++ b/spring-data-neo4j/src/test/java/org/springframework/data/neo4j/util/IterableUtilsTests.java @@ -21,14 +21,12 @@ import java.util.Arrays; import java.util.Collections; import org.junit.AfterClass; -import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Transaction; -import org.neo4j.ogm.exception.NotFoundException; -import org.neo4j.ogm.testutil.MultiDriverTestClass; +import org.neo4j.ogm.exception.core.NotFoundException; import org.neo4j.test.TestGraphDatabaseFactory; /**