Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 111c355

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

34 files changed

+45
-37
lines changed

‎spring-data-cassandra/src/main/java/org/springframework/data/cassandra/aot/CassandraRuntimeHints.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import org.springframework.data.cassandra.observability.CassandraObservationSupplier;
3333
import org.springframework.data.cassandra.repository.support.SimpleCassandraRepository;
3434
import org.springframework.data.cassandra.repository.support.SimpleReactiveCassandraRepository;
35-
import org.springframework.data.util.ReactiveWrappers;
35+
import org.springframework.data.core.ReactiveWrappers;
3636
import org.springframework.util.ClassUtils;
3737

3838
import com.datastax.oss.driver.api.core.CqlSession;

‎spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraConversionContext.java‎

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

2020
import org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty;
2121
import org.springframework.data.convert.ValueConversionContext;
22+
import org.springframework.data.core.TypeInformation;
2223
import org.springframework.data.mapping.model.PropertyValueProvider;
2324
import org.springframework.data.mapping.model.SpELContext;
24-
import org.springframework.data.util.TypeInformation;
2525

2626
import com.datastax.oss.driver.api.core.cql.Row;
2727

‎spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraConverter.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,16 @@
1616
package org.springframework.data.cassandra.core.convert;
1717

1818
import org.jspecify.annotations.Nullable;
19+
1920
import org.springframework.data.cassandra.core.mapping.CassandraMappingContext;
2021
import org.springframework.data.cassandra.core.mapping.CassandraPersistentEntity;
2122
import org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty;
2223
import org.springframework.data.cassandra.core.mapping.MapId;
2324
import org.springframework.data.convert.CustomConversions;
2425
import org.springframework.data.convert.EntityConverter;
26+
import org.springframework.data.core.TypeInformation;
2527
import org.springframework.data.projection.EntityProjection;
2628
import org.springframework.data.projection.ProjectionFactory;
27-
import org.springframework.data.util.TypeInformation;
2829
import org.springframework.util.Assert;
2930

3031
import com.datastax.oss.driver.api.core.cql.Row;

‎spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/ColumnType.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
package org.springframework.data.cassandra.core.convert;
1717

1818
import org.jspecify.annotations.Nullable;
19-
import org.springframework.data.util.TypeInformation;
19+
import org.springframework.data.core.TypeInformation;
2020

2121
import com.datastax.oss.driver.api.core.data.TupleValue;
2222
import com.datastax.oss.driver.api.core.data.UdtValue;

‎spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/ColumnTypeResolver.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import org.jspecify.annotations.Nullable;
1919
import org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty;
2020
import org.springframework.data.cassandra.core.mapping.CassandraType;
21-
import org.springframework.data.util.TypeInformation;
21+
import org.springframework.data.core.TypeInformation;
2222
import org.springframework.util.Assert;
2323

2424
/**

‎spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/DefaultCassandraColumnType.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
import java.util.function.Supplier;
1919
import java.util.stream.Collectors;
2020

21+
import org.springframework.data.core.TypeInformation;
2122
import org.springframework.data.util.Lazy;
22-
import org.springframework.data.util.TypeInformation;
2323

2424
import com.datastax.oss.driver.api.core.type.DataType;
2525
import com.datastax.oss.driver.api.core.type.UserDefinedType;

‎spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/DefaultColumnType.java‎

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

2323
import org.jspecify.annotations.Nullable;
24-
import org.springframework.data.util.TypeInformation;
24+
import org.springframework.data.core.TypeInformation;
2525

2626
/**
2727
* Default {@link ColumnType} implementation.

‎spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/DefaultColumnTypeResolver.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@
4545
import org.springframework.data.convert.PropertyValueConversions;
4646
import org.springframework.data.convert.PropertyValueConverter;
4747
import org.springframework.data.convert.ValueConversionContext;
48+
import org.springframework.data.core.TypeInformation;
4849
import org.springframework.data.mapping.MappingException;
4950
import org.springframework.data.mapping.context.MappingContext;
5051
import org.springframework.data.util.Lazy;
51-
import org.springframework.data.util.TypeInformation;
5252
import org.springframework.util.Assert;
5353
import org.springframework.util.ObjectUtils;
5454

‎spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/MappingCassandraConverter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
import org.springframework.data.convert.CustomConversions;
4747
import org.springframework.data.convert.PropertyValueConverter;
4848
import org.springframework.data.convert.ValueConversionContext;
49+
import org.springframework.data.core.TypeInformation;
4950
import org.springframework.data.mapping.InstanceCreatorMetadata;
5051
import org.springframework.data.mapping.MappingException;
5152
import org.springframework.data.mapping.Parameter;
@@ -66,7 +67,6 @@
6667
import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
6768
import org.springframework.data.util.Lazy;
6869
import org.springframework.data.util.Predicates;
69-
import org.springframework.data.util.TypeInformation;
7070
import org.springframework.expression.spel.standard.SpelExpressionParser;
7171
import org.springframework.lang.Contract;
7272
import org.springframework.util.Assert;

‎spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/QueryMapper.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import java.util.stream.Collectors;
2525

2626
import org.jspecify.annotations.Nullable;
27+
2728
import org.springframework.data.cassandra.core.mapping.BasicCassandraPersistentEntity;
2829
import org.springframework.data.cassandra.core.mapping.CassandraMappingContext;
2930
import org.springframework.data.cassandra.core.mapping.CassandraPersistentEntity;
@@ -41,13 +42,13 @@
4142
import org.springframework.data.cassandra.core.query.VectorSort;
4243
import org.springframework.data.convert.PropertyValueConverter;
4344
import org.springframework.data.convert.ValueConversionContext;
45+
import org.springframework.data.core.PropertyPath;
46+
import org.springframework.data.core.PropertyReferenceException;
4447
import org.springframework.data.domain.Sort;
4548
import org.springframework.data.domain.Sort.Order;
4649
import org.springframework.data.mapping.PersistentProperty;
4750
import org.springframework.data.mapping.PersistentPropertyPath;
4851
import org.springframework.data.mapping.PropertyHandler;
49-
import org.springframework.data.mapping.PropertyPath;
50-
import org.springframework.data.mapping.PropertyReferenceException;
5152
import org.springframework.data.mapping.context.MappingContext;
5253
import org.springframework.data.mapping.model.PropertyValueProvider;
5354
import org.springframework.util.Assert;

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /