Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Introduce alias for 'value' attribute in @Header

Browse Source 
This commit introduces 'name' as an alias for 'value' in @Header.

Issue: SPR-11393
This commit is contained in:
Sam Brannen
2015-05-29 23:23:52 +02:00
parent 35c3e7c0f3
commit 60a5ec87d0
5 changed files with 42 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-messaging/src/test/java/org/springframework/messaging/handler/annotation/support/HeaderMethodArgumentResolverTests.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.
@@ -139,8 +139,8 @@ public class HeaderMethodArgumentResolverTests {
@SuppressWarnings("unused")
private void handleMessage(
@Header String param1,
@Header(value = "name", defaultValue = "bar") String param2,
@Header(value = "name", defaultValue="#{systemProperties.systemProperty}") String param3,
@Header(name = "name", defaultValue = "bar") String param2,
@Header(name = "name", defaultValue = "#{systemProperties.systemProperty}") String param3,
String param4,
@Header("nativeHeaders.param1") String nativeHeaderParam1) {
}

4
spring-messaging/src/test/java/org/springframework/messaging/simp/annotation/support/SimpAnnotationMethodMessageHandlerTests.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.
@@ -371,7 +371,7 @@ public class SimpAnnotationMethodMessageHandlerTests {
}
@MessageMapping("/optionalHeaders")
public void optionalHeaders(@Header(value="foo", required=false) String foo1, @Header(value="foo") Optional<String> foo2) {
public void optionalHeaders(@Header(name="foo", required=false) String foo1, @Header("foo") Optional<String> foo2) {
this.method = "optionalHeaders";
this.arguments.put("foo1", foo1);
this.arguments.put("foo2", (foo2.isPresent() ? foo2.get() : null));