root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Polishing

This commit is contained in:
Juergen Hoeller 2014-12-30 15:01:51 +01:00
parent 3bfe4dcca7
commit 730bd02da7
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SimpAnnotationMethodMessageHandler.java
View File

@ -188,7 +188,7 @@ public class SimpAnnotationMethodMessageHandler extends AbstractMethodMessageHan
} }
/** /**
* The configured {@link ConversionService}. * Return the configured {@link ConversionService}.
*/ */
public ConversionService getConversionService() { public ConversionService getConversionService() {
return this.conversionService; return this.conversionService;
@ -206,14 +206,14 @@ public class SimpAnnotationMethodMessageHandler extends AbstractMethodMessageHan
} }
/** /**
* Return the PathMatcher implementation to use for matching destinations * Return the PathMatcher implementation to use for matching destinations.
*/ */
public PathMatcher getPathMatcher() { public PathMatcher getPathMatcher() {
return this.pathMatcher; return this.pathMatcher;
} }
/** /**
* The configured Validator instance * Return the configured Validator instance.
*/ */
public Validator getValidator() { public Validator getValidator() {
return this.validator; return this.validator;
@ -343,17 +343,17 @@ public class SimpAnnotationMethodMessageHandler extends AbstractMethodMessageHan
@Override @Override
protected SimpMessageMappingInfo getMappingForMethod(Method method, Class<?> handlerType) { protected SimpMessageMappingInfo getMappingForMethod(Method method, Class<?> handlerType) {
MessageMapping typeAnnotation = AnnotationUtils.findAnnotation(handlerType, MessageMapping.class); MessageMapping typeAnnotation = AnnotationUtils.findAnnotation(handlerType, MessageMapping.class);
MessageMapping messageAnnot = AnnotationUtils.findAnnotation(method, MessageMapping.class); MessageMapping messageAnnotation = AnnotationUtils.findAnnotation(method, MessageMapping.class);
if (messageAnnot != null) { if (messageAnnotation != null) {
SimpMessageMappingInfo result = createMessageMappingCondition(messageAnnot); SimpMessageMappingInfo result = createMessageMappingCondition(messageAnnotation);
if (typeAnnotation != null) { if (typeAnnotation != null) {
result = createMessageMappingCondition(typeAnnotation).combine(result); result = createMessageMappingCondition(typeAnnotation).combine(result);
} }
return result; return result;
} }
SubscribeMapping subsribeAnnotation = AnnotationUtils.findAnnotation(method, SubscribeMapping.class); SubscribeMapping subscribeAnnotation = AnnotationUtils.findAnnotation(method, SubscribeMapping.class);
if (subsribeAnnotation != null) { if (subscribeAnnotation != null) {
SimpMessageMappingInfo result = createSubscribeCondition(subsribeAnnotation); SimpMessageMappingInfo result = createSubscribeCondition(subscribeAnnotation);
if (typeAnnotation != null) { if (typeAnnotation != null) {
result = createMessageMappingCondition(typeAnnotation).combine(result); result = createMessageMappingCondition(typeAnnotation).combine(result);
} }