Checking both method and fields for a DynamoDBMarshaller annotation

First checks for a method with the given property name and annotation
and if not found then checks for a field with the given property name and
annotation.

Author: Michael Wolfe

src/main/java/org/socialsignin/spring/data/dynamodb/repository/support/DynamoDBEntityMetadataSupport.java

@@ -286,11 +286,23 @@ public String getOverriddenAttributeName(final String propertyName) {
 
 	@Override
 	public DynamoDBMarshaller<?> getMarshallerForProperty(final String propertyName) {
+		DynamoDBMarshalling annotation = null;
 
 		Method method = findMethod(propertyName);
-		if (method != null && method.getAnnotation(DynamoDBMarshalling.class) != null) {
+		if (method != null) {
+			annotation = method.getAnnotation(DynamoDBMarshalling.class);
+		}
+
+		if(annotation == null) {
+			Field field = findField(propertyName);
+			if(field != null) {
+				annotation = field.getAnnotation(DynamoDBMarshalling.class);
+			}
+		}
+
+		if(annotation != null) {
 			try {
-				return method.getAnnotation(DynamoDBMarshalling.class).marshallerClass().newInstance();
+				return annotation.marshallerClass().newInstance();
 			} catch (InstantiationException e) {
 				throw new RuntimeException(e);
 			} catch (IllegalAccessException e) {