Skip to content

Commit 1e76408

Browse files
committed
Adapt to package changes in Spring Data commons.
Closes gh-945
1 parent f272fa3 commit 1e76408

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@
4747
<netty.version>4.2.7.Final</netty.version>
4848
<nullaway.version>0.12.10</nullaway.version>
4949
<okhttp3.version>3.14.9</okhttp3.version>
50-
<spring.version>7.0.0-RC1</spring.version>
51-
<spring-data-bom.version>2025.1.0-RC1</spring-data-bom.version>
50+
<spring.version>7.0.0-SNAPSHOT</spring.version>
51+
<spring-data-bom.version>2025.1.0-SNAPSHOT</spring-data-bom.version>
5252
<spring-security-bom.version>7.0.0-M3</spring-security-bom.version>
5353
<reactor.version>2025.0.0-RC1</reactor.version>
5454

spring-vault-core/src/main/java/org/springframework/vault/repository/convert/DefaultVaultTypeMapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
import org.springframework.data.convert.SimpleTypeInformationMapper;
2626
import org.springframework.data.convert.TypeAliasAccessor;
2727
import org.springframework.data.convert.TypeInformationMapper;
28+
import org.springframework.data.core.TypeInformation;
2829
import org.springframework.data.mapping.Alias;
2930
import org.springframework.data.mapping.PersistentEntity;
3031
import org.springframework.data.mapping.context.MappingContext;
31-
import org.springframework.data.util.TypeInformation;
3232

3333
/**
3434
* Default implementation of {@link VaultTypeMapper} allowing configuration of the key to

spring-vault-core/src/main/java/org/springframework/vault/repository/convert/MappingVaultConverter.java

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

2929
import org.springframework.core.CollectionFactory;
3030
import org.springframework.core.convert.support.DefaultConversionService;
31+
import org.springframework.data.core.TypeInformation;
3132
import org.springframework.data.mapping.MappingException;
3233
import org.springframework.data.mapping.Parameter;
3334
import org.springframework.data.mapping.PersistentPropertyAccessor;
@@ -37,7 +38,6 @@
3738
import org.springframework.data.mapping.model.ParameterValueProvider;
3839
import org.springframework.data.mapping.model.PersistentEntityParameterValueProvider;
3940
import org.springframework.data.mapping.model.PropertyValueProvider;
40-
import org.springframework.data.util.TypeInformation;
4141
import org.springframework.lang.Contract;
4242
import org.springframework.util.Assert;
4343
import org.springframework.util.ClassUtils;

spring-vault-core/src/main/java/org/springframework/vault/repository/mapping/BasicVaultPersistentEntity.java

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

1818
import org.jspecify.annotations.Nullable;
1919

20+
import org.springframework.data.core.TypeInformation;
2021
import org.springframework.data.expression.ValueExpression;
2122
import org.springframework.data.expression.ValueExpressionParser;
2223
import org.springframework.data.keyvalue.core.mapping.AnnotationBasedKeySpaceResolver;
2324
import org.springframework.data.keyvalue.core.mapping.BasicKeyValuePersistentEntity;
2425
import org.springframework.data.keyvalue.core.mapping.KeySpaceResolver;
25-
import org.springframework.data.util.TypeInformation;
2626
import org.springframework.expression.Expression;
2727
import org.springframework.expression.common.LiteralExpression;
2828
import org.springframework.util.ObjectUtils;

spring-vault-core/src/main/java/org/springframework/vault/repository/mapping/VaultMappingContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
*/
1616
package org.springframework.vault.repository.mapping;
1717

18+
import org.springframework.data.core.TypeInformation;
1819
import org.springframework.data.keyvalue.core.mapping.context.KeyValueMappingContext;
1920
import org.springframework.data.mapping.model.Property;
2021
import org.springframework.data.mapping.model.SimpleTypeHolder;
21-
import org.springframework.data.util.TypeInformation;
2222

2323
/**
2424
* Mapping context for {@link VaultPersistentEntity Vault-specific entities}.

spring-vault-core/src/test/java/org/springframework/vault/repository/convert/DefaultVaultTypeMapperUnitTests.java

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

2626
import org.springframework.data.convert.ConfigurableTypeInformationMapper;
2727
import org.springframework.data.convert.SimpleTypeInformationMapper;
28-
import org.springframework.data.util.TypeInformation;
28+
import org.springframework.data.core.TypeInformation;
2929

3030
import static org.assertj.core.api.Assertions.*;
3131

0 commit comments

Comments
 (0)