Skip to content

Commit 00a7a3e

Browse files
SQiShERSQiShER
committed
Reorganizing package structure to reduce dependencies
1 parent a098864 commit 00a7a3e

154 files changed

Lines changed: 1955 additions & 1614 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/integration-test/java/de/danielbechler/diff/PhoneBookSetup.groovy‎

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

1717
package de.danielbechler.diff
1818

19-
import de.danielbechler.diff.annotation.ObjectDiffProperty
19+
import de.danielbechler.diff.introspection.ObjectDiffProperty
2020
import groovy.transform.EqualsAndHashCode
2121
import groovy.transform.ToString
2222

@@ -25,66 +25,66 @@ import groovy.transform.ToString
2525
*/
2626
public class PhoneBookSetup {
2727

28-
static def getBase() {
29-
return new PhoneBook(
30-
name: "Jerry's Phone Book",
31-
revision: 1,
32-
contacts: [
33-
new Contact(id: "elaine", name: "Elaine", number: "917-555-0186"),
34-
new Contact(id: "george", name: "George", number: "917-555-0102"),
35-
new Contact(id: "kramer", name: "Kramer", number: "917-555-3456")
36-
])
37-
}
28+
static def getBase() {
29+
return new PhoneBook(
30+
name: "Jerry's Phone Book",
31+
revision: 1,
32+
contacts: [
33+
new Contact(id: "elaine", name: "Elaine", number: "917-555-0186"),
34+
new Contact(id: "george", name: "George", number: "917-555-0102"),
35+
new Contact(id: "kramer", name: "Kramer", number: "917-555-3456")
36+
])
37+
}
3838

39-
static def getWorking() {
40-
return new PhoneBook(
41-
// Jerry decided to give his phone book a more formal title
42-
name: "Jerry Seinfeld's Phone Book",
43-
revision: 2,
44-
contacts: [
45-
new Contact(id: "elaine", name: "Elaine", number: "917-555-0186"),
39+
static def getWorking() {
40+
return new PhoneBook(
41+
// Jerry decided to give his phone book a more formal title
42+
name: "Jerry Seinfeld's Phone Book",
43+
revision: 2,
44+
contacts: [
45+
new Contact(id: "elaine", name: "Elaine", number: "917-555-0186"),
4646

47-
// George has a new nickname
48-
new Contact(id: "george", name: "Koko", number: "917-555-0102"),
47+
// George has a new nickname
48+
new Contact(id: "george", name: "Koko", number: "917-555-0102"),
4949

50-
// Jerry always ended up at the Moviefone hotline until he realized Kramers new number actually ends with 5, not 6
51-
new Contact(id: "kramer", name: "Kramer", number: "917-555-3455")
52-
])
53-
}
50+
// Jerry always ended up at the Moviefone hotline until he realized Kramers new number actually ends with 5, not 6
51+
new Contact(id: "kramer", name: "Kramer", number: "917-555-3455")
52+
])
53+
}
5454

55-
@EqualsAndHashCode
56-
@ToString(includePackage = false)
57-
public static class PhoneBook {
58-
def name
59-
def contacts = []
60-
def revision
55+
@EqualsAndHashCode
56+
@ToString(includePackage = false)
57+
public static class PhoneBook {
58+
def name
59+
def contacts = []
60+
def revision
6161

62-
@SuppressWarnings("GroovyUnusedDeclaration")
63-
@ObjectDiffProperty(excluded = true)
64-
def getRevision() {
65-
return revision
66-
}
62+
@SuppressWarnings("GroovyUnusedDeclaration")
63+
@ObjectDiffProperty(excluded = true)
64+
def getRevision() {
65+
return revision
66+
}
6767

68-
void setRevision(revision) {
69-
this.revision = revision
70-
}
71-
}
68+
void setRevision(revision) {
69+
this.revision = revision
70+
}
71+
}
7272

73-
@EqualsAndHashCode(includes = ["id"])
74-
@ToString(includePackage = false)
75-
public static class Contact {
76-
def id
77-
def name
78-
def number
73+
@EqualsAndHashCode(includes = ["id"])
74+
@ToString(includePackage = false)
75+
public static class Contact {
76+
def id
77+
def name
78+
def number
7979

80-
@SuppressWarnings("GroovyUnusedDeclaration")
81-
@ObjectDiffProperty(categories = ['private'])
82-
def getNumber() {
83-
return number
84-
}
80+
@SuppressWarnings("GroovyUnusedDeclaration")
81+
@ObjectDiffProperty(categories = ['private'])
82+
def getNumber() {
83+
return number
84+
}
8585

86-
void setNumber(number) {
87-
this.number = number
88-
}
89-
}
86+
void setNumber(number) {
87+
this.number = number
88+
}
89+
}
9090
}

