Java 44187

spring-boot-modules/spring-boot-simple/pom.xml

@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.5.0-M1</version>
+        <version>3.5.4</version>
         <relativePath/>
     </parent>
 
@@ -110,22 +110,14 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>3.3.2</version>
             </plugin>
         </plugins>
     </build>
 
     <properties>
         <start-class>com.baeldung.bootstrap.Application</start-class>
         <subethasmtp.version>7.0.2</subethasmtp.version>
+        <spring-boot-maven-plugin.version>3.5.4</spring-boot-maven-plugin.version>
     </properties>
 
-    <repositories>
-        <repository>
-            <id>repository.spring.milestones</id>
-            <name>Spring Milestones Repository</name>
-            <url>https://repo.spring.io/milestone/</url>
-        </repository>
-    </repositories>
-
 </project>

spring-boot-modules/spring-boot-simple/src/test/java/com/baeldung/actuator/ActuatorInfoIntegrationTest.java

@@ -1,17 +1,14 @@
 package com.baeldung.actuator;
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.web.client.TestRestTemplate;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-@ExtendWith(SpringExtension.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = Application.class)
 public class ActuatorInfoIntegrationTest {
 

spring-boot-modules/spring-boot-simple/src/test/java/com/baeldung/boot/testing/EmployeeControllerIntegrationTest.java

@@ -2,15 +2,13 @@
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 import org.mockito.internal.verification.VerificationModeFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.http.MediaType;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.web.servlet.MockMvc;
 
 import java.util.Arrays;
@@ -26,7 +24,6 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-@ExtendWith(SpringExtension.class)
 @WebMvcTest(value = EmployeeRestController.class, excludeAutoConfiguration = SecurityAutoConfiguration.class)
 public class EmployeeControllerIntegrationTest {
 

spring-boot-modules/spring-boot-simple/src/test/java/com/baeldung/boot/testing/EmployeeRepositoryIntegrationTest.java

@@ -1,17 +1,14 @@
 package com.baeldung.boot.testing;
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
 import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-@ExtendWith(SpringExtension.class)
 @DataJpaTest
 public class EmployeeRepositoryIntegrationTest {
 
@@ -41,13 +38,15 @@ public void whenFindById_thenReturnEmployee() {
         Employee emp = new Employee("test");
         entityManager.persistAndFlush(emp);
 
-        Employee fromDb = employeeRepository.findById(emp.getId()).orElse(null);
+        Employee fromDb = employeeRepository.findById(emp.getId())
+            .orElse(null);
         assertThat(fromDb.getName()).isEqualTo(emp.getName());
     }
 
     @Test
     public void whenInvalidId_thenReturnNull() {
-        Employee fromDb = employeeRepository.findById(-11l).orElse(null);
+        Employee fromDb = employeeRepository.findById(-11l)
+            .orElse(null);
         assertThat(fromDb).isNull();
     }
 
@@ -64,6 +63,8 @@ public void givenSetOfEmployees_whenFindAll_thenReturnAllEmployees() {
 
         List<Employee> allEmployees = employeeRepository.findAll();
 
-        assertThat(allEmployees).hasSize(3).extracting(Employee::getName).containsOnly(alex.getName(), ron.getName(), bob.getName());
+        assertThat(allEmployees).hasSize(3)
+            .extracting(Employee::getName)
+            .containsOnly(alex.getName(), ron.getName(), bob.getName());
     }
 }

spring-boot-modules/spring-boot-simple/src/test/java/com/baeldung/boot/testing/EmployeeRestControllerIntegrationTest.java

@@ -2,15 +2,13 @@
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.http.MediaType;
 import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.web.servlet.MockMvc;
 
 import java.io.IOException;
@@ -25,10 +23,9 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
 
-@ExtendWith(SpringExtension.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.MOCK, classes = Application.class)
-@AutoConfigureMockMvc 
-@EnableAutoConfiguration(exclude=SecurityAutoConfiguration.class)
+@AutoConfigureMockMvc
+@EnableAutoConfiguration(exclude = SecurityAutoConfiguration.class)
 @TestPropertySource(locations = "classpath:application-integrationtest.properties")
 public class EmployeeRestControllerIntegrationTest {
 
@@ -46,10 +43,12 @@ public void resetDb() {
     @Test
     public void whenValidInput_thenCreateEmployee() throws IOException, Exception {
         Employee bob = new Employee("bob");
-        mvc.perform(post("/api/employees").contentType(MediaType.APPLICATION_JSON).content(JsonUtil.toJson(bob)));
+        mvc.perform(post("/api/employees").contentType(MediaType.APPLICATION_JSON)
+            .content(JsonUtil.toJson(bob)));
 
         List<Employee> found = repository.findAll();
-        assertThat(found).extracting(Employee::getName).containsOnly("bob");
+        assertThat(found).extracting(Employee::getName)
+            .containsOnly("bob");
     }
 
     @Test

spring-boot-modules/spring-boot-simple/src/test/java/com/baeldung/boot/testing/EmployeeServiceImplIntegrationTest.java

@@ -44,12 +44,18 @@ public void setUp() {
 
         List<Employee> allEmployees = Arrays.asList(john, bob, alex);
 
-        Mockito.when(employeeRepository.findByName(john.getName())).thenReturn(john);
-        Mockito.when(employeeRepository.findByName(alex.getName())).thenReturn(alex);
-        Mockito.when(employeeRepository.findByName("wrong_name")).thenReturn(null);
-        Mockito.when(employeeRepository.findById(john.getId())).thenReturn(Optional.of(john));
-        Mockito.when(employeeRepository.findAll()).thenReturn(allEmployees);
-        Mockito.when(employeeRepository.findById(-99L)).thenReturn(Optional.empty());
+        Mockito.when(employeeRepository.findByName(john.getName()))
+            .thenReturn(john);
+        Mockito.when(employeeRepository.findByName(alex.getName()))
+            .thenReturn(alex);
+        Mockito.when(employeeRepository.findByName("wrong_name"))
+            .thenReturn(null);
+        Mockito.when(employeeRepository.findById(john.getId()))
+            .thenReturn(Optional.of(john));
+        Mockito.when(employeeRepository.findAll())
+            .thenReturn(allEmployees);
+        Mockito.when(employeeRepository.findById(-99L))
+            .thenReturn(Optional.empty());
     }
 
     @Test
@@ -107,21 +113,26 @@ public void given3Employees_whengetAll_thenReturn3Records() {
 
         List<Employee> allEmployees = employeeService.getAllEmployees();
         verifyFindAllEmployeesIsCalledOnce();
-        assertThat(allEmployees).hasSize(3).extracting(Employee::getName).contains(alex.getName(), john.getName(), bob.getName());
+        assertThat(allEmployees).hasSize(3)
+            .extracting(Employee::getName)
+            .contains(alex.getName(), john.getName(), bob.getName());
     }
 
     private void verifyFindByNameIsCalledOnce(String name) {
-        Mockito.verify(employeeRepository, VerificationModeFactory.times(1)).findByName(name);
+        Mockito.verify(employeeRepository, VerificationModeFactory.times(1))
+            .findByName(name);
         Mockito.reset(employeeRepository);
     }
 
     private void verifyFindByIdIsCalledOnce() {
-        Mockito.verify(employeeRepository, VerificationModeFactory.times(1)).findById(Mockito.anyLong());
+        Mockito.verify(employeeRepository, VerificationModeFactory.times(1))
+            .findById(Mockito.anyLong());
         Mockito.reset(employeeRepository);
     }
 
     private void verifyFindAllEmployeesIsCalledOnce() {
-        Mockito.verify(employeeRepository, VerificationModeFactory.times(1)).findAll();
+        Mockito.verify(employeeRepository, VerificationModeFactory.times(1))
+            .findAll();
         Mockito.reset(employeeRepository);
     }
 }

spring-boot-modules/spring-boot-simple/src/test/java/com/baeldung/bootstrap/SpringBootBootstrapLiveTest.java

@@ -1,8 +1,15 @@
 package com.baeldung.bootstrap;
 
+import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
+import static org.apache.commons.lang3.RandomStringUtils.randomNumeric;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import com.baeldung.bootstrap.persistence.model.Book;
+
 import io.restassured.RestAssured;
 import io.restassured.response.Response;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -12,11 +19,6 @@
 
 import java.util.List;
 
-import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
-import static org.apache.commons.lang3.RandomStringUtils.randomNumeric;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 public class SpringBootBootstrapLiveTest {
 
@@ -128,10 +130,11 @@ private Book createRandomBook() {
 
     private String createBookAsUri(Book book) {
         final Response response = RestAssured.given()
-          .contentType(MediaType.APPLICATION_JSON_VALUE)
-          .body(book)
-          .post(API_ROOT);
-        return API_ROOT + "/" + response.jsonPath().get("id");
+            .contentType(MediaType.APPLICATION_JSON_VALUE)
+            .body(book)
+            .post(API_ROOT);
+        return API_ROOT + "/" + response.jsonPath()
+            .get("id");
     }
 
 }

spring-boot-modules/spring-boot-simple/src/test/java/com/baeldung/bootstrap/SpringContextTest.java

@@ -1,11 +1,8 @@
 package com.baeldung.bootstrap;
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-@ExtendWith(SpringExtension.class)
 @SpringBootTest
 public class SpringContextTest {
 

spring-boot-modules/spring-boot-simple/src/test/java/com/baeldung/configurationproperties/PropertiesConversionIntegrationTest.java

@@ -1,18 +1,16 @@
 package com.baeldung.configurationproperties;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.util.unit.DataSize;
 
 import java.time.Duration;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-@ExtendWith(SpringExtension.class)
 @SpringBootTest(classes = PropertiesConversionApplication.class)
 @TestPropertySource("classpath:conversion.properties")
 public class PropertiesConversionIntegrationTest {
@@ -31,13 +29,15 @@ public void whenUseTimeUnitPropertyConversion_thenSuccess() throws Exception {
     public void whenUseDataSizePropertyConversion_thenSuccess() throws Exception {
         assertEquals(DataSize.ofBytes(300), properties.getSizeInDefaultUnit());
         assertEquals(DataSize.ofGigabytes(2), properties.getSizeInGB());
-        assertEquals(DataSize.ofTerabytes(4), properties.getSizeInTB());        
+        assertEquals(DataSize.ofTerabytes(4), properties.getSizeInTB());
     }
-   
+
     @Test
     public void whenUseCustomPropertyConverter_thenSuccess() throws Exception {
-        assertEquals("john", properties.getEmployee().getName());
-        assertEquals(2000.0, properties.getEmployee().getSalary());
+        assertEquals("john", properties.getEmployee()
+            .getName());
+        assertEquals(2000.0, properties.getEmployee()
+            .getSalary());
     }
-    
+
 }

spring-boot-modules/spring-boot-simple/src/test/java/com/baeldung/starter/SpringBootApplicationIntegrationTest.java

@@ -1,24 +1,21 @@
 package com.baeldung.starter;
 
+import static org.hamcrest.Matchers.hasSize;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.http.MediaType;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.context.web.WebAppConfiguration;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
 
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.hasSize;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
-
-@ExtendWith(SpringExtension.class)
 @SpringBootTest(classes = Application.class)
 @WebAppConfiguration
 public class SpringBootApplicationIntegrationTest {
@@ -30,24 +27,17 @@ public class SpringBootApplicationIntegrationTest {
 
     @BeforeEach
     public void setupMockMvc() {
-        mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).build();
+        mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext)
+            .build();
     }
 
     @Test
-    public void givenRequestHasBeenMade_whenMeetsAllOfGivenConditions_thenCorrect()
-      throws Exception {
+    public void givenRequestHasBeenMade_whenMeetsAllOfGivenConditions_thenCorrect() throws Exception {
         mockMvc.perform(MockMvcRequestBuilders.get("/entity/all"))
-          .andExpect(MockMvcResultMatchers.status().isOk())
-          .andExpect(MockMvcResultMatchers.content().contentType(MediaType.APPLICATION_JSON))
-          .andExpect(jsonPath("$", hasSize(4)));
+            .andExpect(MockMvcResultMatchers.status()
+                .isOk())
+            .andExpect(MockMvcResultMatchers.content()
+                .contentType(MediaType.APPLICATION_JSON))
+            .andExpect(jsonPath("$", hasSize(4)));
     }
-
-    @Test
-    public void givenRequestHasBeenMade_whenMeetsFindByDateOfGivenConditions_thenCorrect()
-      throws Exception {
-        mockMvc.perform(MockMvcRequestBuilders.get("/entity/findbydate/{date}", "2011-12-03T10:15:30"))
-          .andExpect(MockMvcResultMatchers.status().isOk()).andExpect(MockMvcResultMatchers.content().contentType(MediaType.APPLICATION_JSON))
-          .andExpect(jsonPath("$.id", equalTo(1)));
-    }
-
 }