Removing the FileObserver protocol that intended to replace SpeakEasy…

…, as the LocalSocket protocol is superior and the FileObserver protocol was never adopted. PiperOrigin-RevId: 703192031
android · Dec 5, 2024 · f5ff2c3 · f5ff2c3
1 parent 8199b18
commit f5ff2c3
Show file tree

Hide file tree

Showing 12 changed files with 5 additions and 1,204 deletions.
diff --git a/services/CHANGELOG.md b/services/CHANGELOG.md
@@ -6,6 +6,9 @@
 
 **Bug Fixes**
 
+* The obsolete FileObserver protocol has been removed in favor of the
+  LocalSocket-based protocol.
+
 **New Features**
 
 **Breaking Changes**

diff --git a/services/shellexecutor/java/androidx/test/services/shellexecutor/BUILD b/services/shellexecutor/java/androidx/test/services/shellexecutor/BUILD
@@ -9,28 +9,6 @@ package(default_applicable_licenses = ["//services:license"])
 
 licenses(["notice"])
 
-kt_android_library(
-    name = "coroutine_file_observer",
-    srcs = [
-        "CoroutineFileObserver.kt",
-    ],
-    visibility = ["//visibility:private"],
-    deps = [
-        "@maven//:org_jetbrains_kotlinx_kotlinx_coroutines_core",
-    ],
-)
-
-kt_android_library(
-    name = "file_observer_protocol",
-    srcs = [
-        "FileObserverProtocol.kt",
-        "Messages.kt",
-    ],
-    visibility = [
-        "//services/shellexecutor/javatests/androidx/test/services/shellexecutor:__subpackages__",
-    ],
-)
-
 proto_library(
     name = "local_socket_protocol_pb",
     srcs = ["local_socket_protocol.proto"],
@@ -61,21 +39,17 @@ kt_android_library(
     name = "exec_server",
     srcs = [
         "BlockingPublish.java",
-        "FileObserverShellMain.kt",
         "LocalSocketShellMain.kt",
         "ShellCommand.java",
         "ShellCommandExecutor.java",
         "ShellCommandExecutorServer.java",
-        "ShellCommandFileObserverExecutorServer.kt",
         "ShellCommandLocalSocketExecutorServer.kt",
         "ShellExecSharedConstants.java",
         "ShellMain.java",
     ],
     idl_srcs = ["Command.aidl"],
     visibility = [":export"],
     deps = [
-        ":coroutine_file_observer",
-        ":file_observer_protocol",
         ":local_socket_protocol",
         ":local_socket_protocol_pb_java_proto_lite",
         "//services/speakeasy/java/androidx/test/services/speakeasy:protocol",
@@ -93,20 +67,16 @@ kt_android_library(
         "ClientNotConnected.java",
         "ShellCommand.java",
         "ShellCommandClient.java",
-        "ShellCommandFileObserverClient.kt",
         "ShellCommandLocalSocketClient.kt",
         "ShellExecSharedConstants.java",
         "ShellExecutor.java",
         "ShellExecutorFactory.java",
-        "ShellExecutorFileObserverImpl.kt",
         "ShellExecutorImpl.java",
         "ShellExecutorLocalSocketImpl.kt",
     ],
     idl_srcs = ["Command.aidl"],
     visibility = [":export"],
     deps = [
-        ":coroutine_file_observer",
-        ":file_observer_protocol",
         ":local_socket_protocol",
         ":local_socket_protocol_pb_java_proto_lite",
         "//services/speakeasy/java/androidx/test/services/speakeasy:protocol",

diff --git a/services/shellexecutor/java/androidx/test/services/shellexecutor/CoroutineFileObserver.kt b/services/shellexecutor/java/androidx/test/services/shellexecutor/CoroutineFileObserver.kt