8009267: Restore isAnnotationPresent methods in public AnnotatedElement implementations
Reviewed-by: jjg
--- a/jdk/src/share/classes/java/lang/Class.java Sun Mar 03 20:52:04 2013 -0800
+++ b/jdk/src/share/classes/java/lang/Class.java Mon Mar 04 19:42:56 2013 -0800
@@ -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;
@@ -3084,6 +3085,16 @@
}
/**
+ * {@inheritDoc}
+ * @throws NullPointerException {@inheritDoc}
+ * @since 1.5
+ */
+ @Override
+ public boolean isAnnotationPresent(Class<? extends Annotation> annotationClass) {
+ return AnnotatedElement.super.isAnnotationPresent(annotationClass);
+ }
+
+ /**
* @throws NullPointerException {@inheritDoc}
* @since 1.8
*/
--- a/jdk/src/share/classes/java/lang/Package.java Sun Mar 03 20:52:04 2013 -0800
+++ b/jdk/src/share/classes/java/lang/Package.java Mon Mar 04 19:42:56 2013 -0800
@@ -25,6 +25,7 @@
package java.lang;
+import java.lang.reflect.AnnotatedElement;
import java.io.InputStream;
import java.util.Enumeration;
@@ -386,6 +387,16 @@
}
/**
+ * {@inheritDoc}
+ * @throws NullPointerException {@inheritDoc}
+ * @since 1.5
+ */
+ @Override
+ public boolean isAnnotationPresent(Class<? extends Annotation> annotationClass) {
+ return AnnotatedElement.super.isAnnotationPresent(annotationClass);
+ }
+
+ /**
* @throws NullPointerException {@inheritDoc}
* @since 1.8
*/
--- a/jdk/src/share/classes/java/lang/reflect/AccessibleObject.java Sun Mar 03 20:52:04 2013 -0800
+++ b/jdk/src/share/classes/java/lang/reflect/AccessibleObject.java Mon Mar 04 19:42:56 2013 -0800
@@ -181,6 +181,16 @@
}
/**
+ * {@inheritDoc}
+ * @throws NullPointerException {@inheritDoc}
+ * @since 1.5
+ */
+ @Override
+ public boolean isAnnotationPresent(Class<? extends Annotation> annotationClass) {
+ return AnnotatedElement.super.isAnnotationPresent(annotationClass);
+ }
+
+ /**
* @throws NullPointerException {@inheritDoc}
* @since 1.8
*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/lang/reflect/OldenCompilingWithDefaults.java Mon Mar 04 19:42:56 2013 -0800
@@ -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<OldenCompilingWithDefaults> clazz = OldenCompilingWithDefaults.class;
+ Package pkg = clazz.getPackage();
+ Constructor<OldenCompilingWithDefaults> 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.");
+ }
+}