GitHub-Spring
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Polishing

pull/715/head
Juergen Hoeller 11 years ago
parent
3bfe4dcca7
commit
730bd02da7
2 changed files with 11 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SimpAnnotationMethodMessageHandler.java
  2. 4
      spring-web/src/main/java/org/springframework/web/util/WebUtils.java

18
spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SimpAnnotationMethodMessageHandler.java
Unescape 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);
} }

4
spring-web/src/main/java/org/springframework/web/util/WebUtils.java
Unescape View File

@ -207,7 +207,7 @@ public abstract class WebUtils {
return null; return null;
} }
String param = servletContext.getInitParameter(HTML_ESCAPE_CONTEXT_PARAM); String param = servletContext.getInitParameter(HTML_ESCAPE_CONTEXT_PARAM);
return (StringUtils.hasText(param)? Boolean.valueOf(param) : null); return (StringUtils.hasText(param) ? Boolean.valueOf(param) : null);
} }
/** /**
@ -227,7 +227,7 @@ public abstract class WebUtils {
return null; return null;
} }
String param = servletContext.getInitParameter(RESPONSE_ENCODED_HTML_ESCAPE_CONTEXT_PARAM); String param = servletContext.getInitParameter(RESPONSE_ENCODED_HTML_ESCAPE_CONTEXT_PARAM);
return (StringUtils.hasText(param)? Boolean.valueOf(param) : null); return (StringUtils.hasText(param) ? Boolean.valueOf(param) : null);
} }
/** /**

Write Preview
Loading…
Cancel
Save