More fixes after rebasing

Author: Bencodes

src/main/kotlin/io/bazel/worker/BUILD.bazel

@@ -1,13 +1,25 @@
-# General purpose Bazel worker implemented Kotlin. Best suited for jvm based tools.
+load("@com_google_protobuf//bazel:java_proto_library.bzl", "java_proto_library")
 load("//src/main/kotlin:bootstrap.bzl", "kt_bootstrap_library")
 
+java_proto_library(
+    name = "worker_protocol_java_proto",
+    deps = ["@bazel_worker_api//:worker_protocol_proto"],
+)
+
 kt_bootstrap_library(
     name = "worker",
     srcs = glob(["*.kt"]),
     visibility = [
         "//:__subpackages__",
     ],
     deps = [
+        ":worker_protocol_java_proto",
         "@bazel_worker_java//src/main/java/com/google/devtools/build/lib/worker:work_request_handlers",
+        "@kotlin_rules_maven//:com_google_auto_value_auto_value",
+        "@kotlin_rules_maven//:com_google_code_findbugs_jsr305",
+        "@kotlin_rules_maven//:com_google_errorprone_error_prone_annotations",
+        "@kotlin_rules_maven//:com_google_guava_guava",
+        "@kotlin_rules_maven//:com_google_protobuf_protobuf_java",
+        "@kotlin_rules_maven//:com_google_protobuf_protobuf_java_util",
     ],
 )

src/main/kotlin/io/bazel/worker/PersistentWorker.kt

@@ -18,9 +18,8 @@
 package io.bazel.worker
 
 import com.google.devtools.build.lib.worker.ProtoWorkerMessageProcessor
-import com.google.devtools.build.lib.worker.WorkRequestHandler.WorkRequestCallback
-import com.google.devtools.build.lib.worker.WorkRequestHandler.WorkRequestHandlerBuilder
-import com.google.devtools.build.lib.worker.WorkerProtocol.WorkRequest
+import com.google.devtools.build.lib.worker.WorkRequestHandler
+import com.google.devtools.build.lib.worker.WorkerProtocol
 import java.io.IOException
 import java.io.PrintWriter
 import java.time.Duration
@@ -36,17 +35,16 @@ class PersistentWorker : Worker {
     return WorkerContext.run {
       val realStdErr = System.err
       try {
-        val workerHandler =
-          WorkRequestHandlerBuilder(
-            WorkRequestCallback { request: WorkRequest, pw: PrintWriter ->
-              return@WorkRequestCallback doTask(
-                name = "request ${request.requestId}",
-                task = request.workTo(execute),
-              ).asResponse(pw)
-            },
-            realStdErr,
-            ProtoWorkerMessageProcessor(System.`in`, System.out),
-          ).setCpuUsageBeforeGc(Duration.ofSeconds(10)).build()
+        val workerHandler: WorkRequestHandler = WorkRequestHandler.WorkRequestHandlerBuilder(
+          WorkRequestHandler.WorkRequestCallback { request: WorkerProtocol.WorkRequest, pw: PrintWriter ->
+            return@WorkRequestCallback doTask(
+              name = "request ${request.requestId}",
+              task = request.workTo(execute),
+            ).asResponse(pw)
+          },
+          realStdErr,
+          ProtoWorkerMessageProcessor(System.`in`, System.out),
+        ).setCpuUsageBeforeGc(Duration.ofSeconds(10)).build()
         workerHandler.processRequests()
       } catch (e: IOException) {
         this.error(e, { "Unknown IO exception" })
@@ -57,8 +55,11 @@ class PersistentWorker : Worker {
     }
   }
 
-  private fun WorkRequest.workTo(execute: Work): (sub: WorkerContext.TaskContext) -> Status =
-    { ctx -> execute(ctx, argumentsList.toList()) }
+  private fun WorkerProtocol.WorkRequest.workTo(execute: Work): (sub: WorkerContext.TaskContext) -> Status {
+    return { ctx ->
+      execute(ctx, argumentsList.toList())
+    }
+  }
 
   private fun TaskResult.asResponse(pw: PrintWriter): Int {
     pw.print(log.out.toString())