Skip to content

Spring7 migration #1779

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
fatroom wants to merge 6 commits into from
+368 −411
Closed

Spring7 migration #1779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cea0913
Release 4.5.0
Aug 14, 2025
8223b62
Development 4.5.1-SNAPSHOT
Aug 14, 2025
11b50d5
Add private constructor util class to avoid coverage failures
fatroom Dec 22, 2025
23578a0
Spring 7: avoid removed SPECIFICITY_COMPARATOR usage
fatroom Dec 22, 2025
9e4dcc3
Intermediate state of spring 7 migration
fatroom Dec 22, 2025
ff51bc8
Added RFC compliant headers in caching test
fatroom Dec 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>org.zalando</groupId>
<artifactId>riptide</artifactId>
<version>4.4.1-SNAPSHOT</version>
<version>4.5.1-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Riptide</name>
Expand Down Expand Up @@ -77,7 +77,7 @@
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>

<spring.version>6.2.1</spring.version>
<spring.version>7.0.1</spring.version>
</properties>

<build>
Expand Down
2 changes: 1 addition & 1 deletion riptide-auth/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.zalando</groupId>
<artifactId>riptide-parent</artifactId>
<version>4.4.1-SNAPSHOT</version>
<version>4.5.1-SNAPSHOT</version>
<relativePath>../riptide-parent</relativePath>
</parent>

Expand Down
40 changes: 20 additions & 20 deletions riptide-bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.zalando</groupId>
<artifactId>riptide</artifactId>
<version>4.4.1-SNAPSHOT</version>
<version>4.5.1-SNAPSHOT</version>
</parent>

<artifactId>riptide-bom</artifactId>
Expand All @@ -21,97 +21,97 @@
<dependency>
<groupId>org.zalando</groupId>
<artifactId>riptide-auth</artifactId>
<version>4.4.1-SNAPSHOT</version>
<version>4.5.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.zalando</groupId>
<artifactId>riptide-capture</artifactId>
<version>4.4.1-SNAPSHOT</version>
<version>4.5.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.zalando</groupId>
<artifactId>riptide-chaos</artifactId>
<version>4.4.1-SNAPSHOT</version>
<version>4.5.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.zalando</groupId>
<artifactId>riptide-compatibility</artifactId>
<version>4.4.1-SNAPSHOT</version>
<version>4.5.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.zalando</groupId>
<artifactId>riptide-concurrent</artifactId>
<version>4.4.1-SNAPSHOT</version>
<version>4.5.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.zalando</groupId>
<artifactId>riptide-core</artifactId>
<version>4.4.1-SNAPSHOT</version>
<version>4.5.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.zalando</groupId>
<artifactId>riptide-failsafe</artifactId>
<version>4.4.1-SNAPSHOT</version>
<version>4.5.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.zalando</groupId>
<artifactId>riptide-faults</artifactId>
<version>4.4.1-SNAPSHOT</version>
<version>4.5.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.zalando</groupId>
<artifactId>riptide-httpclient</artifactId>
<version>4.4.1-SNAPSHOT</version>
<version>4.5.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.zalando</groupId>
<artifactId>riptide-idempotency</artifactId>
<version>4.4.1-SNAPSHOT</version>
<version>4.5.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.zalando</groupId>
<artifactId>riptide-logbook</artifactId>
<version>4.4.1-SNAPSHOT</version>
<version>4.5.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.zalando</groupId>
<artifactId>riptide-micrometer</artifactId>
<version>4.4.1-SNAPSHOT</version>
<version>4.5.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.zalando</groupId>
<artifactId>riptide-opentracing</artifactId>
<version>4.4.1-SNAPSHOT</version>
<version>4.5.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.zalando</groupId>
<artifactId>riptide-opentelemetry</artifactId>
<version>4.4.1-SNAPSHOT</version>
<version>4.5.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.zalando</groupId>
<artifactId>riptide-problem</artifactId>
<version>4.4.1-SNAPSHOT</version>
<version>4.5.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.zalando</groupId>
<artifactId>riptide-soap</artifactId>
<version>4.4.1-SNAPSHOT</version>
<version>4.5.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.zalando</groupId>
<artifactId>riptide-spring-boot-autoconfigure</artifactId>
<version>4.4.1-SNAPSHOT</version>
<version>4.5.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.zalando</groupId>
<artifactId>riptide-spring-boot-starter</artifactId>
<version>4.4.1-SNAPSHOT</version>
<version>4.5.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.zalando</groupId>
<artifactId>riptide-stream</artifactId>
<version>4.4.1-SNAPSHOT</version>
<version>4.5.1-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>
Expand Down
2 changes: 1 addition & 1 deletion riptide-capture/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.zalando</groupId>
<artifactId>riptide-parent</artifactId>
<version>4.4.1-SNAPSHOT</version>
<version>4.5.1-SNAPSHOT</version>
<relativePath>../riptide-parent</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion riptide-chaos/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.zalando</groupId>
<artifactId>riptide-parent</artifactId>
<version>4.4.1-SNAPSHOT</version>
<version>4.5.1-SNAPSHOT</version>
<relativePath>../riptide-parent</relativePath>
</parent>

Expand Down
8 changes: 4 additions & 4 deletions riptide-chaos/src/main/java/org/zalando/riptide/chaos/ErrorResponseInjection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,10 @@ public HttpStatus getStatusCode() {
return status;
}

@Override
public int getRawStatusCode() {
return status.value();
}
// @Override
// public int getRawStatusCode() {
// return status.value();
// }

