changed java.java.time.Instant serialization

Author: Mark

src/main/java/com/arangodb/internal/velocypack/VPackDeserializersAsync.java

@@ -26,6 +26,7 @@
 import java.time.ZoneId;
 
 import com.arangodb.velocypack.VPackDeserializer;
+import com.arangodb.velocypack.internal.VPackDeserializers;
 
 /**
  * @author Mark - mark at arangodb.com
@@ -34,13 +35,13 @@
 public class VPackDeserializersAsync {
 
 	public static VPackDeserializer<Instant> INSTANT = (parent, vpack, context) -> {
-		return vpack.getAsDate().toInstant();
+		return VPackDeserializers.DATE.deserialize(parent, vpack, context).toInstant();
 	};
 	public static VPackDeserializer<LocalDate> LOCAL_DATE = (parent, vpack, context) -> {
-		return vpack.getAsDate().toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+		return INSTANT.deserialize(parent, vpack, context).atZone(ZoneId.systemDefault()).toLocalDate();
 	};
 	public static VPackDeserializer<LocalDateTime> LOCAL_DATE_TIME = (parent, vpack, context) -> {
-		return vpack.getAsDate().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+		return INSTANT.deserialize(parent, vpack, context).atZone(ZoneId.systemDefault()).toLocalDateTime();
 	};
 
 }

src/main/java/com/arangodb/internal/velocypack/VPackSerializersAsync.java

@@ -27,6 +27,7 @@
 import java.util.Date;
 
 import com.arangodb.velocypack.VPackSerializer;
+import com.arangodb.velocypack.internal.VPackSerializers;
 
 /**
  * @author Mark - mark at arangodb.com
@@ -35,13 +36,13 @@
 public class VPackSerializersAsync {
 
 	public static VPackSerializer<Instant> INSTANT = (builder, attribute, value, context) -> {
-		builder.add(attribute, Date.from(value));
+		VPackSerializers.DATE.serialize(builder, attribute, Date.from(value), context);
 	};
 	public static VPackSerializer<LocalDate> LOCAL_DATE = (builder, attribute, value, context) -> {
-		builder.add(attribute, Date.from(value.atStartOfDay(ZoneId.systemDefault()).toInstant()));
+		INSTANT.serialize(builder, attribute, value.atStartOfDay(ZoneId.systemDefault()).toInstant(), context);
 	};
 	public static VPackSerializer<LocalDateTime> LOCAL_DATE_TIME = (builder, attribute, value, context) -> {
-		builder.add(attribute, Date.from(value.atZone(ZoneId.systemDefault()).toInstant()));
+		INSTANT.serialize(builder, attribute, value.atZone(ZoneId.systemDefault()).toInstant(), context);
 	};
 
 }

src/test/java/com/arangodb/velocypack/VPackSerializeDeserializeTest.java

@@ -24,6 +24,8 @@
 import static org.hamcrest.Matchers.notNullValue;
 import static org.junit.Assert.assertThat;
 
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
 import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -40,6 +42,8 @@
  */
 public class VPackSerializeDeserializeTest {
 
+	private static final DateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");// ISO 8601
+
 	protected static class TestEntityDate {
 		private Instant instant;
 		private LocalDate localDate;
@@ -90,12 +94,12 @@ public void serializeDate() {
 		final VPackSlice vpack = builder.build().serialize(new TestEntityDate(1474988621));
 		assertThat(vpack, is(notNullValue()));
 		assertThat(vpack.isObject(), is(true));
-		assertThat(vpack.get("instant").isDate(), is(true));
-		assertThat(vpack.get("instant").getAsDate(), is(new Date(1474988621)));
-		assertThat(vpack.get("localDate").isDate(), is(true));
-		assertThat(vpack.get("localDate").getAsDate(), is(new Date(70, 0, 18)));
-		assertThat(vpack.get("localDateTime").isDate(), is(true));
-		assertThat(vpack.get("localDateTime").getAsDate(), is(new Date(1474988621)));
+		assertThat(vpack.get("instant").isString(), is(true));
+		assertThat(vpack.get("instant").getAsString(), is(DATE_FORMAT.format(new Date(1474988621))));
+		assertThat(vpack.get("localDate").isString(), is(true));
+		assertThat(vpack.get("localDate").getAsString(), is(DATE_FORMAT.format(new Date(70, 0, 18))));
+		assertThat(vpack.get("localDateTime").isString(), is(true));
+		assertThat(vpack.get("localDateTime").getAsString(), is(DATE_FORMAT.format(new Date(1474988621))));
 	}
 
 	@SuppressWarnings("deprecation")
@@ -118,6 +122,26 @@ public void deserializeDate() {
 			is(LocalDateTime.ofInstant(Instant.ofEpochMilli(1475062216), ZoneId.systemDefault())));
 	}
 
+	@SuppressWarnings("deprecation")
+	@Test
+	public void deserializeDateFromString() {
+		final VPackBuilder builder = new VPackBuilder();
+		builder.add(ValueType.OBJECT);
+		builder.add("instant", DATE_FORMAT.format(new Date(1475062216)));
+		builder.add("localDate", DATE_FORMAT.format(new Date(70, 0, 18)));
+		builder.add("localDateTime", DATE_FORMAT.format(new Date(1475062216)));
+		builder.close();
+
+		final VPack.Builder vpackBuilder = new VPack.Builder();
+		VPackConfigureAsync.configure(vpackBuilder);
+		final TestEntityDate entity = vpackBuilder.build().deserialize(builder.slice(), TestEntityDate.class);
+		assertThat(entity, is(notNullValue()));
+		assertThat(entity.instant, is(Instant.ofEpochMilli(1475062216)));
+		assertThat(entity.localDate, is(Instant.ofEpochMilli(1475062216).atZone(ZoneId.systemDefault()).toLocalDate()));
+		assertThat(entity.localDateTime,
+			is(LocalDateTime.ofInstant(Instant.ofEpochMilli(1475062216), ZoneId.systemDefault())));
+	}
+
 	@Test
 	public void date() {
 		final VPack.Builder builder = new VPack.Builder();