Skip to content

Commit 2bad55c

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

File tree

18 files changed

+27
-22
lines changed

18 files changed

+27
-22
lines changed

spring-data-rest-core/src/main/java/org/springframework/data/rest/core/UriToEntityConverter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@
2626
import org.springframework.core.convert.ConversionService;
2727
import org.springframework.core.convert.TypeDescriptor;
2828
import org.springframework.core.convert.converter.GenericConverter;
29+
import org.springframework.data.core.TypeInformation;
2930
import org.springframework.data.mapping.PersistentEntity;
3031
import org.springframework.data.mapping.context.PersistentEntities;
3132
import org.springframework.data.repository.support.Repositories;
3233
import org.springframework.data.repository.support.RepositoryInvokerFactory;
3334
import org.springframework.data.util.ClassUtils;
34-
import org.springframework.data.util.TypeInformation;
3535
import org.springframework.util.Assert;
3636

3737
/**

spring-data-rest-core/src/test/java/org/springframework/data/rest/core/UriToEntityConverterUnitTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,20 @@
3333
import org.junit.jupiter.api.extension.ExtendWith;
3434
import org.mockito.Mock;
3535
import org.mockito.junit.jupiter.MockitoExtension;
36+
3637
import org.springframework.core.ResolvableType;
3738
import org.springframework.core.convert.ConversionFailedException;
3839
import org.springframework.core.convert.ConversionService;
3940
import org.springframework.core.convert.TypeDescriptor;
4041
import org.springframework.core.convert.converter.GenericConverter.ConvertiblePair;
4142
import org.springframework.data.annotation.Id;
43+
import org.springframework.data.core.TypeInformation;
4244
import org.springframework.data.keyvalue.core.mapping.context.KeyValueMappingContext;
4345
import org.springframework.data.mapping.context.PersistentEntities;
4446
import org.springframework.data.repository.support.RepositoryInvoker;
4547
import org.springframework.data.repository.support.RepositoryInvokerFactory;
4648
import org.springframework.data.rest.core.UriToEntityConverterUnitTests.JMoleculesAggregateRoot.JMoleculesIdentifier;
4749
import org.springframework.data.util.Streamable;
48-
import org.springframework.data.util.TypeInformation;
4950
import org.springframework.format.support.DefaultFormattingConversionService;
5051
import org.springframework.util.ObjectUtils;
5152

spring-data-rest-core/src/test/java/org/springframework/data/rest/core/ValidationErrorsUnitTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,13 @@
2323

2424
import org.junit.jupiter.api.BeforeEach;
2525
import org.junit.jupiter.api.Test;
26+
2627
import org.springframework.beans.NotReadablePropertyException;
28+
import org.springframework.data.core.TypeInformation;
2729
import org.springframework.data.keyvalue.core.mapping.KeyValuePersistentEntity;
2830
import org.springframework.data.keyvalue.core.mapping.KeyValuePersistentProperty;
2931
import org.springframework.data.keyvalue.core.mapping.context.KeyValueMappingContext;
3032
import org.springframework.data.mapping.context.PersistentEntities;
31-
import org.springframework.data.util.TypeInformation;
3233
import org.springframework.validation.Errors;
3334

3435
/**

spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositorySearchController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import java.util.Optional;
2525

2626
import org.springframework.core.MethodParameter;
27+
import org.springframework.data.core.TypeInformation;
2728
import org.springframework.data.domain.Sort;
2829
import org.springframework.data.mapping.PersistentEntity;
2930
import org.springframework.data.mapping.PersistentProperty;
@@ -35,7 +36,6 @@
3536
import org.springframework.data.rest.core.mapping.SearchResourceMappings;
3637
import org.springframework.data.rest.webmvc.support.DefaultedPageable;
3738
import org.springframework.data.rest.webmvc.support.RepositoryEntityLinks;
38-
import org.springframework.data.util.TypeInformation;
3939
import org.springframework.data.web.PagedResourcesAssembler;
4040
import org.springframework.hateoas.CollectionModel;
4141
import org.springframework.hateoas.EntityModel;

spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/config/QuerydslAwareRootResourceInformationHandlerMethodArgumentResolver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import java.util.Optional;
2222

2323
import org.springframework.core.MethodParameter;
24+
import org.springframework.data.core.TypeInformation;
2425
import org.springframework.data.querydsl.QuerydslPredicateExecutor;
2526
import org.springframework.data.querydsl.QuerydslRepositoryInvokerAdapter;
2627
import org.springframework.data.querydsl.binding.QuerydslBindings;
@@ -32,7 +33,6 @@
3233
import org.springframework.data.repository.support.RepositoryInvokerFactory;
3334
import org.springframework.data.rest.webmvc.RootResourceInformation;
3435
import org.springframework.data.util.Pair;
35-
import org.springframework.data.util.TypeInformation;
3636
import org.springframework.util.LinkedMultiValueMap;
3737
import org.springframework.util.MultiValueMap;
3838
import org.springframework.web.method.support.HandlerMethodArgumentResolver;

spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/AggregateReferenceResolvingModule.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@
2828

2929
import java.util.Iterator;
3030

31+
import org.springframework.data.core.TypeInformation;
3132
import org.springframework.data.rest.core.UriToEntityConverter;
3233
import org.springframework.data.rest.core.mapping.ResourceMappings;
3334
import org.springframework.data.rest.webmvc.json.PersistentEntityJacksonModule.AssociationUriResolvingDeserializerModifier.ValueInstantiatorCustomizer;
3435
import org.springframework.data.rest.webmvc.json.PersistentEntityJacksonModule.CollectionValueInstantiator;
3536
import org.springframework.data.rest.webmvc.json.PersistentEntityJacksonModule.UriStringDeserializer;
36-
import org.springframework.data.util.TypeInformation;
3737
import org.springframework.util.Assert;
3838

3939

spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/DomainObjectReader.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,12 @@
3333
import java.util.function.IntFunction;
3434

3535
import org.jspecify.annotations.Nullable;
36+
3637
import org.springframework.beans.PropertyAccessor;
3738
import org.springframework.beans.PropertyAccessorFactory;
3839
import org.springframework.core.CollectionFactory;
3940
import org.springframework.core.convert.support.DefaultConversionService;
41+
import org.springframework.data.core.TypeInformation;
4042
import org.springframework.data.mapping.Association;
4143
import org.springframework.data.mapping.PersistentEntity;
4244
import org.springframework.data.mapping.PersistentProperty;
@@ -47,7 +49,6 @@
4749
import org.springframework.data.mapping.model.ConvertingPropertyAccessor;
4850
import org.springframework.data.rest.webmvc.mapping.Associations;
4951
import org.springframework.data.rest.webmvc.util.InputStreamHttpInputMessage;
50-
import org.springframework.data.util.TypeInformation;
5152
import org.springframework.http.converter.HttpMessageNotReadableException;
5253
import org.springframework.util.Assert;
5354
import org.springframework.util.ClassUtils;

spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/Jackson2Serializers.java

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

2323
import org.jspecify.annotations.Nullable;
2424

25+
import org.springframework.data.core.TypeInformation;
2526
import org.springframework.data.rest.webmvc.json.JsonSchema.EnumProperty;
2627
import org.springframework.data.rest.webmvc.json.JsonSchema.JsonSchemaProperty;
27-
import org.springframework.data.util.TypeInformation;
2828
import org.springframework.util.Assert;
2929

3030
import com.fasterxml.jackson.core.JsonGenerator;

spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/JacksonSerializers.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434

3535
import org.jspecify.annotations.Nullable;
3636

37+
import org.springframework.data.core.TypeInformation;
3738
import org.springframework.data.rest.webmvc.json.JsonSchema.EnumProperty;
3839
import org.springframework.data.rest.webmvc.json.JsonSchema.JsonSchemaProperty;
39-
import org.springframework.data.util.TypeInformation;
4040
import org.springframework.util.Assert;
4141

4242
/**

spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/JsonSchema.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131

3232
import org.jspecify.annotations.Nullable;
3333

34+
import org.springframework.data.core.TypeInformation;
3435
import org.springframework.data.rest.core.config.JsonSchemaFormat;
35-
import org.springframework.data.util.TypeInformation;
3636
import org.springframework.util.Assert;
3737
import org.springframework.util.ClassUtils;
3838
import org.springframework.util.StringUtils;

0 commit comments

Comments
 (0)