Skip to content

Commit ef0973c

Browse files
committed
Test against latest Framework 5.1 snapshot
This updates REST Docs to test against Framework's latest 5.1 snapshot. Due to a bug in the behaviour of HttpHeaders' key set [1], HeaderRemovingOperationPreprocessor has been updated to no longer use it when removing headers from a request or response prior to it being documented. [1] spring-projects/spring-framework#22821
1 parent 4bbc5b3 commit ef0973c

File tree

4 files changed

+8
-9
lines changed

4 files changed

+8
-9
lines changed

spring-restdocs-core/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,6 @@ test {
6767
matrixTest {
6868
springFramework {
6969
group = 'org.springframework'
70-
versions = ['5.1.0.BUILD-SNAPSHOT']
70+
versions = ['5.1.10.BUILD-SNAPSHOT']
7171
}
7272
}

spring-restdocs-core/src/main/java/org/springframework/restdocs/operation/preprocess/HeaderRemovingOperationPreprocessor.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616

1717
package org.springframework.restdocs.operation.preprocess;
1818

19-
import java.util.Iterator;
19+
import java.util.List;
20+
import java.util.Map.Entry;
2021

2122
import org.springframework.http.HttpHeaders;
2223
import org.springframework.restdocs.operation.OperationRequest;
@@ -55,11 +56,9 @@ public OperationRequest preprocess(OperationRequest request) {
5556

5657
private HttpHeaders removeHeaders(HttpHeaders originalHeaders) {
5758
HttpHeaders processedHeaders = new HttpHeaders();
58-
processedHeaders.putAll(originalHeaders);
59-
Iterator<String> headers = processedHeaders.keySet().iterator();
60-
while (headers.hasNext()) {
61-
if (this.headerFilter.excludeHeader(headers.next())) {
62-
headers.remove();
59+
for (Entry<String, List<String>> header : originalHeaders.entrySet()) {
60+
if (!this.headerFilter.excludeHeader(header.getKey())) {
61+
processedHeaders.put(header.getKey(), header.getValue());
6362
}
6463
}
6564
return processedHeaders;

spring-restdocs-mockmvc/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ test {
2121
matrixTest {
2222
springFramework {
2323
group = 'org.springframework'
24-
versions = ['5.1.0.BUILD-SNAPSHOT']
24+
versions = ['5.1.10.BUILD-SNAPSHOT']
2525
}
2626
}

spring-restdocs-webtestclient/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ test {
1919
matrixTest {
2020
springFramework {
2121
group = 'org.springframework'
22-
versions = ['5.1.0.BUILD-SNAPSHOT']
22+
versions = ['5.1.10.BUILD-SNAPSHOT']
2323
}
2424
}

0 commit comments

Comments
 (0)