8193214: Incorrect annotations.without.processors warnings with JDK 9

Reviewed-by: vromero
This commit is contained in:
Joe Darcy 2018-07-18 00:16:37 -07:00
parent a6ff367b24
commit 19c364592c
3 changed files with 93 additions and 9 deletions

View file

@ -243,15 +243,20 @@ public class JavacProcessingEnvironment implements ProcessingEnvironment, Closea
}
private Set<String> initPlatformAnnotations() {
Set<String> platformAnnotations = new HashSet<>();
platformAnnotations.add("java.lang.Deprecated");
platformAnnotations.add("java.lang.Override");
platformAnnotations.add("java.lang.SuppressWarnings");
platformAnnotations.add("java.lang.annotation.Documented");
platformAnnotations.add("java.lang.annotation.Inherited");
platformAnnotations.add("java.lang.annotation.Retention");
platformAnnotations.add("java.lang.annotation.Target");
return Collections.unmodifiableSet(platformAnnotations);
final String module_prefix =
Feature.MODULES.allowedInSource(source) ? "java.base/" : "";
return Set.of(module_prefix + "java.lang.Deprecated",
module_prefix + "java.lang.FunctionalInterface",
module_prefix + "java.lang.Override",
module_prefix + "java.lang.SafeVarargs",
module_prefix + "java.lang.SuppressWarnings",
module_prefix + "java.lang.annotation.Documented",
module_prefix + "java.lang.annotation.Inherited",
module_prefix + "java.lang.annotation.Native",
module_prefix + "java.lang.annotation.Repeatable",
module_prefix + "java.lang.annotation.Retention",
module_prefix + "java.lang.annotation.Target");
}
private void initProcessorLoader() {

View file

@ -0,0 +1,79 @@
/*
* Copyright (c) 2018, 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 8193214
* @summary Verify annotations without processors warning not given for base module annotations.
* @library /tools/javac/lib
* @modules java.compiler
* @build JavacTestingAbstractProcessor TestAnnotationsWithoutProcessors
* @compile/ref=empty.out -XDrawDiagnostics -Xlint:processing -processor TestAnnotationsWithoutProcessors --release 8 TestAnnotationsWithoutProcessors.java
* @compile/ref=empty.out -XDrawDiagnostics -Xlint:processing -processor TestAnnotationsWithoutProcessors TestAnnotationsWithoutProcessors.java
*/
import java.lang.annotation.*;
import java.util.*;
import javax.annotation.processing.*;
import javax.lang.model.element.*;
/**
* Use various annotations in java.base.
*/
@SuppressWarnings("unchecked")
public class TestAnnotationsWithoutProcessors extends JavacTestingAbstractProcessor {
@Override
public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
return false;
}
@SafeVarargs
@Deprecated
public static void main(String... args) {
return;
}
@FunctionalInterface
interface OneMethod {
String method();
}
@Native
public double TAU = 2.0 * Math.PI;
@Documented
@Inherited
@Repeatable(TestAnnotationTypes.class)
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.TYPE)
@interface TestAnnotationType {
}
@Documented
@Inherited
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.TYPE)
@interface TestAnnotationTypes {
TestAnnotationType[] value();
}
}