Removed ConfigNode prototype and AnyElementSelector

Author: SQiShER

src/main/java/de/danielbechler/diff/differ/DifferDispatcher.java

@@ -62,6 +62,12 @@ public DifferDispatcher(final DifferProvider differProvider,
 		resetInstanceMemory();
 	}
 
+	protected final void resetInstanceMemory()
+	{
+		workingCircularReferenceDetector = circularReferenceDetectorFactory.createCircularReferenceDetector();
+		baseCircularReferenceDetector = circularReferenceDetectorFactory.createCircularReferenceDetector();
+	}
+
 	private static DiffNode findNodeMatchingPropertyPath(final DiffNode node, final NodePath nodePath)
 	{
 		if (node == null)
@@ -144,7 +150,7 @@ private DiffNode compareWithCircularReferenceTracking(final DiffNode parentNode,
 				forgetInstances(instances);
 			}
 		}
-		catch (CircularReferenceException e)
+		catch (final CircularReferenceException e)
 		{
 			node = newCircularNode(parentNode, instances, e.getNodePath());
 			circularReferenceExceptionHandler.onCircularReferenceException(node);
@@ -167,12 +173,6 @@ private DiffNode compare(final DiffNode parentNode, final Instances instances)
 		return differ.compare(parentNode, instances);
 	}
 
-	protected final void resetInstanceMemory()
-	{
-		workingCircularReferenceDetector = circularReferenceDetectorFactory.createCircularReferenceDetector();
-		baseCircularReferenceDetector = circularReferenceDetectorFactory.createCircularReferenceDetector();
-	}
-
 	protected void forgetInstances(final Instances instances)
 	{
 		workingCircularReferenceDetector.remove(instances.getWorking());

src/main/java/de/danielbechler/diff/inclusion/ConfigNode.java

@@ -17,7 +17,6 @@
 package de.danielbechler.diff.inclusion;
 
 import de.danielbechler.diff.path.NodePath;
-import de.danielbechler.diff.selector.AnyElementSelector;
 import de.danielbechler.diff.selector.ElementSelector;
 import de.danielbechler.diff.selector.RootElementSelector;
 
@@ -36,8 +35,6 @@ public class ConfigNode
 	private final Map<ElementSelector, ConfigNode> children = new HashMap<ElementSelector, ConfigNode>();
 	private final ElementSelector elementSelector;
 	private final ConfigNode parent;
-	@Deprecated
-	private ConfigNode prototype;
 	private Inclusion inclusion;
 
 	public ConfigNode()
@@ -97,14 +94,6 @@ public ConfigNode getChild(final ElementSelector childSelector)
 		{
 			throw new IllegalArgumentException("A child node can never be the root");
 		}
-		if (childSelector instanceof AnyElementSelector)
-		{
-			if (prototype == null)
-			{
-				prototype = new ConfigNode(childSelector, parent);
-			}
-			return prototype;
-		}
 		if (children.containsKey(childSelector))
 		{
 			return children.get(childSelector);
@@ -146,10 +135,6 @@ public boolean isIncluded()
 			{
 				return parentWithInclusion.getInclusion() != EXCLUDED;
 			}
-			if (!hasInclusion() && hasPrototype() && prototype.hasInclusion())
-			{
-				return prototype.inclusion == INCLUDED;
-			}
 			if (inclusion == INCLUDED)
 			{
 				return true;
@@ -226,19 +211,4 @@ public boolean containsInclusion(final Inclusion inclusion)
 		}
 		return false;
 	}
-
-	public ConfigNode getPrototype()
-	{
-		return prototype;
-	}
-
-	public void setPrototype(final ConfigNode prototype)
-	{
-		this.prototype = prototype;
-	}
-
-	public boolean hasPrototype()
-	{
-		return prototype != null;
-	}
 }

src/main/java/de/danielbechler/diff/node/DiffNode.java

@@ -504,6 +504,7 @@ public boolean isExcluded()
 		return false;
 	}
 
+	// TODO These categories should also contain the ones configured via CategoryService
 	public final Set<String> getCategories()
 	{
 		final Set<String> categories = new TreeSet<String>();

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Daniel Bechler
+ * Copyright 2014 Daniel Bechler
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 
 package de.danielbechler.diff.path;
 
-import de.danielbechler.diff.selector.AnyElementSelector;
 import de.danielbechler.diff.selector.BeanPropertyElementSelector;
 import de.danielbechler.diff.selector.CollectionItemElementSelector;
 import de.danielbechler.diff.selector.ElementSelector;
@@ -42,37 +41,32 @@ private NodePath(final List<ElementSelector> elementSelectors)
 		this.elementSelectors = Collections.unmodifiableList(elementSelectors);
 	}
 
