Sonar fixes

- printStackTrace in test mail server
- Illegal throws
- Large anon. classes

* - indexOf char
- stored external object

* - ignored exceptional return values

* - checkstyle

Author: garyrussell

spring-integration-core/src/main/java/org/springframework/integration/aggregator/MessageGroupExpiredEvent.java

@@ -47,8 +47,8 @@ public MessageGroupExpiredEvent(Object source, Object groupId, int messageCount,
 		super(source);
 		this.groupId = groupId;
 		this.messageCount = messageCount;
-		this.lastModified = lastModified;
-		this.expired = expired;
+		this.lastModified = (Date) lastModified.clone();
+		this.expired = (Date) expired.clone();
 		this.discarded = discarded;
 	}
 

spring-integration-core/src/main/java/org/springframework/integration/config/MessagingGatewayRegistrar.java

@@ -163,7 +163,7 @@ else if (StringUtils.hasText(asyncExecutor)) {
 		}
 		String id = (String) gatewayAttributes.get("name");
 		if (!StringUtils.hasText(id)) {
-			id = Introspector.decapitalize(serviceInterface.substring(serviceInterface.lastIndexOf(".") + 1));
+			id = Introspector.decapitalize(serviceInterface.substring(serviceInterface.lastIndexOf('.') + 1));
 		}
 
 		gatewayProxyBuilder.addConstructorArgValue(serviceInterface);

spring-integration-core/src/main/java/org/springframework/integration/config/xml/AnnotationConfigParser.java

@@ -35,42 +35,49 @@
  *
  * @author Mark Fisher
  * @author Artem Bilan
+ * @author Gary Russell
  */
 public class AnnotationConfigParser implements BeanDefinitionParser {
 
 	@Override
 	public BeanDefinition parse(final Element element, ParserContext parserContext) {
-		StandardAnnotationMetadata importingClassMetadata =
-				new StandardAnnotationMetadata(Object.class) {
+		new IntegrationRegistrar().registerBeanDefinitions(new ExtendedAnnotationMetadata(Object.class, element),
+				parserContext.getRegistry());
+		return null;
+	}
 
-					@Override
-					public Map<String, Object> getAnnotationAttributes(String annotationType) {
-						if (EnablePublisher.class.getName().equals(annotationType)) {
-							Element enablePublisherElement =
-									DomUtils.getChildElementByTagName(element, "enable-publisher");
-							if (enablePublisherElement != null) {
-								Map<String, Object> attributes = new HashMap<>();
-								attributes.put("defaultChannel",
-										enablePublisherElement.getAttribute("default-publisher-channel"));
-								attributes.put("proxyTargetClass",
-										enablePublisherElement.getAttribute("proxy-target-class"));
-								attributes.put("order", enablePublisherElement.getAttribute("order"));
-								return attributes;
-							}
-							else {
-								return null;
-							}
-						}
-						else {
-							return null;
-						}
-					}
+	private static final class ExtendedAnnotationMetadata extends StandardAnnotationMetadata {
 
-				};
+		private final Element element;
 
-		new IntegrationRegistrar().registerBeanDefinitions(importingClassMetadata, parserContext.getRegistry());
+		ExtendedAnnotationMetadata(Class<?> introspectedClass, Element element) {
+			super(introspectedClass);
+			this.element = element;
+		}
+
+		@Override
+		public Map<String, Object> getAnnotationAttributes(String annotationType) {
+			if (EnablePublisher.class.getName().equals(annotationType)) {
+				Element enablePublisherElement =
+						DomUtils.getChildElementByTagName(this.element, "enable-publisher");
+				if (enablePublisherElement != null) {
+					Map<String, Object> attributes = new HashMap<>();
+					attributes.put("defaultChannel",
+							enablePublisherElement.getAttribute("default-publisher-channel"));
+					attributes.put("proxyTargetClass",
+							enablePublisherElement.getAttribute("proxy-target-class"));
+					attributes.put("order", enablePublisherElement.getAttribute("order"));
+					return attributes;
+				}
+				else {
+					return null;
+				}
+			}
+			else {
+				return null;
+			}
+		}
 
-		return null;
 	}
 
 }

spring-integration-core/src/main/java/org/springframework/integration/endpoint/ReactiveStreamsConsumer.java

