Added field access capabilities (work in progress)

Author: SQiShER

src/main/java/de/danielbechler/diff/instantiation/TypeInfo.java

@@ -63,6 +63,22 @@ public Collection<PropertyAwareAccessor> getAccessors()
 		return accessors;
 	}
 
+	/**
+	 * @param name The property name to find an accessor for.
+	 * @return The accessor for the given property name or null if none is found.
+	 */
+	public PropertyAwareAccessor getAccessorByName(final String name)
+	{
+		for (PropertyAwareAccessor accessor : accessors)
+		{
+			if (accessor.getPropertyName().equals(name))
+			{
+				return accessor;
+			}
+		}
+		return null;
+	}
+
 	public void setInstanceFactory(final InstanceFactory instanceFactory)
 	{
 		this.instanceFactory = instanceFactory;

src/main/java/de/danielbechler/diff/introspection/DefaultIntrospector.java

@@ -14,19 +14,26 @@ public class DefaultIntrospector implements Introspector
 	public TypeInfo introspect(final Class<?> type)
 	{
 		final TypeInfo typeInfo = new TypeInfo(type);
+
+		final Collection<PropertyAwareAccessor> getterSetterAccessors = getterSetterIntrospector.introspect(type).getAccessors();
+		for (final PropertyAwareAccessor getterSetterAccessor : getterSetterAccessors)
+		{
+			typeInfo.addPropertyAccessor(getterSetterAccessor);
+		}
+
 		if (returnFields)
 		{
 			final Collection<PropertyAwareAccessor> fieldAccessors = fieldIntrospector.introspect(type).getAccessors();
 			for (final PropertyAwareAccessor fieldAccessor : fieldAccessors)
 			{
-				typeInfo.addPropertyAccessor(fieldAccessor);
+				final String propertyName = fieldAccessor.getPropertyName();
+				if (typeInfo.getAccessorByName(propertyName) == null)
+				{
+					typeInfo.addPropertyAccessor(fieldAccessor);
+				}
 			}
 		}
-		final Collection<PropertyAwareAccessor> getterSetterAccessors = getterSetterIntrospector.introspect(type).getAccessors();
-		for (final PropertyAwareAccessor getterSetterAccessor : getterSetterAccessors)
-		{
-			typeInfo.addPropertyAccessor(getterSetterAccessor);
-		}
+
 		return typeInfo;
 	}
 

src/main/java/de/danielbechler/diff/introspection/FieldAccessor.java

@@ -102,4 +102,12 @@ public boolean isExcludedByAnnotation()
 		ObjectDiffProperty annotation = getFieldAnnotation(ObjectDiffProperty.class);
 		return annotation != null && annotation.excluded();
 	}
+
+	@Override
+	public String toString()
+	{
+		return "FieldAccessor{" +
+				"field=" + field +
+				'}';
+	}
 }