LANG-1167: Add null filter to ReflectionToStringBuilder Fix/add since javadoc tags, fix checkstyle violations and do other small clean-ups.
Project: http://git-wip-us.apache.org/repos/asf/commons-lang/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-lang/commit/859224ff Tree: http://git-wip-us.apache.org/repos/asf/commons-lang/tree/859224ff Diff: http://git-wip-us.apache.org/repos/asf/commons-lang/diff/859224ff Branch: refs/heads/release Commit: 859224ffadb79147088840732236c1fad341d842 Parents: 0446364 Author: pascalschumacher <pascalschumac...@gmx.net> Authored: Thu Apr 20 19:15:31 2017 +0200 Committer: pascalschumacher <pascalschumac...@gmx.net> Committed: Thu Apr 20 19:15:31 2017 +0200 ---------------------------------------------------------------------- .../lang3/builder/ReflectionToStringBuilder.java | 14 ++++++++------ ...eflectionToStringBuilderExcludeNullValuesTest.java | 11 +++++++---- 2 files changed, 15 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-lang/blob/859224ff/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 e315ed2..5e512d3 100644 --- a/src/main/java/org/apache/commons/lang3/builder/ReflectionToStringBuilder.java +++ b/src/main/java/org/apache/commons/lang3/builder/ReflectionToStringBuilder.java @@ -342,7 +342,7 @@ public class ReflectionToStringBuilder extends ToStringBuilder { * whether to include transient fields * @param outputStatics * whether to include static fields - * @param excludeNulls + * @param excludeNullValues * whether to exclude fields whose values are null * @param reflectUpToClass * the superclass to reflect up to (inclusive), may be <code>null</code> @@ -351,12 +351,12 @@ public class ReflectionToStringBuilder extends ToStringBuilder { * if the Object is <code>null</code> * * @see ToStringExclude - * @since 2.1 + * @since 3.6 */ public static <T> String toString( final T object, final ToStringStyle style, final boolean outputTransients, - final boolean outputStatics, boolean excludeNulls, final Class<? super T> reflectUpToClass) { - return new ReflectionToStringBuilder(object, style, null, reflectUpToClass, outputTransients, outputStatics, excludeNulls) + final boolean outputStatics, boolean excludeNullValues, final Class<? super T> reflectUpToClass) { + return new ReflectionToStringBuilder(object, style, null, reflectUpToClass, outputTransients, outputStatics, excludeNullValues) .toString(); } @@ -565,7 +565,7 @@ public class ReflectionToStringBuilder extends ToStringBuilder { * whether to include static fields * @param excludeNullValues * whether to exclude fields who value is null - * @since 2.1 + * @since 3.6 */ public <T> ReflectionToStringBuilder( final T object, final ToStringStyle style, final StringBuffer buffer, @@ -641,7 +641,7 @@ public class ReflectionToStringBuilder extends ToStringBuilder { // Warning: Field.get(Object) creates wrappers objects // for primitive types. final Object fieldValue = this.getValue(field); - if(!excludeNullValues || fieldValue != null){ + if (!excludeNullValues || fieldValue != null) { this.append(fieldName, fieldValue); } } catch (final IllegalAccessException ex) { @@ -722,6 +722,7 @@ public class ReflectionToStringBuilder extends ToStringBuilder { * </p> * * @return Whether or not to append fields whose values are null. + * @since 3.6 */ public boolean isExcludeNullValues() { return this.excludeNullValues; @@ -773,6 +774,7 @@ public class ReflectionToStringBuilder extends ToStringBuilder { * * @param excludeNullValues * Whether or not to append fields whose values are null. + * @since 3.6 */ public void setExcludeNullValues(final boolean excludeNullValues) { this.excludeNullValues = excludeNullValues; http://git-wip-us.apache.org/repos/asf/commons-lang/blob/859224ff/src/test/java/org/apache/commons/lang3/builder/ReflectionToStringBuilderExcludeNullValuesTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/lang3/builder/ReflectionToStringBuilderExcludeNullValuesTest.java b/src/test/java/org/apache/commons/lang3/builder/ReflectionToStringBuilderExcludeNullValuesTest.java index 0a91609..dd94c51 100644 --- a/src/test/java/org/apache/commons/lang3/builder/ReflectionToStringBuilderExcludeNullValuesTest.java +++ b/src/test/java/org/apache/commons/lang3/builder/ReflectionToStringBuilderExcludeNullValuesTest.java @@ -17,17 +17,20 @@ package org.apache.commons.lang3.builder; -import static org.junit.Assert.*; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import org.junit.Test; public class ReflectionToStringBuilderExcludeNullValuesTest { - class TestFixture{ + static class TestFixture { + @SuppressWarnings("unused") private Integer testIntegerField; + @SuppressWarnings("unused") private String testStringField; - - public TestFixture(Integer a, String b){ + + public TestFixture(Integer a, String b) { this.testIntegerField = a; this.testStringField = b; }
