Simplified Introspector and renamed BeanPropertyX stuff to PropertyX stuff

Author: SQiShER

src/main/java/de/danielbechler/diff/access/CategoryAware.java

@@ -23,5 +23,5 @@
  */
 public interface CategoryAware
 {
-	Set<String> getCategories();
+	Set<String> getCategoriesFromAnnotation();
 }

src/main/java/de/danielbechler/diff/access/ExclusionAware.java

@@ -21,5 +21,5 @@
  */
 public interface ExclusionAware
 {
-	boolean isExcluded();
+	boolean isExcludedByAnnotation();
 }

src/main/java/de/danielbechler/diff/introspection/StandardPropertyAccessExceptionHandler.java renamed to src/main/java/de/danielbechler/diff/introspection/DefaultPropertyAccessExceptionHandler.java

@@ -20,20 +20,19 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings("UnusedDeclaration")
-public class StandardPropertyAccessExceptionHandler implements BeanPropertyAccessExceptionHandler
+public class DefaultPropertyAccessExceptionHandler implements PropertyAccessExceptionHandler
 {
-	private static final Logger logger = LoggerFactory.getLogger(StandardPropertyAccessExceptionHandler.class);
+	private static final Logger logger = LoggerFactory.getLogger(DefaultPropertyAccessExceptionHandler.class);
 
-	public DiffNode onPropertyWriteException(final BeanPropertyWriteException exception, final DiffNode node)
+	public DiffNode onPropertyWriteException(final PropertyWriteException exception, final DiffNode node)
 	{
 		final Object newValue = exception.getNewValue();
 		final String propertyName = exception.getPropertyName();
 		logger.info("Couldn't set new value '{}' for property '{}'", newValue, propertyName);
 		throw exception;
 	}
 
-	public DiffNode onPropertyReadException(final BeanPropertyReadException exception, final DiffNode node)
+	public DiffNode onPropertyReadException(final PropertyReadException exception, final DiffNode node)
 	{
 		throw exception;
 	}

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

@@ -36,7 +36,7 @@ public class IntrospectionService implements IntrospectionConfigurer, IsIntrospe
 	private final NodePathValueHolder<Introspector> nodePathIntrospectorHolder = new NodePathValueHolder<Introspector>();
 	private final NodePathValueHolder<IntrospectionMode> nodePathIntrospectionModeHolder = new NodePathValueHolder<IntrospectionMode>();
 	private final ObjectDifferBuilder objectDifferBuilder;
-	private Introspector defaultIntrospector = new StandardBeanIntrospector();
+	private Introspector defaultIntrospector = new StandardIntrospector();
 
 	public IntrospectionService(final ObjectDifferBuilder objectDifferBuilder)
 	{

src/main/java/de/danielbechler/diff/introspection/BeanPropertyException.java renamed to src/main/java/de/danielbechler/diff/introspection/PropertyAccessException.java

@@ -19,14 +19,14 @@
 /**
  * @author Daniel Bechler
  */
-public abstract class BeanPropertyException extends RuntimeException
+public abstract class PropertyAccessException extends RuntimeException
 {
 	private static final long serialVersionUID = 1L;
 
 	private String propertyName;
 	private Class<?> targetType;
 
-	public BeanPropertyException(final Throwable cause)
+	public PropertyAccessException(final Throwable cause)
 	{
 		super(cause);
 	}

src/main/java/de/danielbechler/diff/introspection/BeanPropertyAccessExceptionHandler.java renamed to src/main/java/de/danielbechler/diff/introspection/PropertyAccessExceptionHandler.java

@@ -21,10 +21,9 @@
 /**
  * @author Daniel Bechler
  */
-@SuppressWarnings("UnusedDeclaration")
-public interface BeanPropertyAccessExceptionHandler
+public interface PropertyAccessExceptionHandler
 {
-	DiffNode onPropertyWriteException(BeanPropertyWriteException ex, DiffNode propertyNode);
+	DiffNode onPropertyWriteException(PropertyWriteException exception, DiffNode node);
 
-	DiffNode onPropertyReadException(BeanPropertyReadException ex, DiffNode propertyNode);
+	DiffNode onPropertyReadException(PropertyReadException exception, DiffNode node);
 }

src/main/java/de/danielbechler/diff/introspection/BeanPropertyAccessor.java renamed to src/main/java/de/danielbechler/diff/introspection/PropertyAccessor.java

@@ -24,28 +24,28 @@
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
-import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
 
+import static java.util.Arrays.asList;
+
 /**
  * @author Daniel Bechler
  */
-public class BeanPropertyAccessor implements PropertyAwareAccessor
+public class PropertyAccessor implements PropertyAwareAccessor
 {
-	private static final Logger logger = LoggerFactory.getLogger(BeanPropertyAccessor.class);
+	private static final Logger logger = LoggerFactory.getLogger(PropertyAccessor.class);
 
 	private final String propertyName;
 	private final Class<?> type;
 	private final Method readMethod;
 	private final Method writeMethod;
-	private Set<String> categories = new TreeSet<String>();
-	private boolean excluded;
 
-	public BeanPropertyAccessor(final String propertyName, final Method readMethod, final Method writeMethod)
+	public PropertyAccessor(final String propertyName, final Method readMethod, final Method writeMethod)
 	{
 		Assert.notNull(propertyName, "propertyName");
 		Assert.notNull(readMethod, "readMethod");
@@ -57,31 +57,28 @@ public BeanPropertyAccessor(final String propertyName, final Method readMethod,
 
 	private static Method makeAccessible(final Method method)
 	{
-		if (method != null)
+		if (method != null && !method.isAccessible())
 		{
+			logger.debug("Making method accessible: {}", method.toString());
 			method.setAccessible(true);
 		}
 		return method;
 	}
 
-	public final Set<String> getCategories()
+	public final Set<String> getCategoriesFromAnnotation()
 	{
-		return categories;
-	}
-
-	public final void setCategories(final Set<String> categories)
-	{
-		this.categories = categories;
-	}
-
-	public boolean isExcluded()
-	{
-		return excluded;
+		final ObjectDiffProperty annotation = readMethod.getAnnotation(ObjectDiffProperty.class);
+		if (annotation != null)
+		{
+			return new TreeSet<String>(asList(annotation.categories()));
+		}
+		return Collections.emptySet();
 	}
 
-	public void setExcluded(final boolean excluded)
+	public boolean isExcludedByAnnotation()
 	{
-		this.excluded = excluded;
+		final ObjectDiffProperty annotation = readMethod.getAnnotation(ObjectDiffProperty.class);
+		return annotation != null && annotation.excluded();
 	}
 
 	public String getPropertyName()
@@ -94,7 +91,7 @@ public String getPropertyName()
 	 */
 	public Set<Annotation> getReadMethodAnnotations()
 	{
-		return new LinkedHashSet<Annotation>(Arrays.asList(readMethod.getAnnotations()));
+		return new LinkedHashSet<Annotation>(asList(readMethod.getAnnotations()));
 	}
 
 	public <T extends Annotation> T getReadMethodAnnotation(final Class<T> annotationClass)
@@ -129,7 +126,7 @@ public Object get(final Object target)
 		}
 		catch (final Exception e)
 		{
-			final BeanPropertyReadException ex = new BeanPropertyReadException(e);
+			final PropertyReadException ex = new PropertyReadException(e);
 			ex.setPropertyName(propertyName);
 			ex.setTargetType(target.getClass());
 			throw ex;
@@ -191,7 +188,7 @@ private void invokeWriteMethod(final Object target, final Object value)
 		}
 		catch (final Exception e)
 		{
-			final BeanPropertyWriteException ex = new BeanPropertyWriteException(e, value);
+			final PropertyWriteException ex = new PropertyWriteException(e, value);
 			ex.setPropertyName(propertyName);
 			ex.setTargetType(getType());
 			throw ex;

src/main/java/de/danielbechler/diff/introspection/BeanPropertyReadException.java renamed to src/main/java/de/danielbechler/diff/introspection/PropertyReadException.java

@@ -19,11 +19,11 @@
 /**
  * @author Daniel Bechler
  */
-public class BeanPropertyReadException extends BeanPropertyException
+public class PropertyReadException extends PropertyAccessException
 {
 	private static final long serialVersionUID = 1L;
 
-	public BeanPropertyReadException(final Throwable cause)
+	public PropertyReadException(final Throwable cause)
 	{
 		super(cause);
 	}

src/main/java/de/danielbechler/diff/introspection/BeanPropertyWriteException.java renamed to src/main/java/de/danielbechler/diff/introspection/PropertyWriteException.java

@@ -19,12 +19,12 @@
 /**
  * @author Daniel Bechler
  */
-public class BeanPropertyWriteException extends BeanPropertyException
+public class PropertyWriteException extends PropertyAccessException
 {
 	private static final long serialVersionUID = 1L;
 	private Object newValue;
 
-	public BeanPropertyWriteException(final Throwable cause, final Object newValue)
+	public PropertyWriteException(final Throwable cause, final Object newValue)
 	{
 		super(cause);
 		this.newValue = newValue;

src/main/java/de/danielbechler/diff/introspection/StandardBeanIntrospector.java renamed to src/main/java/de/danielbechler/diff/introspection/StandardIntrospector.java

@@ -18,7 +18,6 @@
 
 import de.danielbechler.diff.access.PropertyAwareAccessor;
 import de.danielbechler.util.Assert;
-import de.danielbechler.util.Collections;
 import de.danielbechler.util.Exceptions;
 
 import java.beans.BeanInfo;
@@ -34,7 +33,7 @@
  *
  * @author Daniel Bechler
  */
-public class StandardBeanIntrospector implements de.danielbechler.diff.introspection.Introspector
+public class StandardIntrospector implements de.danielbechler.diff.introspection.Introspector
 {
 	public Iterable<PropertyAwareAccessor> introspect(final Class<?> type)
 	{
@@ -55,11 +54,14 @@ private Iterable<PropertyAwareAccessor> internalIntrospect(final Class<?> type)
 		final Collection<PropertyAwareAccessor> accessors = new ArrayList<PropertyAwareAccessor>(descriptors.length);
 		for (final PropertyDescriptor descriptor : descriptors)
 		{
-			final PropertyAwareAccessor accessor = handlePropertyDescriptor(descriptor);
-			if (accessor != null)
+			if (shouldSkip(descriptor))
 			{
-				accessors.add(accessor);
+				continue;
 			}
+			final String propertyName = descriptor.getName();
+			final Method readMethod = descriptor.getReadMethod();
+			final Method writeMethod = descriptor.getWriteMethod();
+			accessors.add(new PropertyAccessor(propertyName, readMethod, writeMethod));
 		}
 		return accessors;
 	}
@@ -69,24 +71,6 @@ protected BeanInfo getBeanInfo(final Class<?> type) throws IntrospectionExceptio
 		return Introspector.getBeanInfo(type);
 	}
 
-	private static PropertyAwareAccessor handlePropertyDescriptor(final PropertyDescriptor descriptor)
-	{
-		if (shouldSkip(descriptor))
-		{
-			return null;
-		}
-
-		final String propertyName = descriptor.getName();
-		final Method readMethod = descriptor.getReadMethod();
-		final Method writeMethod = descriptor.getWriteMethod();
-
-		final BeanPropertyAccessor accessor = new BeanPropertyAccessor(propertyName, readMethod, writeMethod);
-
-		handleObjectDiffPropertyAnnotation(readMethod, accessor);
-
-		return accessor;
-	}
-
 	private static boolean shouldSkip(final PropertyDescriptor descriptor)
 	{
 		if (descriptor.getName().equals("class")) // Java & Groovy
@@ -103,15 +87,4 @@ private static boolean shouldSkip(final PropertyDescriptor descriptor)
 		}
 		return false;
 	}
-
-	private static void handleObjectDiffPropertyAnnotation(final Method readMethod,
-														   final BeanPropertyAccessor propertyAccessor)
-	{
-		final ObjectDiffProperty annotation = readMethod.getAnnotation(ObjectDiffProperty.class);
-		if (annotation != null)
-		{
-			propertyAccessor.setExcluded(annotation.excluded());
-			propertyAccessor.setCategories(Collections.setOf(annotation.categories()));
-		}
-	}
 }