src/integration-test/java/de/danielbechler/diff/ObjectDifferIT.java renamed to src/integration-test/java/de/danielbechler/diff/builder/ObjectDifferIT.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,11 @@
1414
* limitations under the License.
1515
*/
1616

17-
package de.danielbechler.diff;
17+
package de.danielbechler.diff.builder;
1818

19-
import de.danielbechler.diff.collection.CollectionItemElementSelector;
19+
import de.danielbechler.diff.NodeHierarchyVisitor;
2020
import de.danielbechler.diff.helper.NodeAssertions;
2121
import de.danielbechler.diff.helper.TestGroups;
22-
import de.danielbechler.diff.map.MapKeyElementSelector;
2322
import de.danielbechler.diff.mock.ObjectWithAccessTrackingIgnoredProperty;
2423
import de.danielbechler.diff.mock.ObjectWithCollection;
2524
import de.danielbechler.diff.mock.ObjectWithHashCodeAndEquals;
@@ -29,7 +28,10 @@
2928
import de.danielbechler.diff.mock.ObjectWithMethodEqualsOnlyValueProviderMethodOnGetMap;
3029
import de.danielbechler.diff.mock.ObjectWithMethodEqualsOnlyValueProviderMethodOnGetNestedObject;
3130
import de.danielbechler.diff.mock.ObjectWithNestedObject;
32-
import de.danielbechler.diff.visitor.NodeHierarchyVisitor;
31+
import de.danielbechler.diff.node.DiffNode;
32+
import de.danielbechler.diff.nodepath.CollectionItemElementSelector;
33+
import de.danielbechler.diff.nodepath.MapKeyElementSelector;
34+
import de.danielbechler.diff.nodepath.NodePath;
3335
import org.fest.assertions.api.Assertions;
3436
import org.testng.annotations.BeforeMethod;
3537
import org.testng.annotations.Test;

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

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

1717
package de.danielbechler.diff.example;
1818

19-
import de.danielbechler.diff.DiffNode;
20-
import de.danielbechler.diff.ObjectDifferBuilder;
21-
import de.danielbechler.diff.collection.CollectionItemElementSelector;
22-
import de.danielbechler.diff.visitor.NodeHierarchyVisitor;
19+
import de.danielbechler.diff.NodeHierarchyVisitor;
20+
import de.danielbechler.diff.builder.ObjectDifferBuilder;
21+
import de.danielbechler.diff.node.DiffNode;
22+
import de.danielbechler.diff.nodepath.CollectionItemElementSelector;
2323

2424
import java.util.LinkedList;
2525
import java.util.List;

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
package de.danielbechler.diff.example;
22

3-
import de.danielbechler.diff.*;
4-
import de.danielbechler.diff.visitor.*;
3+
import de.danielbechler.diff.PrintingVisitor;
4+
import de.danielbechler.diff.builder.ObjectDifferBuilder;
5+
import de.danielbechler.diff.node.DiffNode;
6+
import de.danielbechler.diff.nodepath.NodePath;
57

