Author: niallp
Date: Sun Jan 31 17:07:34 2010
New Revision: 905074
URL: http://svn.apache.org/viewvc?rev=905074&view=rev
Log:
Port LANG-575 to 2.x branch - Replacing the creation of a List in the core of
each Builder class to test contains on the excludeFields with a call to
ArrayUtils.contains
Modified:
commons/proper/lang/branches/LANG_2_X/src/main/java/org/apache/commons/lang/builder/CompareToBuilder.java
commons/proper/lang/branches/LANG_2_X/src/main/java/org/apache/commons/lang/builder/EqualsBuilder.java
commons/proper/lang/branches/LANG_2_X/src/main/java/org/apache/commons/lang/builder/HashCodeBuilder.java
Modified:
commons/proper/lang/branches/LANG_2_X/src/main/java/org/apache/commons/lang/builder/CompareToBuilder.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/branches/LANG_2_X/src/main/java/org/apache/commons/lang/builder/CompareToBuilder.java?rev=905074&r1=905073&r2=905074&view=diff
==============================================================================
---
commons/proper/lang/branches/LANG_2_X/src/main/java/org/apache/commons/lang/builder/CompareToBuilder.java
(original)
+++
commons/proper/lang/branches/LANG_2_X/src/main/java/org/apache/commons/lang/builder/CompareToBuilder.java
Sun Jan 31 17:07:34 2010
@@ -19,12 +19,10 @@
import java.lang.reflect.AccessibleObject;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
-import java.util.Arrays;
import java.util.Collection;
-import java.util.Collections;
import java.util.Comparator;
-import java.util.List;
+import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang.math.NumberUtils;
/**
@@ -355,11 +353,10 @@
String[] excludeFields) {
Field[] fields = clazz.getDeclaredFields();
- List excludedFieldList = excludeFields != null ?
Arrays.asList(excludeFields) : Collections.EMPTY_LIST;
AccessibleObject.setAccessible(fields, true);
for (int i = 0; i < fields.length && builder.comparison == 0; i++) {
Field f = fields[i];
- if (!excludedFieldList.contains(f.getName())
+ if (!ArrayUtils.contains(excludeFields, f.getName())
&& (f.getName().indexOf('$') == -1)
&& (useTransients || !Modifier.isTransient(f.getModifiers()))
&& (!Modifier.isStatic(f.getModifiers()))) {
Modified:
commons/proper/lang/branches/LANG_2_X/src/main/java/org/apache/commons/lang/builder/EqualsBuilder.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/branches/LANG_2_X/src/main/java/org/apache/commons/lang/builder/EqualsBuilder.java?rev=905074&r1=905073&r2=905074&view=diff
==============================================================================
---
commons/proper/lang/branches/LANG_2_X/src/main/java/org/apache/commons/lang/builder/EqualsBuilder.java
(original)
+++
commons/proper/lang/branches/LANG_2_X/src/main/java/org/apache/commons/lang/builder/EqualsBuilder.java
Sun Jan 31 17:07:34 2010
@@ -19,10 +19,9 @@
import java.lang.reflect.AccessibleObject;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
-import java.util.Arrays;
import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
+
+import org.apache.commons.lang.ArrayUtils;
/**
* <p>Assists in implementing {...@link Object#equals(Object)} methods.</p>
@@ -318,11 +317,10 @@
boolean useTransients,
String[] excludeFields) {
Field[] fields = clazz.getDeclaredFields();
- List excludedFieldList = excludeFields != null ?
Arrays.asList(excludeFields) : Collections.EMPTY_LIST;
AccessibleObject.setAccessible(fields, true);
for (int i = 0; i < fields.length && builder.isEquals; i++) {
Field f = fields[i];
- if (!excludedFieldList.contains(f.getName())
+ if (!ArrayUtils.contains(excludeFields, f.getName())
&& (f.getName().indexOf('$') == -1)
&& (useTransients || !Modifier.isTransient(f.getModifiers()))
&& (!Modifier.isStatic(f.getModifiers()))) {
Modified:
commons/proper/lang/branches/LANG_2_X/src/main/java/org/apache/commons/lang/builder/HashCodeBuilder.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/branches/LANG_2_X/src/main/java/org/apache/commons/lang/builder/HashCodeBuilder.java?rev=905074&r1=905073&r2=905074&view=diff
==============================================================================
---
commons/proper/lang/branches/LANG_2_X/src/main/java/org/apache/commons/lang/builder/HashCodeBuilder.java
(original)
+++
commons/proper/lang/branches/LANG_2_X/src/main/java/org/apache/commons/lang/builder/HashCodeBuilder.java
Sun Jan 31 17:07:34 2010
@@ -20,13 +20,11 @@
import java.lang.reflect.AccessibleObject;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
-import java.util.Arrays;
import java.util.Collection;
-import java.util.Collections;
import java.util.HashSet;
-import java.util.List;
import java.util.Set;
+import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang.IDKey;
/**
@@ -180,11 +178,10 @@
try {
register(object);
Field[] fields = clazz.getDeclaredFields();
- List excludedFieldList = excludeFields != null ?
Arrays.asList(excludeFields) : Collections.EMPTY_LIST;
AccessibleObject.setAccessible(fields, true);
for (int i = 0; i < fields.length; i++) {
Field field = fields[i];
- if (!excludedFieldList.contains(field.getName())
+ if (!ArrayUtils.contains(excludeFields, field.getName())
&& (field.getName().indexOf('$') == -1)
&& (useTransients ||
!Modifier.isTransient(field.getModifiers()))
&& (!Modifier.isStatic(field.getModifiers()))) {
