Skip to content

Cleanup #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 11, 2024
Merged

Cleanup #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d2f23ca
Move some classes around, and make a few of them internal instead of …
BoD Oct 10, 2024
e2997ca
Use expect/actual funs instead of classes
BoD Oct 10, 2024
3208f9d
Update sample apps
BoD Oct 10, 2024
c7b787d
Remove deprecated symbols
BoD Oct 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

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

# Version 0.0.3
_2024-09-20_
Expand Down
98 changes: 12 additions & 86 deletions normalized-cache-incubating/api/normalized-cache-incubating.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,10 @@ public final class com/apollographql/cache/normalized/ApolloStoreKt {
public final class com/apollographql/cache/normalized/CacheInfo : com/apollographql/apollo/api/ExecutionContext$Element {
public static final field Key Lcom/apollographql/cache/normalized/CacheInfo$Key;
public synthetic fun <init> (JJJJZLcom/apollographql/apollo/exception/CacheMissException;Lcom/apollographql/apollo/exception/ApolloException;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
public fun <init> (JJZLjava/lang/String;Ljava/lang/String;)V
public final fun getCacheEndMillis ()J
public final fun getCacheMissException ()Lcom/apollographql/apollo/exception/CacheMissException;
public final fun getCacheStartMillis ()J
public final fun getHit ()Z
public fun getKey ()Lcom/apollographql/apollo/api/ExecutionContext$Key;
public final fun getMillisEnd ()J
public final fun getMillisStart ()J
public final fun getMissedField ()Ljava/lang/String;
public final fun getMissedKey ()Ljava/lang/String;
public final fun getNetworkEndMillis ()J
public final fun getNetworkException ()Lcom/apollographql/apollo/exception/ApolloException;
public final fun getNetworkStartMillis ()J
Expand Down Expand Up @@ -105,8 +99,6 @@ public final class com/apollographql/cache/normalized/NormalizedCache {
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;
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;
public static final fun doNotStore (Lcom/apollographql/apollo/api/MutableExecutionOptions;Z)Ljava/lang/Object;
public static final fun emitCacheMisses (Lcom/apollographql/apollo/api/MutableExecutionOptions;Z)Lcom/apollographql/apollo/api/MutableExecutionOptions;
public static final fun executeCacheAndNetwork (Lcom/apollographql/apollo/ApolloCall;)Lkotlinx/coroutines/flow/Flow;
public static final fun fetchPolicy (Lcom/apollographql/apollo/api/MutableExecutionOptions;Lcom/apollographql/cache/normalized/FetchPolicy;)Ljava/lang/Object;
public static final fun fetchPolicyInterceptor (Lcom/apollographql/apollo/api/MutableExecutionOptions;Lcom/apollographql/apollo/interceptor/ApolloInterceptor;)Ljava/lang/Object;
public static final fun getApolloStore (Lcom/apollographql/apollo/ApolloClient;)Lcom/apollographql/cache/normalized/ApolloStore;
Expand All @@ -126,8 +118,6 @@ public final class com/apollographql/cache/normalized/NormalizedCache {
public static final fun storeReceiveDate (Lcom/apollographql/apollo/api/MutableExecutionOptions;Z)Ljava/lang/Object;
public static final fun watch (Lcom/apollographql/apollo/ApolloCall;)Lkotlinx/coroutines/flow/Flow;
public static final fun watch (Lcom/apollographql/apollo/ApolloCall;Lcom/apollographql/apollo/api/Query$Data;)Lkotlinx/coroutines/flow/Flow;
public static final fun watch (Lcom/apollographql/apollo/ApolloCall;Z)Lkotlinx/coroutines/flow/Flow;
public static final fun watch (Lcom/apollographql/apollo/ApolloCall;ZZ)Lkotlinx/coroutines/flow/Flow;
public static final fun writeToCacheAsynchronously (Lcom/apollographql/apollo/api/MutableExecutionOptions;Z)Ljava/lang/Object;
}

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

public abstract interface class com/apollographql/cache/normalized/api/CacheData {
public abstract fun toMap ()Ljava/util/Map;
}

public final class com/apollographql/cache/normalized/api/CacheHeaders {
public static final field Companion Lcom/apollographql/cache/normalized/api/CacheHeaders$Companion;
public static final field NONE Lcom/apollographql/cache/normalized/api/CacheHeaders;
Expand Down Expand Up @@ -188,8 +174,6 @@ public final class com/apollographql/cache/normalized/api/CacheKey {
public final class com/apollographql/cache/normalized/api/CacheKey$Companion {
public final fun canDeserialize (Ljava/lang/String;)Z
public final fun deserialize (Ljava/lang/String;)Lcom/apollographql/cache/normalized/api/CacheKey;
public final fun from (Ljava/lang/String;Ljava/util/List;)Lcom/apollographql/cache/normalized/api/CacheKey;
public final fun from (Ljava/lang/String;[Ljava/lang/String;)Lcom/apollographql/cache/normalized/api/CacheKey;
public final fun rootKey ()Lcom/apollographql/cache/normalized/api/CacheKey;
}

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

public final class com/apollographql/cache/normalized/api/MemoryCache : com/apollographql/cache/normalized/api/NormalizedCache {
public fun <init> ()V
public fun <init> (Lcom/apollographql/cache/normalized/api/NormalizedCache;IJ)V
public synthetic fun <init> (Lcom/apollographql/cache/normalized/api/NormalizedCache;IJILkotlin/jvm/internal/DefaultConstructorMarker;)V
public fun clearAll ()V
public fun dump ()Ljava/util/Map;
public final fun getSize ()I
public fun loadRecord (Ljava/lang/String;Lcom/apollographql/cache/normalized/api/CacheHeaders;)Lcom/apollographql/cache/normalized/api/Record;
public fun loadRecords (Ljava/util/Collection;Lcom/apollographql/cache/normalized/api/CacheHeaders;)Ljava/util/Collection;
public fun merge (Lcom/apollographql/cache/normalized/api/Record;Lcom/apollographql/cache/normalized/api/CacheHeaders;Lcom/apollographql/cache/normalized/api/RecordMerger;)Ljava/util/Set;
public fun merge (Ljava/util/Collection;Lcom/apollographql/cache/normalized/api/CacheHeaders;Lcom/apollographql/cache/normalized/api/RecordMerger;)Ljava/util/Set;
public fun remove (Lcom/apollographql/cache/normalized/api/CacheKey;Z)Z
public fun remove (Ljava/lang/String;)I
}

public final class com/apollographql/cache/normalized/api/MemoryCacheFactory : com/apollographql/cache/normalized/api/NormalizedCacheFactory {
public fun <init> ()V
public fun <init> (I)V
public fun <init> (IJ)V
public synthetic fun <init> (IJILkotlin/jvm/internal/DefaultConstructorMarker;)V
public final fun chain (Lcom/apollographql/cache/normalized/api/NormalizedCacheFactory;)Lcom/apollographql/cache/normalized/api/MemoryCacheFactory;
public fun create ()Lcom/apollographql/cache/normalized/api/MemoryCache;
public synthetic fun create ()Lcom/apollographql/cache/normalized/api/NormalizedCache;
}

public abstract interface class com/apollographql/cache/normalized/api/MetadataGenerator {
public abstract fun metadataForObject (Ljava/lang/Object;Lcom/apollographql/cache/normalized/api/MetadataGeneratorContext;)Ljava/util/Map;
}
Expand Down Expand Up @@ -412,8 +371,6 @@ public final class com/apollographql/cache/normalized/api/OperationCacheExtensio
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;
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;
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;
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;
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;
}

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

public final class com/apollographql/cache/normalized/api/Record : java/util/Map, kotlin/jvm/internal/markers/KMappedMarker {
public static final field Companion Lcom/apollographql/cache/normalized/api/Record$Companion;
public fun <init> (Ljava/lang/String;Ljava/util/Map;Ljava/util/UUID;)V
public synthetic fun <init> (Ljava/lang/String;Ljava/util/Map;Ljava/util/UUID;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
public fun <init> (Ljava/lang/String;Ljava/util/Map;Ljava/util/UUID;Ljava/util/Map;)V
public synthetic fun <init> (Ljava/lang/String;Ljava/util/Map;Ljava/util/UUID;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
public fun clear ()V
public synthetic fun compute (Ljava/lang/Object;Ljava/util/function/BiFunction;)Ljava/lang/Object;
public fun compute (Ljava/lang/String;Ljava/util/function/BiFunction;)Ljava/lang/Object;
Expand Down Expand Up @@ -511,58 +467,28 @@ public final class com/apollographql/cache/normalized/api/TypePolicyCacheKeyGene
public fun cacheKeyForObject (Ljava/util/Map;Lcom/apollographql/cache/normalized/api/CacheKeyGeneratorContext;)Lcom/apollographql/cache/normalized/api/CacheKey;
}

public final class com/apollographql/cache/normalized/api/internal/BlobRecordSerializer {
public static final field INSTANCE Lcom/apollographql/cache/normalized/api/internal/BlobRecordSerializer;
public final fun deserialize (Ljava/lang/String;[B)Lcom/apollographql/cache/normalized/api/Record;
public final fun serialize (Lcom/apollographql/cache/normalized/api/Record;)[B
}

public final class com/apollographql/cache/normalized/api/internal/Lock {
public final class com/apollographql/cache/normalized/memory/MemoryCache : com/apollographql/cache/normalized/api/NormalizedCache {
public fun <init> ()V
public final fun read (Lkotlin/jvm/functions/Function0;)Ljava/lang/Object;
public final fun write (Lkotlin/jvm/functions/Function0;)Ljava/lang/Object;
}

public final class com/apollographql/cache/normalized/api/internal/OptimisticNormalizedCache : com/apollographql/cache/normalized/api/NormalizedCache {
public fun <init> (Lcom/apollographql/cache/normalized/api/NormalizedCache;)V
public final fun addOptimisticUpdate (Lcom/apollographql/cache/normalized/api/Record;)Ljava/util/Set;
public final fun addOptimisticUpdates (Ljava/util/Collection;)Ljava/util/Set;
public fun <init> (Lcom/apollographql/cache/normalized/api/NormalizedCache;IJ)V
public synthetic fun <init> (Lcom/apollographql/cache/normalized/api/NormalizedCache;IJILkotlin/jvm/internal/DefaultConstructorMarker;)V
public fun clearAll ()V
public fun dump ()Ljava/util/Map;
public final fun getSize ()I
public fun loadRecord (Ljava/lang/String;Lcom/apollographql/cache/normalized/api/CacheHeaders;)Lcom/apollographql/cache/normalized/api/Record;
public fun loadRecords (Ljava/util/Collection;Lcom/apollographql/cache/normalized/api/CacheHeaders;)Ljava/util/Collection;
public fun merge (Lcom/apollographql/cache/normalized/api/Record;Lcom/apollographql/cache/normalized/api/CacheHeaders;Lcom/apollographql/cache/normalized/api/RecordMerger;)Ljava/util/Set;
public fun merge (Ljava/util/Collection;Lcom/apollographql/cache/normalized/api/CacheHeaders;Lcom/apollographql/cache/normalized/api/RecordMerger;)Ljava/util/Set;
public fun remove (Lcom/apollographql/cache/normalized/api/CacheKey;Z)Z
public fun remove (Ljava/lang/String;)I
public final fun removeOptimisticUpdates (Ljava/util/UUID;)Ljava/util/Set;
}

public abstract interface class com/apollographql/cache/normalized/api/internal/store/Cache {
public abstract fun getAllPresent ()Ljava/util/Map;
public abstract fun getAllPresent (Ljava/util/List;)Ljava/util/Map;
public abstract fun getIfPresent (Ljava/lang/Object;)Ljava/lang/Object;
public abstract fun getOrPut (Ljava/lang/Object;Lkotlin/jvm/functions/Function0;)Ljava/lang/Object;
public abstract fun invalidate (Ljava/lang/Object;)V
public abstract fun invalidateAll ()V
public abstract fun invalidateAll (Ljava/util/List;)V
public abstract fun put (Ljava/lang/Object;Ljava/lang/Object;)V
public abstract fun putAll (Ljava/util/Map;)V
public abstract fun size ()J
}

public final class com/apollographql/cache/normalized/api/internal/store/CacheBuilder {
public static final field Companion Lcom/apollographql/cache/normalized/api/internal/store/CacheBuilder$Companion;
public final class com/apollographql/cache/normalized/memory/MemoryCacheFactory : com/apollographql/cache/normalized/api/NormalizedCacheFactory {
public fun <init> ()V
public final fun build ()Lcom/apollographql/cache/normalized/api/internal/store/Cache;
public final fun concurrencyLevel (Lkotlin/jvm/functions/Function0;)Lcom/apollographql/cache/normalized/api/internal/store/CacheBuilder;
public final fun expireAfterAccess-LRDsOJo (J)Lcom/apollographql/cache/normalized/api/internal/store/CacheBuilder;
public final fun expireAfterWrite-LRDsOJo (J)Lcom/apollographql/cache/normalized/api/internal/store/CacheBuilder;
public final fun maximumSize (J)Lcom/apollographql/cache/normalized/api/internal/store/CacheBuilder;
public final fun ticker (Lkotlin/jvm/functions/Function0;)Lcom/apollographql/cache/normalized/api/internal/store/CacheBuilder;
public final fun weigher (JLkotlin/jvm/functions/Function2;)Lcom/apollographql/cache/normalized/api/internal/store/CacheBuilder;
}

public final class com/apollographql/cache/normalized/api/internal/store/CacheBuilder$Companion {
public fun <init> (I)V
public fun <init> (IJ)V
public synthetic fun <init> (IJILkotlin/jvm/internal/DefaultConstructorMarker;)V
public final fun chain (Lcom/apollographql/cache/normalized/api/NormalizedCacheFactory;)Lcom/apollographql/cache/normalized/memory/MemoryCacheFactory;
public synthetic fun create ()Lcom/apollographql/cache/normalized/api/NormalizedCache;
public fun create ()Lcom/apollographql/cache/normalized/memory/MemoryCache;
}

Loading