diff --git a/gson/pom.xml b/gson/pom.xml
index b6f67be4..a48860af 100644
--- a/gson/pom.xml
+++ b/gson/pom.xml
@@ -113,8 +113,8 @@
maven-compiler-plugin
3.3
-
- 1.5
+
+ 1.6
diff --git a/gson/src/main/java/com/google/gson/DefaultDateTypeAdapter.java b/gson/src/main/java/com/google/gson/DefaultDateTypeAdapter.java
index aa253340..7ea945f8 100644
--- a/gson/src/main/java/com/google/gson/DefaultDateTypeAdapter.java
+++ b/gson/src/main/java/com/google/gson/DefaultDateTypeAdapter.java
@@ -67,6 +67,7 @@ final class DefaultDateTypeAdapter implements JsonSerializer, JsonDeserial
// These methods need to be synchronized since JDK DateFormat classes are not thread-safe
// See issue 162
+ @Override
public JsonElement serialize(Date src, Type typeOfSrc, JsonSerializationContext context) {
synchronized (localFormat) {
String dateFormatAsString = enUsFormat.format(src);
@@ -74,6 +75,7 @@ final class DefaultDateTypeAdapter implements JsonSerializer, JsonDeserial
}
}
+ @Override
public Date deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
throws JsonParseException {
if (!(json instanceof JsonPrimitive)) {
diff --git a/gson/src/main/java/com/google/gson/FieldNamingPolicy.java b/gson/src/main/java/com/google/gson/FieldNamingPolicy.java
index 6b4c72ca..eecb2dbb 100644
--- a/gson/src/main/java/com/google/gson/FieldNamingPolicy.java
+++ b/gson/src/main/java/com/google/gson/FieldNamingPolicy.java
@@ -35,7 +35,7 @@ public enum FieldNamingPolicy implements FieldNamingStrategy {
* unchanged.
*/
IDENTITY() {
- public String translateName(Field f) {
+ @Override public String translateName(Field f) {
return f.getName();
}
},
@@ -51,7 +51,7 @@ public enum FieldNamingPolicy implements FieldNamingStrategy {
*
*/
UPPER_CAMEL_CASE() {
- public String translateName(Field f) {
+ @Override public String translateName(Field f) {
return upperCaseFirstLetter(f.getName());
}
},
@@ -70,7 +70,7 @@ public enum FieldNamingPolicy implements FieldNamingStrategy {
* @since 1.4
*/
UPPER_CAMEL_CASE_WITH_SPACES() {
- public String translateName(Field f) {
+ @Override public String translateName(Field f) {
return upperCaseFirstLetter(separateCamelCase(f.getName(), " "));
}
},
@@ -88,7 +88,7 @@ public enum FieldNamingPolicy implements FieldNamingStrategy {
*
*/
LOWER_CASE_WITH_UNDERSCORES() {
- public String translateName(Field f) {
+ @Override public String translateName(Field f) {
return separateCamelCase(f.getName(), "_").toLowerCase(Locale.ENGLISH);
}
},
@@ -111,7 +111,7 @@ public enum FieldNamingPolicy implements FieldNamingStrategy {
* @since 1.4
*/
LOWER_CASE_WITH_DASHES() {
- public String translateName(Field f) {
+ @Override public String translateName(Field f) {
return separateCamelCase(f.getName(), "-").toLowerCase(Locale.ENGLISH);
}
};
@@ -166,4 +166,4 @@ public enum FieldNamingPolicy implements FieldNamingStrategy {
? firstCharacter + srcString.substring(indexOfSubstring)
: String.valueOf(firstCharacter);
}
-}
\ No newline at end of file
+}
diff --git a/gson/src/main/java/com/google/gson/Gson.java b/gson/src/main/java/com/google/gson/Gson.java
index d3b172a8..ad17db96 100644
--- a/gson/src/main/java/com/google/gson/Gson.java
+++ b/gson/src/main/java/com/google/gson/Gson.java
@@ -125,16 +125,16 @@ public final class Gson {
final JsonDeserializationContext deserializationContext = new JsonDeserializationContext() {
@SuppressWarnings("unchecked")
- public T deserialize(JsonElement json, Type typeOfT) throws JsonParseException {
+ @Override public T deserialize(JsonElement json, Type typeOfT) throws JsonParseException {
return (T) fromJson(json, typeOfT);
}
};
final JsonSerializationContext serializationContext = new JsonSerializationContext() {
- public JsonElement serialize(Object src) {
+ @Override public JsonElement serialize(Object src) {
return toJsonTree(src);
}
- public JsonElement serialize(Object src, Type typeOfSrc) {
+ @Override public JsonElement serialize(Object src, Type typeOfSrc) {
return toJsonTree(src, typeOfSrc);
}
};
diff --git a/gson/src/main/java/com/google/gson/LongSerializationPolicy.java b/gson/src/main/java/com/google/gson/LongSerializationPolicy.java
index 3d9a2da1..7b732bab 100644
--- a/gson/src/main/java/com/google/gson/LongSerializationPolicy.java
+++ b/gson/src/main/java/com/google/gson/LongSerializationPolicy.java
@@ -32,7 +32,7 @@ public enum LongSerializationPolicy {
* {@code {"f":123}}.
*/
DEFAULT() {
- public JsonElement serialize(Long value) {
+ @Override public JsonElement serialize(Long value) {
return new JsonPrimitive(value);
}
},
@@ -43,7 +43,7 @@ public enum LongSerializationPolicy {
* {@code {"f":"123"}}.
*/
STRING() {
- public JsonElement serialize(Long value) {
+ @Override public JsonElement serialize(Long value) {
return new JsonPrimitive(String.valueOf(value));
}
};
diff --git a/gson/src/main/java/com/google/gson/TreeTypeAdapter.java b/gson/src/main/java/com/google/gson/TreeTypeAdapter.java
index a05c1fe0..ef090909 100644
--- a/gson/src/main/java/com/google/gson/TreeTypeAdapter.java
+++ b/gson/src/main/java/com/google/gson/TreeTypeAdapter.java
@@ -127,6 +127,7 @@ final class TreeTypeAdapter extends TypeAdapter {
}
@SuppressWarnings("unchecked") // guarded by typeToken.equals() call
+ @Override
public TypeAdapter create(Gson gson, TypeToken type) {
boolean matches = exactType != null
? exactType.equals(type) || matchRawType && exactType.getType() == type.getRawType()
diff --git a/gson/src/main/java/com/google/gson/internal/bind/ArrayTypeAdapter.java b/gson/src/main/java/com/google/gson/internal/bind/ArrayTypeAdapter.java
index 55d7e309..3fb7c056 100644
--- a/gson/src/main/java/com/google/gson/internal/bind/ArrayTypeAdapter.java
+++ b/gson/src/main/java/com/google/gson/internal/bind/ArrayTypeAdapter.java
@@ -38,7 +38,7 @@ import com.google.gson.stream.JsonWriter;
public final class ArrayTypeAdapter extends TypeAdapter