Skip to content
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

Jump to bottom

Bump spring-boot.version from 3.2.3 to 3.3.4 #1905

Merged
merged 5 commits into from
Sep 23, 2024
Merged

Bump spring-boot.version from 3.2.3 to 3.3.4 #1905

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1cd0a68
Bump spring-boot.version from 3.2.3 to 3.3.4
dependabot[bot] Sep 20, 2024
c62f7e0
update the MultiFilterTest and bump logback versions
kasmarian Sep 20, 2024
87aee1e
Merge branch 'main' into dependabot/maven/spring-boot.version-3.3.4
msdousti Sep 20, 2024
07396d7
cast to LocalResponse in getResponse
kasmarian Sep 23, 2024
61ecbe1
Merge branch 'main' into dependabot/maven/spring-boot.version-3.3.4
msdousti Sep 23, 2024
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
6 changes: 3 additions & 3 deletions logbook-parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@
<feign.version>13.4</feign.version>

<spring.version>6.1.13</spring.version>
<spring-boot.version>3.2.3</spring-boot.version>
<spring-boot.version>3.3.4</spring-boot.version>

<junit.version>5.10.2</junit.version>
<mockito.version>5.1.1</mockito.version>
<jmh.version>1.37</jmh.version>
<lombok.version>1.18.32</lombok.version>
<logback-classic.version>1.5.6</logback-classic.version>
<logback-core.version>1.4.14</logback-core.version>
<logback-classic.version>1.5.8</logback-classic.version>
<logback-core.version>1.5.8</logback-core.version>
<commons-lang3.version>3.17.0</commons-lang3.version>
<okio.version>3.9.1</okio.version>
</properties>
Expand Down
10 changes: 6 additions & 4 deletions logbook-servlet/src/test/java/org/zalando/logbook/servlet/MultiFilterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

import jakarta.servlet.Filter;
import jakarta.servlet.ServletException;
import jakarta.servlet.ServletResponseWrapper;
import jakarta.servlet.http.HttpServletResponse;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
Expand Down Expand Up @@ -106,10 +108,10 @@ void shouldBufferResponseTwice() throws Exception {
.content("Hello, world!")).andReturn();

final LocalResponse firstResponse = getResponse(lastFilter);
final LocalResponse secondResponse = getResponse(controller);
final HttpServletResponse secondResponse = getResponse(controller);

assertThat(firstResponse.getBody()).isNotEmpty();
assertThat(secondResponse.getBody()).isNotEmpty();
assertThat(((LocalResponse)((ServletResponseWrapper)secondResponse).getResponse()).getBody()).isNotEmpty();
}

private RemoteRequest getRequest(final Filter filter) throws IOException, ServletException {
Expand All @@ -130,8 +132,8 @@ private LocalResponse getResponse(final Filter filter) throws IOException, Servl
return captor.getValue();
}

private LocalResponse getResponse(final ExampleController controller) throws IOException {
final ArgumentCaptor<LocalResponse> captor = ArgumentCaptor.forClass(LocalResponse.class);
private HttpServletResponse getResponse(final ExampleController controller) throws IOException {
final ArgumentCaptor<HttpServletResponse> captor = ArgumentCaptor.forClass(HttpServletResponse.class);
kasmarian marked this conversation as resolved.
Show resolved Hide resolved
verify(controller).readBytes(any(), captor.capture());
return captor.getValue();
}
Expand Down
Loading