-	public static AppendableBuilder startBuilding()
-	{
-		final List<ElementSelector> elementSelectors1 = new LinkedList<ElementSelector>();
-		elementSelectors1.add(RootElementSelector.getInstance());
-		return new AppendableBuilderImpl(elementSelectors1);
-	}
-
 	public static AppendableBuilder startBuildingFrom(final NodePath nodePath)
 	{
 		Assert.notNull(nodePath, "propertyPath");
 		return new AppendableBuilderImpl(new ArrayList<ElementSelector>(nodePath.getElementSelectors()));
 	}
 
-	public static NodePath with(final String propertyName, final String... additionalPropertyNames)
+	public List<ElementSelector> getElementSelectors()
 	{
-		return startBuilding().propertyName(propertyName, additionalPropertyNames).build();
+		return elementSelectors;
 	}
 
-	public static NodePath withRoot()
+	public static NodePath with(final String propertyName, final String... additionalPropertyNames)
 	{
-		return startBuilding().build();
+		return startBuilding().propertyName(propertyName, additionalPropertyNames).build();
 	}
 
-	public List<ElementSelector> getElementSelectors()
+	public static AppendableBuilder startBuilding()
 	{
-		return elementSelectors;
+		final List<ElementSelector> elementSelectors1 = new LinkedList<ElementSelector>();
+		elementSelectors1.add(RootElementSelector.getInstance());
+		return new AppendableBuilderImpl(elementSelectors1);
 	}
 
-	public boolean matches(final NodePath nodePath)
+	public static NodePath withRoot()
 	{
-		return nodePath.equals(this);
+		return startBuilding().build();
 	}
 
 	public boolean isParentOf(final NodePath nodePath)
@@ -100,6 +94,34 @@ public ElementSelector getLastElementSelector()
 		return elementSelectors.get(elementSelectors.size() - 1);
 	}
 
+	@Override
+	public int hashCode()
+	{
+		return elementSelectors.hashCode();
+	}
+
+	@Override
+	public boolean equals(final Object o)
+	{
+		if (this == o)
+		{
+			return true;
+		}
+		if (o == null || getClass() != o.getClass())
+		{
+			return false;
+		}
+
+		final NodePath that = (NodePath) o;
+
+		if (!elementSelectors.equals(that.elementSelectors))
+		{
+			return false;
+		}
+
+		return true;
+	}
+
 	@Override
 	public String toString()
 	{
@@ -131,34 +153,6 @@ else if (previousElementSelector instanceof RootElementSelector)
 		return sb.toString();
 	}
 
-	@Override
-	public boolean equals(final Object o)
-	{
-		if (this == o)
-		{
-			return true;
-		}
-		if (o == null || getClass() != o.getClass())
-		{
-			return false;
-		}
-
-		final NodePath that = (NodePath) o;
-
-		if (!elementSelectors.equals(that.elementSelectors))
-		{
-			return false;
-		}
-
-		return true;
-	}
-
-	@Override
-	public int hashCode()
-	{
-		return elementSelectors.hashCode();
-	}
-
 	public int compareTo(final NodePath that)
 	{
 		if (this.getElementSelectors().size() <= that.getElementSelectors().size())
@@ -179,10 +173,13 @@ else if (this.getElementSelectors().size() > that.getElementSelectors().size())
 		}
 	}
 
-	public static interface AppendableBuilder
+	public boolean matches(final NodePath nodePath)
 	{
-		AppendableBuilder any();
+		return nodePath.equals(this);
+	}
 
+	public static interface AppendableBuilder
+	{
 		AppendableBuilder element(ElementSelector elementSelector);
 
 		AppendableBuilder propertyName(String name, String... names);
@@ -204,12 +201,6 @@ public AppendableBuilderImpl(final List<ElementSelector> elementSelectors)
 			this.elementSelectors = new LinkedList<ElementSelector>(elementSelectors);
 		}
 
-		public AppendableBuilder any()
-		{
-			elementSelectors.add(new AnyElementSelector());
-			return this;
-		}
-
 		public AppendableBuilder element(final ElementSelector elementSelector)
 		{
 			Assert.notNull(elementSelector, "elementSelector");