Skip to content
This repository was archived by the owner on Oct 4, 2018. It is now read-only.

Commit 85a398f

Browse files
SQiShERSQiShER
committed
Renamed CollectionElement to CollectionItemElement and MapElement to MapKeyElement
1 parent ecffea2 commit 85a398f

34 files changed

+447
-324
lines changed

‎src/integration-test/java/de/danielbechler/diff/ObjectDifferITCase.java‎

Lines changed: 54 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,43 @@
1616

1717
package de.danielbechler.diff;
1818

19-
import de.danielbechler.diff.collection.*;
20-
import de.danielbechler.diff.helper.*;
21-
import de.danielbechler.diff.map.*;
22-
import de.danielbechler.diff.mock.*;
23-
import de.danielbechler.diff.visitor.*;
24-
import org.fest.assertions.api.*;
25-
import org.testng.annotations.*;
19+
import de.danielbechler.diff.collection.CollectionItemElement;
20+
import de.danielbechler.diff.helper.NodeAssertions;
21+
import de.danielbechler.diff.helper.TestGroups;
22+
import de.danielbechler.diff.map.MapKeyElement;
23+
import de.danielbechler.diff.mock.ObjectWithAccessTrackingIgnoredProperty;
24+
import de.danielbechler.diff.mock.ObjectWithCollection;
25+
import de.danielbechler.diff.mock.ObjectWithHashCodeAndEquals;
26+
import de.danielbechler.diff.mock.ObjectWithIdentityAndValue;
27+
import de.danielbechler.diff.mock.ObjectWithIgnoredMap;
28+
import de.danielbechler.diff.mock.ObjectWithMethodEqualsOnlyValueProviderMethodOnGetCollection;
29+
import de.danielbechler.diff.mock.ObjectWithMethodEqualsOnlyValueProviderMethodOnGetMap;
30+
import de.danielbechler.diff.mock.ObjectWithMethodEqualsOnlyValueProviderMethodOnGetNestedObject;
31+
import de.danielbechler.diff.mock.ObjectWithNestedObject;
32+
import de.danielbechler.diff.visitor.NodeHierarchyVisitor;
33+
import org.fest.assertions.api.Assertions;
34+
import org.testng.annotations.BeforeMethod;
35+
import org.testng.annotations.Test;
2636

2737
import java.util.ArrayList;
28-
import java.util.*;
29-
30-
import static de.danielbechler.diff.helper.NodeAssertions.*;
31-
import static de.danielbechler.diff.helper.TestGroups.*;
32-
import static java.util.Arrays.*;
33-
34-
/** @author Daniel Bechler */
38+
import java.util.Collection;
39+
import java.util.Collections;
40+
import java.util.HashMap;
41+
import java.util.LinkedHashMap;
42+
import java.util.LinkedHashSet;
43+
import java.util.LinkedList;
44+
import java.util.List;
45+
import java.util.Map;
46+
import java.util.TreeMap;
47+
import java.util.TreeSet;
48+
49+
import static de.danielbechler.diff.helper.NodeAssertions.assertThat;
50+
import static de.danielbechler.diff.helper.TestGroups.INTEGRATION;
51+
import static java.util.Arrays.asList;
52+
53+
/**
54+
* @author Daniel Bechler
55+
*/
3556
@Test(groups = TestGroups.INTEGRATION)
3657
public class ObjectDifferITCase
3758
{
@@ -60,8 +81,8 @@ public void testCompareCollectionWithIgnoredCollectionProperty()
6081
working.getCollection().add("foo");
6182
final ObjectDifferBuilder objectDifferBuilder = ObjectDifferBuilder.startBuilding();
6283
objectDifferBuilder.configure().inclusion()
63-
.toExclude()
64-
.nodes(NodePath.buildWith("collection"));
84+
.toExclude()
85+
.nodes(NodePath.buildWith("collection"));
6586
objectDiffer = objectDifferBuilder.build();
6687

6788
final DiffNode node = objectDiffer.compare(working, new ObjectWithCollection());
@@ -78,7 +99,7 @@ public void testCompareCollectionWithAddedItem() throws Exception
7899
final DiffNode node = ObjectDifferBuilder.buildDefaultObjectDiffer().compare(working, base);
79100

80101
NodeAssertions.assertThat(node).self().hasState(DiffNode.State.CHANGED);
81-
NodeAssertions.assertThat(node).child(new CollectionElement("foo")).hasState(DiffNode.State.ADDED);
102+
NodeAssertions.assertThat(node).child(new CollectionItemElement("foo")).hasState(DiffNode.State.ADDED);
82103
}
83104

84105
public void testCompareCollectionWithRemovedItem() throws Exception
@@ -89,7 +110,7 @@ public void testCompareCollectionWithRemovedItem() throws Exception
89110
final DiffNode node = ObjectDifferBuilder.buildDefaultObjectDiffer().compare(working, base);
90111

