Merge pull request #9 from lfir/feat/spring-boot4

Update to Spring Boot 4

Author: lfir

pom.xml

@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.5.6</version>
+        <version>4.0.0</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>cf.maybelambda</groupId>
     <artifactId>http-validator</artifactId>
-    <version>3.0.2</version>
+    <version>3.0.3</version>
     <name>http-validator</name>
     <description>Retrieves target HTTP resources and responses, validates them and notifies about their current status.</description>
 
@@ -27,21 +27,21 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
+            <artifactId>spring-boot-starter-webmvc-test</artifactId>
             <scope>test</scope>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.springframework.restdocs/spring-restdocs-mockmvc -->
         <dependency>
             <groupId>org.springframework.restdocs</groupId>
             <artifactId>spring-restdocs-mockmvc</artifactId>
-            <version>3.0.5</version>
+            <version>4.0.0</version>
             <scope>test</scope>
         </dependency>
         <!-- https://mvnrepository.com/artifact/com.mailgun/mailgun-java -->
         <dependency>
             <groupId>com.mailgun</groupId>
             <artifactId>mailgun-java</artifactId>
-            <version>2.1.0</version>
+            <version>2.1.1</version>
         </dependency>
         <dependency>
             <groupId>io.jsonwebtoken</groupId>
@@ -78,7 +78,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.13</version>
+                <version>0.8.14</version>
                 <executions>
                     <execution>
                         <id>default-prepare-agent</id>

src/main/java/cf/maybelambda/httpvalidator/springboot/model/ValidationTask.java

@@ -1,6 +1,6 @@
 package cf.maybelambda.httpvalidator.springboot.model;
 
-import com.fasterxml.jackson.databind.JsonNode;
+import tools.jackson.databind.JsonNode;
 
 import javax.swing.text.html.FormSubmitEvent.MethodType;
 import java.util.List;

src/main/java/cf/maybelambda/httpvalidator/springboot/persistence/XMLValidationTaskDao.java

@@ -1,8 +1,6 @@
 package cf.maybelambda.httpvalidator.springboot.persistence;
 
 import cf.maybelambda.httpvalidator.springboot.model.ValidationTask;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,6 +13,8 @@
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
+import tools.jackson.databind.JsonNode;
+import tools.jackson.databind.ObjectMapper;
 
 import javax.management.modelmbean.XMLParseException;
 import javax.swing.text.html.FormSubmitEvent.MethodType;

src/main/java/cf/maybelambda/httpvalidator/springboot/service/ValidationService.java

@@ -3,15 +3,15 @@
 import cf.maybelambda.httpvalidator.springboot.model.ValidationTask;
 import cf.maybelambda.httpvalidator.springboot.persistence.XMLValidationTaskDao;
 import cf.maybelambda.httpvalidator.springboot.util.HttpSendOutcomeWrapper;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.scheduling.support.CronExpression;
 import org.springframework.stereotype.Service;
+import tools.jackson.core.JacksonException;
+import tools.jackson.databind.ObjectMapper;
 
 import javax.management.modelmbean.XMLParseException;
 import java.io.FileNotFoundException;
