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 2019/09/06 14:32:47 UTC
[commons-lang] branch master updated: [LANG-1486] Generify builder
classes Diffable, DiffBuilder, and DiffResult
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-lang.git
The following commit(s) were added to refs/heads/master by this push:
new 0abfa79 [LANG-1486] Generify builder classes Diffable, DiffBuilder, and DiffResult
0abfa79 is described below
commit 0abfa791934a846a563ee6d4e89eb5e3f92f63de
Author: Gary Gregory <ga...@users.noreply.github.com>
AuthorDate: Fri Sep 6 10:32:41 2019 -0400
[LANG-1486] Generify builder classes Diffable, DiffBuilder, and DiffResult
[LANG-1486] Generify builder classes Diffable, DiffBuilder, and DiffResult #452.
---
src/changes/changes.xml | 1 +
.../apache/commons/lang3/builder/DiffBuilder.java | 57 ++++++++---------
.../apache/commons/lang3/builder/DiffResult.java | 13 ++--
.../org/apache/commons/lang3/builder/Diffable.java | 2 +-
.../lang3/builder/ReflectionDiffBuilder.java | 14 ++---
.../commons/lang3/builder/DiffBuilderTest.java | 72 +++++++++++-----------
6 files changed, 81 insertions(+), 78 deletions(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 053d23b..6768cbe 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -63,6 +63,7 @@ The <action> type attribute can be add,update,fix,remove.
<action issue="LANG-1477" type="add" dev="jochen">Added Functions.as*, and tests thereof, as suggested by Peter Verhas</action>
<action issue="LANG-1475" type="fix" dev="kinow" due-to="stzx">StringUtils.unwrap incorrect throw StringIndexOutOfBoundsException.</action>
<action issue="LANG-1485" type="add" dev="ggregory" due-to="nicolasbd">Add getters for lhs and rhs objects in DiffResult #451.</action>
+ <action issue="LANG-1486" type="add" dev="ggregory" due-to="Gary Gregory">Generify builder classes Diffable, DiffBuilder, and DiffResult #452.</action>
</release>
<release version="3.9" date="2019-04-09" description="New features and bug fixes. Requires Java 8, supports Java 9, 10, 11">
diff --git a/src/main/java/org/apache/commons/lang3/builder/DiffBuilder.java b/src/main/java/org/apache/commons/lang3/builder/DiffBuilder.java
index 20fc150..6beeaf7 100644
--- a/src/main/java/org/apache/commons/lang3/builder/DiffBuilder.java
+++ b/src/main/java/org/apache/commons/lang3/builder/DiffBuilder.java
@@ -58,18 +58,19 @@ import org.apache.commons.lang3.Validate;
* calling {@link DiffResult#toString(ToStringStyle)}.
* </p>
*
- * @since 3.3
+ * @param <T> type of the left and right object.
* @see Diffable
* @see Diff
* @see DiffResult
* @see ToStringStyle
+ * @since 3.3
*/
-public class DiffBuilder implements Builder<DiffResult> {
+public class DiffBuilder<T> implements Builder<DiffResult<T>> {
private final List<Diff<?>> diffs;
private final boolean objectsTriviallyEqual;
- private final Object left;
- private final Object right;
+ private final T left;
+ private final T right;
private final ToStringStyle style;
/**
@@ -100,7 +101,7 @@ public class DiffBuilder implements Builder<DiffResult> {
* if {@code lhs} or {@code rhs} is {@code null}
* @since 3.4
*/
- public DiffBuilder(final Object lhs, final Object rhs,
+ public DiffBuilder(final T lhs, final T rhs,
final ToStringStyle style, final boolean testTriviallyEqual) {
Validate.isTrue(lhs != null, "lhs cannot be null");
@@ -141,7 +142,7 @@ public class DiffBuilder implements Builder<DiffResult> {
* @throws IllegalArgumentException
* if {@code lhs} or {@code rhs} is {@code null}
*/
- public DiffBuilder(final Object lhs, final Object rhs,
+ public DiffBuilder(final T lhs, final T rhs,
final ToStringStyle style) {
this(lhs, rhs, style, true);
@@ -162,7 +163,7 @@ public class DiffBuilder implements Builder<DiffResult> {
* @throws IllegalArgumentException
* if field name is {@code null}
*/
- public DiffBuilder append(final String fieldName, final boolean lhs,
+ public DiffBuilder<T> append(final String fieldName, final boolean lhs,
final boolean rhs) {
validateFieldNameNotNull(fieldName);
@@ -202,7 +203,7 @@ public class DiffBuilder implements Builder<DiffResult> {
* @throws IllegalArgumentException
* if field name is {@code null}
*/
- public DiffBuilder append(final String fieldName, final boolean[] lhs,
+ public DiffBuilder<T> append(final String fieldName, final boolean[] lhs,
final boolean[] rhs) {
validateFieldNameNotNull(fieldName);
if (objectsTriviallyEqual) {
@@ -241,7 +242,7 @@ public class DiffBuilder implements Builder<DiffResult> {
* @throws IllegalArgumentException
* if field name is {@code null}
*/
- public DiffBuilder append(final String fieldName, final byte lhs,
+ public DiffBuilder<T> append(final String fieldName, final byte lhs,
final byte rhs) {
validateFieldNameNotNull(fieldName);
if (objectsTriviallyEqual) {
@@ -280,7 +281,7 @@ public class DiffBuilder implements Builder<DiffResult> {
* @throws IllegalArgumentException
* if field name is {@code null}
*/
- public DiffBuilder append(final String fieldName, final byte[] lhs,
+ public DiffBuilder<T> append(final String fieldName, final byte[] lhs,
final byte[] rhs) {
validateFieldNameNotNull(fieldName);
@@ -320,7 +321,7 @@ public class DiffBuilder implements Builder<DiffResult> {
* @throws IllegalArgumentException
* if field name is {@code null}
*/
- public DiffBuilder append(final String fieldName, final char lhs,
+ public DiffBuilder<T> append(final String fieldName, final char lhs,
final char rhs) {
validateFieldNameNotNull(fieldName);
@@ -360,7 +361,7 @@ public class DiffBuilder implements Builder<DiffResult> {
* @throws IllegalArgumentException
* if field name is {@code null}
*/
- public DiffBuilder append(final String fieldName, final char[] lhs,
+ public DiffBuilder<T> append(final String fieldName, final char[] lhs,
final char[] rhs) {
validateFieldNameNotNull(fieldName);
@@ -400,7 +401,7 @@ public class DiffBuilder implements Builder<DiffResult> {
* @throws IllegalArgumentException
* if field name is {@code null}
*/
- public DiffBuilder append(final String fieldName, final double lhs,
+ public DiffBuilder<T> append(final String fieldName, final double lhs,
final double rhs) {
validateFieldNameNotNull(fieldName);
@@ -440,7 +441,7 @@ public class DiffBuilder implements Builder<DiffResult> {
* @throws IllegalArgumentException
* if field name is {@code null}
*/
- public DiffBuilder append(final String fieldName, final double[] lhs,
+ public DiffBuilder<T> append(final String fieldName, final double[] lhs,
final double[] rhs) {
validateFieldNameNotNull(fieldName);
@@ -480,7 +481,7 @@ public class DiffBuilder implements Builder<DiffResult> {
* @throws IllegalArgumentException
* if field name is {@code null}
*/
- public DiffBuilder append(final String fieldName, final float lhs,
+ public DiffBuilder<T> append(final String fieldName, final float lhs,
final float rhs) {
validateFieldNameNotNull(fieldName);
@@ -520,7 +521,7 @@ public class DiffBuilder implements Builder<DiffResult> {
* @throws IllegalArgumentException
* if field name is {@code null}
*/
- public DiffBuilder append(final String fieldName, final float[] lhs,
+ public DiffBuilder<T> append(final String fieldName, final float[] lhs,
final float[] rhs) {
validateFieldNameNotNull(fieldName);
@@ -560,7 +561,7 @@ public class DiffBuilder implements Builder<DiffResult> {
* @throws IllegalArgumentException
* if field name is {@code null}
*/
- public DiffBuilder append(final String fieldName, final int lhs,
+ public DiffBuilder<T> append(final String fieldName, final int lhs,
final int rhs) {
validateFieldNameNotNull(fieldName);
@@ -600,7 +601,7 @@ public class DiffBuilder implements Builder<DiffResult> {
* @throws IllegalArgumentException
* if field name is {@code null}
*/
- public DiffBuilder append(final String fieldName, final int[] lhs,
+ public DiffBuilder<T> append(final String fieldName, final int[] lhs,
final int[] rhs) {
validateFieldNameNotNull(fieldName);
@@ -640,7 +641,7 @@ public class DiffBuilder implements Builder<DiffResult> {
* @throws IllegalArgumentException
* if field name is {@code null}
*/
- public DiffBuilder append(final String fieldName, final long lhs,
+ public DiffBuilder<T> append(final String fieldName, final long lhs,
final long rhs) {
validateFieldNameNotNull(fieldName);
@@ -680,7 +681,7 @@ public class DiffBuilder implements Builder<DiffResult> {
* @throws IllegalArgumentException
* if field name is {@code null}
*/
- public DiffBuilder append(final String fieldName, final long[] lhs,
+ public DiffBuilder<T> append(final String fieldName, final long[] lhs,
final long[] rhs) {
validateFieldNameNotNull(fieldName);
@@ -720,7 +721,7 @@ public class DiffBuilder implements Builder<DiffResult> {
* @throws IllegalArgumentException
* if field name is {@code null}
*/
- public DiffBuilder append(final String fieldName, final short lhs,
+ public DiffBuilder<T> append(final String fieldName, final short lhs,
final short rhs) {
validateFieldNameNotNull(fieldName);
@@ -760,7 +761,7 @@ public class DiffBuilder implements Builder<DiffResult> {
* @throws IllegalArgumentException
* if field name is {@code null}
*/
- public DiffBuilder append(final String fieldName, final short[] lhs,
+ public DiffBuilder<T> append(final String fieldName, final short[] lhs,
final short[] rhs) {
validateFieldNameNotNull(fieldName);
@@ -800,7 +801,7 @@ public class DiffBuilder implements Builder<DiffResult> {
* @throws IllegalArgumentException
* if field name is {@code null}
*/
- public DiffBuilder append(final String fieldName, final Object lhs,
+ public DiffBuilder<T> append(final String fieldName, final Object lhs,
final Object rhs) {
validateFieldNameNotNull(fieldName);
if (objectsTriviallyEqual) {
@@ -884,7 +885,7 @@ public class DiffBuilder implements Builder<DiffResult> {
* @throws IllegalArgumentException
* if field name is {@code null}
*/
- public DiffBuilder append(final String fieldName, final Object[] lhs,
+ public DiffBuilder<T> append(final String fieldName, final Object[] lhs,
final Object[] rhs) {
validateFieldNameNotNull(fieldName);
if (objectsTriviallyEqual) {
@@ -946,8 +947,8 @@ public class DiffBuilder implements Builder<DiffResult> {
* if field name is {@code null}
* @since 3.5
*/
- public DiffBuilder append(final String fieldName,
- final DiffResult diffResult) {
+ public DiffBuilder<T> append(final String fieldName,
+ final DiffResult<T> diffResult) {
validateFieldNameNotNull(fieldName);
Validate.isTrue(diffResult != null, "Diff result cannot be null");
if (objectsTriviallyEqual) {
@@ -972,8 +973,8 @@ public class DiffBuilder implements Builder<DiffResult> {
* objects.
*/
@Override
- public DiffResult build() {
- return new DiffResult(left, right, diffs, style);
+ public DiffResult<T> build() {
+ return new DiffResult<>(left, right, diffs, style);
}
private void validateFieldNameNotNull(final String fieldName) {
diff --git a/src/main/java/org/apache/commons/lang3/builder/DiffResult.java b/src/main/java/org/apache/commons/lang3/builder/DiffResult.java
index bb1ceec..8132dd4 100644
--- a/src/main/java/org/apache/commons/lang3/builder/DiffResult.java
+++ b/src/main/java/org/apache/commons/lang3/builder/DiffResult.java
@@ -32,10 +32,11 @@ import org.apache.commons.lang3.Validate;
* <p>
* Use a {@link DiffBuilder} to build a {@code DiffResult} comparing two objects.
* </p>
+ * @param <T> type of the left and right object.
*
* @since 3.3
*/
-public class DiffResult implements Iterable<Diff<?>> {
+public class DiffResult<T> implements Iterable<Diff<?>> {
/**
* <p>
@@ -48,8 +49,8 @@ public class DiffResult implements Iterable<Diff<?>> {
private static final String DIFFERS_STRING = "differs from";
private final List<Diff<?>> diffs;
- private final Object lhs;
- private final Object rhs;
+ private final T lhs;
+ private final T rhs;
private final ToStringStyle style;
/**
@@ -71,7 +72,7 @@ public class DiffResult implements Iterable<Diff<?>> {
* @throws IllegalArgumentException
* if {@code lhs}, {@code rhs} or {@code diffs} is {@code null}
*/
- DiffResult(final Object lhs, final Object rhs, final List<Diff<?>> diffs,
+ DiffResult(final T lhs, final T rhs, final List<Diff<?>> diffs,
final ToStringStyle style) {
Validate.isTrue(lhs != null, "Left hand object cannot be null");
Validate.isTrue(rhs != null, "Right hand object cannot be null");
@@ -94,7 +95,7 @@ public class DiffResult implements Iterable<Diff<?>> {
* @return the left object of the diff
* @since 3.10
*/
- public Object getLeft() {
+ public T getLeft() {
return this.lhs;
}
@@ -104,7 +105,7 @@ public class DiffResult implements Iterable<Diff<?>> {
* @return the right object of the diff
* @since 3.10
*/
- public Object getRight() {
+ public T getRight() {
return this.rhs;
}
diff --git a/src/main/java/org/apache/commons/lang3/builder/Diffable.java b/src/main/java/org/apache/commons/lang3/builder/Diffable.java
index 4d435ab..1cb7982 100644
--- a/src/main/java/org/apache/commons/lang3/builder/Diffable.java
+++ b/src/main/java/org/apache/commons/lang3/builder/Diffable.java
@@ -49,5 +49,5 @@ public interface Diffable<T> {
* @return a list of differences
* @throws NullPointerException if the specified object is {@code null}
*/
- DiffResult diff(T obj);
+ DiffResult<T> diff(T obj);
}
diff --git a/src/main/java/org/apache/commons/lang3/builder/ReflectionDiffBuilder.java b/src/main/java/org/apache/commons/lang3/builder/ReflectionDiffBuilder.java
index baca520..5b60bd8 100644
--- a/src/main/java/org/apache/commons/lang3/builder/ReflectionDiffBuilder.java
+++ b/src/main/java/org/apache/commons/lang3/builder/ReflectionDiffBuilder.java
@@ -59,17 +59,19 @@ import org.apache.commons.lang3.reflect.FieldUtils;
* {@code DiffResult.toString()} method. This style choice can be overridden by
* calling {@link DiffResult#toString(ToStringStyle)}.
* </p>
+ * @param <T>
+ * type of the left and right object to diff.
* @see Diffable
* @see Diff
* @see DiffResult
* @see ToStringStyle
* @since 3.6
*/
-public class ReflectionDiffBuilder implements Builder<DiffResult> {
+public class ReflectionDiffBuilder<T> implements Builder<DiffResult<T>> {
private final Object left;
private final Object right;
- private final DiffBuilder diffBuilder;
+ private final DiffBuilder<T> diffBuilder;
/**
* <p>
@@ -81,8 +83,6 @@ public class ReflectionDiffBuilder implements Builder<DiffResult> {
* not evaluate any calls to {@code append(...)} and will return an empty
* {@link DiffResult} when {@link #build()} is executed.
* </p>
- * @param <T>
- * type of the objects to diff
* @param lhs
* {@code this} object
* @param rhs
@@ -93,14 +93,14 @@ public class ReflectionDiffBuilder implements Builder<DiffResult> {
* @throws IllegalArgumentException
* if {@code lhs} or {@code rhs} is {@code null}
*/
- public <T> ReflectionDiffBuilder(final T lhs, final T rhs, final ToStringStyle style) {
+ public ReflectionDiffBuilder(final T lhs, final T rhs, final ToStringStyle style) {
this.left = lhs;
this.right = rhs;
- diffBuilder = new DiffBuilder(lhs, rhs, style);
+ diffBuilder = new DiffBuilder<>(lhs, rhs, style);
}
@Override
- public DiffResult build() {
+ public DiffResult<T> build() {
if (left.equals(right)) {
return diffBuilder.build();
}
diff --git a/src/test/java/org/apache/commons/lang3/builder/DiffBuilderTest.java b/src/test/java/org/apache/commons/lang3/builder/DiffBuilderTest.java
index 6fd7782..aebd3ee 100644
--- a/src/test/java/org/apache/commons/lang3/builder/DiffBuilderTest.java
+++ b/src/test/java/org/apache/commons/lang3/builder/DiffBuilderTest.java
@@ -59,8 +59,8 @@ public class DiffBuilderTest {
private Object[] objectArrayField = {null};
@Override
- public DiffResult diff(final TypeTestClass obj) {
- return new DiffBuilder(this, obj, style)
+ public DiffResult<TypeTestClass> diff(final TypeTestClass obj) {
+ return new DiffBuilder<>(this, obj, style)
.append("boolean", booleanField, obj.booleanField)
.append("booleanArray", booleanArrayField, obj.booleanArrayField)
.append("byte", byteField, obj.byteField)
@@ -99,7 +99,7 @@ public class DiffBuilderTest {
final TypeTestClass class1 = new TypeTestClass();
final TypeTestClass class2 = new TypeTestClass();
class2.booleanField = false;
- final DiffResult list = class1.diff(class2);
+ final DiffResult<TypeTestClass> list = class1.diff(class2);
assertEquals(1, list.getNumberOfDiffs());
final Diff<?> diff = list.getDiffs().get(0);
assertEquals(Boolean.class, diff.getType());
@@ -112,7 +112,7 @@ public class DiffBuilderTest {
final TypeTestClass class1 = new TypeTestClass();
final TypeTestClass class2 = new TypeTestClass();
class2.booleanArrayField = new boolean[] {false, false};
- final DiffResult list = class1.diff(class2);
+ final DiffResult<TypeTestClass> list = class1.diff(class2);
assertEquals(1, list.getNumberOfDiffs());
final Diff<?> diff = list.getDiffs().get(0);
assertArrayEquals(ArrayUtils.toObject(class1.booleanArrayField),
@@ -127,7 +127,7 @@ public class DiffBuilderTest {
final TypeTestClass class1 = new TypeTestClass();
final TypeTestClass class2 = new TypeTestClass();
class2.byteField = 0x01;
- final DiffResult list = class1.diff(class2);
+ final DiffResult<TypeTestClass> list = class1.diff(class2);
assertEquals(1, list.getNumberOfDiffs());
final Diff<?> diff = list.getDiffs().get(0);
assertEquals(Byte.valueOf(class1.byteField), diff.getLeft());
@@ -139,7 +139,7 @@ public class DiffBuilderTest {
final TypeTestClass class1 = new TypeTestClass();
final TypeTestClass class2 = new TypeTestClass();
class2.byteArrayField= new byte[] {0x01, 0x02};
- final DiffResult list = class1.diff(class2);
+ final DiffResult<TypeTestClass> list = class1.diff(class2);
assertEquals(1, list.getNumberOfDiffs());
final Diff<?> diff = list.getDiffs().get(0);
assertArrayEquals(ArrayUtils.toObject(class1.byteArrayField),
@@ -153,7 +153,7 @@ public class DiffBuilderTest {
final TypeTestClass class1 = new TypeTestClass();
final TypeTestClass class2 = new TypeTestClass();
class2.charField = 'z';
- final DiffResult list = class1.diff(class2);
+ final DiffResult<TypeTestClass> list = class1.diff(class2);
assertEquals(1, list.getNumberOfDiffs());
final Diff<?> diff = list.getDiffs().get(0);
assertEquals(Character.valueOf(class1.charField), diff.getLeft());
@@ -166,7 +166,7 @@ public class DiffBuilderTest {
final TypeTestClass class1 = new TypeTestClass();
final TypeTestClass class2 = new TypeTestClass();
class2.charArrayField = new char[] {'f', 'o', 'o'};
- final DiffResult list = class1.diff(class2);
+ final DiffResult<TypeTestClass> list = class1.diff(class2);
assertEquals(1, list.getNumberOfDiffs());
final Diff<?> diff = list.getDiffs().get(0);
assertArrayEquals(ArrayUtils.toObject(class1.charArrayField),
@@ -181,7 +181,7 @@ public class DiffBuilderTest {
final TypeTestClass class1 = new TypeTestClass();
final TypeTestClass class2 = new TypeTestClass();
class2.doubleField = 99.99;
- final DiffResult list = class1.diff(class2);
+ final DiffResult<TypeTestClass> list = class1.diff(class2);
assertEquals(1, list.getNumberOfDiffs());
final Diff<?> diff = list.getDiffs().get(0);
assertEquals(Double.valueOf(class1.doubleField), diff.getLeft());
@@ -194,7 +194,7 @@ public class DiffBuilderTest {
final TypeTestClass class1 = new TypeTestClass();
final TypeTestClass class2 = new TypeTestClass();
class2.doubleArrayField = new double[] {3.0, 2.9, 2.8};
- final DiffResult list = class1.diff(class2);
+ final DiffResult<TypeTestClass> list = class1.diff(class2);
assertEquals(1, list.getNumberOfDiffs());
final Diff<?> diff = list.getDiffs().get(0);
assertArrayEquals(ArrayUtils.toObject(class1.doubleArrayField),
@@ -208,7 +208,7 @@ public class DiffBuilderTest {
final TypeTestClass class1 = new TypeTestClass();
final TypeTestClass class2 = new TypeTestClass();
class2.floatField = 99.99F;
- final DiffResult list = class1.diff(class2);
+ final DiffResult<TypeTestClass> list = class1.diff(class2);
assertEquals(1, list.getNumberOfDiffs());
final Diff<?> diff = list.getDiffs().get(0);
assertEquals(Float.valueOf(class1.floatField), diff.getLeft());
@@ -221,7 +221,7 @@ public class DiffBuilderTest {
final TypeTestClass class1 = new TypeTestClass();
final TypeTestClass class2 = new TypeTestClass();
class2.floatArrayField = new float[] {3.0F, 2.9F, 2.8F};
- final DiffResult list = class1.diff(class2);
+ final DiffResult<TypeTestClass> list = class1.diff(class2);
assertEquals(1, list.getNumberOfDiffs());
final Diff<?> diff = list.getDiffs().get(0);
assertArrayEquals(ArrayUtils.toObject(class1.floatArrayField),
@@ -236,7 +236,7 @@ public class DiffBuilderTest {
final TypeTestClass class1 = new TypeTestClass();
final TypeTestClass class2 = new TypeTestClass();
class2.intField = 42;
- final DiffResult list = class1.diff(class2);
+ final DiffResult<TypeTestClass> list = class1.diff(class2);
assertEquals(1, list.getNumberOfDiffs());
final Diff<?> diff = list.getDiffs().get(0);
assertEquals(Integer.valueOf(class1.intField), diff.getLeft());
@@ -249,7 +249,7 @@ public class DiffBuilderTest {
final TypeTestClass class1 = new TypeTestClass();
final TypeTestClass class2 = new TypeTestClass();
class2.intArrayField = new int[] {3, 2, 1};
- final DiffResult list = class1.diff(class2);
+ final DiffResult<TypeTestClass> list = class1.diff(class2);
assertEquals(1, list.getNumberOfDiffs());
final Diff<?> diff = list.getDiffs().get(0);
assertArrayEquals(ArrayUtils.toObject(class1.intArrayField),
@@ -263,7 +263,7 @@ public class DiffBuilderTest {
final TypeTestClass class1 = new TypeTestClass();
final TypeTestClass class2 = new TypeTestClass();
class2.longField = 42L;
- final DiffResult list = class1.diff(class2);
+ final DiffResult<TypeTestClass> list = class1.diff(class2);
assertEquals(1, list.getNumberOfDiffs());
final Diff<?> diff = list.getDiffs().get(0);
assertEquals(Long.valueOf(class1.longField), diff.getLeft());
@@ -276,7 +276,7 @@ public class DiffBuilderTest {
final TypeTestClass class1 = new TypeTestClass();
final TypeTestClass class2 = new TypeTestClass();
class2.longArrayField = new long[] {3L, 2L, 1L};
- final DiffResult list = class1.diff(class2);
+ final DiffResult<TypeTestClass> list = class1.diff(class2);
assertEquals(1, list.getNumberOfDiffs());
final Diff<?> diff = list.getDiffs().get(0);
assertArrayEquals(ArrayUtils.toObject(class1.longArrayField),
@@ -290,7 +290,7 @@ public class DiffBuilderTest {
final TypeTestClass class1 = new TypeTestClass();
final TypeTestClass class2 = new TypeTestClass();
class2.shortField = 42;
- final DiffResult list = class1.diff(class2);
+ final DiffResult<TypeTestClass> list = class1.diff(class2);
assertEquals(1, list.getNumberOfDiffs());
final Diff<?> diff = list.getDiffs().get(0);
assertEquals(Short.valueOf(class1.shortField), diff.getLeft());
@@ -303,7 +303,7 @@ public class DiffBuilderTest {
final TypeTestClass class1 = new TypeTestClass();
final TypeTestClass class2 = new TypeTestClass();
class2.shortArrayField = new short[] {3, 2, 1};
- final DiffResult list = class1.diff(class2);
+ final DiffResult<TypeTestClass> list = class1.diff(class2);
assertEquals(1, list.getNumberOfDiffs());
final Diff<?> diff = list.getDiffs().get(0);
assertArrayEquals(ArrayUtils.toObject(class1.shortArrayField),
@@ -317,7 +317,7 @@ public class DiffBuilderTest {
final TypeTestClass class1 = new TypeTestClass();
final TypeTestClass class2 = new TypeTestClass();
class2.objectField = "Some string";
- final DiffResult list = class1.diff(class2);
+ final DiffResult<TypeTestClass> list = class1.diff(class2);
assertEquals(1, list.getNumberOfDiffs());
final Diff<?> diff = list.getDiffs().get(0);
assertEquals(class1.objectField, diff.getLeft());
@@ -337,7 +337,7 @@ public class DiffBuilderTest {
assertSame(left.objectField, right.objectField);
assertEquals(left.objectField, right.objectField);
- final DiffResult list = left.diff(right);
+ final DiffResult<TypeTestClass> list = left.diff(right);
assertEquals(0, list.getNumberOfDiffs());
}
@@ -353,7 +353,7 @@ public class DiffBuilderTest {
assertNotSame(left.objectField, right.objectField);
assertEquals(left.objectField, right.objectField);
- final DiffResult list = left.diff(right);
+ final DiffResult<TypeTestClass> list = left.diff(right);
assertEquals(0, list.getNumberOfDiffs());
}
@@ -369,7 +369,7 @@ public class DiffBuilderTest {
assertNotSame(left.objectField, right.objectField);
assertNotEquals(left.objectField, right.objectField);
- final DiffResult list = left.diff(right);
+ final DiffResult<TypeTestClass> list = left.diff(right);
assertEquals(1, list.getNumberOfDiffs());
}
@@ -378,7 +378,7 @@ public class DiffBuilderTest {
final TypeTestClass class1 = new TypeTestClass();
final TypeTestClass class2 = new TypeTestClass();
class2.objectArrayField = new Object[] {"string", 1, 2};
- final DiffResult list = class1.diff(class2);
+ final DiffResult<TypeTestClass> list = class1.diff(class2);
assertEquals(1, list.getNumberOfDiffs());
final Diff<?> diff = list.getDiffs().get(0);
assertArrayEquals(class1.objectArrayField, (Object[]) diff.getLeft());
@@ -391,14 +391,14 @@ public class DiffBuilderTest {
final TypeTestClass class2 = new TypeTestClass();
class1.objectArrayField = new Object[] {"string", 1, 2};
class2.objectArrayField = new Object[] {"string", 1, 2};
- final DiffResult list = class1.diff(class2);
+ final DiffResult<TypeTestClass> list = class1.diff(class2);
assertEquals(0, list.getNumberOfDiffs());
}
@Test
public void testByteArrayEqualAsObject() {
- final DiffResult list = new DiffBuilder("String1", "String2", SHORT_STYLE)
+ final DiffResult<String> list = new DiffBuilder<>("String1", "String2", SHORT_STYLE)
.append("foo", new boolean[] {false}, new boolean[] {false})
.append("foo", new byte[] {0x01}, new byte[] {0x01})
.append("foo", new char[] {'a'}, new char[] {'a'})
@@ -419,7 +419,7 @@ public class DiffBuilderTest {
final TypeTestClass class2 = new TypeTestClass();
class2.intField = 2;
- final DiffResult list = new DiffBuilder(class1, class2, SHORT_STYLE)
+ final DiffResult<TypeTestClass> list = new DiffBuilder<>(class1, class2, SHORT_STYLE)
.append("prop1", class1.diff(class2))
.build();
assertEquals(1, list.getNumberOfDiffs());
@@ -428,19 +428,19 @@ public class DiffBuilderTest {
@Test
public void testNullLhs() {
- assertThrows(IllegalArgumentException.class, () -> new DiffBuilder(null, this, ToStringStyle.DEFAULT_STYLE));
+ assertThrows(IllegalArgumentException.class, () -> new DiffBuilder<>(null, this, ToStringStyle.DEFAULT_STYLE));
}
@Test
public void testNullRhs() {
- assertThrows(IllegalArgumentException.class, () -> new DiffBuilder(this, null, ToStringStyle.DEFAULT_STYLE));
+ assertThrows(IllegalArgumentException.class, () -> new DiffBuilder<>(this, null, ToStringStyle.DEFAULT_STYLE));
}
@Test
public void testSameObjectIgnoresAppends() {
final TypeTestClass testClass = new TypeTestClass();
- final DiffResult list = new DiffBuilder(testClass, testClass, SHORT_STYLE)
+ final DiffResult<TypeTestClass> list = new DiffBuilder<>(testClass, testClass, SHORT_STYLE)
.append("ignored", false, true)
.build();
assertEquals(0, list.getNumberOfDiffs());
@@ -450,7 +450,7 @@ public class DiffBuilderTest {
public void testSimilarObjectIgnoresAppends() {
final TypeTestClass testClass1 = new TypeTestClass();
final TypeTestClass testClass2 = new TypeTestClass();
- final DiffResult list = new DiffBuilder(testClass1, testClass2, SHORT_STYLE)
+ final DiffResult<TypeTestClass> list = new DiffBuilder<>(testClass1, testClass2, SHORT_STYLE)
.append("ignored", false, true)
.build();
assertEquals(0, list.getNumberOfDiffs());
@@ -460,7 +460,7 @@ public class DiffBuilderTest {
@Test
public void testStylePassedToDiffResult() {
final TypeTestClass class1 = new TypeTestClass();
- DiffResult list = class1.diff(class1);
+ DiffResult<TypeTestClass> list = class1.diff(class1);
assertEquals(SHORT_STYLE, list.getToStringStyle());
class1.style = ToStringStyle.MULTI_LINE_STYLE;
@@ -473,12 +473,12 @@ public class DiffBuilderTest {
final Matcher<Integer> equalToOne = equalTo(1);
// Constructor's arguments are not trivially equal, but not testing for that.
- final DiffBuilder explicitTestAndNotEqual1 = new DiffBuilder(1, 2, null, false);
+ final DiffBuilder<Integer> explicitTestAndNotEqual1 = new DiffBuilder<>(1, 2, null, false);
explicitTestAndNotEqual1.append("letter", "X", "Y");
assertThat(explicitTestAndNotEqual1.build().getNumberOfDiffs(), equalToOne);
// Constructor's arguments are trivially equal, but not testing for that.
- final DiffBuilder explicitTestAndNotEqual2 = new DiffBuilder(1, 1, null, false);
+ final DiffBuilder<Integer> explicitTestAndNotEqual2 = new DiffBuilder<>(1, 1, null, false);
// This append(f, l, r) will not abort early.
explicitTestAndNotEqual2.append("letter", "X", "Y");
assertThat(explicitTestAndNotEqual2.build().getNumberOfDiffs(), equalToOne);
@@ -490,19 +490,19 @@ public class DiffBuilderTest {
final Matcher<Integer> equalToOne = equalTo(1);
// The option to test if trivially equal is enabled by default.
- final DiffBuilder implicitTestAndEqual = new DiffBuilder(1, 1, null);
+ final DiffBuilder<Integer> implicitTestAndEqual = new DiffBuilder<>(1, 1, null);
// This append(f, l, r) will abort without creating a Diff for letter.
implicitTestAndEqual.append("letter", "X", "Y");
assertThat(implicitTestAndEqual.build().getNumberOfDiffs(), equalToZero);
- final DiffBuilder implicitTestAndNotEqual = new DiffBuilder(1, 2, null);
+ final DiffBuilder<Integer> implicitTestAndNotEqual = new DiffBuilder<>(1, 2, null);
// This append(f, l, r) will not abort early
// because the constructor's arguments were not trivially equal.
implicitTestAndNotEqual.append("letter", "X", "Y");
assertThat(implicitTestAndNotEqual.build().getNumberOfDiffs(), equalToOne);
// This is explicitly enabling the trivially equal test.
- final DiffBuilder explicitTestAndEqual = new DiffBuilder(1, 1, null, true);
+ final DiffBuilder<Integer> explicitTestAndEqual = new DiffBuilder<>(1, 1, null, true);
explicitTestAndEqual.append("letter", "X", "Y");
assertThat(explicitTestAndEqual.build().getNumberOfDiffs(), equalToZero);
}