91112
NodeAssertions.assertThat(node).self().hasState(DiffNode.State.CHANGED);
92-
NodeAssertions.assertThat(node).child(new CollectionElement("foo")).hasState(DiffNode.State.REMOVED);
113+
NodeAssertions.assertThat(node).child(new CollectionItemElement("foo")).hasState(DiffNode.State.REMOVED);
93114
}
94115

95116
@Test(groups = TestGroups.INTEGRATION)
@@ -140,7 +161,7 @@ public void testCompareCollectionWithChangedItem() throws Exception
140161
final DiffNode node = ObjectDifferBuilder.buildDefaultObjectDiffer().compare(working, base);
141162

142163
assertThat(node).self().hasChanges();
143-
assertThat(node).child(new CollectionElement(new ObjectWithIdentityAndValue("foo")))
164+
assertThat(node).child(new CollectionItemElement(new ObjectWithIdentityAndValue("foo")))
144165
.hasState(DiffNode.State.CHANGED);
145166
}
146167

@@ -154,7 +175,7 @@ public void testWithNewMapInWorkingAndNoneInBase()
154175
final DiffNode node = ObjectDifferBuilder.buildDefaultObjectDiffer().compare(working, base);
155176

156177
NodeAssertions.assertThat(node).self().hasState(DiffNode.State.ADDED);
157-
NodeAssertions.assertThat(node).child(new MapElement("foo")).hasState(DiffNode.State.ADDED);
178+
NodeAssertions.assertThat(node).child(new MapKeyElement("foo")).hasState(DiffNode.State.ADDED);
158179
}
159180

160181
@Test(groups = TestGroups.INTEGRATION)
@@ -167,7 +188,7 @@ public void testWithAdditionOfSimpleTypeToWorkingMap()
167188
final DiffNode node = ObjectDifferBuilder.buildDefaultObjectDiffer().compare(working, base);
168189

169190
NodeAssertions.assertThat(node).self().hasState(DiffNode.State.CHANGED);
170-
NodeAssertions.assertThat(node).child(new MapElement("foo")).hasState(DiffNode.State.ADDED);
191+
NodeAssertions.assertThat(node).child(new MapKeyElement("foo")).hasState(DiffNode.State.ADDED);
171192
}
172193

173194
@Test(groups = TestGroups.INTEGRATION)
@@ -194,7 +215,7 @@ public void testWithSingleEntryAddedToWorkingMap()
194215
final DiffNode node = ObjectDifferBuilder.buildDefaultObjectDiffer().compare(working, base);
195216

196217
NodeAssertions.assertThat(node).self().hasState(DiffNode.State.REMOVED);
197-
NodeAssertions.assertThat(node).child(new MapElement("foo")).hasState(DiffNode.State.REMOVED);
218+
NodeAssertions.assertThat(node).child(new MapKeyElement("foo")).hasState(DiffNode.State.REMOVED);
198219
}
199220

