Add ApolloClient.Builder(ApolloHttpCache) (#5638) (#5640)

* add CachingHttpInterceptor(ApolloHttpCache) * Add ApolloClient.Builder(ApolloHttpCache)
apollographql · Feb 22, 2024 · 3acfc47 · 3acfc47
1 parent 6a4fdc2
commit 3acfc47
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 deletions.
diff --git a/libraries/apollo-http-cache/api/apollo-http-cache.api b/libraries/apollo-http-cache/api/apollo-http-cache.api
@@ -46,6 +46,7 @@ public final class com/apollographql/apollo3/cache/http/DiskLruHttpCache$Compani
 }
 
 public final class com/apollographql/apollo3/cache/http/HttpCache {
+	public static final fun configureApolloClientBuilder (Lcom/apollographql/apollo3/ApolloClient$Builder;Lcom/apollographql/apollo3/cache/http/ApolloHttpCache;)Lcom/apollographql/apollo3/ApolloClient$Builder;
 	public static final fun configureApolloClientBuilder (Lcom/apollographql/apollo3/ApolloClient$Builder;Ljava/io/File;J)Lcom/apollographql/apollo3/ApolloClient$Builder;
 	public static final fun getHttpCache (Lcom/apollographql/apollo3/ApolloClient;)Lcom/apollographql/apollo3/cache/http/ApolloHttpCache;
 	public static final fun httpDoNotStore (Lcom/apollographql/apollo3/api/MutableExecutionOptions;Z)Ljava/lang/Object;

diff --git a/...http-cache/src/main/kotlin/com/apollographql/apollo3/cache/http/CachingHttpInterceptor.kt b/...http-cache/src/main/kotlin/com/apollographql/apollo3/cache/http/CachingHttpInterceptor.kt
@@ -20,12 +20,15 @@ import java.io.File
 import java.time.Instant
 import java.time.format.DateTimeParseException
 
-class CachingHttpInterceptor(
-    directory: File,
-    maxSize: Long,
-    fileSystem: FileSystem = FileSystem.SYSTEM,
+class CachingHttpInterceptor internal constructor(
+    private val lruHttpCache: ApolloHttpCache
 ) : HttpInterceptor {
-  private val lruHttpCache = DiskLruHttpCache(fileSystem, directory, maxSize)
+
+  constructor(
+      directory: File,
+      maxSize: Long,
+      fileSystem: FileSystem = FileSystem.SYSTEM,
+  ): this(DiskLruHttpCache(fileSystem, directory, maxSize))
 
   val cache: ApolloHttpCache = lruHttpCache
 

diff --git a/...lo-http-cache/src/main/kotlin/com/apollographql/apollo3/cache/http/HttpCacheExtensions.kt b/...lo-http-cache/src/main/kotlin/com/apollographql/apollo3/cache/http/HttpCacheExtensions.kt
@@ -26,6 +26,7 @@ import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.onCompletion
 import kotlinx.coroutines.flow.onEach
+import okio.FileSystem
 import java.io.File
 
 enum class HttpFetchPolicy {
@@ -72,10 +73,15 @@ fun ApolloClient.Builder.httpCache(
     directory: File,
     maxSize: Long,
 ): ApolloClient.Builder {
-  val cachingHttpInterceptor = CachingHttpInterceptor(
-      directory = directory,
-      maxSize = maxSize,
-  )
+  return httpCache(DiskLruHttpCache(FileSystem.SYSTEM, directory, maxSize))
+}
+
+@JvmName("configureApolloClientBuilder")
+fun ApolloClient.Builder.httpCache(
+    apolloHttpCache: ApolloHttpCache,
+): ApolloClient.Builder {
+  val cachingHttpInterceptor = CachingHttpInterceptor(apolloHttpCache)
+
   val apolloRequestToCacheKey = mutableMapOf<String, String>()
   return addHttpInterceptor(object : HttpInterceptor {
     override suspend fun intercept(request: HttpRequest, chain: HttpInterceptorChain): HttpResponse {