From 1cc042d4c70f425cde00ec107521dd99c10fe70a Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Thu, 7 May 2015 16:03:15 +0200 Subject: [PATCH] Polishing --- .../context/PayloadApplicationEvent.java | 8 +++-- .../AnnotationDrivenEventListenerTests.java | 6 ++-- .../simp/stomp/StompHeaderAccessor.java | 31 ++++++++++--------- .../web/bind/annotation/CrossOrigin.java | 6 ++-- .../MaxUploadSizeExceededException.java | 4 +-- 5 files changed, 30 insertions(+), 25 deletions(-) diff --git a/spring-context/src/main/java/org/springframework/context/PayloadApplicationEvent.java b/spring-context/src/main/java/org/springframework/context/PayloadApplicationEvent.java index c0b46fb3a83..22ba29b2550 100644 --- a/spring-context/src/main/java/org/springframework/context/PayloadApplicationEvent.java +++ b/spring-context/src/main/java/org/springframework/context/PayloadApplicationEvent.java @@ -33,6 +33,11 @@ public class PayloadApplicationEvent extends ApplicationEvent { private final T payload; + /** + * Create a new PayloadApplicationEvent. + * @param source the component that published the event (never {@code null}) + * @param payload the payload object + */ public PayloadApplicationEvent(Object source, T payload) { super(source); Assert.notNull(payload, "Payload must not be null"); @@ -44,8 +49,7 @@ public class PayloadApplicationEvent extends ApplicationEvent { * Return the payload of the event. */ public T getPayload() { - return payload; + return this.payload; } } - diff --git a/spring-context/src/test/java/org/springframework/context/event/AnnotationDrivenEventListenerTests.java b/spring-context/src/test/java/org/springframework/context/event/AnnotationDrivenEventListenerTests.java index acaebc90f56..f68902daf20 100644 --- a/spring-context/src/test/java/org/springframework/context/event/AnnotationDrivenEventListenerTests.java +++ b/spring-context/src/test/java/org/springframework/context/event/AnnotationDrivenEventListenerTests.java @@ -636,9 +636,9 @@ public class AnnotationDrivenEventListenerTests { } @Override - @EventListener(condition = "'OK'.equals(#content)") - public void handleString(String content) { - super.handleString(content); + @EventListener(condition = "#payload.startsWith('OK')") + public void handleString(String payload) { + super.handleString(payload); } @EventListener(condition = "#root.event.timestamp > #p0") diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaderAccessor.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaderAccessor.java index 3538a639357..78db72b10e9 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaderAccessor.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaderAccessor.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. @@ -218,19 +218,28 @@ public class StompHeaderAccessor extends SimpMessageHeaderAccessor { return (StompCommand) getHeader(COMMAND_HEADER); } - public Set getAcceptVersion() { - String rawValue = getFirstNativeHeader(STOMP_ACCEPT_VERSION_HEADER); - return (rawValue != null ? StringUtils.commaDelimitedListToSet(rawValue) : Collections.emptySet()); - } - public boolean isHeartbeat() { return (SimpMessageType.HEARTBEAT == getMessageType()); } + public long[] getHeartbeat() { + String rawValue = getFirstNativeHeader(STOMP_HEARTBEAT_HEADER); + if (!StringUtils.hasText(rawValue)) { + return Arrays.copyOf(DEFAULT_HEARTBEAT, 2); + } + String[] rawValues = StringUtils.commaDelimitedListToStringArray(rawValue); + return new long[] {Long.valueOf(rawValues[0]), Long.valueOf(rawValues[1])}; + } + public void setAcceptVersion(String acceptVersion) { setNativeHeader(STOMP_ACCEPT_VERSION_HEADER, acceptVersion); } + public Set getAcceptVersion() { + String rawValue = getFirstNativeHeader(STOMP_ACCEPT_VERSION_HEADER); + return (rawValue != null ? StringUtils.commaDelimitedListToSet(rawValue) : Collections.emptySet()); + } + public void setHost(String host) { setNativeHeader(STOMP_HOST_HEADER, host); } @@ -245,15 +254,7 @@ public class StompHeaderAccessor extends SimpMessageHeaderAccessor { setNativeHeader(STOMP_DESTINATION_HEADER, destination); } - public long[] getHeartbeat() { - String rawValue = getFirstNativeHeader(STOMP_HEARTBEAT_HEADER); - if (!StringUtils.hasText(rawValue)) { - return Arrays.copyOf(DEFAULT_HEARTBEAT, 2); - } - String[] rawValues = StringUtils.commaDelimitedListToStringArray(rawValue); - return new long[] { Long.valueOf(rawValues[0]), Long.valueOf(rawValues[1])}; - } - + @Override public void setContentType(MimeType contentType) { super.setContentType(contentType); setNativeHeader(STOMP_CONTENT_TYPE_HEADER, contentType.toString()); diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/CrossOrigin.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/CrossOrigin.java index b6029faaa50..95a9620331a 100644 --- a/spring-web/src/main/java/org/springframework/web/bind/annotation/CrossOrigin.java +++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/CrossOrigin.java @@ -26,9 +26,9 @@ import java.lang.annotation.Target; * Marks the annotated method as permitting cross origin requests. * By default, all origins and headers are permitted. * - * @since 4.2 * @author Russell Allen * @author Sebastien Deleuze + * @since 4.2 */ @Target({ElementType.METHOD, ElementType.TYPE}) @Retention(RetentionPolicy.RUNTIME) @@ -37,7 +37,7 @@ public @interface CrossOrigin { /** * List of allowed origins. {@code "*"} means that all origins are allowed. These values - * are placed in the {@code Access-Control-Allow-Origin } header of both the pre-flight + * are placed in the {@code Access-Control-Allow-Origin} header of both the pre-flight * and actual responses. Default value is "*". */ String[] origin() default {"*"}; @@ -71,7 +71,7 @@ public @interface CrossOrigin { String allowCredentials() default "true"; /** - * Controls the cache duration for pre-flight responses. Setting this to a reasonable + * Controls the cache duration for pre-flight responses. Setting this to a reasonable * value can reduce the number of pre-flight request/response interaction required by * the browser. This property controls the value of the {@code Access-Control-Max-Age header} * in the pre-flight response. Value set to -1 means undefined. Default value is diff --git a/spring-web/src/main/java/org/springframework/web/multipart/MaxUploadSizeExceededException.java b/spring-web/src/main/java/org/springframework/web/multipart/MaxUploadSizeExceededException.java index 36eb573b57e..fce24534467 100644 --- a/spring-web/src/main/java/org/springframework/web/multipart/MaxUploadSizeExceededException.java +++ b/spring-web/src/main/java/org/springframework/web/multipart/MaxUploadSizeExceededException.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 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. @@ -52,7 +52,7 @@ public class MaxUploadSizeExceededException extends MultipartException { * Return the maximum upload size allowed. */ public long getMaxUploadSize() { - return maxUploadSize; + return this.maxUploadSize; } }