root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Use String::isEmpty instead of "".equals(arg) when arg is not null

This commit is contained in:
stsypanov 2018-08-26 22:43:50 +03:00 committed by Juergen Hoeller
parent 4883b8aa03
commit 7dba79c7c1
8 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-beans/src/main/java/org/springframework/beans/AbstractNestablePropertyAccessor.java
View File

@ -194,7 +194,7 @@ public abstract class AbstractNestablePropertyAccessor extends AbstractPropertyA
this.wrappedObject = ObjectUtils.unwrapOptional(object); this.wrappedObject = ObjectUtils.unwrapOptional(object);
Assert.notNull(this.wrappedObject, "Target object must not be null"); Assert.notNull(this.wrappedObject, "Target object must not be null");
this.nestedPath = (nestedPath != null ? nestedPath : ""); this.nestedPath = (nestedPath != null ? nestedPath : "");
this.rootObject = (!"".equals(this.nestedPath) ? rootObject : this.wrappedObject); this.rootObject = (!this.nestedPath.isEmpty() ? rootObject : this.wrappedObject);
this.nestedPropertyAccessors = null; this.nestedPropertyAccessors = null;
this.typeConverterDelegate = new TypeConverterDelegate(this, this.wrappedObject); this.typeConverterDelegate = new TypeConverterDelegate(this, this.wrappedObject);
} }

2
spring-beans/src/main/java/org/springframework/beans/TypeConverterDelegate.java
View File

@ -247,7 +247,7 @@ class TypeConverterDelegate {
} }
} }
String trimmedValue = ((String) convertedValue).trim(); String trimmedValue = ((String) convertedValue).trim();
if (requiredType.isEnum() && "".equals(trimmedValue)) { if (requiredType.isEnum() && trimmedValue.isEmpty()) {
// It's an empty enum identifier: reset the enum value to null. // It's an empty enum identifier: reset the enum value to null.
return null; return null;
} }

2
spring-context/src/main/java/org/springframework/validation/beanvalidation/SpringValidatorAdapter.java
View File

