diff --git a/spring-test/src/main/java/org/springframework/test/util/MetaAnnotationUtils.java b/spring-test/src/main/java/org/springframework/test/util/MetaAnnotationUtils.java
index e1317816b89..d9c813cc6cc 100644
--- a/spring-test/src/main/java/org/springframework/test/util/MetaAnnotationUtils.java
+++ b/spring-test/src/main/java/org/springframework/test/util/MetaAnnotationUtils.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -374,7 +374,7 @@ public abstract class MetaAnnotationUtils {
/**
- * Untyped extension of {@code AnnotationDescriptor} that is used
+ * Untyped extension of {@link AnnotationDescriptor} that is used
* to describe the declaration of one of several candidate annotation types
* where the actual annotation type cannot be predetermined.
*/
@@ -399,7 +399,7 @@ public abstract class MetaAnnotationUtils {
@Override
public Annotation synthesizeAnnotation() {
throw new UnsupportedOperationException(
- "getMergedAnnotation() is unsupported in UntypedAnnotationDescriptor");
+ "synthesizeAnnotation() is unsupported in UntypedAnnotationDescriptor");
}
}
diff --git a/spring-test/src/main/java/org/springframework/test/web/client/AbstractRequestExpectationManager.java b/spring-test/src/main/java/org/springframework/test/web/client/AbstractRequestExpectationManager.java
index ad477ed7440..1f409e21592 100644
--- a/spring-test/src/main/java/org/springframework/test/web/client/AbstractRequestExpectationManager.java
+++ b/spring-test/src/main/java/org/springframework/test/web/client/AbstractRequestExpectationManager.java
@@ -78,7 +78,6 @@ public abstract class AbstractRequestExpectationManager implements RequestExpect
return expectation;
}
- @SuppressWarnings("deprecation")
@Override
public ClientHttpResponse validateRequest(ClientHttpRequest request) throws IOException {
RequestExpectation expectation;