stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

7068437: Regression: Filer.getResource(SOURCE_OUTPUT, ...) no longer works in JDK 7 w/o -s

Browse Source 
Reviewed-by: darcy
This commit is contained in:
Jonathan Gibbons 2011-09-14 18:26:57 -07:00
parent afaeb37bb5
commit 4589920917
2 changed files with 153 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2011, 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
@ -455,9 +455,24 @@ 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.getFileForInput(location,
// In the following, getFileForInput is the "obvious" method
// to use, but it does not have the "obvious" semantics for
// SOURCE_OUTPUT and CLASS_OUTPUT. Conversely, getFileForOutput
// does not have the correct semantics for any "path" location
// with more than one component. So, for now, we use a hybrid
// invocation.
FileObject fileObject;
if (location.isOutputLocation()) {
fileObject = fileManager.getFileForOutput(location,
pkg.toString(),
relativeName.toString(),
null);
} else {
fileObject = fileManager.getFileForInput(location,
pkg.toString(),
relativeName.toString());
}
if (fileObject == null) {
String name = (pkg.length() == 0)
? relativeName.toString() : (pkg + "/" + relativeName);

136
langtools/test/tools/javac/file/T7068437.java Normal file
View File

@ -0,0 +1,136 @@
/*
* Copyright (c) 2011, 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 7068437
* @summary Filer.getResource(SOURCE_OUTPUT, ...) no longer works in JDK 7 w/o -s
*/
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.Writer;
import java.util.Arrays;
import java.util.Collections;
import java.util.Map;
import java.util.Set;
import javax.annotation.processing.AbstractProcessor;
import javax.annotation.processing.Filer;
import javax.annotation.processing.Messager;
import javax.annotation.processing.RoundEnvironment;
import javax.annotation.processing.SupportedAnnotationTypes;
import javax.annotation.processing.SupportedOptions;
import javax.annotation.processing.SupportedSourceVersion;
import javax.lang.model.SourceVersion;
import javax.lang.model.element.TypeElement;
import javax.tools.Diagnostic.Kind;
import javax.tools.JavaCompiler;
import javax.tools.JavaCompiler.CompilationTask;
import javax.tools.StandardLocation;
import javax.tools.ToolProvider;
public class T7068437 {
public static void main(String[] args) throws Exception {
new T7068437().run();
}
void run() throws Exception {
JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
System.err.println("using " + compiler.getClass()
+ " from " + compiler.getClass().getProtectionDomain().getCodeSource());
CompilationTask task = compiler.getTask(null, null, null,
Collections.singleton("-proc:only"),
Collections.singleton("java.lang.Object"),
null);
task.setProcessors(Collections.singleton(new Proc()));
check("compilation", task.call());
task = compiler.getTask(null, null, null,
Arrays.asList("-proc:only", "-AexpectFile"),
Collections.singleton("java.lang.Object"),
null);
task.setProcessors(Collections.singleton(new Proc()));
check("compilation", task.call());
}
void check(String msg, boolean ok) {
System.err.println(msg + ": " + (ok ? "ok" : "failed"));
if (!ok)
throw new AssertionError(msg);
}
@SupportedAnnotationTypes("*")
@SupportedOptions("expectFile")
private static class Proc extends AbstractProcessor {
int count;
@Override
public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
if (roundEnv.processingOver() || count++ > 0) {
return false;
}
Filer filer = processingEnv.getFiler();
Messager messager = processingEnv.getMessager();
Map<String, String> options = processingEnv.getOptions();
System.err.println(options);
boolean expectFile = options.containsKey("expectFile");
System.err.println("running Proc: expectFile=" + expectFile);
boolean found;
try {
messager.printMessage(Kind.NOTE, "found previous content of length " +
filer.getResource(StandardLocation.SOURCE_OUTPUT, "p", "C.java").getCharContent(false).length());
found = true;
} catch (FileNotFoundException x) {
messager.printMessage(Kind.NOTE, "not previously there");
found = false;
} catch (IOException x) {
messager.printMessage(Kind.ERROR, "while reading: " + x);
found = false;
}
if (expectFile && !found) {
messager.printMessage(Kind.ERROR, "expected file but file not found");
}
try {
Writer w = filer.createSourceFile("p.C").openWriter();
w.write("/* hello! */ package p; class C {}");
w.close();
messager.printMessage(Kind.NOTE, "wrote new content");
} catch (IOException x) {
messager.printMessage(Kind.ERROR, "while writing: " + x);
}
return true;
}
@Override
public SourceVersion getSupportedSourceVersion() {
return SourceVersion.latest();
}
}
}