200221
/**
@@ -227,11 +248,11 @@ public void testWithSameEntries()
227248

228249
NodeAssertions.assertThat(node).root().hasChildren(1);
229250
NodeAssertions.assertThat(node)
230-
.child(NodePath.createBuilder().withRoot().withMapKey("foo"))
231-
.doesNotExist();
251+
.child(NodePath.createBuilder().withRoot().withMapKey("foo"))
252+
.doesNotExist();
232253
NodeAssertions.assertThat(node).child(NodePath.createBuilder().withRoot().withMapKey("ping"))
233-
.hasState(DiffNode.State.ADDED)
234-
.hasNoChildren();
254+
.hasState(DiffNode.State.ADDED)
255+
.hasNoChildren();
235256
}
236257

237258
@Test(groups = TestGroups.INTEGRATION)
@@ -245,7 +266,7 @@ public void testWithChangedEntry()
245266

246267
final DiffNode node = ObjectDifferBuilder.buildDefaultObjectDiffer().compare(working, base);
247268
NodeAssertions.assertThat(node).self().hasChildren(1);
248-
NodeAssertions.assertThat(node).child(new MapElement("foo")).hasState(DiffNode.State.CHANGED);
269+
NodeAssertions.assertThat(node).child(new MapKeyElement("foo")).hasState(DiffNode.State.CHANGED);
249270
}
250271

251272
@Test(groups = TestGroups.INTEGRATION)
@@ -310,9 +331,9 @@ public void testCompareWithListContainingObjectTwiceDetectsIfOneGetsRemoved() th
310331
node.visit(new NodeHierarchyVisitor());
311332
assertThat(node)
312333
.child(NodePath.createBuilder()
313-
.withRoot()
314-
.withCollectionItem(new ObjectWithHashCodeAndEquals("foo"))
315-
.build())
334+
.withRoot()
335+
.withCollectionItem(new ObjectWithHashCodeAndEquals("foo"))
336+
.build())
316337
.hasState(DiffNode.State.REMOVED);
317338
}
318339

@@ -324,9 +345,9 @@ public void testCompareWithListContainingObjectOnceDetectsIfAnotherInstanceOfItG
324345
final DiffNode node = ObjectDifferBuilder.buildDefaultObjectDiffer().compare(working, base);
325346
node.visit(new NodeHierarchyVisitor());
326347
assertThat(node).child(NodePath.createBuilder()
327-
.withRoot()
328-
.withCollectionItem(new ObjectWithHashCodeAndEquals("foo"))
329-
.build()).hasState(DiffNode.State.ADDED);
348+
.withRoot()
349+
.withCollectionItem(new ObjectWithHashCodeAndEquals("foo"))
350+
.build()).hasState(DiffNode.State.ADDED);
330351
}
331352

332353
public void testCompareBeanWithEqualsOnlyValueProviderMethodOnGetCollectionPropertyNoChangeInMethodResult()

‎src/integration-test/java/de/danielbechler/diff/example/MapEntryValueAccessExample.java‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,17 @@
1616

1717
package de.danielbechler.diff.example;
1818

19-
import de.danielbechler.diff.*;
20-
import de.danielbechler.diff.map.*;
21-
import de.danielbechler.diff.visitor.*;
19+
import de.danielbechler.diff.DiffNode;
20+
import de.danielbechler.diff.ObjectDifferBuilder;
21+
import de.danielbechler.diff.Visit;
22+
import de.danielbechler.diff.map.MapKeyElement;
2223

23-
import java.util.*;
24+
import java.util.Map;
25+
import java.util.TreeMap;
2426

25-
/** @author Daniel Bechler */
27+
/**
28+
* @author Daniel Bechler
29+
*/
2630
class MapEntryValueAccessExample
2731
{
2832
private MapEntryValueAccessExample()
@@ -45,7 +49,7 @@ public static void main(final String[] args)
4549
{
4650
public void accept(final DiffNode node, final Visit visit)
4751
{
48-
final Object key = ((MapElement) node.getPathElement()).getKey();
52+
final Object key = ((MapKeyElement) node.getPathElement()).getKey();
4953
// ^^^ I do not encourage this, but currently it's the only way
5054
final Object value = node.canonicalGet(working);
5155
System.out.println(key + " => " + value);

‎src/integration-test/java/de/danielbechler/diff/example/phonebook/PhoneBookITCase.java‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,20 @@
1616

1717
package de.danielbechler.diff.example.phonebook;
1818

19-
import de.danielbechler.diff.*;
20-
import de.danielbechler.diff.collection.*;
21-
import org.hamcrest.core.*;
22-
import org.testng.annotations.*;
19+
import de.danielbechler.diff.DiffNode;
20+
import de.danielbechler.diff.ObjectDiffer;
21+
import de.danielbechler.diff.ObjectDifferBuilder;
22+
import de.danielbechler.diff.collection.CollectionItemElement;
23+
import org.hamcrest.core.IsEqual;
24+
import org.hamcrest.core.IsNull;
25+
import org.testng.annotations.Test;
2326

24-
import static org.hamcrest.MatcherAssert.*;
25-
import static org.hamcrest.core.Is.*;
27+
import static org.hamcrest.MatcherAssert.assertThat;
28+
import static org.hamcrest.core.Is.is;
2629

27-
/** @author Daniel Bechler */
30+
/**
31+
* @author Daniel Bechler
32+
*/
2833
public class PhoneBookITCase
2934
{
3035
@Test
@@ -56,15 +61,15 @@ public void testContactMiddleNameChanges()
5661
assertThat(contactsNode, IsNull.notNullValue());
5762
assertThat(contactsNode.hasChanges(), is(true));
5863

59-
final DiffNode pinkmanNode = contactsNode.getChild(new CollectionElement(jessePinkman));
64+
final DiffNode pinkmanNode = contactsNode.getChild(new CollectionItemElement(jessePinkman));
6065
assertThat(pinkmanNode.hasChanges(), is(true));
6166

6267
final DiffNode middleNameNode = pinkmanNode.getChild("middleName");
6368
assertThat(middleNameNode.hasChanges(), is(true));
6469
assertThat(middleNameNode.canonicalGet(phoneBook), IsNull.nullValue());
6570
assertThat((String) middleNameNode.canonicalGet(modifiedPhoneBook), IsEqual.equalTo("Bruce"));
6671

67-
final DiffNode whiteNode = contactsNode.getChild(new CollectionElement(walterWhite));
72+
final DiffNode whiteNode = contactsNode.getChild(new CollectionItemElement(walterWhite));
6873
assertThat(whiteNode.hasChanges(), is(true));
6974

7075
final DiffNode whiteMiddleNameNode = whiteNode.getChild("middleName");

‎src/integration-test/java/de/danielbechler/diff/issues/issue66/MainApp.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,10 @@
1616

1717
package de.danielbechler.diff.issues.issue66;
1818

19-
import de.danielbechler.diff.*;
20-
import de.danielbechler.diff.visitor.*;
19+
import de.danielbechler.diff.DiffNode;
20+
import de.danielbechler.diff.ObjectDiffer;
21+
import de.danielbechler.diff.ObjectDifferBuilder;
22+
import de.danielbechler.diff.Visit;
2123

2224
public class MainApp
2325
{

‎src/main/java/de/danielbechler/diff/CircularReferenceMatchingMode.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,13 @@
2727
*/
2828
public enum CircularReferenceMatchingMode
2929
{
30-
/** Compares objects using the <code>==</code> operator. */
30+
/**
31+
* Compares objects using the <code>==</code> operator.
32+
*/
3133
EQUALITY_OPERATOR,
3234

33-
/** Compares objects using {@linkplain Object#equals(Object)}. */
35+
/**
36+
* Compares objects using {@linkplain Object#equals(Object)}.
37+
*/
3438
EQUALS_METHOD
3539
}

‎src/main/java/de/danielbechler/diff/Inclusion.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616

1717
package de.danielbechler.diff;
1818

19-
/** @author Daniel Bechler */
19+
/**
20+
* @author Daniel Bechler
21+
*/
2022
public enum Inclusion
2123
{
2224
INCLUDED,

‎src/main/java/de/danielbechler/diff/NodePath.java‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,15 @@
1616

1717
package de.danielbechler.diff;
1818

19-
import de.danielbechler.diff.bean.*;
20-
import de.danielbechler.diff.collection.*;
21-
import de.danielbechler.diff.map.*;
22-
import de.danielbechler.util.*;
19+
import de.danielbechler.diff.bean.BeanPropertyElement;
20+
import de.danielbechler.diff.collection.CollectionItemElement;
21+
import de.danielbechler.diff.map.MapKeyElement;
22+
import de.danielbechler.util.Assert;
2323

24-
import java.util.*;
24+
import java.util.ArrayList;
2525
import java.util.Collections;
26+
import java.util.Iterator;
27+
import java.util.List;
2628

2729
/**
2830
* @author Daniel Bechler
@@ -75,7 +77,7 @@ public String toString()
7577
{
7678
sb.append("/");
7779
}
78-
else if (element instanceof CollectionElement || element instanceof MapElement)
80+
else if (element instanceof CollectionItemElement || element instanceof MapKeyElement)
7981
{
8082
sb.append(element);
8183
}
@@ -209,14 +211,14 @@ public AppendableBuilder withPropertyName(final String name, final String... nam
209211

210212
public <T> AppendableBuilder withCollectionItem(final T item)
211213
{
212-
elements.add(new CollectionElement(item));
214+
elements.add(new CollectionItemElement(item));
213215
return this;
214216
}
215217

216218
public <K> AppendableBuilder withMapKey(final K key)
217219
{
218220
Assert.notNull(key, "key");
219-
elements.add(new MapElement(key));
221+
elements.add(new MapKeyElement(key));
220222
return this;
221223
}
222224

‎src/main/java/de/danielbechler/diff/NodePathValueHolder.java‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,28 @@
11
package de.danielbechler.diff;
22

3-
import de.danielbechler.util.*;
3+
import de.danielbechler.util.Assert;
44

5-
import java.util.*;
5+
import java.util.ArrayList;
6+
import java.util.HashMap;
7+
import java.util.Iterator;
8+
import java.util.LinkedList;
9+
import java.util.List;
10+
import java.util.Map;
611

7-
/** @author Daniel Bechler */
8-
public class NodePathValueHolder<T>
12+
/**
13+
* @author Daniel Bechler
14+
*/
15+
class NodePathValueHolder<T>
916
{
17+
private final Map<Element, NodePathValueHolder<T>> elementValueHolders = new HashMap<Element, NodePathValueHolder<T>>();
18+
private T value;
19+
1020
public static <T> NodePathValueHolder<T> of(final Class<T> type)
1121
{
1222
Assert.notNull(type, "type");
1323
return new NodePathValueHolder<T>();
1424
}
1525

16-
private final Map<Element, NodePathValueHolder<T>> elementValueHolders = new HashMap<Element, NodePathValueHolder<T>>();
17-
18-
private T value;
19-
2026
public NodePathValueHolder<T> put(final NodePath nodePath, final T value)
2127
{
2228
put(nodePath.getElements(), value);

0 commit comments

Comments
 (0)