@Nonnull
@Override
Expand Down
6 changes: 3 additions & 3 deletions riptide-chaos/src/test/java/org/zalando/riptide/chaos/ChaosPluginTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import org.apache.hc.core5.util.Timeout;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.springframework.http.HttpStatus;
import org.springframework.http.client.ClientHttpResponse;
import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
import org.zalando.riptide.Http;
Expand Down Expand Up @@ -151,7 +152,7 @@ void shouldInjectErrorResponse() throws IOException {
assertThat(response.getStatusCode(), is(oneOf(INTERNAL_SERVER_ERROR, SERVICE_UNAVAILABLE)));
assertThat(response.getStatusCode().value(), is(oneOf(500, 503)));
assertThat(response.getStatusText(), is(oneOf("Internal Server Error", "Service Unavailable")));
assertThat(response.getHeaders(), is(anEmptyMap())); // TODO can we do better?
assertThat(response.getHeaders().asMultiValueMap(), is(anEmptyMap())); // TODO can we do better?
verify(server, 1, "/foo");
}

Expand Down Expand Up @@ -219,8 +220,7 @@ void shouldInjectLatencyAndErrorResponse() throws IOException {
final Instant end = clock.instant();

assertThat(Duration.between(start, end), is(greaterThanOrEqualTo(Duration.ofSeconds(1))));
// noinspection deprecation: Using getRawStatusCode() to satisfy coverage
assertThat(response.getRawStatusCode(), is(oneOf(500, 503)));
assertThat(response.getStatusCode(), is(oneOf(HttpStatus.INTERNAL_SERVER_ERROR, HttpStatus.SERVICE_UNAVAILABLE)));
verify(server, 1, "/foo");
}

Expand Down
2 changes: 1 addition & 1 deletion riptide-compatibility/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.zalando</groupId>
<artifactId>riptide-parent</artifactId>
<version>4.4.1-SNAPSHOT</version>
<version>4.5.1-SNAPSHOT</version>
<relativePath>../riptide-parent</relativePath>
</parent>

Expand Down
48 changes: 0 additions & 48 deletions ...src/main/java/org/zalando/riptide/compatibility/CompletableToListenableFutureAdapter.java
View file
Open in desktop

This file was deleted.

22 changes: 11 additions & 11 deletions riptide-compatibility/src/main/java/org/zalando/riptide/compatibility/HttpOperations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,53 +154,53 @@ public <T> T postForObject(final URI url, @Nullable final Object body, final Cla
@Override
public <T> ResponseEntity<T> postForEntity(final String url, @Nullable final Object body,
final Class<T> responseType, final Object... uriVariables) {
return exchange(url, POST, new HttpEntity<>(body, null), responseType, uriVariables);
return exchange(url, POST, new HttpEntity<>(body ), responseType, uriVariables);
}

@Nonnull
@Override
public <T> ResponseEntity<T> postForEntity(final String url, @Nullable final Object body,
final Class<T> responseType, final Map<String, ?> uriVariables) {
return exchange(url, POST, new HttpEntity<>(body, null), responseType, uriVariables);
return exchange(url, POST, new HttpEntity<>(body), responseType, uriVariables);
}

@Nonnull
@Override
public <T> ResponseEntity<T> postForEntity(final URI url, @Nullable final Object body,
final Class<T> responseType) {
return exchange(url, POST, new HttpEntity<>(body, null), responseType);
return exchange(url, POST, new HttpEntity<>(body), responseType);
}

@Override
public void put(final String url, @Nullable final Object body, final Object... uriVariables) {
exchange(url, PUT, new HttpEntity<>(body, null), Void.class, uriVariables);
exchange(url, PUT, new HttpEntity<>(body), Void.class, uriVariables);
}

@Override
public void put(final String url, @Nullable final Object body, final Map<String, ?> uriVariables) {
exchange(url, PUT, new HttpEntity<>(body, null), Void.class, uriVariables);
exchange(url, PUT, new HttpEntity<>(body), Void.class, uriVariables);
}

@Override
public void put(final URI url, @Nullable final Object body) {
exchange(url, PUT, new HttpEntity<>(body, null), Void.class);
exchange(url, PUT, new HttpEntity<>(body), Void.class);
}

@Override
public <T> T patchForObject(final String url, @Nullable final Object body, final Class<T> responseType,
final Object... uriVariables) {
return exchange(url, PATCH, new HttpEntity<>(body, null), responseType, uriVariables).getBody();
return exchange(url, PATCH, new HttpEntity<>(body), responseType, uriVariables).getBody();
}

@Override
public <T> T patchForObject(final String url, @Nullable final Object body, final Class<T> responseType,
final Map<String, ?> uriVariables) {
return exchange(url, PATCH, new HttpEntity<>(body, null), responseType, uriVariables).getBody();
return exchange(url, PATCH, new HttpEntity<>(body), responseType, uriVariables).getBody();
}

@Override
public <T> T patchForObject(final URI url, @Nullable final Object body, final Class<T> responseType) {
return exchange(url, PATCH, new HttpEntity<>(body, null), responseType).getBody();
return exchange(url, PATCH, new HttpEntity<>(body), responseType).getBody();
}

@Override
Expand Down Expand Up @@ -352,7 +352,7 @@ private <T> T execute(final String url, final HttpMethod method,
final Object[] uriVariables) {

return http.execute(method, url, uriVariables)
.headers(getHeaders(entity))
.headers(getHeaders(entity).asMultiValueMap())
.body(getBody(entity))
.call(route(route))
.thenApply(function).join();
Expand Down Expand Up @@ -381,7 +381,7 @@ private <T> T execute(final URI url, final HttpMethod method,
@Nullable final HttpEntity<?> entity, final Route route, final Function<ClientHttpResponse, T> function) {

return http.execute(method, url)
.headers(getHeaders(entity))
.headers(getHeaders(entity).asMultiValueMap())
.body(getBody(entity))
.call(route(route))
.thenApply(function).join();
Expand Down
Loading
Loading