@@ -132,38 +132,7 @@ protected void doStart() {
 		if (this.lifecycleDelegate != null) {
 			this.lifecycleDelegate.start();
 		}
-		this.publisher.subscribe(new BaseSubscriber<Message<?>>() {
-
-			private final Subscriber<Message<?>> delegate = ReactiveStreamsConsumer.this.subscriber;
-
-			@Override
-			public void hookOnSubscribe(Subscription s) {
-				this.delegate.onSubscribe(s);
-				ReactiveStreamsConsumer.this.subscription = s;
-			}
-
-			@Override
-			public void hookOnNext(Message<?> message) {
-				try {
-					this.delegate.onNext(message);
-				}
-				catch (Exception e) {
-					ReactiveStreamsConsumer.this.errorHandler.handleError(e);
-					hookOnError(e);
-				}
-			}
-
-			@Override
-			public void hookOnError(Throwable t) {
-				this.delegate.onError(t);
-			}
-
-			@Override
-			public void hookOnComplete() {
-				this.delegate.onComplete();
-			}
-
-		});
+		this.publisher.subscribe(new DelegatingSubscriber());
 	}
 
 	@Override
@@ -176,6 +145,42 @@ protected void doStop() {
 		}
 	}
 
+	private final class DelegatingSubscriber extends BaseSubscriber<Message<?>> {
+
+		private final Subscriber<Message<?>> delegate = ReactiveStreamsConsumer.this.subscriber;
+
+		DelegatingSubscriber() {
+			super();
+		}
+
+		@Override
+		public void hookOnSubscribe(Subscription s) {
+			this.delegate.onSubscribe(s);
+			ReactiveStreamsConsumer.this.subscription = s;
+		}
+
+		@Override
+		public void hookOnNext(Message<?> message) {
+			try {
+				this.delegate.onNext(message);
+			}
+			catch (Exception e) {
+				ReactiveStreamsConsumer.this.errorHandler.handleError(e);
+				hookOnError(e);
+			}
+		}
+
+		@Override
+		public void hookOnError(Throwable t) {
+			this.delegate.onError(t);
+		}
+
+		@Override
+		public void hookOnComplete() {
+			this.delegate.onComplete();
+		}
+
+	}
 
 	private static final class MessageHandlerSubscriber
 			implements CoreSubscriber<Message<?>>, Disposable, Lifecycle {

spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java

@@ -465,7 +465,7 @@ else if (Future.class.isAssignableFrom(returnType)) {
 	}
 
 	@Nullable
-	protected Object doInvoke(MethodInvocation invocation, boolean runningOnCallerThread) throws Throwable {
+	protected Object doInvoke(MethodInvocation invocation, boolean runningOnCallerThread) throws Throwable { // NOSONAR
 		Method method = invocation.getMethod();
 		if (AopUtils.isToStringMethod(method)) {
 			return "gateway proxy for service interface [" + this.serviceInterface + "]";
@@ -474,7 +474,7 @@ protected Object doInvoke(MethodInvocation invocation, boolean runningOnCallerTh
 			return invokeGatewayMethod(invocation, runningOnCallerThread);
 		}
 		catch (Throwable e) { //NOSONAR - ok to catch, rethrown below
-			this.rethrowExceptionCauseIfPossible(e, invocation.getMethod());
+			rethrowExceptionCauseIfPossible(e, invocation.getMethod());
 			return null; // preceding call should always throw something
 		}
 	}
@@ -538,7 +538,7 @@ else if (this.globalMethodMetadata != null) {
 		return (response != null) ? this.convert(response, returnType) : null;
 	}
 
-	private void rethrowExceptionCauseIfPossible(Throwable originalException, Method method) throws Throwable {
+	private void rethrowExceptionCauseIfPossible(Throwable originalException, Method method) throws Throwable { // NOSONAR
 		Class<?>[] exceptionTypes = method.getExceptionTypes();
 		Throwable t = originalException;
 		while (t != null) {

spring-integration-core/src/main/java/org/springframework/integration/handler/advice/AbstractHandleMessageAdvice.java

@@ -19,8 +19,6 @@
 import java.lang.reflect.Method;
 
 import org.aopalliance.intercept.MethodInvocation;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 import org.springframework.integration.context.IntegrationObjectSupport;
 import org.springframework.messaging.Message;
@@ -37,10 +35,8 @@
  */
 public abstract class AbstractHandleMessageAdvice extends IntegrationObjectSupport implements HandleMessageAdvice {
 
-	protected final Log logger = LogFactory.getLog(this.getClass());
-
 	@Override
-	public final Object invoke(MethodInvocation invocation) throws Throwable {
+	public final Object invoke(MethodInvocation invocation) throws Throwable { // NOSONAR
 		Method method = invocation.getMethod();
 		Object invocationThis = invocation.getThis();
 		Object[] arguments = invocation.getArguments();

spring-integration-core/src/main/java/org/springframework/integration/handler/advice/AbstractRequestHandlerAdvice.java

@@ -64,42 +64,7 @@ public final Object invoke(final MethodInvocation invocation) throws Throwable {
 		else {
 			Message<?> message = (Message<?>) arguments[0];
 			try {
-				return doInvoke(new ExecutionCallback() {
-
-					@Override
-					public Object execute() {
-						try {
-							return invocation.proceed();
-						}
-						catch (Throwable e) { //NOSONAR - ok to catch; unwrapped and rethrown below
-							throw new ThrowableHolderException(e);
-						}
-					}
-
-					@Override
-					public Object cloneAndExecute() {
-						try {
-							/*
-				 			* If we don't copy the invocation carefully it won't keep a reference to the other
-				 			* interceptors in the chain.
-				 			*/
-							if (invocation instanceof ProxyMethodInvocation) {
-								return ((ProxyMethodInvocation) invocation).invocableClone().proceed();
-							}
-							else {
-								throw new IllegalStateException(
-										"MethodInvocation of the wrong type detected - this should not happen with Spring AOP," +
-												" so please raise an issue if you see this exception");
-							}
-						}
-						catch (Exception e) { //NOSONAR - catch necessary so we can wrap Errors
-							throw new MessagingException(message, "Failed to handle", e);
-						}
-						catch (Throwable e) { //NOSONAR - ok to catch; unwrapped and rethrown below
-							throw new ThrowableHolderException(e);
-						}
-					}
-				}, invocationThis, message);
+				return doInvoke(new CallbackImpl(invocation), invocationThis, message);
 			}
 			catch (Exception e) {
 				throw this.unwrapThrowableIfNecessary(e);
@@ -172,6 +137,50 @@ protected interface ExecutionCallback {
 
 	}
 
+	private static final class CallbackImpl implements ExecutionCallback {
+
+		private final MethodInvocation invocation;
+
+		CallbackImpl(MethodInvocation invocation) {
+			this.invocation = invocation;
+		}
+
+		@Override
+		public Object execute() {
+			try {
+				return this.invocation.proceed();
+			}
+			catch (Throwable e) { //NOSONAR - ok to catch; unwrapped and rethrown below
+				throw new ThrowableHolderException(e);
+			}
+		}
+
+		@Override
+		public Object cloneAndExecute() {
+			try {
+				/*
+	 			* If we don't copy the invocation carefully it won't keep a reference to the other
+	 			* interceptors in the chain.
+	 			*/
+				if (this.invocation instanceof ProxyMethodInvocation) {
+					return ((ProxyMethodInvocation) this.invocation).invocableClone().proceed();
+				}
+				else {
+					throw new IllegalStateException(
+							"MethodInvocation of the wrong type detected - this should not happen with Spring AOP," +
+									" so please raise an issue if you see this exception");
+				}
+			}
+			catch (Exception e) { //NOSONAR - catch necessary so we can wrap Errors
+				throw new MessagingException((Message<?>) this.invocation.getArguments()[0], "Failed to handle", e);
+			}
+			catch (Throwable e) { //NOSONAR - ok to catch; unwrapped and rethrown below
+				throw new ThrowableHolderException(e);
+			}
+		}
+
+	}
+
 	@SuppressWarnings("serial")
 	protected static final class ThrowableHolderException extends RuntimeException {
 

spring-integration-core/src/main/java/org/springframework/integration/metadata/PropertiesPersistingMetadataStore.java

@@ -93,11 +93,13 @@ public void setFileName(String fileName) {
 	@Override
 	public void afterPropertiesSet() {
 		File baseDir = new File(this.baseDirectory);
-		baseDir.mkdirs();
+		if (!baseDir.mkdirs() && this.logger.isWarnEnabled()) {
+			this.logger.warn("Failed to create directories for " + baseDir);
+		}
 		this.file = new File(baseDir, this.fileName);
 		try {
-			if (!this.file.exists()) {
-				this.file.createNewFile();
+			if (!this.file.exists() && !this.file.createNewFile() && this.logger.isWarnEnabled()) {
+				this.logger.warn("Failed to create file " + this.file);
 			}
 		}
 		catch (Exception e) {