Spring/spring-data-cassandra
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing.

Browse Source 
Move off deprecated StringUtils.isEmpty.

See #1098
This commit is contained in:
Mark Paluch
2021-03-12 09:11:46 +01:00
parent 01c6350cb3
commit 3194a0d3d0
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraEntityClassScanner.java
View File

@@ -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<Class<?>> classes = new HashSet<>();
if (StringUtils.isEmpty(basePackage)) {
if (ObjectUtils.isEmpty(basePackage)) {
return classes;
}

6
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/DefaultColumnTypeResolver.java
View File

@@ -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");
}