Separating interface implementations and general dependency structure…

… refactor (#24)

* Extracted ScalaBuildServer implementation

* Extracted JavaBuildServer implementation, both classes now implement proper interfaces

* Extracted BuildServer endpoints, very tentatively (previous problems with it)

* Extracted BuildServer implementation more properly

* Tidied up initialized/finished methods + other smaller

* Extracted several things to ParsingUtils and Constants

* Extracted BazelBspServerLifetime and BazelBspRequestHelpers, Java- and ScalaBuildServer classes now not dependent on BazelBspServer

* Added server config, Bazel runner and Bazel data dependencies to the server implementation

* Adjusted BazelData dependencies

* Extracted ServerBuildManager

* Hotfix of the cyclical dependency, to improve iteratively

* Moved part of the BSP integration in Server to the BazelBspServer constructor

* Added further parts to the constructor integration

* Removed cyclical dependency between BuildManager and BuildServerImpl

* Started removing cyclical dependency between BazelBspServer and BepServer: BazelData passed in the constructor

* Resolved cyclical dependency between BuildManager and BepServer

* Cleaned up in BazelBspServer

* Simplified the constructor, moved away logic

* General cleanup

* Extracted suppliers from interface methods in BuildServerImpl

* Added build server implementations as fields

* Prepared for interface and service separation

* Separated BuildServer logic from interface implementation

* Separated logic from interface implementation for Scala and Java BuildServers

* Extracted BEP package

* Created new packages and grouped the files + small style improvements

* Minor style corrections

* Renamed Server.java, imported io.grpc.Server

* Corrections after review

* Naming and packaging changes

* Formatting fix

* Formatting fix

src/main/java/org/jetbrains/bsp/bazel/common/BUILD

@@ -5,7 +5,6 @@ java_library(
     srcs = glob(["*.java"]),
     visibility = ["//visibility:public"],
     deps = [
-        "@io_bazel//src/main/protobuf:analysis_java_proto",
         "@maven//:com_google_guava_guava",
     ],
 )

src/main/java/org/jetbrains/bsp/bazel/common/Constants.java

@@ -4,6 +4,7 @@
 import java.util.List;
 
 public class Constants {
+
   public static final String NAME = "bazelbsp";
   public static final String VERSION = "0.0.0";
   public static final String BSP_VERSION = "2.0.0";
@@ -19,11 +20,34 @@ public class Constants {
   public static final List<String> SUPPORTED_LANGUAGES = ImmutableList.of(SCALA, JAVA, KOTLIN);
   public static final List<String> SUPPORTED_COMPILERS = ImmutableList.of(SCALAC, JAVAC, KOTLINC);
 
+  public static final String SCALA_EXTENSION = ".scala";
+  public static final String JAVA_EXTENSION = ".java";
+  public static final String KOTLIN_EXTENSION = ".kt";
+
+  public static final List<String> FILE_EXTENSIONS =
+      ImmutableList.of(
+          SCALA_EXTENSION,
+          JAVA_EXTENSION,
+          KOTLIN_EXTENSION,
+          ".kts",
+          ".sh",
+          ".bzl",
+          ".py",
+          ".js",
+          ".c",
+          ".h",
+          ".cpp",
+          ".hpp");
+
   public static final String BAZEL_BUILD_COMMAND = "build";
   public static final String BAZEL_RUN_COMMAND = "run";
   public static final String BAZEL_TEST_COMMAND = "test";
   public static final String BAZEL_CLEAN_COMMAND = "clean";
 
+  public static final String BINARY_RULE_TYPE = "binary";
+  public static final String LIBRARY_RULE_TYPE = "library";
+  public static final String TEST_RULE_TYPE = "test";
+
   public static final String BUILD_FILE_NAME = "BUILD";
   public static final String WORKSPACE_FILE_NAME = "WORKSPACE";
   public static final String ASPECTS_FILE_NAME = "aspects.bzl";
@@ -33,6 +57,8 @@ public class Constants {
   public static final String BAZELBSP_LOG_FILE_NAME = "bazelbsp.log";
   public static final String BAZELBSP_TRACE_JSON_FILE_NAME = "bazelbsp.trace.json";
 
+  public static final List<String> KNOWN_SOURCE_ROOTS =
+      ImmutableList.of("java", "scala", "kotlin", "javatests", "src", "test", "main", "testsrc");
   public static final String DIAGNOSTICS = "diagnostics";
   public static final String EXEC_ROOT_PREFIX = "exec-root://";
   public static final String SCALA_COMPILER_CLASSPATH_FILES = "scala_compiler_classpath_files";

src/main/java/org/jetbrains/bsp/bazel/common/Uri.java

@@ -7,6 +7,7 @@
 import java.util.List;
 
 public class Uri implements Comparable<Uri> {
+
   private static final String ENC = StandardCharsets.UTF_8.toString();
   private final URI uri;
 

src/main/java/org/jetbrains/bsp/bazel/install/Install.java

@@ -25,8 +25,9 @@
 import org.jetbrains.bsp.bazel.common.Constants;
 
 public class Install {
+
   public static final String INSTALLER_BINARY_NAME = "bazelbsp-install";
-  public static final String SERVER_CLASS_NAME = "org.jetbrains.bsp.bazel.server.Server";
+  public static final String SERVER_CLASS_NAME = "org.jetbrains.bsp.bazel.server.ServerInitializer";
 
   private static final String DEBUGGER_SHORT_OPT = "x";
   private static final String JAVA_SHORT_OPT = "j";

src/main/java/org/jetbrains/bsp/bazel/server/BUILD

@@ -6,20 +6,16 @@ java_library(
     visibility = ["//visibility:public"],
     deps = [
         "//src/main/java/org/jetbrains/bsp/bazel/common",
+        "//src/main/java/org/jetbrains/bsp/bazel/server/bep",
+        "//src/main/java/org/jetbrains/bsp/bazel/server/bsp",
         "//src/main/java/org/jetbrains/bsp/bazel/server/data",
+        "//src/main/java/org/jetbrains/bsp/bazel/server/impl",
         "//src/main/java/org/jetbrains/bsp/bazel/server/logger",
-        "//src/main/java/org/jetbrains/bsp/bazel/server/resolvers",
-        "//src/main/java/org/jetbrains/bsp/bazel/server/utils",
-        "@com_google_protobuf//:protobuf_java",
-        "@googleapis//:google_devtools_build_v1_build_events_java_proto",
-        "@googleapis//:google_devtools_build_v1_publish_build_event_java_grpc",
-        "@googleapis//:google_devtools_build_v1_publish_build_event_java_proto",
-        "@googleapis//:google_devtools_build_v1_publish_build_event_proto",
-        "@io_bazel//src/main/java/com/google/devtools/build/lib/buildeventstream/proto:build_event_stream_java_proto",
-        "@io_bazel//src/main/protobuf:analysis_java_proto",
+        "//src/main/java/org/jetbrains/bsp/bazel/server/resolver",
+        "//src/main/java/org/jetbrains/bsp/bazel/server/service",
+        "//src/main/java/org/jetbrains/bsp/bazel/server/util",
         "@io_bazel//src/main/protobuf:build_java_proto",
         "@io_bazel//third_party/grpc:grpc-jar",
-        "@io_bazel_rules_scala//src/protobuf/io/bazel/rules_scala:diagnostics_java_proto",
         "@maven//:ch_epfl_scala_bsp4j",
         "@maven//:com_google_code_gson_gson",
         "@maven//:com_google_guava_guava",
@@ -32,7 +28,7 @@ java_library(
 
 java_binary(
     name = "bsp-run",
-    main_class = "org.jetbrains.bsp.bazel.server.Server",
+    main_class = "org.jetbrains.bsp.bazel.server.ServerInitializer",
     visibility = ["//visibility:public"],
     runtime_deps = ["//src/main/java/org/jetbrains/bsp/bazel/server"],
 )