Sonar Fixes - Javadoc-only imports

spring-integration-redis/src/main/java/org/springframework/integration/redis/inbound/RedisStoreMessageSource.java

@@ -21,7 +21,6 @@ import java.util.Collection;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.data.redis.serializer.StringRedisSerializer;
 import org.springframework.data.redis.support.collections.RedisCollectionFactoryBean;
 import org.springframework.data.redis.support.collections.RedisCollectionFactoryBean.CollectionType;
 import org.springframework.data.redis.support.collections.RedisStore;
@@ -77,7 +76,8 @@ public class RedisStoreMessageSource extends AbstractMessageSource<RedisStore> {
 	 * Creates an instance with the provided {@link RedisConnectionFactory} and SpEL expression
 	 * which should resolve to a 'key' name of the collection to be used.
 	 * It will create and initialize an instance of {@link StringRedisTemplate} that uses
-	 * {@link StringRedisSerializer} for all serialization.
+	 * {@link org.springframework.data.redis.serializer.StringRedisSerializer} for all
+	 * serialization.
 	 * The 'keyExpression' will be evaluated on every call to the {@link #receive()} method.
 	 * @param connectionFactory The connection factory.
 	 * @param keyExpression The key expression.

spring-integration-redis/src/main/java/org/springframework/integration/redis/metadata/RedisMetadataStore.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * Copyright 2013-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.
@@ -22,12 +22,12 @@ import org.springframework.data.redis.core.RedisOperations;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.data.redis.support.collections.RedisProperties;
 import org.springframework.integration.metadata.ConcurrentMetadataStore;
-import org.springframework.integration.metadata.MetadataStore;
 import org.springframework.util.Assert;
 
 /**
- * Redis implementation of {@link MetadataStore}. Use this {@link MetadataStore} to
- * achieve meta-data persistence across application restarts.
+ * Redis implementation of {@link ConcurrentMetadataStore}. Use this
+ * {@link ConcurrentMetadataStore} to achieve meta-data persistence across application
+ * restarts.
  * <p>
  * This implementation is based on the {@link RedisProperties} and its
  * {@link #replace(String, String, String)}; it can't currently be used with a Redis
@@ -45,7 +45,7 @@ public class RedisMetadataStore implements ConcurrentMetadataStore {
 	private final RedisProperties properties;
 
 	/**
-	 * Specifies the {@link RedisProperties} backend for this {@link MetadataStore}.
+	 * Specifies the {@link RedisProperties} backend for this {@link ConcurrentMetadataStore}.
 	 *
 	 * @param properties The properties.
 	 */

spring-integration-redis/src/main/java/org/springframework/integration/redis/outbound/RedisStoreWritingMessageHandler.java

@@ -28,7 +28,6 @@ import org.springframework.data.redis.core.BoundZSetOperations;
 import org.springframework.data.redis.core.RedisConnectionUtils;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.data.redis.serializer.JdkSerializationRedisSerializer;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
 import org.springframework.data.redis.support.collections.RedisCollectionFactoryBean;
 import org.springframework.data.redis.support.collections.RedisCollectionFactoryBean.CollectionType;
@@ -46,21 +45,20 @@ import org.springframework.integration.expression.FunctionExpression;
 import org.springframework.integration.handler.AbstractMessageHandler;
 import org.springframework.integration.redis.support.RedisHeaders;
 import org.springframework.messaging.Message;
-import org.springframework.messaging.MessageHandler;
 import org.springframework.messaging.MessageHandlingException;
 import org.springframework.util.Assert;
 import org.springframework.util.NumberUtils;
 
 /**
- * Implementation of {@link MessageHandler} which writes Message data into a Redis store
- * identified by a key {@link String}.
+ * Implementation of {@link org.springframework.messaging.MessageHandler} which writes
+ * Message data into a Redis store identified by a key {@link String}.
  *
  * It supports the collection types identified by {@link CollectionType}.
  *
  * It supports batch updates or single item entry.
  *
- * "Batch updates" means that the payload of the Message may be a Map or Collection.
- * With such a payload, individual items from it are added to the corresponding Redis store.
+ * "Batch updates" means that the payload of the Message may be a Map or Collection. With
+ * such a payload, individual items from it are added to the corresponding Redis store.
  * See {@link #handleMessageInternal(Message)} for more details.
  *
  * You can instead choose to persist such a payload as a single item if the
@@ -119,7 +117,9 @@ public class RedisStoreWritingMessageHandler extends AbstractMessageHandler {
 	 * Constructs an instance using the provided {@link RedisConnectionFactory}.
 	 * It will use either a {@link StringRedisTemplate} if {@link #extractPayloadElements} is
 	 * true (default) or a {@link RedisTemplate} with {@link StringRedisSerializer}s for
-	 * keys and hash keys and {@link JdkSerializationRedisSerializer}s for values and
+	 * keys and hash keys and
+	 * {@link org.springframework.data.redis.serializer.JdkSerializationRedisSerializer}s
+	 * for values and
 	 * hash values, when it is false.
 	 * @param connectionFactory The connection factory.
 	 * @see #setExtractPayloadElements(boolean)

spring-integration-redis/src/main/java/org/springframework/integration/redis/store/RedisMessageStore.java

@@ -28,12 +28,12 @@ import org.springframework.data.redis.serializer.SerializationException;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
 import org.springframework.integration.redis.util.RedisUtils;
 import org.springframework.integration.store.AbstractKeyValueMessageStore;
-import org.springframework.integration.store.MessageGroupStore;
-import org.springframework.integration.store.MessageStore;
 import org.springframework.util.Assert;
 
 /**
- * Redis implementation of the key/value style {@link MessageStore} and {@link MessageGroupStore}
+ * Redis implementation of the key/value style
+ * {@link org.springframework.integration.store.MessageStore} and
+ * {@link org.springframework.integration.store.MessageGroupStore}
  *
  * @author Oleg Zhurakousky
  * @author Gary Russell

spring-integration-redis/src/main/java/org/springframework/integration/redis/util/RedisLockRegistry.java

@@ -41,13 +41,12 @@ import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.data.redis.core.script.DefaultRedisScript;
 import org.springframework.data.redis.core.script.RedisScript;
 import org.springframework.integration.support.locks.ExpirableLockRegistry;
-import org.springframework.integration.support.locks.LockRegistry;
 import org.springframework.scheduling.concurrent.CustomizableThreadFactory;
 import org.springframework.util.Assert;
 import org.springframework.util.ReflectionUtils;
 
 /**
- * Implementation of {@link LockRegistry} providing a distributed lock using Redis.
+ * Implementation of {@link ExpirableLockRegistry} providing a distributed lock using Redis.
  * Locks are stored under the key {@code registryKey:lockKey}. Locks expire after
  * (default 60) seconds. Threads unlocking an
  * expired lock will get an {@link IllegalStateException}. This should be