Skip to content

Commit 6f22bcb

Browse files
spencergibbspencergibb
committed
Updates for Spring Framework 7
1 parent e40020e commit 6f22bcb

File tree

84 files changed

+238
-219
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+238
-219
lines changed

‎docs/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.springframework.cloud</groupId>
88
<artifactId>spring-cloud-gateway</artifactId>
9-
<version>4.3.1-SNAPSHOT</version>
9+
<version>5.0.0-SNAPSHOT</version>
1010
</parent>
1111
<artifactId>spring-cloud-gateway-docs</artifactId>
1212
<packaging>jar</packaging>

‎pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>org.springframework.cloud</groupId>
88
<artifactId>spring-cloud-gateway</artifactId>
9-
<version>4.3.1-SNAPSHOT</version>
9+
<version>5.0.0-SNAPSHOT</version>
1010
<packaging>pom</packaging>
1111

1212
<name>Spring Cloud Gateway</name>
@@ -15,7 +15,7 @@
1515
<parent>
1616
<groupId>org.springframework.cloud</groupId>
1717
<artifactId>spring-cloud-build</artifactId>
18-
<version>4.3.1-SNAPSHOT</version>
18+
<version>5.0.0-SNAPSHOT</version>
1919
<relativePath/>
2020
</parent>
2121
<scm>
@@ -55,8 +55,8 @@
5555
<blockhound.version>1.0.8.RELEASE</blockhound.version>
5656
<java.version>17</java.version>
5757
<junit-pioneer.version>2.3.0</junit-pioneer.version>
58-
<spring-cloud-circuitbreaker.version>3.3.1-SNAPSHOT</spring-cloud-circuitbreaker.version>
59-
<spring-cloud-commons.version>4.3.1-SNAPSHOT</spring-cloud-commons.version>
58+
<spring-cloud-circuitbreaker.version>5.0.0-SNAPSHOT</spring-cloud-circuitbreaker.version>
59+
<spring-cloud-commons.version>5.0.0-SNAPSHOT</spring-cloud-commons.version>
6060
<spring-cloud-function.version>4.3.1-SNAPSHOT</spring-cloud-function.version>
6161
<spring-cloud-stream.version>4.3.1-SNAPSHOT</spring-cloud-stream.version>
6262
</properties>

‎spring-cloud-gateway-dependencies/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
<parent>
77
<artifactId>spring-cloud-dependencies-parent</artifactId>
88
<groupId>org.springframework.cloud</groupId>
9-
<version>4.3.1-SNAPSHOT</version>
9+
<version>5.0.0-SNAPSHOT</version>
1010
<relativePath/>
1111
</parent>
1212

1313
<artifactId>spring-cloud-gateway-dependencies</artifactId>
14-
<version>4.3.1-SNAPSHOT</version>
14+
<version>5.0.0-SNAPSHOT</version>
1515
<packaging>pom</packaging>
1616

1717
<name>spring-cloud-gateway-dependencies</name>

‎spring-cloud-gateway-integration-tests/grpc/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<parent>
1919
<groupId>org.springframework.cloud</groupId>
2020
<artifactId>spring-cloud-gateway-integration-tests</artifactId>
21-
<version>4.3.1-SNAPSHOT</version>
21+
<version>5.0.0-SNAPSHOT</version>
2222
<relativePath>..</relativePath> <!-- lookup parent from repository -->
2323
</parent>
2424

‎spring-cloud-gateway-integration-tests/http2/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<parent>
1717
<groupId>org.springframework.cloud</groupId>
1818
<artifactId>spring-cloud-gateway-integration-tests</artifactId>
19-
<version>4.3.1-SNAPSHOT</version>
19+
<version>5.0.0-SNAPSHOT</version>
2020
<relativePath>..</relativePath> <!-- lookup parent from repository -->
2121
</parent>
2222

‎spring-cloud-gateway-integration-tests/httpclient/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<parent>
1717
<groupId>org.springframework.cloud</groupId>
1818
<artifactId>spring-cloud-gateway-integration-tests</artifactId>
19-
<version>4.3.1-SNAPSHOT</version>
19+
<version>5.0.0-SNAPSHOT</version>
2020
<relativePath>..</relativePath> <!-- lookup parent from repository -->
2121
</parent>
2222

‎spring-cloud-gateway-integration-tests/mvc-failure-analyzer/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<parent>
1717
<groupId>org.springframework.cloud</groupId>
1818
<artifactId>spring-cloud-gateway-integration-tests</artifactId>
19-
<version>4.3.1-SNAPSHOT</version>
19+
<version>5.0.0-SNAPSHOT</version>
2020
<relativePath>..</relativePath> <!-- lookup parent from repository -->
2121
</parent>
2222

‎spring-cloud-gateway-integration-tests/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<parent>
1717
<groupId>org.springframework.cloud</groupId>
1818
<artifactId>spring-cloud-gateway</artifactId>
19-
<version>4.3.1-SNAPSHOT</version>
19+
<version>5.0.0-SNAPSHOT</version>
2020
<relativePath>..</relativePath> <!-- lookup parent from repository -->
2121
</parent>
2222

‎spring-cloud-gateway-mvc/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<parent>
1212
<groupId>org.springframework.cloud</groupId>
1313
<artifactId>spring-cloud-gateway</artifactId>
14-
<version>4.3.1-SNAPSHOT</version>
14+
<version>5.0.0-SNAPSHOT</version>
1515
<relativePath>..</relativePath>
1616
</parent>
1717

‎spring-cloud-gateway-mvc/src/main/java/org/springframework/cloud/gateway/mvc/ProxyExchange.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ private void addHeaders(HttpHeaders headers) {
365365
webRequest.getHeaderNames().forEachRemaining(headerNames::add);
366366
Set<String> filteredKeys = filterHeaderKeys(headerNames);
367367
filteredKeys.stream()
368-
.filter(key -> !headers.containsKey(key))
368+
.filter(key -> !headers.containsHeader(key))
369369
.forEach(header -> headers.addAll(header, Arrays.asList(webRequest.getHeaderValues(header))));
370370
}
371371

@@ -379,7 +379,7 @@ private BodyBuilder headers(BodyBuilder builder) {
379379
}
380380

381381
private Set<String> filterHeaderKeys(HttpHeaders headers) {
382-
return filterHeaderKeys(headers.keySet());
382+
return filterHeaderKeys(headers.headerNames());
383383
}
384384

385385
private Set<String> filterHeaderKeys(Collection<String> headerNames) {
@@ -529,7 +529,7 @@ public ServletInputStream getInputStream() throws IOException {
529529

530530
@Override
531531
public Enumeration<String> getHeaderNames() {
532-
Set<String> names = headers.keySet();
532+
Set<String> names = headers.headerNames();
533533
if (names.isEmpty()) {
534534
return super.getHeaderNames();
535535
}

0 commit comments

Comments
 (0)