Move Resettable to api/internal
PiperOrigin-RevId: 248171296
Change-Id: I431373c5453ea2943263167f28d190fda9d5a614
diff --git a/src/main/java/com/google/android/libraries/feed/api/lifecycle/BUILD b/src/main/java/com/google/android/libraries/feed/api/internal/lifecycle/BUILD
similarity index 100%
rename from src/main/java/com/google/android/libraries/feed/api/lifecycle/BUILD
rename to src/main/java/com/google/android/libraries/feed/api/internal/lifecycle/BUILD
diff --git a/src/main/java/com/google/android/libraries/feed/api/lifecycle/Resettable.java b/src/main/java/com/google/android/libraries/feed/api/internal/lifecycle/Resettable.java
similarity index 91%
rename from src/main/java/com/google/android/libraries/feed/api/lifecycle/Resettable.java
rename to src/main/java/com/google/android/libraries/feed/api/internal/lifecycle/Resettable.java
index b4be8fb..6873fa2 100644
--- a/src/main/java/com/google/android/libraries/feed/api/lifecycle/Resettable.java
+++ b/src/main/java/com/google/android/libraries/feed/api/internal/lifecycle/Resettable.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.lifecycle;
+package com.google.android.libraries.feed.api.internal.lifecycle;
/** Interface for objects which support reset to an initial state. */
public interface Resettable {
diff --git a/src/main/java/com/google/android/libraries/feed/api/internal/sessionmanager/BUILD b/src/main/java/com/google/android/libraries/feed/api/internal/sessionmanager/BUILD
index 9d2dabc..274d618 100644
--- a/src/main/java/com/google/android/libraries/feed/api/internal/sessionmanager/BUILD
+++ b/src/main/java/com/google/android/libraries/feed/api/internal/sessionmanager/BUILD
@@ -9,8 +9,8 @@
"//src/main/java/com/google/android/libraries/feed/api/client/knowncontent",
"//src/main/java/com/google/android/libraries/feed/api/host/logging",
"//src/main/java/com/google/android/libraries/feed/api/internal/common",
+ "//src/main/java/com/google/android/libraries/feed/api/internal/lifecycle",
"//src/main/java/com/google/android/libraries/feed/api/internal/modelprovider",
- "//src/main/java/com/google/android/libraries/feed/api/lifecycle",
"//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/functional",
diff --git a/src/main/java/com/google/android/libraries/feed/api/internal/sessionmanager/FeedSessionManager.java b/src/main/java/com/google/android/libraries/feed/api/internal/sessionmanager/FeedSessionManager.java
index 4497646..8ecb6da 100644
--- a/src/main/java/com/google/android/libraries/feed/api/internal/sessionmanager/FeedSessionManager.java
+++ b/src/main/java/com/google/android/libraries/feed/api/internal/sessionmanager/FeedSessionManager.java
@@ -17,9 +17,9 @@
import com.google.android.libraries.feed.api.client.knowncontent.KnownContent;
import com.google.android.libraries.feed.api.host.logging.RequestReason;
import com.google.android.libraries.feed.api.internal.common.PayloadWithId;
+import com.google.android.libraries.feed.api.internal.lifecycle.Resettable;
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.lifecycle.Resettable;
import com.google.android.libraries.feed.api.sessionmanager.SessionManager;
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/scope/BUILD b/src/main/java/com/google/android/libraries/feed/api/scope/BUILD
index 8c13f25..20f0883 100644
--- a/src/main/java/com/google/android/libraries/feed/api/scope/BUILD
+++ b/src/main/java/com/google/android/libraries/feed/api/scope/BUILD
@@ -11,8 +11,8 @@
deps = [
"//src/main/java/com/google/android/libraries/feed/api/host/logging",
"//src/main/java/com/google/android/libraries/feed/api/internal/common",
+ "//src/main/java/com/google/android/libraries/feed/api/internal/lifecycle",
"//src/main/java/com/google/android/libraries/feed/api/internal/sessionmanager",
- "//src/main/java/com/google/android/libraries/feed/api/lifecycle",
"//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/logging",
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/scope/ClearAllListener.java
index bb2992a..26c9296 100644
--- a/src/main/java/com/google/android/libraries/feed/api/scope/ClearAllListener.java
+++ b/src/main/java/com/google/android/libraries/feed/api/scope/ClearAllListener.java
@@ -17,8 +17,8 @@
import com.google.android.libraries.feed.api.host.logging.RequestReason;
import com.google.android.libraries.feed.api.host.logging.Task;
import com.google.android.libraries.feed.api.internal.common.ThreadUtils;
+import com.google.android.libraries.feed.api.internal.lifecycle.Resettable;
import com.google.android.libraries.feed.api.internal.sessionmanager.FeedSessionManager;
-import com.google.android.libraries.feed.api.lifecycle.Resettable;
import com.google.android.libraries.feed.common.concurrent.TaskQueue;
import com.google.android.libraries.feed.common.concurrent.TaskQueue.TaskType;
import com.google.android.libraries.feed.common.feedobservable.FeedObservable;
diff --git a/src/main/java/com/google/android/libraries/feed/feedstore/BUILD b/src/main/java/com/google/android/libraries/feed/feedstore/BUILD
index d8a40cd..e3eaf77 100644
--- a/src/main/java/com/google/android/libraries/feed/feedstore/BUILD
+++ b/src/main/java/com/google/android/libraries/feed/feedstore/BUILD
@@ -9,8 +9,8 @@
"//src/main/java/com/google/android/libraries/feed/api/host/logging",
"//src/main/java/com/google/android/libraries/feed/api/host/storage",
"//src/main/java/com/google/android/libraries/feed/api/internal/common",
+ "//src/main/java/com/google/android/libraries/feed/api/internal/lifecycle",
"//src/main/java/com/google/android/libraries/feed/api/internal/store",
- "//src/main/java/com/google/android/libraries/feed/api/lifecycle",
"//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/feedstore/FeedStore.java b/src/main/java/com/google/android/libraries/feed/feedstore/FeedStore.java
index 7be7248..d04b676 100644
--- a/src/main/java/com/google/android/libraries/feed/feedstore/FeedStore.java
+++ b/src/main/java/com/google/android/libraries/feed/feedstore/FeedStore.java
@@ -24,6 +24,7 @@
import com.google.android.libraries.feed.api.internal.common.PayloadWithId;
import com.google.android.libraries.feed.api.internal.common.SemanticPropertiesWithId;
import com.google.android.libraries.feed.api.internal.common.ThreadUtils;
+import com.google.android.libraries.feed.api.internal.lifecycle.Resettable;
import com.google.android.libraries.feed.api.internal.store.ActionPropertiesMutation;
import com.google.android.libraries.feed.api.internal.store.ContentMutation;
import com.google.android.libraries.feed.api.internal.store.LocalActionMutation;
@@ -32,7 +33,6 @@
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.internal.store.UploadableActionMutation;
-import com.google.android.libraries.feed.api.lifecycle.Resettable;
import com.google.android.libraries.feed.common.Result;
import com.google.android.libraries.feed.common.concurrent.MainThreadRunner;
import com.google.android.libraries.feed.common.concurrent.TaskQueue;
diff --git a/src/test/java/com/google/android/libraries/feed/api/scope/BUILD b/src/test/java/com/google/android/libraries/feed/api/scope/BUILD
index 2547a00..15e5ab9 100644
--- a/src/test/java/com/google/android/libraries/feed/api/scope/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/api/scope/BUILD
@@ -11,8 +11,8 @@
manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
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/sessionmanager",
- "//src/main/java/com/google/android/libraries/feed/api/lifecycle",
"//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",
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/scope/ClearAllListenerTest.java
index 394cf92..05c6cc8 100644
--- a/src/test/java/com/google/android/libraries/feed/api/scope/ClearAllListenerTest.java
+++ b/src/test/java/com/google/android/libraries/feed/api/scope/ClearAllListenerTest.java
@@ -20,8 +20,8 @@
import static org.mockito.MockitoAnnotations.initMocks;
import com.google.android.libraries.feed.api.host.logging.RequestReason;
+import com.google.android.libraries.feed.api.internal.lifecycle.Resettable;
import com.google.android.libraries.feed.api.internal.sessionmanager.FeedSessionManager;
-import com.google.android.libraries.feed.api.lifecycle.Resettable;
import com.google.android.libraries.feed.common.concurrent.testing.FakeTaskQueue;
import com.google.android.libraries.feed.common.concurrent.testing.FakeThreadUtils;
import com.google.android.libraries.feed.common.time.testing.FakeClock;
