Improving Unit test coverage

Author: derjust

src/main/java/org/socialsignin/spring/data/dynamodb/config/AbstractDynamoDBConfiguration.java

@@ -88,7 +88,7 @@ public DynamoDBMappingContext dynamoDBMappingContext() throws ClassNotFoundExcep
      */
     protected Set<Class<?>> getInitialEntitySet() throws ClassNotFoundException {
 
-        Set<Class<?>> initialEntitySet = new HashSet<Class<?>>();
+        Set<Class<?>> initialEntitySet = new HashSet<>();
 
         String[] basePackages = getMappingBasePackages();
 

src/main/java/org/socialsignin/spring/data/dynamodb/mapping/AbstractDynamoDBDateMarshaller.java

@@ -23,6 +23,7 @@
 
 /**
  * @author Michael Lavelle
+ * @author Sebastian Just
  * @deprecated According to {@code com.amazonaws.services.dynamodbv2.datamodeling.marshallers.CustomMarshaller.marshall(Object)}
  * at some point {@link DynamoDBMarshaller} might be cached - whereas {@link DateFormat} is not thread-safe. <br>
  * Use {@link org.socialsignin.spring.data.dynamodb.marshaller.DateDynamoDBMarshaller} instead.
@@ -39,15 +40,23 @@ public AbstractDynamoDBDateMarshaller(DateFormat dateFormat) {
 
 	@Override
 	public String marshall(Date getterReturnResult) {
-		return dateFormat.format(getterReturnResult);
+		if (getterReturnResult == null) {
+			return null;
+		} else {
+			return dateFormat.format(getterReturnResult);
+		}
 	}
 
 	@Override
-	public Date unmarshall(Class<Date> clazz, String obj) {
-		try {
-			return dateFormat.parse(obj);
-		} catch (ParseException e) {
-			throw new RuntimeException(e);
+	public Date unmarshall(Class<Date> clazz, String obj) throws IllegalArgumentException {
+		if (obj == null) {
+			return null;
+		} else {
+			try {
+				return dateFormat.parse(obj);
+			} catch (ParseException e) {
+				throw new IllegalArgumentException("Could not unmarshall '" + obj + "' via " + dateFormat, e);
+			}
 		}
 	}
 

src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DefaultDynamoDBDateMarshaller.java

@@ -20,17 +20,26 @@
 
 /**
  * @author Michael Lavelle
+ * @author Sebastian Just
  * @deprecated Consider using {@link org.socialsignin.spring.data.dynamodb.marshaller.Date2IsoDynamoDBMarshaller}
  */
 @Deprecated
 public class DefaultDynamoDBDateMarshaller extends AbstractDynamoDBDateMarshaller {
 
+	private static final class UTCSimpleDateFormat extends SimpleDateFormat {
+		private static final long serialVersionUID = 1L;
+		private UTCSimpleDateFormat() {
+			super("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
+			setTimeZone(TimeZone.getTimeZone("UTC"));
+		}
+
+		@Override
+		public String toString() {
+			return toPattern();
+		}
+	}
+
 	public DefaultDynamoDBDateMarshaller() {
-		super(new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'") {
-			private static final long serialVersionUID = 1L;
-			{
-				setTimeZone(TimeZone.getTimeZone("UTC"));
-			}
-		});
+		super(new UTCSimpleDateFormat());
 	}
 }

src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBMappingContext.java

@@ -32,6 +32,7 @@
  * as primary abstractions.
  *
  * @author Michael Lavelle
+ * @author Sebastian Just
  */
 public class DynamoDBMappingContext extends AbstractMappingContext<DynamoDBPersistentEntityImpl<?>, DynamoDBPersistentProperty> {
 	/*
@@ -43,7 +44,7 @@ public class DynamoDBMappingContext extends AbstractMappingContext<DynamoDBPersi
 	 */
 	@Override
 	protected <T> DynamoDBPersistentEntityImpl<?> createPersistentEntity(TypeInformation<T> typeInformation) {
-		return new DynamoDBPersistentEntityImpl<T>(typeInformation, null);
+		return new DynamoDBPersistentEntityImpl<>(typeInformation, null);
 
 	}
 

src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentEntity.java

@@ -21,6 +21,7 @@
  * Interface for a DynamoDB-specific entity.
  * 
  * @author Michael Lavelle
+ * @author Sebastian Just
  */
 public interface DynamoDBPersistentEntity<T> extends PersistentEntity<T, DynamoDBPersistentProperty> {
 

src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentEntityImpl.java

@@ -25,6 +25,7 @@
  * DynamoDB specific {@link DynamoDBPersistentEntity} implementation
  * 
  * @author Michael Lavelle
+ * @author Sebastian Just
  */
 public class DynamoDBPersistentEntityImpl<T> extends BasicPersistentEntity<T, DynamoDBPersistentProperty> implements
 		DynamoDBPersistentEntity<T> {

src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentProperty.java

@@ -21,11 +21,12 @@
  * Interface for a DynamoDB-specific {@link PersistentProperty}.
  * 
  * @author Michael Lavelle
+ * @author Sebastian Just
  */
 public interface DynamoDBPersistentProperty extends PersistentProperty<DynamoDBPersistentProperty> {
 
-	public boolean isHashKeyProperty();
+	boolean isHashKeyProperty();
 
-	public boolean isCompositeIdProperty();
+	boolean isCompositeIdProperty();
 
 }

src/main/java/org/socialsignin/spring/data/dynamodb/mapping/DynamoDBPersistentPropertyImpl.java

@@ -36,6 +36,7 @@
  * {@link DynamoDBPersistentProperty} implementation
  * 
  * @author Michael Lavelle
+ * @author Sebastian Just
  */
 class DynamoDBPersistentPropertyImpl extends AnnotationBasedPersistentProperty<DynamoDBPersistentProperty> implements
 		DynamoDBPersistentProperty {
@@ -50,7 +51,7 @@ class DynamoDBPersistentPropertyImpl extends AnnotationBasedPersistentProperty<D
 		annotations.add(Reference.class); // Reference not yet supported
 		ASSOCIATION_ANNOTATIONS = Collections.unmodifiableSet(annotations);
 
-		annotations = new HashSet<Class<? extends Annotation>>();
+		annotations = new HashSet<>();
 		annotations.add(Id.class);
 		annotations.add(DynamoDBHashKey.class);
 		ID_ANNOTATIONS = annotations;

src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AbstractDynamoDBEventListener.java

@@ -45,6 +45,7 @@
  * Base class to implement domain class specific {@link ApplicationListener}s.
  *
  * @author Michael Lavelle
+ * @author Sebastian Just
  */
 public abstract class AbstractDynamoDBEventListener<E> implements
 		ApplicationListener<DynamoDBMappingEvent<?>> {
@@ -75,18 +76,16 @@ public void onApplicationEvent(DynamoDBMappingEvent<?> event) {
 		@SuppressWarnings("unchecked")
 		E source = (E) event.getSource();
 
-		if (source == null) {
-			return;
-		}
+		// source can not be null as java.util.EventObject can not be constructed with null
+		assert source != null;
 
 		if (event instanceof AfterScanEvent) {
-			if (source instanceof PaginatedScanList) {
-				publishEachElement((PaginatedScanList<?>)source, this::onAfterScan);
-			}
+
+			publishEachElement((PaginatedScanList<?>)source, this::onAfterScan);
+
 		} else if (event instanceof AfterQueryEvent) {
-			if (source instanceof PaginatedQueryList) {
-				publishEachElement((PaginatedQueryList<?>)source, this::onAfterQuery);
-			}
+
+			publishEachElement((PaginatedQueryList<?>)source, this::onAfterQuery);
 		}
 		// Check for matching domain type and invoke callbacks
 		else if (domainClass.isAssignableFrom(source.getClass())) {
@@ -117,45 +116,31 @@ private void publishEachElement(List<?> list, Consumer<E> publishMethod) {
 	}
 
 	public void onBeforeSave(E source) {
-		if (LOG.isDebugEnabled()) {
-			LOG.debug("onBeforeSave({}, {})", source);
-		}
+		LOG.debug("onBeforeSave({}, {})", source);
 	}
 
 	public void onAfterSave(E source) {
-		if (LOG.isDebugEnabled()) {
-			LOG.debug("onAfterSave({}, {})", source);
-		}
+		LOG.debug("onAfterSave({}, {})", source);
 	}
 
 	public void onAfterLoad(E source) {
-		if (LOG.isDebugEnabled()) {
-			LOG.debug("onAfterLoad({})", source);
-		}
+		LOG.debug("onAfterLoad({})", source);
 	}
 
 	public void onAfterDelete(E source) {
-		if (LOG.isDebugEnabled()) {
-			LOG.debug("onAfterDelete({})", source);
-		}
+		LOG.debug("onAfterDelete({})", source);
 	}
 
 	public void onBeforeDelete(E source) {
-		if (LOG.isDebugEnabled()) {
-			LOG.debug("onBeforeDelete({})", source);
-		}
+		LOG.debug("onBeforeDelete({})", source);
 	}
 
 	public void onAfterScan(E source) {
-		if (LOG.isDebugEnabled()) {
-			LOG.debug("onAfterScan({})", source);
-		}
+		LOG.debug("onAfterScan({})", source);
 	}
 
 	public void onAfterQuery(E source) {
-		if (LOG.isDebugEnabled()) {
-			LOG.debug("onAfterQuery({})", source);
-		}
+		LOG.debug("onAfterQuery({})", source);
 	}
 
 }

src/main/java/org/socialsignin/spring/data/dynamodb/mapping/event/AfterDeleteEvent.java

@@ -18,6 +18,7 @@
 
 /**
  * @author Michael Lavelle
+ * @author Sebastian Just
  */
 public class AfterDeleteEvent<T> extends DynamoDBMappingEvent<T> {