Move scope impls to api/internal

PiperOrigin-RevId: 248555738
Change-Id: I6e77503d069552a6cc368f8a93e7b0bd20e7d4c9
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 efceee9..9f2e79d 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
@@ -37,9 +37,9 @@
         "//src/main/java/com/google/android/libraries/feed/api/internal/knowncontent",
         "//src/main/java/com/google/android/libraries/feed/api/internal/protocoladapter",
         "//src/main/java/com/google/android/libraries/feed/api/internal/requestmanager",
+        "//src/main/java/com/google/android/libraries/feed/api/internal/scope",
+        "//src/main/java/com/google/android/libraries/feed/api/internal/scope:feedprocessscope",
         "//src/main/java/com/google/android/libraries/feed/api/internal/sessionmanager",
-        "//src/main/java/com/google/android/libraries/feed/api/scope",
-        "//src/main/java/com/google/android/libraries/feed/api/scope:feedprocessscope",
         "//src/main/java/com/google/android/libraries/feed/basicstream",
         "//src/main/java/com/google/android/libraries/feed/common",
         "//src/main/java/com/google/android/libraries/feed/common/concurrent",
@@ -89,10 +89,9 @@
         "//src/main/java/com/google/android/libraries/feed/api/internal/knowncontent",
         "//src/main/java/com/google/android/libraries/feed/api/internal/modelprovider",
         "//src/main/java/com/google/android/libraries/feed/api/internal/protocoladapter",
+        "//src/main/java/com/google/android/libraries/feed/api/internal/scope:feedstreamscope",
         "//src/main/java/com/google/android/libraries/feed/api/internal/sessionmanager",
         "//src/main/java/com/google/android/libraries/feed/api/internal/stream",
-        "//src/main/java/com/google/android/libraries/feed/api/scope:feedstreamscope",
-        "//src/main/java/com/google/android/libraries/feed/api/stream",
         "//src/main/java/com/google/android/libraries/feed/common",
         "//src/main/java/com/google/android/libraries/feed/common/concurrent",
         "//src/main/java/com/google/android/libraries/feed/common/protoextensions",
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 34f5015..522ce70 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
@@ -36,9 +36,9 @@
 import com.google.android.libraries.feed.api.internal.protocoladapter.ProtocolAdapter;
 import com.google.android.libraries.feed.api.internal.requestmanager.ActionUploadRequestManager;
 import com.google.android.libraries.feed.api.internal.requestmanager.FeedRequestManager;
+import com.google.android.libraries.feed.api.internal.scope.ClearAllListener;
+import com.google.android.libraries.feed.api.internal.scope.FeedProcessScope;
 import com.google.android.libraries.feed.api.internal.sessionmanager.FeedSessionManager;
-import com.google.android.libraries.feed.api.scope.ClearAllListener;
-import com.google.android.libraries.feed.api.scope.FeedProcessScope;
 import com.google.android.libraries.feed.common.Validators;
 import com.google.android.libraries.feed.common.concurrent.DirectHostSupported;
 import com.google.android.libraries.feed.common.concurrent.MainThreadRunner;
diff --git a/src/main/java/com/google/android/libraries/feed/api/client/scope/StreamScopeBuilder.java b/src/main/java/com/google/android/libraries/feed/api/client/scope/StreamScopeBuilder.java
index 5ba00e0..a84e3a7 100644
--- a/src/main/java/com/google/android/libraries/feed/api/client/scope/StreamScopeBuilder.java
+++ b/src/main/java/com/google/android/libraries/feed/api/client/scope/StreamScopeBuilder.java
@@ -34,10 +34,10 @@
 import com.google.android.libraries.feed.api.internal.knowncontent.FeedKnownContent;
 import com.google.android.libraries.feed.api.internal.modelprovider.ModelProviderFactory;
 import com.google.android.libraries.feed.api.internal.protocoladapter.ProtocolAdapter;
+import com.google.android.libraries.feed.api.internal.scope.FeedStreamScope;
 import com.google.android.libraries.feed.api.internal.sessionmanager.FeedSessionManager;
 import com.google.android.libraries.feed.api.internal.stream.BasicStreamFactory;
 import com.google.android.libraries.feed.api.internal.stream.StreamFactory;
-import com.google.android.libraries.feed.api.scope.FeedStreamScope;
 import com.google.android.libraries.feed.common.Validators;
 import com.google.android.libraries.feed.common.concurrent.MainThreadRunner;
 import com.google.android.libraries.feed.common.concurrent.TaskQueue;
diff --git a/src/main/java/com/google/android/libraries/feed/api/scope/BUILD b/src/main/java/com/google/android/libraries/feed/api/internal/scope/BUILD
similarity index 97%
rename from src/main/java/com/google/android/libraries/feed/api/scope/BUILD
rename to src/main/java/com/google/android/libraries/feed/api/internal/scope/BUILD
index 20f0883..e4ed08d 100644
--- a/src/main/java/com/google/android/libraries/feed/api/scope/BUILD
+++ b/src/main/java/com/google/android/libraries/feed/api/internal/scope/BUILD
@@ -61,7 +61,6 @@
         "//src/main/java/com/google/android/libraries/feed/api/client/scope:streamscope",
         "//src/main/java/com/google/android/libraries/feed/api/client/stream",
         "//src/main/java/com/google/android/libraries/feed/api/internal/modelprovider",
