From 6c442b7421c58b963cdf10ede9e52f16214a9a5b Mon Sep 17 00:00:00 2001
From: Ilayaperumal Gopinathan <igopinathan@pivotal.io>
Date: Mon, 4 Apr 2016 18:00:48 +0530
Subject: [PATCH] Fix compiler warnings

This resolves #467
---
 .../cloud/stream/binder/AbstractBinderTests.java              | 1 +
 .../cloud/stream/binding/BindableProxyFactory.java            | 2 ++
 .../cloud/stream/binding/BinderAwareChannelResolver.java      | 1 +
 .../cloud/stream/converter/AbstractFromMessageConverter.java  | 4 ++--
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/spring-cloud-stream-binders/spring-cloud-stream-binder-test/src/main/java/org/springframework/cloud/stream/binder/AbstractBinderTests.java b/spring-cloud-stream-binders/spring-cloud-stream-binder-test/src/main/java/org/springframework/cloud/stream/binder/AbstractBinderTests.java
index 1ba955837..19b3c7c70 100644
--- a/spring-cloud-stream-binders/spring-cloud-stream-binder-test/src/main/java/org/springframework/cloud/stream/binder/AbstractBinderTests.java
+++ b/spring-cloud-stream-binders/spring-cloud-stream-binder-test/src/main/java/org/springframework/cloud/stream/binder/AbstractBinderTests.java
@@ -46,6 +46,7 @@ import org.springframework.util.MimeTypeUtils;
  * @author David Turanski
  * @author Mark Fisher
  */
+@SuppressWarnings("unchecked")
 public abstract class AbstractBinderTests<B extends AbstractTestBinder<? extends AbstractBinder<MessageChannel, CP, PP>, CP, PP>, CP extends ConsumerProperties, PP extends ProducerProperties> {
 
 	protected B testBinder;
diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binding/BindableProxyFactory.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binding/BindableProxyFactory.java
index ba71d7c33..e2c340cd3 100644
--- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binding/BindableProxyFactory.java
+++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binding/BindableProxyFactory.java
@@ -125,6 +125,7 @@ public class BindableProxyFactory implements MethodInterceptor, FactoryBean<Obje
 				Input input = AnnotationUtils.findAnnotation(method, Input.class);
 				if (input != null) {
 					String name = BindingBeanDefinitionRegistryUtils.getChannelName(input, method);
+					@SuppressWarnings("unchecked")
 					Class<? extends MessageChannel> channelType = (Class<? extends MessageChannel>) method.getReturnType();
 					MessageChannel sharedChannel = locateSharedChannel(name);
 					if (sharedChannel == null) {
@@ -145,6 +146,7 @@ public class BindableProxyFactory implements MethodInterceptor, FactoryBean<Obje
 				Output output = AnnotationUtils.findAnnotation(method, Output.class);
 				if (output != null) {
 					String name = BindingBeanDefinitionRegistryUtils.getChannelName(output, method);
+					@SuppressWarnings("unchecked")
 					Class<? extends MessageChannel> channelType = (Class<? extends MessageChannel>) method.getReturnType();
 					MessageChannel sharedChannel = locateSharedChannel(name);
 					if (sharedChannel == null) {
diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binding/BinderAwareChannelResolver.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binding/BinderAwareChannelResolver.java
index a4028b223..ad6784f01 100644
--- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binding/BinderAwareChannelResolver.java
+++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binding/BinderAwareChannelResolver.java
@@ -49,6 +49,7 @@ public class BinderAwareChannelResolver extends BeanFactoryMessageChannelDestina
 
 	private ConfigurableListableBeanFactory beanFactory;
 
+	@SuppressWarnings("unchecked")
 	public BinderAwareChannelResolver(BinderFactory binderFactory,
 			ChannelBindingServiceProperties channelBindingServiceProperties,
 			DynamicDestinationsBindable dynamicDestinationsBindable,
diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/converter/AbstractFromMessageConverter.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/converter/AbstractFromMessageConverter.java
index 78066c75a..dc881751f 100644
--- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/converter/AbstractFromMessageConverter.java
+++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/converter/AbstractFromMessageConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 the original author or authors.
+ * Copyright 2015-2016 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.
@@ -163,7 +163,7 @@ public abstract class AbstractFromMessageConverter extends AbstractMessageConver
 	 * Not supported by default
 	 */
 	@Override
-	public Object convertToInternal(Object payload, MessageHeaders headers) {
+	public Object convertToInternal(Object payload, MessageHeaders headers, Object conversionHint) {
 		throw new UnsupportedOperationException("'convertTo' not supported");
 	}