Remove some deprecated getters & setters from ProcessScope
PiperOrigin-RevId: 248163673
Change-Id: Iafd7ec614fa5f55c11d27de7bb60e843501ee8fa
diff --git a/src/main/java/com/google/android/libraries/feed/api/client/scope/BUILD b/src/main/java/com/google/android/libraries/feed/api/client/scope/BUILD
index 7ef1075..2d88839 100644
--- a/src/main/java/com/google/android/libraries/feed/api/client/scope/BUILD
+++ b/src/main/java/com/google/android/libraries/feed/api/client/scope/BUILD
@@ -14,13 +14,9 @@
"//src/main/java/com/google/android/libraries/feed/api/host/imageloader",
"//src/main/java/com/google/android/libraries/feed/api/host/offlineindicator",
"//src/main/java/com/google/android/libraries/feed/api/host/stream",
- "//src/main/java/com/google/android/libraries/feed/api/internal/actionmanager",
- "//src/main/java/com/google/android/libraries/feed/api/internal/protocoladapter",
"//src/main/java/com/google/android/libraries/feed/api/sessionmanager",
"//src/main/java/com/google/android/libraries/feed/basicstream",
"//src/main/java/com/google/android/libraries/feed/common/concurrent",
- "//src/main/java/com/google/android/libraries/feed/common/protoextensions",
- "//src/main/java/com/google/android/libraries/feed/common/time",
],
)
diff --git a/src/main/java/com/google/android/libraries/feed/api/client/scope/ProcessScope.java b/src/main/java/com/google/android/libraries/feed/api/client/scope/ProcessScope.java
index e8cdfb0..87fd822 100644
--- a/src/main/java/com/google/android/libraries/feed/api/client/scope/ProcessScope.java
+++ b/src/main/java/com/google/android/libraries/feed/api/client/scope/ProcessScope.java
@@ -25,43 +25,27 @@
import com.google.android.libraries.feed.api.host.stream.SnackbarApi;
import com.google.android.libraries.feed.api.host.stream.StreamConfiguration;
import com.google.android.libraries.feed.api.host.stream.TooltipApi;
-import com.google.android.libraries.feed.api.internal.actionmanager.ActionManager;
-import com.google.android.libraries.feed.api.internal.protocoladapter.ProtocolAdapter;
import com.google.android.libraries.feed.api.sessionmanager.SessionManager;
import com.google.android.libraries.feed.common.concurrent.TaskQueue;
-import com.google.android.libraries.feed.common.protoextensions.FeedExtensionRegistry;
-import com.google.android.libraries.feed.common.time.TimingUtils;
/** Allows interaction with the Feed library at the process leve. */
public interface ProcessScope {
- @Deprecated
- ProtocolAdapter getProtocolAdapter();
-
/** Returns the Feed library request manager. */
RequestManager getRequestManager();
/** Returns the Feed library session manager. */
SessionManager getSessionManager();
- @Deprecated
- TimingUtils getTimingUtils();
-
/** Returns the Feed library task queue. */
TaskQueue getTaskQueue();
/** Returns the Feed library lifecycle listener. */
AppLifecycleListener getAppLifecycleListener();
- @Deprecated
- ActionManager getActionManager();
-
/** Returns the Feed library known content. */
KnownContent getKnownContent();
- @Deprecated
- FeedExtensionRegistry getFeedExtensionRegistry();
-
/** Returns a {@link StreamScopeBuilder.Builder}. */
StreamScopeBuilder createStreamScopeBuilder(
Context context,
diff --git a/src/main/java/com/google/android/libraries/feed/api/client/scope/ProcessScopeBuilder.java b/src/main/java/com/google/android/libraries/feed/api/client/scope/ProcessScopeBuilder.java
index 607063d..3ef7c8b 100644
--- a/src/main/java/com/google/android/libraries/feed/api/client/scope/ProcessScopeBuilder.java
+++ b/src/main/java/com/google/android/libraries/feed/api/client/scope/ProcessScopeBuilder.java
@@ -83,13 +83,10 @@
/*@MonotonicNonNull*/ private ProtoExtensionProvider protoExtensionProvider = null;
/*@MonotonicNonNull*/ ContentStorageDirect contentStorage = null;
/*@MonotonicNonNull*/ JournalStorageDirect journalStorage = null;
- /*@MonotonicNonNull*/ ContentStorage rawContentStorage = null;
- /*@MonotonicNonNull*/ JournalStorage rawJournalStorage = null;
+ /*@MonotonicNonNull*/ private ContentStorage rawContentStorage = null;
+ /*@MonotonicNonNull*/ private JournalStorage rawJournalStorage = null;
/*@MonotonicNonNull*/ private Clock clock;
- // This will be overridden in tests.
- private ThreadUtils threadUtils = new ThreadUtils();
-
/** The APIs are all required to construct the scope. */
public ProcessScopeBuilder(
Configuration configuration,
@@ -138,17 +135,6 @@
return this;
}
- // This is really exposed for tests to override the thread checking
- ProcessScopeBuilder setThreadUtils(ThreadUtils threadUtils) {
- this.threadUtils = threadUtils;
- return this;
- }
-
- public ProcessScopeBuilder setClock(Clock clock) {
- this.clock = clock;
- return this;
- }
-
@VisibleForTesting
ContentStorageDirect buildContentStorage(MainThreadRunner mainThreadRunner) {
if (contentStorage == null) {
@@ -188,6 +174,8 @@
contentStorage = buildContentStorage(mainThreadRunner);
journalStorage = buildJournalStorage(mainThreadRunner);
+ ThreadUtils threadUtils = new ThreadUtils();
+
boolean directHostCallEnabled =
configuration.getValueOrDefault(ConfigKey.USE_DIRECT_STORAGE, false);
NetworkClient networkClient;
diff --git a/src/main/java/com/google/android/libraries/feed/api/scope/FeedProcessScope.java b/src/main/java/com/google/android/libraries/feed/api/scope/FeedProcessScope.java
index a4d3466..0c46ad6 100644
--- a/src/main/java/com/google/android/libraries/feed/api/scope/FeedProcessScope.java
+++ b/src/main/java/com/google/android/libraries/feed/api/scope/FeedProcessScope.java
@@ -150,11 +150,6 @@
}
}
- @Deprecated
- public ProtocolAdapter getProtocolAdapter() {
- return protocolAdapter;
- }
-
public RequestManager getRequestManager() {
return requestManager;
@@ -164,11 +159,6 @@
return feedSessionManager;
}
- @Deprecated
- public TimingUtils getTimingUtils() {
- return timingUtils;
- }
-
public TaskQueue getTaskQueue() {
return taskQueue;
}
@@ -177,20 +167,10 @@
return appLifecycleListener;
}
- @Deprecated
- public ActionManager getActionManager() {
- return actionManager;
- }
-
public KnownContent getKnownContent() {
return feedKnownContent;
}
- @Deprecated
- public FeedExtensionRegistry getFeedExtensionRegistry() {
- return feedExtensionRegistry;
- }
-
/**
* Return a {@link Builder} to create a FeedProcessScope
*
diff --git a/src/test/java/com/google/android/libraries/feed/api/client/scope/BUILD b/src/test/java/com/google/android/libraries/feed/api/client/scope/BUILD
index 2cd26bc..26d6644 100644
--- a/src/test/java/com/google/android/libraries/feed/api/client/scope/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/api/client/scope/BUILD
@@ -21,7 +21,6 @@
"//src/main/java/com/google/android/libraries/feed/api/host/stream",
"//src/main/java/com/google/android/libraries/feed/api/internal/common",
"//src/main/java/com/google/android/libraries/feed/common/concurrent",
- "//src/main/java/com/google/android/libraries/feed/common/time/testing",
"//third_party:robolectric",
"@com_google_protobuf_javalite//:protobuf_java_lite",
"@maven//:com_google_guava_guava",
diff --git a/src/test/java/com/google/android/libraries/feed/api/client/scope/ProcessScopeBuilderTest.java b/src/test/java/com/google/android/libraries/feed/api/client/scope/ProcessScopeBuilderTest.java
index b494782..a41df28 100644
--- a/src/test/java/com/google/android/libraries/feed/api/client/scope/ProcessScopeBuilderTest.java
+++ b/src/test/java/com/google/android/libraries/feed/api/client/scope/ProcessScopeBuilderTest.java
@@ -36,7 +36,6 @@
import com.google.android.libraries.feed.api.host.stream.TooltipSupportedApi;
import com.google.android.libraries.feed.api.internal.common.ThreadUtils;
import com.google.android.libraries.feed.common.concurrent.MainThreadRunner;
-import com.google.android.libraries.feed.common.time.testing.FakeClock;
import com.google.common.util.concurrent.MoreExecutors;
import java.util.ArrayList;
import org.junit.Before;
@@ -84,7 +83,6 @@
context,
applicationInfo,
tooltipSupportedApi)
- .setThreadUtils(threadUtils)
.build();
assertThat(processScope.getRequestManager()).isNotNull();
@@ -96,7 +94,6 @@
@Test
public void testComplexBuild() {
- FakeClock fakeClock = new FakeClock();
// No crash should happen.
ProcessScope processScope =
new ProcessScopeBuilder(
@@ -110,7 +107,6 @@
applicationInfo,
tooltipSupportedApi)
.setProtoExtensionProvider(protoExtensionProvider)
- .setClock(fakeClock)
.build();
assertThat(processScope.getRequestManager()).isNotNull();
