From c6f762f36be0496874d05c733593ac030409eb4e Mon Sep 17 00:00:00 2001 From: Joel Leitch Date: Wed, 23 Sep 2009 19:09:01 +0000 Subject: [PATCH] Fix Warnings --- ...eAnnotationBasedExclusionStrategyTest.java | 4 +-- ...nnotationInterceptingNamingPolicyTest.java | 2 +- .../com/google/gson/TypeInfoFactoryTest.java | 34 +++++++++---------- .../gson/VersionExclusionStrategyTest.java | 2 +- .../gson/functional/CollectionTest.java | 2 +- .../gson/functional/ConcurrencyTest.java | 6 ++-- .../functional/CustomTypeAdaptersTest.java | 2 +- .../google/gson/functional/JsonTreeTest.java | 2 +- .../com/google/gson/functional/MapTest.java | 4 +-- .../gson/functional/NamingPolicyTest.java | 4 +-- .../functional/NullObjectAndFieldTest.java | 6 ++-- .../google/gson/functional/ObjectTest.java | 4 +-- .../functional/ParameterizedTypesTest.java | 4 +-- 13 files changed, 38 insertions(+), 38 deletions(-) diff --git a/gson/src/test/java/com/google/gson/ExposeAnnotationBasedExclusionStrategyTest.java b/gson/src/test/java/com/google/gson/ExposeAnnotationBasedExclusionStrategyTest.java index 1f63f95e..45f11cb0 100644 --- a/gson/src/test/java/com/google/gson/ExposeAnnotationBasedExclusionStrategyTest.java +++ b/gson/src/test/java/com/google/gson/ExposeAnnotationBasedExclusionStrategyTest.java @@ -54,7 +54,7 @@ public class ExposeAnnotationBasedExclusionStrategyTest extends TestCase { @SuppressWarnings("unused") private static class MockObject { @Expose - public final int exposedField = 0; - public final int hiddenField = 0; + private final int exposedField = 0; + private final int hiddenField = 0; } } diff --git a/gson/src/test/java/com/google/gson/SerializedNameAnnotationInterceptingNamingPolicyTest.java b/gson/src/test/java/com/google/gson/SerializedNameAnnotationInterceptingNamingPolicyTest.java index a0144a58..08010108 100644 --- a/gson/src/test/java/com/google/gson/SerializedNameAnnotationInterceptingNamingPolicyTest.java +++ b/gson/src/test/java/com/google/gson/SerializedNameAnnotationInterceptingNamingPolicyTest.java @@ -56,6 +56,6 @@ public class SerializedNameAnnotationInterceptingNamingPolicyTest extends TestCa @SuppressWarnings("unused") private static class SomeObject { @SerializedName(ANNOTATED_FIELD_NAME) public final int fieldWithAnnotation = 1; - public final int fieldWithoutAnnotation = 1; + private final int fieldWithoutAnnotation = 1; } } diff --git a/gson/src/test/java/com/google/gson/TypeInfoFactoryTest.java b/gson/src/test/java/com/google/gson/TypeInfoFactoryTest.java index 26155307..368c0dcb 100644 --- a/gson/src/test/java/com/google/gson/TypeInfoFactoryTest.java +++ b/gson/src/test/java/com/google/gson/TypeInfoFactoryTest.java @@ -229,25 +229,25 @@ public class TypeInfoFactoryTest extends TestCase { TEST_1, TEST_2; } - public String simpleField; - public TestEnum enumField; - public List simpleParameterizedType; - public List> simpleNestedParameterizedType; - public List[] simpleGenericArray; + private String simpleField; + private TestEnum enumField; + private List simpleParameterizedType; + private List> simpleNestedParameterizedType; + private List[] simpleGenericArray; - public T typeVariableObj; - public T[] typeVariableArray; - public T[][][] mutliDimensionalTypeVariableArray; - public List listOfTypeVariables; - public List> listOfListsOfTypeVariables; - public List[] listOfTypeVariablesArray; + private T typeVariableObj; + private T[] typeVariableArray; + private T[][][] mutliDimensionalTypeVariableArray; + private List listOfTypeVariables; + private List> listOfListsOfTypeVariables; + private List[] listOfTypeVariablesArray; - public List listWithWildcard; - public List[] arrayOfListWithWildcard; - public List listWithStringWildcard; - public List[] arrayOfListWithStringWildcard; + private List listWithWildcard; + private List[] arrayOfListWithWildcard; + private List listWithStringWildcard; + private List[] arrayOfListWithStringWildcard; - public List listWithTypeVariableWildcard; - public List[] arrayOfListWithTypeVariableWildcard; + private List listWithTypeVariableWildcard; + private List[] arrayOfListWithTypeVariableWildcard; } } diff --git a/gson/src/test/java/com/google/gson/VersionExclusionStrategyTest.java b/gson/src/test/java/com/google/gson/VersionExclusionStrategyTest.java index cca213bc..5546f881 100644 --- a/gson/src/test/java/com/google/gson/VersionExclusionStrategyTest.java +++ b/gson/src/test/java/com/google/gson/VersionExclusionStrategyTest.java @@ -69,6 +69,6 @@ public class VersionExclusionStrategyTest extends TestCase { @SuppressWarnings("unused") @Since(VERSION) - public final int someField = 0; + private final int someField = 0; } } diff --git a/gson/src/test/java/com/google/gson/functional/CollectionTest.java b/gson/src/test/java/com/google/gson/functional/CollectionTest.java index d43d4ce2..a0311a4d 100644 --- a/gson/src/test/java/com/google/gson/functional/CollectionTest.java +++ b/gson/src/test/java/com/google/gson/functional/CollectionTest.java @@ -285,7 +285,7 @@ public class CollectionTest extends TestCase { // For use by Gson @SuppressWarnings({ "unchecked", "unused" }) - public ObjectWithWildcardCollection() { + private ObjectWithWildcardCollection() { this(Collections.EMPTY_LIST); } diff --git a/gson/src/test/java/com/google/gson/functional/ConcurrencyTest.java b/gson/src/test/java/com/google/gson/functional/ConcurrencyTest.java index 2dccf4b6..e28c5927 100755 --- a/gson/src/test/java/com/google/gson/functional/ConcurrencyTest.java +++ b/gson/src/test/java/com/google/gson/functional/ConcurrencyTest.java @@ -123,9 +123,9 @@ public class ConcurrencyTest extends TestCase { @SuppressWarnings("unused") private static class MyObject { - String a; - String b; - int i; + private String a; + private String b; + private int i; MyObject() { this("hello", "world", 42); diff --git a/gson/src/test/java/com/google/gson/functional/CustomTypeAdaptersTest.java b/gson/src/test/java/com/google/gson/functional/CustomTypeAdaptersTest.java index 526a42c5..0d927c35 100644 --- a/gson/src/test/java/com/google/gson/functional/CustomTypeAdaptersTest.java +++ b/gson/src/test/java/com/google/gson/functional/CustomTypeAdaptersTest.java @@ -170,7 +170,7 @@ public class CustomTypeAdaptersTest extends TestCase { private static class Derived extends Base { @SuppressWarnings("unused") - int derivedValue = 3; + private int derivedValue = 3; } diff --git a/gson/src/test/java/com/google/gson/functional/JsonTreeTest.java b/gson/src/test/java/com/google/gson/functional/JsonTreeTest.java index 195f6f99..8484280f 100644 --- a/gson/src/test/java/com/google/gson/functional/JsonTreeTest.java +++ b/gson/src/test/java/com/google/gson/functional/JsonTreeTest.java @@ -76,7 +76,7 @@ public class JsonTreeTest extends TestCase { private static class SubTypeOfBagOfPrimitives extends BagOfPrimitives { @SuppressWarnings("unused") - float f = 1.2F; + private float f = 1.2F; public SubTypeOfBagOfPrimitives(long l, int i, boolean b, String string, float f) { super(l, i, b, string); this.f = f; diff --git a/gson/src/test/java/com/google/gson/functional/MapTest.java b/gson/src/test/java/com/google/gson/functional/MapTest.java index 6e084e0a..372d88ee 100755 --- a/gson/src/test/java/com/google/gson/functional/MapTest.java +++ b/gson/src/test/java/com/google/gson/functional/MapTest.java @@ -173,7 +173,7 @@ public class MapTest extends TestCase { private static final long serialVersionUID = 1L; @SuppressWarnings("unused") - int foo = 10; + private int foo = 10; } public void testMapSubclassSerialization() { @@ -250,7 +250,7 @@ public class MapTest extends TestCase { private static final long serialVersionUID = 1L; @SuppressWarnings("unused") - int foo = 10; + private int foo = 10; } /** diff --git a/gson/src/test/java/com/google/gson/functional/NamingPolicyTest.java b/gson/src/test/java/com/google/gson/functional/NamingPolicyTest.java index 7b1f9bb7..05b2aec7 100644 --- a/gson/src/test/java/com/google/gson/functional/NamingPolicyTest.java +++ b/gson/src/test/java/com/google/gson/functional/NamingPolicyTest.java @@ -84,8 +84,8 @@ public class NamingPolicyTest extends TestCase { @SuppressWarnings("unused") private static class ClassWithDuplicateFields { - public Integer a; - @SerializedName("a") public Double b; + private Integer a; + @SerializedName("a") private Double b; public ClassWithDuplicateFields(Integer a) { this(a, null); diff --git a/gson/src/test/java/com/google/gson/functional/NullObjectAndFieldTest.java b/gson/src/test/java/com/google/gson/functional/NullObjectAndFieldTest.java index fe9f1ffe..aa2666b9 100755 --- a/gson/src/test/java/com/google/gson/functional/NullObjectAndFieldTest.java +++ b/gson/src/test/java/com/google/gson/functional/NullObjectAndFieldTest.java @@ -153,9 +153,9 @@ public class NullObjectAndFieldTest extends TestCase { @SuppressWarnings("unused") private static class ClassWithMembers { - String str; - int[] array; - Collection col; + private String str; + private int[] array; + private Collection col; } private static class ClassWithObjectsSerializer implements JsonSerializer { diff --git a/gson/src/test/java/com/google/gson/functional/ObjectTest.java b/gson/src/test/java/com/google/gson/functional/ObjectTest.java index 78ddfee9..f14de4c5 100644 --- a/gson/src/test/java/com/google/gson/functional/ObjectTest.java +++ b/gson/src/test/java/com/google/gson/functional/ObjectTest.java @@ -367,7 +367,7 @@ public class ObjectTest extends TestCase { private static class ClassWithObjectField { @SuppressWarnings("unused") - Object member; + private Object member; } public void testInnerClassSerialization() { @@ -393,7 +393,7 @@ public class ObjectTest extends TestCase { private static class Parent { @SuppressWarnings("unused") - int value1 = 1; + private int value1 = 1; private class Child { int value2 = 2; } diff --git a/gson/src/test/java/com/google/gson/functional/ParameterizedTypesTest.java b/gson/src/test/java/com/google/gson/functional/ParameterizedTypesTest.java index 9c12ebd3..1bf24b69 100644 --- a/gson/src/test/java/com/google/gson/functional/ParameterizedTypesTest.java +++ b/gson/src/test/java/com/google/gson/functional/ParameterizedTypesTest.java @@ -466,11 +466,11 @@ public class ParameterizedTypesTest extends TestCase { // Begin: tests to reproduce issue 103 private static class Quantity { @SuppressWarnings("unused") - int q = 10; + private int q = 10; } private static class MyQuantity extends Quantity { @SuppressWarnings("unused") - int q2 = 20; + private int q2 = 20; } private interface Measurable { }