-        "//src/main/java/com/google/android/libraries/feed/api/stream",
         "//src/main/java/com/google/android/libraries/feed/basicstream",
     ],
 )
diff --git a/src/main/java/com/google/android/libraries/feed/api/scope/ClearAllListener.java b/src/main/java/com/google/android/libraries/feed/api/internal/scope/ClearAllListener.java
similarity index 98%
rename from src/main/java/com/google/android/libraries/feed/api/scope/ClearAllListener.java
rename to src/main/java/com/google/android/libraries/feed/api/internal/scope/ClearAllListener.java
index 26c9296..35ac8f3 100644
--- a/src/main/java/com/google/android/libraries/feed/api/scope/ClearAllListener.java
+++ b/src/main/java/com/google/android/libraries/feed/api/internal/scope/ClearAllListener.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.android.libraries.feed.api.scope;
+package com.google.android.libraries.feed.api.internal.scope;
 
 import com.google.android.libraries.feed.api.host.logging.RequestReason;
 import com.google.android.libraries.feed.api.host.logging.Task;
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/internal/scope/FeedProcessScope.java
similarity index 94%
rename from src/main/java/com/google/android/libraries/feed/api/scope/FeedProcessScope.java
rename to src/main/java/com/google/android/libraries/feed/api/internal/scope/FeedProcessScope.java
index 0c46ad6..6b28113 100644
--- a/src/main/java/com/google/android/libraries/feed/api/scope/FeedProcessScope.java
+++ b/src/main/java/com/google/android/libraries/feed/api/internal/scope/FeedProcessScope.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.android.libraries.feed.api.scope;
+package com.google.android.libraries.feed.api.internal.scope;
 
 import android.content.Context;
 import com.google.android.libraries.feed.api.client.knowncontent.KnownContent;
@@ -150,6 +150,11 @@
     }
   }
 
+  @Deprecated
+  public ProtocolAdapter getProtocolAdapter() {
+    return protocolAdapter;
+  }
+
 
   public RequestManager getRequestManager() {
     return requestManager;
@@ -159,6 +164,11 @@
     return feedSessionManager;
   }
 
+  @Deprecated
+  public TimingUtils getTimingUtils() {
+    return timingUtils;
+  }
+
   public TaskQueue getTaskQueue() {
     return taskQueue;
   }
@@ -167,10 +177,20 @@
     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/main/java/com/google/android/libraries/feed/api/scope/FeedStreamScope.java b/src/main/java/com/google/android/libraries/feed/api/internal/scope/FeedStreamScope.java
similarity index 95%
rename from src/main/java/com/google/android/libraries/feed/api/scope/FeedStreamScope.java
rename to src/main/java/com/google/android/libraries/feed/api/internal/scope/FeedStreamScope.java
index d70d836..2704665 100644
--- a/src/main/java/com/google/android/libraries/feed/api/scope/FeedStreamScope.java
+++ b/src/main/java/com/google/android/libraries/feed/api/internal/scope/FeedStreamScope.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.android.libraries.feed.api.scope;
+package com.google.android.libraries.feed.api.internal.scope;
 
 import com.google.android.libraries.feed.api.client.scope.StreamScope;
 import com.google.android.libraries.feed.api.client.stream.Stream;
diff --git a/src/main/java/com/google/android/libraries/feed/common/testing/BUILD b/src/main/java/com/google/android/libraries/feed/common/testing/BUILD
index abb20cb..963e4a2 100644
--- a/src/main/java/com/google/android/libraries/feed/common/testing/BUILD
+++ b/src/main/java/com/google/android/libraries/feed/common/testing/BUILD
@@ -18,8 +18,8 @@
         "//src/main/java/com/google/android/libraries/feed/api/internal/common/testing",
         "//src/main/java/com/google/android/libraries/feed/api/internal/modelprovider",
         "//src/main/java/com/google/android/libraries/feed/api/internal/protocoladapter",
+        "//src/main/java/com/google/android/libraries/feed/api/internal/scope",
         "//src/main/java/com/google/android/libraries/feed/api/internal/sessionmanager",
-        "//src/main/java/com/google/android/libraries/feed/api/scope",
         "//src/main/java/com/google/android/libraries/feed/common/concurrent",
         "//src/main/java/com/google/android/libraries/feed/common/concurrent/testing",
         "//src/main/java/com/google/android/libraries/feed/common/functional",
