Skip to content

Commit 722f355

Browse files
SQiShERSQiShER
committed
Repackaging...
1 parent 8dc8ac6 commit 722f355

File tree

94 files changed

+444
-392
lines changed

Some content is hidden

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

94 files changed

+444
-392
lines changed

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

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

1717
package de.danielbechler.diff;
1818

19-
import de.danielbechler.diff.visitors.NodeHierarchyVisitor;
2019
import de.danielbechler.diff.helper.NodeAssertions;
2120
import de.danielbechler.diff.helper.TestGroups;
2221
import de.danielbechler.diff.mock.ObjectWithAccessTrackingIgnoredProperty;
@@ -29,9 +28,10 @@
2928
import de.danielbechler.diff.mock.ObjectWithMethodEqualsOnlyValueProviderMethodOnGetNestedObject;
3029
import de.danielbechler.diff.mock.ObjectWithNestedObject;
3130
import de.danielbechler.diff.node.DiffNode;
32-
import de.danielbechler.diff.node.path.CollectionItemElementSelector;
33-
import de.danielbechler.diff.node.path.MapKeyElementSelector;
34-
import de.danielbechler.diff.node.path.NodePath;
31+
import de.danielbechler.diff.path.NodePath;
32+
import de.danielbechler.diff.selector.CollectionItemElementSelector;
33+
import de.danielbechler.diff.selector.MapKeyElementSelector;
34+
import de.danielbechler.diff.visitors.NodeHierarchyVisitor;
3535
import org.fest.assertions.api.Assertions;
3636
import org.testng.annotations.BeforeMethod;
3737
import org.testng.annotations.Test;

‎src/integration-test/java/de/danielbechler/diff/config/inclusion/IncludingAnElementViaNodePathIT.groovy

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

3-
import de.danielbechler.diff.PhoneBookSetup
43
import de.danielbechler.diff.ObjectDifferBuilder
5-
import de.danielbechler.diff.node.path.NodePath
4+
import de.danielbechler.diff.PhoneBookSetup
5+
import de.danielbechler.diff.path.NodePath
66
import spock.lang.Specification
77

88
import static de.danielbechler.diff.PhoneBookSetup.Contact

‎src/integration-test/java/de/danielbechler/diff/config/inclusion/InclusionAT.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ package de.danielbechler.diff.config.inclusion
1818

1919
import de.danielbechler.diff.ObjectDifferBuilder
2020
import de.danielbechler.diff.config.introspection.ObjectDiffProperty
21-
import de.danielbechler.diff.node.path.CollectionItemElementSelector
22-
import de.danielbechler.diff.node.path.NodePath
21+
import de.danielbechler.diff.path.NodePath
22+
import de.danielbechler.diff.selector.CollectionItemElementSelector
2323
import spock.lang.Specification
2424

2525
/**

‎src/integration-test/java/de/danielbechler/diff/config/inclusion/InclusionIT.groovy

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

1717
package de.danielbechler.diff.config.inclusion
1818

19-
import de.danielbechler.diff.PhoneBookSetup
2019
import de.danielbechler.diff.ObjectDifferBuilder
21-
import de.danielbechler.diff.node.path.CollectionItemElementSelector
22-
import de.danielbechler.diff.node.path.NodePath
20+
import de.danielbechler.diff.PhoneBookSetup
21+
import de.danielbechler.diff.path.NodePath
22+
import de.danielbechler.diff.selector.CollectionItemElementSelector
2323
import spock.lang.Specification
2424

2525
import static de.danielbechler.diff.PhoneBookSetup.Contact

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

Lines changed: 2 additions & 2 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.visitors.NodeHierarchyVisitor;
2019
import de.danielbechler.diff.ObjectDifferBuilder;
2120
import de.danielbechler.diff.node.DiffNode;
22-
import de.danielbechler.diff.node.path.CollectionItemElementSelector;
21+
import de.danielbechler.diff.selector.CollectionItemElementSelector;
22+
import de.danielbechler.diff.visitors.NodeHierarchyVisitor;
2323

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

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

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

3-
import de.danielbechler.diff.visitors.PrintingVisitor;
43
import de.danielbechler.diff.ObjectDifferBuilder;
54
import de.danielbechler.diff.node.DiffNode;
6-
import de.danielbechler.diff.node.path.NodePath;
5+
import de.danielbechler.diff.path.NodePath;
6+
import de.danielbechler.diff.visitors.PrintingVisitor;
77

88
class EqualsOnlyValueProviderMethodExample
99
{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package de.danielbechler.diff.example
1919
import de.danielbechler.diff.ObjectDifferBuilder
2020
import de.danielbechler.diff.config.introspection.ObjectDiffEqualsOnlyType
2121
import de.danielbechler.diff.config.introspection.ObjectDiffProperty
22-
import de.danielbechler.diff.node.path.NodePath
22+
import de.danielbechler.diff.path.NodePath
2323
import spock.lang.Specification
2424

2525
import static de.danielbechler.diff.node.DiffNode.State.UNTOUCHED

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

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

3-
import de.danielbechler.diff.visitors.PrintingVisitor;
43
import de.danielbechler.diff.ObjectDifferBuilder;
54
import de.danielbechler.diff.config.introspection.ObjectDiffProperty;
65
import de.danielbechler.diff.node.DiffNode;
7-
import de.danielbechler.diff.node.path.NodePath;
6+
import de.danielbechler.diff.path.NodePath;
7+
import de.danielbechler.diff.visitors.PrintingVisitor;
88

99
/**
1010
* @author Daniel Bechler

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

Lines changed: 2 additions & 2 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.node.Visit;
2019
import de.danielbechler.diff.ObjectDifferBuilder;
2120
import de.danielbechler.diff.node.DiffNode;
22-
import de.danielbechler.diff.node.path.MapKeyElementSelector;
21+
import de.danielbechler.diff.node.Visit;
22+
import de.danielbechler.diff.selector.MapKeyElementSelector;
2323

2424
import java.util.Map;
2525
import java.util.TreeMap;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import de.danielbechler.diff.ObjectDiffer;
2020
import de.danielbechler.diff.ObjectDifferBuilder;
2121
import de.danielbechler.diff.node.DiffNode;
22-
import de.danielbechler.diff.node.path.CollectionItemElementSelector;
22+
import de.danielbechler.diff.selector.CollectionItemElementSelector;
2323
import org.hamcrest.core.IsEqual;
2424
import org.hamcrest.core.IsNull;
2525
import org.testng.annotations.Test;

0 commit comments

Comments
 (0)