Refactor

Author: agluszak

bsp-testkit/client/bazel/BUILD

@@ -4,8 +4,4 @@ kt_jvm_library(
     name = "bazel",
     srcs = glob(["*.kt"]),
     visibility = ["//visibility:public"],
-    deps = [
-        "@maven//:ch_epfl_scala_bsp4j",
-        "//bsp-testkit/client"
-    ],
 )

…-testkit/client/bazel/BazelTestClient.kt …kit/client/bazel/BazelJsonTransformer.ktbsp-testkit/client/bazel/BazelTestClient.kt renamed to bsp-testkit/client/bazel/BazelJsonTransformer.kt bsp-testkit/client/bazel/BazelTestClient.kt renamed to bsp-testkit/client/bazel/BazelJsonTransformer.kt

@@ -1,31 +1,21 @@
 package org.jetbrains.bsp.testkit.client.bazel
 
-import ch.epfl.scala.bsp4j.BuildClient
-import ch.epfl.scala.bsp4j.BuildServer
-import ch.epfl.scala.bsp4j.InitializeBuildParams
-import org.jetbrains.bsp.testkit.client.BasicTestClient
 import java.nio.file.Path
 import java.util.Locale
 
-class BazelTestClient<Server : BuildServer, Client : BuildClient>(
-  workspacePath: Path,
-  initializeParams: InitializeBuildParams,
+class BazelJsonTransformer(
+  private val workspacePath: Path,
   private val bazelCache: Path,
   private val bazelOutputBase: Path,
-  client: Client,
-  serverClass: Class<Server>
-) : BasicTestClient<Server, Client>(
-  workspacePath,
-  initializeParams,
-  { s: String ->
-    s.replace("\$WORKSPACE", workspacePath.toString())
+) {
+  fun transformJson(s: String): String {
+    return s
+      .replace("\$WORKSPACE", workspacePath.toString())
       .replace("\$BAZEL_CACHE", bazelCache.toString())
       .replace("\$BAZEL_OUTPUT_BASE_PATH", bazelOutputBase.toString())
       .replace("\$OS", osFamily)
-  },
-  client = client,
-  serverClass = serverClass
-) {
+  }
+
   companion object {
     private val osFamily: String = System.getProperty("os.name").lowercase(Locale.getDefault()).let { osName ->
       when {