You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by br...@apache.org on 2015/05/04 20:56:26 UTC

[1/4] [lang] EqualsExlcude notation, HashCodeExclude notation and ToStringExludeNotation

Repository: commons-lang
Updated Branches:
  refs/heads/master 8e7ea70a3 -> 8548b12d8


EqualsExlcude notation, HashCodeExclude notation and ToStringExludeNotation


Project: http://git-wip-us.apache.org/repos/asf/commons-lang/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-lang/commit/aeb6f86b
Tree: http://git-wip-us.apache.org/repos/asf/commons-lang/tree/aeb6f86b
Diff: http://git-wip-us.apache.org/repos/asf/commons-lang/diff/aeb6f86b

Branch: refs/heads/master
Commit: aeb6f86bcdec061ee9c6be96066fa19c56523490
Parents: 8e7ea70
Author: Felipe Adorno <fe...@gmail.com>
Authored: Sun May 3 15:59:00 2015 -0300
Committer: Felipe Adorno <fe...@gmail.com>
Committed: Sun May 3 15:59:00 2015 -0300

----------------------------------------------------------------------
 .../commons/lang3/builder/EqualsBuilder.java    |  3 +-
 .../commons/lang3/builder/EqualsExclude.java    | 33 ++++++++++
 .../commons/lang3/builder/HashCodeBuilder.java  |  3 +-
 .../commons/lang3/builder/HashCodeExclude.java  | 33 ++++++++++
 .../builder/ReflectionToStringBuilder.java      |  3 +
 .../commons/lang3/builder/ToStringExclude.java  | 33 ++++++++++
 .../lang3/builder/EqualsBuilderTest.java        | 32 ++++++++++
 .../lang3/builder/HashCodeBuilderTest.java      | 47 +++++++++++++++
 ...oStringBuilderExcludeWithAnnotationTest.java | 63 ++++++++++++++++++++
 9 files changed, 248 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-lang/blob/aeb6f86b/src/main/java/org/apache/commons/lang3/builder/EqualsBuilder.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/lang3/builder/EqualsBuilder.java b/src/main/java/org/apache/commons/lang3/builder/EqualsBuilder.java
