diff --git a/moshi/src/main/java/com/squareup/moshi/ClassJsonAdapter.java b/moshi/src/main/java/com/squareup/moshi/ClassJsonAdapter.java index 2163620..3af3031 100644 --- a/moshi/src/main/java/com/squareup/moshi/ClassJsonAdapter.java +++ b/moshi/src/main/java/com/squareup/moshi/ClassJsonAdapter.java @@ -115,7 +115,7 @@ final class ClassJsonAdapter extends JsonAdapter { private final ClassFactory classFactory; private final Map> jsonFields; - private ClassJsonAdapter(ClassFactory classFactory, Map> jsonFields) { + ClassJsonAdapter(ClassFactory classFactory, Map> jsonFields) { this.classFactory = classFactory; this.jsonFields = jsonFields; } @@ -179,13 +179,13 @@ final class ClassJsonAdapter extends JsonAdapter { this.adapter = adapter; } - private void read(JsonReader reader, Object value) throws IOException, IllegalAccessException { + void read(JsonReader reader, Object value) throws IOException, IllegalAccessException { T fieldValue = adapter.fromJson(reader); field.set(value, fieldValue); } @SuppressWarnings("unchecked") // We require that field's values are of type T. - private void write(JsonWriter writer, Object value) throws IllegalAccessException, IOException { + void write(JsonWriter writer, Object value) throws IllegalAccessException, IOException { T fieldValue = (T) field.get(value); adapter.toJson(writer, fieldValue); } diff --git a/moshi/src/main/java/com/squareup/moshi/CollectionJsonAdapter.java b/moshi/src/main/java/com/squareup/moshi/CollectionJsonAdapter.java index 03d6623..3b2418f 100644 --- a/moshi/src/main/java/com/squareup/moshi/CollectionJsonAdapter.java +++ b/moshi/src/main/java/com/squareup/moshi/CollectionJsonAdapter.java @@ -46,7 +46,7 @@ abstract class CollectionJsonAdapter, T> extends JsonAda this.elementAdapter = elementAdapter; } - private static JsonAdapter> newArrayListAdapter(Type type, Moshi moshi) { + static JsonAdapter> newArrayListAdapter(Type type, Moshi moshi) { Type elementType = Types.collectionElementType(type, Collection.class); JsonAdapter elementAdapter = moshi.adapter(elementType); return new CollectionJsonAdapter, T>(elementAdapter) { @@ -56,7 +56,7 @@ abstract class CollectionJsonAdapter, T> extends JsonAda }; } - private static JsonAdapter> newLinkedHashSetAdapter(Type type, Moshi moshi) { + static JsonAdapter> newLinkedHashSetAdapter(Type type, Moshi moshi) { Type elementType = Types.collectionElementType(type, Collection.class); JsonAdapter elementAdapter = moshi.adapter(elementType); return new CollectionJsonAdapter, T>(elementAdapter) { diff --git a/moshi/src/main/java/com/squareup/moshi/LinkedHashTreeMap.java b/moshi/src/main/java/com/squareup/moshi/LinkedHashTreeMap.java index db328a4..00d6aeb 100644 --- a/moshi/src/main/java/com/squareup/moshi/LinkedHashTreeMap.java +++ b/moshi/src/main/java/com/squareup/moshi/LinkedHashTreeMap.java @@ -755,7 +755,7 @@ final class LinkedHashTreeMap extends AbstractMap implements Seriali } } - private abstract class LinkedTreeMapIterator implements Iterator { + abstract class LinkedTreeMapIterator implements Iterator { Node next = header.next; Node lastReturned = null; int expectedModCount = modCount; diff --git a/moshi/src/main/java/com/squareup/moshi/Moshi.java b/moshi/src/main/java/com/squareup/moshi/Moshi.java index 4ae7bbe..ccbdb18 100644 --- a/moshi/src/main/java/com/squareup/moshi/Moshi.java +++ b/moshi/src/main/java/com/squareup/moshi/Moshi.java @@ -45,7 +45,7 @@ public final class Moshi { private final ThreadLocal>> reentrantCalls = new ThreadLocal<>(); private final Map> adapterCache = new LinkedHashMap<>(); - private Moshi(Builder builder) { + Moshi(Builder builder) { List factories = new ArrayList<>(builder.factories.size() + BUILT_IN_FACTORIES.size()); factories.addAll(builder.factories); factories.addAll(BUILT_IN_FACTORIES); @@ -186,7 +186,7 @@ public final class Moshi { return add(AdapterMethodsFactory.get(adapter)); } - private Builder addAll(List factories) { + Builder addAll(List factories) { this.factories.addAll(factories); return this; } @@ -205,14 +205,14 @@ public final class Moshi { * class that has a {@code List} field for an organization's management hierarchy. */ private static class DeferredAdapter extends JsonAdapter { - private Object cacheKey; + Object cacheKey; private JsonAdapter delegate; - public DeferredAdapter(Object cacheKey) { + DeferredAdapter(Object cacheKey) { this.cacheKey = cacheKey; } - public void ready(JsonAdapter delegate) { + void ready(JsonAdapter delegate) { this.delegate = delegate; this.cacheKey = null; } diff --git a/moshi/src/main/java/com/squareup/moshi/StandardJsonAdapters.java b/moshi/src/main/java/com/squareup/moshi/StandardJsonAdapters.java index a3bc90b..0d7feba 100644 --- a/moshi/src/main/java/com/squareup/moshi/StandardJsonAdapters.java +++ b/moshi/src/main/java/com/squareup/moshi/StandardJsonAdapters.java @@ -60,7 +60,7 @@ final class StandardJsonAdapters { private static final String ERROR_FORMAT = "Expected %s but was %s at path %s"; - private static int rangeCheckNextInt(JsonReader reader, String typeMessage, int min, int max) + static int rangeCheckNextInt(JsonReader reader, String typeMessage, int min, int max) throws IOException { int value = reader.nextInt(); if (value < min || value > max) { diff --git a/moshi/src/main/java/com/squareup/moshi/Types.java b/moshi/src/main/java/com/squareup/moshi/Types.java index c5b3dd0..56feb8c 100644 --- a/moshi/src/main/java/com/squareup/moshi/Types.java +++ b/moshi/src/main/java/com/squareup/moshi/Types.java @@ -177,7 +177,7 @@ public final class Types { } } - private static int hashCodeOrZero(Object o) { + static int hashCodeOrZero(Object o) { return o != null ? o.hashCode() : 0; } @@ -390,7 +390,7 @@ public final class Types { return genericDeclaration instanceof Class ? (Class) genericDeclaration : null; } - private static void checkNotPrimitive(Type type) { + static void checkNotPrimitive(Type type) { if ((type instanceof Class) && ((Class) type).isPrimitive()) { throw new IllegalArgumentException(); } @@ -399,9 +399,9 @@ public final class Types { private static final class ParameterizedTypeImpl implements ParameterizedType { private final Type ownerType; private final Type rawType; - private final Type[] typeArguments; + final Type[] typeArguments; - public ParameterizedTypeImpl(Type ownerType, Type rawType, Type... typeArguments) { + ParameterizedTypeImpl(Type ownerType, Type rawType, Type... typeArguments) { // require an owner type if the raw type needs it if (rawType instanceof Class) { Class rawTypeAsClass = (Class) rawType;