Upgraded to use s-c-f 2.0.1.RELEASE

This one picked up some formatting changes as well
This commit is contained in:
Oleg Zhurakousky
2019-02-14 10:37:18 +01:00
parent 233495b992
commit 24bbe1d8e1
4 changed files with 13 additions and 11 deletions

View File

@@ -28,7 +28,7 @@
<reactor.version>Californium-RELEASE</reactor.version>
<kryo-shaded.version>3.0.3</kryo-shaded.version>
<objenesis.version>2.1</objenesis.version>
<spring-cloud-function.version>2.0.0.BUILD-SNAPSHOT
<spring-cloud-function.version>2.0.1.RELEASE
</spring-cloud-function.version>
<maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError>

View File

@@ -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) {

View File

@@ -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) {

View File

@@ -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 {
}
}
}