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

Polishing

This commit is contained in:
Juergen Hoeller 2015-05-07 16:03:15 +02:00
parent 783cb2c438
commit 1cc042d4c7
5 changed files with 30 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spring-context/src/main/java/org/springframework/context/PayloadApplicationEvent.java
View File

@ -33,6 +33,11 @@ public class PayloadApplicationEvent<T> 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<T> extends ApplicationEvent {
* Return the payload of the event.
*/
public T getPayload() {
return payload;
return this.payload;
}
}

6
spring-context/src/test/java/org/springframework/context/event/AnnotationDrivenEventListenerTests.java
View File

@ -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")

31
spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompHeaderAccessor.java
View File

@ -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<String> getAcceptVersion() {
String rawValue = getFirstNativeHeader(STOMP_ACCEPT_VERSION_HEADER);
return (rawValue != null ? StringUtils.commaDelimitedListToSet(rawValue) : Collections.<String>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<String> getAcceptVersion() {
String rawValue = getFirstNativeHeader(STOMP_ACCEPT_VERSION_HEADER);
return (rawValue != null ? StringUtils.commaDelimitedListToSet(rawValue) : Collections.<String>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());

2
spring-web/src/main/java/org/springframework/web/bind/annotation/CrossOrigin.java
View File

@ -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)

4
spring-web/src/main/java/org/springframework/web/multipart/MaxUploadSizeExceededException.java
View File

@ -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;
}
}