Package refactoring

Author: SQiShER

src/main/java/de/danielbechler/diff/BeanDiffer.java

@@ -22,7 +22,7 @@
 import de.danielbechler.diff.config.introspection.Introspector;
 import de.danielbechler.diff.config.introspection.IntrospectorResolver;
 import de.danielbechler.diff.config.introspection.IsIntrospectableResolver;
-import de.danielbechler.diff.node.ComparisonStrategy;
+import de.danielbechler.diff.config.comparison.ComparisonStrategy;
 import de.danielbechler.diff.node.DiffNode;
 import de.danielbechler.util.Assert;
 

src/main/java/de/danielbechler/diff/CollectionDiffer.java

@@ -19,7 +19,7 @@
 import de.danielbechler.diff.node.Accessor;
 import de.danielbechler.diff.node.CollectionItemAccessor;
 import de.danielbechler.diff.config.comparison.ComparisonStrategyResolver;
-import de.danielbechler.diff.node.ComparisonStrategy;
+import de.danielbechler.diff.config.comparison.ComparisonStrategy;
 import de.danielbechler.diff.node.DiffNode;
 import de.danielbechler.util.Assert;
 import de.danielbechler.util.Collections;

src/main/java/de/danielbechler/diff/config/comparison/ComparableComparisonStrategy.java

@@ -16,7 +16,6 @@
 
 package de.danielbechler.diff.config.comparison;
 
-import de.danielbechler.diff.node.ComparisonStrategy;
 import de.danielbechler.diff.node.DiffNode;
 
 import static de.danielbechler.util.Comparables.isEqualByComparison;

src/main/java/de/danielbechler/diff/config/comparison/ComparisonConfiguration.java

@@ -1,6 +1,5 @@
 package de.danielbechler.diff.config.comparison;
 
-import de.danielbechler.diff.node.ComparisonStrategy;
 import de.danielbechler.diff.node.path.NodePath;
 
 /**

src/main/java/de/danielbechler/diff/config/comparison/ComparisonService.java

@@ -16,7 +16,6 @@
 
 package de.danielbechler.diff.config.comparison;
 
-import de.danielbechler.diff.node.ComparisonStrategy;
 import de.danielbechler.diff.node.DiffNode;
 import de.danielbechler.diff.node.path.NodePath;
 import de.danielbechler.diff.node.path.NodePathValueHolder;

src/main/java/de/danielbechler/diff/node/ComparisonStrategy.java renamed to src/main/java/de/danielbechler/diff/config/comparison/ComparisonStrategy.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package de.danielbechler.diff.node;
+package de.danielbechler.diff.config.comparison;
 
 import de.danielbechler.diff.node.DiffNode;
 

src/main/java/de/danielbechler/diff/config/comparison/ComparisonStrategyResolver.java

@@ -16,7 +16,6 @@
 
 package de.danielbechler.diff.config.comparison;
 
-import de.danielbechler.diff.node.ComparisonStrategy;
 import de.danielbechler.diff.node.DiffNode;
 
 /**

src/main/java/de/danielbechler/diff/config/comparison/EqualsOnlyComparisonStrategy.java

@@ -16,7 +16,6 @@
 
 package de.danielbechler.diff.config.comparison;
 
-import de.danielbechler.diff.node.ComparisonStrategy;
 import de.danielbechler.diff.node.DiffNode;
 import de.danielbechler.util.Assert;
 import de.danielbechler.util.Exceptions;

src/main/java/de/danielbechler/diff/config/inclusion/InclusionConfiguration.java

@@ -24,22 +24,6 @@ public interface InclusionConfiguration
 
 	ToExclude exclude();
 
-	public interface To<T extends To>
-	{
-		T categories(String... categories);
-
-		T types(Class<?>... types);
-
-		T node(NodePath nodePath);
-
-		T propertyNames(String... propertyNames);
-	}
-
-	public interface AndReturn
-	{
-		Configuration and();
-	}
-
 	public interface ToInclude
 	{
 		ToIncludeAndReturn category(String category);

src/main/java/de/danielbechler/diff/config/introspection/BeanPropertyAccessor.java

@@ -18,7 +18,7 @@
 
 import de.danielbechler.diff.node.Accessor;
 import de.danielbechler.diff.node.PropertyAwareAccessor;
-import de.danielbechler.diff.node.ComparisonStrategy;
+import de.danielbechler.diff.config.comparison.ComparisonStrategy;
 import de.danielbechler.diff.node.path.BeanPropertyElementSelector;
 import de.danielbechler.diff.node.path.ElementSelector;
 import de.danielbechler.util.Assert;