Merge pull request #621 from sourcegraph/olafurpg/benchmarks

Get benchmarks running correctly

Author: olafurpg

semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbJavacOptions.java

@@ -5,8 +5,6 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.stream.Collectors;
 import javax.tools.FileObject;
 import javax.tools.JavaFileManager;
 import javax.tools.JavaFileObject;
@@ -31,8 +29,6 @@ public class SemanticdbJavacOptions {
   public NoRelativePathMode noRelativePath = NoRelativePathMode.INDEX_ANYWAY;
   public Path generatedTargetRoot;
 
-  public static String stubClassName = "META-INF-semanticdb-stub";
-
   public SemanticdbJavacOptions() {
     errors = new ArrayList<>();
   }
@@ -133,9 +129,11 @@ private static TargetPaths getJavacClassesDir(SemanticdbJavacOptions result, Con
     try {
       JavaFileManager fm = ctx.get(JavaFileManager.class);
       FileObject sourceOutputDirStub =
-          fm.getJavaFileForOutput(SOURCE_OUTPUT, stubClassName, JavaFileObject.Kind.SOURCE, null);
+          fm.getJavaFileForOutput(
+              SOURCE_OUTPUT, SemanticdbPlugin.stubClassName, JavaFileObject.Kind.SOURCE, null);
       FileObject clasSOutputDirStub =
-          fm.getJavaFileForOutput(CLASS_OUTPUT, stubClassName, JavaFileObject.Kind.CLASS, null);
+          fm.getJavaFileForOutput(
+              CLASS_OUTPUT, SemanticdbPlugin.stubClassName, JavaFileObject.Kind.CLASS, null);
       classOutputDir = Paths.get(clasSOutputDirStub.toUri()).toAbsolutePath().getParent();
       sourceOutputDir = Paths.get(sourceOutputDirStub.toUri()).toAbsolutePath().getParent();
     } catch (Exception e) {

semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/SemanticdbPlugin.java

@@ -9,6 +9,8 @@
 /** Entrypoint of the semanticdb-javac compiler plugin. */
 public class SemanticdbPlugin implements Plugin {
 
+  public static String stubClassName = "META-INF-semanticdb-stub";
+
   @Override
   public String getName() {
     return "semanticdb";

tests/unit/src/main/scala/tests/SimpleFileManager.java

@@ -9,10 +9,9 @@
 import javax.tools.JavaFileObject;
 import javax.tools.StandardJavaFileManager;
 
-import com.sourcegraph.semanticdb_javac.SemanticdbJavacOptions;
+import com.sourcegraph.semanticdb_javac.SemanticdbPlugin;
 
-public class SimpleFileManager
-    extends ForwardingJavaFileManager<StandardJavaFileManager> {
+public class SimpleFileManager extends ForwardingJavaFileManager<StandardJavaFileManager> {
 
   public final List<SimpleClassFile> compiled = new ArrayList<>();
   public final Path targetroot;
@@ -25,15 +24,13 @@ protected SimpleFileManager(StandardJavaFileManager fileManager, Path targetroot
   // standard constructors/getters
 
   @Override
-  public JavaFileObject getJavaFileForOutput(Location location,
-                                             String className, JavaFileObject.Kind kind, FileObject sibling) {
+  public JavaFileObject getJavaFileForOutput(
+      Location location, String className, JavaFileObject.Kind kind, FileObject sibling) {
     URI uri = targetroot.resolve(className).toUri();
     SimpleClassFile result = new SimpleClassFile(uri);
-    if (!className.equals(SemanticdbJavacOptions.stubClassName)) {
+    if (!className.equals(SemanticdbPlugin.stubClassName)) {
       compiled.add(result);
     }
     return result;
   }
-
 }
-