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

Merge branch '6.2.x'

Browse Source
This commit is contained in:
rstoyanchev
2025-01-28 15:37:38 +00:00
parent db3c2b39b1 a6b6d19545
commit 52c187bf64
6 changed files with 54 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExtendedServletRequestDataBinder.java
View File

@@ -125,7 +125,7 @@ public class ExtendedServletRequestDataBinder extends ServletRequestDataBinder {
String name = names.nextElement();
Object value = getHeaderValue(httpRequest, name);
if (value != null) {
name = StringUtils.uncapitalize(name.replace("-", ""));
name = normalizeHeaderName(name);
addValueIfNotPresent(mpvs, "Header", name, value);
}
}
@@ -171,6 +171,10 @@ public class ExtendedServletRequestDataBinder extends ServletRequestDataBinder {
return values;
}
private static String normalizeHeaderName(String name) {
return StringUtils.uncapitalize(name.replace("-", ""));
}
/**
* Resolver of values that looks up URI path variables.
@@ -206,8 +210,10 @@ public class ExtendedServletRequestDataBinder extends ServletRequestDataBinder {
if (request instanceof HttpServletRequest httpServletRequest) {
Enumeration<String> enumeration = httpServletRequest.getHeaderNames();
while (enumeration.hasMoreElements()) {
String headerName = enumeration.nextElement();
set.add(headerName.replaceAll("-", ""));
String name = enumeration.nextElement();
if (headerPredicate.test(name)) {
set.add(normalizeHeaderName(name));
}
}
}
return set;

17
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ExtendedServletRequestDataBinderTests.java
View File

@@ -119,6 +119,23 @@ class ExtendedServletRequestDataBinderTests {
assertThat(mpvs).isEmpty();
}
@Test
void headerPredicateWithConstructorArgs() {
ExtendedServletRequestDataBinder binder = new ExtendedServletRequestDataBinder(null);
binder.addHeaderPredicate(name -> !name.equalsIgnoreCase("Some-Int-Array"));
binder.setTargetType(ResolvableType.forClass(DataBean.class));
binder.setNameResolver(new BindParamNameResolver());
request.addHeader("Some-Int-Array", "1");
request.addHeader("Some-Int-Array", "2");
binder.construct(request);
DataBean bean = (DataBean) binder.getTarget();
assertThat(bean.someIntArray()).isNull();
}
@Test
void headerPredicate() {
TestBinder binder = new TestBinder();