From 1d0c2f6f0e209815a5f218b34c961886320db1e1 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Thu, 10 Dec 2015 00:31:37 +0100 Subject: [PATCH] Polishing (cherry picked from commit ca9a078) --- .../DestinationPatternsMessageCondition.java | 4 ++-- .../support/PayloadArgumentResolver.java | 16 ++++++++-------- .../invocation/AbstractMethodMessageHandler.java | 2 +- .../simp/SimpMessageTypeMessageCondition.java | 7 +++---- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/DestinationPatternsMessageCondition.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/DestinationPatternsMessageCondition.java index d738836fb6..058f05a44e 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/handler/DestinationPatternsMessageCondition.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/DestinationPatternsMessageCondition.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2014 the original author or authors. + * Copyright 2002-2015 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. @@ -162,7 +162,7 @@ public class DestinationPatternsMessageCondition extends AbstractMessageConditio } List matches = new ArrayList(); - for (String pattern : patterns) { + for (String pattern : this.patterns) { if (pattern.equals(destination) || this.pathMatcher.match(pattern, destination)) { matches.add(pattern); } diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/PayloadArgumentResolver.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/PayloadArgumentResolver.java index 7bb9b86515..56db971208 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/PayloadArgumentResolver.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/PayloadArgumentResolver.java @@ -85,8 +85,8 @@ public class PayloadArgumentResolver implements HandlerMethodArgumentResolver { } @Override - public Object resolveArgument(MethodParameter param, Message message) throws Exception { - Payload ann = param.getParameterAnnotation(Payload.class); + public Object resolveArgument(MethodParameter parameter, Message message) throws Exception { + Payload ann = parameter.getParameterAnnotation(Payload.class); if (ann != null && StringUtils.hasText(ann.value())) { throw new IllegalStateException("@Payload SpEL expressions not supported by this resolver"); } @@ -94,19 +94,19 @@ public class PayloadArgumentResolver implements HandlerMethodArgumentResolver { Object payload = message.getPayload(); if (isEmptyPayload(payload)) { if (ann == null || ann.required()) { - String paramName = getParameterName(param); + String paramName = getParameterName(parameter); BindingResult bindingResult = new BeanPropertyBindingResult(payload, paramName); - bindingResult.addError(new ObjectError(paramName, "@Payload param is required")); - throw new MethodArgumentNotValidException(message, param, bindingResult); + bindingResult.addError(new ObjectError(paramName, "Payload value must not be empty")); + throw new MethodArgumentNotValidException(message, parameter, bindingResult); } else { return null; } } - Class targetClass = param.getParameterType(); + Class targetClass = parameter.getParameterType(); if (ClassUtils.isAssignable(targetClass, payload.getClass())) { - validate(message, param, payload); + validate(message, parameter, payload); return payload; } else { @@ -115,7 +115,7 @@ public class PayloadArgumentResolver implements HandlerMethodArgumentResolver { throw new MessageConversionException(message, "No converter found to convert to " + targetClass + ", message=" + message); } - validate(message, param, payload); + validate(message, parameter, payload); return payload; } } diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/AbstractMethodMessageHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/AbstractMethodMessageHandler.java index c6345d89f6..e6f415d91b 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/AbstractMethodMessageHandler.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/AbstractMethodMessageHandler.java @@ -413,7 +413,7 @@ public abstract class AbstractMethodMessageHandler for (T mapping : mappingsToCheck) { T match = getMatchingMapping(mapping, message); if (match != null) { - matches.add(new Match(match, handlerMethods.get(mapping))); + matches.add(new Match(match, this.handlerMethods.get(mapping))); } } } diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/SimpMessageTypeMessageCondition.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/SimpMessageTypeMessageCondition.java index a6fa137ccb..9f33e2212d 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/SimpMessageTypeMessageCondition.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/SimpMessageTypeMessageCondition.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2015 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. @@ -57,7 +57,7 @@ public class SimpMessageTypeMessageCondition extends AbstractMessageCondition getContent() { - return Arrays.asList(messageType); + return Arrays.asList(this.messageType); } @Override @@ -72,12 +72,10 @@ public class SimpMessageTypeMessageCondition extends AbstractMessageCondition message) { - Object actualMessageType = SimpMessageHeaderAccessor.getMessageType(message.getHeaders()); if (actualMessageType == null) { return null; } - return this; } @@ -97,4 +95,5 @@ public class SimpMessageTypeMessageCondition extends AbstractMessageCondition