Restore javax meta-annotation lookup behavior

Closes gh-22957

Author: jhoeller

spring-core/spring-core.gradle

@@ -80,6 +80,7 @@ dependencies {
 	optional("io.netty:netty-buffer")
 	testCompile("io.projectreactor:reactor-test")
 	testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
+	testCompile("com.google.code.findbugs:jsr305:3.0.2")
 	testCompile("org.xmlunit:xmlunit-matchers:2.6.2")
 	testCompile("javax.xml.bind:jaxb-api:2.3.1")
 	testCompile("com.fasterxml.woodstox:woodstox-core:5.2.0") {

spring-core/src/main/java/org/springframework/core/annotation/AnnotationUtils.java

@@ -956,7 +956,7 @@ else if (annotatedElement instanceof Member) {
 			return false;
 		}
 		String name = clazz.getName();
-		return (name.startsWith("java") || name.startsWith("org.springframework.lang."));
+		return (name.startsWith("java.") || name.startsWith("org.springframework.lang."));
 	}
 
 	/**

spring-core/src/test/java/org/springframework/core/annotation/AnnotatedElementUtilsTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 package org.springframework.core.annotation;
 
 import java.lang.annotation.Annotation;
+import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
@@ -28,14 +29,18 @@
 import java.util.Date;
 import java.util.List;
 import java.util.Set;
+import javax.annotation.Nonnull;
+import javax.annotation.ParametersAreNonnullByDefault;
 import javax.annotation.Resource;
+import javax.annotation.meta.When;
 
 import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.internal.ArrayComparisonFailure;
 import org.junit.rules.ExpectedException;
 
+import org.springframework.lang.NonNullApi;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Indexed;
 import org.springframework.util.Assert;
@@ -118,6 +123,14 @@ public void hasMetaAnnotationTypesOnClassWithMetaDepth2() {
 		assertFalse(hasMetaAnnotationTypes(ComposedTransactionalComponentClass.class, ComposedTransactionalComponent.class.getName()));
 	}
 
+	@Test
+	public void isAnnotatedForPlainTypes() {
+		assertTrue(isAnnotated(Order.class, Documented.class));
+		assertTrue(isAnnotated(NonNullApi.class, Documented.class));
+		assertTrue(isAnnotated(NonNullApi.class, Nonnull.class));
+		assertTrue(isAnnotated(ParametersAreNonnullByDefault.class, Nonnull.class));
+	}
+
 	@Test
 	public void isAnnotatedOnNonAnnotatedClass() {
 		assertFalse(isAnnotated(NonAnnotatedClass.class, TX_NAME));
@@ -147,6 +160,14 @@ public void isAnnotatedOnClassWithMetaDepth2() {
 		assertTrue(isAnnotated(ComposedTransactionalComponentClass.class, ComposedTransactionalComponent.class.getName()));
 	}
 
+	@Test
+	public void hasAnnotationForPlainTypes() {
+		assertTrue(hasAnnotation(Order.class, Documented.class));
+		assertTrue(hasAnnotation(NonNullApi.class, Documented.class));
+		assertTrue(hasAnnotation(NonNullApi.class, Nonnull.class));
+		assertTrue(hasAnnotation(ParametersAreNonnullByDefault.class, Nonnull.class));
+	}
+
 	@Test
 	public void getAllAnnotationAttributesOnNonAnnotatedClass() {
 		assertNull(getAllAnnotationAttributes(NonAnnotatedClass.class, TX_NAME));
@@ -207,6 +228,22 @@ public void getAllAnnotationAttributesOnClassWithMultipleComposedAnnotations() {
 				attributes.get("value"));
 	}
 
+	@Test
+	public void getAllAnnotationAttributesOnLangType() {
+		MultiValueMap<String, Object> attributes = getAllAnnotationAttributes(
+				NonNullApi.class, Nonnull.class.getName());
+		assertNotNull(attributes);
+		assertEquals(asList(When.ALWAYS), attributes.get("when"));
+	}
+
+	@Test
+	public void getAllAnnotationAttributesOnJavaxType() {
+		MultiValueMap<String, Object> attributes = getAllAnnotationAttributes(
+				ParametersAreNonnullByDefault.class, Nonnull.class.getName());
+		assertNotNull(attributes);
+		assertEquals(asList(When.ALWAYS), attributes.get("when"));
+	}
+
 	@Test
 	public void getMergedAnnotationAttributesOnClassWithLocalAnnotation() {
 		Class<?> element = TxConfig.class;
@@ -701,14 +738,33 @@ private void assertWebMapping(AnnotatedElement element) throws ArrayComparisonFa
 	@Test
 	public void javaLangAnnotationTypeViaFindMergedAnnotation() throws Exception {
 		Constructor<?> deprecatedCtor = Date.class.getConstructor(String.class);
-		assertEquals(deprecatedCtor.getAnnotation(Deprecated.class), findMergedAnnotation(deprecatedCtor, Deprecated.class));
-		assertEquals(Date.class.getAnnotation(Deprecated.class), findMergedAnnotation(Date.class, Deprecated.class));
+		assertEquals(deprecatedCtor.getAnnotation(Deprecated.class),
+				findMergedAnnotation(deprecatedCtor, Deprecated.class));
+		assertEquals(Date.class.getAnnotation(Deprecated.class),
+				findMergedAnnotation(Date.class, Deprecated.class));
 	}
 
 	@Test
 	public void javaxAnnotationTypeViaFindMergedAnnotation() throws Exception {
-		assertEquals(ResourceHolder.class.getAnnotation(Resource.class), findMergedAnnotation(ResourceHolder.class, Resource.class));
-		assertEquals(SpringAppConfigClass.class.getAnnotation(Resource.class), findMergedAnnotation(SpringAppConfigClass.class, Resource.class));
+		assertEquals(ResourceHolder.class.getAnnotation(Resource.class),
+				findMergedAnnotation(ResourceHolder.class, Resource.class));
+		assertEquals(SpringAppConfigClass.class.getAnnotation(Resource.class),
+				findMergedAnnotation(SpringAppConfigClass.class, Resource.class));
+	}
+
+	@Test
+	public void javaxMetaAnnotationTypeViaFindMergedAnnotation() throws Exception {
+		assertEquals(ParametersAreNonnullByDefault.class.getAnnotation(Nonnull.class),
+				findMergedAnnotation(ParametersAreNonnullByDefault.class, Nonnull.class));
+		assertEquals(ParametersAreNonnullByDefault.class.getAnnotation(Nonnull.class),
+				findMergedAnnotation(ResourceHolder.class, Nonnull.class));
+	}
+
+	@Test
+	public void nullableAnnotationTypeViaFindMergedAnnotation() throws Exception {
+		Method method = TransactionalServiceImpl.class.getMethod("doIt");
+		assertEquals(method.getAnnotation(Resource.class), findMergedAnnotation(method, Resource.class));
+		assertEquals(method.getAnnotation(Resource.class), findMergedAnnotation(method, Resource.class));
 	}
 
 	@Test
@@ -1288,6 +1344,7 @@ static class SpringAppConfigClass {
 	}
 
 	@Resource(name = "x")
+	@ParametersAreNonnullByDefault
 	static class ResourceHolder {
 	}