Repackaging...

Author: SQiShER

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

@@ -16,7 +16,6 @@
 
 package de.danielbechler.diff;
 
-import de.danielbechler.diff.visitors.NodeHierarchyVisitor;
 import de.danielbechler.diff.helper.NodeAssertions;
 import de.danielbechler.diff.helper.TestGroups;
 import de.danielbechler.diff.mock.ObjectWithAccessTrackingIgnoredProperty;
@@ -29,9 +28,10 @@
 import de.danielbechler.diff.mock.ObjectWithMethodEqualsOnlyValueProviderMethodOnGetNestedObject;
 import de.danielbechler.diff.mock.ObjectWithNestedObject;
 import de.danielbechler.diff.node.DiffNode;
-import de.danielbechler.diff.node.path.CollectionItemElementSelector;
-import de.danielbechler.diff.node.path.MapKeyElementSelector;
-import de.danielbechler.diff.node.path.NodePath;
+import de.danielbechler.diff.path.NodePath;
+import de.danielbechler.diff.selector.CollectionItemElementSelector;
+import de.danielbechler.diff.selector.MapKeyElementSelector;
+import de.danielbechler.diff.visitors.NodeHierarchyVisitor;
 import org.fest.assertions.api.Assertions;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;

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

@@ -1,8 +1,8 @@
 package de.danielbechler.diff.config.inclusion
 
-import de.danielbechler.diff.PhoneBookSetup
 import de.danielbechler.diff.ObjectDifferBuilder
-import de.danielbechler.diff.node.path.NodePath
+import de.danielbechler.diff.PhoneBookSetup
+import de.danielbechler.diff.path.NodePath
 import spock.lang.Specification
 
 import static de.danielbechler.diff.PhoneBookSetup.Contact

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

@@ -18,8 +18,8 @@ package de.danielbechler.diff.config.inclusion
 
 import de.danielbechler.diff.ObjectDifferBuilder
 import de.danielbechler.diff.config.introspection.ObjectDiffProperty
-import de.danielbechler.diff.node.path.CollectionItemElementSelector
-import de.danielbechler.diff.node.path.NodePath
+import de.danielbechler.diff.path.NodePath
+import de.danielbechler.diff.selector.CollectionItemElementSelector
 import spock.lang.Specification
 
 /**

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

@@ -16,10 +16,10 @@
 
 package de.danielbechler.diff.config.inclusion
 
-import de.danielbechler.diff.PhoneBookSetup
 import de.danielbechler.diff.ObjectDifferBuilder
-import de.danielbechler.diff.node.path.CollectionItemElementSelector
-import de.danielbechler.diff.node.path.NodePath
+import de.danielbechler.diff.PhoneBookSetup
+import de.danielbechler.diff.path.NodePath
+import de.danielbechler.diff.selector.CollectionItemElementSelector
 import spock.lang.Specification
 
 import static de.danielbechler.diff.PhoneBookSetup.Contact

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

@@ -16,10 +16,10 @@
 
 package de.danielbechler.diff.example;
 
-import de.danielbechler.diff.visitors.NodeHierarchyVisitor;
 import de.danielbechler.diff.ObjectDifferBuilder;
 import de.danielbechler.diff.node.DiffNode;
-import de.danielbechler.diff.node.path.CollectionItemElementSelector;
+import de.danielbechler.diff.selector.CollectionItemElementSelector;
+import de.danielbechler.diff.visitors.NodeHierarchyVisitor;
 
 import java.util.LinkedList;
 import java.util.List;

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

@@ -1,9 +1,9 @@
 package de.danielbechler.diff.example;
 
-import de.danielbechler.diff.visitors.PrintingVisitor;
 import de.danielbechler.diff.ObjectDifferBuilder;
 import de.danielbechler.diff.node.DiffNode;
-import de.danielbechler.diff.node.path.NodePath;
+import de.danielbechler.diff.path.NodePath;
+import de.danielbechler.diff.visitors.PrintingVisitor;
 
 class EqualsOnlyValueProviderMethodExample
 {

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

@@ -19,7 +19,7 @@ package de.danielbechler.diff.example
 import de.danielbechler.diff.ObjectDifferBuilder
 import de.danielbechler.diff.config.introspection.ObjectDiffEqualsOnlyType
 import de.danielbechler.diff.config.introspection.ObjectDiffProperty
-import de.danielbechler.diff.node.path.NodePath
+import de.danielbechler.diff.path.NodePath
 import spock.lang.Specification
 
 import static de.danielbechler.diff.node.DiffNode.State.UNTOUCHED

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

@@ -1,10 +1,10 @@
 package de.danielbechler.diff.example;
 
-import de.danielbechler.diff.visitors.PrintingVisitor;
 import de.danielbechler.diff.ObjectDifferBuilder;
 import de.danielbechler.diff.config.introspection.ObjectDiffProperty;
 import de.danielbechler.diff.node.DiffNode;
-import de.danielbechler.diff.node.path.NodePath;
+import de.danielbechler.diff.path.NodePath;
+import de.danielbechler.diff.visitors.PrintingVisitor;
 
 /**
  * @author Daniel Bechler

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

@@ -16,10 +16,10 @@
 
 package de.danielbechler.diff.example;
 
-import de.danielbechler.diff.node.Visit;
 import de.danielbechler.diff.ObjectDifferBuilder;
 import de.danielbechler.diff.node.DiffNode;
-import de.danielbechler.diff.node.path.MapKeyElementSelector;
+import de.danielbechler.diff.node.Visit;
+import de.danielbechler.diff.selector.MapKeyElementSelector;
 
 import java.util.Map;
 import java.util.TreeMap;

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

@@ -19,7 +19,7 @@
 import de.danielbechler.diff.ObjectDiffer;
 import de.danielbechler.diff.ObjectDifferBuilder;
 import de.danielbechler.diff.node.DiffNode;
-import de.danielbechler.diff.node.path.CollectionItemElementSelector;
+import de.danielbechler.diff.selector.CollectionItemElementSelector;
 import org.hamcrest.core.IsEqual;
 import org.hamcrest.core.IsNull;
 import org.testng.annotations.Test;