Make assertions based on Annotation#toString() lenient

The behavior for the toString() implementation for annotations changed
in JDK 19, per my request to the JDK team (see link below).

Specifically, since JDK 19, the toString() implementation for annotation
proxies created by the JDK started using canonical names instead of
binary names for types.

See https://bugs.openjdk.org/browse/JDK-8281462

Author: sbrannen

Diff for: spring-web/src/test/java/org/springframework/web/service/invoker/HttpServiceMethodTests.java

@@ -220,8 +220,8 @@ void multipleAnnotationsAtClassLevel() {
 				.isThrownBy(() -> this.proxyFactory.createClient(serviceInterface))
 				.withMessageContainingAll(
 					"Multiple @HttpExchange annotations found on " + serviceInterface,
-					"@" + HttpExchange.class.getName(),
-					"@" + ExtraHttpExchange.class.getName()
+					HttpExchange.class.getSimpleName(),
+					ExtraHttpExchange.class.getSimpleName()
 				);
 	}
 
@@ -234,8 +234,8 @@ void multipleAnnotationsAtMethodLevel() throws NoSuchMethodException {
 				.isThrownBy(() -> this.proxyFactory.createClient(serviceInterface))
 				.withMessageContainingAll(
 					"Multiple @HttpExchange annotations found on method " + method,
-					"@" + PostExchange.class.getName(),
-					"@" + PutExchange.class.getName()
+					PostExchange.class.getSimpleName(),
+					PutExchange.class.getSimpleName()
 				);
 	}
 

Diff for: spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerMappingTests.java

@@ -163,8 +163,8 @@ void httpExchangeWithMultipleAnnotationsAtClassLevel() {
 				.isThrownBy(() -> this.handlerMapping.getMappingForMethod(method, controllerClass))
 				.withMessageContainingAll(
 					"Multiple @HttpExchange annotations found on " + controllerClass,
-					"@" + HttpExchange.class.getName(),
-					"@" + ExtraHttpExchange.class.getName()
+					HttpExchange.class.getSimpleName(),
+					ExtraHttpExchange.class.getSimpleName()
 				);
 	}
 
@@ -179,8 +179,8 @@ void httpExchangeWithMultipleAnnotationsAtMethodLevel() {
 				.isThrownBy(() -> this.handlerMapping.getMappingForMethod(method, controllerClass))
 				.withMessageContainingAll(
 					"Multiple @HttpExchange annotations found on " + method,
-					"@" + PostExchange.class.getName(),
-					"@" + PutExchange.class.getName()
+					PostExchange.class.getSimpleName(),
+					PutExchange.class.getSimpleName()
 				);
 	}
 
@@ -196,8 +196,8 @@ void httpExchangeWithMixedAnnotationsAtClassLevel() {
 				.withMessageContainingAll(
 					controllerClass.getName(),
 					"is annotated with @RequestMapping and @HttpExchange annotations, but only one is allowed:",
-					"@" + RequestMapping.class.getName(),
-					"@" + HttpExchange.class.getName()
+					RequestMapping.class.getSimpleName(),
+					HttpExchange.class.getSimpleName()
 				);
 	}
 
@@ -213,8 +213,8 @@ void httpExchangeWithMixedAnnotationsAtMethodLevel() {
 				.withMessageContainingAll(
 					method.toString(),
 					"is annotated with @RequestMapping and @HttpExchange annotations, but only one is allowed:",
-					"@" + PostMapping.class.getName(),
-					"@" + PostExchange.class.getName()
+					PostMapping.class.getSimpleName(),
+					PostExchange.class.getSimpleName()
 				);
 	}
 

Diff for: spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMappingTests.java

@@ -289,8 +289,8 @@ void httpExchangeWithMultipleAnnotationsAtClassLevel() throws NoSuchMethodExcept
 				.isThrownBy(() -> mapping.getMappingForMethod(method, controllerClass))
 				.withMessageContainingAll(
 					"Multiple @HttpExchange annotations found on " + controllerClass,
-					"@" + HttpExchange.class.getName(),
-					"@" + ExtraHttpExchange.class.getName()
+					HttpExchange.class.getSimpleName(),
+					ExtraHttpExchange.class.getSimpleName()
 				);
 	}
 
@@ -305,8 +305,8 @@ void httpExchangeWithMultipleAnnotationsAtMethodLevel() throws NoSuchMethodExcep
 				.isThrownBy(() -> mapping.getMappingForMethod(method, controllerClass))
 				.withMessageContainingAll(
 					"Multiple @HttpExchange annotations found on " + method,
-					"@" + PostExchange.class.getName(),
-					"@" + PutExchange.class.getName()
+					PostExchange.class.getSimpleName(),
+					PutExchange.class.getSimpleName()
 				);
 	}
 
@@ -322,8 +322,8 @@ void httpExchangeWithMixedAnnotationsAtClassLevel() throws NoSuchMethodException
 				.withMessageContainingAll(
 					controllerClass.getName(),
 					"is annotated with @RequestMapping and @HttpExchange annotations, but only one is allowed:",
-					"@" + RequestMapping.class.getName(),
-					"@" + HttpExchange.class.getName()
+					RequestMapping.class.getSimpleName(),
+					HttpExchange.class.getSimpleName()
 				);
 	}
 
@@ -339,8 +339,8 @@ void httpExchangeWithMixedAnnotationsAtMethodLevel() throws NoSuchMethodExceptio
 				.withMessageContainingAll(
 					method.toString(),
 					"is annotated with @RequestMapping and @HttpExchange annotations, but only one is allowed:",
-					"@" + PostMapping.class.getName(),
-					"@" + PostExchange.class.getName()
+					PostMapping.class.getSimpleName(),
+					PostExchange.class.getSimpleName()
 				);
 	}