Remove Moshi from cache layer

apollo-android-support/build.gradle

@@ -34,7 +34,6 @@ android {
 
 dependencies {
   compile dep.jsr305
-  compile dep.moshi
 
   provided project(":apollo-runtime")
   provided project(":apollo-api")

apollo-android-support/src/androidTest/java/com/apollographql/apollo/cache/normalized/sql/SqlNormalizedCacheTest.java

@@ -7,8 +7,7 @@
 import com.apollographql.apollo.cache.ApolloCacheHeaders;
 import com.apollographql.apollo.cache.CacheHeaders;
 import com.apollographql.apollo.cache.normalized.Record;
-import com.apollographql.apollo.cache.normalized.RecordFieldAdapter;
-import com.squareup.moshi.Moshi;
+import com.apollographql.apollo.cache.normalized.RecordFieldJsonAdapter;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -29,8 +28,7 @@ public class SqlNormalizedCacheTest {
   public void setUp() {
     ApolloSqlHelper apolloSqlHelper = ApolloSqlHelper.create(InstrumentationRegistry.getTargetContext(),
         IN_MEMORY_DB);
-    sqlStore = new SqlNormalizedCacheFactory(apolloSqlHelper).createNormalizedCache(RecordFieldAdapter.create(new
-        Moshi.Builder().build()));
+    sqlStore = new SqlNormalizedCacheFactory(apolloSqlHelper).createNormalizedCache(RecordFieldJsonAdapter.create());
   }
 
   @Test

apollo-android-support/src/main/java/com/apollographql/apollo/cache/normalized/sql/SqlNormalizedCache.java

@@ -9,7 +9,7 @@
 import com.apollographql.apollo.cache.normalized.CacheKey;
 import com.apollographql.apollo.cache.normalized.NormalizedCache;
 import com.apollographql.apollo.cache.normalized.Record;
-import com.apollographql.apollo.cache.normalized.RecordFieldAdapter;
+import com.apollographql.apollo.cache.normalized.RecordFieldJsonAdapter;
 
 import java.io.IOException;
 import java.util.Collection;
@@ -54,7 +54,7 @@ public final class SqlNormalizedCache extends NormalizedCache {
   private final SQLiteStatement deleteStatement;
   private final SQLiteStatement deleteAllRecordsStatement;
 
-  SqlNormalizedCache(RecordFieldAdapter recordFieldAdapter, ApolloSqlHelper dbHelper) {
+  SqlNormalizedCache(RecordFieldJsonAdapter recordFieldAdapter, ApolloSqlHelper dbHelper) {
     super(recordFieldAdapter);
     this.dbHelper = dbHelper;
     database = dbHelper.getWritableDatabase();

apollo-android-support/src/main/java/com/apollographql/apollo/cache/normalized/sql/SqlNormalizedCacheFactory.java

@@ -1,7 +1,7 @@
 package com.apollographql.apollo.cache.normalized.sql;
 
 import com.apollographql.apollo.cache.normalized.NormalizedCacheFactory;
-import com.apollographql.apollo.cache.normalized.RecordFieldAdapter;
+import com.apollographql.apollo.cache.normalized.RecordFieldJsonAdapter;
 
 import static com.apollographql.apollo.api.internal.Utils.checkNotNull;
 
@@ -13,7 +13,7 @@ public SqlNormalizedCacheFactory(ApolloSqlHelper helper) {
     this.helper = checkNotNull(helper, "helper == null");
   }
 
-  @Override public SqlNormalizedCache createNormalizedCache(RecordFieldAdapter recordFieldAdapter) {
+  @Override public SqlNormalizedCache createNormalizedCache(RecordFieldJsonAdapter recordFieldAdapter) {
     return new SqlNormalizedCache(recordFieldAdapter, helper);
   }
 }

apollo-integration/build.gradle

@@ -42,7 +42,6 @@ dependencies {
   testCompile dep.truth
   testCompile dep.mockWebServer
   testCompile dep.okhttpTestSupport
-  testCompile dep.moshi
   testCompile dep.cache
 }
 

apollo-integration/src/test/java/com/apollographql/apollo/CacheHeadersTest.java

@@ -10,9 +10,8 @@
 import com.apollographql.apollo.cache.normalized.NormalizedCache;
 import com.apollographql.apollo.cache.normalized.NormalizedCacheFactory;
 import com.apollographql.apollo.cache.normalized.Record;
-import com.apollographql.apollo.cache.normalized.RecordFieldAdapter;
+import com.apollographql.apollo.cache.normalized.RecordFieldJsonAdapter;
 import com.apollographql.apollo.exception.ApolloException;
-import com.squareup.moshi.Moshi;
 
 import org.junit.After;
 import org.junit.Before;
@@ -47,7 +46,7 @@ public void tearDown() throws IOException {
 
   @Test
   public void testHeadersReceived() throws ApolloException, IOException {
-    final NormalizedCache normalizedCache = new NormalizedCache(RecordFieldAdapter.create(new Moshi.Builder().build())) {
+    final NormalizedCache normalizedCache = new NormalizedCache(RecordFieldJsonAdapter.create()) {
       @Nullable @Override public Record loadRecord(@NonNull String key, @NonNull CacheHeaders cacheHeaders) {
         assertThat(cacheHeaders.hasHeader(ApolloCacheHeaders.DO_NOT_STORE)).isTrue();
         return null;
@@ -67,7 +66,7 @@ public void testHeadersReceived() throws ApolloException, IOException {
     };
 
     final NormalizedCacheFactory<NormalizedCache> cacheFactory = new NormalizedCacheFactory<NormalizedCache>() {
-      @Override public NormalizedCache createNormalizedCache(RecordFieldAdapter recordFieldAdapter) {
+      @Override public NormalizedCache createNormalizedCache(RecordFieldJsonAdapter recordFieldAdapter) {
         return normalizedCache;
       }
     };
@@ -88,7 +87,7 @@ public void testHeadersReceived() throws ApolloException, IOException {
 
   @Test
   public void testDefaultHeadersReceived() throws IOException, ApolloException {
-    final NormalizedCache normalizedCache = new NormalizedCache(RecordFieldAdapter.create(new Moshi.Builder().build())) {
+    final NormalizedCache normalizedCache = new NormalizedCache(RecordFieldJsonAdapter.create()) {
       @Nullable @Override public Record loadRecord(@NonNull String key, @NonNull CacheHeaders cacheHeaders) {
         assertThat(cacheHeaders.hasHeader(ApolloCacheHeaders.DO_NOT_STORE)).isTrue();
         return null;
@@ -108,7 +107,7 @@ public void testDefaultHeadersReceived() throws IOException, ApolloException {
     };
 
     final NormalizedCacheFactory<NormalizedCache> cacheFactory = new NormalizedCacheFactory<NormalizedCache>() {
-      @Override public NormalizedCache createNormalizedCache(RecordFieldAdapter recordFieldAdapter) {
+      @Override public NormalizedCache createNormalizedCache(RecordFieldJsonAdapter recordFieldAdapter) {
         return normalizedCache;
       }
     };

apollo-integration/src/test/java/com/apollographql/apollo/internal/cache/normalized/ApolloStoreTest.java

@@ -8,17 +8,15 @@
 import com.apollographql.apollo.cache.normalized.CacheKeyResolver;
 import com.apollographql.apollo.cache.normalized.NormalizedCache;
 import com.apollographql.apollo.cache.normalized.Record;
-import com.apollographql.apollo.cache.normalized.RecordFieldAdapter;
+import com.apollographql.apollo.cache.normalized.RecordFieldJsonAdapter;
 import com.apollographql.apollo.internal.util.ApolloLogger;
-import com.squareup.moshi.Moshi;
 
 import org.junit.Test;
 
 import java.util.Collections;
 import java.util.Set;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -27,7 +25,7 @@ public class ApolloStoreTest {
 
   @Test public void storeClearAllCallsNormalizedCacheClearAll() throws Exception {
     final NamedCountDownLatch latch = new NamedCountDownLatch("storeClearAllCallsNormalizedCacheClearAll", 1);
-    final RealApolloStore realApolloStore = new RealApolloStore(new NormalizedCache(RecordFieldAdapter.create(new Moshi.Builder().build())) {
+    final RealApolloStore realApolloStore = new RealApolloStore(new NormalizedCache(RecordFieldJsonAdapter.create()) {
       @Nullable @Override public Record loadRecord(@Nonnull String key, @Nonnull CacheHeaders cacheHeaders) {
         return null;
       }

apollo-runtime/build.gradle

@@ -6,7 +6,6 @@ sourceCompatibility = JavaVersion.VERSION_1_7
 dependencies {
   compile dep.jsr305
   compile dep.okHttp
-  compile dep.moshi
   compile dep.cache
 
   compile project(":apollo-api")

apollo-runtime/src/main/java/com/apollographql/apollo/ApolloClient.java

@@ -14,7 +14,7 @@
 import com.apollographql.apollo.cache.normalized.CacheKeyResolver;
 import com.apollographql.apollo.cache.normalized.NormalizedCache;
 import com.apollographql.apollo.cache.normalized.NormalizedCacheFactory;
-import com.apollographql.apollo.cache.normalized.RecordFieldAdapter;
+import com.apollographql.apollo.cache.normalized.RecordFieldJsonAdapter;
 import com.apollographql.apollo.fetcher.ApolloResponseFetchers;
 import com.apollographql.apollo.fetcher.ResponseFetcher;
 import com.apollographql.apollo.interceptor.ApolloInterceptor;
@@ -25,9 +25,6 @@
 import com.apollographql.apollo.internal.cache.http.HttpCache;
 import com.apollographql.apollo.internal.cache.normalized.RealApolloStore;
 import com.apollographql.apollo.internal.util.ApolloLogger;
-import com.squareup.moshi.JsonAdapter;
-import com.squareup.moshi.JsonWriter;
-import com.squareup.moshi.Moshi;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -51,7 +48,6 @@
 
 import static com.apollographql.apollo.api.internal.Utils.checkNotNull;
 
-
 /**
  * ApolloClient class represents the abstraction for the graphQL client that will be used to execute queries and read
  * the responses back.
@@ -76,7 +72,6 @@ public static Builder builder() {
   private final HttpCache httpCache;
   private final ApolloStore apolloStore;
   private final Map<ScalarType, CustomTypeAdapter> customTypeAdapters;
-  private final Moshi moshi;
   private final ResponseFieldMapperFactory responseFieldMapperFactory = new ResponseFieldMapperFactory();
   private final ExecutorService dispatcher;
   private final HttpCachePolicy.Policy defaultHttpCachePolicy;
@@ -93,7 +88,6 @@ private ApolloClient(Builder builder) {
     this.httpCache = builder.httpCache;
     this.apolloStore = builder.apolloStore;
     this.customTypeAdapters = builder.customTypeAdapters;
-    this.moshi = builder.moshi;
     this.dispatcher = builder.dispatcher;
     this.defaultHttpCachePolicy = builder.defaultHttpCachePolicy;
     this.defaultCacheHeaders = builder.defaultCacheHeaders;
@@ -213,8 +207,6 @@ private <D extends Operation.Data, T, V extends Operation.Variables> RealApolloC
     ResponseFetcher defaultResponseFetcher = ApolloResponseFetchers.CACHE_FIRST;
     CacheHeaders defaultCacheHeaders = CacheHeaders.NONE;
     final Map<ScalarType, CustomTypeAdapter> customTypeAdapters = new LinkedHashMap<>();
-    private final Moshi.Builder moshiBuilder = new Moshi.Builder();
-    Moshi moshi;
     ExecutorService dispatcher;
     Optional<Logger> logger = Optional.absent();
     HttpCache httpCache;
@@ -304,18 +296,6 @@ public Builder normalizedCache(@Nonnull NormalizedCacheFactory normalizedCacheFa
     public <T> Builder addCustomTypeAdapter(@Nonnull ScalarType scalarType,
         @Nonnull final CustomTypeAdapter<T> customTypeAdapter) {
       customTypeAdapters.put(scalarType, customTypeAdapter);
-      moshiBuilder.add(scalarType.javaType(), new JsonAdapter<T>() {
-        @Override
-        public T fromJson(com.squareup.moshi.JsonReader reader) throws IOException {
-          return customTypeAdapter.decode(reader.nextString());
-        }
-
-        @Override
-        public void toJson(JsonWriter writer, T value) throws IOException {
-          //noinspection unchecked
-          writer.value(customTypeAdapter.encode(value));
-        }
-      });
       return this;
     }
 
@@ -411,7 +391,6 @@ public ApolloClient build() {
       checkNotNull(serverUrl, "serverUrl is null");
 
       apolloLogger = new ApolloLogger(logger);
-      moshi = moshiBuilder.build();
 
       if (httpCacheStore != null) {
         httpCache = new HttpCache(httpCacheStore, apolloLogger);
@@ -424,7 +403,7 @@ public ApolloClient build() {
 
       if (cacheFactory.isPresent() && cacheKeyResolver.isPresent()) {
         final NormalizedCache normalizedCache =
-            cacheFactory.get().createNormalizedCache(RecordFieldAdapter.create(moshi));
+            cacheFactory.get().createNormalizedCache(RecordFieldJsonAdapter.create());
         this.apolloStore = new RealApolloStore(normalizedCache, cacheKeyResolver.get(), customTypeAdapters,
             dispatcher, apolloLogger);
       }

apollo-runtime/src/main/java/com/apollographql/apollo/cache/normalized/NormalizedCache.java

@@ -31,16 +31,16 @@
  */
 public abstract class NormalizedCache {
 
-  private RecordFieldAdapter recordFieldAdapter;
+  private RecordFieldJsonAdapter recordFieldAdapter;
 
   /**
    * @param recordFieldAdapter An adapter which can deserialize and deserialize {@link Record}
    */
-  public NormalizedCache(RecordFieldAdapter recordFieldAdapter) {
+  public NormalizedCache(RecordFieldJsonAdapter recordFieldAdapter) {
     this.recordFieldAdapter = recordFieldAdapter;
   }
 
-  protected RecordFieldAdapter recordAdapter() {
+  protected RecordFieldJsonAdapter recordAdapter() {
     return recordFieldAdapter;
   }
 

apollo-runtime/src/main/java/com/apollographql/apollo/cache/normalized/NormalizedCacheFactory.java

@@ -10,11 +10,11 @@
 public interface NormalizedCacheFactory<T extends NormalizedCache> {
 
   /**
-   * @param recordFieldAdapter A {@link RecordFieldAdapter} configured with the custom scalar adapters set in {@link
+   * @param recordFieldAdapter A {@link RecordFieldJsonAdapter} configured with the custom scalar adapters set in {@link
    *                           com.apollographql.apollo.ApolloClient.Builder#addCustomTypeAdapter(ScalarType,
    *                           CustomTypeAdapter)}.
    * @return An implementation of {@link NormalizedCache}.
    */
-  T createNormalizedCache(RecordFieldAdapter recordFieldAdapter);
+  T createNormalizedCache(RecordFieldJsonAdapter recordFieldAdapter);
 
 }