Skip to content

Commit e416294

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

14 files changed

+21
-14
lines changed

src/main/java/org/springframework/data/keyvalue/core/DefaultIdentifierGenerator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import java.util.concurrent.atomic.AtomicReference;
2424

2525
import org.springframework.dao.InvalidDataAccessApiUsageException;
26-
import org.springframework.data.util.TypeInformation;
26+
import org.springframework.data.core.TypeInformation;
2727
import org.springframework.util.ClassUtils;
2828
import org.springframework.util.StringUtils;
2929

src/main/java/org/springframework/data/keyvalue/core/IdentifierGenerator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package org.springframework.data.keyvalue.core;
1717

18-
import org.springframework.data.util.TypeInformation;
18+
import org.springframework.data.core.TypeInformation;
1919

2020
/**
2121
* API for components generating identifiers.

src/main/java/org/springframework/data/keyvalue/core/PropertyPathComparator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import java.util.Map;
2121

2222
import org.jspecify.annotations.Nullable;
23-
import org.springframework.data.mapping.PropertyPath;
23+
import org.springframework.data.core.PropertyPath;
2424
import org.springframework.lang.Contract;
2525

2626
/**

src/main/java/org/springframework/data/keyvalue/core/SimplePropertyPathAccessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
import org.jspecify.annotations.Nullable;
1919
import org.springframework.beans.BeanWrapper;
20-
import org.springframework.data.mapping.PropertyPath;
20+
import org.springframework.data.core.PropertyPath;
2121
import org.springframework.data.util.DirectFieldAccessFallbackBeanWrapper;
2222

2323
/**

src/main/java/org/springframework/data/keyvalue/core/mapping/BasicKeyValuePersistentEntity.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@
1616
package org.springframework.data.keyvalue.core.mapping;
1717

1818
import org.jspecify.annotations.Nullable;
19+
20+
import org.springframework.data.core.TypeInformation;
1921
import org.springframework.data.expression.ValueExpression;
2022
import org.springframework.data.expression.ValueExpressionParser;
2123
import org.springframework.data.mapping.model.BasicPersistentEntity;
22-
import org.springframework.data.util.TypeInformation;
2324
import org.springframework.expression.Expression;
2425
import org.springframework.expression.common.LiteralExpression;
2526
import org.springframework.expression.spel.standard.SpelExpressionParser;

src/main/java/org/springframework/data/keyvalue/core/mapping/context/KeyValueMappingContext.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
import java.util.Collections;
1919

2020
import org.jspecify.annotations.Nullable;
21+
22+
import org.springframework.data.core.TypeInformation;
2123
import org.springframework.data.keyvalue.core.mapping.BasicKeyValuePersistentEntity;
2224
import org.springframework.data.keyvalue.core.mapping.KeySpaceResolver;
2325
import org.springframework.data.keyvalue.core.mapping.KeyValuePersistentEntity;
@@ -26,7 +28,6 @@
2628
import org.springframework.data.mapping.context.MappingContext;
2729
import org.springframework.data.mapping.model.Property;
2830
import org.springframework.data.mapping.model.SimpleTypeHolder;
29-
import org.springframework.data.util.TypeInformation;
3031

3132
/**
3233
* Default implementation of a {@link MappingContext} using {@link KeyValuePersistentEntity} and

src/main/java/org/springframework/data/keyvalue/repository/query/PredicateQueryCreator.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,12 @@
2525
import java.util.regex.Pattern;
2626

2727
import org.jspecify.annotations.Nullable;
28+
2829
import org.springframework.dao.InvalidDataAccessApiUsageException;
30+
import org.springframework.data.core.PropertyPath;
2931
import org.springframework.data.domain.Sort;
3032
import org.springframework.data.keyvalue.core.SimplePropertyPathAccessor;
3133
import org.springframework.data.keyvalue.core.query.KeyValueQuery;
32-
import org.springframework.data.mapping.PropertyPath;
3334
import org.springframework.data.repository.query.ParameterAccessor;
3435
import org.springframework.data.repository.query.parser.AbstractQueryCreator;
3536
import org.springframework.data.repository.query.parser.Part;

src/main/java/org/springframework/data/keyvalue/repository/support/KeyValueQuerydslUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
import java.util.ArrayList;
1919
import java.util.List;
2020

21+
import org.springframework.data.core.PropertyPath;
2122
import org.springframework.data.domain.Sort;
2223
import org.springframework.data.domain.Sort.Order;
23-
import org.springframework.data.mapping.PropertyPath;
2424
import org.springframework.data.querydsl.QSort;
2525
import org.springframework.lang.Contract;
2626
import org.springframework.util.Assert;

src/test/java/org/springframework/data/keyvalue/core/DefaultIdentifierGeneratorUnitTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
import org.junit.jupiter.api.Test;
2424
import org.springframework.dao.InvalidDataAccessApiUsageException;
25-
import org.springframework.data.util.TypeInformation;
25+
import org.springframework.data.core.TypeInformation;
2626

2727
/**
2828
* @author Christoph Strobl

src/test/java/org/springframework/data/keyvalue/core/PredicateQueryEngineUnitTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,15 @@
3030
import org.junit.jupiter.api.extension.ExtendWith;
3131
import org.mockito.Mock;
3232
import org.mockito.junit.jupiter.MockitoExtension;
33+
3334
import org.springframework.data.annotation.Id;
35+
import org.springframework.data.core.TypeInformation;
3436
import org.springframework.data.keyvalue.repository.query.PredicateQueryCreator;
3537
import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
3638
import org.springframework.data.repository.core.RepositoryMetadata;
3739
import org.springframework.data.repository.query.ParametersParameterAccessor;
3840
import org.springframework.data.repository.query.QueryMethod;
3941
import org.springframework.data.repository.query.parser.PartTree;
40-
import org.springframework.data.util.TypeInformation;
4142

4243
/**
4344
* Unit tests for {@link SpelQueryEngine}.

0 commit comments

Comments
 (0)