Removed dependency between Instances and BeanPropertyAccessor

Author: SQiShER

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

@@ -16,7 +16,11 @@
 
 package de.danielbechler.diff;
 
-import de.danielbechler.util.*;
+import de.danielbechler.util.Assert;
+import de.danielbechler.util.Exceptions;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 
 import static de.danielbechler.util.Objects.isEqual;
 
@@ -38,6 +42,32 @@ public EqualsOnlyComparisonStrategy(final String equalsValueProviderMethod)
 		this.equalsValueProviderMethod = equalsValueProviderMethod;
 	}
 
+	private static Object access(final Object target, final String methodName)
+	{
+		if (target == null)
+		{
+			return null;
+		}
+		try
+		{
+			final Method method = target.getClass().getMethod(methodName);
+			method.setAccessible(true);
+			return method.invoke(target);
+		}
+		catch (final NoSuchMethodException e)
+		{
+			throw Exceptions.escalate(e);
+		}
+		catch (final InvocationTargetException e)
+		{
+			throw Exceptions.escalate(e);
+		}
+		catch (final IllegalAccessException e)
+		{
+			throw Exceptions.escalate(e);
+		}
+	}
+
 	public void compare(final DiffNode node, final Instances instances)
 	{
 		if (hasEqual(instances))
@@ -54,7 +84,9 @@ private boolean hasEqual(final Instances instances)
 	{
 		if (equalsValueProviderMethod != null)
 		{
-			return instances.access(equalsValueProviderMethod).areEqual();
+			final Object working = access(instances.getWorking(), equalsValueProviderMethod);
+			final Object base = access(instances.getBase(), equalsValueProviderMethod);
+			return isEqual(working, base);
 		}
 		else
 		{

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

@@ -16,13 +16,10 @@
 
 package de.danielbechler.diff;
 
-import de.danielbechler.diff.bean.BeanPropertyAccessor;
 import de.danielbechler.util.Assert;
 import de.danielbechler.util.Classes;
 import de.danielbechler.util.Collections;
-import de.danielbechler.util.Exceptions;
 
-import java.lang.reflect.Method;
 import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
@@ -32,7 +29,6 @@
 /**
  * @author Daniel Bechler
  */
-@SuppressWarnings({"UnusedDeclaration"})
 public class Instances
 {
 	private final Accessor sourceAccessor;
@@ -80,27 +76,6 @@ public Accessor getSourceAccessor()
 		return sourceAccessor;
 	}
 
-	public Instances access(final String methodName)
-	{
-		Assert.hasText(methodName, "methodName");
-		final Class<?> type = getType();
-		if (type != null)
-		{
-			try
-			{
-				final Method method = type.getMethod(methodName);
-				method.setAccessible(true);
-				final BeanPropertyAccessor accessor = new BeanPropertyAccessor(methodName, method, null);
-				return new Instances(accessor, accessor.get(working), accessor.get(base), accessor.get(fresh));
-			}
-			catch (NoSuchMethodException e)
-			{
-				throw Exceptions.escalate(type.getName(), e);
-			}
-		}
-		return null;
-	}
-
 	public Instances access(final Accessor accessor)
 	{
 		Assert.notNull(accessor, "accessor");
@@ -289,14 +264,4 @@ else if (sourceAccessorType != null)
 				"Instances must either be null or have the exact same type.");
 	}
 
-	public NodePath getPropertyPath(final DiffNode parentNode)
-	{
-		if (parentNode != null)
-		{
-			final NodePath parentPath = parentNode.getPath();
-			final ElementSelector elementSelector = sourceAccessor.getElementSelector();
-			return NodePath.startBuildingFrom(parentPath).element(elementSelector).build();
-		}
-		return NodePath.withRoot();
-	}
 }