diff --git a/pom.xml b/pom.xml index 2609cc4f9..4fc093e8f 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ Californium-RELEASE 3.0.3 2.1 - 2.0.0.BUILD-SNAPSHOT + 2.0.1.RELEASE true diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/SmartMessageMethodArgumentResolver.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/SmartMessageMethodArgumentResolver.java index dc2c643bf..b21ff3b24 100644 --- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/SmartMessageMethodArgumentResolver.java +++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/SmartMessageMethodArgumentResolver.java @@ -86,8 +86,8 @@ class SmartMessageMethodArgumentResolver extends MessageMethodArgumentResolver { } private boolean conversionNotRequired(Class a, Class b) { - return b == Object.class - ? ClassUtils.isAssignable(a, b) : ClassUtils.isAssignable(b, a); + return b == Object.class ? ClassUtils.isAssignable(a, b) + : ClassUtils.isAssignable(b, a); } private Class getPayloadType(MethodParameter parameter) { diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/SmartPayloadArgumentResolver.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/SmartPayloadArgumentResolver.java index 481ddbaaf..de4accf3c 100644 --- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/SmartPayloadArgumentResolver.java +++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/SmartPayloadArgumentResolver.java @@ -131,8 +131,8 @@ class SmartPayloadArgumentResolver extends PayloadArgumentResolver { } private boolean conversionNotRequired(Class a, Class b) { - return b == Object.class - ? ClassUtils.isAssignable(a, b) : ClassUtils.isAssignable(b, a); + return b == Object.class ? ClassUtils.isAssignable(a, b) + : ClassUtils.isAssignable(b, a); } private String getParameterName(MethodParameter param) { diff --git a/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/config/ArgumentResolversTests.java b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/config/ArgumentResolversTests.java index 2a57b3e98..f3754d95f 100644 --- a/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/config/ArgumentResolversTests.java +++ b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/config/ArgumentResolversTests.java @@ -32,7 +32,6 @@ import org.springframework.util.ReflectionUtils; import static org.assertj.core.api.Assertions.assertThat; /** - * * @author Oleg Zhurakousky * */ @@ -42,11 +41,13 @@ public class ArgumentResolversTests { @Test public void testSmartPayloadArgumentResolver() throws Exception { - SmartPayloadArgumentResolver resolver = new SmartPayloadArgumentResolver(new TestMessageConverter()); + SmartPayloadArgumentResolver resolver = new SmartPayloadArgumentResolver( + new TestMessageConverter()); Object payload = "hello".getBytes(); GenericMessage message = new GenericMessage(payload); - MethodParameter parameter = new MethodParameter(getMethod("byteArray", byte[].class), 0); + MethodParameter parameter = new MethodParameter( + getMethod("byteArray", byte[].class), 0); Object resolvedArgument = resolver.resolveArgument(parameter, message); assertThat(resolvedArgument).isSameAs(payload); @@ -80,15 +81,15 @@ public class ArgumentResolversTests { public void object(Object p) { } + @SuppressWarnings("rawtypes") public void map(Map p) { } /* - * The whole point of this converter is to return something other - * then what is being resolved to simply validate when it is invoked - * vs. when it is not. + * The whole point of this converter is to return something other then what is being + * resolved to simply validate when it is invoked vs. when it is not. */ private static class TestMessageConverter implements MessageConverter { @@ -103,4 +104,5 @@ public class ArgumentResolversTests { } } + }