Polishing

Author: jhoeller

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 DestinationPatternsMessageCondition getMatchingCondition(Message<?> messa
 		}
 
 		List<String> matches = new ArrayList<String>();
-		for (String pattern : patterns) {
+		for (String pattern : this.patterns) {
 			if (pattern.equals(destination) || this.pathMatcher.match(pattern, destination)) {
 				matches.add(pattern);
 			}

spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/PayloadArgumentResolver.java

@@ -97,7 +97,7 @@ public Object resolveArgument(MethodParameter parameter, Message<?> message) thr
 			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 {

spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/AbstractMethodMessageHandler.java

@@ -456,7 +456,7 @@ private void addMatchesToCollection(Collection<T> mappingsToCheck, Message<?> me
 		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)));
 			}
 		}
 	}

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 SimpMessageType getMessageType() {
 
 	@Override
 	protected Collection<?> getContent() {
-		return Arrays.asList(messageType);
+		return Arrays.asList(this.messageType);
 	}
 
 	@Override
@@ -72,12 +72,10 @@ public SimpMessageTypeMessageCondition combine(SimpMessageTypeMessageCondition o
 
 	@Override
 	public SimpMessageTypeMessageCondition getMatchingCondition(Message<?> message) {
-
 		Object actualMessageType = SimpMessageHeaderAccessor.getMessageType(message.getHeaders());
 		if (actualMessageType == null) {
 			return null;
 		}
-
 		return this;
 	}
 
@@ -97,4 +95,5 @@ else if (actualMessageType.equals(other.getMessageType())) {
 		}
 		return 0;
 	}
+
 }