From ca9a078d829e41a4e9871efe3877712517331485 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Thu, 10 Dec 2015 00:31:37 +0100 Subject: [PATCH] Polishing --- .../handler/DestinationPatternsMessageCondition.java | 4 ++-- .../annotation/support/PayloadArgumentResolver.java | 2 +- .../handler/invocation/AbstractMethodMessageHandler.java | 2 +- .../messaging/simp/SimpMessageTypeMessageCondition.java | 7 +++---- 4 files changed, 7 insertions(+), 8 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 bface20cfb..099fa1ae6f 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 @@ -97,7 +97,7 @@ public class PayloadArgumentResolver implements HandlerMethodArgumentResolver { if (ann == null || ann.required()) { String paramName = getParameterName(parameter); BindingResult bindingResult = new BeanPropertyBindingResult(payload, paramName); - bindingResult.addError(new ObjectError(paramName, "@Payload param is required")); + bindingResult.addError(new ObjectError(paramName, "Payload value must not be empty")); throw new MethodArgumentNotValidException(message, parameter, bindingResult); } else { 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 43e7c38edb..1aaa0da811 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 @@ -456,7 +456,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