Skip to content

Commit c76db4a

Browse files
committed
Move PropertyPath and TypeInformation types to core package.
Our domain types Sort and ExampleMatcher were designed to use property paths forming a conceptual cycle between the mapping and domain package. By moving PropertyPath support and related types (TypeInformation, wrapper and collection infrastructure) into a newly created core package we're resolving the design cycles resulting in an improved design reflecting the actual intended dependencies. Types moved from org.springframework.data.mapping to org.springframework.data.core: * PropertyPath * PropertyReferenceException Types moved from org.springframework.data.util to org.springframework.data.core: * CustomCollections and CustomCollectionRegistrar * NullableWrapper * NullableWrapperConverters * ReactiveWrappers * TypeInformation Closes #3393
1 parent 6c3e1ac commit c76db4a

File tree

132 files changed

+698
-196
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

132 files changed

+698
-196
lines changed

src/main/java/org/springframework/data/aot/AotMappingContext.java

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

24+
import org.springframework.data.core.TypeInformation;
2425
import org.springframework.data.domain.Page;
2526
import org.springframework.data.geo.Point;
2627
import org.springframework.data.mapping.Association;
@@ -34,7 +35,6 @@
3435
import org.springframework.data.mapping.model.EntityInstantiators;
3536
import org.springframework.data.mapping.model.Property;
3637
import org.springframework.data.mapping.model.SimpleTypeHolder;
37-
import org.springframework.data.util.TypeInformation;
3838

3939
/**
4040
* Simple {@link AbstractMappingContext} for processing of AOT contributions.

src/main/java/org/springframework/data/aot/AuditingBeanRegistrationAotProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
import org.springframework.beans.factory.aot.BeanRegistrationAotProcessor;
2626
import org.springframework.beans.factory.support.RegisteredBean;
2727
import org.springframework.core.DecoratingProxy;
28+
import org.springframework.data.core.ReactiveWrappers;
2829
import org.springframework.data.domain.AuditorAware;
2930
import org.springframework.data.domain.ReactiveAuditorAware;
30-
import org.springframework.data.util.ReactiveWrappers;
3131
import org.springframework.util.ClassUtils;
3232

3333
/**

src/main/java/org/springframework/data/convert/ConfigurableTypeInformationMapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121

2222
import org.jspecify.annotations.Nullable;
2323

24+
import org.springframework.data.core.TypeInformation;
2425
import org.springframework.data.mapping.Alias;
2526
import org.springframework.data.mapping.PersistentEntity;
2627
import org.springframework.data.mapping.context.MappingContext;
27-
import org.springframework.data.util.TypeInformation;
2828
import org.springframework.util.Assert;
2929

3030
/**

src/main/java/org/springframework/data/convert/CustomConversions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
import org.springframework.core.convert.converter.GenericConverter.ConvertiblePair;
3535
import org.springframework.core.convert.support.GenericConversionService;
3636
import org.springframework.data.convert.ConverterBuilder.ConverterAware;
37+
import org.springframework.data.core.CustomCollections;
3738
import org.springframework.data.mapping.PersistentProperty;
3839
import org.springframework.data.mapping.model.SimpleTypeHolder;
39-
import org.springframework.data.util.CustomCollections;
4040
import org.springframework.data.util.Predicates;
4141
import org.springframework.data.util.Streamable;
4242
import org.springframework.util.Assert;

src/main/java/org/springframework/data/convert/DefaultTypeMapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626
import org.jspecify.annotations.Nullable;
2727

2828
import org.springframework.beans.factory.BeanClassLoaderAware;
29+
import org.springframework.data.core.TypeInformation;
2930
import org.springframework.data.mapping.Alias;
3031
import org.springframework.data.mapping.PersistentEntity;
3132
import org.springframework.data.mapping.context.MappingContext;
32-
import org.springframework.data.util.TypeInformation;
3333
import org.springframework.util.Assert;
3434

3535
/**

src/main/java/org/springframework/data/convert/MappingContextTypeInformationMapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020

2121
import org.jspecify.annotations.Nullable;
2222

23+
import org.springframework.data.core.TypeInformation;
2324
import org.springframework.data.mapping.Alias;
2425
import org.springframework.data.mapping.PersistentEntity;
2526
import org.springframework.data.mapping.PersistentProperty;
2627
import org.springframework.data.mapping.context.MappingContext;
27-
import org.springframework.data.util.TypeInformation;
2828
import org.springframework.util.Assert;
2929

3030
/**

src/main/java/org/springframework/data/convert/SimpleTypeInformationMapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import org.jspecify.annotations.Nullable;
2323

2424
import org.springframework.beans.factory.BeanClassLoaderAware;
25+
import org.springframework.data.core.TypeInformation;
2526
import org.springframework.data.mapping.Alias;
26-
import org.springframework.data.util.TypeInformation;
2727
import org.springframework.util.ClassUtils;
2828

2929
/**

src/main/java/org/springframework/data/convert/TypeInformationMapper.java

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

1818
import org.jspecify.annotations.Nullable;
1919

20+
import org.springframework.data.core.TypeInformation;
2021
import org.springframework.data.mapping.Alias;
21-
import org.springframework.data.util.TypeInformation;
2222

2323
/**
2424
* Interface to abstract the mapping from a type alias to the actual type.

src/main/java/org/springframework/data/convert/TypeMapper.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

20-
import org.springframework.data.util.TypeInformation;
20+
import org.springframework.data.core.TypeInformation;
2121

2222
/**
2323
* Interface to define strategies how to store type information in a store specific sink or source.

src/main/java/org/springframework/data/convert/ValueConversionContext.java

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

1818
import org.jspecify.annotations.Nullable;
1919

20+
import org.springframework.data.core.TypeInformation;
2021
import org.springframework.data.mapping.PersistentProperty;
21-
import org.springframework.data.util.TypeInformation;
2222

2323
/**
2424
* The {@link ValueConversionContext} provides access to the store-specific {@link PersistentProperty} and allows to

0 commit comments

Comments
 (0)