From 3194a0d3d0628e5dd39a4be3a08e0f88579bbd60 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 12 Mar 2021 09:11:46 +0100 Subject: [PATCH] Polishing. Move off deprecated StringUtils.isEmpty. See #1098 --- .../data/cassandra/config/CassandraEntityClassScanner.java | 4 ++-- .../cassandra/core/convert/DefaultColumnTypeResolver.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraEntityClassScanner.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraEntityClassScanner.java index 5ef58e697..d2519bf6d 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraEntityClassScanner.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraEntityClassScanner.java @@ -30,7 +30,7 @@ import org.springframework.data.cassandra.core.mapping.PrimaryKeyClass; import org.springframework.data.cassandra.core.mapping.Table; import org.springframework.lang.Nullable; import org.springframework.util.ClassUtils; -import org.springframework.util.StringUtils; +import org.springframework.util.ObjectUtils; /** * Scans packages for Cassandra entities. The entity scanner scans for entity classes annotated with @@ -208,7 +208,7 @@ public class CassandraEntityClassScanner { HashSet> classes = new HashSet<>(); - if (StringUtils.isEmpty(basePackage)) { + if (ObjectUtils.isEmpty(basePackage)) { return classes; } 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 7b1470e60..2d8ecea16 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 @@ -45,7 +45,7 @@ import org.springframework.data.util.Lazy; import org.springframework.data.util.TypeInformation; import org.springframework.lang.Nullable; import org.springframework.util.Assert; -import org.springframework.util.StringUtils; +import org.springframework.util.ObjectUtils; import com.datastax.oss.driver.api.core.CqlIdentifier; import com.datastax.oss.driver.api.core.data.TupleValue; @@ -104,7 +104,7 @@ class DefaultColumnTypeResolver implements ColumnTypeResolver { CassandraType annotation = property.getRequiredAnnotation(CassandraType.class); - if (annotation.type() == Name.UDT && StringUtils.isEmpty(annotation.userTypeName())) { + if (annotation.type() == Name.UDT && ObjectUtils.isEmpty(annotation.userTypeName())) { throw new InvalidDataAccessApiUsageException( String.format("Expected user type name in property ['%s'] of type ['%s'] in entity [%s]", property.getName(), property.getType(), property.getOwner().getName())); @@ -251,7 +251,7 @@ class DefaultColumnTypeResolver implements ColumnTypeResolver { return ColumnType.tupleOf(DataTypes.tupleOf(dataTypes)); case UDT: - if (StringUtils.isEmpty(annotation.userTypeName())) { + if (ObjectUtils.isEmpty(annotation.userTypeName())) { throw new InvalidDataAccessApiUsageException( "Cannot resolve user type for @CassandraType(type=UDT) without userTypeName"); }