Fixed SQiShER#13. Type detection os now much more reliable.

Author: SQiShER

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

@@ -53,7 +53,7 @@ Node compare(final Object working, final Object base)
 
 	public Node compare(final Node parentNode, final Instances instances)
 	{
-		final Node node = new DefaultNode(parentNode, instances.getSourceAccessor());
+		final Node node = new DefaultNode(parentNode, instances.getSourceAccessor(), instances.getType());
 		if (getDelegate().isIgnored(node))
 		{
 			node.setState(Node.State.IGNORED);
@@ -71,7 +71,7 @@ else if (instances.getType() == null)
 
 	private Node compareBean(final Node parentNode, final Instances instances)
 	{
-		final Node node = new DefaultNode(parentNode, instances.getSourceAccessor());
+		final Node node = new DefaultNode(parentNode, instances.getSourceAccessor(), instances.getType());
 		if (instances.hasBeenAdded())
 		{
 			node.setState(Node.State.ADDED);
@@ -110,7 +110,7 @@ private void compareProperties(final Node parentNode, final Instances instances)
 	{
 		for (final Accessor accessor : introspect(instances.getType()))
 		{
-			final Node node = new DefaultNode(parentNode, accessor);
+			final Node node = new DefaultNode(parentNode, accessor, instances.getType());
 			if (getDelegate().isIgnored(node))
 			{
 				if (getDelegate().isReturnable(node))

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

@@ -46,7 +46,7 @@ public CollectionNode compare(final Collection<?> working, final Collection<?> b
 
 	public CollectionNode compare(final Node parentNode, final Instances instances)
 	{
-		final CollectionNode node = new CollectionNode(parentNode, instances.getSourceAccessor());
+		final CollectionNode node = new CollectionNode(parentNode, instances.getSourceAccessor(), instances.getType());
 		if (getDelegate().isIgnored(node))
 		{
 			node.setState(Node.State.IGNORED);

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

@@ -140,7 +140,7 @@ public boolean isExcluded(final Node node)
 	@Override
 	public boolean isEqualsOnly(final Node node)
 	{
-		final Class<?> propertyType = node.getPropertyType();
+		final Class<?> propertyType = node.getValueType();
 		if (propertyType != null)
 		{
 			if (propertyType.getAnnotation(ObjectDiffEqualsOnlyType.class) != null)

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

@@ -46,7 +46,7 @@ public MapNode compare(final Map<?, ?> modified, final Map<?, ?> base)
 
 	public MapNode compare(final Node parentNode, final Instances instances)
 	{
-		final MapNode node = new MapNode(parentNode, instances.getSourceAccessor());
+		final MapNode node = new MapNode(parentNode, instances.getSourceAccessor(), instances.getType());
 
 		if (getConfiguration().isIgnored(node))
 		{
@@ -115,7 +115,7 @@ private Node compareEntry(final Object key, Instances instances, final MapNode p
 		if (instances.areSame())
 		{
 			// if the instances are the same, there is no need to delegate
-			return new DefaultNode(parent, accessor);
+			return new DefaultNode(parent, accessor, instances.getType());
 		}
 		return getDelegate().delegate(parent, instances);
 	}

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

@@ -24,9 +24,9 @@
 /** @author Daniel Bechler */
 public final class CollectionNode extends DefaultNode
 {
-	public CollectionNode(final Node parent, final Accessor accessor)
+	public CollectionNode(final Node parent, final Accessor accessor, final Class<?> valueType)
 	{
-		super(parent, accessor);
+		super(parent, accessor, valueType);
 	}
 
 	public Accessor accessorForItem(final Object item)

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

@@ -32,12 +32,20 @@ public class DefaultNode implements Node
 
 	private State state = State.UNTOUCHED;
 	private Node parentNode;
+	private Class<?> valueType;
 
-	public DefaultNode(final Node parentNode, final Accessor accessor)
+	/**
+	 *
+	 * @param parentNode
+	 * @param accessor
+	 * @param valueType
+	 */
+	public DefaultNode(final Node parentNode, final Accessor accessor, final Class<?> valueType)
 	{
 		Assert.notNull(accessor, "accessor");
 		this.parentNode = parentNode;
 		this.accessor = accessor;
+		this.valueType = valueType;
 	}
 
 	public State getState()
@@ -108,13 +116,18 @@ public MapNode toMapDifference()
 	}
 
 	@Override
-	public Class<?> getPropertyType()
+	public Class<?> getValueType()
 	{
 		if (accessor instanceof TypeAwareAccessor)
 		{
 			return ((TypeAwareAccessor) accessor).getPropertyType();
 		}
-		return null;
+		return valueType;
+	}
+
+	public void setValueType(final Class<?> valueType)
+	{
+		this.valueType = valueType;
 	}
 
 	public boolean hasChildren()
@@ -328,9 +341,9 @@ public String toString()
 		final StringBuilder sb = new StringBuilder();
 		sb.append(getPropertyPath());
 		sb.append(" = { ").append(getState().toString().toLowerCase());
-		if (getPropertyType() != null)
+		if (getValueType() != null)
 		{
-			sb.append(", type is ").append(getPropertyType().getCanonicalName());
+			sb.append(", type is ").append(getValueType().getCanonicalName());
 		}
 		if (getChildren().size() == 1)
 		{

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

@@ -26,9 +26,9 @@ public class MapNode extends DefaultNode
 {
 	private final List<Object> referenceKeys = new LinkedList<Object>();
 
-	public MapNode(final Node parentNode, final Accessor accessor)
+	public MapNode(final Node parentNode, final Accessor accessor, final Class<?> valueType)
 	{
-		super(parentNode, accessor);
+		super(parentNode, accessor, valueType);
 	}
 
 	public final int indexKey(final Object key)

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

@@ -23,10 +23,11 @@
 import java.util.*;
 
 /**
- * Represents a part of an object. It could be the object itself, one of its properties, an item in a collection or a map
- * entry. A node may one parent node and any number of children. It also provides methods to read and write the property
- * represented by this node on any object of the same type as the original object. Last but not least, a node knows how the
- * associated property has changed compared to the base object.
+ * Represents a part of an object. It could be the object itself, one of its properties, an item in a
+ * collection or a map entry. A node may one parent node and any number of children. It also provides methods
+ * to read and write the property represented by this node on any object of the same type as the original
+ * object. Last but not least, a node knows how the associated property has changed compared to the base
+ * object.
  *
  * @author Daniel Bechler
  */
@@ -93,7 +94,15 @@ public enum State
 	MapNode toMapDifference();
 
 	/** @return Returns the type of the property represented by this node, or null if unavailable. */
-	Class<?> getPropertyType();
+	Class<?> getValueType();
+
+	/**
+	 * Allows for explicit type definition. However, if the accessor is TypeAware, {@link #getValueType()} will
+	 * always return the type returned by the accessor.
+	 *
+	 * @param propertyType The type of the value represented by this node.
+	 */
+	void setValueType(Class<?> propertyType);
 
 	/** @return The absolute property path from the object root up to this node. */
 	PropertyPath getPropertyPath();

src/test/java/de/danielbechler/diff/MapDifferTest.java

@@ -167,4 +167,21 @@ public void testWithSameEntries()
 		assertThat(pingNode, IsNull.notNullValue());
 		assertThat(pingNode.getState(), is(Node.State.ADDED));
 	}
+
+	@Test
+	public void testWithChangedEntry()
+	{
+		final Map<String, String> working = new LinkedHashMap<String, String>(1);
+		working.put("foo", "bar");
+
+		final Map<String, String> base = new LinkedHashMap<String, String>(1);
+		base.put("foo", "woot");
+
+		final MapNode node = differ.compare(working, base);
+		assertThat("Node should have exactly one child", node.getChildren().size(), is(1));
+		assertThat("Child node should have changed", node.getChildren()
+														 .iterator()
+														 .next()
+														 .getState(), is(Node.State.CHANGED));
+	}
 }