diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/ColumnType.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/ColumnType.java index 4c2d34285..ad769093f 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/ColumnType.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/ColumnType.java @@ -15,7 +15,6 @@ */ package org.springframework.data.cassandra.core.convert; -import org.springframework.data.util.ClassTypeInformation; import org.springframework.data.util.TypeInformation; import org.springframework.lang.Nullable; @@ -42,7 +41,7 @@ public interface ColumnType { * @return */ static ColumnType create(Class type) { - return create(ClassTypeInformation.from(type)); + return create(TypeInformation.of(type)); } /** @@ -63,7 +62,7 @@ public interface ColumnType { * @return */ static CassandraColumnType create(Class type, DataType dataType) { - return new DefaultCassandraColumnType(ClassTypeInformation.from(type), dataType); + return new DefaultCassandraColumnType(TypeInformation.of(type), dataType); } /** @@ -78,7 +77,7 @@ public interface ColumnType { return listOf((CassandraColumnType) componentType); } - return new DefaultColumnType(ClassTypeInformation.LIST, componentType); + return new DefaultColumnType(TypeInformation.LIST, componentType); } /** @@ -99,7 +98,7 @@ public interface ColumnType { * @return */ static CassandraColumnType listOf(CassandraColumnType componentType, boolean frozen) { - return new DefaultCassandraColumnType(ClassTypeInformation.LIST, + return new DefaultCassandraColumnType(TypeInformation.LIST, () -> DataTypes.listOf(componentType.getDataType(), frozen), componentType); } @@ -115,7 +114,7 @@ public interface ColumnType { return setOf((CassandraColumnType) componentType); } - return new DefaultColumnType(ClassTypeInformation.SET, componentType); + return new DefaultColumnType(TypeInformation.SET, componentType); } /** @@ -136,7 +135,7 @@ public interface ColumnType { * @return */ static CassandraColumnType setOf(CassandraColumnType componentType, boolean frozen) { - return new DefaultCassandraColumnType(ClassTypeInformation.SET, + return new DefaultCassandraColumnType(TypeInformation.SET, () -> DataTypes.setOf(componentType.getDataType(), frozen), componentType); } @@ -148,7 +147,7 @@ public interface ColumnType { * @return */ static ColumnType mapOf(ColumnType keyType, ColumnType valueType) { - return new DefaultColumnType(ClassTypeInformation.MAP, keyType, valueType); + return new DefaultColumnType(TypeInformation.MAP, keyType, valueType); } /** @@ -172,7 +171,7 @@ public interface ColumnType { * @since 3.2.4 */ static CassandraColumnType mapOf(CassandraColumnType keyType, CassandraColumnType valueType, boolean frozen) { - return new DefaultCassandraColumnType(ClassTypeInformation.MAP, + return new DefaultCassandraColumnType(TypeInformation.MAP, () -> DataTypes.mapOf(keyType.getDataType(), valueType.getDataType(), frozen), keyType, valueType); } diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/DefaultCassandraColumnType.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/DefaultCassandraColumnType.java index 1ae66131e..adb159053 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/DefaultCassandraColumnType.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/DefaultCassandraColumnType.java @@ -18,7 +18,6 @@ package org.springframework.data.cassandra.core.convert; import java.util.function.Supplier; import java.util.stream.Collectors; -import org.springframework.data.util.ClassTypeInformation; import org.springframework.data.util.Lazy; import org.springframework.data.util.TypeInformation; @@ -36,7 +35,7 @@ class DefaultCassandraColumnType extends DefaultColumnType implements CassandraC private final Lazy dataType; DefaultCassandraColumnType(Class type, DataType dataType, ColumnType... parameters) { - this(ClassTypeInformation.from(type), dataType, parameters); + this(TypeInformation.of(type), dataType, parameters); } DefaultCassandraColumnType(TypeInformation typeInformation, Supplier dataType, diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/DefaultColumnType.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/DefaultColumnType.java index b42585017..38ccc84c6 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/DefaultColumnType.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/DefaultColumnType.java @@ -20,7 +20,6 @@ import java.util.List; import java.util.Set; import java.util.stream.Collectors; -import org.springframework.data.util.ClassTypeInformation; import org.springframework.data.util.TypeInformation; import org.springframework.lang.Nullable; @@ -32,7 +31,7 @@ import org.springframework.lang.Nullable; */ class DefaultColumnType implements ColumnType { - public static final DefaultColumnType OBJECT = new DefaultColumnType(ClassTypeInformation.OBJECT); + public static final DefaultColumnType OBJECT = new DefaultColumnType(TypeInformation.OBJECT); private final TypeInformation typeInformation; private final List parameters; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/DefaultColumnTypeResolver.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/DefaultColumnTypeResolver.java index d0a5269f4..7b6a0e162 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/DefaultColumnTypeResolver.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/DefaultColumnTypeResolver.java @@ -41,7 +41,6 @@ import org.springframework.data.cassandra.core.mapping.UserTypeResolver; import org.springframework.data.convert.CustomConversions; import org.springframework.data.mapping.MappingException; import org.springframework.data.mapping.context.MappingContext; -import org.springframework.data.util.ClassTypeInformation; import org.springframework.data.util.Lazy; import org.springframework.data.util.TypeInformation; import org.springframework.lang.Nullable; @@ -196,7 +195,7 @@ class DefaultColumnTypeResolver implements ColumnTypeResolver { private CassandraColumnType resolve(TypeInformation typeInformation, FrozenIndicator frozen) { return getCustomWriteTarget(typeInformation) - .map(it -> createCassandraTypeDescriptor(tryResolve(it), ClassTypeInformation.from(it))) + .map(it -> createCassandraTypeDescriptor(tryResolve(it), TypeInformation.of(it))) .orElseGet(() -> typeInformation.getType().isEnum() ? ColumnType.create(String.class, DataTypes.TEXT) : createCassandraTypeDescriptor(typeInformation, frozen)); @@ -279,7 +278,7 @@ class DefaultColumnTypeResolver implements ColumnTypeResolver { if (value != null) { - ClassTypeInformation typeInformation = ClassTypeInformation.from(value.getClass()); + TypeInformation typeInformation = TypeInformation.of(value.getClass()); return getCustomWriteTarget(typeInformation).map(it -> { return (ColumnType) createCassandraTypeDescriptor(tryResolve(it), typeInformation); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/MappingCassandraConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/MappingCassandraConverter.java index 70e086759..1e36240e3 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/MappingCassandraConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/MappingCassandraConverter.java @@ -60,7 +60,6 @@ import org.springframework.data.mapping.model.SpELExpressionParameterValueProvid import org.springframework.data.projection.EntityProjection; import org.springframework.data.projection.ProjectionFactory; import org.springframework.data.projection.SpelAwareProxyProjectionFactory; -import org.springframework.data.util.ClassTypeInformation; import org.springframework.data.util.Predicates; import org.springframework.data.util.TypeInformation; import org.springframework.lang.Nullable; @@ -420,7 +419,7 @@ public class MappingCassandraConverter extends AbstractCassandraConverter public R readRow(Class type, Row row) { Class beanClassLoaderClass = transformClassToBeanClassLoaderClass(type); - TypeInformation typeInfo = ClassTypeInformation.from(beanClassLoaderClass); + TypeInformation typeInfo = TypeInformation.of(beanClassLoaderClass); return doReadRow(getConversionContext(), row, typeInfo); } @@ -553,7 +552,7 @@ public class MappingCassandraConverter extends AbstractCassandraConverter @Override public Object convertToColumnType(Object obj) { - return convertToColumnType(obj, ClassTypeInformation.from(obj.getClass())); + return convertToColumnType(obj, TypeInformation.of(obj.getClass())); } @Override @@ -924,7 +923,7 @@ public class MappingCassandraConverter extends AbstractCassandraConverter return writeMapInternal((Map) value, columnType); } - TypeInformation type = ClassTypeInformation.from((Class) value.getClass()); + TypeInformation type = TypeInformation.of((Class) value.getClass()); TypeInformation actualType = type.getRequiredActualType(); BasicCassandraPersistentEntity entity = getMappingContext().getPersistentEntity(actualType.getType()); @@ -1144,7 +1143,7 @@ public class MappingCassandraConverter extends AbstractCassandraConverter } TypeInformation componentType = targetType.getComponentType(); - componentType = componentType == null ? ClassTypeInformation.from(elementType) : componentType; + componentType = componentType == null ? TypeInformation.of(elementType) : componentType; for (Object element : source) { collection.add(context.convert(element, componentType)); @@ -1200,7 +1199,7 @@ public class MappingCassandraConverter extends AbstractCassandraConverter Object value = entry.getValue(); - map.put(key, context.convert(value, valueType == null ? ClassTypeInformation.OBJECT : valueType)); + map.put(key, context.convert(value, valueType == null ? TypeInformation.OBJECT : valueType)); } return map; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraQueryMethod.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraQueryMethod.java index 871226ad4..5c2f6d22d 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraQueryMethod.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraQueryMethod.java @@ -30,7 +30,6 @@ import org.springframework.data.mapping.context.MappingContext; import org.springframework.data.projection.ProjectionFactory; import org.springframework.data.repository.core.RepositoryMetadata; import org.springframework.data.repository.query.QueryMethod; -import org.springframework.data.util.ClassTypeInformation; import org.springframework.data.util.TypeInformation; import org.springframework.lang.Nullable; import org.springframework.util.Assert; @@ -201,7 +200,7 @@ public class CassandraQueryMethod extends QueryMethod { * @return the return type for this {@link QueryMethod}. */ public TypeInformation getReturnType() { - return ClassTypeInformation.fromReturnTypeOf(this.method); + return TypeInformation.fromReturnTypeOf(this.method); } /** diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/convert/ColumnTypeResolverUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/convert/ColumnTypeResolverUnitTests.java index cb19d6195..d9fb96cdf 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/convert/ColumnTypeResolverUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/convert/ColumnTypeResolverUnitTests.java @@ -25,6 +25,7 @@ import java.util.UUID; import org.assertj.core.api.SoftAssertions; import org.junit.jupiter.api.Test; + import org.springframework.data.cassandra.core.mapping.BasicCassandraPersistentEntity; import org.springframework.data.cassandra.core.mapping.CassandraMappingContext; import org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty; @@ -32,7 +33,7 @@ import org.springframework.data.cassandra.core.mapping.CassandraType; import org.springframework.data.cassandra.core.mapping.Frozen; import org.springframework.data.cassandra.core.mapping.UserDefinedType; import org.springframework.data.mapping.MappingException; -import org.springframework.data.util.ClassTypeInformation; +import org.springframework.data.util.TypeInformation; import com.datastax.oss.driver.api.core.data.TupleValue; import com.datastax.oss.driver.api.core.type.DataType; @@ -59,8 +60,8 @@ public class ColumnTypeResolverUnitTests { void shouldResolveSimpleType() { assertThat(resolver.resolve("foo").getType()).isEqualTo(String.class); - assertThat(resolver.resolve(ClassTypeInformation.from(String.class)).getType()).isEqualTo(String.class); - assertThat(resolver.resolve(ClassTypeInformation.from(String.class)).getDataType()).isEqualTo(DataTypes.TEXT); + assertThat(resolver.resolve(TypeInformation.of(String.class)).getType()).isEqualTo(String.class); + assertThat(resolver.resolve(TypeInformation.of(String.class)).getDataType()).isEqualTo(DataTypes.TEXT); BasicCassandraPersistentEntity entity = mappingContext.getRequiredPersistentEntity(Person.class); @@ -72,8 +73,8 @@ public class ColumnTypeResolverUnitTests { void shouldResolveEnumType() { assertThat(resolver.resolve(MyEnum.INSTANCE).getType()).isEqualTo(String.class); - assertThat(resolver.resolve(ClassTypeInformation.from(MyEnum.class)).getType()).isEqualTo(String.class); - assertThat(resolver.resolve(ClassTypeInformation.from(MyEnum.class)).getDataType()).isEqualTo(DataTypes.TEXT); + assertThat(resolver.resolve(TypeInformation.of(MyEnum.class)).getType()).isEqualTo(String.class); + assertThat(resolver.resolve(TypeInformation.of(MyEnum.class)).getDataType()).isEqualTo(DataTypes.TEXT); BasicCassandraPersistentEntity entity = mappingContext.getRequiredPersistentEntity(Person.class); diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentEntityUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentEntityUnitTests.java index 034f86713..46612e645 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentEntityUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentEntityUnitTests.java @@ -34,7 +34,7 @@ import org.springframework.context.ApplicationContext; import org.springframework.core.annotation.AliasFor; import org.springframework.data.mapping.Association; import org.springframework.data.mapping.AssociationHandler; -import org.springframework.data.util.ClassTypeInformation; +import org.springframework.data.util.TypeInformation; import com.datastax.oss.driver.api.core.CqlIdentifier; @@ -55,7 +55,7 @@ class BasicCassandraPersistentEntityUnitTests { void subclassInheritsAtTableAnnotation() { BasicCassandraPersistentEntity entity = new BasicCassandraPersistentEntity<>( - ClassTypeInformation.from(Notification.class)); + TypeInformation.of(Notification.class)); assertThat(entity.getTableName().asCql(true)).isEqualTo("messages"); } @@ -64,7 +64,7 @@ class BasicCassandraPersistentEntityUnitTests { void evaluatesSpELExpression() { BasicCassandraPersistentEntity entity = new BasicCassandraPersistentEntity<>( - ClassTypeInformation.from(Area.class)); + TypeInformation.of(Area.class)); entity.setApplicationContext(this.context); @@ -81,7 +81,7 @@ class BasicCassandraPersistentEntityUnitTests { when(this.context.containsBean("tableNameHolderThingy")).thenReturn(true); BasicCassandraPersistentEntity entity = new BasicCassandraPersistentEntity<>( - ClassTypeInformation.from(UserLine.class)); + TypeInformation.of(UserLine.class)); entity.setApplicationContext(context); assertThat(entity.getTableName()).hasToString(bean.tableName); @@ -91,7 +91,7 @@ class BasicCassandraPersistentEntityUnitTests { void setForceQuoteCallsSetTableName() { BasicCassandraPersistentEntity entitySpy = spy( - new BasicCassandraPersistentEntity<>(ClassTypeInformation.from(Message.class))); + new BasicCassandraPersistentEntity<>(TypeInformation.of(Message.class))); DirectFieldAccessor directFieldAccessor = new DirectFieldAccessor(entitySpy); @@ -110,7 +110,7 @@ class BasicCassandraPersistentEntityUnitTests { void setForceQuoteDoesNothing() { BasicCassandraPersistentEntity entitySpy = spy( - new BasicCassandraPersistentEntity<>(ClassTypeInformation.from(Message.class))); + new BasicCassandraPersistentEntity<>(TypeInformation.of(Message.class))); DirectFieldAccessor directFieldAccessor = new DirectFieldAccessor(entitySpy); @@ -126,7 +126,7 @@ class BasicCassandraPersistentEntityUnitTests { void isUserDefinedTypeShouldReturnFalse() { BasicCassandraPersistentEntity entity = new BasicCassandraPersistentEntity<>( - ClassTypeInformation.from(UserLine.class)); + TypeInformation.of(UserLine.class)); assertThat(entity.isUserDefinedType()).isFalse(); } @@ -135,7 +135,7 @@ class BasicCassandraPersistentEntityUnitTests { void shouldConsiderComposedTableAnnotation() { BasicCassandraPersistentEntity entity = new BasicCassandraPersistentEntity<>( - ClassTypeInformation.from(TableWithComposedAnnotation.class)); + TypeInformation.of(TableWithComposedAnnotation.class)); assertThat(entity.getTableName()).isEqualTo(CqlIdentifier.fromCql("mytable")); } @@ -144,7 +144,7 @@ class BasicCassandraPersistentEntityUnitTests { void shouldConsiderComposedPrimaryKeyClassAnnotation() { BasicCassandraPersistentEntity entity = new BasicCassandraPersistentEntity<>( - ClassTypeInformation.from(PrimaryKeyClassWithComposedAnnotation.class)); + TypeInformation.of(PrimaryKeyClassWithComposedAnnotation.class)); assertThat(entity.isCompositePrimaryKey()).isTrue(); } @@ -154,7 +154,7 @@ class BasicCassandraPersistentEntityUnitTests { void shouldRejectAssociationCreation() { BasicCassandraPersistentEntity entity = new BasicCassandraPersistentEntity<>( - ClassTypeInformation.from(PrimaryKeyClassWithComposedAnnotation.class)); + TypeInformation.of(PrimaryKeyClassWithComposedAnnotation.class)); assertThatThrownBy(() -> entity.addAssociation(mock(Association.class))) .isInstanceOf(UnsupportedCassandraOperationException.class); @@ -165,7 +165,7 @@ class BasicCassandraPersistentEntityUnitTests { void shouldNoOpOnDoWithAssociations() { BasicCassandraPersistentEntity entity = new BasicCassandraPersistentEntity<>( - ClassTypeInformation.from(PrimaryKeyClassWithComposedAnnotation.class)); + TypeInformation.of(PrimaryKeyClassWithComposedAnnotation.class)); AssociationHandler handlerMock = mock(AssociationHandler.class); entity.doWithAssociations(handlerMock); diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentPropertyUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentPropertyUnitTests.java index d00e23398..c34b0a183 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentPropertyUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentPropertyUnitTests.java @@ -33,7 +33,7 @@ import org.junit.jupiter.api.Test; import org.springframework.core.annotation.AliasFor; import org.springframework.data.mapping.model.Property; -import org.springframework.data.util.ClassTypeInformation; +import org.springframework.data.util.TypeInformation; import org.springframework.util.ReflectionUtils; import com.datastax.oss.driver.api.core.CqlIdentifier; @@ -162,12 +162,12 @@ class BasicCassandraPersistentPropertyUnitTests { Field field = ReflectionUtils.findField(type, fieldName); - return new BasicCassandraPersistentProperty(Property.of(ClassTypeInformation.from(type), field), getEntity(type), + return new BasicCassandraPersistentProperty(Property.of(TypeInformation.of(type), field), getEntity(type), CassandraSimpleTypeHolder.HOLDER); } private BasicCassandraPersistentEntity getEntity(Class type) { - return new BasicCassandraPersistentEntity<>(ClassTypeInformation.from(type)); + return new BasicCassandraPersistentEntity<>(TypeInformation.of(type)); } private static class Timeline { diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentTuplePropertyUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentTuplePropertyUnitTests.java index 26cf70f78..db302711e 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentTuplePropertyUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentTuplePropertyUnitTests.java @@ -25,7 +25,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.data.mapping.model.Property; -import org.springframework.data.util.ClassTypeInformation; +import org.springframework.data.util.TypeInformation; import org.springframework.util.ReflectionUtils; /** @@ -56,12 +56,12 @@ class BasicCassandraPersistentTuplePropertyUnitTests { Field field = ReflectionUtils.findField(type, fieldName); - return new BasicCassandraPersistentTupleProperty(Property.of(ClassTypeInformation.from(type), field), + return new BasicCassandraPersistentTupleProperty(Property.of(TypeInformation.of(type), field), getEntity(type), CassandraSimpleTypeHolder.HOLDER); } private BasicCassandraPersistentEntity getEntity(Class type) { - return new BasicCassandraPersistentTupleEntity<>(ClassTypeInformation.from(type)); + return new BasicCassandraPersistentTupleEntity<>(TypeInformation.of(type)); } @Tuple diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CassandraCompositePrimaryKeyUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CassandraCompositePrimaryKeyUnitTests.java index 164f7a2f9..64c0a5aae 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CassandraCompositePrimaryKeyUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CassandraCompositePrimaryKeyUnitTests.java @@ -32,7 +32,7 @@ import org.springframework.data.cassandra.core.cql.PrimaryKeyType; import org.springframework.data.cassandra.core.cql.keyspace.ColumnSpecification; import org.springframework.data.cassandra.core.cql.keyspace.CreateTableSpecification; import org.springframework.data.mapping.model.Property; -import org.springframework.data.util.ClassTypeInformation; +import org.springframework.data.util.TypeInformation; import org.springframework.util.ReflectionUtils; import com.datastax.oss.driver.api.core.type.DataTypes; @@ -58,8 +58,8 @@ class CassandraCompositePrimaryKeyUnitTests { context = new CassandraMappingContext(); schemaFactory = new SchemaFactory(context, context.getCustomConversions(), context.getCodecRegistry()); - entity = context.getRequiredPersistentEntity(ClassTypeInformation.from(TypeWithCompositeKey.class)); - key = context.getRequiredPersistentEntity(ClassTypeInformation.from(CompositeKey.class)); + entity = context.getRequiredPersistentEntity(TypeInformation.of(TypeWithCompositeKey.class)); + key = context.getRequiredPersistentEntity(TypeInformation.of(CompositeKey.class)); } @Test // DATACASS-507 @@ -67,7 +67,7 @@ class CassandraCompositePrimaryKeyUnitTests { Field field = ReflectionUtils.findField(TypeWithCompositeKey.class, "id"); CassandraPersistentProperty property = new BasicCassandraPersistentProperty( - Property.of(ClassTypeInformation.from(TypeWithCompositeKey.class), field), entity, + Property.of(TypeInformation.of(TypeWithCompositeKey.class), field), entity, CassandraSimpleTypeHolder.HOLDER); assertThat(property.isIdProperty()).isTrue(); assertThat(property.isCompositePrimaryKey()).isTrue(); diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CassandraMappingContextUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CassandraMappingContextUnitTests.java index a20358bdf..6e7a35e91 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CassandraMappingContextUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CassandraMappingContextUnitTests.java @@ -35,7 +35,7 @@ import org.springframework.data.cassandra.core.cql.Ordering; import org.springframework.data.cassandra.core.cql.PrimaryKeyType; import org.springframework.data.cassandra.core.cql.keyspace.CreateIndexSpecification; import org.springframework.data.mapping.MappingException; -import org.springframework.data.util.ClassTypeInformation; +import org.springframework.data.util.TypeInformation; import com.datastax.oss.driver.api.core.CqlIdentifier; import com.datastax.oss.driver.api.core.data.UdtValue; @@ -283,7 +283,7 @@ public class CassandraMappingContextUnitTests { void shouldCreatePersistentEntityIfNoConversionRegistered() { mappingContext.setCustomConversions(new CassandraCustomConversions(Collections.emptyList())); - assertThat(mappingContext.shouldCreatePersistentEntityFor(ClassTypeInformation.from(Human.class))).isTrue(); + assertThat(mappingContext.shouldCreatePersistentEntityFor(TypeInformation.of(Human.class))).isTrue(); } @Test // DATACASS-296 @@ -292,7 +292,7 @@ public class CassandraMappingContextUnitTests { mappingContext.setCustomConversions( new CassandraCustomConversions(Collections.singletonList(HumanToStringConverter.INSTANCE))); - assertThat(mappingContext.shouldCreatePersistentEntityFor(ClassTypeInformation.from(Human.class))).isFalse(); + assertThat(mappingContext.shouldCreatePersistentEntityFor(TypeInformation.of(Human.class))).isFalse(); } @Test // DATACASS-172, DATACASS-455 diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CassandraUserTypePersistentEntityUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CassandraUserTypePersistentEntityUnitTests.java index b49c16c6c..87fc57ca3 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CassandraUserTypePersistentEntityUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CassandraUserTypePersistentEntityUnitTests.java @@ -27,7 +27,7 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.core.annotation.AliasFor; -import org.springframework.data.util.ClassTypeInformation; +import org.springframework.data.util.TypeInformation; import com.datastax.oss.driver.api.core.CqlIdentifier; @@ -80,7 +80,7 @@ class CassandraUserTypePersistentEntityUnitTests { } private CassandraUserTypePersistentEntity getEntity(Class entityClass) { - return new CassandraUserTypePersistentEntity<>(ClassTypeInformation.from(entityClass), null); + return new CassandraUserTypePersistentEntity<>(TypeInformation.of(entityClass), null); } @UserDefinedType diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CompoundPrimaryKeyUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CompoundPrimaryKeyUnitTests.java index 3b7e01c55..4c148f645 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CompoundPrimaryKeyUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CompoundPrimaryKeyUnitTests.java @@ -22,9 +22,10 @@ import java.util.Date; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; + import org.springframework.data.cassandra.core.cql.PrimaryKeyType; import org.springframework.data.mapping.model.Property; -import org.springframework.data.util.ClassTypeInformation; +import org.springframework.data.util.TypeInformation; import org.springframework.util.ReflectionUtils; /** @@ -56,14 +57,14 @@ class CompoundPrimaryKeyUnitTests { @BeforeEach void setup() { - cpk = new BasicCassandraPersistentEntity<>(ClassTypeInformation.from(TimelineKey.class)); - entity = new BasicCassandraPersistentEntity<>(ClassTypeInformation.from(Timeline.class)); + cpk = new BasicCassandraPersistentEntity<>(TypeInformation.of(TimelineKey.class)); + entity = new BasicCassandraPersistentEntity<>(TypeInformation.of(Timeline.class)); } @Test // DATACASS-507 void checkIdProperty() { Field id = ReflectionUtils.findField(Timeline.class, "id"); - CassandraPersistentProperty property = getPropertyFor(Property.of(ClassTypeInformation.from(Timeline.class), id)); + CassandraPersistentProperty property = getPropertyFor(Property.of(TypeInformation.of(Timeline.class), id)); assertThat(property.isIdProperty()).isTrue(); assertThat(property.isCompositePrimaryKey()).isTrue(); } diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/ForceQuotedEntitiesSimpleUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/ForceQuotedEntitiesSimpleUnitTests.java index 0904ccc5d..d4b689986 100755 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/ForceQuotedEntitiesSimpleUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/ForceQuotedEntitiesSimpleUnitTests.java @@ -19,7 +19,8 @@ package org.springframework.data.cassandra.core.mapping; import static org.assertj.core.api.Assertions.*; import org.junit.jupiter.api.Test; -import org.springframework.data.util.ClassTypeInformation; + +import org.springframework.data.util.TypeInformation; /** * Unit tests for {@link BasicCassandraPersistentEntity}. @@ -31,7 +32,7 @@ class ForceQuotedEntitiesSimpleUnitTests { @Test void testImplicitTableNameForceQuoted() { BasicCassandraPersistentEntity entity = new BasicCassandraPersistentEntity<>( - ClassTypeInformation.from(ImplicitTableNameForceQuoted.class)); + TypeInformation.of(ImplicitTableNameForceQuoted.class)); assertThat(entity.getTableName().asCql(false)) .isEqualTo("\"" + ImplicitTableNameForceQuoted.class.getSimpleName() + "\""); @@ -46,7 +47,7 @@ class ForceQuotedEntitiesSimpleUnitTests { @Test void testExplicitTableNameForceQuoted() { BasicCassandraPersistentEntity entity = new BasicCassandraPersistentEntity<>( - ClassTypeInformation.from(ExplicitTableNameForceQuoted.class)); + TypeInformation.of(ExplicitTableNameForceQuoted.class)); assertThat(entity.getTableName().asCql(true)).isEqualTo("\"" + EXPLICIT_TABLE_NAME + "\""); assertThat(entity.getTableName().asInternal()).isEqualTo(EXPLICIT_TABLE_NAME); @@ -58,7 +59,7 @@ class ForceQuotedEntitiesSimpleUnitTests { @Test void testDefaultTableNameForceQuoted() { BasicCassandraPersistentEntity entity = new BasicCassandraPersistentEntity<>( - ClassTypeInformation.from(DefaultTableNameForceQuoted.class)); + TypeInformation.of(DefaultTableNameForceQuoted.class)); assertThat(entity.getTableName().asCql(true)) .isEqualTo(DefaultTableNameForceQuoted.class.getSimpleName().toLowerCase()); diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/NamingStrategyUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/NamingStrategyUnitTests.java index b47932ed5..ddcf74de3 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/NamingStrategyUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/NamingStrategyUnitTests.java @@ -21,7 +21,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.data.annotation.Id; -import org.springframework.data.util.ClassTypeInformation; +import org.springframework.data.util.TypeInformation; import org.springframework.util.StringUtils; import com.datastax.oss.driver.api.core.CqlIdentifier; @@ -46,7 +46,7 @@ class NamingStrategyUnitTests { void getTableNameGeneratesTableName() { BasicCassandraPersistentEntity entity = new BasicCassandraPersistentEntity<>( - ClassTypeInformation.from(TableNameHolderThingy.class)); + TypeInformation.of(TableNameHolderThingy.class)); assertThat(entity.getTableName().asCql(true)).isEqualTo("tablenameholderthingy"); } @@ -55,12 +55,12 @@ class NamingStrategyUnitTests { void getTableNameGeneratesQuotedTableName() { BasicCassandraPersistentEntity entity = new BasicCassandraPersistentEntity<>( - ClassTypeInformation.from(TableNameHolderThingy.class)); + TypeInformation.of(TableNameHolderThingy.class)); entity.setNamingStrategy(NamingStrategy.SNAKE_CASE.transform(it -> "\"" + StringUtils.capitalize(it) + "\"")); assertThat(entity.getTableName().asCql(true)).isEqualTo("\"Table_name_holder_thingy\""); - entity = new BasicCassandraPersistentEntity<>(ClassTypeInformation.from(TableNameHolderThingy.class)); + entity = new BasicCassandraPersistentEntity<>(TypeInformation.of(TableNameHolderThingy.class)); entity.setNamingStrategy(NamingStrategy.SNAKE_CASE.transform(String::toUpperCase)); assertThat(entity.getTableName().asCql(true)).isEqualTo("\"TABLE_NAME_HOLDER_THINGY\""); @@ -70,7 +70,7 @@ class NamingStrategyUnitTests { void atTableIsCaseSensitive() { BasicCassandraPersistentEntity entity = new BasicCassandraPersistentEntity<>( - ClassTypeInformation.from(ProvidedTableName.class)); + TypeInformation.of(ProvidedTableName.class)); assertThat(entity.getTableName().asCql(true)).isEqualTo("\"iAmProvided\""); } @@ -79,7 +79,7 @@ class NamingStrategyUnitTests { void atTableWithQuotedNameShouldRetainQuotes() { BasicCassandraPersistentEntity entity = new BasicCassandraPersistentEntity<>( - ClassTypeInformation.from(QuotedTableName.class)); + TypeInformation.of(QuotedTableName.class)); assertThat(entity.getTableName().asCql(true)).isEqualTo("\"IAmQuoted\""); }