Skip to content

Commit 3f11366

Browse files
committed
Move Commons PropertyPath and TypeInformation types to core package.
See spring-projects/spring-data-commons#3393
1 parent 05452cf commit 3f11366

30 files changed

+33
-33
lines changed

src/main/java/org/springframework/data/neo4j/aot/Neo4jRuntimeHints.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import org.springframework.aot.hint.RuntimeHints;
2424
import org.springframework.aot.hint.RuntimeHintsRegistrar;
2525
import org.springframework.aot.hint.TypeReference;
26+
import org.springframework.data.core.ReactiveWrappers;
2627
import org.springframework.data.neo4j.core.mapping.callback.AfterConvertCallback;
2728
import org.springframework.data.neo4j.core.mapping.callback.BeforeBindCallback;
2829
import org.springframework.data.neo4j.core.mapping.callback.ReactiveBeforeBindCallback;
@@ -37,7 +38,6 @@
3738
import org.springframework.data.neo4j.repository.support.SimpleNeo4jRepository;
3839
import org.springframework.data.neo4j.repository.support.SimpleReactiveNeo4jRepository;
3940
import org.springframework.data.querydsl.QuerydslUtils;
40-
import org.springframework.data.util.ReactiveWrappers;
4141

4242
/**
4343
* AoT runtime hints registering various types for reflection.

src/main/java/org/springframework/data/neo4j/core/Neo4jOperations.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import org.neo4j.cypherdsl.core.Statement;
2626

2727
import org.springframework.dao.IncorrectResultSizeDataAccessException;
28-
import org.springframework.data.mapping.PropertyPath;
28+
import org.springframework.data.core.PropertyPath;
2929
import org.springframework.data.neo4j.core.mapping.Neo4jPersistentProperty;
3030
import org.springframework.data.neo4j.repository.NoResultException;
3131
import org.springframework.data.neo4j.repository.query.QueryFragmentsAndParameters;

src/main/java/org/springframework/data/neo4j/core/Neo4jTemplate.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@
6060
import org.springframework.core.log.LogAccessor;
6161
import org.springframework.dao.IncorrectResultSizeDataAccessException;
6262
import org.springframework.dao.OptimisticLockingFailureException;
63+
import org.springframework.data.core.PropertyPath;
6364
import org.springframework.data.mapping.Association;
6465
import org.springframework.data.mapping.PersistentPropertyAccessor;
65-
import org.springframework.data.mapping.PropertyPath;
6666
import org.springframework.data.mapping.callback.EntityCallbacks;
6767
import org.springframework.data.neo4j.core.TemplateSupport.NodesAndRelationshipsByIdStatementProvider;
6868
import org.springframework.data.neo4j.core.mapping.AssociationHandlerSupport;

src/main/java/org/springframework/data/neo4j/core/PropertyFilterSupport.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,9 @@
2828

2929
import org.apiguardian.api.API;
3030

31+
import org.springframework.data.core.PropertyPath;
32+
import org.springframework.data.core.TypeInformation;
3133
import org.springframework.data.mapping.PersistentProperty;
32-
import org.springframework.data.mapping.PropertyPath;
3334
import org.springframework.data.neo4j.core.mapping.GraphPropertyDescription;
3435
import org.springframework.data.neo4j.core.mapping.Neo4jMappingContext;
3536
import org.springframework.data.neo4j.core.mapping.Neo4jPersistentEntity;
@@ -40,7 +41,6 @@
4041
import org.springframework.data.projection.ProjectionInformation;
4142
import org.springframework.data.repository.query.ResultProcessor;
4243
import org.springframework.data.repository.query.ReturnedType;
43-
import org.springframework.data.util.TypeInformation;
4444

4545
/**
4646
* This class is responsible for creating a List of {@link PropertyPath} entries that

src/main/java/org/springframework/data/neo4j/core/ReactiveNeo4jOperations.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import reactor.core.publisher.Mono;
2626

2727
import org.springframework.dao.IncorrectResultSizeDataAccessException;
28-
import org.springframework.data.mapping.PropertyPath;
28+
import org.springframework.data.core.PropertyPath;
2929
import org.springframework.data.neo4j.core.mapping.Neo4jPersistentProperty;
3030
import org.springframework.data.neo4j.repository.query.QueryFragmentsAndParameters;
3131

src/main/java/org/springframework/data/neo4j/core/ReactiveNeo4jTemplate.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@
6464
import org.springframework.core.log.LogAccessor;
6565
import org.springframework.dao.IncorrectResultSizeDataAccessException;
6666
import org.springframework.dao.OptimisticLockingFailureException;
67+
import org.springframework.data.core.PropertyPath;
6768
import org.springframework.data.mapping.Association;
6869
import org.springframework.data.mapping.PersistentPropertyAccessor;
69-
import org.springframework.data.mapping.PropertyPath;
7070
import org.springframework.data.mapping.callback.ReactiveEntityCallbacks;
7171
import org.springframework.data.neo4j.core.TemplateSupport.FilteredBinderFunction;
7272
import org.springframework.data.neo4j.core.TemplateSupport.NodesAndRelationshipsByIdStatementProvider;

src/main/java/org/springframework/data/neo4j/core/TemplateSupport.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,9 @@
5151
import org.neo4j.driver.types.MapAccessor;
5252
import org.neo4j.driver.types.TypeSystem;
5353

54+
import org.springframework.data.core.PropertyPath;
55+
import org.springframework.data.core.TypeInformation;
5456
import org.springframework.data.mapping.PersistentPropertyAccessor;
55-
import org.springframework.data.mapping.PropertyPath;
5657
import org.springframework.data.neo4j.core.mapping.Constants;
5758
import org.springframework.data.neo4j.core.mapping.EntityInstanceWithSource;
5859
import org.springframework.data.neo4j.core.mapping.IdDescription;
@@ -65,7 +66,6 @@
6566
import org.springframework.data.neo4j.core.mapping.PropertyTraverser;
6667
import org.springframework.data.neo4j.core.mapping.SpringDataCypherDsl;
6768
import org.springframework.data.neo4j.repository.query.QueryFragments;
68-
import org.springframework.data.util.TypeInformation;
6969
import org.springframework.util.Assert;
7070

7171
/**

src/main/java/org/springframework/data/neo4j/core/convert/Neo4jConversionService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import org.neo4j.driver.Value;
2121

2222
import org.springframework.dao.TypeMismatchDataAccessException;
23-
import org.springframework.data.util.TypeInformation;
23+
import org.springframework.data.core.TypeInformation;
2424

2525
/**
2626
* This service orchestrates a standard Spring conversion service with

src/main/java/org/springframework/data/neo4j/core/mapping/DefaultNeo4jConversionService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@
3030
import org.springframework.core.convert.support.ConfigurableConversionService;
3131
import org.springframework.core.convert.support.DefaultConversionService;
3232
import org.springframework.dao.TypeMismatchDataAccessException;
33+
import org.springframework.data.core.TypeInformation;
3334
import org.springframework.data.mapping.model.SimpleTypeHolder;
3435
import org.springframework.data.neo4j.core.convert.Neo4jConversionService;
3536
import org.springframework.data.neo4j.core.convert.Neo4jConversions;
3637
import org.springframework.data.neo4j.core.convert.Neo4jPersistentPropertyConverter;
37-
import org.springframework.data.util.TypeInformation;
3838

3939
/**
4040
* Default implementation for all {@link Neo4jConversionService Neo4j specific conversion

src/main/java/org/springframework/data/neo4j/core/mapping/DefaultNeo4jEntityConverter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949

5050
import org.springframework.core.CollectionFactory;
5151
import org.springframework.core.KotlinDetector;
52+
import org.springframework.data.core.TypeInformation;
5253
import org.springframework.data.mapping.AssociationHandler;
5354
import org.springframework.data.mapping.MappingException;
5455
import org.springframework.data.mapping.Parameter;
@@ -60,7 +61,6 @@
6061
import org.springframework.data.neo4j.core.mapping.callback.EventSupport;
6162
import org.springframework.data.neo4j.core.schema.TargetNode;
6263
import org.springframework.data.util.ReflectionUtils;
63-
import org.springframework.data.util.TypeInformation;
6464
import org.springframework.util.Assert;
6565

6666
/**

0 commit comments

Comments
 (0)