diff --git a/src/share/classes/java/lang/Class.java b/src/share/classes/java/lang/Class.java index 671d04a65c7278e45556a53009e60f63df7ad792..441f25a8a2c14e7ac10eba4490a37d4221dfeb92 100644 --- a/src/share/classes/java/lang/Class.java +++ b/src/share/classes/java/lang/Class.java @@ -25,6 +25,7 @@ package java.lang; +import java.lang.reflect.AnnotatedElement; import java.lang.reflect.Array; import java.lang.reflect.GenericArrayType; import java.lang.reflect.Member; @@ -3083,6 +3084,16 @@ public final return (A) annotations.get(annotationClass); } + /** + * {@inheritDoc} + * @throws NullPointerException {@inheritDoc} + * @since 1.5 + */ + @Override + public boolean isAnnotationPresent(Class annotationClass) { + return AnnotatedElement.super.isAnnotationPresent(annotationClass); + } + /** * @throws NullPointerException {@inheritDoc} * @since 1.8 diff --git a/src/share/classes/java/lang/Package.java b/src/share/classes/java/lang/Package.java index b9776f478dbb9d0393146e4cb2832a8aef66e95e..7d1d38db64db0b192af488e0fd7ea00cf76ac098 100644 --- a/src/share/classes/java/lang/Package.java +++ b/src/share/classes/java/lang/Package.java @@ -25,6 +25,7 @@ package java.lang; +import java.lang.reflect.AnnotatedElement; import java.io.InputStream; import java.util.Enumeration; @@ -385,6 +386,16 @@ public class Package implements java.lang.reflect.AnnotatedElement { return getPackageInfo().getAnnotation(annotationClass); } + /** + * {@inheritDoc} + * @throws NullPointerException {@inheritDoc} + * @since 1.5 + */ + @Override + public boolean isAnnotationPresent(Class annotationClass) { + return AnnotatedElement.super.isAnnotationPresent(annotationClass); + } + /** * @throws NullPointerException {@inheritDoc} * @since 1.8 diff --git a/src/share/classes/java/lang/reflect/AccessibleObject.java b/src/share/classes/java/lang/reflect/AccessibleObject.java index d198d939d4b0442259dd81fbb03649fcd064337d..f98aed5db25e3f29e19df4e8d2314fbd92a719a9 100644 --- a/src/share/classes/java/lang/reflect/AccessibleObject.java +++ b/src/share/classes/java/lang/reflect/AccessibleObject.java @@ -181,6 +181,16 @@ public class AccessibleObject implements AnnotatedElement { } /** + * {@inheritDoc} + * @throws NullPointerException {@inheritDoc} + * @since 1.5 + */ + @Override + public boolean isAnnotationPresent(Class annotationClass) { + return AnnotatedElement.super.isAnnotationPresent(annotationClass); + } + + /** * @throws NullPointerException {@inheritDoc} * @since 1.8 */ diff --git a/test/java/lang/reflect/OldenCompilingWithDefaults.java b/test/java/lang/reflect/OldenCompilingWithDefaults.java new file mode 100644 index 0000000000000000000000000000000000000000..c8609b35f9d678acb5b41594cffa589d0f029319 --- /dev/null +++ b/test/java/lang/reflect/OldenCompilingWithDefaults.java @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2013, 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 8009267 + * @summary Verify uses of isAnnotationPresent compile under older source versions + * @compile -source 1.5 -target 1.5 OldenCompilingWithDefaults.java + * @compile -source 1.6 -target 1.6 OldenCompilingWithDefaults.java + * @compile -source 1.7 -target 1.7 OldenCompilingWithDefaults.java + * @compile OldenCompilingWithDefaults.java + */ + +import java.lang.reflect.*; + +public class OldenCompilingWithDefaults { + public OldenCompilingWithDefaults(){} + static Object f; + + public static void main(String... args) throws Exception { + Class clazz = OldenCompilingWithDefaults.class; + Package pkg = clazz.getPackage(); + Constructor ctor = clazz.getConstructor(); + Method m = clazz.getMethod("main", String[].class); + Field f = clazz.getField("f"); + + if(clazz.isAnnotationPresent(SuppressWarnings.class) || + pkg.isAnnotationPresent(SuppressWarnings.class) || + ctor.isAnnotationPresent(SuppressWarnings.class) || + m.isAnnotationPresent(SuppressWarnings.class) || + f.isAnnotationPresent(SuppressWarnings.class)) + System.out.println("An annotation is present."); + } +}