@ -162,7 +162,7 @@ public class SpringValidatorAdapter implements SmartValidator, javax.validation.
// as necessary for Hibernate Validator compatibility (non-indexed set path in field) // as necessary for Hibernate Validator compatibility (non-indexed set path in field)
BindingResult bindingResult = (BindingResult) errors; BindingResult bindingResult = (BindingResult) errors;
String nestedField = bindingResult.getNestedPath() + field; String nestedField = bindingResult.getNestedPath() + field;
if ("".equals(nestedField)) { if (nestedField.isEmpty()) {
String[] errorCodes = bindingResult.resolveMessageCodes(errorCode); String[] errorCodes = bindingResult.resolveMessageCodes(errorCode);
ObjectError error = new ObjectError( ObjectError error = new ObjectError(
errors.getObjectName(), errorCodes, errorArgs, violation.getMessage()); errors.getObjectName(), errorCodes, errorArgs, violation.getMessage());

2
spring-core/src/main/java/org/springframework/core/convert/support/StringToBooleanConverter.java
View File

@ -49,7 +49,7 @@ final class StringToBooleanConverter implements Converter<String, Boolean> {
@Override @Override
public Boolean convert(String source) { public Boolean convert(String source) {
String value = source.trim(); String value = source.trim();
if ("".equals(value)) { if (value.isEmpty()) {
return null; return null;
} }
value = value.toLowerCase(); value = value.toLowerCase();

4
spring-core/src/main/java/org/springframework/util/AntPathMatcher.java
View File

@ -571,8 +571,8 @@ public class AntPathMatcher implements PathMatcher {
int dotPos2 = pattern2.indexOf('.'); int dotPos2 = pattern2.indexOf('.');
String file2 = (dotPos2 == -1 ? pattern2 : pattern2.substring(0, dotPos2)); String file2 = (dotPos2 == -1 ? pattern2 : pattern2.substring(0, dotPos2));
String ext2 = (dotPos2 == -1 ? "" : pattern2.substring(dotPos2)); String ext2 = (dotPos2 == -1 ? "" : pattern2.substring(dotPos2));
boolean ext1All = (ext1.equals(".*") || ext1.equals("")); boolean ext1All = (ext1.equals(".*") || ext1.isEmpty());
boolean ext2All = (ext2.equals(".*") || ext2.equals("")); boolean ext2All = (ext2.equals(".*") || ext2.isEmpty());
if (!ext1All && !ext2All) { if (!ext1All && !ext2All) {
throw new IllegalArgumentException("Cannot combine patterns: " + pattern1 + " vs " + pattern2); throw new IllegalArgumentException("Cannot combine patterns: " + pattern1 + " vs " + pattern2);
} }

2
spring-core/src/main/java/org/springframework/util/PatternMatchUtils.java
View File

@ -52,7 +52,7 @@ public abstract class PatternMatchUtils {
return str.endsWith(pattern.substring(1)); return str.endsWith(pattern.substring(1));
} }
String part = pattern.substring(1, nextIndex); String part = pattern.substring(1, nextIndex);
if ("".equals(part)) { if (part.isEmpty()) {
return simpleMatch(pattern.substring(nextIndex), str); return simpleMatch(pattern.substring(nextIndex), str);
} }
int partIndex = str.indexOf(part); int partIndex = str.indexOf(part);

4
spring-core/src/main/java/org/springframework/util/StringUtils.java
View File

@ -821,7 +821,7 @@ public abstract class StringUtils {
} }
} }
if ("".equals(variant) && country.startsWith("#")) { if (variant.isEmpty() && country.startsWith("#")) {
variant = country; variant = country;
country = ""; country = "";
} }
@ -1192,7 +1192,7 @@ public abstract class StringUtils {
} }
List<String> result = new ArrayList<>(); List<String> result = new ArrayList<>();
if ("".equals(delimiter)) { if (delimiter.isEmpty()) {
for (int i = 0; i < str.length(); i++) { for (int i = 0; i < str.length(); i++) {
result.add(deleteAny(str.substring(i, i + 1), charsToDelete)); result.add(deleteAny(str.substring(i, i + 1), charsToDelete));
} }

8
spring-orm/src/main/java/org/springframework/orm/jpa/support/PersistenceAnnotationBeanPostProcessor.java
View File

@ -468,7 +468,7 @@ public class PersistenceAnnotationBeanPostProcessor
protected EntityManagerFactory getPersistenceUnit(@Nullable String unitName) { protected EntityManagerFactory getPersistenceUnit(@Nullable String unitName) {
if (this.persistenceUnits != null) { if (this.persistenceUnits != null) {
String unitNameForLookup = (unitName != null ? unitName : ""); String unitNameForLookup = (unitName != null ? unitName : "");
if ("".equals(unitNameForLookup)) { if (unitNameForLookup.isEmpty()) {
unitNameForLookup = this.defaultPersistenceUnitName; unitNameForLookup = this.defaultPersistenceUnitName;
} }
String jndiName = this.persistenceUnits.get(unitNameForLookup); String jndiName = this.persistenceUnits.get(unitNameForLookup);
@ -501,7 +501,7 @@ public class PersistenceAnnotationBeanPostProcessor
Map<String, String> contexts = (extended ? this.extendedPersistenceContexts : this.persistenceContexts); Map<String, String> contexts = (extended ? this.extendedPersistenceContexts : this.persistenceContexts);
if (contexts != null) { if (contexts != null) {
String unitNameForLookup = (unitName != null ? unitName : ""); String unitNameForLookup = (unitName != null ? unitName : "");
if ("".equals(unitNameForLookup)) { if (unitNameForLookup.isEmpty()) {
unitNameForLookup = this.defaultPersistenceUnitName; unitNameForLookup = this.defaultPersistenceUnitName;
} }
String jndiName = contexts.get(unitNameForLookup); String jndiName = contexts.get(unitNameForLookup);
@ -533,10 +533,10 @@ public class PersistenceAnnotationBeanPostProcessor
throws NoSuchBeanDefinitionException { throws NoSuchBeanDefinitionException {
String unitNameForLookup = (unitName != null ? unitName : ""); String unitNameForLookup = (unitName != null ? unitName : "");
if ("".equals(unitNameForLookup)) { if (unitNameForLookup.isEmpty()) {
unitNameForLookup = this.defaultPersistenceUnitName; unitNameForLookup = this.defaultPersistenceUnitName;
} }
if (!"".equals(unitNameForLookup)) { if (!unitNameForLookup.isEmpty()) {
return findNamedEntityManagerFactory(unitNameForLookup, requestingBeanName); return findNamedEntityManagerFactory(unitNameForLookup, requestingBeanName);
} }
else { else {