Sonar Fixes - Javadoc-only imports

spring-integration-test-support/src/main/java/org/springframework/integration/test/matcher/HeaderMatcher.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -24,7 +24,6 @@ import org.hamcrest.Description;
 import org.hamcrest.Factory;
 import org.hamcrest.Matcher;
 import org.hamcrest.TypeSafeMatcher;
-import org.junit.Assert;
 
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageHeaders;
@@ -33,7 +32,7 @@ import org.springframework.messaging.MessageHeaders;
  * Are the {@link MessageHeaders} of a {@link Message} containing any entry
  * or multiple that match?
  * <p>
- * For example using {@link Assert#assertThat(Object, Matcher)} for a single
+ * For example using {@link org.junit.Assert#assertThat(Object, Matcher)} for a single
  * entry:
  *
  * <pre class="code">
@@ -69,6 +68,7 @@ import org.springframework.messaging.MessageHeaders;
  * @author Alex Peters
  * @author Iwein Fuld
  * @author Artem Bilan
+ * @author Gary Russell
  *
  */
 public class HeaderMatcher<T> extends TypeSafeMatcher<Message<T>> {

spring-integration-test-support/src/main/java/org/springframework/integration/test/matcher/MockitoMessageMatchers.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -19,9 +19,7 @@ package org.springframework.integration.test.matcher;
 import java.util.Map;
 
 import org.hamcrest.Matcher;
-import org.mockito.ArgumentMatcher;
 import org.mockito.ArgumentMatchers;
-import org.mockito.Mockito;
 import org.mockito.internal.hamcrest.HamcrestArgumentMatcher;
 
 import org.springframework.messaging.Message;
@@ -32,11 +30,11 @@ import org.springframework.messaging.Message;
  * This class contains expressive factory methods for the most common Mockito
  * matchers needed when matching {@link Message}s. If you need a different
  * matching strategy, any Hamcrest matcher can be used in Mockito through
- * {@link Mockito#argThat(ArgumentMatcher)}.
+ * {@link org.mockito.Mockito#argThat(org.mockito.ArgumentMatcher)}.
  *
  * Example usage:
  * <p>
- * With {@link Mockito#verify(Object)}:
+ * With {@link org.mockito.Mockito#verify(Object)}:
  * </p>
  *
  * <pre class="code">
@@ -50,7 +48,7 @@ import org.springframework.messaging.Message;
  * }
  * </pre>
  * <p>
- * With {@link Mockito#when(Object)}:
+ * With {@link org.mockito.Mockito#when(Object)}:
  * </p>
  *
  * <pre class="code">

spring-integration-test-support/src/main/java/org/springframework/integration/test/matcher/PayloadMatcher.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -21,7 +21,6 @@ import org.hamcrest.Factory;
 import org.hamcrest.Matcher;
 import org.hamcrest.TypeSafeMatcher;
 import org.hamcrest.core.IsEqual;
-import org.junit.Assert;
 
 import org.springframework.messaging.Message;
 
@@ -29,7 +28,7 @@ import org.springframework.messaging.Message;
  * Is the payload of a {@link Message} equal to a given value or is matching
  * a given matcher?
  * <p>
- * A Junit example using {@link Assert#assertThat(Object, Matcher)} could look
+ * A Junit example using {@link org.junit.Assert#assertThat(Object, Matcher)} could look
  * like this to test a payload value:
  *
  * <pre class="code">
@@ -41,7 +40,7 @@ import org.springframework.messaging.Message;
  * </pre>
  *
  * <p>
- * An example using {@link Assert#assertThat(Object, Matcher)} delegating to
+ * An example using {@link org.junit.Assert#assertThat(Object, Matcher)} delegating to
  * another {@link Matcher}.
  *
  * <pre class="code">
@@ -56,6 +55,7 @@ import org.springframework.messaging.Message;
  * @author Alex Peters
  * @author Iwein Fuld
  * @author Artem Bilan
+ * @author Gary Russell
  *
  */
 public class PayloadMatcher<T> extends TypeSafeMatcher<Message<?>> {