Skip to content

Commit e7afe95

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

14 files changed

+20
-14
lines changed

src/main/java/org/springframework/data/redis/core/convert/CompositeIndexResolver.java

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

2525
import org.jspecify.annotations.Nullable;
26-
import org.springframework.data.util.TypeInformation;
26+
import org.springframework.data.core.TypeInformation;
2727
import org.springframework.util.Assert;
2828
import org.springframework.util.CollectionUtils;
2929

src/main/java/org/springframework/data/redis/core/convert/IndexResolver.java

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

2020
import org.jspecify.annotations.Nullable;
21+
22+
import org.springframework.data.core.TypeInformation;
2123
import org.springframework.data.mapping.PersistentProperty;
22-
import org.springframework.data.util.TypeInformation;
2324

2425
/**
2526
* {@link IndexResolver} extracts secondary index structures to be applied on a given path, {@link PersistentProperty}

src/main/java/org/springframework/data/redis/core/convert/MappingRedisConverter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import org.springframework.core.convert.support.DefaultConversionService;
3131
import org.springframework.core.convert.support.GenericConversionService;
3232
import org.springframework.data.convert.CustomConversions;
33+
import org.springframework.data.core.TypeInformation;
3334
import org.springframework.data.mapping.AssociationHandler;
3435
import org.springframework.data.mapping.InstanceCreatorMetadata;
3536
import org.springframework.data.mapping.MappingException;
@@ -49,7 +50,6 @@
4950
import org.springframework.data.redis.core.mapping.RedisPersistentProperty;
5051
import org.springframework.data.redis.util.ByteUtils;
5152
import org.springframework.data.util.ProxyUtils;
52-
import org.springframework.data.util.TypeInformation;
5353
import org.springframework.util.Assert;
5454
import org.springframework.util.ClassUtils;
5555
import org.springframework.util.CollectionUtils;

src/main/java/org/springframework/data/redis/core/convert/PathIndexResolver.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
import java.util.Set;
2424

2525
import org.jspecify.annotations.Nullable;
26+
27+
import org.springframework.data.core.TypeInformation;
2628
import org.springframework.data.geo.Point;
2729
import org.springframework.data.mapping.PersistentProperty;
2830
import org.springframework.data.mapping.PersistentPropertyAccessor;
@@ -40,7 +42,6 @@
4042
import org.springframework.data.redis.core.mapping.RedisMappingContext;
4143
import org.springframework.data.redis.core.mapping.RedisPersistentEntity;
4244
import org.springframework.data.redis.core.mapping.RedisPersistentProperty;
43-
import org.springframework.data.util.TypeInformation;
4445
import org.springframework.util.Assert;
4546
import org.springframework.util.ClassUtils;
4647
import org.springframework.util.CollectionUtils;

src/main/java/org/springframework/data/redis/core/convert/SpelIndexResolver.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,14 @@
2222
import java.util.Set;
2323

2424
import org.jspecify.annotations.Nullable;
25+
2526
import org.springframework.context.expression.BeanFactoryResolver;
27+
import org.springframework.data.core.TypeInformation;
2628
import org.springframework.data.redis.core.index.ConfigurableIndexDefinitionProvider;
2729
import org.springframework.data.redis.core.index.IndexDefinition;
2830
import org.springframework.data.redis.core.index.SpelIndexDefinition;
2931
import org.springframework.data.redis.core.mapping.RedisMappingContext;
3032
import org.springframework.data.redis.core.mapping.RedisPersistentEntity;
31-
import org.springframework.data.util.TypeInformation;
3233
import org.springframework.expression.BeanResolver;
3334
import org.springframework.expression.Expression;
3435
import org.springframework.expression.spel.standard.SpelExpressionParser;

src/main/java/org/springframework/data/redis/core/index/IndexDefinition.java

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

2020
import org.jspecify.annotations.Nullable;
21-
import org.springframework.data.util.TypeInformation;
21+
import org.springframework.data.core.TypeInformation;
2222
import org.springframework.util.ObjectUtils;
2323

2424
/**

src/main/java/org/springframework/data/redis/core/mapping/BasicRedisPersistentEntity.java

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

1818
import org.jspecify.annotations.Nullable;
19+
1920
import org.springframework.data.annotation.Id;
21+
import org.springframework.data.core.TypeInformation;
2022
import org.springframework.data.keyvalue.core.mapping.BasicKeyValuePersistentEntity;
2123
import org.springframework.data.keyvalue.core.mapping.KeySpaceResolver;
2224
import org.springframework.data.mapping.MappingException;
2325
import org.springframework.data.redis.core.TimeToLive;
2426
import org.springframework.data.redis.core.TimeToLiveAccessor;
25-
import org.springframework.data.util.TypeInformation;
2627
import org.springframework.util.Assert;
2728

2829
/**

src/main/java/org/springframework/data/redis/core/mapping/RedisMappingContext.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@
2222
import java.util.concurrent.TimeUnit;
2323

2424
import org.jspecify.annotations.Nullable;
25+
2526
import org.springframework.core.annotation.AnnotationUtils;
27+
import org.springframework.data.core.TypeInformation;
2628
import org.springframework.data.keyvalue.annotation.KeySpace;
2729
import org.springframework.data.keyvalue.core.mapping.KeySpaceResolver;
2830
import org.springframework.data.keyvalue.core.mapping.context.KeyValueMappingContext;
@@ -41,7 +43,6 @@
4143
import org.springframework.data.redis.core.convert.MappingConfiguration;
4244
import org.springframework.data.redis.core.convert.RedisCustomConversions;
4345
import org.springframework.data.redis.core.index.IndexConfiguration;
44-
import org.springframework.data.util.TypeInformation;
4546
import org.springframework.util.Assert;
4647
import org.springframework.util.ClassUtils;
4748
import org.springframework.util.NumberUtils;

src/main/java/org/springframework/data/redis/hash/ObjectHashMapper.java

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

2222
import org.jspecify.annotations.Nullable;
23+
2324
import org.springframework.data.convert.CustomConversions;
25+
import org.springframework.data.core.TypeInformation;
2426
import org.springframework.data.redis.core.convert.IndexResolver;
2527
import org.springframework.data.redis.core.convert.IndexedData;
2628
import org.springframework.data.redis.core.convert.MappingRedisConverter;
@@ -29,7 +31,6 @@
2931
import org.springframework.data.redis.core.convert.RedisData;
3032
import org.springframework.data.redis.core.convert.ReferenceResolver;
3133
import org.springframework.data.redis.core.mapping.RedisMappingContext;
32-
import org.springframework.data.util.TypeInformation;
3334
import org.springframework.lang.Contract;
3435
import org.springframework.util.Assert;
3536

src/test/java/org/springframework/data/redis/core/convert/CompositeIndexResolverUnitTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.mockito.Mock;
2727
import org.mockito.junit.jupiter.MockitoExtension;
2828

29-
import org.springframework.data.util.TypeInformation;
29+
import org.springframework.data.core.TypeInformation;
3030

3131
/**
3232
* @author Christoph Strobl

0 commit comments

Comments
 (0)