68
class EqualsOnlyValueProviderMethodExample
79
{
@@ -20,8 +22,8 @@ public static void main(final String[] args)
2022

2123
// (Option 1) Causes the ObjectDiffer to compare using the method "getProp1" on the 'prop' property of the root object
2224
builder.configure().comparison()
23-
.ofNode(NodePath.with("prop"))
24-
.toUseEqualsMethodOfValueProvidedByMethod("getProp1");
25+
.ofNode(NodePath.with("prop"))
26+
.toUseEqualsMethodOfValueProvidedByMethod("getProp1");
2527

2628
final DiffNode node = builder.build().compare(working, base);
2729

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

Lines changed: 36 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -16,59 +16,51 @@
1616

1717
package de.danielbechler.diff.example
1818

19-
import de.danielbechler.diff.ObjectDifferBuilder
19+
import de.danielbechler.diff.builder.ObjectDifferBuilder
2020
import spock.lang.Specification
2121

22-
import static de.danielbechler.diff.DiffNode.State.CHANGED
23-
import static de.danielbechler.diff.DiffNode.State.UNTOUCHED
22+
import static de.danielbechler.diff.node.DiffNode.State.CHANGED
23+
import static de.danielbechler.diff.node.DiffNode.State.UNTOUCHED
2424

25-
public class Example1IT extends Specification
26-
{
27-
def "Comparing Objects via compareTo instead of equals"()
28-
{
29-
given: "an object differ configured to compare the given type via compareTo method"
30-
def builder = ObjectDifferBuilder.startBuilding()
31-
builder.configure().comparison().ofType(ComparableObject).toUseCompareToMethod()
32-
def objectDiffer = builder.build()
25+
public class Example1IT extends Specification {
26+
def "Comparing Objects via compareTo instead of equals"() {
27+
given: "an object differ configured to compare the given type via compareTo method"
28+
def builder = ObjectDifferBuilder.startBuilding()
29+
builder.configure().comparison().ofType(ComparableObject).toUseCompareToMethod()
30+
def objectDiffer = builder.build()
3331

34-
expect:
35-
objectDiffer.compare(working, base).state == expectedState
32+
expect:
33+
objectDiffer.compare(working, base).state == expectedState
3634

37-
where:
38-
base | working || expectedState
39-
new ComparableObject("foo", 1) | new ComparableObject("foo", 2) || UNTOUCHED
40-
new ComparableObject("foo", 1) | new ComparableObject("bar", 1) || CHANGED
41-
}
35+
where:
36+
base | working || expectedState
37+
new ComparableObject("foo", 1) | new ComparableObject("foo", 2) || UNTOUCHED
38+
new ComparableObject("foo", 1) | new ComparableObject("bar", 1) || CHANGED
39+
}
4240

43-
public static class ComparableObject implements Comparable<ComparableObject>
44-
{
45-
private final String value
46-
private final int index
41+
public static class ComparableObject implements Comparable<ComparableObject> {
42+
private final String value
43+
private final int index
4744

48-
public ComparableObject(String value, int index)
49-
{
50-
this.value = value
51-
this.index = index
52-
}
45+
public ComparableObject(String value, int index) {
46+
this.value = value
47+
this.index = index
48+
}
5349

54-
public String getValue()
55-
{
56-
return value
57-
}
50+
public String getValue() {
51+
return value
52+
}
5853

59-
public int compareTo(ComparableObject o)
60-
{
61-
return value.compareToIgnoreCase(o.value)
62-
}
54+
public int compareTo(ComparableObject o) {
55+
return value.compareToIgnoreCase(o.value)
56+
}
6357

64-
public boolean equals(Object o)
65-
{
66-
return false
67-
}
58+
public boolean equals(Object o) {
59+
return false
60+
}
6861

69-
public int hashCode()
70-
{
71-
return 0
72-
}
73-
}
62+
public int hashCode() {
63+
return 0
64+
}
65+
}
7466
}

0 commit comments

Comments
 (0)