Skip to content

Commit 2409afa

Browse files
BoDBoD
authored
Cleanup (#47)
* Move some classes around, and make a few of them internal instead of @ApolloInternal * Use expect/actual funs instead of classes * Update sample apps * Remove deprecated symbols
1 parent eef0c84 commit 2409afa

File tree

75 files changed

+358
-655
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+358
-655
lines changed

‎CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
- Expiration support (see [the documentation](https://apollographql.github.io/apollo-kotlin-normalized-cache-incubating/expiration.html) for details)
44
- Compatibility with the IntelliJ plugin cache viewer (#42)
5+
- For consistency, `MemoryCacheFactory` and `MemoryCache` are now in the `com.apollographql.cache.normalized.memory` package
6+
- Remove deprecated symbols
57

68
# Version 0.0.3
79
_2024-09-20_

‎normalized-cache-incubating/api/normalized-cache-incubating.api‎

Lines changed: 12 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,10 @@ public final class com/apollographql/cache/normalized/ApolloStoreKt {
3434
public final class com/apollographql/cache/normalized/CacheInfo : com/apollographql/apollo/api/ExecutionContext$Element {
3535
public static final field Key Lcom/apollographql/cache/normalized/CacheInfo$Key;
3636
public synthetic fun <init> (JJJJZLcom/apollographql/apollo/exception/CacheMissException;Lcom/apollographql/apollo/exception/ApolloException;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
37-
public fun <init> (JJZLjava/lang/String;Ljava/lang/String;)V
3837
public final fun getCacheEndMillis ()J
3938
public final fun getCacheMissException ()Lcom/apollographql/apollo/exception/CacheMissException;
4039
public final fun getCacheStartMillis ()J
41-
public final fun getHit ()Z
4240
public fun getKey ()Lcom/apollographql/apollo/api/ExecutionContext$Key;
43-
public final fun getMillisEnd ()J
44-
public final fun getMillisStart ()J
45-
public final fun getMissedField ()Ljava/lang/String;
46-
public final fun getMissedKey ()Ljava/lang/String;
4741
public final fun getNetworkEndMillis ()J
4842
public final fun getNetworkException ()Lcom/apollographql/apollo/exception/ApolloException;
4943
public final fun getNetworkStartMillis ()J
@@ -105,8 +99,6 @@ public final class com/apollographql/cache/normalized/NormalizedCache {
10599
public static final fun configureApolloClientBuilder2 (Lcom/apollographql/apollo/ApolloClient$Builder;Lcom/apollographql/cache/normalized/api/NormalizedCacheFactory;Lcom/apollographql/cache/normalized/api/CacheKeyGenerator;Lcom/apollographql/cache/normalized/api/MetadataGenerator;Lcom/apollographql/cache/normalized/api/CacheResolver;Lcom/apollographql/cache/normalized/api/RecordMerger;Lcom/apollographql/cache/normalized/api/FieldKeyGenerator;Lcom/apollographql/cache/normalized/api/EmbeddedFieldsProvider;Z)Lcom/apollographql/apollo/ApolloClient$Builder;
106100
public static synthetic fun configureApolloClientBuilder2$default (Lcom/apollographql/apollo/ApolloClient$Builder;Lcom/apollographql/cache/normalized/api/NormalizedCacheFactory;Lcom/apollographql/cache/normalized/api/CacheKeyGenerator;Lcom/apollographql/cache/normalized/api/MetadataGenerator;Lcom/apollographql/cache/normalized/api/CacheResolver;Lcom/apollographql/cache/normalized/api/RecordMerger;Lcom/apollographql/cache/normalized/api/FieldKeyGenerator;Lcom/apollographql/cache/normalized/api/EmbeddedFieldsProvider;ZILjava/lang/Object;)Lcom/apollographql/apollo/ApolloClient$Builder;
107101
public static final fun doNotStore (Lcom/apollographql/apollo/api/MutableExecutionOptions;Z)Ljava/lang/Object;
108-
public static final fun emitCacheMisses (Lcom/apollographql/apollo/api/MutableExecutionOptions;Z)Lcom/apollographql/apollo/api/MutableExecutionOptions;
109-
public static final fun executeCacheAndNetwork (Lcom/apollographql/apollo/ApolloCall;)Lkotlinx/coroutines/flow/Flow;
110102
public static final fun fetchPolicy (Lcom/apollographql/apollo/api/MutableExecutionOptions;Lcom/apollographql/cache/normalized/FetchPolicy;)Ljava/lang/Object;
111103
public static final fun fetchPolicyInterceptor (Lcom/apollographql/apollo/api/MutableExecutionOptions;Lcom/apollographql/apollo/interceptor/ApolloInterceptor;)Ljava/lang/Object;
112104
public static final fun getApolloStore (Lcom/apollographql/apollo/ApolloClient;)Lcom/apollographql/cache/normalized/ApolloStore;
@@ -126,8 +118,6 @@ public final class com/apollographql/cache/normalized/NormalizedCache {
126118
public static final fun storeReceiveDate (Lcom/apollographql/apollo/api/MutableExecutionOptions;Z)Ljava/lang/Object;
127119
public static final fun watch (Lcom/apollographql/apollo/ApolloCall;)Lkotlinx/coroutines/flow/Flow;
128120
public static final fun watch (Lcom/apollographql/apollo/ApolloCall;Lcom/apollographql/apollo/api/Query$Data;)Lkotlinx/coroutines/flow/Flow;
129-
public static final fun watch (Lcom/apollographql/apollo/ApolloCall;Z)Lkotlinx/coroutines/flow/Flow;
130-
public static final fun watch (Lcom/apollographql/apollo/ApolloCall;ZZ)Lkotlinx/coroutines/flow/Flow;
131121
public static final fun writeToCacheAsynchronously (Lcom/apollographql/apollo/api/MutableExecutionOptions;Z)Ljava/lang/Object;
132122
}
133123

@@ -145,10 +135,6 @@ public final class com/apollographql/cache/normalized/api/ApolloCacheHeaders {
145135
public static final field RECEIVED_DATE Ljava/lang/String;
146136
}
147137

148-
public abstract interface class com/apollographql/cache/normalized/api/CacheData {
149-
public abstract fun toMap ()Ljava/util/Map;
150-
}
151-
152138
public final class com/apollographql/cache/normalized/api/CacheHeaders {
153139
public static final field Companion Lcom/apollographql/cache/normalized/api/CacheHeaders$Companion;
154140
public static final field NONE Lcom/apollographql/cache/normalized/api/CacheHeaders;
@@ -188,8 +174,6 @@ public final class com/apollographql/cache/normalized/api/CacheKey {
188174
public final class com/apollographql/cache/normalized/api/CacheKey$Companion {
189175
public final fun canDeserialize (Ljava/lang/String;)Z
190176
public final fun deserialize (Ljava/lang/String;)Lcom/apollographql/cache/normalized/api/CacheKey;
191-
public final fun from (Ljava/lang/String;Ljava/util/List;)Lcom/apollographql/cache/normalized/api/CacheKey;
192-
public final fun from (Ljava/lang/String;[Ljava/lang/String;)Lcom/apollographql/cache/normalized/api/CacheKey;
193177
public final fun rootKey ()Lcom/apollographql/cache/normalized/api/CacheKey;
194178
}
195179

@@ -344,31 +328,6 @@ public abstract interface class com/apollographql/cache/normalized/api/MaxAgePro
344328
public abstract fun getMaxAge-5sfh64U (Lcom/apollographql/cache/normalized/api/MaxAgeContext;)J
345329
}
346330

347-
public final class com/apollographql/cache/normalized/api/MemoryCache : com/apollographql/cache/normalized/api/NormalizedCache {
348-
public fun <init> ()V
349-
public fun <init> (Lcom/apollographql/cache/normalized/api/NormalizedCache;IJ)V
350-
public synthetic fun <init> (Lcom/apollographql/cache/normalized/api/NormalizedCache;IJILkotlin/jvm/internal/DefaultConstructorMarker;)V
351-
public fun clearAll ()V
352-
public fun dump ()Ljava/util/Map;
353-
public final fun getSize ()I
354-
public fun loadRecord (Ljava/lang/String;Lcom/apollographql/cache/normalized/api/CacheHeaders;)Lcom/apollographql/cache/normalized/api/Record;
355-
public fun loadRecords (Ljava/util/Collection;Lcom/apollographql/cache/normalized/api/CacheHeaders;)Ljava/util/Collection;
356-
public fun merge (Lcom/apollographql/cache/normalized/api/Record;Lcom/apollographql/cache/normalized/api/CacheHeaders;Lcom/apollographql/cache/normalized/api/RecordMerger;)Ljava/util/Set;
357-
public fun merge (Ljava/util/Collection;Lcom/apollographql/cache/normalized/api/CacheHeaders;Lcom/apollographql/cache/normalized/api/RecordMerger;)Ljava/util/Set;
358-
public fun remove (Lcom/apollographql/cache/normalized/api/CacheKey;Z)Z
359-
public fun remove (Ljava/lang/String;)I
360-
}
361-
362-
public final class com/apollographql/cache/normalized/api/MemoryCacheFactory : com/apollographql/cache/normalized/api/NormalizedCacheFactory {
363-
public fun <init> ()V
364-
public fun <init> (I)V
365-
public fun <init> (IJ)V
366-
public synthetic fun <init> (IJILkotlin/jvm/internal/DefaultConstructorMarker;)V
367-
public final fun chain (Lcom/apollographql/cache/normalized/api/NormalizedCacheFactory;)Lcom/apollographql/cache/normalized/api/MemoryCacheFactory;
368-
public fun create ()Lcom/apollographql/cache/normalized/api/MemoryCache;
369-
public synthetic fun create ()Lcom/apollographql/cache/normalized/api/NormalizedCache;
370-
}
371-
372331
public abstract interface class com/apollographql/cache/normalized/api/MetadataGenerator {
373332
public abstract fun metadataForObject (Ljava/lang/Object;Lcom/apollographql/cache/normalized/api/MetadataGeneratorContext;)Ljava/util/Map;
374333
}
@@ -412,8 +371,6 @@ public final class com/apollographql/cache/normalized/api/OperationCacheExtensio
412371
public static final fun readDataFromCache (Lcom/apollographql/apollo/api/Executable;Lcom/apollographql/cache/normalized/api/CacheKey;Lcom/apollographql/apollo/api/CustomScalarAdapters;Lcom/apollographql/cache/normalized/api/ReadOnlyNormalizedCache;Lcom/apollographql/cache/normalized/api/CacheResolver;Lcom/apollographql/cache/normalized/api/CacheHeaders;Lcom/apollographql/cache/normalized/api/FieldKeyGenerator;)Lcom/apollographql/apollo/api/Executable$Data;
413372
public static synthetic fun readDataFromCache$default (Lcom/apollographql/apollo/api/Executable;Lcom/apollographql/apollo/api/CustomScalarAdapters;Lcom/apollographql/cache/normalized/api/ReadOnlyNormalizedCache;Lcom/apollographql/cache/normalized/api/CacheResolver;Lcom/apollographql/cache/normalized/api/CacheHeaders;Lcom/apollographql/cache/normalized/api/FieldKeyGenerator;ILjava/lang/Object;)Lcom/apollographql/apollo/api/Executable$Data;
414373
public static synthetic fun readDataFromCache$default (Lcom/apollographql/apollo/api/Executable;Lcom/apollographql/cache/normalized/api/CacheKey;Lcom/apollographql/apollo/api/CustomScalarAdapters;Lcom/apollographql/cache/normalized/api/ReadOnlyNormalizedCache;Lcom/apollographql/cache/normalized/api/CacheResolver;Lcom/apollographql/cache/normalized/api/CacheHeaders;Lcom/apollographql/cache/normalized/api/FieldKeyGenerator;ILjava/lang/Object;)Lcom/apollographql/apollo/api/Executable$Data;
415-
public static final fun readDataFromCacheInternal (Lcom/apollographql/apollo/api/Executable;Lcom/apollographql/cache/normalized/api/CacheKey;Lcom/apollographql/cache/normalized/api/ReadOnlyNormalizedCache;Lcom/apollographql/cache/normalized/api/CacheResolver;Lcom/apollographql/cache/normalized/api/CacheHeaders;Lcom/apollographql/apollo/api/Executable$Variables;Lcom/apollographql/cache/normalized/api/FieldKeyGenerator;)Lcom/apollographql/cache/normalized/api/CacheData;
416-
public static final fun toData (Lcom/apollographql/cache/normalized/api/CacheData;Lcom/apollographql/apollo/api/Adapter;Lcom/apollographql/apollo/api/CustomScalarAdapters;Lcom/apollographql/apollo/api/Executable$Variables;)Lcom/apollographql/apollo/api/Executable$Data;
417374
}
418375

419376
public abstract interface class com/apollographql/cache/normalized/api/ReadOnlyNormalizedCache {
@@ -424,9 +381,8 @@ public abstract interface class com/apollographql/cache/normalized/api/ReadOnlyN
424381

425382
public final class com/apollographql/cache/normalized/api/Record : java/util/Map, kotlin/jvm/internal/markers/KMappedMarker {
426383
public static final field Companion Lcom/apollographql/cache/normalized/api/Record$Companion;
427-
public fun <init> (Ljava/lang/String;Ljava/util/Map;Ljava/util/UUID;)V
428-
public synthetic fun <init> (Ljava/lang/String;Ljava/util/Map;Ljava/util/UUID;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
429384
public fun <init> (Ljava/lang/String;Ljava/util/Map;Ljava/util/UUID;Ljava/util/Map;)V
385+
public synthetic fun <init> (Ljava/lang/String;Ljava/util/Map;Ljava/util/UUID;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
430386
public fun clear ()V
431387
public synthetic fun compute (Ljava/lang/Object;Ljava/util/function/BiFunction;)Ljava/lang/Object;
432388
public fun compute (Ljava/lang/String;Ljava/util/function/BiFunction;)Ljava/lang/Object;
@@ -511,58 +467,28 @@ public final class com/apollographql/cache/normalized/api/TypePolicyCacheKeyGene
511467
public fun cacheKeyForObject (Ljava/util/Map;Lcom/apollographql/cache/normalized/api/CacheKeyGeneratorContext;)Lcom/apollographql/cache/normalized/api/CacheKey;
512468
}
513469

514-
public final class com/apollographql/cache/normalized/api/internal/BlobRecordSerializer {
515-
public static final field INSTANCE Lcom/apollographql/cache/normalized/api/internal/BlobRecordSerializer;
516-
public final fun deserialize (Ljava/lang/String;[B)Lcom/apollographql/cache/normalized/api/Record;
517-
public final fun serialize (Lcom/apollographql/cache/normalized/api/Record;)[B
518-
}
519-
520-
public final class com/apollographql/cache/normalized/api/internal/Lock {
470+
public final class com/apollographql/cache/normalized/memory/MemoryCache : com/apollographql/cache/normalized/api/NormalizedCache {
521471
public fun <init> ()V
522-
public final fun read (Lkotlin/jvm/functions/Function0;)Ljava/lang/Object;
523-
public final fun write (Lkotlin/jvm/functions/Function0;)Ljava/lang/Object;
524-
}
525-
526-
public final class com/apollographql/cache/normalized/api/internal/OptimisticNormalizedCache : com/apollographql/cache/normalized/api/NormalizedCache {
527-
public fun <init> (Lcom/apollographql/cache/normalized/api/NormalizedCache;)V
528-
public final fun addOptimisticUpdate (Lcom/apollographql/cache/normalized/api/Record;)Ljava/util/Set;
529-
public final fun addOptimisticUpdates (Ljava/util/Collection;)Ljava/util/Set;
472+
public fun <init> (Lcom/apollographql/cache/normalized/api/NormalizedCache;IJ)V
473+
public synthetic fun <init> (Lcom/apollographql/cache/normalized/api/NormalizedCache;IJILkotlin/jvm/internal/DefaultConstructorMarker;)V
530474
public fun clearAll ()V
531475
public fun dump ()Ljava/util/Map;
476+
public final fun getSize ()I
532477
public fun loadRecord (Ljava/lang/String;Lcom/apollographql/cache/normalized/api/CacheHeaders;)Lcom/apollographql/cache/normalized/api/Record;
533478
public fun loadRecords (Ljava/util/Collection;Lcom/apollographql/cache/normalized/api/CacheHeaders;)Ljava/util/Collection;
534479
public fun merge (Lcom/apollographql/cache/normalized/api/Record;Lcom/apollographql/cache/normalized/api/CacheHeaders;Lcom/apollographql/cache/normalized/api/RecordMerger;)Ljava/util/Set;
535480
public fun merge (Ljava/util/Collection;Lcom/apollographql/cache/normalized/api/CacheHeaders;Lcom/apollographql/cache/normalized/api/RecordMerger;)Ljava/util/Set;
536481
public fun remove (Lcom/apollographql/cache/normalized/api/CacheKey;Z)Z
537482
public fun remove (Ljava/lang/String;)I
538-
public final fun removeOptimisticUpdates (Ljava/util/UUID;)Ljava/util/Set;
539-
}
540-
541-
public abstract interface class com/apollographql/cache/normalized/api/internal/store/Cache {
542-
public abstract fun getAllPresent ()Ljava/util/Map;
543-
public abstract fun getAllPresent (Ljava/util/List;)Ljava/util/Map;
544-
public abstract fun getIfPresent (Ljava/lang/Object;)Ljava/lang/Object;
545-
public abstract fun getOrPut (Ljava/lang/Object;Lkotlin/jvm/functions/Function0;)Ljava/lang/Object;
546-
public abstract fun invalidate (Ljava/lang/Object;)V
547-
public abstract fun invalidateAll ()V
548-
public abstract fun invalidateAll (Ljava/util/List;)V
549-
public abstract fun put (Ljava/lang/Object;Ljava/lang/Object;)V
550-
public abstract fun putAll (Ljava/util/Map;)V
551-
public abstract fun size ()J
552483
}
553484

554-
public final class com/apollographql/cache/normalized/api/internal/store/CacheBuilder {
555-
public static final field Companion Lcom/apollographql/cache/normalized/api/internal/store/CacheBuilder$Companion;
485+
public final class com/apollographql/cache/normalized/memory/MemoryCacheFactory : com/apollographql/cache/normalized/api/NormalizedCacheFactory {
556486
public fun <init> ()V
557-
public final fun build ()Lcom/apollographql/cache/normalized/api/internal/store/Cache;
558-
public final fun concurrencyLevel (Lkotlin/jvm/functions/Function0;)Lcom/apollographql/cache/normalized/api/internal/store/CacheBuilder;
559-
public final fun expireAfterAccess-LRDsOJo (J)Lcom/apollographql/cache/normalized/api/internal/store/CacheBuilder;
560-
public final fun expireAfterWrite-LRDsOJo (J)Lcom/apollographql/cache/normalized/api/internal/store/CacheBuilder;
561-
public final fun maximumSize (J)Lcom/apollographql/cache/normalized/api/internal/store/CacheBuilder;
562-
public final fun ticker (Lkotlin/jvm/functions/Function0;)Lcom/apollographql/cache/normalized/api/internal/store/CacheBuilder;
563-
public final fun weigher (JLkotlin/jvm/functions/Function2;)Lcom/apollographql/cache/normalized/api/internal/store/CacheBuilder;
564-
}
565-
566-
public final class com/apollographql/cache/normalized/api/internal/store/CacheBuilder$Companion {
487+
public fun <init> (I)V
488+
public fun <init> (IJ)V
489+
public synthetic fun <init> (IJILkotlin/jvm/internal/DefaultConstructorMarker;)V
490+
public final fun chain (Lcom/apollographql/cache/normalized/api/NormalizedCacheFactory;)Lcom/apollographql/cache/normalized/memory/MemoryCacheFactory;
491+
public synthetic fun create ()Lcom/apollographql/cache/normalized/api/NormalizedCache;
492+
public fun create ()Lcom/apollographql/cache/normalized/memory/MemoryCache;
567493
}
568494

0 commit comments

Comments
 (0)