提交 85138986 编写于 作者: S sgroeger

8218152: [javac] fails and exits with no error if a bad annotation processor provided

Summary: Handle exceptions thrown while loading annotation processors.
Reviewed-by: jlahoda, andrew
上级 8ccabded
/* /*
* Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -350,6 +350,7 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea ...@@ -350,6 +350,7 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea
log.error("proc.bad.config.file", sce.getLocalizedMessage()); log.error("proc.bad.config.file", sce.getLocalizedMessage());
throw new Abort(sce); throw new Abort(sce);
} catch (Throwable t) { } catch (Throwable t) {
log.error("proc.bad.config.file", t.getLocalizedMessage());
throw new Abort(t); throw new Abort(t);
} }
} }
...@@ -360,7 +361,14 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea ...@@ -360,7 +361,14 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea
} catch (ServiceConfigurationError sce) { } catch (ServiceConfigurationError sce) {
log.error("proc.bad.config.file", sce.getLocalizedMessage()); log.error("proc.bad.config.file", sce.getLocalizedMessage());
throw new Abort(sce); throw new Abort(sce);
} catch (UnsupportedClassVersionError ucve) {
log.error("proc.cant.load.class", ucve.getLocalizedMessage());
throw new Abort(ucve);
} catch (ClassFormatError cfe) {
log.error("proc.cant.load.class", cfe.getLocalizedMessage());
throw new Abort(cfe);
} catch (Throwable t) { } catch (Throwable t) {
log.error("proc.bad.config.file", t.getLocalizedMessage());
throw new Abort(t); throw new Abort(t);
} }
} }
......
# #
# Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
...@@ -869,6 +869,9 @@ compiler.err.proc.service.problem=\ ...@@ -869,6 +869,9 @@ compiler.err.proc.service.problem=\
compiler.err.proc.bad.config.file=\ compiler.err.proc.bad.config.file=\
Bad service configuration file, or exception thrown while constructing Processor object: {0} Bad service configuration file, or exception thrown while constructing Processor object: {0}
compiler.err.proc.cant.load.class=\
Could not load processor class file due to ''{0}''.
compiler.err.proc.cant.create.loader=\ compiler.err.proc.cant.create.loader=\
Could not create class loader for annotation processors: {0} Could not create class loader for annotation processors: {0}
......
/*
* Copyright (c) 2019, 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 8218152
* @summary A bad annotation processor class file should fail with an error
* @author Steven Groeger
*
* @library /tools/javac/lib
* @build ToolBox
* @run main MalformedAnnotationProcessorTests
*/
import java.io.*;
import java.util.*;
import java.io.RandomAccessFile;
import java.nio.ByteBuffer;
import java.nio.channels.FileChannel;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.List;
import javax.annotation.processing.Processor;
public class MalformedAnnotationProcessorTests {
public static void main(String... args) throws Exception {
new MalformedAnnotationProcessorTests().run();
}
void run() throws Exception {
testBadAnnotationProcessor(Paths.get("."));
testMissingAnnotationProcessor(Paths.get("."));
testWrongClassFileVersion(Paths.get("."));
}
public void testBadAnnotationProcessor(Path base) throws Exception {
Path apDir = base.resolve("annoprocessor");
ToolBox.writeFile(apDir.resolve("META-INF").resolve("services")
.resolve(Processor.class.getCanonicalName()), "BadAnnoProcessor");
ToolBox.writeFile(apDir.resolve("BadAnnoProcessor.class"), "badannoprocessor");
Path classes = base.resolve("classes");
Files.createDirectories(classes);
List<String> actualErrors = new ArrayList<>();
ToolBox.JavaToolArgs args = new ToolBox.JavaToolArgs();
args.setSources("package test; public class Test {}")
.appendArgs("-XDrawDiagnostics",
"-d", classes.toString(),
"-classpath", "",
"-processorpath", apDir.toString())
.set(ToolBox.Expect.FAIL)
.setErrOutput(actualErrors);
ToolBox.javac(args);
System.out.println(actualErrors.get(0));
if (!actualErrors.get(0).contains("- compiler.err.proc.cant.load.class: " +
"Incompatible magic value")) {
throw new AssertionError("Unexpected errors reported: " + actualErrors);
}
}
public void testMissingAnnotationProcessor(Path base) throws Exception {
Path apDir = base.resolve("annoprocessor");
ToolBox.writeFile(apDir.resolve("META-INF").resolve("services").resolve(Processor.class.getCanonicalName()),
"MissingAnnoProcessor");
Path classes = base.resolve("classes");
Files.createDirectories(classes);
List<String> actualErrors = new ArrayList<>();
ToolBox.JavaToolArgs args = new ToolBox.JavaToolArgs();
args.setSources("package test; public class Test {}")
.appendArgs("-XDrawDiagnostics",
"-d", classes.toString(),
"-classpath", "",
"-processorpath", apDir.toString())
.set(ToolBox.Expect.FAIL)
.setErrOutput(actualErrors);
ToolBox.javac(args);
if (!actualErrors.get(0).contains("- compiler.err.proc.bad.config.file: " +
"javax.annotation.processing.Processor: Provider MissingAnnoProcessor not found")) {
throw new AssertionError("Unexpected errors reported: " + actualErrors);
}
}
public void testWrongClassFileVersion(Path base) throws Exception {
Path apDir = base.resolve("annoprocessor");
ToolBox.writeFile(apDir.resolve("META-INF").resolve("services").resolve(Processor.class.getCanonicalName()),
"WrongClassFileVersion");
ToolBox.JavaToolArgs args = new ToolBox.JavaToolArgs();
args.setSources("class WrongClassFileVersion {}")
.appendArgs("-d", apDir.toString())
.set(ToolBox.Expect.SUCCESS);
ToolBox.javac(args);
increaseMajor(apDir.resolve("WrongClassFileVersion.class"), 1);
Path classes = base.resolve("classes");
Files.createDirectories(classes);
List<String> actualErrors = new ArrayList<>();
args = new ToolBox.JavaToolArgs();
args.setSources("package test; public class Test {}")
.appendArgs("-XDrawDiagnostics",
"-d", classes.toString(),
"-classpath", "",
"-processorpath", apDir.toString())
.set(ToolBox.Expect.FAIL)
.setErrOutput(actualErrors);
ToolBox.javac(args);
if (!actualErrors.get(0).contains("- compiler.err.proc.cant.load.class: " +
"WrongClassFileVersion has been compiled by a more recent version")) {
throw new AssertionError("Unexpected errors reported: " + actualErrors);
}
}
// Increase class file cfile's major version by delta
// (note: based on test/langtools/tools/javac/6330997/T6330997.java)
static void increaseMajor(Path cfile, int delta) {
try (RandomAccessFile cls =
new RandomAccessFile(cfile.toFile(), "rw");
FileChannel fc = cls.getChannel()) {
ByteBuffer rbuf = ByteBuffer.allocate(2);
fc.read(rbuf, 6);
ByteBuffer wbuf = ByteBuffer.allocate(2);
wbuf.putShort(0, (short)(rbuf.getShort(0) + delta));
fc.write(wbuf, 6);
fc.force(false);
} catch (Exception e){
throw new RuntimeException("Failed: unexpected exception");
}
}
}
...@@ -32,6 +32,7 @@ compiler.err.proc.cant.create.loader # security exception fro ...@@ -32,6 +32,7 @@ compiler.err.proc.cant.create.loader # security exception fro
compiler.err.proc.no.service # JavacProcessingEnvironment: no service loader available compiler.err.proc.no.service # JavacProcessingEnvironment: no service loader available
compiler.err.proc.processor.bad.option.name # cannot happen? masked by javac.err.invalid.A.key compiler.err.proc.processor.bad.option.name # cannot happen? masked by javac.err.invalid.A.key
compiler.err.proc.service.problem # JavacProcessingEnvironment: catch Throwable from service loader compiler.err.proc.service.problem # JavacProcessingEnvironment: catch Throwable from service loader
compiler.err.proc.cant.load.class # JavacProcessingEnvironment: cant load the class/jar file
compiler.err.signature.doesnt.match.intf # UNUSED compiler.err.signature.doesnt.match.intf # UNUSED
compiler.err.signature.doesnt.match.supertype # UNUSED compiler.err.signature.doesnt.match.supertype # UNUSED
compiler.err.source.cant.overwrite.input.file compiler.err.source.cant.overwrite.input.file
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册