Deprecate PagedList APIs
Fixes: 147143715
Test: ./gradlew paging:paging-common:test
Change-Id: I1ae82767875fdce3cfeec8943415e187a1fa1126
diff --git a/paging/common/api/3.0.0-alpha01.txt b/paging/common/api/3.0.0-alpha01.txt
index 7014741..2ab42bfb 100644
--- a/paging/common/api/3.0.0-alpha01.txt
+++ b/paging/common/api/3.0.0-alpha01.txt
@@ -140,25 +140,25 @@
field @Deprecated public final int requestedLoadSize;
}
- public abstract class PagedList<T> extends java.util.AbstractList<T> {
+ @Deprecated public abstract class PagedList<T> extends java.util.AbstractList<T> {
method @Deprecated public final void addWeakCallback(java.util.List<? extends T>? previousSnapshot, androidx.paging.PagedList.Callback callback);
- method public final void addWeakCallback(androidx.paging.PagedList.Callback callback);
- method public final void addWeakLoadStateListener(kotlin.jvm.functions.Function2<? super androidx.paging.LoadType,? super androidx.paging.LoadState,kotlin.Unit> listener);
- method public abstract void detach();
- method public T? get(int index);
- method public final androidx.paging.PagedList.Config getConfig();
+ method @Deprecated public final void addWeakCallback(androidx.paging.PagedList.Callback callback);
+ method @Deprecated public final void addWeakLoadStateListener(kotlin.jvm.functions.Function2<? super androidx.paging.LoadType,? super androidx.paging.LoadState,kotlin.Unit> listener);
+ method @Deprecated public abstract void detach();
+ method @Deprecated public T? get(int index);
+ method @Deprecated public final androidx.paging.PagedList.Config getConfig();
method @Deprecated public final androidx.paging.DataSource<?,T> getDataSource();
- method public abstract Object? getLastKey();
- method public final int getLoadedCount();
- method public final int getPositionOffset();
- method public int getSize();
- method public abstract boolean isDetached();
- method public boolean isImmutable();
- method public final void loadAround(int index);
- method public final void removeWeakCallback(androidx.paging.PagedList.Callback callback);
- method public final void removeWeakLoadStateListener(kotlin.jvm.functions.Function2<? super androidx.paging.LoadType,? super androidx.paging.LoadState,kotlin.Unit> listener);
- method public void retry();
- method public final java.util.List<T> snapshot();
+ method @Deprecated public abstract Object? getLastKey();
+ method @Deprecated public final int getLoadedCount();
+ method @Deprecated public final int getPositionOffset();
+ method @Deprecated public int getSize();
+ method @Deprecated public abstract boolean isDetached();
+ method @Deprecated public boolean isImmutable();
+ method @Deprecated public final void loadAround(int index);
+ method @Deprecated public final void removeWeakCallback(androidx.paging.PagedList.Callback callback);
+ method @Deprecated public final void removeWeakLoadStateListener(kotlin.jvm.functions.Function2<? super androidx.paging.LoadType,? super androidx.paging.LoadState,kotlin.Unit> listener);
+ method @Deprecated public void retry();
+ method @Deprecated public final java.util.List<T> snapshot();
property @Deprecated public final androidx.paging.DataSource<?,T> dataSource;
property public abstract boolean isDetached;
property public boolean isImmutable;
@@ -168,52 +168,52 @@
property public int size;
}
- @MainThread public abstract static class PagedList.BoundaryCallback<T> {
- ctor public PagedList.BoundaryCallback();
- method public void onItemAtEndLoaded(T itemAtEnd);
- method public void onItemAtFrontLoaded(T itemAtFront);
- method public void onZeroItemsLoaded();
+ @Deprecated @MainThread public abstract static class PagedList.BoundaryCallback<T> {
+ ctor @Deprecated public PagedList.BoundaryCallback();
+ method @Deprecated public void onItemAtEndLoaded(T itemAtEnd);
+ method @Deprecated public void onItemAtFrontLoaded(T itemAtFront);
+ method @Deprecated public void onZeroItemsLoaded();
}
- public static final class PagedList.Builder<Key, Value> {
+ @Deprecated public static final class PagedList.Builder<Key, Value> {
ctor @Deprecated public PagedList.Builder(androidx.paging.DataSource<Key,Value> dataSource, androidx.paging.PagedList.Config config);
ctor @Deprecated public PagedList.Builder(androidx.paging.DataSource<Key,Value> dataSource, int pageSize);
- ctor public PagedList.Builder(androidx.paging.PagingSource<Key,Value> pagingSource, androidx.paging.PagingSource.LoadResult.Page<Key,Value> initialPage, androidx.paging.PagedList.Config config);
- ctor public PagedList.Builder(androidx.paging.PagingSource<Key,Value> pagingSource, androidx.paging.PagingSource.LoadResult.Page<Key,Value> initialPage, int pageSize);
- method public androidx.paging.PagedList<Value> build();
- method public androidx.paging.PagedList.Builder<Key,Value> setBoundaryCallback(androidx.paging.PagedList.BoundaryCallback<Value>? boundaryCallback);
- method public androidx.paging.PagedList.Builder<Key,Value> setCoroutineScope(kotlinx.coroutines.CoroutineScope coroutineScope);
- method public androidx.paging.PagedList.Builder<Key,Value> setFetchDispatcher(kotlinx.coroutines.CoroutineDispatcher fetchDispatcher);
+ ctor @Deprecated public PagedList.Builder(androidx.paging.PagingSource<Key,Value> pagingSource, androidx.paging.PagingSource.LoadResult.Page<Key,Value> initialPage, androidx.paging.PagedList.Config config);
+ ctor @Deprecated public PagedList.Builder(androidx.paging.PagingSource<Key,Value> pagingSource, androidx.paging.PagingSource.LoadResult.Page<Key,Value> initialPage, int pageSize);
+ method @Deprecated public androidx.paging.PagedList<Value> build();
+ method @Deprecated public androidx.paging.PagedList.Builder<Key,Value> setBoundaryCallback(androidx.paging.PagedList.BoundaryCallback<Value>? boundaryCallback);
+ method @Deprecated public androidx.paging.PagedList.Builder<Key,Value> setCoroutineScope(kotlinx.coroutines.CoroutineScope coroutineScope);
+ method @Deprecated public androidx.paging.PagedList.Builder<Key,Value> setFetchDispatcher(kotlinx.coroutines.CoroutineDispatcher fetchDispatcher);
method @Deprecated public androidx.paging.PagedList.Builder<Key,Value> setFetchExecutor(java.util.concurrent.Executor fetchExecutor);
- method public androidx.paging.PagedList.Builder<Key,Value> setInitialKey(Key? initialKey);
- method public androidx.paging.PagedList.Builder<Key,Value> setNotifyDispatcher(kotlinx.coroutines.CoroutineDispatcher notifyDispatcher);
+ method @Deprecated public androidx.paging.PagedList.Builder<Key,Value> setInitialKey(Key? initialKey);
+ method @Deprecated public androidx.paging.PagedList.Builder<Key,Value> setNotifyDispatcher(kotlinx.coroutines.CoroutineDispatcher notifyDispatcher);
method @Deprecated public androidx.paging.PagedList.Builder<Key,Value> setNotifyExecutor(java.util.concurrent.Executor notifyExecutor);
}
- public abstract static class PagedList.Callback {
- ctor public PagedList.Callback();
- method public abstract void onChanged(int position, int count);
- method public abstract void onInserted(int position, int count);
- method public abstract void onRemoved(int position, int count);
+ @Deprecated public abstract static class PagedList.Callback {
+ ctor @Deprecated public PagedList.Callback();
+ method @Deprecated public abstract void onChanged(int position, int count);
+ method @Deprecated public abstract void onInserted(int position, int count);
+ method @Deprecated public abstract void onRemoved(int position, int count);
}
- public static final class PagedList.Config {
- field public static final int MAX_SIZE_UNBOUNDED = 2147483647; // 0x7fffffff
- field public final boolean enablePlaceholders;
- field public final int initialLoadSizeHint;
- field public final int maxSize;
- field public final int pageSize;
- field public final int prefetchDistance;
+ @Deprecated public static final class PagedList.Config {
+ field @Deprecated public static final int MAX_SIZE_UNBOUNDED = 2147483647; // 0x7fffffff
+ field @Deprecated public final boolean enablePlaceholders;
+ field @Deprecated public final int initialLoadSizeHint;
+ field @Deprecated public final int maxSize;
+ field @Deprecated public final int pageSize;
+ field @Deprecated public final int prefetchDistance;
}
- public static final class PagedList.Config.Builder {
- ctor public PagedList.Config.Builder();
- method public androidx.paging.PagedList.Config build();
- method public androidx.paging.PagedList.Config.Builder setEnablePlaceholders(boolean enablePlaceholders);
- method public androidx.paging.PagedList.Config.Builder setInitialLoadSizeHint(@IntRange(from=1) int initialLoadSizeHint);
- method public androidx.paging.PagedList.Config.Builder setMaxSize(@IntRange(from=2) int maxSize);
- method public androidx.paging.PagedList.Config.Builder setPageSize(@IntRange(from=1) int pageSize);
- method public androidx.paging.PagedList.Config.Builder setPrefetchDistance(@IntRange(from=0) int prefetchDistance);
+ @Deprecated public static final class PagedList.Config.Builder {
+ ctor @Deprecated public PagedList.Config.Builder();
+ method @Deprecated public androidx.paging.PagedList.Config build();
+ method @Deprecated public androidx.paging.PagedList.Config.Builder setEnablePlaceholders(boolean enablePlaceholders);
+ method @Deprecated public androidx.paging.PagedList.Config.Builder setInitialLoadSizeHint(@IntRange(from=1) int initialLoadSizeHint);
+ method @Deprecated public androidx.paging.PagedList.Config.Builder setMaxSize(@IntRange(from=2) int maxSize);
+ method @Deprecated public androidx.paging.PagedList.Config.Builder setPageSize(@IntRange(from=1) int pageSize);
+ method @Deprecated public androidx.paging.PagedList.Config.Builder setPrefetchDistance(@IntRange(from=0) int prefetchDistance);
}
public final class PagedListConfigKt {
diff --git a/paging/common/api/current.txt b/paging/common/api/current.txt
index 7014741..2ab42bfb 100644
--- a/paging/common/api/current.txt
+++ b/paging/common/api/current.txt
@@ -140,25 +140,25 @@
field @Deprecated public final int requestedLoadSize;
}
- public abstract class PagedList<T> extends java.util.AbstractList<T> {
+ @Deprecated public abstract class PagedList<T> extends java.util.AbstractList<T> {
method @Deprecated public final void addWeakCallback(java.util.List<? extends T>? previousSnapshot, androidx.paging.PagedList.Callback callback);
- method public final void addWeakCallback(androidx.paging.PagedList.Callback callback);
- method public final void addWeakLoadStateListener(kotlin.jvm.functions.Function2<? super androidx.paging.LoadType,? super androidx.paging.LoadState,kotlin.Unit> listener);
- method public abstract void detach();
- method public T? get(int index);
- method public final androidx.paging.PagedList.Config getConfig();
+ method @Deprecated public final void addWeakCallback(androidx.paging.PagedList.Callback callback);
+ method @Deprecated public final void addWeakLoadStateListener(kotlin.jvm.functions.Function2<? super androidx.paging.LoadType,? super androidx.paging.LoadState,kotlin.Unit> listener);
+ method @Deprecated public abstract void detach();
+ method @Deprecated public T? get(int index);
+ method @Deprecated public final androidx.paging.PagedList.Config getConfig();
method @Deprecated public final androidx.paging.DataSource<?,T> getDataSource();
- method public abstract Object? getLastKey();
- method public final int getLoadedCount();
- method public final int getPositionOffset();
- method public int getSize();
- method public abstract boolean isDetached();
- method public boolean isImmutable();
- method public final void loadAround(int index);
- method public final void removeWeakCallback(androidx.paging.PagedList.Callback callback);
- method public final void removeWeakLoadStateListener(kotlin.jvm.functions.Function2<? super androidx.paging.LoadType,? super androidx.paging.LoadState,kotlin.Unit> listener);
- method public void retry();
- method public final java.util.List<T> snapshot();
+ method @Deprecated public abstract Object? getLastKey();
+ method @Deprecated public final int getLoadedCount();
+ method @Deprecated public final int getPositionOffset();
+ method @Deprecated public int getSize();
+ method @Deprecated public abstract boolean isDetached();
+ method @Deprecated public boolean isImmutable();
+ method @Deprecated public final void loadAround(int index);
+ method @Deprecated public final void removeWeakCallback(androidx.paging.PagedList.Callback callback);
+ method @Deprecated public final void removeWeakLoadStateListener(kotlin.jvm.functions.Function2<? super androidx.paging.LoadType,? super androidx.paging.LoadState,kotlin.Unit> listener);
+ method @Deprecated public void retry();
+ method @Deprecated public final java.util.List<T> snapshot();
property @Deprecated public final androidx.paging.DataSource<?,T> dataSource;
property public abstract boolean isDetached;
property public boolean isImmutable;
@@ -168,52 +168,52 @@
property public int size;
}
- @MainThread public abstract static class PagedList.BoundaryCallback<T> {
- ctor public PagedList.BoundaryCallback();
- method public void onItemAtEndLoaded(T itemAtEnd);
- method public void onItemAtFrontLoaded(T itemAtFront);
- method public void onZeroItemsLoaded();
+ @Deprecated @MainThread public abstract static class PagedList.BoundaryCallback<T> {
+ ctor @Deprecated public PagedList.BoundaryCallback();
+ method @Deprecated public void onItemAtEndLoaded(T itemAtEnd);
+ method @Deprecated public void onItemAtFrontLoaded(T itemAtFront);
+ method @Deprecated public void onZeroItemsLoaded();
}
- public static final class PagedList.Builder<Key, Value> {
+ @Deprecated public static final class PagedList.Builder<Key, Value> {
ctor @Deprecated public PagedList.Builder(androidx.paging.DataSource<Key,Value> dataSource, androidx.paging.PagedList.Config config);
ctor @Deprecated public PagedList.Builder(androidx.paging.DataSource<Key,Value> dataSource, int pageSize);
- ctor public PagedList.Builder(androidx.paging.PagingSource<Key,Value> pagingSource, androidx.paging.PagingSource.LoadResult.Page<Key,Value> initialPage, androidx.paging.PagedList.Config config);
- ctor public PagedList.Builder(androidx.paging.PagingSource<Key,Value> pagingSource, androidx.paging.PagingSource.LoadResult.Page<Key,Value> initialPage, int pageSize);
- method public androidx.paging.PagedList<Value> build();
- method public androidx.paging.PagedList.Builder<Key,Value> setBoundaryCallback(androidx.paging.PagedList.BoundaryCallback<Value>? boundaryCallback);
- method public androidx.paging.PagedList.Builder<Key,Value> setCoroutineScope(kotlinx.coroutines.CoroutineScope coroutineScope);
- method public androidx.paging.PagedList.Builder<Key,Value> setFetchDispatcher(kotlinx.coroutines.CoroutineDispatcher fetchDispatcher);
+ ctor @Deprecated public PagedList.Builder(androidx.paging.PagingSource<Key,Value> pagingSource, androidx.paging.PagingSource.LoadResult.Page<Key,Value> initialPage, androidx.paging.PagedList.Config config);
+ ctor @Deprecated public PagedList.Builder(androidx.paging.PagingSource<Key,Value> pagingSource, androidx.paging.PagingSource.LoadResult.Page<Key,Value> initialPage, int pageSize);
+ method @Deprecated public androidx.paging.PagedList<Value> build();
+ method @Deprecated public androidx.paging.PagedList.Builder<Key,Value> setBoundaryCallback(androidx.paging.PagedList.BoundaryCallback<Value>? boundaryCallback);
+ method @Deprecated public androidx.paging.PagedList.Builder<Key,Value> setCoroutineScope(kotlinx.coroutines.CoroutineScope coroutineScope);
+ method @Deprecated public androidx.paging.PagedList.Builder<Key,Value> setFetchDispatcher(kotlinx.coroutines.CoroutineDispatcher fetchDispatcher);
method @Deprecated public androidx.paging.PagedList.Builder<Key,Value> setFetchExecutor(java.util.concurrent.Executor fetchExecutor);
- method public androidx.paging.PagedList.Builder<Key,Value> setInitialKey(Key? initialKey);
- method public androidx.paging.PagedList.Builder<Key,Value> setNotifyDispatcher(kotlinx.coroutines.CoroutineDispatcher notifyDispatcher);
+ method @Deprecated public androidx.paging.PagedList.Builder<Key,Value> setInitialKey(Key? initialKey);
+ method @Deprecated public androidx.paging.PagedList.Builder<Key,Value> setNotifyDispatcher(kotlinx.coroutines.CoroutineDispatcher notifyDispatcher);
method @Deprecated public androidx.paging.PagedList.Builder<Key,Value> setNotifyExecutor(java.util.concurrent.Executor notifyExecutor);
}
- public abstract static class PagedList.Callback {
- ctor public PagedList.Callback();
- method public abstract void onChanged(int position, int count);
- method public abstract void onInserted(int position, int count);
- method public abstract void onRemoved(int position, int count);
+ @Deprecated public abstract static class PagedList.Callback {
+ ctor @Deprecated public PagedList.Callback();
+ method @Deprecated public abstract void onChanged(int position, int count);
+ method @Deprecated public abstract void onInserted(int position, int count);
+ method @Deprecated public abstract void onRemoved(int position, int count);
}
- public static final class PagedList.Config {
- field public static final int MAX_SIZE_UNBOUNDED = 2147483647; // 0x7fffffff
- field public final boolean enablePlaceholders;
- field public final int initialLoadSizeHint;
- field public final int maxSize;
- field public final int pageSize;
- field public final int prefetchDistance;
+ @Deprecated public static final class PagedList.Config {
+ field @Deprecated public static final int MAX_SIZE_UNBOUNDED = 2147483647; // 0x7fffffff
+ field @Deprecated public final boolean enablePlaceholders;
+ field @Deprecated public final int initialLoadSizeHint;
+ field @Deprecated public final int maxSize;
+ field @Deprecated public final int pageSize;
+ field @Deprecated public final int prefetchDistance;
}
- public static final class PagedList.Config.Builder {
- ctor public PagedList.Config.Builder();
- method public androidx.paging.PagedList.Config build();
- method public androidx.paging.PagedList.Config.Builder setEnablePlaceholders(boolean enablePlaceholders);
- method public androidx.paging.PagedList.Config.Builder setInitialLoadSizeHint(@IntRange(from=1) int initialLoadSizeHint);
- method public androidx.paging.PagedList.Config.Builder setMaxSize(@IntRange(from=2) int maxSize);
- method public androidx.paging.PagedList.Config.Builder setPageSize(@IntRange(from=1) int pageSize);
- method public androidx.paging.PagedList.Config.Builder setPrefetchDistance(@IntRange(from=0) int prefetchDistance);
+ @Deprecated public static final class PagedList.Config.Builder {
+ ctor @Deprecated public PagedList.Config.Builder();
+ method @Deprecated public androidx.paging.PagedList.Config build();
+ method @Deprecated public androidx.paging.PagedList.Config.Builder setEnablePlaceholders(boolean enablePlaceholders);
+ method @Deprecated public androidx.paging.PagedList.Config.Builder setInitialLoadSizeHint(@IntRange(from=1) int initialLoadSizeHint);
+ method @Deprecated public androidx.paging.PagedList.Config.Builder setMaxSize(@IntRange(from=2) int maxSize);
+ method @Deprecated public androidx.paging.PagedList.Config.Builder setPageSize(@IntRange(from=1) int pageSize);
+ method @Deprecated public androidx.paging.PagedList.Config.Builder setPrefetchDistance(@IntRange(from=0) int prefetchDistance);
}
public final class PagedListConfigKt {
diff --git a/paging/common/api/public_plus_experimental_3.0.0-alpha01.txt b/paging/common/api/public_plus_experimental_3.0.0-alpha01.txt
index 7014741..2ab42bfb 100644
--- a/paging/common/api/public_plus_experimental_3.0.0-alpha01.txt
+++ b/paging/common/api/public_plus_experimental_3.0.0-alpha01.txt
@@ -140,25 +140,25 @@
field @Deprecated public final int requestedLoadSize;
}
- public abstract class PagedList<T> extends java.util.AbstractList<T> {
+ @Deprecated public abstract class PagedList<T> extends java.util.AbstractList<T> {
method @Deprecated public final void addWeakCallback(java.util.List<? extends T>? previousSnapshot, androidx.paging.PagedList.Callback callback);
- method public final void addWeakCallback(androidx.paging.PagedList.Callback callback);
- method public final void addWeakLoadStateListener(kotlin.jvm.functions.Function2<? super androidx.paging.LoadType,? super androidx.paging.LoadState,kotlin.Unit> listener);
- method public abstract void detach();
- method public T? get(int index);
- method public final androidx.paging.PagedList.Config getConfig();
+ method @Deprecated public final void addWeakCallback(androidx.paging.PagedList.Callback callback);
+ method @Deprecated public final void addWeakLoadStateListener(kotlin.jvm.functions.Function2<? super androidx.paging.LoadType,? super androidx.paging.LoadState,kotlin.Unit> listener);
+ method @Deprecated public abstract void detach();
+ method @Deprecated public T? get(int index);
+ method @Deprecated public final androidx.paging.PagedList.Config getConfig();
method @Deprecated public final androidx.paging.DataSource<?,T> getDataSource();
- method public abstract Object? getLastKey();
- method public final int getLoadedCount();
- method public final int getPositionOffset();
- method public int getSize();
- method public abstract boolean isDetached();
- method public boolean isImmutable();
- method public final void loadAround(int index);
- method public final void removeWeakCallback(androidx.paging.PagedList.Callback callback);
- method public final void removeWeakLoadStateListener(kotlin.jvm.functions.Function2<? super androidx.paging.LoadType,? super androidx.paging.LoadState,kotlin.Unit> listener);
- method public void retry();
- method public final java.util.List<T> snapshot();
+ method @Deprecated public abstract Object? getLastKey();
+ method @Deprecated public final int getLoadedCount();
+ method @Deprecated public final int getPositionOffset();
+ method @Deprecated public int getSize();
+ method @Deprecated public abstract boolean isDetached();
+ method @Deprecated public boolean isImmutable();
+ method @Deprecated public final void loadAround(int index);
+ method @Deprecated public final void removeWeakCallback(androidx.paging.PagedList.Callback callback);
+ method @Deprecated public final void removeWeakLoadStateListener(kotlin.jvm.functions.Function2<? super androidx.paging.LoadType,? super androidx.paging.LoadState,kotlin.Unit> listener);
+ method @Deprecated public void retry();
+ method @Deprecated public final java.util.List<T> snapshot();
property @Deprecated public final androidx.paging.DataSource<?,T> dataSource;
property public abstract boolean isDetached;
property public boolean isImmutable;
@@ -168,52 +168,52 @@
property public int size;
}
- @MainThread public abstract static class PagedList.BoundaryCallback<T> {
- ctor public PagedList.BoundaryCallback();
- method public void onItemAtEndLoaded(T itemAtEnd);
- method public void onItemAtFrontLoaded(T itemAtFront);
- method public void onZeroItemsLoaded();
+ @Deprecated @MainThread public abstract static class PagedList.BoundaryCallback<T> {
+ ctor @Deprecated public PagedList.BoundaryCallback();
+ method @Deprecated public void onItemAtEndLoaded(T itemAtEnd);
+ method @Deprecated public void onItemAtFrontLoaded(T itemAtFront);
+ method @Deprecated public void onZeroItemsLoaded();
}
- public static final class PagedList.Builder<Key, Value> {
+ @Deprecated public static final class PagedList.Builder<Key, Value> {
ctor @Deprecated public PagedList.Builder(androidx.paging.DataSource<Key,Value> dataSource, androidx.paging.PagedList.Config config);
ctor @Deprecated public PagedList.Builder(androidx.paging.DataSource<Key,Value> dataSource, int pageSize);
- ctor public PagedList.Builder(androidx.paging.PagingSource<Key,Value> pagingSource, androidx.paging.PagingSource.LoadResult.Page<Key,Value> initialPage, androidx.paging.PagedList.Config config);
- ctor public PagedList.Builder(androidx.paging.PagingSource<Key,Value> pagingSource, androidx.paging.PagingSource.LoadResult.Page<Key,Value> initialPage, int pageSize);
- method public androidx.paging.PagedList<Value> build();
- method public androidx.paging.PagedList.Builder<Key,Value> setBoundaryCallback(androidx.paging.PagedList.BoundaryCallback<Value>? boundaryCallback);
- method public androidx.paging.PagedList.Builder<Key,Value> setCoroutineScope(kotlinx.coroutines.CoroutineScope coroutineScope);
- method public androidx.paging.PagedList.Builder<Key,Value> setFetchDispatcher(kotlinx.coroutines.CoroutineDispatcher fetchDispatcher);
+ ctor @Deprecated public PagedList.Builder(androidx.paging.PagingSource<Key,Value> pagingSource, androidx.paging.PagingSource.LoadResult.Page<Key,Value> initialPage, androidx.paging.PagedList.Config config);
+ ctor @Deprecated public PagedList.Builder(androidx.paging.PagingSource<Key,Value> pagingSource, androidx.paging.PagingSource.LoadResult.Page<Key,Value> initialPage, int pageSize);
+ method @Deprecated public androidx.paging.PagedList<Value> build();
+ method @Deprecated public androidx.paging.PagedList.Builder<Key,Value> setBoundaryCallback(androidx.paging.PagedList.BoundaryCallback<Value>? boundaryCallback);
+ method @Deprecated public androidx.paging.PagedList.Builder<Key,Value> setCoroutineScope(kotlinx.coroutines.CoroutineScope coroutineScope);
+ method @Deprecated public androidx.paging.PagedList.Builder<Key,Value> setFetchDispatcher(kotlinx.coroutines.CoroutineDispatcher fetchDispatcher);
method @Deprecated public androidx.paging.PagedList.Builder<Key,Value> setFetchExecutor(java.util.concurrent.Executor fetchExecutor);
- method public androidx.paging.PagedList.Builder<Key,Value> setInitialKey(Key? initialKey);
- method public androidx.paging.PagedList.Builder<Key,Value> setNotifyDispatcher(kotlinx.coroutines.CoroutineDispatcher notifyDispatcher);
+ method @Deprecated public androidx.paging.PagedList.Builder<Key,Value> setInitialKey(Key? initialKey);
+ method @Deprecated public androidx.paging.PagedList.Builder<Key,Value> setNotifyDispatcher(kotlinx.coroutines.CoroutineDispatcher notifyDispatcher);
method @Deprecated public androidx.paging.PagedList.Builder<Key,Value> setNotifyExecutor(java.util.concurrent.Executor notifyExecutor);
}
- public abstract static class PagedList.Callback {
- ctor public PagedList.Callback();
- method public abstract void onChanged(int position, int count);
- method public abstract void onInserted(int position, int count);
- method public abstract void onRemoved(int position, int count);
+ @Deprecated public abstract static class PagedList.Callback {
+ ctor @Deprecated public PagedList.Callback();
+ method @Deprecated public abstract void onChanged(int position, int count);
+ method @Deprecated public abstract void onInserted(int position, int count);
+ method @Deprecated public abstract void onRemoved(int position, int count);
}
- public static final class PagedList.Config {
- field public static final int MAX_SIZE_UNBOUNDED = 2147483647; // 0x7fffffff
- field public final boolean enablePlaceholders;
- field public final int initialLoadSizeHint;
- field public final int maxSize;
- field public final int pageSize;
- field public final int prefetchDistance;
+ @Deprecated public static final class PagedList.Config {
+ field @Deprecated public static final int MAX_SIZE_UNBOUNDED = 2147483647; // 0x7fffffff
+ field @Deprecated public final boolean enablePlaceholders;
+ field @Deprecated public final int initialLoadSizeHint;
+ field @Deprecated public final int maxSize;
+ field @Deprecated public final int pageSize;
+ field @Deprecated public final int prefetchDistance;
}
- public static final class PagedList.Config.Builder {
- ctor public PagedList.Config.Builder();
- method public androidx.paging.PagedList.Config build();
- method public androidx.paging.PagedList.Config.Builder setEnablePlaceholders(boolean enablePlaceholders);
- method public androidx.paging.PagedList.Config.Builder setInitialLoadSizeHint(@IntRange(from=1) int initialLoadSizeHint);
- method public androidx.paging.PagedList.Config.Builder setMaxSize(@IntRange(from=2) int maxSize);
- method public androidx.paging.PagedList.Config.Builder setPageSize(@IntRange(from=1) int pageSize);
- method public androidx.paging.PagedList.Config.Builder setPrefetchDistance(@IntRange(from=0) int prefetchDistance);
+ @Deprecated public static final class PagedList.Config.Builder {
+ ctor @Deprecated public PagedList.Config.Builder();
+ method @Deprecated public androidx.paging.PagedList.Config build();
+ method @Deprecated public androidx.paging.PagedList.Config.Builder setEnablePlaceholders(boolean enablePlaceholders);
+ method @Deprecated public androidx.paging.PagedList.Config.Builder setInitialLoadSizeHint(@IntRange(from=1) int initialLoadSizeHint);
+ method @Deprecated public androidx.paging.PagedList.Config.Builder setMaxSize(@IntRange(from=2) int maxSize);
+ method @Deprecated public androidx.paging.PagedList.Config.Builder setPageSize(@IntRange(from=1) int pageSize);
+ method @Deprecated public androidx.paging.PagedList.Config.Builder setPrefetchDistance(@IntRange(from=0) int prefetchDistance);
}
public final class PagedListConfigKt {
diff --git a/paging/common/api/public_plus_experimental_current.txt b/paging/common/api/public_plus_experimental_current.txt
index 7014741..2ab42bfb 100644
--- a/paging/common/api/public_plus_experimental_current.txt
+++ b/paging/common/api/public_plus_experimental_current.txt
@@ -140,25 +140,25 @@
field @Deprecated public final int requestedLoadSize;
}
- public abstract class PagedList<T> extends java.util.AbstractList<T> {
+ @Deprecated public abstract class PagedList<T> extends java.util.AbstractList<T> {
method @Deprecated public final void addWeakCallback(java.util.List<? extends T>? previousSnapshot, androidx.paging.PagedList.Callback callback);
- method public final void addWeakCallback(androidx.paging.PagedList.Callback callback);
- method public final void addWeakLoadStateListener(kotlin.jvm.functions.Function2<? super androidx.paging.LoadType,? super androidx.paging.LoadState,kotlin.Unit> listener);
- method public abstract void detach();
- method public T? get(int index);
- method public final androidx.paging.PagedList.Config getConfig();
+ method @Deprecated public final void addWeakCallback(androidx.paging.PagedList.Callback callback);
+ method @Deprecated public final void addWeakLoadStateListener(kotlin.jvm.functions.Function2<? super androidx.paging.LoadType,? super androidx.paging.LoadState,kotlin.Unit> listener);
+ method @Deprecated public abstract void detach();
+ method @Deprecated public T? get(int index);
+ method @Deprecated public final androidx.paging.PagedList.Config getConfig();
method @Deprecated public final androidx.paging.DataSource<?,T> getDataSource();
- method public abstract Object? getLastKey();
- method public final int getLoadedCount();
- method public final int getPositionOffset();
- method public int getSize();
- method public abstract boolean isDetached();
- method public boolean isImmutable();
- method public final void loadAround(int index);
- method public final void removeWeakCallback(androidx.paging.PagedList.Callback callback);
- method public final void removeWeakLoadStateListener(kotlin.jvm.functions.Function2<? super androidx.paging.LoadType,? super androidx.paging.LoadState,kotlin.Unit> listener);
- method public void retry();
- method public final java.util.List<T> snapshot();
+ method @Deprecated public abstract Object? getLastKey();
+ method @Deprecated public final int getLoadedCount();
+ method @Deprecated public final int getPositionOffset();
+ method @Deprecated public int getSize();
+ method @Deprecated public abstract boolean isDetached();
+ method @Deprecated public boolean isImmutable();
+ method @Deprecated public final void loadAround(int index);
+ method @Deprecated public final void removeWeakCallback(androidx.paging.PagedList.Callback callback);
+ method @Deprecated public final void removeWeakLoadStateListener(kotlin.jvm.functions.Function2<? super androidx.paging.LoadType,? super androidx.paging.LoadState,kotlin.Unit> listener);
+ method @Deprecated public void retry();
+ method @Deprecated public final java.util.List<T> snapshot();
property @Deprecated public final androidx.paging.DataSource<?,T> dataSource;
property public abstract boolean isDetached;
property public boolean isImmutable;
@@ -168,52 +168,52 @@
property public int size;
}
- @MainThread public abstract static class PagedList.BoundaryCallback<T> {
- ctor public PagedList.BoundaryCallback();
- method public void onItemAtEndLoaded(T itemAtEnd);
- method public void onItemAtFrontLoaded(T itemAtFront);
- method public void onZeroItemsLoaded();
+ @Deprecated @MainThread public abstract static class PagedList.BoundaryCallback<T> {
+ ctor @Deprecated public PagedList.BoundaryCallback();
+ method @Deprecated public void onItemAtEndLoaded(T itemAtEnd);
+ method @Deprecated public void onItemAtFrontLoaded(T itemAtFront);
+ method @Deprecated public void onZeroItemsLoaded();
}
- public static final class PagedList.Builder<Key, Value> {
+ @Deprecated public static final class PagedList.Builder<Key, Value> {
ctor @Deprecated public PagedList.Builder(androidx.paging.DataSource<Key,Value> dataSource, androidx.paging.PagedList.Config config);
ctor @Deprecated public PagedList.Builder(androidx.paging.DataSource<Key,Value> dataSource, int pageSize);
- ctor public PagedList.Builder(androidx.paging.PagingSource<Key,Value> pagingSource, androidx.paging.PagingSource.LoadResult.Page<Key,Value> initialPage, androidx.paging.PagedList.Config config);
- ctor public PagedList.Builder(androidx.paging.PagingSource<Key,Value> pagingSource, androidx.paging.PagingSource.LoadResult.Page<Key,Value> initialPage, int pageSize);
- method public androidx.paging.PagedList<Value> build();
- method public androidx.paging.PagedList.Builder<Key,Value> setBoundaryCallback(androidx.paging.PagedList.BoundaryCallback<Value>? boundaryCallback);
- method public androidx.paging.PagedList.Builder<Key,Value> setCoroutineScope(kotlinx.coroutines.CoroutineScope coroutineScope);
- method public androidx.paging.PagedList.Builder<Key,Value> setFetchDispatcher(kotlinx.coroutines.CoroutineDispatcher fetchDispatcher);
+ ctor @Deprecated public PagedList.Builder(androidx.paging.PagingSource<Key,Value> pagingSource, androidx.paging.PagingSource.LoadResult.Page<Key,Value> initialPage, androidx.paging.PagedList.Config config);
+ ctor @Deprecated public PagedList.Builder(androidx.paging.PagingSource<Key,Value> pagingSource, androidx.paging.PagingSource.LoadResult.Page<Key,Value> initialPage, int pageSize);
+ method @Deprecated public androidx.paging.PagedList<Value> build();
+ method @Deprecated public androidx.paging.PagedList.Builder<Key,Value> setBoundaryCallback(androidx.paging.PagedList.BoundaryCallback<Value>? boundaryCallback);
+ method @Deprecated public androidx.paging.PagedList.Builder<Key,Value> setCoroutineScope(kotlinx.coroutines.CoroutineScope coroutineScope);
+ method @Deprecated public androidx.paging.PagedList.Builder<Key,Value> setFetchDispatcher(kotlinx.coroutines.CoroutineDispatcher fetchDispatcher);
method @Deprecated public androidx.paging.PagedList.Builder<Key,Value> setFetchExecutor(java.util.concurrent.Executor fetchExecutor);
- method public androidx.paging.PagedList.Builder<Key,Value> setInitialKey(Key? initialKey);
- method public androidx.paging.PagedList.Builder<Key,Value> setNotifyDispatcher(kotlinx.coroutines.CoroutineDispatcher notifyDispatcher);
+ method @Deprecated public androidx.paging.PagedList.Builder<Key,Value> setInitialKey(Key? initialKey);
+ method @Deprecated public androidx.paging.PagedList.Builder<Key,Value> setNotifyDispatcher(kotlinx.coroutines.CoroutineDispatcher notifyDispatcher);
method @Deprecated public androidx.paging.PagedList.Builder<Key,Value> setNotifyExecutor(java.util.concurrent.Executor notifyExecutor);
}
- public abstract static class PagedList.Callback {
- ctor public PagedList.Callback();
- method public abstract void onChanged(int position, int count);
- method public abstract void onInserted(int position, int count);
- method public abstract void onRemoved(int position, int count);
+ @Deprecated public abstract static class PagedList.Callback {
+ ctor @Deprecated public PagedList.Callback();
+ method @Deprecated public abstract void onChanged(int position, int count);
+ method @Deprecated public abstract void onInserted(int position, int count);
+ method @Deprecated public abstract void onRemoved(int position, int count);
}
- public static final class PagedList.Config {
- field public static final int MAX_SIZE_UNBOUNDED = 2147483647; // 0x7fffffff
- field public final boolean enablePlaceholders;
- field public final int initialLoadSizeHint;
- field public final int maxSize;
- field public final int pageSize;
- field public final int prefetchDistance;
+ @Deprecated public static final class PagedList.Config {
+ field @Deprecated public static final int MAX_SIZE_UNBOUNDED = 2147483647; // 0x7fffffff
+ field @Deprecated public final boolean enablePlaceholders;
+ field @Deprecated public final int initialLoadSizeHint;
+ field @Deprecated public final int maxSize;
+ field @Deprecated public final int pageSize;
+ field @Deprecated public final int prefetchDistance;
}
- public static final class PagedList.Config.Builder {
- ctor public PagedList.Config.Builder();
- method public androidx.paging.PagedList.Config build();
- method public androidx.paging.PagedList.Config.Builder setEnablePlaceholders(boolean enablePlaceholders);
- method public androidx.paging.PagedList.Config.Builder setInitialLoadSizeHint(@IntRange(from=1) int initialLoadSizeHint);
- method public androidx.paging.PagedList.Config.Builder setMaxSize(@IntRange(from=2) int maxSize);
- method public androidx.paging.PagedList.Config.Builder setPageSize(@IntRange(from=1) int pageSize);
- method public androidx.paging.PagedList.Config.Builder setPrefetchDistance(@IntRange(from=0) int prefetchDistance);
+ @Deprecated public static final class PagedList.Config.Builder {
+ ctor @Deprecated public PagedList.Config.Builder();
+ method @Deprecated public androidx.paging.PagedList.Config build();
+ method @Deprecated public androidx.paging.PagedList.Config.Builder setEnablePlaceholders(boolean enablePlaceholders);
+ method @Deprecated public androidx.paging.PagedList.Config.Builder setInitialLoadSizeHint(@IntRange(from=1) int initialLoadSizeHint);
+ method @Deprecated public androidx.paging.PagedList.Config.Builder setMaxSize(@IntRange(from=2) int maxSize);
+ method @Deprecated public androidx.paging.PagedList.Config.Builder setPageSize(@IntRange(from=1) int pageSize);
+ method @Deprecated public androidx.paging.PagedList.Config.Builder setPrefetchDistance(@IntRange(from=0) int prefetchDistance);
}
public final class PagedListConfigKt {
diff --git a/paging/common/api/restricted_3.0.0-alpha01.txt b/paging/common/api/restricted_3.0.0-alpha01.txt
index 7014741..2ab42bfb 100644
--- a/paging/common/api/restricted_3.0.0-alpha01.txt
+++ b/paging/common/api/restricted_3.0.0-alpha01.txt
@@ -140,25 +140,25 @@
field @Deprecated public final int requestedLoadSize;
}
- public abstract class PagedList<T> extends java.util.AbstractList<T> {
+ @Deprecated public abstract class PagedList<T> extends java.util.AbstractList<T> {
method @Deprecated public final void addWeakCallback(java.util.List<? extends T>? previousSnapshot, androidx.paging.PagedList.Callback callback);
- method public final void addWeakCallback(androidx.paging.PagedList.Callback callback);
- method public final void addWeakLoadStateListener(kotlin.jvm.functions.Function2<? super androidx.paging.LoadType,? super androidx.paging.LoadState,kotlin.Unit> listener);
- method public abstract void detach();
- method public T? get(int index);
- method public final androidx.paging.PagedList.Config getConfig();
+ method @Deprecated public final void addWeakCallback(androidx.paging.PagedList.Callback callback);
+ method @Deprecated public final void addWeakLoadStateListener(kotlin.jvm.functions.Function2<? super androidx.paging.LoadType,? super androidx.paging.LoadState,kotlin.Unit> listener);
+ method @Deprecated public abstract void detach();
+ method @Deprecated public T? get(int index);
+ method @Deprecated public final androidx.paging.PagedList.Config getConfig();
method @Deprecated public final androidx.paging.DataSource<?,T> getDataSource();
- method public abstract Object? getLastKey();
- method public final int getLoadedCount();
- method public final int getPositionOffset();
- method public int getSize();
- method public abstract boolean isDetached();
- method public boolean isImmutable();
- method public final void loadAround(int index);
- method public final void removeWeakCallback(androidx.paging.PagedList.Callback callback);
- method public final void removeWeakLoadStateListener(kotlin.jvm.functions.Function2<? super androidx.paging.LoadType,? super androidx.paging.LoadState,kotlin.Unit> listener);
- method public void retry();
- method public final java.util.List<T> snapshot();
+ method @Deprecated public abstract Object? getLastKey();
+ method @Deprecated public final int getLoadedCount();
+ method @Deprecated public final int getPositionOffset();
+ method @Deprecated public int getSize();
+ method @Deprecated public abstract boolean isDetached();
+ method @Deprecated public boolean isImmutable();
+ method @Deprecated public final void loadAround(int index);
+ method @Deprecated public final void removeWeakCallback(androidx.paging.PagedList.Callback callback);
+ method @Deprecated public final void removeWeakLoadStateListener(kotlin.jvm.functions.Function2<? super androidx.paging.LoadType,? super androidx.paging.LoadState,kotlin.Unit> listener);
+ method @Deprecated public void retry();
+ method @Deprecated public final java.util.List<T> snapshot();
property @Deprecated public final androidx.paging.DataSource<?,T> dataSource;
property public abstract boolean isDetached;
property public boolean isImmutable;
@@ -168,52 +168,52 @@
property public int size;
}
- @MainThread public abstract static class PagedList.BoundaryCallback<T> {
- ctor public PagedList.BoundaryCallback();
- method public void onItemAtEndLoaded(T itemAtEnd);
- method public void onItemAtFrontLoaded(T itemAtFront);
- method public void onZeroItemsLoaded();
+ @Deprecated @MainThread public abstract static class PagedList.BoundaryCallback<T> {
+ ctor @Deprecated public PagedList.BoundaryCallback();
+ method @Deprecated public void onItemAtEndLoaded(T itemAtEnd);
+ method @Deprecated public void onItemAtFrontLoaded(T itemAtFront);
+ method @Deprecated public void onZeroItemsLoaded();
}
- public static final class PagedList.Builder<Key, Value> {
+ @Deprecated public static final class PagedList.Builder<Key, Value> {
ctor @Deprecated public PagedList.Builder(androidx.paging.DataSource<Key,Value> dataSource, androidx.paging.PagedList.Config config);
ctor @Deprecated public PagedList.Builder(androidx.paging.DataSource<Key,Value> dataSource, int pageSize);
- ctor public PagedList.Builder(androidx.paging.PagingSource<Key,Value> pagingSource, androidx.paging.PagingSource.LoadResult.Page<Key,Value> initialPage, androidx.paging.PagedList.Config config);
- ctor public PagedList.Builder(androidx.paging.PagingSource<Key,Value> pagingSource, androidx.paging.PagingSource.LoadResult.Page<Key,Value> initialPage, int pageSize);
- method public androidx.paging.PagedList<Value> build();
- method public androidx.paging.PagedList.Builder<Key,Value> setBoundaryCallback(androidx.paging.PagedList.BoundaryCallback<Value>? boundaryCallback);
- method public androidx.paging.PagedList.Builder<Key,Value> setCoroutineScope(kotlinx.coroutines.CoroutineScope coroutineScope);
- method public androidx.paging.PagedList.Builder<Key,Value> setFetchDispatcher(kotlinx.coroutines.CoroutineDispatcher fetchDispatcher);
+ ctor @Deprecated public PagedList.Builder(androidx.paging.PagingSource<Key,Value> pagingSource, androidx.paging.PagingSource.LoadResult.Page<Key,Value> initialPage, androidx.paging.PagedList.Config config);
+ ctor @Deprecated public PagedList.Builder(androidx.paging.PagingSource<Key,Value> pagingSource, androidx.paging.PagingSource.LoadResult.Page<Key,Value> initialPage, int pageSize);
+ method @Deprecated public androidx.paging.PagedList<Value> build();
+ method @Deprecated public androidx.paging.PagedList.Builder<Key,Value> setBoundaryCallback(androidx.paging.PagedList.BoundaryCallback<Value>? boundaryCallback);
+ method @Deprecated public androidx.paging.PagedList.Builder<Key,Value> setCoroutineScope(kotlinx.coroutines.CoroutineScope coroutineScope);
+ method @Deprecated public androidx.paging.PagedList.Builder<Key,Value> setFetchDispatcher(kotlinx.coroutines.CoroutineDispatcher fetchDispatcher);
method @Deprecated public androidx.paging.PagedList.Builder<Key,Value> setFetchExecutor(java.util.concurrent.Executor fetchExecutor);
- method public androidx.paging.PagedList.Builder<Key,Value> setInitialKey(Key? initialKey);
- method public androidx.paging.PagedList.Builder<Key,Value> setNotifyDispatcher(kotlinx.coroutines.CoroutineDispatcher notifyDispatcher);
+ method @Deprecated public androidx.paging.PagedList.Builder<Key,Value> setInitialKey(Key? initialKey);
+ method @Deprecated public androidx.paging.PagedList.Builder<Key,Value> setNotifyDispatcher(kotlinx.coroutines.CoroutineDispatcher notifyDispatcher);
method @Deprecated public androidx.paging.PagedList.Builder<Key,Value> setNotifyExecutor(java.util.concurrent.Executor notifyExecutor);
}
- public abstract static class PagedList.Callback {
- ctor public PagedList.Callback();
- method public abstract void onChanged(int position, int count);
- method public abstract void onInserted(int position, int count);
- method public abstract void onRemoved(int position, int count);
+ @Deprecated public abstract static class PagedList.Callback {
+ ctor @Deprecated public PagedList.Callback();
+ method @Deprecated public abstract void onChanged(int position, int count);
+ method @Deprecated public abstract void onInserted(int position, int count);
+ method @Deprecated public abstract void onRemoved(int position, int count);
}
- public static final class PagedList.Config {
- field public static final int MAX_SIZE_UNBOUNDED = 2147483647; // 0x7fffffff
- field public final boolean enablePlaceholders;
- field public final int initialLoadSizeHint;
- field public final int maxSize;
- field public final int pageSize;
- field public final int prefetchDistance;
+ @Deprecated public static final class PagedList.Config {
+ field @Deprecated public static final int MAX_SIZE_UNBOUNDED = 2147483647; // 0x7fffffff
+ field @Deprecated public final boolean enablePlaceholders;
+ field @Deprecated public final int initialLoadSizeHint;
+ field @Deprecated public final int maxSize;
+ field @Deprecated public final int pageSize;
+ field @Deprecated public final int prefetchDistance;
}
- public static final class PagedList.Config.Builder {
- ctor public PagedList.Config.Builder();
- method public androidx.paging.PagedList.Config build();
- method public androidx.paging.PagedList.Config.Builder setEnablePlaceholders(boolean enablePlaceholders);
- method public androidx.paging.PagedList.Config.Builder setInitialLoadSizeHint(@IntRange(from=1) int initialLoadSizeHint);
- method public androidx.paging.PagedList.Config.Builder setMaxSize(@IntRange(from=2) int maxSize);
- method public androidx.paging.PagedList.Config.Builder setPageSize(@IntRange(from=1) int pageSize);
- method public androidx.paging.PagedList.Config.Builder setPrefetchDistance(@IntRange(from=0) int prefetchDistance);
+ @Deprecated public static final class PagedList.Config.Builder {
+ ctor @Deprecated public PagedList.Config.Builder();
+ method @Deprecated public androidx.paging.PagedList.Config build();
+ method @Deprecated public androidx.paging.PagedList.Config.Builder setEnablePlaceholders(boolean enablePlaceholders);
+ method @Deprecated public androidx.paging.PagedList.Config.Builder setInitialLoadSizeHint(@IntRange(from=1) int initialLoadSizeHint);
+ method @Deprecated public androidx.paging.PagedList.Config.Builder setMaxSize(@IntRange(from=2) int maxSize);
+ method @Deprecated public androidx.paging.PagedList.Config.Builder setPageSize(@IntRange(from=1) int pageSize);
+ method @Deprecated public androidx.paging.PagedList.Config.Builder setPrefetchDistance(@IntRange(from=0) int prefetchDistance);
}
public final class PagedListConfigKt {
diff --git a/paging/common/api/restricted_current.txt b/paging/common/api/restricted_current.txt
index 7014741..2ab42bfb 100644
--- a/paging/common/api/restricted_current.txt
+++ b/paging/common/api/restricted_current.txt
@@ -140,25 +140,25 @@
field @Deprecated public final int requestedLoadSize;
}
- public abstract class PagedList<T> extends java.util.AbstractList<T> {
+ @Deprecated public abstract class PagedList<T> extends java.util.AbstractList<T> {
method @Deprecated public final void addWeakCallback(java.util.List<? extends T>? previousSnapshot, androidx.paging.PagedList.Callback callback);
- method public final void addWeakCallback(androidx.paging.PagedList.Callback callback);
- method public final void addWeakLoadStateListener(kotlin.jvm.functions.Function2<? super androidx.paging.LoadType,? super androidx.paging.LoadState,kotlin.Unit> listener);
- method public abstract void detach();
- method public T? get(int index);
- method public final androidx.paging.PagedList.Config getConfig();
+ method @Deprecated public final void addWeakCallback(androidx.paging.PagedList.Callback callback);
+ method @Deprecated public final void addWeakLoadStateListener(kotlin.jvm.functions.Function2<? super androidx.paging.LoadType,? super androidx.paging.LoadState,kotlin.Unit> listener);
+ method @Deprecated public abstract void detach();
+ method @Deprecated public T? get(int index);
+ method @Deprecated public final androidx.paging.PagedList.Config getConfig();
method @Deprecated public final androidx.paging.DataSource<?,T> getDataSource();
- method public abstract Object? getLastKey();
- method public final int getLoadedCount();
- method public final int getPositionOffset();
- method public int getSize();
- method public abstract boolean isDetached();
- method public boolean isImmutable();
- method public final void loadAround(int index);
- method public final void removeWeakCallback(androidx.paging.PagedList.Callback callback);
- method public final void removeWeakLoadStateListener(kotlin.jvm.functions.Function2<? super androidx.paging.LoadType,? super androidx.paging.LoadState,kotlin.Unit> listener);
- method public void retry();
- method public final java.util.List<T> snapshot();
+ method @Deprecated public abstract Object? getLastKey();
+ method @Deprecated public final int getLoadedCount();
+ method @Deprecated public final int getPositionOffset();
+ method @Deprecated public int getSize();
+ method @Deprecated public abstract boolean isDetached();
+ method @Deprecated public boolean isImmutable();
+ method @Deprecated public final void loadAround(int index);
+ method @Deprecated public final void removeWeakCallback(androidx.paging.PagedList.Callback callback);
+ method @Deprecated public final void removeWeakLoadStateListener(kotlin.jvm.functions.Function2<? super androidx.paging.LoadType,? super androidx.paging.LoadState,kotlin.Unit> listener);
+ method @Deprecated public void retry();
+ method @Deprecated public final java.util.List<T> snapshot();
property @Deprecated public final androidx.paging.DataSource<?,T> dataSource;
property public abstract boolean isDetached;
property public boolean isImmutable;
@@ -168,52 +168,52 @@
property public int size;
}
- @MainThread public abstract static class PagedList.BoundaryCallback<T> {
- ctor public PagedList.BoundaryCallback();
- method public void onItemAtEndLoaded(T itemAtEnd);
- method public void onItemAtFrontLoaded(T itemAtFront);
- method public void onZeroItemsLoaded();
+ @Deprecated @MainThread public abstract static class PagedList.BoundaryCallback<T> {
+ ctor @Deprecated public PagedList.BoundaryCallback();
+ method @Deprecated public void onItemAtEndLoaded(T itemAtEnd);
+ method @Deprecated public void onItemAtFrontLoaded(T itemAtFront);
+ method @Deprecated public void onZeroItemsLoaded();
}
- public static final class PagedList.Builder<Key, Value> {
+ @Deprecated public static final class PagedList.Builder<Key, Value> {
ctor @Deprecated public PagedList.Builder(androidx.paging.DataSource<Key,Value> dataSource, androidx.paging.PagedList.Config config);
ctor @Deprecated public PagedList.Builder(androidx.paging.DataSource<Key,Value> dataSource, int pageSize);
- ctor public PagedList.Builder(androidx.paging.PagingSource<Key,Value> pagingSource, androidx.paging.PagingSource.LoadResult.Page<Key,Value> initialPage, androidx.paging.PagedList.Config config);
- ctor public PagedList.Builder(androidx.paging.PagingSource<Key,Value> pagingSource, androidx.paging.PagingSource.LoadResult.Page<Key,Value> initialPage, int pageSize);
- method public androidx.paging.PagedList<Value> build();
- method public androidx.paging.PagedList.Builder<Key,Value> setBoundaryCallback(androidx.paging.PagedList.BoundaryCallback<Value>? boundaryCallback);
- method public androidx.paging.PagedList.Builder<Key,Value> setCoroutineScope(kotlinx.coroutines.CoroutineScope coroutineScope);
- method public androidx.paging.PagedList.Builder<Key,Value> setFetchDispatcher(kotlinx.coroutines.CoroutineDispatcher fetchDispatcher);
+ ctor @Deprecated public PagedList.Builder(androidx.paging.PagingSource<Key,Value> pagingSource, androidx.paging.PagingSource.LoadResult.Page<Key,Value> initialPage, androidx.paging.PagedList.Config config);
+ ctor @Deprecated public PagedList.Builder(androidx.paging.PagingSource<Key,Value> pagingSource, androidx.paging.PagingSource.LoadResult.Page<Key,Value> initialPage, int pageSize);
+ method @Deprecated public androidx.paging.PagedList<Value> build();
+ method @Deprecated public androidx.paging.PagedList.Builder<Key,Value> setBoundaryCallback(androidx.paging.PagedList.BoundaryCallback<Value>? boundaryCallback);
+ method @Deprecated public androidx.paging.PagedList.Builder<Key,Value> setCoroutineScope(kotlinx.coroutines.CoroutineScope coroutineScope);
+ method @Deprecated public androidx.paging.PagedList.Builder<Key,Value> setFetchDispatcher(kotlinx.coroutines.CoroutineDispatcher fetchDispatcher);
method @Deprecated public androidx.paging.PagedList.Builder<Key,Value> setFetchExecutor(java.util.concurrent.Executor fetchExecutor);
- method public androidx.paging.PagedList.Builder<Key,Value> setInitialKey(Key? initialKey);
- method public androidx.paging.PagedList.Builder<Key,Value> setNotifyDispatcher(kotlinx.coroutines.CoroutineDispatcher notifyDispatcher);
+ method @Deprecated public androidx.paging.PagedList.Builder<Key,Value> setInitialKey(Key? initialKey);
+ method @Deprecated public androidx.paging.PagedList.Builder<Key,Value> setNotifyDispatcher(kotlinx.coroutines.CoroutineDispatcher notifyDispatcher);
method @Deprecated public androidx.paging.PagedList.Builder<Key,Value> setNotifyExecutor(java.util.concurrent.Executor notifyExecutor);
}
- public abstract static class PagedList.Callback {
- ctor public PagedList.Callback();
- method public abstract void onChanged(int position, int count);
- method public abstract void onInserted(int position, int count);
- method public abstract void onRemoved(int position, int count);
+ @Deprecated public abstract static class PagedList.Callback {
+ ctor @Deprecated public PagedList.Callback();
+ method @Deprecated public abstract void onChanged(int position, int count);
+ method @Deprecated public abstract void onInserted(int position, int count);
+ method @Deprecated public abstract void onRemoved(int position, int count);
}
- public static final class PagedList.Config {
- field public static final int MAX_SIZE_UNBOUNDED = 2147483647; // 0x7fffffff
- field public final boolean enablePlaceholders;
- field public final int initialLoadSizeHint;
- field public final int maxSize;
- field public final int pageSize;
- field public final int prefetchDistance;
+ @Deprecated public static final class PagedList.Config {
+ field @Deprecated public static final int MAX_SIZE_UNBOUNDED = 2147483647; // 0x7fffffff
+ field @Deprecated public final boolean enablePlaceholders;
+ field @Deprecated public final int initialLoadSizeHint;
+ field @Deprecated public final int maxSize;
+ field @Deprecated public final int pageSize;
+ field @Deprecated public final int prefetchDistance;
}
- public static final class PagedList.Config.Builder {
- ctor public PagedList.Config.Builder();
- method public androidx.paging.PagedList.Config build();
- method public androidx.paging.PagedList.Config.Builder setEnablePlaceholders(boolean enablePlaceholders);
- method public androidx.paging.PagedList.Config.Builder setInitialLoadSizeHint(@IntRange(from=1) int initialLoadSizeHint);
- method public androidx.paging.PagedList.Config.Builder setMaxSize(@IntRange(from=2) int maxSize);
- method public androidx.paging.PagedList.Config.Builder setPageSize(@IntRange(from=1) int pageSize);
- method public androidx.paging.PagedList.Config.Builder setPrefetchDistance(@IntRange(from=0) int prefetchDistance);
+ @Deprecated public static final class PagedList.Config.Builder {
+ ctor @Deprecated public PagedList.Config.Builder();
+ method @Deprecated public androidx.paging.PagedList.Config build();
+ method @Deprecated public androidx.paging.PagedList.Config.Builder setEnablePlaceholders(boolean enablePlaceholders);
+ method @Deprecated public androidx.paging.PagedList.Config.Builder setInitialLoadSizeHint(@IntRange(from=1) int initialLoadSizeHint);
+ method @Deprecated public androidx.paging.PagedList.Config.Builder setMaxSize(@IntRange(from=2) int maxSize);
+ method @Deprecated public androidx.paging.PagedList.Config.Builder setPageSize(@IntRange(from=1) int pageSize);
+ method @Deprecated public androidx.paging.PagedList.Config.Builder setPrefetchDistance(@IntRange(from=0) int prefetchDistance);
}
public final class PagedListConfigKt {
diff --git a/paging/common/src/main/kotlin/androidx/paging/ContiguousPagedList.kt b/paging/common/src/main/kotlin/androidx/paging/ContiguousPagedList.kt
index ebd597d..5481a4b 100644
--- a/paging/common/src/main/kotlin/androidx/paging/ContiguousPagedList.kt
+++ b/paging/common/src/main/kotlin/androidx/paging/ContiguousPagedList.kt
@@ -32,6 +32,7 @@
/**
* @suppress
*/
+@Suppress("DEPRECATION")
@RestrictTo(RestrictTo.Scope.LIBRARY)
open class ContiguousPagedList<K : Any, V : Any>(
final override val pagingSource: PagingSource<K, V>,
diff --git a/paging/common/src/main/kotlin/androidx/paging/LegacyPager.kt b/paging/common/src/main/kotlin/androidx/paging/LegacyPager.kt
index a167d70..7882738 100644
--- a/paging/common/src/main/kotlin/androidx/paging/LegacyPager.kt
+++ b/paging/common/src/main/kotlin/androidx/paging/LegacyPager.kt
@@ -24,6 +24,7 @@
internal class LegacyPager<K : Any, V : Any>(
private val pagedListScope: CoroutineScope,
+ @Suppress("DEPRECATION")
val config: PagedList.Config,
val source: PagingSource<K, V>,
private val notifyDispatcher: CoroutineDispatcher,
@@ -33,6 +34,7 @@
) {
private val detached = AtomicBoolean(false)
+ @Suppress("DEPRECATION")
var loadStateManager = object : PagedList.LoadStateManager() {
override fun onStateChanged(type: LoadType, state: LoadState) {
pageConsumer.onStateChanged(type, state)
@@ -105,7 +107,7 @@
loadStateManager.setState(LoadType.START, LoadState.Loading)
- val loadParams = LoadParams<K>(
+ val loadParams = LoadParams(
LoadType.START,
key,
config.pageSize,
diff --git a/paging/common/src/main/kotlin/androidx/paging/PagedList.kt b/paging/common/src/main/kotlin/androidx/paging/PagedList.kt
index 5a82670..b01c0ab 100644
--- a/paging/common/src/main/kotlin/androidx/paging/PagedList.kt
+++ b/paging/common/src/main/kotlin/androidx/paging/PagedList.kt
@@ -21,10 +21,6 @@
import androidx.annotation.IntRange
import androidx.annotation.MainThread
import androidx.annotation.RestrictTo
-import androidx.paging.PagedList.Callback
-import androidx.paging.PagedList.Config
-import androidx.paging.PagedList.Config.Builder
-import androidx.paging.PagedList.Config.Companion.MAX_SIZE_UNBOUNDED
import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
@@ -118,6 +114,7 @@
*
* @param T The type of the entries in the list.
*/
+@Deprecated("PagedList is deprecated and has been replaced by PagingData")
abstract class PagedList<T : Any> internal constructor(
/**
* The [PagingSource] that provides data to this [PagedList].
@@ -160,6 +157,7 @@
*
* @suppress
*/
+ @Suppress("DEPRECATION")
@JvmStatic
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
fun <K : Any, T : Any> create(
@@ -255,6 +253,11 @@
* @param Key Type of key used to load data from the [PagingSource].
* @param Value Type of items held and loaded by the [PagedList].
*/
+ @Deprecated(
+ message = "PagedList is deprecated and has been replaced by PagingData, which no " +
+ "longer supports constructing snapshots of loaded data manually.",
+ replaceWith = ReplaceWith("PagingDataFlow", "androidx.paging.PagingDataFlow")
+ )
class Builder<Key : Any, Value : Any> {
private val pagingSource: PagingSource<Key, Value>?
private var dataSource: DataSource<Key, Value>?
@@ -272,7 +275,6 @@
* @param dataSource [DataSource] the [PagedList] will load from.
* @param config [Config] that defines how the [PagedList] loads data from its [DataSource].
*/
- @Deprecated("DataSource is deprecated and has been replaced by PagingSource")
constructor(dataSource: DataSource<Key, Value>, config: Config) {
this.pagingSource = null
this.dataSource = dataSource
@@ -293,8 +295,6 @@
* @param pageSize [Config] that defines how the [PagedList] loads data from its
* [DataSource].
*/
- @Suppress("DEPRECATION")
- @Deprecated("DataSource is deprecated and has been replaced by PagingSource")
constructor(dataSource: DataSource<Key, Value>, pageSize: Int) : this(
dataSource = dataSource,
config = Config(pageSize)
@@ -476,6 +476,7 @@
*
* @return The newly constructed [PagedList]
*/
+ @Suppress("DEPRECATION")
fun build(): PagedList<Value> {
val fetchDispatcher = fetchDispatcher ?: Dispatchers.IO
val pagingSource = pagingSource
@@ -1234,11 +1235,11 @@
* @param boundaryCallback [PagedList.BoundaryCallback] for listening to out-of-data events.
* @param initialKey [Key] the [DataSource] should load around as part of initialization.
*/
-@Suppress("FunctionName", "DeprecatedCallableAddReplaceWith")
+@Suppress("FunctionName", "DEPRECATION")
@Deprecated("DataSource is deprecated and has been replaced by PagingSource")
fun <Key : Any, Value : Any> PagedList(
dataSource: DataSource<Key, Value>,
- config: Config,
+ config: PagedList.Config,
notifyExecutor: Executor,
fetchExecutor: Executor,
boundaryCallback: PagedList.BoundaryCallback<Value>? = null,
diff --git a/paging/common/src/main/kotlin/androidx/paging/PagedListConfig.kt b/paging/common/src/main/kotlin/androidx/paging/PagedListConfig.kt
index 06a2157..c58704b 100644
--- a/paging/common/src/main/kotlin/androidx/paging/PagedListConfig.kt
+++ b/paging/common/src/main/kotlin/androidx/paging/PagedListConfig.kt
@@ -16,9 +16,6 @@
package androidx.paging
-import androidx.paging.PagedList.Config.Builder.Companion.DEFAULT_INITIAL_PAGE_MULTIPLIER
-import androidx.paging.PagedList.Config.Companion.MAX_SIZE_UNBOUNDED
-
/**
* Constructs a [PagedList.Config], convenience for [PagedList.Config.Builder].
*
@@ -29,13 +26,13 @@
* @param maxSize Maximum number of items to keep in memory, or
* [PagedList.Config.MAX_SIZE_UNBOUNDED] to disable page dropping.
*/
-@Suppress("FunctionName")
+@Suppress("FunctionName", "DEPRECATION")
fun Config(
pageSize: Int,
prefetchDistance: Int = pageSize,
enablePlaceholders: Boolean = true,
- initialLoadSizeHint: Int = pageSize * DEFAULT_INITIAL_PAGE_MULTIPLIER,
- maxSize: Int = MAX_SIZE_UNBOUNDED
+ initialLoadSizeHint: Int = pageSize * PagedList.Config.Builder.DEFAULT_INITIAL_PAGE_MULTIPLIER,
+ maxSize: Int = PagedList.Config.MAX_SIZE_UNBOUNDED
): PagedList.Config {
return PagedList.Config.Builder()
.setPageSize(pageSize)
diff --git a/paging/common/src/main/kotlin/androidx/paging/PagerState.kt b/paging/common/src/main/kotlin/androidx/paging/PagerState.kt
index ba5b10e..510bbaa 100644
--- a/paging/common/src/main/kotlin/androidx/paging/PagerState.kt
+++ b/paging/common/src/main/kotlin/androidx/paging/PagerState.kt
@@ -23,7 +23,6 @@
import androidx.paging.PageEvent.Insert.Companion.End
import androidx.paging.PageEvent.Insert.Companion.Refresh
import androidx.paging.PageEvent.Insert.Companion.Start
-import androidx.paging.PagedList.Config.Companion.MAX_SIZE_UNBOUNDED
import androidx.paging.PagingSource.LoadResult.Page
import androidx.paging.PagingSource.LoadResult.Page.Companion.COUNT_UNDEFINED
import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -202,7 +201,8 @@
START -> {
// TODO: Incrementally compute this.
val currentSize = pages.sumBy { it.data.size }
- if (maxSize != MAX_SIZE_UNBOUNDED && currentSize > maxSize) {
+ @Suppress("DEPRECATION")
+ if (maxSize != PagedList.Config.MAX_SIZE_UNBOUNDED && currentSize > maxSize) {
var pageCount = 0
var itemCount = 0
pages.takeWhile {
@@ -217,7 +217,8 @@
END -> {
// TODO: Incrementally compute this.
val currentSize = pages.sumBy { it.data.size }
- if (maxSize != MAX_SIZE_UNBOUNDED && currentSize > maxSize) {
+ @Suppress("DEPRECATION")
+ if (maxSize != PagedList.Config.MAX_SIZE_UNBOUNDED && currentSize > maxSize) {
var pageCount = 0
var itemCount = 0
pages.takeLastWhile {
diff --git a/paging/common/src/main/kotlin/androidx/paging/PagingSource.kt b/paging/common/src/main/kotlin/androidx/paging/PagingSource.kt
index 0c78f1b..1d5c59a 100644
--- a/paging/common/src/main/kotlin/androidx/paging/PagingSource.kt
+++ b/paging/common/src/main/kotlin/androidx/paging/PagingSource.kt
@@ -24,6 +24,7 @@
/**
* @suppress
*/
+@Suppress("DEPRECATION")
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
fun <Key : Any> PagedList.Config.toRefreshLoadParams(key: Key?): PagingSource.LoadParams<Key> =
PagingSource.LoadParams(
diff --git a/paging/common/src/main/kotlin/androidx/paging/SnapshotPagedList.kt b/paging/common/src/main/kotlin/androidx/paging/SnapshotPagedList.kt
index a560bfc..bd7c42f 100644
--- a/paging/common/src/main/kotlin/androidx/paging/SnapshotPagedList.kt
+++ b/paging/common/src/main/kotlin/androidx/paging/SnapshotPagedList.kt
@@ -16,6 +16,7 @@
package androidx.paging
+@Suppress("DEPRECATION")
internal class SnapshotPagedList<T : Any>(private val pagedList: PagedList<T>) : PagedList<T>(
pagedList.pagingSource,
pagedList.storage.snapshot(),
diff --git a/paging/common/src/test/kotlin/androidx/paging/PagedListConfigBuilderTest.kt b/paging/common/src/test/kotlin/androidx/paging/PagedListConfigBuilderTest.kt
index 05faea4..ad107b9 100644
--- a/paging/common/src/test/kotlin/androidx/paging/PagedListConfigBuilderTest.kt
+++ b/paging/common/src/test/kotlin/androidx/paging/PagedListConfigBuilderTest.kt
@@ -25,6 +25,7 @@
class PagedListConfigBuilderTest {
@Test
fun defaults() {
+ @Suppress("DEPRECATION")
val config = PagedList.Config.Builder()
.setPageSize(10)
.build()
@@ -32,11 +33,13 @@
Assert.assertEquals(30, config.initialLoadSizeHint)
Assert.assertEquals(true, config.enablePlaceholders)
Assert.assertEquals(10, config.prefetchDistance)
+ @Suppress("DEPRECATION")
Assert.assertEquals(PagedList.Config.MAX_SIZE_UNBOUNDED, config.maxSize)
}
@Test(expected = IllegalArgumentException::class)
fun maxSizeTooSmall() {
+ @Suppress("DEPRECATION")
PagedList.Config.Builder()
.setPageSize(20)
.setPrefetchDistance(15)
@@ -46,6 +49,7 @@
@Test
fun maxSizeAccepted() {
+ @Suppress("DEPRECATION")
PagedList.Config.Builder()
.setPageSize(20)
.setPrefetchDistance(15)
diff --git a/paging/integration-tests/testapp/src/main/java/androidx/paging/integration/testapp/custom/PagedListSampleActivity.kt b/paging/integration-tests/testapp/src/main/java/androidx/paging/integration/testapp/custom/PagedListSampleActivity.kt
index f98408f..978d355 100644
--- a/paging/integration-tests/testapp/src/main/java/androidx/paging/integration/testapp/custom/PagedListSampleActivity.kt
+++ b/paging/integration-tests/testapp/src/main/java/androidx/paging/integration/testapp/custom/PagedListSampleActivity.kt
@@ -47,6 +47,7 @@
footer = StateItemAdapter { pagingAdapter.currentList?.retry() }
)
+ @Suppress("DEPRECATION")
viewModel.livePagedList.observe(this,
Observer<PagedList<Item>> { pagingAdapter.submitList(it) })
diff --git a/paging/runtime/src/androidTest/java/androidx/paging/AsyncPagedListDifferTest.kt b/paging/runtime/src/androidTest/java/androidx/paging/AsyncPagedListDifferTest.kt
index 8136a07..01a27f2 100644
--- a/paging/runtime/src/androidTest/java/androidx/paging/AsyncPagedListDifferTest.kt
+++ b/paging/runtime/src/androidTest/java/androidx/paging/AsyncPagedListDifferTest.kt
@@ -60,12 +60,12 @@
return differ
}
+ @Suppress("DEPRECATION")
private fun <V : Any> createPagedListFromListAndPos(
config: PagedList.Config,
data: List<V>,
initialKey: Int
): PagedList<V> {
- @Suppress("DEPRECATION")
return PagedList.Builder(ListDataSource(data), config)
.setInitialKey(initialKey)
.setNotifyExecutor(mainThread)
@@ -165,6 +165,7 @@
@Test
fun pagingInContent() {
+ @Suppress("DEPRECATION")
val config = PagedList.Config.Builder()
.setInitialLoadSizeHint(4)
.setPageSize(2)
@@ -214,6 +215,7 @@
@Test
fun simpleSwap() {
// Page size large enough to load
+ @Suppress("DEPRECATION")
val config = PagedList.Config.Builder()
.setPageSize(50)
.build()
@@ -247,6 +249,7 @@
@Test
fun oldListUpdateIgnoredWhileDiffing() {
+ @Suppress("DEPRECATION")
val config = PagedList.Config.Builder()
.setInitialLoadSizeHint(4)
.setPageSize(2)
@@ -358,6 +361,7 @@
val differ = createDiffer(callback)
differAccessor[0] = differ
+ @Suppress("DEPRECATION")
val config = PagedList.Config.Builder()
.setPageSize(20)
.build()
@@ -386,6 +390,7 @@
fun loadAroundHandlePrepend() {
val differ = createDiffer()
+ @Suppress("DEPRECATION")
val config = PagedList.Config.Builder()
.setPageSize(5)
.setEnablePlaceholders(false)
@@ -406,6 +411,7 @@
@Test
fun submitSubset() {
// Page size large enough to load
+ @Suppress("DEPRECATION")
val config = PagedList.Config.Builder()
.setInitialLoadSizeHint(4)
.setPageSize(2)
@@ -522,9 +528,11 @@
@Test
fun addRemovePagedListCallback() {
val differ = createDiffer()
+ @Suppress("DEPRECATION")
val noopCallback = { _: PagedList<String>?, _: PagedList<String>? -> }
differ.addPagedListListener(noopCallback)
assert(differ.listeners.size == 1)
+ @Suppress("DEPRECATION")
differ.removePagedListListener { _: PagedList<String>?, _: PagedList<String>? -> }
assert(differ.listeners.size == 1)
differ.removePagedListListener(noopCallback)
diff --git a/paging/runtime/src/androidTest/java/androidx/paging/LivePagedListBuilderTest.kt b/paging/runtime/src/androidTest/java/androidx/paging/LivePagedListBuilderTest.kt
index f61b6e3..13b0d53 100644
--- a/paging/runtime/src/androidTest/java/androidx/paging/LivePagedListBuilderTest.kt
+++ b/paging/runtime/src/androidTest/java/androidx/paging/LivePagedListBuilderTest.kt
@@ -140,8 +140,10 @@
.setFetchExecutor(backgroundExecutor)
.build()
+ @Suppress("DEPRECATION")
val pagedListHolder: Array<PagedList<String>?> = arrayOfNulls(1)
+ @Suppress("DEPRECATION")
livePagedList.observe(lifecycleOwner, Observer<PagedList<String>> { newList ->
pagedListHolder[0] = newList
})
@@ -174,8 +176,10 @@
.setFetchExecutor(backgroundExecutor)
.build()
+ @Suppress("DEPRECATION")
val pagedListHolder: Array<PagedList<String>?> = arrayOfNulls(1)
+ @Suppress("DEPRECATION")
livePagedList.observe(lifecycleOwner, Observer<PagedList<String>> { newList ->
pagedListHolder[0] = newList
})
diff --git a/paging/runtime/src/androidTest/java/androidx/paging/PagedListAdapterTest.kt b/paging/runtime/src/androidTest/java/androidx/paging/PagedListAdapterTest.kt
index f90857d..2480c96 100644
--- a/paging/runtime/src/androidTest/java/androidx/paging/PagedListAdapterTest.kt
+++ b/paging/runtime/src/androidTest/java/androidx/paging/PagedListAdapterTest.kt
@@ -58,6 +58,7 @@
override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) =
throw IllegalStateException("not supported")
+ @Suppress("OverridingDeprecatedMember")
override fun onCurrentListChanged(currentList: PagedList<String>?) {
onChangedLegacy?.onCurrentListChanged(null, currentList)
}
@@ -137,12 +138,10 @@
}
private fun verifyOnCurrentListChanged(
- @Suppress("DEPRECATION")
- legacyListener: AsyncPagedListDiffer.PagedListListener<String>,
- @Suppress("DEPRECATION")
- listener: AsyncPagedListDiffer.PagedListListener<String>,
- previousList: PagedList<String>?,
- currentList: PagedList<String>?
+ @Suppress("DEPRECATION") legacyListener: AsyncPagedListDiffer.PagedListListener<String>,
+ @Suppress("DEPRECATION") listener: AsyncPagedListDiffer.PagedListListener<String>,
+ @Suppress("DEPRECATION") previousList: PagedList<String>?,
+ @Suppress("DEPRECATION") currentList: PagedList<String>?
) {
verify(legacyListener).onCurrentListChanged(null, currentList)
verify(listener).onCurrentListChanged(previousList, currentList)
diff --git a/paging/runtime/src/androidTest/java/androidx/paging/RecordingCallbackTest.kt b/paging/runtime/src/androidTest/java/androidx/paging/RecordingCallbackTest.kt
index b2189fe..7171b32 100644
--- a/paging/runtime/src/androidTest/java/androidx/paging/RecordingCallbackTest.kt
+++ b/paging/runtime/src/androidTest/java/androidx/paging/RecordingCallbackTest.kt
@@ -30,6 +30,7 @@
fun recordReplay() {
val recordingCallback = RecordingCallback()
+ @Suppress("DEPRECATION")
val failCallback = object : PagedList.Callback() {
override fun onChanged(position: Int, count: Int) = fail("not expected")
override fun onInserted(position: Int, count: Int) = fail("not expected")
@@ -44,6 +45,7 @@
recordingCallback.onRemoved(5, 6)
var inc = 0
+ @Suppress("DEPRECATION")
val verifyCallback = object : PagedList.Callback() {
override fun onChanged(position: Int, count: Int) {
assertEquals(inc, 0)
@@ -51,12 +53,14 @@
assertEquals(count, 2)
inc += 1
}
+
override fun onInserted(position: Int, count: Int) {
assertEquals(inc, 1)
assertEquals(position, 3)
assertEquals(count, 4)
inc += 1
}
+
override fun onRemoved(position: Int, count: Int) {
assertEquals(inc, 2)
assertEquals(position, 5)
diff --git a/paging/runtime/src/androidTest/java/androidx/paging/StringPagedList.kt b/paging/runtime/src/androidTest/java/androidx/paging/StringPagedList.kt
index 7208cd3..6c99a64 100644
--- a/paging/runtime/src/androidTest/java/androidx/paging/StringPagedList.kt
+++ b/paging/runtime/src/androidTest/java/androidx/paging/StringPagedList.kt
@@ -44,7 +44,7 @@
}
}
-@Suppress("TestFunctionName")
+@Suppress("TestFunctionName", "DEPRECATION")
fun StringPagedList(
leadingNulls: Int,
trailingNulls: Int,
diff --git a/paging/runtime/src/main/java/androidx/paging/AsyncPagedListDiffer.kt b/paging/runtime/src/main/java/androidx/paging/AsyncPagedListDiffer.kt
index e2bd838..fae0b93 100644
--- a/paging/runtime/src/main/java/androidx/paging/AsyncPagedListDiffer.kt
+++ b/paging/runtime/src/main/java/androidx/paging/AsyncPagedListDiffer.kt
@@ -19,7 +19,6 @@
import androidx.annotation.VisibleForTesting
import androidx.arch.core.executor.ArchTaskExecutor
import androidx.lifecycle.LiveData
-import androidx.paging.PagedList.LoadStateManager
import androidx.recyclerview.widget.AdapterListUpdateCallback
import androidx.recyclerview.widget.AsyncDifferConfig
import androidx.recyclerview.widget.DiffUtil
@@ -131,9 +130,12 @@
internal var mainThreadExecutor = ArchTaskExecutor.getMainThreadExecutor()
+ @Suppress("DEPRECATION")
@VisibleForTesting
internal val listeners = CopyOnWriteArrayList<PagedListListener<T>>()
+ @Suppress("DEPRECATION")
private var pagedList: PagedList<T>? = null
+ @Suppress("DEPRECATION")
private var snapshot: PagedList<T>? = null
/**
@@ -142,7 +144,8 @@
@Suppress("MemberVisibilityCanBePrivate") // synthetic access
internal var maxScheduledGeneration: Int = 0
- private val loadStateManager: LoadStateManager = object : LoadStateManager() {
+ @Suppress("DEPRECATION")
+ private val loadStateManager = object : PagedList.LoadStateManager() {
override fun onStateChanged(type: LoadType, state: LoadState) {
// Don't need to post - PagedList will already have done that
loadStateListeners.forEach { it(type, state) }
@@ -154,6 +157,7 @@
internal val loadStateListeners: MutableList<(LoadType, LoadState) -> Unit> =
CopyOnWriteArrayList()
+ @Suppress("DEPRECATION")
private val pagedListCallback = object : PagedList.Callback() {
override fun onInserted(position: Int, count: Int) =
updateCallback.onInserted(position, count)
@@ -185,6 +189,7 @@
*
* @return The list currently being displayed, may be `null`.
*/
+ @Suppress("DEPRECATION")
open val currentList: PagedList<T>?
get() = snapshot ?: pagedList
@@ -193,6 +198,7 @@
*
* @param T Type of items in [PagedList]
*/
+ @Deprecated("PagedList is deprecated and has been replaced by PagingData")
interface PagedListListener<T : Any> {
/**
* Called after the current PagedList has been updated.
@@ -200,7 +206,10 @@
* @param previousList The previous list, may be null.
* @param currentList The new current list, may be null.
*/
- fun onCurrentListChanged(previousList: PagedList<T>?, currentList: PagedList<T>?)
+ fun onCurrentListChanged(
+ @Suppress("DEPRECATION") previousList: PagedList<T>?,
+ @Suppress("DEPRECATION") currentList: PagedList<T>?
+ )
}
/**
@@ -208,6 +217,7 @@
*
* @param T Type of items in [PagedList]
*/
+ @Suppress("DEPRECATION")
private class OnCurrentListChangedWrapper<T : Any>(
val callback: (PagedList<T>?, PagedList<T>?) -> Unit
) : PagedListListener<T> {
@@ -296,7 +306,8 @@
*
* @param pagedList The new PagedList.
*/
- open fun submitList(pagedList: PagedList<T>?) = submitList(pagedList, null)
+ open fun submitList(@Suppress("DEPRECATION") pagedList: PagedList<T>?) =
+ submitList(pagedList, null)
/**
* Pass a new PagedList to the differ.
@@ -314,7 +325,10 @@
* @param commitCallback Optional runnable that is executed when the PagedList is committed, if
* it is committed.
*/
- open fun submitList(pagedList: PagedList<T>?, commitCallback: Runnable?) {
+ open fun submitList(
+ @Suppress("DEPRECATION") pagedList: PagedList<T>?,
+ commitCallback: Runnable?
+ ) {
// incrementing generation means any currently-running diffs are discarded when they finish
val runGeneration = ++maxScheduledGeneration
@@ -361,6 +375,7 @@
it.removeWeakCallback(pagedListCallback)
it.removeWeakLoadStateListener(loadStateListener)
+ @Suppress("DEPRECATION")
snapshot = it.snapshot() as PagedList<T>
this.pagedList = null
}
@@ -370,6 +385,7 @@
throw IllegalStateException("must be in snapshot state to diff")
}
+ @Suppress("DEPRECATION")
val newSnapshot = pagedList.snapshot() as PagedList<T>
val recordingCallback = RecordingCallback()
pagedList.addWeakCallback(recordingCallback)
@@ -396,8 +412,8 @@
@Suppress("MemberVisibilityCanBePrivate") // synthetic access
internal fun latchPagedList(
- newList: PagedList<T>,
- diffSnapshot: PagedList<T>,
+ @Suppress("DEPRECATION") newList: PagedList<T>,
+ @Suppress("DEPRECATION") diffSnapshot: PagedList<T>,
diffResult: DiffUtil.DiffResult,
recordingCallback: RecordingCallback,
lastAccessIndex: Int,
@@ -450,8 +466,8 @@
}
private fun onCurrentListChanged(
- previousList: PagedList<T>?,
- currentList: PagedList<T>?,
+ @Suppress("DEPRECATION") previousList: PagedList<T>?,
+ @Suppress("DEPRECATION") currentList: PagedList<T>?,
commitCallback: Runnable?
) {
listeners.forEach { it.onCurrentListChanged(previousList, currentList) }
@@ -466,7 +482,7 @@
* @see currentList
* @see removePagedListListener
*/
- open fun addPagedListListener(listener: PagedListListener<T>) {
+ open fun addPagedListListener(@Suppress("DEPRECATION") listener: PagedListListener<T>) {
listeners.add(listener)
}
@@ -478,7 +494,9 @@
* @see currentList
* @see removePagedListListener
*/
- fun addPagedListListener(callback: (PagedList<T>?, PagedList<T>?) -> Unit) {
+ fun addPagedListListener(
+ @Suppress("DEPRECATION") callback: (PagedList<T>?, PagedList<T>?) -> Unit
+ ) {
listeners.add(OnCurrentListChangedWrapper(callback))
}
@@ -490,7 +508,7 @@
* @see currentList
* @see addPagedListListener
*/
- open fun removePagedListListener(listener: PagedListListener<T>) {
+ open fun removePagedListListener(@Suppress("DEPRECATION") listener: PagedListListener<T>) {
listeners.remove(listener)
}
@@ -502,7 +520,9 @@
* @see currentList
* @see addPagedListListener
*/
- fun removePagedListListener(callback: (PagedList<T>?, PagedList<T>?) -> Unit) {
+ fun removePagedListListener(
+ @Suppress("DEPRECATION") callback: (PagedList<T>?, PagedList<T>?) -> Unit
+ ) {
listeners.removeAll { it is OnCurrentListChangedWrapper<T> && it.callback === callback }
}
diff --git a/paging/runtime/src/main/java/androidx/paging/LivePagedList.kt b/paging/runtime/src/main/java/androidx/paging/LivePagedList.kt
index faea28c..9205c17 100644
--- a/paging/runtime/src/main/java/androidx/paging/LivePagedList.kt
+++ b/paging/runtime/src/main/java/androidx/paging/LivePagedList.kt
@@ -30,6 +30,7 @@
import kotlinx.coroutines.withContext
import java.util.concurrent.Executor
+@Suppress("DEPRECATION")
internal class LivePagedList<Key : Any, Value : Any>(
private val coroutineScope: CoroutineScope,
initialKey: Key?,
@@ -122,6 +123,7 @@
*
* @see LivePagedListBuilder
*/
+@Suppress("DEPRECATION")
@Deprecated(
message = "PagedList is deprecated and has been replaced by PagingData",
replaceWith = ReplaceWith(
@@ -147,7 +149,6 @@
boundaryCallback: PagedList.BoundaryCallback<Value>? = null,
fetchExecutor: Executor = ArchTaskExecutor.getIOThreadExecutor()
): LiveData<PagedList<Value>> {
- @Suppress("DEPRECATION")
return LivePagedListBuilder(this, config)
.setInitialLoadKey(initialLoadKey)
.setBoundaryCallback(boundaryCallback)
@@ -169,6 +170,7 @@
*
* @see LivePagedListBuilder
*/
+@Suppress("DEPRECATION")
@Deprecated(
message = "PagedList is deprecated and has been replaced by PagingData",
replaceWith = ReplaceWith(
@@ -188,7 +190,6 @@
boundaryCallback: PagedList.BoundaryCallback<Value>? = null,
fetchExecutor: Executor = ArchTaskExecutor.getIOThreadExecutor()
): LiveData<PagedList<Value>> {
- @Suppress("DEPRECATION")
return LivePagedListBuilder(this, Config(pageSize))
.setInitialLoadKey(initialLoadKey)
.setBoundaryCallback(boundaryCallback)
@@ -215,6 +216,7 @@
*
* @see LivePagedListBuilder
*/
+@Suppress("DEPRECATION")
@Deprecated(
message = "PagedList is deprecated and has been replaced by PagingData",
replaceWith = ReplaceWith(
@@ -270,6 +272,7 @@
*
* @see LivePagedListBuilder
*/
+@Suppress("DEPRECATION")
@Deprecated(
message = "PagedList is deprecated and has been replaced by PagingData",
replaceWith = ReplaceWith(
diff --git a/paging/runtime/src/main/java/androidx/paging/LivePagedListBuilder.kt b/paging/runtime/src/main/java/androidx/paging/LivePagedListBuilder.kt
index 55bd769..edd9bd5 100644
--- a/paging/runtime/src/main/java/androidx/paging/LivePagedListBuilder.kt
+++ b/paging/runtime/src/main/java/androidx/paging/LivePagedListBuilder.kt
@@ -39,9 +39,11 @@
class LivePagedListBuilder<Key : Any, Value : Any> {
private val pagingSourceFactory: (() -> PagingSource<Key, Value>)?
private val dataSourceFactory: DataSource.Factory<Key, Value>?
+ @Suppress("DEPRECATION")
private val config: PagedList.Config
private var coroutineScope: CoroutineScope = GlobalScope
private var initialLoadKey: Key? = null
+ @Suppress("DEPRECATION")
private var boundaryCallback: PagedList.BoundaryCallback<Value>? = null
private var fetchDispatcher = Dispatchers.IO
@@ -70,7 +72,11 @@
"kotlinx.coroutines.Dispatchers"
)
)
- constructor(dataSourceFactory: DataSource.Factory<Key, Value>, config: PagedList.Config) {
+ constructor(
+ dataSourceFactory: DataSource.Factory<Key, Value>,
+ @Suppress("DEPRECATION")
+ config: PagedList.Config
+ ) {
this.pagingSourceFactory = null
this.dataSourceFactory = dataSourceFactory
this.config = config
@@ -139,7 +145,11 @@
"androidx.paging.PagingConfig"
)
)
- constructor(pagingSourceFactory: () -> PagingSource<Key, Value>, config: PagedList.Config) {
+ constructor(
+ pagingSourceFactory: () -> PagingSource<Key, Value>,
+ @Suppress("DEPRECATION")
+ config: PagedList.Config
+ ) {
this.pagingSourceFactory = pagingSourceFactory
this.dataSourceFactory = null
this.config = config
@@ -231,7 +241,10 @@
* @param boundaryCallback The boundary callback for listening to PagedList load state.
* @return this
*/
- fun setBoundaryCallback(boundaryCallback: PagedList.BoundaryCallback<Value>?) = this.apply {
+ fun setBoundaryCallback(
+ @Suppress("DEPRECATION")
+ boundaryCallback: PagedList.BoundaryCallback<Value>?
+ ) = this.apply {
this.boundaryCallback = boundaryCallback
}
@@ -257,6 +270,7 @@
*
* @return The [LiveData] of [PagedList]s
*/
+ @Suppress("DEPRECATION")
fun build(): LiveData<PagedList<Value>> {
val pagingSourceFactory = pagingSourceFactory
?: dataSourceFactory?.asPagingSourceFactory(fetchDispatcher)
diff --git a/paging/runtime/src/main/java/androidx/paging/PagedListAdapter.kt b/paging/runtime/src/main/java/androidx/paging/PagedListAdapter.kt
index 5c71b8c..b7d9f68 100644
--- a/paging/runtime/src/main/java/androidx/paging/PagedListAdapter.kt
+++ b/paging/runtime/src/main/java/androidx/paging/PagedListAdapter.kt
@@ -115,8 +115,8 @@
abstract class PagedListAdapter<T : Any, VH : RecyclerView.ViewHolder> : RecyclerView.Adapter<VH> {
@Suppress("DEPRECATION")
internal val differ: AsyncPagedListDiffer<T>
+ @Suppress("DEPRECATION")
private val listener = { previousList: PagedList<T>?, currentList: PagedList<T>? ->
- @Suppress("DEPRECATION")
this@PagedListAdapter.onCurrentListChanged(currentList)
this@PagedListAdapter.onCurrentListChanged(previousList, currentList)
}
@@ -132,6 +132,7 @@
*
* @see onCurrentListChanged
*/
+ @Suppress("DEPRECATION")
open val currentList: PagedList<T>?
get() = differ.currentList
@@ -164,7 +165,8 @@
*
* @param pagedList The new list to be displayed.
*/
- open fun submitList(pagedList: PagedList<T>?) = differ.submitList(pagedList)
+ open fun submitList(@Suppress("DEPRECATION") pagedList: PagedList<T>?) =
+ differ.submitList(pagedList)
/**
* Set the new list to be displayed.
@@ -180,8 +182,10 @@
* @param commitCallback Optional runnable that is executed when the PagedList is committed, if
* it is committed.
*/
- open fun submitList(pagedList: PagedList<T>?, commitCallback: Runnable?) =
- differ.submitList(pagedList, commitCallback)
+ open fun submitList(
+ @Suppress("DEPRECATION") pagedList: PagedList<T>?,
+ commitCallback: Runnable?
+ ) = differ.submitList(pagedList, commitCallback)
protected open fun getItem(position: Int) = differ.getItem(position)
@@ -207,7 +211,7 @@
"Use the two argument variant instead.",
ReplaceWith("onCurrentListChanged(previousList, currentList)")
)
- open fun onCurrentListChanged(currentList: PagedList<T>?) {
+ open fun onCurrentListChanged(@Suppress("DEPRECATION") currentList: PagedList<T>?) {
}
/**
@@ -227,7 +231,10 @@
*
* @see currentList
*/
- open fun onCurrentListChanged(previousList: PagedList<T>?, currentList: PagedList<T>?) {
+ open fun onCurrentListChanged(
+ @Suppress("DEPRECATION") previousList: PagedList<T>?,
+ @Suppress("DEPRECATION") currentList: PagedList<T>?
+ ) {
}
/**
diff --git a/paging/runtime/src/main/java/androidx/paging/RecordingCallback.kt b/paging/runtime/src/main/java/androidx/paging/RecordingCallback.kt
index b4371af..c559a72 100644
--- a/paging/runtime/src/main/java/androidx/paging/RecordingCallback.kt
+++ b/paging/runtime/src/main/java/androidx/paging/RecordingCallback.kt
@@ -16,6 +16,7 @@
package androidx.paging
+@Suppress("DEPRECATION")
internal class RecordingCallback : PagedList.Callback() {
private val list = mutableListOf<Int>()
override fun onChanged(position: Int, count: Int) {
diff --git a/paging/rxjava2/src/main/java/androidx/paging/RxPagedList.kt b/paging/rxjava2/src/main/java/androidx/paging/RxPagedList.kt
index 8d38dd8..8e5d64d 100644
--- a/paging/rxjava2/src/main/java/androidx/paging/RxPagedList.kt
+++ b/paging/rxjava2/src/main/java/androidx/paging/RxPagedList.kt
@@ -23,9 +23,9 @@
private fun <Key : Any, Value : Any> createRxPagedListBuilder(
dataSourceFactory: DataSource.Factory<Key, Value>,
- config: PagedList.Config,
+ @Suppress("DEPRECATION") config: PagedList.Config,
initialLoadKey: Key?,
- boundaryCallback: PagedList.BoundaryCallback<Value>?,
+ @Suppress("DEPRECATION") boundaryCallback: PagedList.BoundaryCallback<Value>?,
fetchScheduler: Scheduler?,
notifyScheduler: Scheduler?
): RxPagedListBuilder<Key, Value> {
@@ -40,9 +40,9 @@
private fun <Key : Any, Value : Any> createRxPagedListBuilder(
pagingSourceFactory: () -> PagingSource<Key, Value>,
- config: PagedList.Config,
+ @Suppress("DEPRECATION") config: PagedList.Config,
initialLoadKey: Key?,
- boundaryCallback: PagedList.BoundaryCallback<Value>?,
+ @Suppress("DEPRECATION") boundaryCallback: PagedList.BoundaryCallback<Value>?,
fetchScheduler: Scheduler?,
notifyScheduler: Scheduler?
): RxPagedListBuilder<Key, Value> {
@@ -74,6 +74,7 @@
* @see RxPagedListBuilder
* @see toFlowable
*/
+@Suppress("DEPRECATION")
@Deprecated(
message = "PagedList is deprecated and has been replaced by PagingData",
replaceWith = ReplaceWith(
@@ -130,6 +131,7 @@
* @see RxPagedListBuilder
* @see toFlowable
*/
+@Suppress("DEPRECATION")
@Deprecated(
message = "PagedList is deprecated and has been replaced by PagingData",
replaceWith = ReplaceWith(
@@ -181,6 +183,7 @@
* @see RxPagedListBuilder
* @see toObservable
*/
+@Suppress("DEPRECATION")
@Deprecated(
message = "PagedList is deprecated and has been replaced by PagingData",
replaceWith = ReplaceWith(
@@ -239,6 +242,7 @@
* @see RxPagedListBuilder
* @see toObservable
*/
+@Suppress("DEPRECATION")
@Deprecated(
message = "PagedList is deprecated and has been replaced by PagingData",
replaceWith = ReplaceWith(
@@ -290,6 +294,7 @@
* @see RxPagedListBuilder
* @see toFlowable
*/
+@Suppress("DEPRECATION")
@Deprecated(
message = "PagedList is deprecated and has been replaced by PagingData",
replaceWith = ReplaceWith(
@@ -346,6 +351,7 @@
* @see RxPagedListBuilder
* @see toFlowable
*/
+@Suppress("DEPRECATION")
@Deprecated(
message = "PagedList is deprecated and has been replaced by PagingData",
replaceWith = ReplaceWith(
@@ -395,6 +401,7 @@
* @see RxPagedListBuilder
* @see toObservable
*/
+@Suppress("DEPRECATION")
@Deprecated(
message = "PagedList is deprecated and has been replaced by PagingData",
replaceWith = ReplaceWith(
@@ -451,6 +458,7 @@
* @see RxPagedListBuilder
* @see toObservable
*/
+@Suppress("DEPRECATION")
@Deprecated(
message = "PagedList is deprecated and has been replaced by PagingData",
replaceWith = ReplaceWith(
diff --git a/paging/rxjava2/src/main/java/androidx/paging/RxPagedListBuilder.kt b/paging/rxjava2/src/main/java/androidx/paging/RxPagedListBuilder.kt
index 76814ef..cedf80a 100644
--- a/paging/rxjava2/src/main/java/androidx/paging/RxPagedListBuilder.kt
+++ b/paging/rxjava2/src/main/java/androidx/paging/RxPagedListBuilder.kt
@@ -52,9 +52,11 @@
class RxPagedListBuilder<Key : Any, Value : Any> {
private val pagingSourceFactory: (() -> PagingSource<Key, Value>)?
private val dataSourceFactory: DataSource.Factory<Key, Value>?
+ @Suppress("DEPRECATION")
private val config: PagedList.Config
private var initialLoadKey: Key? = null
+ @Suppress("DEPRECATION")
private var boundaryCallback: PagedList.BoundaryCallback<Value>? = null
private var notifyDispatcher: SchedulerCoroutineDispatcher? = null
private var notifyScheduler: Scheduler? = null
@@ -89,7 +91,7 @@
)
constructor(
pagingSourceFactory: () -> PagingSource<Key, Value>,
- config: PagedList.Config
+ @Suppress("DEPRECATION") config: PagedList.Config
) {
this.pagingSourceFactory = pagingSourceFactory
this.dataSourceFactory = null
@@ -159,7 +161,7 @@
)
constructor(
dataSourceFactory: DataSource.Factory<Key, Value>,
- config: PagedList.Config
+ @Suppress("DEPRECATION") config: PagedList.Config
) {
this.pagingSourceFactory = null
this.dataSourceFactory = dataSourceFactory
@@ -237,9 +239,9 @@
* @param boundaryCallback The boundary callback for listening to PagedList load state.
* @return this
*/
- fun setBoundaryCallback(boundaryCallback: PagedList.BoundaryCallback<Value>?) = apply {
- this.boundaryCallback = boundaryCallback
- }
+ fun setBoundaryCallback(
+ @Suppress("DEPRECATION") boundaryCallback: PagedList.BoundaryCallback<Value>?
+ ) = apply { this.boundaryCallback = boundaryCallback }
/**
* Sets scheduler which will be used for observing new PagedLists, as well as loading updates
@@ -284,6 +286,7 @@
*
* @return The [Observable] of PagedLists
*/
+ @Suppress("DEPRECATION")
fun buildObservable(): Observable<PagedList<Value>> {
@SuppressLint("RestrictedApi")
val notifyScheduler = notifyScheduler
@@ -326,10 +329,12 @@
* @param backpressureStrategy BackpressureStrategy for the [Flowable] to use.
* @return The [Flowable] of PagedLists
*/
+ @Suppress("DEPRECATION")
fun buildFlowable(backpressureStrategy: BackpressureStrategy): Flowable<PagedList<Value>> {
return buildObservable().toFlowable(backpressureStrategy)
}
+ @Suppress("DEPRECATION")
internal class PagingObservableOnSubscribe<Key : Any, Value : Any>(
initialLoadKey: Key?,
private val config: PagedList.Config,