>();
serializeNulls = false;
dateStyle = DateFormat.DEFAULT;
+ timeStyle = DateFormat.DEFAULT;
}
/**
@@ -225,6 +227,28 @@ public final class GsonBuilder {
return this;
}
+ /**
+ * Configures Gson to to serialize {@code Date} objects according to the style value provided.
+ * You can call this method or {@link #setDateFormat(String)} multiple times, but only the last
+ * invocation will be used to decide the serialization format.
+ *
+ * Note that this style value should be one of the predefined constants in the
+ * {@code DateFormat} class. See the documentation in {@link java.text.DateFormat} for more
+ * information on the valid style constants.
+ *
+ * @param dateStyle the predefined date style that date objects will be serialized/deserialized
+ * to/from
+ * @param timeStyle the predefined style for the time portion of the date objects
+ * @return a reference to this {@code GsonBuilder} object to fulfill the "Builder" pattern
+ * @since 1.2
+ */
+ public GsonBuilder setDateFormat(int dateStyle, int timeStyle) {
+ this.dateStyle = dateStyle;
+ this.timeStyle = timeStyle;
+ this.datePattern = null;
+ return this;
+ }
+
/**
* Configures Gson for custom serialization or deserialization. This method combines the
* registration of an {@link InstanceCreator}, {@link JsonSerializer}, and a
@@ -323,7 +347,8 @@ public final class GsonBuilder {
ParameterizedTypeHandlerMap> customSerializers = serializers.copyOf();
ParameterizedTypeHandlerMap> customDeserializers = deserializers.copyOf();
- addTypeAdaptersForDate(datePattern, dateStyle, customSerializers, customDeserializers);
+ addTypeAdaptersForDate(datePattern, dateStyle, timeStyle, customSerializers,
+ customDeserializers);
customSerializers.registerIfAbsent(DefaultTypeAdapters.DEFAULT_SERIALIZERS);
customDeserializers.registerIfAbsent(DefaultTypeAdapters.DEFAULT_DESERIALIZERS);
@@ -337,15 +362,15 @@ public final class GsonBuilder {
return gson;
}
- private static void addTypeAdaptersForDate(String datePattern, int dateStyle,
+ private static void addTypeAdaptersForDate(String datePattern, int dateStyle, int timeStyle,
ParameterizedTypeHandlerMap> serializers,
ParameterizedTypeHandlerMap> deserializers) {
// NOTE: if a date pattern exists, then that style takes priority
DefaultDateTypeAdapter dateTypeAdapter = null;
if (datePattern != null && !"".equals(datePattern.trim())) {
dateTypeAdapter = new DefaultDateTypeAdapter(datePattern);
- } else if (dateStyle != DateFormat.DEFAULT) {
- dateTypeAdapter = new DefaultDateTypeAdapter(dateStyle);
+ } else if (dateStyle != DateFormat.DEFAULT && timeStyle != DateFormat.DEFAULT) {
+ dateTypeAdapter = new DefaultDateTypeAdapter(dateStyle, timeStyle);
}
if (dateTypeAdapter != null
&& !serializers.hasAnyHandlerFor(Date.class)
diff --git a/gson/src/test/java/com/google/gson/functional/DefaultTypeAdaptersTest.java b/gson/src/test/java/com/google/gson/functional/DefaultTypeAdaptersTest.java
index 89eec9ab..3878b8b5 100644
--- a/gson/src/test/java/com/google/gson/functional/DefaultTypeAdaptersTest.java
+++ b/gson/src/test/java/com/google/gson/functional/DefaultTypeAdaptersTest.java
@@ -187,44 +187,52 @@ public class DefaultTypeAdaptersTest extends TestCase {
public void testDefaultDateSerialization() {
Date now = new Date();
String json = gson.toJson(now);
- assertEquals("\"" + DateFormat.getDateInstance().format(now) + "\"", json);
+ assertEquals("\"" + DateFormat.getDateTimeInstance().format(now) + "\"", json);
}
public void testDefaultDateDeserialization() {
Date date = new Date();
- assertEquals(date, gson.fromJson(gson.toJson(date), Date.class));
+ String json = gson.toJson(date);
+ Date extracted = gson.fromJson(json, Date.class);
+ // Using comparison of string forms since the extracted date has lost the millisecond portion.
+ assertEquals(date.toString(), extracted.toString());
}
-
+
public void testDefaultDateSerializationUsingBuilder() throws Exception {
Gson gson = new GsonBuilder().create();
Date now = new Date();
String json = gson.toJson(now);
- assertEquals("\"" + DateFormat.getDateInstance().format(now) + "\"", json);
+ assertEquals("\"" + DateFormat.getDateTimeInstance().format(now) + "\"", json);
}
public void testDefaultDateDeserializationUsingBuilder() throws Exception {
Gson gson = new GsonBuilder().create();
Date now = new Date();
String json = gson.toJson(now);
- assertEquals(now, gson.fromJson(json, Date.class));
+ Date extracted = gson.fromJson(json, Date.class);
+ assertEquals(now.toString(), extracted.toString());
}
public void testDateSerializationWithPattern() throws Exception {
String pattern = "yyyy-MM-dd";
DateFormat formatter = new SimpleDateFormat(pattern);
- Gson gson = new GsonBuilder().setDateFormat(DateFormat.LONG).setDateFormat(pattern).create();
+ Gson gson = new GsonBuilder().setDateFormat(DateFormat.FULL).setDateFormat(pattern).create();
Date now = new Date();
String json = gson.toJson(now);
assertEquals("\"" + formatter.format(now) + "\"", json);
}
+ @SuppressWarnings("deprecation")
public void testDateDeserializationWithPattern() throws Exception {
String pattern = "yyyy-MM-dd";
DateFormat formatter = new SimpleDateFormat(pattern);
- Gson gson = new GsonBuilder().setDateFormat(DateFormat.LONG).setDateFormat(pattern).create();
+ Gson gson = new GsonBuilder().setDateFormat(DateFormat.FULL).setDateFormat(pattern).create();
Date now = new Date();
String json = gson.toJson(now);
- assertEquals(now, gson.fromJson(json, Date.class));
+ Date extracted = gson.fromJson(json, Date.class);
+ assertEquals(now.getYear(), extracted.getYear());
+ assertEquals(now.getMonth(), extracted.getMonth());
+ assertEquals(now.getDay(), extracted.getDay());
}
private static class ClassWithBigDecimal {