diff --git a/src/main/java/com/google/android/libraries/feed/common/testing/InfraIntegrationScope.java b/src/main/java/com/google/android/libraries/feed/common/testing/InfraIntegrationScope.java
index 09d9611..b5e987a 100644
--- a/src/main/java/com/google/android/libraries/feed/common/testing/InfraIntegrationScope.java
+++ b/src/main/java/com/google/android/libraries/feed/common/testing/InfraIntegrationScope.java
@@ -24,8 +24,8 @@
 import com.google.android.libraries.feed.api.host.storage.JournalStorageDirect;
 import com.google.android.libraries.feed.api.internal.modelprovider.ModelProviderFactory;
 import com.google.android.libraries.feed.api.internal.protocoladapter.ProtocolAdapter;
+import com.google.android.libraries.feed.api.internal.scope.ClearAllListener;
 import com.google.android.libraries.feed.api.internal.sessionmanager.FeedSessionManager;
-import com.google.android.libraries.feed.api.scope.ClearAllListener;
 import com.google.android.libraries.feed.common.concurrent.TaskQueue;
 import com.google.android.libraries.feed.common.concurrent.testing.FakeDirectExecutor;
 import com.google.android.libraries.feed.common.concurrent.testing.FakeMainThreadRunner;
diff --git a/src/test/java/com/google/android/libraries/feed/api/scope/BUILD b/src/test/java/com/google/android/libraries/feed/api/internal/scope/BUILD
similarity index 92%
rename from src/test/java/com/google/android/libraries/feed/api/scope/BUILD
rename to src/test/java/com/google/android/libraries/feed/api/internal/scope/BUILD
index 15e5ab9..660d862 100644
--- a/src/test/java/com/google/android/libraries/feed/api/scope/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/api/internal/scope/BUILD
@@ -12,8 +12,8 @@
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/host/logging",
         "//src/main/java/com/google/android/libraries/feed/api/internal/lifecycle",
+        "//src/main/java/com/google/android/libraries/feed/api/internal/scope",
         "//src/main/java/com/google/android/libraries/feed/api/internal/sessionmanager",
-        "//src/main/java/com/google/android/libraries/feed/api/scope",
         "//src/main/java/com/google/android/libraries/feed/common/concurrent/testing",
         "//src/main/java/com/google/android/libraries/feed/common/time/testing",
         "//src/main/java/com/google/android/libraries/feed/feedapplifecyclelistener",
@@ -44,10 +44,10 @@
         "//src/main/java/com/google/android/libraries/feed/api/internal/common",
         "//src/main/java/com/google/android/libraries/feed/api/internal/knowncontent",
         "//src/main/java/com/google/android/libraries/feed/api/internal/protocoladapter",
+        "//src/main/java/com/google/android/libraries/feed/api/internal/scope",
+        "//src/main/java/com/google/android/libraries/feed/api/internal/scope:feedprocessscope",
         "//src/main/java/com/google/android/libraries/feed/api/internal/sessionmanager",
         "//src/main/java/com/google/android/libraries/feed/api/internal/store",
-        "//src/main/java/com/google/android/libraries/feed/api/scope",
-        "//src/main/java/com/google/android/libraries/feed/api/scope:feedprocessscope",
         "//src/main/java/com/google/android/libraries/feed/common/concurrent",
         "//src/main/java/com/google/android/libraries/feed/common/feedobservable",
         "//src/main/java/com/google/android/libraries/feed/common/protoextensions",
diff --git a/src/test/java/com/google/android/libraries/feed/api/scope/ClearAllListenerTest.java b/src/test/java/com/google/android/libraries/feed/api/internal/scope/ClearAllListenerTest.java
similarity index 97%
rename from src/test/java/com/google/android/libraries/feed/api/scope/ClearAllListenerTest.java
rename to src/test/java/com/google/android/libraries/feed/api/internal/scope/ClearAllListenerTest.java
index 05c6cc8..aa5955f 100644
--- a/src/test/java/com/google/android/libraries/feed/api/scope/ClearAllListenerTest.java
+++ b/src/test/java/com/google/android/libraries/feed/api/internal/scope/ClearAllListenerTest.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.android.libraries.feed.api.scope;
+package com.google.android.libraries.feed.api.internal.scope;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.verify;
diff --git a/src/test/java/com/google/android/libraries/feed/api/scope/FeedProcessScopeTest.java b/src/test/java/com/google/android/libraries/feed/api/internal/scope/FeedProcessScopeTest.java
similarity index 98%
rename from src/test/java/com/google/android/libraries/feed/api/scope/FeedProcessScopeTest.java
rename to src/test/java/com/google/android/libraries/feed/api/internal/scope/FeedProcessScopeTest.java
index 9cbc925..7ad03da 100644
--- a/src/test/java/com/google/android/libraries/feed/api/scope/FeedProcessScopeTest.java
+++ b/src/test/java/com/google/android/libraries/feed/api/internal/scope/FeedProcessScopeTest.java
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.android.libraries.feed.api.scope;
+package com.google.android.libraries.feed.api.internal.scope;
 
 import static org.mockito.Mockito.verify;
 import static org.mockito.MockitoAnnotations.initMocks;