Move ActionUploadRequestManager to api/internal/requestmanager
PiperOrigin-RevId: 248356686
Change-Id: Ibebb4d62f1ddd844852050e966533a230b88364e
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 2d88839..efceee9 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
@@ -38,7 +38,6 @@
"//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/sessionmanager",
- "//src/main/java/com/google/android/libraries/feed/api/requestmanager",
"//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",
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 3ef7c8b..34f5015 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
@@ -34,9 +34,9 @@
import com.google.android.libraries.feed.api.internal.common.ThreadUtils;
import com.google.android.libraries.feed.api.internal.knowncontent.FeedKnownContent;
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.sessionmanager.FeedSessionManager;
-import com.google.android.libraries.feed.api.requestmanager.ActionUploadRequestManager;
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;
diff --git a/src/main/java/com/google/android/libraries/feed/api/requestmanager/ActionUploadRequestManager.java b/src/main/java/com/google/android/libraries/feed/api/internal/requestmanager/ActionUploadRequestManager.java
similarity index 94%
rename from src/main/java/com/google/android/libraries/feed/api/requestmanager/ActionUploadRequestManager.java
rename to src/main/java/com/google/android/libraries/feed/api/internal/requestmanager/ActionUploadRequestManager.java
index faf1abd..fd5f8db 100644
--- a/src/main/java/com/google/android/libraries/feed/api/requestmanager/ActionUploadRequestManager.java
+++ b/src/main/java/com/google/android/libraries/feed/api/internal/requestmanager/ActionUploadRequestManager.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.requestmanager;
+package com.google.android.libraries.feed.api.internal.requestmanager;
import com.google.android.libraries.feed.common.Result;
import com.google.android.libraries.feed.common.functional.Consumer;
diff --git a/src/main/java/com/google/android/libraries/feed/api/requestmanager/BUILD b/src/main/java/com/google/android/libraries/feed/api/requestmanager/BUILD
deleted file mode 100644
index 8627ee7..0000000
--- a/src/main/java/com/google/android/libraries/feed/api/requestmanager/BUILD
+++ /dev/null
@@ -1,14 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-licenses(["notice"]) # Apache 2
-
-java_library(
- name = "requestmanager",
- srcs = glob(["*.java"]),
- deps = [
- "//src/main/java/com/google/android/libraries/feed/common",
- "//src/main/java/com/google/android/libraries/feed/common/functional",
- "//src/main/proto/com/google/android/libraries/feed/api/internal/proto:client_feed_java_proto_lite",
- "//src/main/proto/search/now/wire/feed:feed_java_proto_lite",
- ],
-)
diff --git a/src/main/java/com/google/android/libraries/feed/feedrequestmanager/BUILD b/src/main/java/com/google/android/libraries/feed/feedrequestmanager/BUILD
index 18d0622..a1da658 100644
--- a/src/main/java/com/google/android/libraries/feed/feedrequestmanager/BUILD
+++ b/src/main/java/com/google/android/libraries/feed/feedrequestmanager/BUILD
@@ -19,7 +19,6 @@
"//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/store",
- "//src/main/java/com/google/android/libraries/feed/api/requestmanager",
"//src/main/java/com/google/android/libraries/feed/api/sessionmanager",
"//src/main/java/com/google/android/libraries/feed/common",
"//src/main/java/com/google/android/libraries/feed/common/concurrent",
diff --git a/src/main/java/com/google/android/libraries/feed/feedrequestmanager/FeedActionUploadRequestManager.java b/src/main/java/com/google/android/libraries/feed/feedrequestmanager/FeedActionUploadRequestManager.java
index 5416d30..8a17b90 100644
--- a/src/main/java/com/google/android/libraries/feed/feedrequestmanager/FeedActionUploadRequestManager.java
+++ b/src/main/java/com/google/android/libraries/feed/feedrequestmanager/FeedActionUploadRequestManager.java
@@ -24,9 +24,9 @@
import com.google.android.libraries.feed.api.internal.actionmanager.ActionReader;
import com.google.android.libraries.feed.api.internal.common.ThreadUtils;
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.store.Store;
import com.google.android.libraries.feed.api.internal.store.UploadableActionMutation;
-import com.google.android.libraries.feed.api.requestmanager.ActionUploadRequestManager;
import com.google.android.libraries.feed.common.Result;
import com.google.android.libraries.feed.common.concurrent.TaskQueue;
import com.google.android.libraries.feed.common.concurrent.TaskQueue.TaskType;
diff --git a/src/main/java/com/google/android/libraries/feed/feedsessionmanager/BUILD b/src/main/java/com/google/android/libraries/feed/feedsessionmanager/BUILD
index dc33752..20c9487 100644
--- a/src/main/java/com/google/android/libraries/feed/feedsessionmanager/BUILD
+++ b/src/main/java/com/google/android/libraries/feed/feedsessionmanager/BUILD
@@ -17,7 +17,6 @@
"//src/main/java/com/google/android/libraries/feed/api/internal/requestmanager",
"//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/requestmanager",
"//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/feedobservable",
diff --git a/src/main/java/com/google/android/libraries/feed/feedsessionmanager/FeedSessionManagerFactory.java b/src/main/java/com/google/android/libraries/feed/feedsessionmanager/FeedSessionManagerFactory.java
index a3c3d36..22bcf53 100644
--- a/src/main/java/com/google/android/libraries/feed/feedsessionmanager/FeedSessionManagerFactory.java
+++ b/src/main/java/com/google/android/libraries/feed/feedsessionmanager/FeedSessionManagerFactory.java
@@ -19,10 +19,10 @@
import com.google.android.libraries.feed.api.host.scheduler.SchedulerApi;
import com.google.android.libraries.feed.api.internal.common.ThreadUtils;
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.sessionmanager.FeedSessionManager;
import com.google.android.libraries.feed.api.internal.store.Store;
-import com.google.android.libraries.feed.api.requestmanager.ActionUploadRequestManager;
import com.google.android.libraries.feed.common.concurrent.TaskQueue;
import com.google.android.libraries.feed.common.feedobservable.FeedObservable;
import com.google.android.libraries.feed.common.time.Clock;
diff --git a/src/main/java/com/google/android/libraries/feed/feedsessionmanager/FeedSessionManagerImpl.java b/src/main/java/com/google/android/libraries/feed/feedsessionmanager/FeedSessionManagerImpl.java
index afefe86..c0d7c17 100644
--- a/src/main/java/com/google/android/libraries/feed/feedsessionmanager/FeedSessionManagerImpl.java
+++ b/src/main/java/com/google/android/libraries/feed/feedsessionmanager/FeedSessionManagerImpl.java
@@ -32,11 +32,11 @@
import com.google.android.libraries.feed.api.internal.modelprovider.ModelProvider;
import com.google.android.libraries.feed.api.internal.modelprovider.ModelProvider.ViewDepthProvider;
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.sessionmanager.FeedSessionManager;
import com.google.android.libraries.feed.api.internal.store.Store;
import com.google.android.libraries.feed.api.internal.store.StoreListener;
-import com.google.android.libraries.feed.api.requestmanager.ActionUploadRequestManager;
import com.google.android.libraries.feed.common.Result;
import com.google.android.libraries.feed.common.Validators;
import com.google.android.libraries.feed.common.concurrent.TaskQueue;
diff --git a/src/main/java/com/google/android/libraries/feed/testing/requestmanager/BUILD b/src/main/java/com/google/android/libraries/feed/testing/requestmanager/BUILD
index ca9e3c2..2f44363 100644
--- a/src/main/java/com/google/android/libraries/feed/testing/requestmanager/BUILD
+++ b/src/main/java/com/google/android/libraries/feed/testing/requestmanager/BUILD
@@ -10,7 +10,6 @@
"//src/main/java/com/google/android/libraries/feed/api/host/logging",
"//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/requestmanager",
"//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/concurrent/testing",
diff --git a/src/main/java/com/google/android/libraries/feed/testing/requestmanager/FakeActionUploadRequestManager.java b/src/main/java/com/google/android/libraries/feed/testing/requestmanager/FakeActionUploadRequestManager.java
index 2c64115..ce91c21 100644
--- a/src/main/java/com/google/android/libraries/feed/testing/requestmanager/FakeActionUploadRequestManager.java
+++ b/src/main/java/com/google/android/libraries/feed/testing/requestmanager/FakeActionUploadRequestManager.java
@@ -14,7 +14,7 @@
package com.google.android.libraries.feed.testing.requestmanager;
-import com.google.android.libraries.feed.api.requestmanager.ActionUploadRequestManager;
+import com.google.android.libraries.feed.api.internal.requestmanager.ActionUploadRequestManager;
import com.google.android.libraries.feed.common.Result;
import com.google.android.libraries.feed.common.concurrent.testing.FakeThreadUtils;
import com.google.android.libraries.feed.common.functional.Consumer;
