This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-beanutils.git
The following commit(s) were added to refs/heads/master by this push:
new 27f07b3 Use isEmpty().
27f07b3 is described below
commit 27f07b3cc55e35dede6da18495be190a1d4e0647
Author: Gary Gregory <[email protected]>
AuthorDate: Sun Jan 17 09:07:43 2021 -0500
Use isEmpty().
---
.../org/apache/commons/beanutils2/JDBCDynaClass.java | 2 +-
.../commons/beanutils2/MappedPropertyDescriptor.java | 8 ++++----
.../apache/commons/beanutils2/PropertyUtilsBean.java | 8 ++++----
.../beanutils2/converters/DateTimeConverter.java | 2 +-
.../commons/beanutils2/converters/NumberConverter.java | 2 +-
.../commons/beanutils2/expression/DefaultResolver.java | 18 +++++++++---------
6 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/src/main/java/org/apache/commons/beanutils2/JDBCDynaClass.java
b/src/main/java/org/apache/commons/beanutils2/JDBCDynaClass.java
index 0ce593b..856d4c4 100644
--- a/src/main/java/org/apache/commons/beanutils2/JDBCDynaClass.java
+++ b/src/main/java/org/apache/commons/beanutils2/JDBCDynaClass.java
@@ -190,7 +190,7 @@ abstract class JDBCDynaClass implements DynaClass,
Serializable {
if (useColumnLabel) {
columnName = metadata.getColumnLabel(i);
}
- if (columnName == null || columnName.trim().length() == 0) {
+ if (columnName == null || columnName.trim().isEmpty()) {
columnName = metadata.getColumnName(i);
}
final String name = lowerCase ? columnName.toLowerCase() : columnName;
diff --git
a/src/main/java/org/apache/commons/beanutils2/MappedPropertyDescriptor.java
b/src/main/java/org/apache/commons/beanutils2/MappedPropertyDescriptor.java
index aa245bf..5b6466a 100644
--- a/src/main/java/org/apache/commons/beanutils2/MappedPropertyDescriptor.java
+++ b/src/main/java/org/apache/commons/beanutils2/MappedPropertyDescriptor.java
@@ -87,7 +87,7 @@ public class MappedPropertyDescriptor extends
PropertyDescriptor {
super(propertyName, null, null);
- if (propertyName == null || propertyName.length() == 0) {
+ if (propertyName == null || propertyName.isEmpty()) {
throw new IntrospectionException("bad property name: " +
propertyName + " on class: " +
beanClass.getClass().getName());
}
@@ -154,7 +154,7 @@ public class MappedPropertyDescriptor extends
PropertyDescriptor {
super(propertyName, null, null);
- if (propertyName == null || propertyName.length() == 0) {
+ if (propertyName == null || propertyName.isEmpty()) {
throw new IntrospectionException("bad property name: " +
propertyName);
}
@@ -200,7 +200,7 @@ public class MappedPropertyDescriptor extends
PropertyDescriptor {
super(propertyName, mappedGetter, mappedSetter);
- if (propertyName == null || propertyName.length() == 0) {
+ if (propertyName == null || propertyName.isEmpty()) {
throw new IntrospectionException("bad property name: " +
propertyName);
}
@@ -319,7 +319,7 @@ public class MappedPropertyDescriptor extends
PropertyDescriptor {
* @param s The property name
*/
private static String capitalizePropertyName(final String s) {
- if (s.length() == 0) {
+ if (s.isEmpty()) {
return s;
}
diff --git a/src/main/java/org/apache/commons/beanutils2/PropertyUtilsBean.java
b/src/main/java/org/apache/commons/beanutils2/PropertyUtilsBean.java
index b98f1a6..56a59ec 100644
--- a/src/main/java/org/apache/commons/beanutils2/PropertyUtilsBean.java
+++ b/src/main/java/org/apache/commons/beanutils2/PropertyUtilsBean.java
@@ -461,7 +461,7 @@ public class PropertyUtilsBean {
if (bean == null) {
throw new IllegalArgumentException("No bean specified");
}
- if (name == null || name.length() == 0) {
+ if (name == null || name.isEmpty()) {
if (bean.getClass().isArray()) {
return Array.get(bean, index);
} else if (bean instanceof List) {
@@ -812,7 +812,7 @@ public class PropertyUtilsBean {
if (resolver.isMapped(propertyName)) {
final String name = resolver.getProperty(propertyName);
- if (name == null || name.length() == 0) {
+ if (name == null || name.isEmpty()) {
propertyName = resolver.getKey(propertyName);
}
}
@@ -1526,7 +1526,7 @@ public class PropertyUtilsBean {
if (bean == null) {
throw new IllegalArgumentException("No bean specified");
}
- if (name == null || name.length() == 0) {
+ if (name == null || name.isEmpty()) {
if (bean.getClass().isArray()) {
Array.set(bean, index, value);
return;
@@ -1908,7 +1908,7 @@ public class PropertyUtilsBean {
if (resolver.isMapped(propertyName)) {
final String name = resolver.getProperty(propertyName);
- if (name == null || name.length() == 0) {
+ if (name == null || name.isEmpty()) {
propertyName = resolver.getKey(propertyName);
}
}
diff --git
a/src/main/java/org/apache/commons/beanutils2/converters/DateTimeConverter.java
b/src/main/java/org/apache/commons/beanutils2/converters/DateTimeConverter.java
index 3ee1980..6b21891 100644
---
a/src/main/java/org/apache/commons/beanutils2/converters/DateTimeConverter.java
+++
b/src/main/java/org/apache/commons/beanutils2/converters/DateTimeConverter.java
@@ -362,7 +362,7 @@ public abstract class DateTimeConverter extends
AbstractConverter {
// Convert all other types to String & handle
final String stringValue = toTrim(value);
- if (stringValue.length() == 0) {
+ if (stringValue.isEmpty()) {
return handleMissing(targetType);
}
diff --git
a/src/main/java/org/apache/commons/beanutils2/converters/NumberConverter.java
b/src/main/java/org/apache/commons/beanutils2/converters/NumberConverter.java
index 1878a25..1b33725 100644
---
a/src/main/java/org/apache/commons/beanutils2/converters/NumberConverter.java
+++
b/src/main/java/org/apache/commons/beanutils2/converters/NumberConverter.java
@@ -256,7 +256,7 @@ public abstract class NumberConverter extends
AbstractConverter {
// Convert all other types to String & handle
final String stringValue = toTrim(value);
- if (stringValue.length() == 0) {
+ if (stringValue.isEmpty()) {
return handleMissing(targetType);
}
diff --git
a/src/main/java/org/apache/commons/beanutils2/expression/DefaultResolver.java
b/src/main/java/org/apache/commons/beanutils2/expression/DefaultResolver.java
index c57c3fc..29d8bd1 100644
---
a/src/main/java/org/apache/commons/beanutils2/expression/DefaultResolver.java
+++
b/src/main/java/org/apache/commons/beanutils2/expression/DefaultResolver.java
@@ -77,7 +77,7 @@ public class DefaultResolver implements Resolver {
*/
@Override
public int getIndex(final String expression) {
- if (expression == null || expression.length() == 0) {
+ if (expression == null || expression.isEmpty()) {
return -1;
}
for (int i = 0; i < expression.length(); i++) {
@@ -90,7 +90,7 @@ public class DefaultResolver implements Resolver {
throw new IllegalArgumentException("Missing End
Delimiter");
}
final String value = expression.substring(i + 1, end);
- if (value.length() == 0) {
+ if (value.isEmpty()) {
throw new IllegalArgumentException("No Index Value");
}
int index = 0;
@@ -115,7 +115,7 @@ public class DefaultResolver implements Resolver {
*/
@Override
public String getKey(final String expression) {
- if (expression == null || expression.length() == 0) {
+ if (expression == null || expression.isEmpty()) {
return null;
}
for (int i = 0; i < expression.length(); i++) {
@@ -141,7 +141,7 @@ public class DefaultResolver implements Resolver {
*/
@Override
public String getProperty(final String expression) {
- if (expression == null || expression.length() == 0) {
+ if (expression == null || expression.isEmpty()) {
return expression;
}
for (int i = 0; i < expression.length(); i++) {
@@ -162,7 +162,7 @@ public class DefaultResolver implements Resolver {
*/
@Override
public boolean hasNested(final String expression) {
- if (expression == null || expression.length() == 0) {
+ if (expression == null || expression.isEmpty()) {
return false;
}
return remove(expression) != null;
@@ -177,7 +177,7 @@ public class DefaultResolver implements Resolver {
*/
@Override
public boolean isIndexed(final String expression) {
- if (expression == null || expression.length() == 0) {
+ if (expression == null || expression.isEmpty()) {
return false;
}
for (int i = 0; i < expression.length(); i++) {
@@ -200,7 +200,7 @@ public class DefaultResolver implements Resolver {
*/
@Override
public boolean isMapped(final String expression) {
- if (expression == null || expression.length() == 0) {
+ if (expression == null || expression.isEmpty()) {
return false;
}
for (int i = 0; i < expression.length(); i++) {
@@ -223,7 +223,7 @@ public class DefaultResolver implements Resolver {
*/
@Override
public String next(final String expression) {
- if (expression == null || expression.length() == 0) {
+ if (expression == null || expression.isEmpty()) {
return null;
}
boolean indexed = false;
@@ -266,7 +266,7 @@ public class DefaultResolver implements Resolver {
*/
@Override
public String remove(final String expression) {
- if (expression == null || expression.length() == 0) {
+ if (expression == null || expression.isEmpty()) {
return null;
}
final String property = next(expression);
