Skip to content

Commit 274eab7

Browse files
rstoyanchevrstoyanchev
committed
Merge branch '5.1.x'
2 parents 78abc27 + a7bb5ca commit 274eab7

File tree

5 files changed

+26
-23
lines changed

5 files changed

+26
-23
lines changed

‎spring-test/src/main/java/org/springframework/mock/web/HeaderValueHolder.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2018 the original author or authors.
2+
* Copyright 2002-2019 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -91,8 +91,11 @@ public String toString() {
9191
* @param headers the Map of header names to HeaderValueHolders
9292
* @param name the name of the desired header
9393
* @return the corresponding HeaderValueHolder, or {@code null} if none found
94+
* @deprecated as of 5.1.10 in favor of using
95+
* {@link org.springframework.util.LinkedCaseInsensitiveMap}.
9496
*/
9597
@Nullable
98+
@Deprecated
9699
public static HeaderValueHolder getByName(Map<String, HeaderValueHolder> headers, String name) {
97100
Assert.notNull(name, "Header name must not be null");
98101
for (Map.Entry<String, HeaderValueHolder> entry : headers.entrySet()) {

‎spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -1038,7 +1038,7 @@ else if (HttpHeaders.ACCEPT_LANGUAGE.equalsIgnoreCase(name) &&
10381038
}
10391039

10401040
private void doAddHeaderValue(String name, @Nullable Object value, boolean replace) {
1041-
HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
1041+
HeaderValueHolder header = this.headers.get(name);
10421042
Assert.notNull(value, "Header value must not be null");
10431043
if (header == null || replace) {
10441044
header = new HeaderValueHolder();
@@ -1078,7 +1078,7 @@ public void removeHeader(String name) {
10781078
*/
10791079
@Override
10801080
public long getDateHeader(String name) {
1081-
HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
1081+
HeaderValueHolder header = this.headers.get(name);
10821082
Object value = (header != null ? header.getValue() : null);
10831083
if (value instanceof Date) {
10841084
return ((Date) value).getTime();
@@ -1115,13 +1115,13 @@ private long parseDateHeader(String name, String value) {
11151115
@Override
11161116
@Nullable
11171117
public String getHeader(String name) {
1118-
HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
1118+
HeaderValueHolder header = this.headers.get(name);
11191119
return (header != null ? header.getStringValue() : null);
11201120
}
11211121

11221122
@Override
11231123
public Enumeration<String> getHeaders(String name) {
1124-
HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
1124+
HeaderValueHolder header = this.headers.get(name);
11251125
return Collections.enumeration(header != null ? header.getStringValues() : new LinkedList<>());
11261126
}
11271127

@@ -1132,7 +1132,7 @@ public Enumeration<String> getHeaderNames() {
11321132

11331133
@Override
11341134
public int getIntHeader(String name) {
1135-
HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
1135+
HeaderValueHolder header = this.headers.get(name);
11361136
Object value = (header != null ? header.getValue() : null);
11371137
if (value instanceof Number) {
11381138
return ((Number) value).intValue();

‎spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ public Cookie getCookie(String name) {
409409

410410
@Override
411411
public boolean containsHeader(String name) {
412-
return (HeaderValueHolder.getByName(this.headers, name) != null);
412+
return (this.headers.get(name) != null);
413413
}
414414

415415
/**
@@ -434,7 +434,7 @@ public Collection<String> getHeaderNames() {
434434
@Override
435435
@Nullable
436436
public String getHeader(String name) {
437-
HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
437+
HeaderValueHolder header = this.headers.get(name);
438438
return (header != null ? header.getStringValue() : null);
439439
}
440440

@@ -448,7 +448,7 @@ public String getHeader(String name) {
448448
*/
449449
@Override
450450
public List<String> getHeaders(String name) {
451-
HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
451+
HeaderValueHolder header = this.headers.get(name);
452452
if (header != null) {
453453
return header.getStringValues();
454454
}
@@ -465,7 +465,7 @@ public List<String> getHeaders(String name) {
465465
*/
466466
@Nullable
467467
public Object getHeaderValue(String name) {
468-
HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
468+
HeaderValueHolder header = this.headers.get(name);
469469
return (header != null ? header.getValue() : null);
470470
}
471471

@@ -475,7 +475,7 @@ public Object getHeaderValue(String name) {
475475
* @return the associated header values, or an empty List if none
476476
*/
477477
public List<Object> getHeaderValues(String name) {
478-
HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
478+
HeaderValueHolder header = this.headers.get(name);
479479
if (header != null) {
480480
return header.getValues();
481481
}
@@ -643,7 +643,7 @@ else if (HttpHeaders.SET_COOKIE.equalsIgnoreCase(name)) {
643643
}
644644

645645
private void doAddHeaderValue(String name, Object value, boolean replace) {
646-
HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
646+
HeaderValueHolder header = this.headers.get(name);
647647
Assert.notNull(value, "Header value must not be null");
648648
if (header == null) {
649649
header = new HeaderValueHolder();

‎spring-web/src/test/java/org/springframework/mock/web/test/MockHttpServletRequest.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -1038,7 +1038,7 @@ else if (HttpHeaders.ACCEPT_LANGUAGE.equalsIgnoreCase(name) &&
10381038
}
10391039

10401040
private void doAddHeaderValue(String name, @Nullable Object value, boolean replace) {
1041-
HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
1041+
HeaderValueHolder header = this.headers.get(name);
10421042
Assert.notNull(value, "Header value must not be null");
10431043
if (header == null || replace) {
10441044
header = new HeaderValueHolder();
@@ -1078,7 +1078,7 @@ public void removeHeader(String name) {
10781078
*/
10791079
@Override
10801080
public long getDateHeader(String name) {
1081-
HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
1081+
HeaderValueHolder header = this.headers.get(name);
10821082
Object value = (header != null ? header.getValue() : null);
10831083
if (value instanceof Date) {
10841084
return ((Date) value).getTime();
@@ -1115,13 +1115,13 @@ private long parseDateHeader(String name, String value) {
11151115
@Override
11161116
@Nullable
11171117
public String getHeader(String name) {
1118-
HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
1118+
HeaderValueHolder header = this.headers.get(name);
11191119
return (header != null ? header.getStringValue() : null);
11201120
}
11211121

11221122
@Override
11231123
public Enumeration<String> getHeaders(String name) {
1124-
HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
1124+
HeaderValueHolder header = this.headers.get(name);
11251125
return Collections.enumeration(header != null ? header.getStringValues() : new LinkedList<>());
11261126
}
11271127

@@ -1132,7 +1132,7 @@ public Enumeration<String> getHeaderNames() {
11321132

11331133
@Override
11341134
public int getIntHeader(String name) {
1135-
HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
1135+
HeaderValueHolder header = this.headers.get(name);
11361136
Object value = (header != null ? header.getValue() : null);
11371137
if (value instanceof Number) {
11381138
return ((Number) value).intValue();

‎spring-web/src/test/java/org/springframework/mock/web/test/MockHttpServletResponse.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ public Cookie getCookie(String name) {
409409

410410
@Override
411411
public boolean containsHeader(String name) {
412-
return (HeaderValueHolder.getByName(this.headers, name) != null);
412+
return (this.headers.get(name) != null);
413413
}
414414

415415
/**
@@ -434,7 +434,7 @@ public Collection<String> getHeaderNames() {
434434
@Override
435435
@Nullable
436436
public String getHeader(String name) {
437-
HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
437+
HeaderValueHolder header = this.headers.get(name);
438438
return (header != null ? header.getStringValue() : null);
439439
}
440440

@@ -448,7 +448,7 @@ public String getHeader(String name) {
448448
*/
449449
@Override
450450
public List<String> getHeaders(String name) {
451-
HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
451+
HeaderValueHolder header = this.headers.get(name);
452452
if (header != null) {
453453
return header.getStringValues();
454454
}
@@ -465,7 +465,7 @@ public List<String> getHeaders(String name) {
465465
*/
466466
@Nullable
467467
public Object getHeaderValue(String name) {
468-
HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
468+
HeaderValueHolder header = this.headers.get(name);
469469
return (header != null ? header.getValue() : null);
470470
}
471471

@@ -475,7 +475,7 @@ public Object getHeaderValue(String name) {
475475
* @return the associated header values, or an empty List if none
476476
*/
477477
public List<Object> getHeaderValues(String name) {
478-
HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
478+
HeaderValueHolder header = this.headers.get(name);
479479
if (header != null) {
480480
return header.getValues();
481481
}
@@ -643,7 +643,7 @@ else if (HttpHeaders.SET_COOKIE.equalsIgnoreCase(name)) {
643643
}
644644

645645
private void doAddHeaderValue(String name, Object value, boolean replace) {
646-
HeaderValueHolder header = HeaderValueHolder.getByName(this.headers, name);
646+
HeaderValueHolder header = this.headers.get(name);
647647
Assert.notNull(value, "Header value must not be null");
648648
if (header == null) {
649649
header = new HeaderValueHolder();

0 commit comments

Comments
 (0)