You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2022/11/25 14:14:52 UTC
[commons-beanutils] branch master updated (16f04195 -> 1a3b7fb4)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-beanutils.git
from 16f04195 Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-beanutils.git
new 079d907f Reuse constants
new 1a3b7fb4 Better constant names
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/main/java/org/apache/commons/beanutils2/BasicDynaClass.java | 2 +-
.../java/org/apache/commons/beanutils2/DefaultBeanIntrospector.java | 2 +-
.../org/apache/commons/beanutils2/DefaultIntrospectionContext.java | 2 +-
src/main/java/org/apache/commons/beanutils2/DynaProperty.java | 2 +-
src/main/java/org/apache/commons/beanutils2/JDBCDynaClass.java | 2 +-
src/main/java/org/apache/commons/beanutils2/LazyDynaBean.java | 2 +-
src/main/java/org/apache/commons/beanutils2/LazyDynaList.java | 4 ++--
src/main/java/org/apache/commons/beanutils2/PropertyDescriptors.java | 2 +-
src/main/java/org/apache/commons/beanutils2/WrapDynaClass.java | 2 +-
src/test/java/org/apache/commons/beanutils2/LazyDynaListTestCase.java | 2 +-
10 files changed, 11 insertions(+), 11 deletions(-)
[commons-beanutils] 01/02: Reuse constants
Posted by gg...@apache.org.
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
commit 079d907f1aeb5b9b9af5b0b951b501a6e50c7f1c
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Nov 25 09:05:23 2022 -0500
Reuse constants
---
src/main/java/org/apache/commons/beanutils2/JDBCDynaClass.java | 2 +-
src/test/java/org/apache/commons/beanutils2/LazyDynaListTestCase.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/commons/beanutils2/JDBCDynaClass.java b/src/main/java/org/apache/commons/beanutils2/JDBCDynaClass.java
index b5e0b0fd..8b461585 100644
--- a/src/main/java/org/apache/commons/beanutils2/JDBCDynaClass.java
+++ b/src/main/java/org/apache/commons/beanutils2/JDBCDynaClass.java
@@ -239,7 +239,7 @@ abstract class JDBCDynaClass implements DynaClass, Serializable {
// Convert this list into the internal data structures we need
properties =
- list.toArray(new DynaProperty[list.size()]);
+ list.toArray(DynaProperty.EMPTY_DYNA_PROPERTY_ARRAY);
for (final DynaProperty property : properties) {
propertiesMap.put(property.getName(), property);
}
diff --git a/src/test/java/org/apache/commons/beanutils2/LazyDynaListTestCase.java b/src/test/java/org/apache/commons/beanutils2/LazyDynaListTestCase.java
index e463ed0c..8e1a6f1d 100644
--- a/src/test/java/org/apache/commons/beanutils2/LazyDynaListTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/LazyDynaListTestCase.java
@@ -604,7 +604,7 @@ public class LazyDynaListTestCase extends TestCase {
final LazyDynaList list = new LazyDynaList(LazyDynaBean.class);
final LazyDynaBean elem = new LazyDynaBean();
list.add(elem);
- final LazyDynaBean[] array = list.toArray(new LazyDynaBean[0]);
+ final LazyDynaBean[] array = list.toArray(LazyDynaBean.EMPTY_LAZY_DYNA_BEAN_ARRAY);
assertEquals("Wrong array size", 1, array.length);
assertEquals("Wrong element", elem, array[0]);
}
[commons-beanutils] 02/02: Better constant names
Posted by gg...@apache.org.
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
commit 1a3b7fb47cc742efff38cd7683eae4291fb397f8
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Nov 25 09:14:48 2022 -0500
Better constant names
---
src/main/java/org/apache/commons/beanutils2/BasicDynaClass.java | 2 +-
.../java/org/apache/commons/beanutils2/DefaultBeanIntrospector.java | 2 +-
.../org/apache/commons/beanutils2/DefaultIntrospectionContext.java | 2 +-
src/main/java/org/apache/commons/beanutils2/DynaProperty.java | 2 +-
src/main/java/org/apache/commons/beanutils2/JDBCDynaClass.java | 2 +-
src/main/java/org/apache/commons/beanutils2/LazyDynaBean.java | 2 +-
src/main/java/org/apache/commons/beanutils2/LazyDynaList.java | 4 ++--
src/main/java/org/apache/commons/beanutils2/PropertyDescriptors.java | 2 +-
src/main/java/org/apache/commons/beanutils2/WrapDynaClass.java | 2 +-
src/test/java/org/apache/commons/beanutils2/LazyDynaListTestCase.java | 2 +-
10 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/main/java/org/apache/commons/beanutils2/BasicDynaClass.java b/src/main/java/org/apache/commons/beanutils2/BasicDynaClass.java
index fdf02608..06486213 100644
--- a/src/main/java/org/apache/commons/beanutils2/BasicDynaClass.java
+++ b/src/main/java/org/apache/commons/beanutils2/BasicDynaClass.java
@@ -105,7 +105,7 @@ public class BasicDynaClass implements DynaClass, Serializable {
/**
* The set of dynamic properties that are part of this DynaClass.
*/
- protected DynaProperty[] properties = DynaProperty.EMPTY_DYNA_PROPERTY_ARRAY;
+ protected DynaProperty[] properties = DynaProperty.EMPTY_ARRAY;
/**
* The set of dynamic properties that are part of this DynaClass,
diff --git a/src/main/java/org/apache/commons/beanutils2/DefaultBeanIntrospector.java b/src/main/java/org/apache/commons/beanutils2/DefaultBeanIntrospector.java
index a44c67b2..512b9f79 100644
--- a/src/main/java/org/apache/commons/beanutils2/DefaultBeanIntrospector.java
+++ b/src/main/java/org/apache/commons/beanutils2/DefaultBeanIntrospector.java
@@ -85,7 +85,7 @@ public class DefaultBeanIntrospector implements BeanIntrospector {
PropertyDescriptor[] descriptors = beanInfo.getPropertyDescriptors();
if (descriptors == null) {
- descriptors = PropertyDescriptors.EMPTY_PROPERTY_DESCRIPTOR_ARRAY;
+ descriptors = PropertyDescriptors.EMPTY_ARRAY;
}
handleIndexedPropertyDescriptors(icontext.getTargetClass(),
diff --git a/src/main/java/org/apache/commons/beanutils2/DefaultIntrospectionContext.java b/src/main/java/org/apache/commons/beanutils2/DefaultIntrospectionContext.java
index 1b8ee6c7..6ffd0396 100644
--- a/src/main/java/org/apache/commons/beanutils2/DefaultIntrospectionContext.java
+++ b/src/main/java/org/apache/commons/beanutils2/DefaultIntrospectionContext.java
@@ -106,6 +106,6 @@ class DefaultIntrospectionContext implements IntrospectionContext {
* @return an array with all known property descriptors
*/
public PropertyDescriptor[] getPropertyDescriptors() {
- return descriptors.values().toArray(PropertyDescriptors.EMPTY_PROPERTY_DESCRIPTOR_ARRAY);
+ return descriptors.values().toArray(PropertyDescriptors.EMPTY_ARRAY);
}
}
diff --git a/src/main/java/org/apache/commons/beanutils2/DynaProperty.java b/src/main/java/org/apache/commons/beanutils2/DynaProperty.java
index 44fdd45b..b5b69bcc 100644
--- a/src/main/java/org/apache/commons/beanutils2/DynaProperty.java
+++ b/src/main/java/org/apache/commons/beanutils2/DynaProperty.java
@@ -129,7 +129,7 @@ public class DynaProperty implements Serializable {
/**
* Empty array.
*/
- static final DynaProperty[] EMPTY_DYNA_PROPERTY_ARRAY = {};
+ static final DynaProperty[] EMPTY_ARRAY = {};
/**
* Gets the <em>(optional)</em> type of the indexed content for {@code DynaProperty}'s
diff --git a/src/main/java/org/apache/commons/beanutils2/JDBCDynaClass.java b/src/main/java/org/apache/commons/beanutils2/JDBCDynaClass.java
index 8b461585..e4e115c8 100644
--- a/src/main/java/org/apache/commons/beanutils2/JDBCDynaClass.java
+++ b/src/main/java/org/apache/commons/beanutils2/JDBCDynaClass.java
@@ -239,7 +239,7 @@ abstract class JDBCDynaClass implements DynaClass, Serializable {
// Convert this list into the internal data structures we need
properties =
- list.toArray(DynaProperty.EMPTY_DYNA_PROPERTY_ARRAY);
+ list.toArray(DynaProperty.EMPTY_ARRAY);
for (final DynaProperty property : properties) {
propertiesMap.put(property.getName(), property);
}
diff --git a/src/main/java/org/apache/commons/beanutils2/LazyDynaBean.java b/src/main/java/org/apache/commons/beanutils2/LazyDynaBean.java
index 8fdd2652..e6c905e2 100644
--- a/src/main/java/org/apache/commons/beanutils2/LazyDynaBean.java
+++ b/src/main/java/org/apache/commons/beanutils2/LazyDynaBean.java
@@ -163,7 +163,7 @@ public class LazyDynaBean implements DynaBean, Serializable {
*/
protected MutableDynaClass dynaClass;
- static final LazyDynaBean[] EMPTY_LAZY_DYNA_BEAN_ARRAY = {};
+ static final LazyDynaBean[] EMPTY_ARRAY = {};
/**
* Constructs a new {@code LazyDynaBean</code> with a <code>LazyDynaClass} instance.
diff --git a/src/main/java/org/apache/commons/beanutils2/LazyDynaList.java b/src/main/java/org/apache/commons/beanutils2/LazyDynaList.java
index 2c443780..3b67bef3 100644
--- a/src/main/java/org/apache/commons/beanutils2/LazyDynaList.java
+++ b/src/main/java/org/apache/commons/beanutils2/LazyDynaList.java
@@ -390,7 +390,7 @@ public class LazyDynaList extends ArrayList<Object> {
@Override
public Object[] toArray() {
if (isEmpty() && elementType == null) {
- return LazyDynaBean.EMPTY_LAZY_DYNA_BEAN_ARRAY;
+ return LazyDynaBean.EMPTY_ARRAY;
}
final Object[] array = (Object[])Array.newInstance(elementType, size());
@@ -461,7 +461,7 @@ public class LazyDynaList extends ArrayList<Object> {
*/
public DynaBean[] toDynaBeanArray() {
if (isEmpty() && elementDynaBeanType == null) {
- return LazyDynaBean.EMPTY_LAZY_DYNA_BEAN_ARRAY;
+ return LazyDynaBean.EMPTY_ARRAY;
}
final DynaBean[] array = (DynaBean[])Array.newInstance(elementDynaBeanType, size());
diff --git a/src/main/java/org/apache/commons/beanutils2/PropertyDescriptors.java b/src/main/java/org/apache/commons/beanutils2/PropertyDescriptors.java
index 8d271685..797bff79 100644
--- a/src/main/java/org/apache/commons/beanutils2/PropertyDescriptors.java
+++ b/src/main/java/org/apache/commons/beanutils2/PropertyDescriptors.java
@@ -21,6 +21,6 @@ import java.beans.PropertyDescriptor;
class PropertyDescriptors {
- static final PropertyDescriptor[] EMPTY_PROPERTY_DESCRIPTOR_ARRAY = {};
+ static final PropertyDescriptor[] EMPTY_ARRAY = {};
}
diff --git a/src/main/java/org/apache/commons/beanutils2/WrapDynaClass.java b/src/main/java/org/apache/commons/beanutils2/WrapDynaClass.java
index 202cc6db..4fe40053 100644
--- a/src/main/java/org/apache/commons/beanutils2/WrapDynaClass.java
+++ b/src/main/java/org/apache/commons/beanutils2/WrapDynaClass.java
@@ -269,7 +269,7 @@ public class WrapDynaClass implements DynaClass {
PropertyDescriptor[] regulars =
getPropertyUtilsBean().getPropertyDescriptors(beanClass);
if (regulars == null) {
- regulars = PropertyDescriptors.EMPTY_PROPERTY_DESCRIPTOR_ARRAY;
+ regulars = PropertyDescriptors.EMPTY_ARRAY;
}
Map<?, ?> mappeds =
PropertyUtils.getMappedPropertyDescriptors(beanClass);
diff --git a/src/test/java/org/apache/commons/beanutils2/LazyDynaListTestCase.java b/src/test/java/org/apache/commons/beanutils2/LazyDynaListTestCase.java
index 8e1a6f1d..5cc2df8f 100644
--- a/src/test/java/org/apache/commons/beanutils2/LazyDynaListTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/LazyDynaListTestCase.java
@@ -604,7 +604,7 @@ public class LazyDynaListTestCase extends TestCase {
final LazyDynaList list = new LazyDynaList(LazyDynaBean.class);
final LazyDynaBean elem = new LazyDynaBean();
list.add(elem);
- final LazyDynaBean[] array = list.toArray(LazyDynaBean.EMPTY_LAZY_DYNA_BEAN_ARRAY);
+ final LazyDynaBean[] array = list.toArray(LazyDynaBean.EMPTY_ARRAY);
assertEquals("Wrong array size", 1, array.length);
assertEquals("Wrong element", elem, array[0]);
}