Remove unused MockPushServer
PiperOrigin-RevId: 244076027
Change-Id: I9d1cb70dc942689a9ca2292c5d209d1109f0adab
diff --git a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/BUILD b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/BUILD
index 6d8589f..9f46625 100644
--- a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/BUILD
+++ b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/BUILD
@@ -6,18 +6,12 @@
name = "mocknetworkclient",
srcs = glob(["*.java"]),
deps = [
- "//src/main/java/com/google/android/libraries/feed/api/common",
- "//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",
"//src/main/java/com/google/android/libraries/feed/common/logging",
"//src/main/java/com/google/android/libraries/feed/feedrequestmanager",
"//src/main/java/com/google/android/libraries/feed/host/network",
- "//src/main/java/com/google/android/libraries/feed/internalapi/protocoladapter",
- "//src/main/proto/com/google/android/libraries/feed/internalapi/proto:client_feed_java_proto_lite",
"//src/main/proto/search/now/wire/feed:feed_java_proto_lite",
"//src/main/proto/search/now/wire/feed/mockserver:mock_server_java_proto_lite",
"@com_google_protobuf_javalite//:protobuf_java_lite",
- "@maven//:com_android_support_support_annotations",
],
)
diff --git a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/MockPushServer.java b/src/main/java/com/google/android/libraries/feed/mocknetworkclient/MockPushServer.java
deleted file mode 100644
index 3a78254..0000000
--- a/src/main/java/com/google/android/libraries/feed/mocknetworkclient/MockPushServer.java
+++ /dev/null
@@ -1,101 +0,0 @@
-// Copyright 2018 The Feed Authors.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.google.android.libraries.feed.mocknetworkclient;
-
-import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
-import android.os.Handler;
-import android.os.HandlerThread;
-import android.support.annotation.VisibleForTesting;
-import com.google.android.libraries.feed.api.common.MutationContext;
-import com.google.android.libraries.feed.api.sessionmanager.SessionManager;
-import com.google.android.libraries.feed.common.Result;
-import com.google.android.libraries.feed.common.logging.Logger;
-import com.google.android.libraries.feed.internalapi.protocoladapter.ProtocolAdapter;
-import com.google.search.now.feed.client.StreamDataProto.StreamDataOperation;
-import com.google.search.now.wire.feed.ResponseProto.Response;
-import com.google.search.now.wire.feed.mockserver.MockServerProto.MockServer;
-import com.google.search.now.wire.feed.mockserver.MockServerProto.MockUpdate;
-import java.util.List;
-
-/** This is a mock server client which will push responses through the session manager. */
-// TODO: This violates a bunch of Tiktok rules, uses Handler and thread primitives
-public final class MockPushServer {
- private static final String TAG = "MockPushServer";
-
- private final SessionManager sessionManager;
- private final ProtocolAdapter protocolAdapter;
- @VisibleForTesting final MockServerLooper looper;
- @VisibleForTesting boolean hasQuit = false;
-
- @SuppressWarnings("nullness")
- public MockPushServer(
- MockServer mockServer, SessionManager sessionManager, ProtocolAdapter protocolAdapter) {
- this.sessionManager = sessionManager;
- this.protocolAdapter = protocolAdapter;
- this.looper = new MockServerLooper();
- Handler handler = looper.getHandler();
- // This triggers a nullness warning, suppressing above. This should be ok since this is a mock
- // class.
- for (MockUpdate update : mockServer.getMockUpdatesList()) {
- handler.postDelayed(() -> handleUpdate(update.getResponse()), update.getUpdateTriggerTime());
- }
- }
-
- /** Called to shutdown the Looper providing support for Mock Updates */
- public void quitSafely() {
- looper.getHandler().removeCallbacksAndMessages(null);
- looper.quitSafely();
- hasQuit = true;
- }
-
- @VisibleForTesting
- void handleUpdate(Response response) {
- Result<List<StreamDataOperation>> results = protocolAdapter.createModel(response);
- if (!results.isSuccessful()) {
- Logger.e(TAG, "Unable to parse the response for push update, ignoring");
- return;
- }
- sessionManager
- .getUpdateConsumer(MutationContext.EMPTY_CONTEXT)
- .accept(Result.success(results.getValue()));
- }
-
- @VisibleForTesting
- static final class MockServerLooper {
- private final HandlerThread updateThread;
- private final Handler handler;
-
- private MockServerLooper() {
- Logger.i(TAG, "creating MockServerLooperImpl");
- updateThread = new HandlerThread("UpdateThread");
- updateThread.start();
- handler = new Handler(updateThread.getLooper());
- }
-
- Handler getHandler() {
- return handler;
- }
-
- void quitSafely() {
- Logger.i(TAG, "Looper quitSafely");
- if (VERSION.SDK_INT >= VERSION_CODES.JELLY_BEAN_MR2) {
- updateThread.quitSafely();
- } else {
- updateThread.quit();
- }
- }
- }
-}
diff --git a/src/main/proto/search/now/wire/feed/mockserver/mock_server.proto b/src/main/proto/search/now/wire/feed/mockserver/mock_server.proto
index 796b81b..4123947 100644
--- a/src/main/proto/search/now/wire/feed/mockserver/mock_server.proto
+++ b/src/main/proto/search/now/wire/feed/mockserver/mock_server.proto
@@ -14,12 +14,12 @@
syntax = "proto2";
-import "src/main/proto/search/now/wire/feed/response.proto";
-
package search.now.wire.feed.mockserver;
option optimize_for=LITE_RUNTIME;
+
+import "src/main/proto/search/now/wire/feed/response.proto";
option java_package = "com.google.search.now.wire.feed.mockserver";
option java_outer_classname = "MockServerProto";
@@ -30,8 +30,7 @@
// conditional responses represent responses for paged content
repeated ConditionalResponse conditional_responses = 2;
- // Mock updates to existing cards
- repeated MockUpdate mock_updates = 3;
+ reserved 3;
}
/** This represents a response providing updates to the stream. */
