From 8abd7a07b583ea7d052c7fe99929055d42d2a28a Mon Sep 17 00:00:00 2001
From: panos-kakos <102670093+panos-kakos@users.noreply.github.com>
Date: Fri, 24 Nov 2023 18:18:04 +0200
Subject: [PATCH] [JAVA-27546] Updated spring-cucumber to spring boot 3
(#15276)
---
spring-cucumber/pom.xml | 11 ++++++-----
.../cucumberoptions/HealthCheckController.java | 5 +++--
.../test/java/com/baeldung/SpringIntegrationTest.java | 4 +++-
.../java/com/baeldung/StepDefsIntegrationTest.java | 3 ++-
.../HealthCheckStepDefsIntegrationTest.java | 5 +++--
5 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/spring-cucumber/pom.xml b/spring-cucumber/pom.xml
index 042e81971f..0b0e38a2be 100644
--- a/spring-cucumber/pom.xml
+++ b/spring-cucumber/pom.xml
@@ -11,9 +11,9 @@
com.baeldung
- parent-boot-2
+ parent-boot-3
0.0.1-SNAPSHOT
- ../parent-boot-2
+ ../parent-boot-3
@@ -53,16 +53,17 @@
- org.apache.commons
+ commons-io
commons-io
${commons-io.version}
+
+ com.baeldung.SpringDemoApplication
7.14.0
- 1.3.2
- 5.10.0
+ 5.10.1
\ No newline at end of file
diff --git a/spring-cucumber/src/main/java/com/baeldung/cucumberoptions/HealthCheckController.java b/spring-cucumber/src/main/java/com/baeldung/cucumberoptions/HealthCheckController.java
index 637dbdb540..70a917d999 100644
--- a/spring-cucumber/src/main/java/com/baeldung/cucumberoptions/HealthCheckController.java
+++ b/spring-cucumber/src/main/java/com/baeldung/cucumberoptions/HealthCheckController.java
@@ -3,6 +3,7 @@ package com.baeldung.cucumberoptions;
import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
import org.springframework.http.HttpStatus;
+import org.springframework.http.HttpStatusCode;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -11,12 +12,12 @@ import org.springframework.web.bind.annotation.RestController;
public class HealthCheckController {
@GetMapping(path = "/v1/status", produces = APPLICATION_JSON_VALUE)
- public HttpStatus getV1Status() {
+ public HttpStatusCode getV1Status() {
return ResponseEntity.ok().build().getStatusCode();
}
@GetMapping(path = "/v2/status", produces = APPLICATION_JSON_VALUE)
- public HttpStatus getV2Status() {
+ public HttpStatusCode getV2Status() {
return ResponseEntity.ok().build().getStatusCode();
}
}
\ No newline at end of file
diff --git a/spring-cucumber/src/test/java/com/baeldung/SpringIntegrationTest.java b/spring-cucumber/src/test/java/com/baeldung/SpringIntegrationTest.java
index 7b5c4e21ff..f243c68237 100644
--- a/spring-cucumber/src/test/java/com/baeldung/SpringIntegrationTest.java
+++ b/spring-cucumber/src/test/java/com/baeldung/SpringIntegrationTest.java
@@ -9,6 +9,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.HttpStatusCode;
import org.springframework.http.client.ClientHttpResponse;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.web.client.ResponseErrorHandler;
@@ -69,7 +71,7 @@ public class SpringIntegrationTest {
@Override
public boolean hasError(ClientHttpResponse response) throws IOException {
- hadError = response.getRawStatusCode() >= 400;
+ hadError = response.getStatusCode().value() >= 400;
return hadError;
}
diff --git a/spring-cucumber/src/test/java/com/baeldung/StepDefsIntegrationTest.java b/spring-cucumber/src/test/java/com/baeldung/StepDefsIntegrationTest.java
index 9611e95dcf..e4e0b2a883 100644
--- a/spring-cucumber/src/test/java/com/baeldung/StepDefsIntegrationTest.java
+++ b/spring-cucumber/src/test/java/com/baeldung/StepDefsIntegrationTest.java
@@ -5,6 +5,7 @@ import io.cucumber.java.en.Given;
import io.cucumber.java.en.Then;
import io.cucumber.java.en.When;
import org.springframework.http.HttpStatus;
+import org.springframework.http.HttpStatusCode;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
@@ -29,7 +30,7 @@ public class StepDefsIntegrationTest extends SpringIntegrationTest {
@Then("^the client receives status code of (\\d+)$")
public void the_client_receives_status_code_of(int statusCode) throws Throwable {
- final HttpStatus currentStatusCode = latestResponse.getTheResponse().getStatusCode();
+ final HttpStatusCode currentStatusCode = latestResponse.getTheResponse().getStatusCode();
assertThat("status code is incorrect : " + latestResponse.getBody(), currentStatusCode.value(), is(statusCode));
}
diff --git a/spring-cucumber/src/test/java/com/baeldung/cucumberoptions/HealthCheckStepDefsIntegrationTest.java b/spring-cucumber/src/test/java/com/baeldung/cucumberoptions/HealthCheckStepDefsIntegrationTest.java
index 999adadbef..7304f269e7 100644
--- a/spring-cucumber/src/test/java/com/baeldung/cucumberoptions/HealthCheckStepDefsIntegrationTest.java
+++ b/spring-cucumber/src/test/java/com/baeldung/cucumberoptions/HealthCheckStepDefsIntegrationTest.java
@@ -3,7 +3,8 @@ package com.baeldung.cucumberoptions;
import io.cucumber.java.en.Then;
import io.cucumber.java.en.When;
-import org.springframework.http.HttpStatus;
+
+import org.springframework.http.HttpStatusCode;
import org.springframework.http.ResponseEntity;
import org.springframework.web.client.RestTemplate;
@@ -32,7 +33,7 @@ public class HealthCheckStepDefsIntegrationTest extends SpringIntegrationTest {
@Then("^the client receives (\\d+) status code$")
public void verifyStatusCode(int statusCode) throws Throwable {
- final HttpStatus currentStatusCode = statusResponse.getStatusCode();
+ final HttpStatusCode currentStatusCode = statusResponse.getStatusCode();
assertThat(currentStatusCode.value(), is(statusCode));
}
}
\ No newline at end of file