From 8380d28e6fd1c320ad3f13aef257a907b8f04a47 Mon Sep 17 00:00:00 2001 From: Inderjeet Singh Date: Mon, 6 Dec 2010 19:47:41 +0000 Subject: [PATCH] removed compiler warnings --- .../java/com/google/gson/DefaultTypeAdapters.java | 1 - .../com/google/gson/JsonSerializationVisitor.java | 1 - .../com/google/gson/MappedObjectConstructor.java | 1 - .../java/com/google/gson/ObjectNavigator.java | 5 ----- .../google/gson/ParameterizedTypeHandlerMap.java | 1 - gson/src/main/java/com/google/gson/Types.java | 15 +++++++++------ .../java/com/google/gson/reflect/TypeToken.java | 2 +- .../com/google/gson/stream/JsonReaderTest.java | 2 +- 8 files changed, 11 insertions(+), 17 deletions(-) diff --git a/gson/src/main/java/com/google/gson/DefaultTypeAdapters.java b/gson/src/main/java/com/google/gson/DefaultTypeAdapters.java index 4e920f63..c1ac294d 100644 --- a/gson/src/main/java/com/google/gson/DefaultTypeAdapters.java +++ b/gson/src/main/java/com/google/gson/DefaultTypeAdapters.java @@ -16,7 +16,6 @@ package com.google.gson; -import com.google.gson.reflect.TypeToken; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.math.BigDecimal; diff --git a/gson/src/main/java/com/google/gson/JsonSerializationVisitor.java b/gson/src/main/java/com/google/gson/JsonSerializationVisitor.java index 0892c576..0649a5a7 100644 --- a/gson/src/main/java/com/google/gson/JsonSerializationVisitor.java +++ b/gson/src/main/java/com/google/gson/JsonSerializationVisitor.java @@ -16,7 +16,6 @@ package com.google.gson; -import com.google.gson.reflect.TypeToken; import java.lang.reflect.Array; import java.lang.reflect.Type; diff --git a/gson/src/main/java/com/google/gson/MappedObjectConstructor.java b/gson/src/main/java/com/google/gson/MappedObjectConstructor.java index 44cd6cab..0ad8ebb4 100644 --- a/gson/src/main/java/com/google/gson/MappedObjectConstructor.java +++ b/gson/src/main/java/com/google/gson/MappedObjectConstructor.java @@ -16,7 +16,6 @@ package com.google.gson; -import com.google.gson.reflect.TypeToken; import java.lang.reflect.AccessibleObject; import java.lang.reflect.Array; import java.lang.reflect.Constructor; diff --git a/gson/src/main/java/com/google/gson/ObjectNavigator.java b/gson/src/main/java/com/google/gson/ObjectNavigator.java index 9fe62f3f..0738c709 100644 --- a/gson/src/main/java/com/google/gson/ObjectNavigator.java +++ b/gson/src/main/java/com/google/gson/ObjectNavigator.java @@ -16,14 +16,9 @@ package com.google.gson; -import com.google.gson.reflect.TypeToken; import java.lang.reflect.AccessibleObject; import java.lang.reflect.Field; -import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; -import java.util.Collection; -import java.util.Map; -import java.util.Properties; /** * Provides ability to apply a visitor to an object and all of its fields diff --git a/gson/src/main/java/com/google/gson/ParameterizedTypeHandlerMap.java b/gson/src/main/java/com/google/gson/ParameterizedTypeHandlerMap.java index c5936a4f..b215bc34 100644 --- a/gson/src/main/java/com/google/gson/ParameterizedTypeHandlerMap.java +++ b/gson/src/main/java/com/google/gson/ParameterizedTypeHandlerMap.java @@ -16,7 +16,6 @@ package com.google.gson; -import com.google.gson.reflect.TypeToken; import java.lang.reflect.Type; import java.util.ArrayList; import java.util.HashMap; diff --git a/gson/src/main/java/com/google/gson/Types.java b/gson/src/main/java/com/google/gson/Types.java index f0380418..12ce177c 100644 --- a/gson/src/main/java/com/google/gson/Types.java +++ b/gson/src/main/java/com/google/gson/Types.java @@ -195,8 +195,8 @@ public final class Types { if (!(b instanceof TypeVariable)) { return false; } - TypeVariable va = (TypeVariable) a; - TypeVariable vb = (TypeVariable) b; + TypeVariable va = (TypeVariable) a; + TypeVariable vb = (TypeVariable) b; return va.getGenericDeclaration() == vb.getGenericDeclaration() && va.getName().equals(vb.getName()); @@ -211,7 +211,7 @@ public final class Types { } public static String typeToString(Type type) { - return type instanceof Class ? ((Class) type).getName() : type.toString(); + return type instanceof Class ? ((Class) type).getName() : type.toString(); } /** @@ -226,7 +226,7 @@ public final class Types { // we skip searching through interfaces if unknown is an interface if (toResolve.isInterface()) { - Class[] interfaces = rawType.getInterfaces(); + Class[] interfaces = rawType.getInterfaces(); for (int i = 0, length = interfaces.length; i < length; i++) { if (interfaces[i] == toResolve) { return rawType.getGenericInterfaces()[i]; @@ -316,7 +316,7 @@ public final class Types { // this implementation is made a little more complicated in an attempt to avoid object-creation while (true) { if (toResolve instanceof TypeVariable) { - TypeVariable typeVariable = (TypeVariable) toResolve; + TypeVariable typeVariable = (TypeVariable) toResolve; toResolve = resolveTypeVariable(context, contextRawType, typeVariable); if (toResolve == typeVariable) { return toResolve; @@ -384,6 +384,7 @@ public final class Types { } } + @SuppressWarnings("rawtypes") static Type resolveTypeVariable(Type context, Class contextRawType, TypeVariable unknown) { Class declaredByRaw = declaringClassOf(unknown); @@ -414,6 +415,7 @@ public final class Types { * Returns the declaring class of {@code typeVariable}, or {@code null} if it was not declared by * a class. */ + @SuppressWarnings("rawtypes") private static Class declaringClassOf(TypeVariable typeVariable) { GenericDeclaration genericDeclaration = typeVariable.getGenericDeclaration(); return genericDeclaration instanceof Class @@ -422,7 +424,7 @@ public final class Types { } private static void checkNotPrimitive(Type type) { - checkArgument(!(type instanceof Class) || !((Class) type).isPrimitive()); + checkArgument(!(type instanceof Class) || !((Class) type).isPrimitive()); } private static class ParameterizedTypeImpl implements ParameterizedType, Serializable { @@ -430,6 +432,7 @@ public final class Types { private final Type rawType; private final Type[] typeArguments; + @SuppressWarnings("rawtypes") public ParameterizedTypeImpl(Type ownerType, Type rawType, Type... typeArguments) { // require an owner type if the raw type needs it if (rawType instanceof Class) { diff --git a/gson/src/main/java/com/google/gson/reflect/TypeToken.java b/gson/src/main/java/com/google/gson/reflect/TypeToken.java index 555ccd0d..03729588 100644 --- a/gson/src/main/java/com/google/gson/reflect/TypeToken.java +++ b/gson/src/main/java/com/google/gson/reflect/TypeToken.java @@ -299,7 +299,7 @@ public class TypeToken { @Override public final boolean equals(Object o) { return o instanceof TypeToken - && Types.equals(type, ((TypeToken) o).type); + && Types.equals(type, ((TypeToken) o).type); } @Override public final String toString() { diff --git a/gson/src/test/java/com/google/gson/stream/JsonReaderTest.java b/gson/src/test/java/com/google/gson/stream/JsonReaderTest.java index 8b2e3cfc..ce16375e 100644 --- a/gson/src/test/java/com/google/gson/stream/JsonReaderTest.java +++ b/gson/src/test/java/com/google/gson/stream/JsonReaderTest.java @@ -757,7 +757,7 @@ public final class JsonReaderTest extends TestCase { assertEquals(JsonToken.END_DOCUMENT, reader.peek()); } - public void testLenientPartialNonExecutePrefix() throws IOException { + public void testLenientPartialNonExecutePrefix() { JsonReader reader = new JsonReader(new StringReader(")]}' []")); reader.setLenient(true); try {