Merge pull request #113 from derjust/Issue_103

#103 Update Marshaller to use DynamoDBTypeConverter

Author: derjust

src/changes/changes.xml

@@ -10,6 +10,9 @@
       <action dev="vitolimandibhrata" issue="40" type="add" date="2017-01-07">
         Added support for Auditing
       </action>
+      <action dev="derjust" issue="103" type="add" date="2018-01-07">
+        Update Marshaller to use DynamoDBTypeConverter (while keeping old inheritance intact)
+      </action>
     </release>
     <release version="5.0.1" date="2018-01-06" description="Maintenance release">
       <action dev="derjust" issue="68" type="fix" date="2017-12-01" >

src/main/java/org/socialsignin/spring/data/dynamodb/marshaller/DateDynamoDBMarshaller.java

@@ -1,16 +1,22 @@
 package org.socialsignin.spring.data.dynamodb.marshaller;
 
 import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMarshaller;
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTypeConverter;
 import org.springframework.util.StringUtils;
 
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.util.Date;
 
-public abstract class DateDynamoDBMarshaller implements DynamoDBMarshaller<Date> {
+public abstract class DateDynamoDBMarshaller implements DynamoDBTypeConverter<String, Date>, DynamoDBMarshaller<Date> {
 
 	public abstract DateFormat getDateFormat();
 
+	@Override
+	public String convert(Date object) {
+		return marshall(object);
+	}
+
 	@Override
 	public String marshall(Date getterReturnResult) {
 		if (getterReturnResult == null) {
@@ -20,6 +26,11 @@ public String marshall(Date getterReturnResult) {
 		}
 	}
 
+	@Override
+	public Date unconvert(String object) {
+		return unmarshall(Date.class, object);
+	}
+
 	@Override
 	public Date unmarshall(Class<Date> clazz, String obj) {
 		if (StringUtils.isEmpty(obj)) {

src/main/java/org/socialsignin/spring/data/dynamodb/marshaller/Instant2EpocheDynamoDBMarshaller.java

@@ -1,11 +1,17 @@
 package org.socialsignin.spring.data.dynamodb.marshaller;
 
 import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMarshaller;
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTypeConverter;
 import org.springframework.util.StringUtils;
 
 import java.time.Instant;
 
-public class Instant2EpocheDynamoDBMarshaller implements DynamoDBMarshaller<Instant> {
+public class Instant2EpocheDynamoDBMarshaller implements DynamoDBTypeConverter<String, Instant>, DynamoDBMarshaller<Instant> {
+
+	@Override
+	public String convert(Instant object) {
+		return marshall(object);
+	}
 
 	@Override
 	public String marshall(Instant getterReturnResult) {
@@ -16,6 +22,11 @@ public String marshall(Instant getterReturnResult) {
 		}
 	}
 
+	@Override
+	public Instant unconvert(String object) {
+		return unmarshall(Instant.class, object);
+	}
+
 	@Override
 	public Instant unmarshall(Class<Instant> clazz, String obj) {
 		if (StringUtils.isEmpty(obj)) {

src/main/java/org/socialsignin/spring/data/dynamodb/marshaller/Instant2IsoDynamoDBMarshaller.java

@@ -1,13 +1,14 @@
 package org.socialsignin.spring.data.dynamodb.marshaller;
 
 import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMarshaller;
+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTypeConverter;
 import org.springframework.util.StringUtils;
 
 import java.time.Instant;
 import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
 
-public class Instant2IsoDynamoDBMarshaller implements DynamoDBMarshaller<Instant> {
+public class Instant2IsoDynamoDBMarshaller implements DynamoDBTypeConverter<String, Instant>, DynamoDBMarshaller<Instant> {
 
 	private static final String PATTERN = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";
 
@@ -16,6 +17,11 @@ private DateTimeFormatter getDateFormat() {
 			.withZone(ZoneOffset.UTC);
 	}
 
+	@Override
+	public String convert(Instant object) {
+		return marshall(object);
+	}
+
 	@Override
 	public String marshall(Instant getterReturnResult) {
 		if (getterReturnResult == null) {
@@ -25,6 +31,11 @@ public String marshall(Instant getterReturnResult) {
 		}
 	}
 
+	@Override
+	public Instant unconvert(String object) {
+		return unmarshall(Instant.class, object);
+	}
+
 	@Override
 	public Instant unmarshall(Class<Instant> clazz, String obj) {
 		if (StringUtils.isEmpty(obj)) {

src/test/java/org/socialsignin/spring/data/dynamodb/marshaller/Date2EpocheDynamoDBMarshallerTest.java

@@ -26,9 +26,8 @@ public void testNullMarshall() {
 
 	@Test
 	public void testMarshall() {
-		String actual = underTest.marshall(new Date(0));
-
-		assertEquals("0", actual);
+		assertEquals("0", underTest.marshall(new Date(0)));
+		assertEquals("0", underTest.convert(new Date(0)));
 	}
 
 	@Test
@@ -40,9 +39,9 @@ public void testUnmarshallNull() {
 
 	@Test
 	public void testUnmarshall() {
-		Date actual = underTest.unmarshall(Date.class, "0");
+		assertEquals(new Date(0), underTest.unmarshall(Date.class, "0"));
+		assertEquals(new Date(0), underTest.unconvert("0"));;
 
-		assertEquals(new Date(0), actual);
 	}
 
 	@Test(expected = NumberFormatException.class)

src/test/java/org/socialsignin/spring/data/dynamodb/marshaller/Date2IsoDynamoDBMarshallerTest.java

@@ -26,9 +26,8 @@ public void testNullMarshall() {
 
 	@Test
 	public void testMarshall() {
-		String actual = underTest.marshall(new Date(0));
-
-		assertEquals("1970-01-01T00:00:00.000Z", actual);
+		assertEquals("1970-01-01T00:00:00.000Z", underTest.marshall(new Date(0)));
+		assertEquals("1970-01-01T00:00:00.000Z", underTest.convert(new Date(0)));
 	}
 
 	@Test
@@ -40,9 +39,8 @@ public void testUnmarshallNull() {
 
 	@Test
 	public void testUnmarshall() {
-		Date actual = underTest.unmarshall(Date.class, "1970-01-01T00:00:00.000Z");
-
-		assertEquals(new Date(0), actual);
+		assertEquals(new Date(0), underTest.unmarshall(Date.class, "1970-01-01T00:00:00.000Z"));
+		assertEquals(new Date(0), underTest.unconvert("1970-01-01T00:00:00.000Z"));
 	}
 
 	@Test(expected = RuntimeException.class)

src/test/java/org/socialsignin/spring/data/dynamodb/marshaller/Instant2EpocheDynamoDBMarshallerTest.java

@@ -26,9 +26,8 @@ public void testNullMarshall() {
 
 	@Test
 	public void testMarshall() {
-		String actual = underTest.marshall(Instant.ofEpochMilli(0));
-
-		assertEquals("0", actual);
+		assertEquals("0", underTest.marshall(Instant.ofEpochMilli(0)));
+		assertEquals("0", underTest.convert(Instant.ofEpochMilli(0)));
 	}
 
 	@Test
@@ -40,9 +39,8 @@ public void testUnmarshallNull() {
 
 	@Test
 	public void testUnmarshall() {
-		Instant actual = underTest.unmarshall(Instant.class, "0");
-
-		assertEquals(Instant.ofEpochMilli(0), actual);
+		assertEquals(Instant.ofEpochMilli(0), underTest.unmarshall(Instant.class, "0"));
+		assertEquals(Instant.ofEpochMilli(0), underTest.unconvert("0"));
 	}
 
 	@Test(expected = NumberFormatException.class)

src/test/java/org/socialsignin/spring/data/dynamodb/marshaller/Instant2IsoDynamoDBMarshallerTest.java

@@ -26,9 +26,8 @@ public void testNullMarshall() {
 
 	@Test
 	public void testMarshall() {
-		String actual = underTest.marshall(Instant.ofEpochMilli(0));
-
-		assertEquals("1970-01-01T00:00:00.000Z", actual);
+		assertEquals("1970-01-01T00:00:00.000Z", underTest.marshall(Instant.ofEpochMilli(0)));
+		assertEquals("1970-01-01T00:00:00.000Z", underTest.convert(Instant.ofEpochMilli(0)));
 	}
 
 	@Test
@@ -40,9 +39,8 @@ public void testUnmarshallNull() {
 
 	@Test
 	public void testUnmarshall() {
-		Instant actual = underTest.unmarshall(Instant.class, "1970-01-01T00:00:00.000Z");
-
-		assertEquals(Instant.ofEpochMilli(0), actual);
+		assertEquals(Instant.ofEpochMilli(0), underTest.unmarshall(Instant.class, "1970-01-01T00:00:00.000Z"));
+		assertEquals(Instant.ofEpochMilli(0), underTest.unconvert("1970-01-01T00:00:00.000Z"));
 	}
 
 	@Test(expected = RuntimeException.class)