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 99604aba Call and assign Objects.requireNonNull()
99604aba is described below
commit 99604abab0f270cadc673bb7d5ed87151223b10c
Author: Gary Gregory <[email protected]>
AuthorDate: Sat Aug 31 13:50:11 2024 -0400
Call and assign Objects.requireNonNull()
---
.../apache/commons/beanutils2/BaseDynaBeanMapDecorator.java | 3 +--
.../java/org/apache/commons/beanutils2/BasicDynaClass.java | 3 +--
.../commons/beanutils2/FluentPropertyBeanIntrospector.java | 3 +--
.../java/org/apache/commons/beanutils2/LazyDynaClass.java | 3 +--
src/main/java/org/apache/commons/beanutils2/LazyDynaMap.java | 3 +--
src/main/java/org/apache/commons/beanutils2/MethodUtils.java | 11 +++--------
.../java/org/apache/commons/beanutils2/PropertyUtilsBean.java | 3 +--
.../java/org/apache/commons/beanutils2/WrapDynaClass.java | 3 +--
.../apache/commons/beanutils2/converters/ArrayConverter.java | 3 +--
.../apache/commons/beanutils2/converters/ConverterFacade.java | 3 +--
.../apache/commons/beanutils2/sql/AbstractJdbcDynaClass.java | 3 +--
11 files changed, 13 insertions(+), 28 deletions(-)
diff --git
a/src/main/java/org/apache/commons/beanutils2/BaseDynaBeanMapDecorator.java
b/src/main/java/org/apache/commons/beanutils2/BaseDynaBeanMapDecorator.java
index 2688fc18..c9915fb6 100644
--- a/src/main/java/org/apache/commons/beanutils2/BaseDynaBeanMapDecorator.java
+++ b/src/main/java/org/apache/commons/beanutils2/BaseDynaBeanMapDecorator.java
@@ -117,8 +117,7 @@ public abstract class BaseDynaBeanMapDecorator<K>
implements Map<K, Object> {
* @throws IllegalArgumentException if the {@link DynaBean} is null.
*/
public BaseDynaBeanMapDecorator(final DynaBean dynaBean, final boolean
readOnly) {
- Objects.requireNonNull(dynaBean, "dynaBean");
- this.dynaBean = dynaBean;
+ this.dynaBean = Objects.requireNonNull(dynaBean, "dynaBean");
this.readOnly = readOnly;
}
diff --git a/src/main/java/org/apache/commons/beanutils2/BasicDynaClass.java
b/src/main/java/org/apache/commons/beanutils2/BasicDynaClass.java
index 7a940fa4..9084e3ef 100644
--- a/src/main/java/org/apache/commons/beanutils2/BasicDynaClass.java
+++ b/src/main/java/org/apache/commons/beanutils2/BasicDynaClass.java
@@ -153,8 +153,7 @@ public class BasicDynaClass implements DynaClass,
Serializable {
*/
@Override
public DynaProperty getDynaProperty(final String name) {
- Objects.requireNonNull(name, "name");
- return propertiesMap.get(name);
+ return propertiesMap.get(Objects.requireNonNull(name, "name"));
}
/**
diff --git
a/src/main/java/org/apache/commons/beanutils2/FluentPropertyBeanIntrospector.java
b/src/main/java/org/apache/commons/beanutils2/FluentPropertyBeanIntrospector.java
index a1fec561..c9532ed7 100644
---
a/src/main/java/org/apache/commons/beanutils2/FluentPropertyBeanIntrospector.java
+++
b/src/main/java/org/apache/commons/beanutils2/FluentPropertyBeanIntrospector.java
@@ -105,8 +105,7 @@ public class FluentPropertyBeanIntrospector implements
BeanIntrospector {
* @throws IllegalArgumentException if the prefix is <b>null</b>
*/
public FluentPropertyBeanIntrospector(final String writePrefix) {
- Objects.requireNonNull(writePrefix, "writePrefix");
- writeMethodPrefix = writePrefix;
+ writeMethodPrefix = Objects.requireNonNull(writePrefix, "writePrefix");
}
/**
diff --git a/src/main/java/org/apache/commons/beanutils2/LazyDynaClass.java
b/src/main/java/org/apache/commons/beanutils2/LazyDynaClass.java
index 2fbf2550..9f81c954 100644
--- a/src/main/java/org/apache/commons/beanutils2/LazyDynaClass.java
+++ b/src/main/java/org/apache/commons/beanutils2/LazyDynaClass.java
@@ -246,8 +246,7 @@ public class LazyDynaClass extends BasicDynaClass
implements MutableDynaClass {
* @throws IllegalArgumentException if no property name is specified
*/
public boolean isDynaProperty(final String name) {
- Objects.requireNonNull(name, "name");
- return propertiesMap.get(name) != null;
+ return propertiesMap.get(Objects.requireNonNull(name, "name")) != null;
}
/**
diff --git a/src/main/java/org/apache/commons/beanutils2/LazyDynaMap.java
b/src/main/java/org/apache/commons/beanutils2/LazyDynaMap.java
index 7c19220e..52044c35 100644
--- a/src/main/java/org/apache/commons/beanutils2/LazyDynaMap.java
+++ b/src/main/java/org/apache/commons/beanutils2/LazyDynaMap.java
@@ -310,8 +310,7 @@ public class LazyDynaMap extends LazyDynaBean implements
MutableDynaClass {
*/
@Override
protected boolean isDynaProperty(final String name) {
- Objects.requireNonNull(name, "name");
- return values.containsKey(name);
+ return values.containsKey(Objects.requireNonNull(name, "name"));
}
/**
diff --git a/src/main/java/org/apache/commons/beanutils2/MethodUtils.java
b/src/main/java/org/apache/commons/beanutils2/MethodUtils.java
index 61a47ca5..fe2acfb2 100644
--- a/src/main/java/org/apache/commons/beanutils2/MethodUtils.java
+++ b/src/main/java/org/apache/commons/beanutils2/MethodUtils.java
@@ -69,14 +69,9 @@ public class MethodUtils {
*/
public MethodDescriptor(final Class<?> cls, final String methodName,
Class<?>[] paramTypes,
final boolean exact) {
- Objects.requireNonNull(cls, "cls");
- Objects.requireNonNull(methodName, "methodName");
- if (paramTypes == null) {
- paramTypes = BeanUtils.EMPTY_CLASS_ARRAY;
- }
- this.cls = cls;
- this.methodName = methodName;
- this.paramTypes = paramTypes;
+ this.cls = Objects.requireNonNull(cls, "cls");
+ this.methodName = Objects.requireNonNull(methodName, "methodName");
+ this.paramTypes = paramTypes != null ? paramTypes :
BeanUtils.EMPTY_CLASS_ARRAY;
this.exact= exact;
this.hashCode = methodName.length();
}
diff --git a/src/main/java/org/apache/commons/beanutils2/PropertyUtilsBean.java
b/src/main/java/org/apache/commons/beanutils2/PropertyUtilsBean.java
index 7d7ef87a..a33fa04d 100644
--- a/src/main/java/org/apache/commons/beanutils2/PropertyUtilsBean.java
+++ b/src/main/java/org/apache/commons/beanutils2/PropertyUtilsBean.java
@@ -165,8 +165,7 @@ public class PropertyUtilsBean {
* @since 1.9
*/
public void addBeanIntrospector(final BeanIntrospector introspector) {
- Objects.requireNonNull(introspector, "introspector");
- introspectors.add(introspector);
+ introspectors.add(Objects.requireNonNull(introspector,
"introspector"));
}
/**
diff --git a/src/main/java/org/apache/commons/beanutils2/WrapDynaClass.java
b/src/main/java/org/apache/commons/beanutils2/WrapDynaClass.java
index a1ebe4b9..c3a308aa 100644
--- a/src/main/java/org/apache/commons/beanutils2/WrapDynaClass.java
+++ b/src/main/java/org/apache/commons/beanutils2/WrapDynaClass.java
@@ -227,8 +227,7 @@ public class WrapDynaClass implements DynaClass {
*/
@Override
public DynaProperty getDynaProperty(final String name) {
- Objects.requireNonNull(name, "name");
- return propertiesMap.get(name);
+ return propertiesMap.get(Objects.requireNonNull(name, "name"));
}
/**
diff --git
a/src/main/java/org/apache/commons/beanutils2/converters/ArrayConverter.java
b/src/main/java/org/apache/commons/beanutils2/converters/ArrayConverter.java
index 2111c678..c56fcbfd 100644
--- a/src/main/java/org/apache/commons/beanutils2/converters/ArrayConverter.java
+++ b/src/main/java/org/apache/commons/beanutils2/converters/ArrayConverter.java
@@ -153,9 +153,8 @@ public class ArrayConverter<C> extends AbstractConverter<C>
{
if (!defaultType.isArray()) {
throw new IllegalArgumentException("Default type must be an
array.");
}
- Objects.requireNonNull(elementConverter, "elementConverter");
+ this.elementConverter = Objects.requireNonNull(elementConverter,
"elementConverter");
this.defaultType = defaultType;
- this.elementConverter = elementConverter;
}
/**
diff --git
a/src/main/java/org/apache/commons/beanutils2/converters/ConverterFacade.java
b/src/main/java/org/apache/commons/beanutils2/converters/ConverterFacade.java
index 0b107c71..d3d2fec5 100644
---
a/src/main/java/org/apache/commons/beanutils2/converters/ConverterFacade.java
+++
b/src/main/java/org/apache/commons/beanutils2/converters/ConverterFacade.java
@@ -43,8 +43,7 @@ public final class ConverterFacade<T> implements Converter<T>
{
* @param converter The converter to delegate to
*/
public ConverterFacade(final Converter<T> converter) {
- Objects.requireNonNull(converter, "converter");
- this.converter = converter;
+ this.converter = Objects.requireNonNull(converter, "converter");
}
/**
diff --git
a/src/main/java/org/apache/commons/beanutils2/sql/AbstractJdbcDynaClass.java
b/src/main/java/org/apache/commons/beanutils2/sql/AbstractJdbcDynaClass.java
index be2fd69c..d4953462 100644
--- a/src/main/java/org/apache/commons/beanutils2/sql/AbstractJdbcDynaClass.java
+++ b/src/main/java/org/apache/commons/beanutils2/sql/AbstractJdbcDynaClass.java
@@ -163,8 +163,7 @@ abstract class AbstractJdbcDynaClass implements DynaClass,
Serializable {
*/
@Override
public DynaProperty getDynaProperty(final String name) {
- Objects.requireNonNull(name, "name");
- return propertiesMap.get(name);
+ return propertiesMap.get(Objects.requireNonNull(name, "name"));
}