@@ -70,8 +70,8 @@ public class ValidationService {
      */
     public ValidationService() {
         this.client = HttpClient.newBuilder()
-            .connectTimeout(CONNECT_TIMEOUT_SECONDS)
-            .followRedirects(HttpClient.Redirect.ALWAYS).build();
+                .connectTimeout(CONNECT_TIMEOUT_SECONDS)
+                .followRedirects(HttpClient.Redirect.ALWAYS).build();
     }
 
     /**
@@ -82,13 +82,13 @@ public ValidationService() {
      *
      * @throws FileNotFoundException if the data file is not found
      * @throws XMLParseException if there is an error parsing the XML file
-     * @throws JsonProcessingException when a validation task contains invalid JSON content
+     * @throws JacksonException when a validation task contains invalid JSON content
      * @throws ConnectIOException if there is an error sending notification email
      * @throws ExecutionException when an unhandled error occurs while processing the HTTP requests
      * @throws InterruptedException when interrupted before completing all the requests
      */
     @Scheduled(cron = "${" + RUN_SCHEDULE_PROPERTY + "}")
-    public void execValidations() throws FileNotFoundException, XMLParseException, JsonProcessingException,
+    public void execValidations() throws FileNotFoundException, XMLParseException, JacksonException,
             ConnectIOException, ExecutionException, InterruptedException {
         // Record the start date-time of the validation process
         Instant start = Instant.now();
@@ -113,9 +113,9 @@ public void execValidations() throws FileNotFoundException, XMLParseException, J
      * @return a list of HttpSendOutcomeWrapper objects containing the responses or exceptions
      * @throws ExecutionException when an unhandled error occurs while processing the HTTP requests
      * @throws InterruptedException when interrupted before completing all the requests
-     * @throws JsonProcessingException when a validation task contains invalid JSON content
+     * @throws JacksonException when a validation task contains invalid JSON content
      */
-    List<HttpSendOutcomeWrapper> buildAndExecuteRequests(List<ValidationTask> tasks) throws ExecutionException, InterruptedException, JsonProcessingException {
+    List<HttpSendOutcomeWrapper> buildAndExecuteRequests(List<ValidationTask> tasks) throws ExecutionException, InterruptedException, JacksonException {
         // Build HTTP requests from the validation tasks
         List<HttpRequest> reqs = new ArrayList<>();
         for (ValidationTask task : tasks) {
@@ -134,13 +134,13 @@ List<HttpSendOutcomeWrapper> buildAndExecuteRequests(List<ValidationTask> tasks)
         // Send the requests asynchronously and store the responses or exceptions in the results list
         // Use the index of each request to store the corresponding response or exception
         List<CompletableFuture<Void>> futures = IntStream.range(0, reqs.size())
-            .mapToObj(i -> client.sendAsync(reqs.get(i), HttpResponse.BodyHandlers.ofString())
-                .thenAccept(res -> results.set(i, new HttpSendOutcomeWrapper(res)))
-                .exceptionally(e -> {
-                    results.set(i, new HttpSendOutcomeWrapper(e));
-                    return null;
-                }))
-            .toList();
+                .mapToObj(i -> client.sendAsync(reqs.get(i), HttpResponse.BodyHandlers.ofString())
+                        .thenAccept(res -> results.set(i, new HttpSendOutcomeWrapper(res)))
+                        .exceptionally(e -> {
+                            results.set(i, new HttpSendOutcomeWrapper(e));
+                            return null;
+                        }))
+                .toList();
         // Wait for all requests to complete
         CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).get();
 

src/test/java/cf/maybelambda/httpvalidator/springboot/controller/AppConfigurationControllerTests.java

@@ -4,15 +4,15 @@
 import cf.maybelambda.httpvalidator.springboot.persistence.XMLValidationTaskDao;
 import cf.maybelambda.httpvalidator.springboot.service.JwtAuthenticationService;
 import cf.maybelambda.httpvalidator.springboot.service.ValidationService;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.MockedStatic;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest;
 import org.springframework.http.MediaType;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.web.servlet.MockMvc;
+import tools.jackson.databind.ObjectMapper;
 
 import javax.management.modelmbean.XMLParseException;
 import java.io.IOException;
@@ -41,11 +41,11 @@ public class AppConfigurationControllerTests {
     private MockMvc mockMvc;
     @Autowired
     private ObjectMapper mapper;
-    @MockBean
+    @MockitoBean
     private ValidationService valServ;
-    @MockBean
+    @MockitoBean
     private XMLValidationTaskDao dao;
-    @MockBean
+    @MockitoBean
     private JwtAuthenticationService authServ;
     private final Map<String, String> reqBody = new HashMap<>();
 

src/test/java/cf/maybelambda/httpvalidator/springboot/controller/AppInfoControllerTests.java

@@ -7,9 +7,9 @@
 import cf.maybelambda.httpvalidator.springboot.service.ValidationService;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest;
 import org.springframework.http.MediaType;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.web.servlet.MockMvc;
 
 import java.util.HashMap;
@@ -34,15 +34,15 @@
 public class AppInfoControllerTests {
     @Autowired
     private MockMvc mockMvc;
-    @MockBean
+    @MockitoBean
     private XMLValidationTaskDao dao;
-    @MockBean
+    @MockitoBean
     private EmailNotificationService mailServ;
-    @MockBean
+    @MockitoBean
     private ValidationService valServ;
-    @MockBean
+    @MockitoBean
     private EventListenerService eventServ;
-    @MockBean
+    @MockitoBean
     private JwtAuthenticationService authServ;
 
     @Test

src/test/java/cf/maybelambda/httpvalidator/springboot/itest/AppConfigurationControllerIntegrationTests.java

@@ -4,7 +4,6 @@
 import cf.maybelambda.httpvalidator.springboot.persistence.XMLValidationTaskDao;
 import cf.maybelambda.httpvalidator.springboot.service.JwtAuthenticationService;
 import cf.maybelambda.httpvalidator.springboot.service.ValidationService;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -21,6 +20,7 @@
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.web.context.WebApplicationContext;
+import tools.jackson.databind.ObjectMapper;
 
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
@@ -56,7 +56,7 @@
 @ActiveProfiles("test")
 @SpringBootTest
 public class AppConfigurationControllerIntegrationTests {
-    public static String UPD_DATAFILE_ERRORS_DESCR = INVALID_DATA_FILE_ERROR_MSG + " or " + UPD_DATA_FILE_ERROR_MSG;
+    public static final String UPD_DATAFILE_ERRORS_DESCR = INVALID_DATA_FILE_ERROR_MSG + " or " + UPD_DATA_FILE_ERROR_MSG;
     private String testsToken;
     private MockMvc mockMvc;
 
@@ -138,12 +138,12 @@ public void canUpdateDataFileWithValidXML() throws Exception {
             .andDo(document("{method-name}", REQUEST_HEADERS_SNIPPET));
 
         assertThat(this.dao.isDataFileStatusOk()).isTrue();
-        assertThat(this.dao.getAll().get(0)).isEqualTo(task);
+        assertThat(this.dao.getAll().getFirst()).isEqualTo(task);
     }
 
     @Test
     public void error400WhenUpdateDataFileRequestWithInvalidXML() throws Exception {
-        ValidationTask task = this.dao.getAll().get(0);
+        ValidationTask task = this.dao.getAll().getFirst();
 
         String xmlContent =   "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
                             + "<validations>"
@@ -175,6 +175,6 @@ public void error400WhenUpdateDataFileRequestWithInvalidXML() throws Exception {
             );
 
         // Verify the original file contents have not been modified
-        assertThat(this.dao.getAll().get(0)).isEqualTo(task);
+        assertThat(this.dao.getAll().getFirst()).isEqualTo(task);
     }
 }

src/test/java/cf/maybelambda/httpvalidator/springboot/itest/AppInfoControllerIntegrationTests.java

@@ -51,10 +51,14 @@ public class AppInfoControllerIntegrationTests {
     );
     public static final String START_TIME_DESCR = "The start time of the application in a formatted string";
     public static final String START_TIME_LR_DESCR = "The start time of the last run in a formatted string";
-    public static final String DATAFILE_STATUS_DESCR = "`OK`: Data file status is okay, i.e. it "
-        + "exists and is readable\n\n`ERROR`: Data file status is not okay";
-    public static final String CONFIG_STATUS_DESCR = "`OK`: Both mail and validation configurations are okay (run "
-        + "schedule, credentials, from and to addresses)\n\n`ERROR`: Either mail or validation configuration is not okay";
+    public static final String DATAFILE_STATUS_DESCR = """
+            `OK`: Data file status is okay, i.e. it exists and is readable
+            
+            `ERROR`: Data file status is not okay""";
+    public static final String CONFIG_STATUS_DESCR = """
+            `OK`: Both mail and validation configurations are okay (run schedule, credentials, from and to addresses)
+            
+            `ERROR`: Either mail or validation configuration is not okay""";
     public static final String TIME_ELAPSED_DESCR = "Duration of the last run";
     public static final String TASKS_TOTAL_DESCR = "The total number of tasks to be processed in the last run";
     public static final String TASKS_OK_DESCR = "The number of tasks with expected results";

src/test/java/cf/maybelambda/httpvalidator/springboot/model/ValidationTaskTests.java

@@ -1,7 +1,7 @@
 package cf.maybelambda.httpvalidator.springboot.model;
 
-import com.fasterxml.jackson.databind.JsonNode;
 import org.junit.jupiter.api.Test;
+import tools.jackson.databind.JsonNode;
 
 import java.util.List;
 

src/test/java/cf/maybelambda/httpvalidator/springboot/persistence/XMLValidationTaskDaoTests.java

@@ -1,9 +1,6 @@
 package cf.maybelambda.httpvalidator.springboot.persistence;
 
 import cf.maybelambda.httpvalidator.springboot.model.ValidationTask;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.MockedStatic;
@@ -15,6 +12,9 @@
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
+import tools.jackson.core.JacksonException;
+import tools.jackson.databind.JsonNode;
+import tools.jackson.databind.ObjectMapper;
 
 import javax.management.modelmbean.XMLParseException;
 import javax.xml.parsers.DocumentBuilder;
@@ -127,12 +127,12 @@ void taskDataIsReadWhenWellFormedXMLParsedWithoutErrors() throws Exception {
 
         List<ValidationTask> ans = this.taskDao.getAll();
 
-        assertEquals(GET, ans.get(0).reqMethod());
-        assertEquals(this.url.getTextContent(), ans.get(0).reqURL());
-        assertEquals(this.header.getTextContent(), ans.get(0).reqHeaders().get(0));
-        assertEquals(this.mapper.readTree(this.reqbody.getTextContent()), ans.get(0).reqBody());
-        assertEquals(Integer.parseInt(this.resBodyAttrs.getNamedItem(RES_SC_ATTR).getTextContent()), ans.get(0).validStatusCode());
-        assertEquals(this.response.getTextContent(), ans.get(0).validBody());
+        assertEquals(GET, ans.getFirst().reqMethod());
+        assertEquals(this.url.getTextContent(), ans.getFirst().reqURL());
+        assertEquals(this.header.getTextContent(), ans.getFirst().reqHeaders().getFirst());
+        assertEquals(this.mapper.readTree(this.reqbody.getTextContent()), ans.getFirst().reqBody());
+        assertEquals(Integer.parseInt(this.resBodyAttrs.getNamedItem(RES_SC_ATTR).getTextContent()), ans.getFirst().validStatusCode());
+        assertEquals(this.response.getTextContent(), ans.getFirst().validBody());
     }
 
     @Test
@@ -147,8 +147,8 @@ void xmlAttributesThatCanBeEmptyInDatafileAreParsedOk() throws Exception {
 
         List<ValidationTask> ans = this.taskDao.getAll();
 
-        assertThat(ans.get(0).reqHeaders().isEmpty()).isTrue();
-        assertEquals("", ans.get(0).validBody());
+        assertThat(ans.getFirst().reqHeaders().isEmpty()).isTrue();
+        assertEquals("", ans.getFirst().validBody());
     }
 
     @Test
@@ -160,7 +160,7 @@ void whenGetAllThrowsSAXExceptionThenErrorIsLogged() throws Exception {
     }
 
     @Test
-    void whenJacksonThrowsJSONExceptionInGetAllThenErrorIsLogged() throws Exception {
+    void whenJacksonThrowsJSONExceptionInGetAllThenErrorIsLogged() {
         // Number of <validation> elements
         given(this.nodes.getLength()).willReturn(1);
         // 2 child nodes of <validation>: <url> and <reqbody>
@@ -169,7 +169,7 @@ void whenJacksonThrowsJSONExceptionInGetAllThenErrorIsLogged() throws Exception
         given(this.childNodes.item(1)).willReturn(this.reqbody);
         given(this.reqbody.getNodeName()).willReturn(REQ_BODY_TAG);
         given(this.reqbody.getTextContent()).willReturn("");
-        given(this.mapper.readTree(anyString())).willThrow(JsonProcessingException.class);
+        given(this.mapper.readTree(anyString())).willThrow(JacksonException.class);
 
         assertThrows(XMLParseException.class, () -> this.taskDao.getAll());
         verify(logger).error(anyString(), any(Throwable.class));