diff --git a/spring-web-modules/spring-5-mvc/pom.xml b/spring-web-modules/spring-5-mvc/pom.xml
index 23bcb00801..ca5698462f 100644
--- a/spring-web-modules/spring-5-mvc/pom.xml
+++ b/spring-web-modules/spring-5-mvc/pom.xml
@@ -10,9 +10,9 @@
com.baeldung
- parent-boot-2
+ parent-boot-3
0.0.1-SNAPSHOT
- ../../parent-boot-2
+ ../../parent-boot-3
@@ -52,19 +52,14 @@
h2
runtime
-
- org.springframework
- spring-test
-
org.springframework.boot
spring-boot-starter-test
test
- com.jayway.restassured
+ io.rest-assured
rest-assured
- ${jayway-rest-assured.version}
test
@@ -72,11 +67,6 @@
javafaker
${javafaker.version}
-
- org.apache.httpcomponents
- httpclient
- ${httpclient.version}
-
@@ -84,8 +74,6 @@
- 2.9.0
- 4.5.8
com.baeldung.Spring5Application
0.18
diff --git a/spring-web-modules/spring-5-mvc/src/main/java/com/baeldung/idc/BookRepository.java b/spring-web-modules/spring-5-mvc/src/main/java/com/baeldung/idc/BookRepository.java
index 0550b3b79a..eebfbedc19 100644
--- a/spring-web-modules/spring-5-mvc/src/main/java/com/baeldung/idc/BookRepository.java
+++ b/spring-web-modules/spring-5-mvc/src/main/java/com/baeldung/idc/BookRepository.java
@@ -6,7 +6,7 @@ import java.util.Optional;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
import org.springframework.stereotype.Component;
diff --git a/spring-web-modules/spring-5-mvc/src/main/java/com/baeldung/model/Foo.java b/spring-web-modules/spring-5-mvc/src/main/java/com/baeldung/model/Foo.java
index b06f50b742..187ad5c3bf 100644
--- a/spring-web-modules/spring-5-mvc/src/main/java/com/baeldung/model/Foo.java
+++ b/spring-web-modules/spring-5-mvc/src/main/java/com/baeldung/model/Foo.java
@@ -1,9 +1,9 @@
package com.baeldung.model;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
@Entity
public class Foo {
diff --git a/spring-web-modules/spring-5-mvc/src/main/java/com/baeldung/web/FooController.java b/spring-web-modules/spring-5-mvc/src/main/java/com/baeldung/web/FooController.java
index 8d8e03bbaf..78d1591575 100644
--- a/spring-web-modules/spring-5-mvc/src/main/java/com/baeldung/web/FooController.java
+++ b/spring-web-modules/spring-5-mvc/src/main/java/com/baeldung/web/FooController.java
@@ -2,8 +2,8 @@ package com.baeldung.web;
import java.util.List;
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.PageRequest;
diff --git a/spring-web-modules/spring-5-mvc/src/main/java/com/baeldung/web/ResponseBodyEmitterController.java b/spring-web-modules/spring-5-mvc/src/main/java/com/baeldung/web/ResponseBodyEmitterController.java
index c5f63486fe..c6bb1a3abf 100644
--- a/spring-web-modules/spring-5-mvc/src/main/java/com/baeldung/web/ResponseBodyEmitterController.java
+++ b/spring-web-modules/spring-5-mvc/src/main/java/com/baeldung/web/ResponseBodyEmitterController.java
@@ -13,7 +13,7 @@ import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyEmitter
@Controller
public class ResponseBodyEmitterController {
- private ExecutorService nonBlockingService = Executors.newCachedThreadPool();
+ private final ExecutorService nonBlockingService = Executors.newCachedThreadPool();
@GetMapping(Constants.API_RBE)
public ResponseEntity handleRbe() {
@@ -29,7 +29,7 @@ public class ResponseBodyEmitterController {
}
});
- return new ResponseEntity(emitter, HttpStatus.OK);
+ return new ResponseEntity<>(emitter, HttpStatus.OK);
}
}
diff --git a/spring-web-modules/spring-5-mvc/src/main/java/com/baeldung/web/SseEmitterController.java b/spring-web-modules/spring-5-mvc/src/main/java/com/baeldung/web/SseEmitterController.java
index 00113c5ff7..45eed6bb3e 100644
--- a/spring-web-modules/spring-5-mvc/src/main/java/com/baeldung/web/SseEmitterController.java
+++ b/spring-web-modules/spring-5-mvc/src/main/java/com/baeldung/web/SseEmitterController.java
@@ -14,7 +14,7 @@ import com.baeldung.Constants;
@Controller
public class SseEmitterController {
- private ExecutorService nonBlockingService = Executors.newCachedThreadPool();
+ private final ExecutorService nonBlockingService = Executors.newCachedThreadPool();
@GetMapping(Constants.API_SSE)
public SseEmitter handleSse() {
diff --git a/spring-web-modules/spring-5-mvc/src/main/java/com/baeldung/web/StreamingResponseBodyController.java b/spring-web-modules/spring-5-mvc/src/main/java/com/baeldung/web/StreamingResponseBodyController.java
index 1722ad85cd..00f168824a 100644
--- a/spring-web-modules/spring-5-mvc/src/main/java/com/baeldung/web/StreamingResponseBodyController.java
+++ b/spring-web-modules/spring-5-mvc/src/main/java/com/baeldung/web/StreamingResponseBodyController.java
@@ -17,7 +17,7 @@ public class StreamingResponseBodyController {
String msg = Constants.API_SRB_MSG + " @ " + new Date();
out.write(msg.getBytes());
};
- return new ResponseEntity(stream, HttpStatus.OK);
+ return new ResponseEntity<>(stream, HttpStatus.OK);
}
}
diff --git a/spring-web-modules/spring-5-mvc/src/test/java/com/baeldung/LiveTest.java b/spring-web-modules/spring-5-mvc/src/test/java/com/baeldung/LiveTest.java
index b2f2852dbe..8b43bc79bc 100644
--- a/spring-web-modules/spring-5-mvc/src/test/java/com/baeldung/LiveTest.java
+++ b/spring-web-modules/spring-5-mvc/src/test/java/com/baeldung/LiveTest.java
@@ -6,9 +6,9 @@ import static org.junit.Assert.assertEquals;
import org.junit.Test;
import org.springframework.http.MediaType;
-import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.response.Response;
-import com.jayway.restassured.specification.RequestSpecification;
+import io.restassured.RestAssured;
+import io.restassured.response.Response;
+import io.restassured.specification.RequestSpecification;
public class LiveTest {
@@ -36,8 +36,6 @@ public class LiveTest {
assertEquals(200, response.getStatusCode());
}*/
- //
-
private final String resourceWithNullName() {
return "{\"name\":null}";
}