Skip to content

Commit efbdf84

Browse files
committed
Transform header name to property name using "camelCase", and use replace instead of replaceAll.
1 parent 57c0d95 commit efbdf84

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ protected void addBindValues(MutablePropertyValues mpvs, ServletRequest request)
124124
String name = names.nextElement();
125125
Object value = getHeaderValue(httpRequest, name);
126126
if (value != null) {
127-
name = StringUtils.uncapitalize(name.replace("-", ""));
127+
name = transformedHeaderName(name);
128128
addValueIfNotPresent(mpvs, "Header", name, value);
129129
}
130130
}
@@ -147,6 +147,10 @@ private static void addValueIfNotPresent(MutablePropertyValues mpvs, String labe
147147
}
148148
}
149149

150+
private static String transformedHeaderName(String headerName) {
151+
return StringUtils.uncapitalize(headerName.replace("-", ""));
152+
}
153+
150154
private @Nullable Object getHeaderValue(HttpServletRequest request, String name) {
151155
if (!this.headerPredicate.test(name)) {
152156
return null;
@@ -206,7 +210,7 @@ protected Set<String> initParameterNames(ServletRequest request) {
206210
Enumeration<String> enumeration = httpServletRequest.getHeaderNames();
207211
while (enumeration.hasMoreElements()) {
208212
String headerName = enumeration.nextElement();
209-
set.add(headerName.replaceAll("-", ""));
213+
set.add(transformedHeaderName(headerName));
210214
}
211215
}
212216
return set;

0 commit comments

Comments
 (0)