index b449766..be8f4f1 100644
--- a/src/main/java/org/apache/commons/lang3/builder/EqualsBuilder.java
+++ b/src/main/java/org/apache/commons/lang3/builder/EqualsBuilder.java
@@ -411,7 +411,8 @@ public class EqualsBuilder implements Builder<Boolean> {
                 if (!ArrayUtils.contains(excludeFields, f.getName())
                     && !f.getName().contains("$")
                     && (useTransients || !Modifier.isTransient(f.getModifiers()))
-                    && !Modifier.isStatic(f.getModifiers())) {
+                    && (!Modifier.isStatic(f.getModifiers()))
+                    && (!f.isAnnotationPresent(EqualsExclude.class))) {
                     try {
                         builder.append(f.get(lhs), f.get(rhs));
                     } catch (final IllegalAccessException e) {

http://git-wip-us.apache.org/repos/asf/commons-lang/blob/aeb6f86b/src/main/java/org/apache/commons/lang3/builder/EqualsExclude.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/lang3/builder/EqualsExclude.java b/src/main/java/org/apache/commons/lang3/builder/EqualsExclude.java
new file mode 100755
index 0000000..bbe2bb0
--- /dev/null
+++ b/src/main/java/org/apache/commons/lang3/builder/EqualsExclude.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.commons.lang3.builder;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+/**
+ * Use this annotation to builds a equals excluding the annotated field.
+ * @author Felipe Adorno (felipeadsc@gmail.com)
+ */
+@Retention(RUNTIME)
+@Target(ElementType.FIELD)
+public @interface EqualsExclude {
+
+}

http://git-wip-us.apache.org/repos/asf/commons-lang/blob/aeb6f86b/src/main/java/org/apache/commons/lang3/builder/HashCodeBuilder.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/lang3/builder/HashCodeBuilder.java b/src/main/java/org/apache/commons/lang3/builder/HashCodeBuilder.java
index 537b9f5..fbbd110 100644
--- a/src/main/java/org/apache/commons/lang3/builder/HashCodeBuilder.java
+++ b/src/main/java/org/apache/commons/lang3/builder/HashCodeBuilder.java
@@ -192,7 +192,8 @@ public class HashCodeBuilder implements Builder<Integer> {
                 if (!ArrayUtils.contains(excludeFields, field.getName())
                     && !field.getName().contains("$")
                     && (useTransients || !Modifier.isTransient(field.getModifiers()))
-                    && !Modifier.isStatic(field.getModifiers())) {
+                    && (!Modifier.isStatic(field.getModifiers()))
+                    && (!field.isAnnotationPresent(HashCodeExclude.class))) {
                     try {
                         final Object fieldValue = field.get(object);
                         builder.append(fieldValue);

http://git-wip-us.apache.org/repos/asf/commons-lang/blob/aeb6f86b/src/main/java/org/apache/commons/lang3/builder/HashCodeExclude.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/lang3/builder/HashCodeExclude.java b/src/main/java/org/apache/commons/lang3/builder/HashCodeExclude.java
new file mode 100755
index 0000000..2984808
--- /dev/null
+++ b/src/main/java/org/apache/commons/lang3/builder/HashCodeExclude.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.commons.lang3.builder;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+/**
+ * Use this annotation to builds a hash code excluding the annotated field.
+ * @author Felipe Adorno (felipeadsc@gmail.com)
+ */
+@Retention(RUNTIME)
+@Target(ElementType.FIELD)
+public @interface HashCodeExclude {
+
+}

http://git-wip-us.apache.org/repos/asf/commons-lang/blob/aeb6f86b/src/main/java/org/apache/commons/lang3/builder/ReflectionToStringBuilder.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/lang3/builder/ReflectionToStringBuilder.java b/src/main/java/org/apache/commons/lang3/builder/ReflectionToStringBuilder.java
index 5b992bd..5904469 100644
--- a/src/main/java/org/apache/commons/lang3/builder/ReflectionToStringBuilder.java
+++ b/src/main/java/org/apache/commons/lang3/builder/ReflectionToStringBuilder.java
@@ -494,6 +494,9 @@ public class ReflectionToStringBuilder extends ToStringBuilder {
             // Reject fields from the getExcludeFieldNames list.
             return false;
         }
+        if(field.isAnnotationPresent(ToStringExclude.class)) {
+            return false;
+        }
         return true;
     }
 

http://git-wip-us.apache.org/repos/asf/commons-lang/blob/aeb6f86b/src/main/java/org/apache/commons/lang3/builder/ToStringExclude.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/lang3/builder/ToStringExclude.java b/src/main/java/org/apache/commons/lang3/builder/ToStringExclude.java
new file mode 100755
index 0000000..b0bf98a
--- /dev/null
+++ b/src/main/java/org/apache/commons/lang3/builder/ToStringExclude.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.commons.lang3.builder;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+/**
+ * Use this annotation to builds a String excluding the annotated field.
+ * @author Felipe Adorno (felipeadsc@gmail.com)
+ */
+@Retention(RUNTIME)
+@Target(ElementType.FIELD)
+public @interface ToStringExclude {
+
+}

http://git-wip-us.apache.org/repos/asf/commons-lang/blob/aeb6f86b/src/test/java/org/apache/commons/lang3/builder/EqualsBuilderTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/lang3/builder/EqualsBuilderTest.java b/src/test/java/org/apache/commons/lang3/builder/EqualsBuilderTest.java
index 30e2e22..702c5a2 100644
--- a/src/test/java/org/apache/commons/lang3/builder/EqualsBuilderTest.java
+++ b/src/test/java/org/apache/commons/lang3/builder/EqualsBuilderTest.java
@@ -1150,5 +1150,37 @@ public class EqualsBuilderTest {
         assertTrue(EqualsBuilder.reflectionEquals(d1, d3));
     }
 
+    static class TestObjectEqualsExclude {
+        @EqualsExclude
+        private int a;
+        private int b;
+
+        public TestObjectEqualsExclude(int a, int b) {
+            this.a = a;
+            this.b = b;
+        }
+
+        public int getA() {
+            return a;
+        }
+
+        public int getB() {
+            return b;
+        }
+    }
+
+    @Test
+    public void testToEqualsExclude() {
+        TestObjectEqualsExclude one = new TestObjectEqualsExclude(1, 2);
+        TestObjectEqualsExclude two = new TestObjectEqualsExclude(1, 3);
+
+        assertFalse(EqualsBuilder.reflectionEquals(one, two));
+
+        one = new TestObjectEqualsExclude(1, 2);
+        two = new TestObjectEqualsExclude(2, 2);
+
+        assertTrue(EqualsBuilder.reflectionEquals(one, two));
+    }
+
 }
 

http://git-wip-us.apache.org/repos/asf/commons-lang/blob/aeb6f86b/src/test/java/org/apache/commons/lang3/builder/HashCodeBuilderTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/lang3/builder/HashCodeBuilderTest.java b/src/test/java/org/apache/commons/lang3/builder/HashCodeBuilderTest.java
index 12aba9e..9009fbd 100644
--- a/src/test/java/org/apache/commons/lang3/builder/HashCodeBuilderTest.java
+++ b/src/test/java/org/apache/commons/lang3/builder/HashCodeBuilderTest.java
@@ -622,4 +622,51 @@ public class HashCodeBuilderTest {
                      hcb.toHashCode(), hcb.hashCode());
     }
 
+    static class TestObjectHashCodeExclude {
+        @HashCodeExclude
+        private int a;
+        private int b;
+
+        public TestObjectHashCodeExclude(int a, int b) {
+            this.a = a;
+            this.b = b;
+        }
+
+        public int getA() {
+            return a;
+        }
+
+        public int getB() {
+            return b;
+        }
+    }
+
+    static class TestObjectHashCodeExclude2 {
+        @HashCodeExclude
+        private int a;
+        @HashCodeExclude
+        private int b;
+
+        public TestObjectHashCodeExclude2(int a, int b) {
+            this.a = a;
+            this.b = b;
+        }
+
+        public int getA() {
+            return a;
+        }
+
+        public int getB() {
+            return b;
+        }
+    }
+
+    @Test
+    public void testToHashCodeExclude() {
+        TestObjectHashCodeExclude one = new TestObjectHashCodeExclude(1, 2);
+        TestObjectHashCodeExclude2 two = new TestObjectHashCodeExclude2(1, 2);
+        assertEquals(17 * 37 + 2, HashCodeBuilder.reflectionHashCode(one));
+        assertEquals(17, HashCodeBuilder.reflectionHashCode(two));
+    }
+
 }

http://git-wip-us.apache.org/repos/asf/commons-lang/blob/aeb6f86b/src/test/java/org/apache/commons/lang3/builder/ReflectionToStringBuilderExcludeWithAnnotationTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/lang3/builder/ReflectionToStringBuilderExcludeWithAnnotationTest.java b/src/test/java/org/apache/commons/lang3/builder/ReflectionToStringBuilderExcludeWithAnnotationTest.java
new file mode 100755
index 0000000..c01d3b8
--- /dev/null
+++ b/src/test/java/org/apache/commons/lang3/builder/ReflectionToStringBuilderExcludeWithAnnotationTest.java
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.commons.lang3.builder;
+
+import org.apache.commons.lang3.ArrayUtils;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * Test class for ToStringExclude annotation
+ * @author Felipe Adorno (felipeadsc@gmail.com)
+ * @version $Id$
+ */
+public class ReflectionToStringBuilderExcludeWithAnnotationTest {
+
+    class TestFixture {
+        @ToStringExclude
+        private final String secretField = SECRET_VALUE;
+
+        @SuppressWarnings("unused")
+        private final String showField = NOT_SECRET_VALUE;
+    }
+
+    private static final String NOT_SECRET_FIELD = "showField";
+
+    private static final String NOT_SECRET_VALUE = "Hello World!";
+
+    private static final String SECRET_FIELD = "secretField";
+
+    private static final String SECRET_VALUE = "secret value";
+
+    @Test
+    public void test_toStringExclude() {
+        final String toString = ReflectionToStringBuilder.toString(new TestFixture());
+        this.validateSecretFieldAbsent(toString);
+    }
+
+    private void validateNonSecretField(final String toString) {
+        Assert.assertTrue(toString.indexOf(NOT_SECRET_FIELD) > ArrayUtils.INDEX_NOT_FOUND);
+        Assert.assertTrue(toString.indexOf(NOT_SECRET_VALUE) > ArrayUtils.INDEX_NOT_FOUND);
+    }
+
+    private void validateSecretFieldAbsent(final String toString) {
+        Assert.assertEquals(ArrayUtils.INDEX_NOT_FOUND, toString.indexOf(SECRET_FIELD));
+        Assert.assertEquals(ArrayUtils.INDEX_NOT_FOUND, toString.indexOf(SECRET_VALUE));
+        this.validateNonSecretField(toString);
+    }
+}


[3/4] [lang] Add LANG-1031 to changes.xml

Posted by br...@apache.org.
Add LANG-1031 to changes.xml


Project: http://git-wip-us.apache.org/repos/asf/commons-lang/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-lang/commit/ceca92e3
Tree: http://git-wip-us.apache.org/repos/asf/commons-lang/tree/ceca92e3
Diff: http://git-wip-us.apache.org/repos/asf/commons-lang/diff/ceca92e3

Branch: refs/heads/master
Commit: ceca92e3f8e9f893081b3e8461508ffcae0ed076
Parents: 4daaeab
Author: Benedikt Ritter <br...@apache.org>
Authored: Mon May 4 20:51:43 2015 +0200
Committer: Benedikt Ritter <br...@apache.org>
Committed: Mon May 4 20:51:43 2015 +0200

----------------------------------------------------------------------
 src/changes/changes.xml | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-lang/blob/ceca92e3/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 36fc671..0a8069b 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -22,6 +22,7 @@
   <body>
 
   <release version="3.5" date="tba" description="tba">
+    <action issue="LANG-1031" type="add" dev="britter" due-to="Felipe Adorno">Add annotations to exclude fields from ReflectionEqualsBuilder, ReflectionToStringBuilder and ReflectionHashCodeBuilder</action>
     <action issue="LANG-1127" type="add" dev="chas">Unit test helpers which set and reset default Locale and TimeZone</action>
     <action issue="LANG-1128" type="fix" dev="britter" due-to="jacktan1991">JsonToStringStyle doesn't handle chars and objects correctly</action>
     <action issue="LANG-456" type="fix" dev="britter" due-to="Bob Fields, Woosan Ko, Bruno P. Kinoshita">HashCodeBuilder throws StackOverflowError in bidirectional navigable association</action>


[2/4] [lang] Remove author

Posted by br...@apache.org.
Remove author


Project: http://git-wip-us.apache.org/repos/asf/commons-lang/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-lang/commit/4daaeaba
Tree: http://git-wip-us.apache.org/repos/asf/commons-lang/tree/4daaeaba
Diff: http://git-wip-us.apache.org/repos/asf/commons-lang/diff/4daaeaba

Branch: refs/heads/master
Commit: 4daaeabaad5ea11d25c0079fea40b7f9d0fe83a3
Parents: aeb6f86
Author: Felipe Adorno <fe...@gmail.com>
Authored: Sun May 3 21:42:20 2015 -0300
Committer: Felipe Adorno <fe...@gmail.com>
Committed: Sun May 3 21:42:20 2015 -0300

----------------------------------------------------------------------
 pom.xml                                                           | 3 +++
 src/main/java/org/apache/commons/lang3/builder/EqualsExclude.java | 1 -
 .../java/org/apache/commons/lang3/builder/HashCodeExclude.java    | 1 -
 .../java/org/apache/commons/lang3/builder/ToStringExclude.java    | 1 -
 .../ReflectionToStringBuilderExcludeWithAnnotationTest.java       | 1 -
 5 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-lang/blob/4daaeaba/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3d80909..4f8c2e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -478,6 +478,9 @@
     <contributor>
       <name>MichaƂ Kordas</name>
     </contributor>
+    <contributor>
+      <name>Felipe Adorno</name>
+    </contributor>
   </contributors>
 
   <!-- Lang should depend on very little -->

http://git-wip-us.apache.org/repos/asf/commons-lang/blob/4daaeaba/src/main/java/org/apache/commons/lang3/builder/EqualsExclude.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/lang3/builder/EqualsExclude.java b/src/main/java/org/apache/commons/lang3/builder/EqualsExclude.java
index bbe2bb0..f71616f 100755
--- a/src/main/java/org/apache/commons/lang3/builder/EqualsExclude.java
+++ b/src/main/java/org/apache/commons/lang3/builder/EqualsExclude.java
@@ -24,7 +24,6 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 /**
  * Use this annotation to builds a equals excluding the annotated field.
- * @author Felipe Adorno (felipeadsc@gmail.com)
  */
 @Retention(RUNTIME)
 @Target(ElementType.FIELD)

http://git-wip-us.apache.org/repos/asf/commons-lang/blob/4daaeaba/src/main/java/org/apache/commons/lang3/builder/HashCodeExclude.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/lang3/builder/HashCodeExclude.java b/src/main/java/org/apache/commons/lang3/builder/HashCodeExclude.java
index 2984808..adc2eb4 100755
--- a/src/main/java/org/apache/commons/lang3/builder/HashCodeExclude.java
+++ b/src/main/java/org/apache/commons/lang3/builder/HashCodeExclude.java
@@ -24,7 +24,6 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 /**
  * Use this annotation to builds a hash code excluding the annotated field.
- * @author Felipe Adorno (felipeadsc@gmail.com)
  */
 @Retention(RUNTIME)
 @Target(ElementType.FIELD)

http://git-wip-us.apache.org/repos/asf/commons-lang/blob/4daaeaba/src/main/java/org/apache/commons/lang3/builder/ToStringExclude.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/lang3/builder/ToStringExclude.java b/src/main/java/org/apache/commons/lang3/builder/ToStringExclude.java
index b0bf98a..0e26c49 100755
--- a/src/main/java/org/apache/commons/lang3/builder/ToStringExclude.java
+++ b/src/main/java/org/apache/commons/lang3/builder/ToStringExclude.java
@@ -24,7 +24,6 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 /**
  * Use this annotation to builds a String excluding the annotated field.
- * @author Felipe Adorno (felipeadsc@gmail.com)
  */
 @Retention(RUNTIME)
 @Target(ElementType.FIELD)

http://git-wip-us.apache.org/repos/asf/commons-lang/blob/4daaeaba/src/test/java/org/apache/commons/lang3/builder/ReflectionToStringBuilderExcludeWithAnnotationTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/commons/lang3/builder/ReflectionToStringBuilderExcludeWithAnnotationTest.java b/src/test/java/org/apache/commons/lang3/builder/ReflectionToStringBuilderExcludeWithAnnotationTest.java
index c01d3b8..f6b62bc 100755
--- a/src/test/java/org/apache/commons/lang3/builder/ReflectionToStringBuilderExcludeWithAnnotationTest.java
+++ b/src/test/java/org/apache/commons/lang3/builder/ReflectionToStringBuilderExcludeWithAnnotationTest.java
@@ -23,7 +23,6 @@ import org.junit.Test;
 
 /**
  * Test class for ToStringExclude annotation
- * @author Felipe Adorno (felipeadsc@gmail.com)
  * @version $Id$
  */
 public class ReflectionToStringBuilderExcludeWithAnnotationTest {


[4/4] [lang] Merge branch 'LANG-1031'

Posted by br...@apache.org.
Merge branch 'LANG-1031'

LANG-1031: Add annotations to exclude fields from ReflectionEqualsBuilder,
ReflectionToStringBuilder and ReflectionHashCodeBuilder. Thanks to
Felipe Adorno. This closes #29, #77.


Project: http://git-wip-us.apache.org/repos/asf/commons-lang/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-lang/commit/8548b12d
Tree: http://git-wip-us.apache.org/repos/asf/commons-lang/tree/8548b12d
Diff: http://git-wip-us.apache.org/repos/asf/commons-lang/diff/8548b12d

Branch: refs/heads/master
Commit: 8548b12d8f697667593ab78a3ecf3628c21db7f8
Parents: 8e7ea70 ceca92e
Author: Benedikt Ritter <br...@apache.org>
Authored: Mon May 4 20:52:04 2015 +0200
Committer: Benedikt Ritter <br...@apache.org>
Committed: Mon May 4 20:52:04 2015 +0200

----------------------------------------------------------------------
 pom.xml                                         |  3 +
 src/changes/changes.xml                         |  1 +
 .../commons/lang3/builder/EqualsBuilder.java    |  3 +-
 .../commons/lang3/builder/EqualsExclude.java    | 32 ++++++++++
 .../commons/lang3/builder/HashCodeBuilder.java  |  3 +-
 .../commons/lang3/builder/HashCodeExclude.java  | 32 ++++++++++
 .../builder/ReflectionToStringBuilder.java      |  3 +
 .../commons/lang3/builder/ToStringExclude.java  | 32 ++++++++++
 .../lang3/builder/EqualsBuilderTest.java        | 32 ++++++++++
 .../lang3/builder/HashCodeBuilderTest.java      | 47 +++++++++++++++
 ...oStringBuilderExcludeWithAnnotationTest.java | 62 ++++++++++++++++++++
 11 files changed, 248 insertions(+), 2 deletions(-)
----------------------------------------------------------------------