diff --git a/gson/src/main/java/com/google/gson/FieldNamingPolicy.java b/gson/src/main/java/com/google/gson/FieldNamingPolicy.java index eecb2dbbf5..3b325a4fd8 100644 --- a/gson/src/main/java/com/google/gson/FieldNamingPolicy.java +++ b/gson/src/main/java/com/google/gson/FieldNamingPolicy.java @@ -120,7 +120,7 @@ public enum FieldNamingPolicy implements FieldNamingStrategy { * Converts the field name that uses camel-case define word separation into * separate words that are separated by the provided {@code separatorString}. */ - private static String separateCamelCase(String name, String separator) { + static String separateCamelCase(String name, String separator) { StringBuilder translation = new StringBuilder(); for (int i = 0; i < name.length(); i++) { char character = name.charAt(i); @@ -135,7 +135,7 @@ private static String separateCamelCase(String name, String separator) { /** * Ensures the JSON field names begins with an upper case letter. */ - private static String upperCaseFirstLetter(String name) { + static String upperCaseFirstLetter(String name) { StringBuilder fieldNameBuilder = new StringBuilder(); int index = 0; char firstCharacter = name.charAt(index); diff --git a/gson/src/main/java/com/google/gson/Gson.java b/gson/src/main/java/com/google/gson/Gson.java index c29eada40c..2ba47cceea 100644 --- a/gson/src/main/java/com/google/gson/Gson.java +++ b/gson/src/main/java/com/google/gson/Gson.java @@ -303,7 +303,7 @@ private TypeAdapter floatAdapter(boolean serializeSpecialFloatingPointVa }; } - private void checkValidFloatingPoint(double value) { + static void checkValidFloatingPoint(double value) { if (Double.isNaN(value) || Double.isInfinite(value)) { throw new IllegalArgumentException(value + " is not a valid double value as per JSON specification. To override this" @@ -459,7 +459,7 @@ public TypeAdapter getAdapter(TypeToken type) { * } * Note that this call will skip all factories registered before {@code skipPast}. In case of * multiple TypeAdapterFactories registered it is up to the caller of this function to insure - * that the order of registration does not prevent this method from reaching a factory they + * that the order of registration does not prevent this method from reaching a factory they * would expect to reply from this call. * Note that since you can not override type adapter factories for String and Java primitive * types, our stats factory will not count the number of String or primitives that will be diff --git a/gson/src/main/java/com/google/gson/TreeTypeAdapter.java b/gson/src/main/java/com/google/gson/TreeTypeAdapter.java index ef09090957..5b7305edc8 100644 --- a/gson/src/main/java/com/google/gson/TreeTypeAdapter.java +++ b/gson/src/main/java/com/google/gson/TreeTypeAdapter.java @@ -38,7 +38,7 @@ final class TreeTypeAdapter extends TypeAdapter { /** The delegate is lazily created because it may not be needed, and creating it may fail. */ private TypeAdapter delegate; - private TreeTypeAdapter(JsonSerializer serializer, JsonDeserializer deserializer, + TreeTypeAdapter(JsonSerializer serializer, JsonDeserializer deserializer, Gson gson, TypeToken typeToken, TypeAdapterFactory skipPast) { this.serializer = serializer; this.deserializer = deserializer; @@ -112,7 +112,7 @@ private static class SingleTypeFactory implements TypeAdapterFactory { private final JsonSerializer serializer; private final JsonDeserializer deserializer; - private SingleTypeFactory(Object typeAdapter, TypeToken exactType, boolean matchRawType, + SingleTypeFactory(Object typeAdapter, TypeToken exactType, boolean matchRawType, Class hierarchyType) { serializer = typeAdapter instanceof JsonSerializer ? (JsonSerializer) typeAdapter diff --git a/gson/src/main/java/com/google/gson/internal/$Gson$Types.java b/gson/src/main/java/com/google/gson/internal/$Gson$Types.java index 745d07193e..017e27cee0 100644 --- a/gson/src/main/java/com/google/gson/internal/$Gson$Types.java +++ b/gson/src/main/java/com/google/gson/internal/$Gson$Types.java @@ -16,9 +16,6 @@ package com.google.gson.internal; -import static com.google.gson.internal.$Gson$Preconditions.checkArgument; -import static com.google.gson.internal.$Gson$Preconditions.checkNotNull; - import java.io.Serializable; import java.lang.reflect.Array; import java.lang.reflect.GenericArrayType; @@ -34,6 +31,9 @@ import java.util.NoSuchElementException; import java.util.Properties; +import static com.google.gson.internal.$Gson$Preconditions.checkArgument; +import static com.google.gson.internal.$Gson$Preconditions.checkNotNull; + /** * Static methods for working with types. * @@ -212,7 +212,7 @@ public static boolean equals(Type a, Type b) { } } - private static int hashCodeOrZero(Object o) { + static int hashCodeOrZero(Object o) { return o != null ? o.hashCode() : 0; } @@ -430,7 +430,7 @@ private static Class declaringClassOf(TypeVariable typeVariable) { : null; } - private static void checkNotPrimitive(Type type) { + static void checkNotPrimitive(Type type) { checkArgument(!(type instanceof Class) || !((Class) type).isPrimitive()); } diff --git a/gson/src/main/java/com/google/gson/internal/LinkedHashTreeMap.java b/gson/src/main/java/com/google/gson/internal/LinkedHashTreeMap.java index e251ec2f7e..b2707c50da 100644 --- a/gson/src/main/java/com/google/gson/internal/LinkedHashTreeMap.java +++ b/gson/src/main/java/com/google/gson/internal/LinkedHashTreeMap.java @@ -762,6 +762,9 @@ private abstract class LinkedTreeMapIterator implements Iterator { Node lastReturned = null; int expectedModCount = modCount; + LinkedTreeMapIterator() { + } + public final boolean hasNext() { return next != header; } diff --git a/gson/src/main/java/com/google/gson/internal/LinkedTreeMap.java b/gson/src/main/java/com/google/gson/internal/LinkedTreeMap.java index c2c84802a6..80462742e3 100644 --- a/gson/src/main/java/com/google/gson/internal/LinkedTreeMap.java +++ b/gson/src/main/java/com/google/gson/internal/LinkedTreeMap.java @@ -528,6 +528,9 @@ private abstract class LinkedTreeMapIterator implements Iterator { Node lastReturned = null; int expectedModCount = modCount; + LinkedTreeMapIterator() { + } + public final boolean hasNext() { return next != header; } @@ -624,4 +627,4 @@ public K next() { private Object writeReplace() throws ObjectStreamException { return new LinkedHashMap(this); } -} \ No newline at end of file +} diff --git a/gson/src/main/java/com/google/gson/internal/Streams.java b/gson/src/main/java/com/google/gson/internal/Streams.java index 7f00f11d9f..74956d7779 100644 --- a/gson/src/main/java/com/google/gson/internal/Streams.java +++ b/gson/src/main/java/com/google/gson/internal/Streams.java @@ -85,7 +85,7 @@ private static final class AppendableWriter extends Writer { private final Appendable appendable; private final CurrentWrite currentWrite = new CurrentWrite(); - private AppendableWriter(Appendable appendable) { + AppendableWriter(Appendable appendable) { this.appendable = appendable; } diff --git a/gson/src/main/java/com/google/gson/internal/bind/MapTypeAdapterFactory.java b/gson/src/main/java/com/google/gson/internal/bind/MapTypeAdapterFactory.java index 9c82a39659..1682aad040 100644 --- a/gson/src/main/java/com/google/gson/internal/bind/MapTypeAdapterFactory.java +++ b/gson/src/main/java/com/google/gson/internal/bind/MapTypeAdapterFactory.java @@ -104,7 +104,7 @@ */ public final class MapTypeAdapterFactory implements TypeAdapterFactory { private final ConstructorConstructor constructorConstructor; - private final boolean complexMapKeySerialization; + final boolean complexMapKeySerialization; public MapTypeAdapterFactory(ConstructorConstructor constructorConstructor, boolean complexMapKeySerialization) { diff --git a/gson/src/main/java/com/google/gson/internal/bind/ObjectTypeAdapter.java b/gson/src/main/java/com/google/gson/internal/bind/ObjectTypeAdapter.java index 12889933db..ec42e04826 100644 --- a/gson/src/main/java/com/google/gson/internal/bind/ObjectTypeAdapter.java +++ b/gson/src/main/java/com/google/gson/internal/bind/ObjectTypeAdapter.java @@ -47,7 +47,7 @@ public final class ObjectTypeAdapter extends TypeAdapter { private final Gson gson; - private ObjectTypeAdapter(Gson gson) { + ObjectTypeAdapter(Gson gson) { this.gson = gson; } diff --git a/gson/src/main/java/com/google/gson/internal/bind/ReflectiveTypeAdapterFactory.java b/gson/src/main/java/com/google/gson/internal/bind/ReflectiveTypeAdapterFactory.java index 960153aa09..c87cdbf166 100644 --- a/gson/src/main/java/com/google/gson/internal/bind/ReflectiveTypeAdapterFactory.java +++ b/gson/src/main/java/com/google/gson/internal/bind/ReflectiveTypeAdapterFactory.java @@ -16,16 +16,6 @@ package com.google.gson.internal.bind; -import static com.google.gson.internal.bind.JsonAdapterAnnotationTypeAdapterFactory.getTypeAdapter; - -import java.io.IOException; -import java.lang.reflect.Field; -import java.lang.reflect.Type; -import java.util.LinkedHashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; - import com.google.gson.FieldNamingStrategy; import com.google.gson.Gson; import com.google.gson.JsonSyntaxException; @@ -42,6 +32,15 @@ import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonToken; import com.google.gson.stream.JsonWriter; +import java.io.IOException; +import java.lang.reflect.Field; +import java.lang.reflect.Type; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + +import static com.google.gson.internal.bind.JsonAdapterAnnotationTypeAdapterFactory.getTypeAdapter; /** * Type adapter that reflects over the fields and methods of a class. @@ -127,7 +126,7 @@ private ReflectiveTypeAdapterFactory.BoundField createBoundField( }; } - private TypeAdapter getFieldAdapter(Gson gson, Field field, TypeToken fieldType) { + TypeAdapter getFieldAdapter(Gson gson, Field field, TypeToken fieldType) { JsonAdapter annotation = field.getAnnotation(JsonAdapter.class); if (annotation != null) { TypeAdapter adapter = getTypeAdapter(constructorConstructor, gson, fieldType, annotation); @@ -193,7 +192,7 @@ public static final class Adapter extends TypeAdapter { private final ObjectConstructor constructor; private final Map boundFields; - private Adapter(ObjectConstructor constructor, Map boundFields) { + Adapter(ObjectConstructor constructor, Map boundFields) { this.constructor = constructor; this.boundFields = boundFields; } diff --git a/gson/src/main/java/com/google/gson/stream/JsonReader.java b/gson/src/main/java/com/google/gson/stream/JsonReader.java index 388f30b064..04dea07504 100644 --- a/gson/src/main/java/com/google/gson/stream/JsonReader.java +++ b/gson/src/main/java/com/google/gson/stream/JsonReader.java @@ -242,7 +242,7 @@ public class JsonReader implements Closeable { private int lineNumber = 0; private int lineStart = 0; - private int peeked = PEEKED_NONE; + int peeked = PEEKED_NONE; /** * A peeked value that was composed entirely of digits with an optional @@ -462,7 +462,7 @@ public JsonToken peek() throws IOException { } } - private int doPeek() throws IOException { + int doPeek() throws IOException { int peekStack = stack[stackSize - 1]; if (peekStack == JsonScope.EMPTY_ARRAY) { stack[stackSize - 1] = JsonScope.NONEMPTY_ARRAY; @@ -1314,11 +1314,11 @@ private boolean fillBuffer(int minimum) throws IOException { return false; } - private int getLineNumber() { + int getLineNumber() { return lineNumber + 1; } - private int getColumnNumber() { + int getColumnNumber() { return pos - lineStart + 1; }