Skip to content

Commit bd34bef

Browse files
malczuuumalczuuu
committed
Update spring-boot to 4.0.0-RC1
1 parent 73b6355 commit bd34bef

File tree

41 files changed

+83
-45
lines changed

Some content is hidden

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

41 files changed

+83
-45
lines changed

‎gradle/libs.versions.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
jetbrains-annotations = "26.0.2-1"
33
problem4j-core = "1.1.1"
44
problem4j-jackson3 = "1.0.2"
5-
spring-boot = "4.0.0-M3"
5+
spring-boot = "4.0.0-RC1"
66

77
[libraries]
88
jetbrains-annotations = { module = "org.jetbrains:annotations", version.ref = "jetbrains-annotations" }
@@ -19,13 +19,13 @@ spring-boot-autoconfigure = { module = "org.springframework.boot:spring-boot-aut
1919
spring-boot-starter-test = { module = "org.springframework.boot:spring-boot-starter-test" }
2020
spring-boot-starter-webflux = { module = "org.springframework.boot:spring-boot-starter-webflux" }
2121
spring-boot-starter-webmvc = { module = "org.springframework.boot:spring-boot-starter-webmvc" }
22-
spring-boot-starter-validation = { module = "org.springframework.boot:spring-boot-starter-validation" }
2322

24-
spring-boot-restclient = { module = "org.springframework.boot:spring-boot-restclient" }
23+
spring-boot-resttestclient = { module = "org.springframework.boot:spring-boot-resttestclient" }
2524
spring-boot-validation = { module = "org.springframework.boot:spring-boot-validation" }
2625
spring-boot-web-server = { module = "org.springframework.boot:spring-boot-web-server" }
2726
spring-boot-webflux = { module = "org.springframework.boot:spring-boot-webflux" }
2827
spring-boot-webmvc = { module = "org.springframework.boot:spring-boot-webmvc" }
28+
spring-boot-webtestclient = { module = "org.springframework.boot:spring-boot-webtestclient" }
2929

3030
spring-web = { module = "org.springframework:spring-web" }
3131

‎problem4j-spring-webflux/build.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ dependencies {
3131
testImplementation(platform(libs.spring.boot.dependencies))
3232
testImplementation(libs.spring.boot.starter.test)
3333
testImplementation(libs.spring.boot.starter.webflux)
34+
testImplementation(libs.spring.boot.webtestclient)
3435
testImplementation(libs.spring.boot.validation)
3536

3637
testRuntimeOnly(libs.junit.platform.launcher)

‎problem4j-spring-webflux/src/test/java/io/github/malczuuu/problem4j/spring/webflux/integration/ErrorResponseWebFluxTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
import io.github.malczuuu.problem4j.spring.webflux.app.WebFluxTestApp;
99
import org.junit.jupiter.api.Test;
1010
import org.springframework.beans.factory.annotation.Autowired;
11-
import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient;
1211
import org.springframework.boot.test.context.SpringBootTest;
12+
import org.springframework.boot.webtestclient.AutoConfigureWebTestClient;
1313
import org.springframework.context.annotation.Import;
1414
import org.springframework.http.HttpStatus;
1515
import org.springframework.http.ProblemDetail;

‎problem4j-spring-webflux/src/test/java/io/github/malczuuu/problem4j/spring/webflux/integration/MalformedMultipartWebFluxTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
import io.github.malczuuu.problem4j.spring.webflux.app.WebFluxTestApp;
99
import org.junit.jupiter.api.Test;
1010
import org.springframework.beans.factory.annotation.Autowired;
11-
import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient;
1211
import org.springframework.boot.test.context.SpringBootTest;
12+
import org.springframework.boot.webtestclient.AutoConfigureWebTestClient;
1313
import org.springframework.context.annotation.Import;
1414
import org.springframework.http.MediaType;
1515
import org.springframework.test.web.reactive.server.WebTestClient;

‎problem4j-spring-webflux/src/test/java/io/github/malczuuu/problem4j/spring/webflux/integration/MaxUploadSizeExceededWebFluxTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
import io.github.malczuuu.problem4j.spring.webflux.app.WebFluxTestApp;
1111
import org.junit.jupiter.api.Test;
1212
import org.springframework.beans.factory.annotation.Autowired;
13-
import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient;
1413
import org.springframework.boot.test.context.SpringBootTest;
14+
import org.springframework.boot.webtestclient.AutoConfigureWebTestClient;
1515
import org.springframework.context.annotation.Import;
1616
import org.springframework.http.HttpStatus;
1717
import org.springframework.test.web.reactive.server.WebTestClient;
@@ -43,7 +43,7 @@ void givenMaxUploadSizeExceeded_shouldReturnProblem() {
4343
.uri("/max-upload-size")
4444
.exchange()
4545
.expectStatus()
46-
.isEqualTo(HttpStatus.PAYLOAD_TOO_LARGE)
46+
.isEqualTo(HttpStatus.CONTENT_TOO_LARGE)
4747
.expectHeader()
4848
.contentType(Problem.CONTENT_TYPE)
4949
.expectBody(Problem.class)

‎problem4j-spring-webflux/src/test/java/io/github/malczuuu/problem4j/spring/webflux/integration/MethodNotAllowedWebFluxTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
import io.github.malczuuu.problem4j.spring.webflux.app.WebFluxTestApp;
99
import org.junit.jupiter.api.Test;
1010
import org.springframework.beans.factory.annotation.Autowired;
11-
import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient;
1211
import org.springframework.boot.test.context.SpringBootTest;
12+
import org.springframework.boot.webtestclient.AutoConfigureWebTestClient;
1313
import org.springframework.context.annotation.Import;
1414
import org.springframework.http.HttpStatus;
1515
import org.springframework.test.web.reactive.server.WebTestClient;

‎problem4j-spring-webflux/src/test/java/io/github/malczuuu/problem4j/spring/webflux/integration/MissingParameterWebFluxTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import io.github.malczuuu.problem4j.spring.webflux.app.WebFluxTestApp;
2323
import org.junit.jupiter.api.Test;
2424
import org.springframework.beans.factory.annotation.Autowired;
25-
import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient;
2625
import org.springframework.boot.test.context.SpringBootTest;
26+
import org.springframework.boot.webtestclient.AutoConfigureWebTestClient;
2727
import org.springframework.context.annotation.Import;
2828
import org.springframework.core.io.ByteArrayResource;
2929
import org.springframework.http.MediaType;

‎problem4j-spring-webflux/src/test/java/io/github/malczuuu/problem4j/spring/webflux/integration/NotAcceptableWebFluxTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
import io.github.malczuuu.problem4j.spring.webflux.app.WebFluxTestApp;
99
import org.junit.jupiter.api.Test;
1010
import org.springframework.beans.factory.annotation.Autowired;
11-
import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient;
1211
import org.springframework.boot.test.context.SpringBootTest;
12+
import org.springframework.boot.webtestclient.AutoConfigureWebTestClient;
1313
import org.springframework.context.annotation.Import;
1414
import org.springframework.http.HttpStatus;
1515
import org.springframework.http.MediaType;

‎problem4j-spring-webflux/src/test/java/io/github/malczuuu/problem4j/spring/webflux/integration/NotFoundNoHandlerFoundWebFluxTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
import io.github.malczuuu.problem4j.spring.webflux.app.WebFluxTestApp;
88
import org.junit.jupiter.api.Test;
99
import org.springframework.beans.factory.annotation.Autowired;
10-
import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient;
1110
import org.springframework.boot.test.context.SpringBootTest;
11+
import org.springframework.boot.webtestclient.AutoConfigureWebTestClient;
1212
import org.springframework.test.web.reactive.server.WebTestClient;
1313

1414
@SpringBootTest(

‎problem4j-spring-webflux/src/test/java/io/github/malczuuu/problem4j/spring/webflux/integration/NotFoundNoResourceFoundWebFluxTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
import io.github.malczuuu.problem4j.spring.webflux.app.WebFluxTestApp;
88
import org.junit.jupiter.api.Test;
99
import org.springframework.beans.factory.annotation.Autowired;
10-
import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient;
1110
import org.springframework.boot.test.context.SpringBootTest;
11+
import org.springframework.boot.webtestclient.AutoConfigureWebTestClient;
1212
import org.springframework.test.web.reactive.server.WebTestClient;
1313

1414
@SpringBootTest(

0 commit comments

Comments
 (0)