6929404: Filer.getResource(SOURCE_PATH, ...) does not work when -sourcepath contains >1 entry

Reviewed-by: darcy

langtools/src/share/classes/com/sun/tools/javac/processing/JavacFiler.java

@@ -34,6 +34,7 @@ import javax.lang.model.element.Element;
 import java.util.*;
 
 import java.io.Closeable;
+import java.io.FileNotFoundException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.FilterOutputStream;
@@ -450,10 +451,15 @@ public class JavacFiler implements Filer, Closeable {
         // TODO: Only support reading resources in selected output
         // locations?  Only allow reading of non-source, non-class
         // files from the supported input locations?
-        FileObject fileObject = fileManager.getFileForOutput(location,
-                                                             pkg.toString(),
-                                                             relativeName.toString(),
-                                                             null);
+        FileObject fileObject = fileManager.getFileForInput(location,
+                    pkg.toString(),
+                    relativeName.toString());
+        if (fileObject == null) {
+            String name = (pkg.length() == 0)
+                    ? relativeName.toString() : (pkg + "/" + relativeName);
+            throw new FileNotFoundException(name);
+        }
+
         // If the path was already opened for writing, throw an exception.
         checkFileReopening(fileObject, false);
         return new FilerInputFileObject(fileObject);

langtools/test/tools/javac/processing/filer/TestGetResource2.java

+/*
+ * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ * @bug 6929404
+ * @summary Filer.getResource(SOURCE_PATH, ...) does not work when -sourcepath contains >1 entry
+ */
+
+import java.io.*;
+import java.security.*;
+import java.util.*;
+import javax.annotation.processing.*;
+import javax.lang.model.*;
+import javax.lang.model.element.*;
+import javax.tools.*;
+import javax.tools.Diagnostic.Kind;
+import javax.tools.JavaCompiler.CompilationTask;
+
+public class TestGetResource2 {
+
+    public static void main(String[] args) throws Exception {
+        new TestGetResource2().run();
+    }
+
+    void run() throws Exception {
+        JavaCompiler javac = ToolProvider.getSystemJavaCompiler();
+        CodeSource cs = javac.getClass().getProtectionDomain().getCodeSource();
+        if (cs == null) {
+            System.err.println("got compiler from " +
+                ClassLoader.getSystemResource(javac.getClass().getName().replace(".", "/")+".class"));
+        } else {
+            System.err.println("got compiler from " + cs.getLocation());
+        }
+
+        testSingleSourceDir(javac);
+        testCompositeSourcePath(javac);
+        testMissingResource(javac);
+    }
+
+    private void testSingleSourceDir(JavaCompiler javac) throws Exception {
+        System.err.println("testSingleSourceDir");
+        File tmpdir = new File("testSingleSourceDir");
+        File srcdir = new File(tmpdir, "src");
+        File destdir = new File(tmpdir, "dest");
+        write(srcdir, "pkg/X.java", "package pkg; class X {}");
+        write(srcdir, "resources/file.txt", "hello");
+        destdir.mkdirs();
+
+        CompilationTask task = javac.getTask(null, null, null,
+                Arrays.asList("-sourcepath", srcdir.toString(), "-d", destdir.toString()),
+                Collections.singleton("pkg.X"), null);
+        task.setProcessors(Collections.singleton(new AnnoProc()));
+        boolean result = task.call();
+        System.err.println("javac result with single source dir: " + result);
+        expect(result, true);
+    }
+
+    private void testCompositeSourcePath(JavaCompiler javac) throws Exception {
+        System.err.println("testCompositeSearchPath");
+        File tmpdir = new File("testCompositeSourcePath");
+        File srcdir = new File(tmpdir, "src");
+        File rsrcdir = new File(tmpdir, "rsrc");
+        File destdir = new File(tmpdir, "dest");
+        write(srcdir, "pkg/X.java", "package pkg; class X {}");
+        write(rsrcdir, "resources/file.txt", "hello");
+        destdir.mkdirs();
+
+        CompilationTask task = javac.getTask(null, null, null,
+                Arrays.asList("-sourcepath", srcdir + File.pathSeparator + rsrcdir, "-d", destdir.toString()),
+                Collections.singleton("pkg.X"), null);
+        task.setProcessors(Collections.singleton(new AnnoProc()));
+        boolean result = task.call();
+        System.err.println("javac result with composite source path: " + result);
+        expect(result, true);
+    }
+
+    private void testMissingResource(JavaCompiler javac) throws Exception {
+        System.err.println("testMissingResource");
+        File tmpdir = new File("testMissingResource");
+        File srcdir = new File(tmpdir, "src");
+        File destdir = new File(tmpdir, "dest");
+        write(srcdir, "pkg/X.java", "package pkg; class X {}");
+        destdir.mkdirs();
+
+        CompilationTask task = javac.getTask(null, null, null,
+                Arrays.asList("-sourcepath", srcdir.toString(), "-d", destdir.toString()),
+                Collections.singleton("pkg.X"), null);
+        task.setProcessors(Collections.singleton(new AnnoProc()));
+        boolean result = task.call();
+        System.err.println("javac result when missing resource: " + result);
+        expect(result, false);
+
+        if (errors > 0)
+            throw new Exception(errors + " errors occurred");
+    }
+
+    @SupportedAnnotationTypes("*")
+    static class AnnoProc extends AbstractProcessor {
+
+        public @Override boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
+            if (roundEnv.processingOver()) {
+                return false;
+            }
+
+            try {
+                FileObject resource = processingEnv.getFiler().getResource(StandardLocation.SOURCE_PATH, "resources", "file.txt");
+                try {
+                    resource.openInputStream().close();
+                    processingEnv.getMessager().printMessage(Kind.NOTE, "found: " + resource.toUri());
+                    return true;
+                } catch (IOException x) {
+                    processingEnv.getMessager().printMessage(Kind.ERROR, "could not read: " + resource.toUri());
+                    x.printStackTrace();
+                }
+            } catch (IOException x) {
+                processingEnv.getMessager().printMessage(Kind.ERROR, "did not find resource");
+                x.printStackTrace();
+            }
+
+            return false;
+        }
+
+        @Override
+        public SourceVersion getSupportedSourceVersion() {
+            return SourceVersion.latest();
+        }
+    }
+
+    private File write(File dir, String path, String contents) throws IOException {
+        File f = new File(dir, path);
+        f.getParentFile().mkdirs();
+        Writer w = new FileWriter(f);
+        try {
+            w.write(contents);
+        } finally {
+            w.close();
+        }
+        return f;
+    }
+
+    void expect(boolean val, boolean expect) {
+        if (val != expect)
+            error("Unexpected value: " + val + "; expected: " + expect);
+    }
+
+    void error(String msg) {
+        System.err.println(msg);
+        errors++;
+    }
+
+    int errors = 0;
+}