Return-Path: Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: (qmail 80665 invoked from network); 31 Jan 2010 17:08:00 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 31 Jan 2010 17:08:00 -0000 Received: (qmail 51878 invoked by uid 500); 31 Jan 2010 17:07:59 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 51792 invoked by uid 500); 31 Jan 2010 17:07:58 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 51783 invoked by uid 99); 31 Jan 2010 17:07:58 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 31 Jan 2010 17:07:58 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 31 Jan 2010 17:07:56 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D19B22388A02; Sun, 31 Jan 2010 17:07:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r905074 - in /commons/proper/lang/branches/LANG_2_X/src/main/java/org/apache/commons/lang/builder: CompareToBuilder.java EqualsBuilder.java HashCodeBuilder.java Date: Sun, 31 Jan 2010 17:07:34 -0000 To: commits@commons.apache.org From: niallp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100131170734.D19B22388A02@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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; /** *

Assists in implementing {@link Object#equals(Object)} methods.

@@ -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()))) {