Fix file object URIs in ZipOutputFileManager

Avoids spurious diagnostics about annotation processor generated class names not matching the file path.

--
MOS_MIGRATED_REVID=118488628

2 files changed, 6 insertions, 6 deletions

diff --git a/src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/javac/ZipOutputFileManager.java b/src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/javac/ZipOutputFileManager.java
index bda9dad10a..cb197a487b 100644
--- a/src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/javac/ZipOutputFileManager.java
+++ b/src/java_tools/buildjar/java/com/google/devtools/build/java/turbine/javac/ZipOutputFileManager.java
@@ -119,7 +119,7 @@ public class ZipOutputFileManager extends JavacFileManager {
     private final ByteArrayOutputStream buffer = new ByteArrayOutputStream();
 
     public OutputFileObject(String name, Kind kind, Location location) {
-      super(URI.create("outputbuffer://" + name), kind);
+      super(URI.create("outputbuffer:/" + name), kind);
       this.location = location;
     }
 
diff --git a/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/JavacTurbineTest.java b/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/JavacTurbineTest.java
index b4c7b32b35..d5fe382b32 100644
--- a/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/JavacTurbineTest.java
+++ b/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/JavacTurbineTest.java
@@ -231,7 +231,7 @@ public class JavacTurbineTest {
       try {
         JavaFileObject sourceFile = processingEnv.getFiler().createSourceFile("Generated", element);
         try (OutputStream os = sourceFile.openOutputStream()) {
-          os.write("class Generated {}".getBytes(StandardCharsets.UTF_8));
+          os.write("public class Generated {}".getBytes(StandardCharsets.UTF_8));
         }
       } catch (IOException e) {
         throw new IOError(e);
@@ -280,12 +280,12 @@ public class JavacTurbineTest {
       String text = textify(outputs.get("Generated.class"));
       String[] expected = {
         "// class version 51.0 (51)",
-        "// access flags 0x20",
-        "class Generated {",
+        "// access flags 0x21",
+        "public class Generated {",
         "",
         "",
-        "  // access flags 0x0",
-        "  <init>()V",
+        "  // access flags 0x1",
+        "  public <init>()V",
         "}",
         ""
       };