Update project to Java 21 and Spring Boot 4.0.2

.github/workflows/build.yml

@@ -13,10 +13,10 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'zulu'
       - name: Cache SonarQube packages
         uses: actions/cache@v4

Dockerfile

@@ -1,4 +1,4 @@
-FROM eclipse-temurin:17-jdk-alpine
+FROM eclipse-temurin:21-jdk-alpine
 
 WORKDIR /app
 

pom.xml

@@ -8,21 +8,21 @@
     <version>1.0.0</version>
     <packaging>war</packaging>
     <name>Simple-Invoicing</name>
-    <description>Final Project — Spring Boot Advanced — May 2024</description>
+    <description>Final Project – Spring Boot Advanced – May 2024</description>
 
     <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>17</java.version>
-        <spring-boot.version>3.5.7</spring-boot.version>
+        <java.version>21</java.version>
+        <spring-boot.version>4.0.2</spring-boot.version>
         <modelmapper.version>3.2.6</modelmapper.version>
         <cloudinary-http5.version>2.3.2</cloudinary-http5.version>
-        <mysql-connector-j.version>9.5.0</mysql-connector-j.version>
-        <postgresql.version>42.7.8</postgresql.version>
+        <mysql-connector-j.version>9.6.0</mysql-connector-j.version>
+        <postgresql.version>42.7.10</postgresql.version>
         <commons-lang3.version>3.20.0</commons-lang3.version>
         <jacoco.version>0.8.14</jacoco.version>
-        <maven-compiler-plugin.version>3.14.1</maven-compiler-plugin.version>
+        <maven-compiler-plugin.version>3.15.0</maven-compiler-plugin.version>
         <lombok.version>1.18.42</lombok.version>
         <sonar.organization>mark79-github</sonar.organization>
     </properties>
@@ -91,6 +91,16 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-webmvc-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa-test</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-test</artifactId>

src/main/java/bg/softuni/invoice/config/SecurityConfiguration.java

@@ -1,7 +1,6 @@
 package bg.softuni.invoice.config;
 
 import lombok.AllArgsConstructor;
-import org.springframework.boot.autoconfigure.security.servlet.PathRequest;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.authentication.AuthenticationProvider;
@@ -28,15 +27,22 @@ public class SecurityConfiguration {
     private final BCryptPasswordEncoder bCryptPasswordEncoder;
 
     @Bean
-    public SecurityFilterChain configureSecurity(HttpSecurity httpSecurity) throws Exception {
+    public SecurityFilterChain configureSecurity(HttpSecurity httpSecurity) {
         httpSecurity
                 .cors(AbstractHttpConfigurer::disable)
                 .csrf(csrf -> csrf.csrfTokenRepository(csrfTokenRepository()))
                 .authorizeHttpRequests(auth -> auth
                         .requestMatchers("/").permitAll()
-                        .requestMatchers(PathRequest.toStaticResources().atCommonLocations()).permitAll()
+                        .requestMatchers(
+                                "/css/**",
+                                "/js/**",
+                                "/images/**",
+                                "/webjars/**",
+                                "/favicon.ico"
+                        ).permitAll()
                         .requestMatchers("/actuator/health").permitAll()
                         .requestMatchers("/user/register", "/user/login").anonymous()
+                        .requestMatchers("/log/**").hasRole("ROOT")
                         .anyRequest().authenticated()
                 )
                 .formLogin(form -> form

src/main/java/bg/softuni/invoice/service/ScheduleService.java

@@ -1,14 +1,8 @@
 package bg.softuni.invoice.service;
 
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.scheduling.annotation.EnableAsync;
-
-@EnableAsync
 public interface ScheduleService {
-
-    @Async
     void deleteLogs();
 
-    @Async
     void changeStatus();
 }
+

src/main/java/bg/softuni/invoice/web/controller/HomeController.java

@@ -2,19 +2,23 @@
 
 import bg.softuni.invoice.web.annotation.PageTitle;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.security.authentication.AnonymousAuthenticationToken;
+import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 
-import java.security.Principal;
-
 @Controller
 public class HomeController {
 
     @GetMapping("/")
     @PageTitle("invoices")
-    public String index(Principal principal) {
+    public String index(Authentication authentication) {
+
+        boolean isLoggedIn = authentication != null
+                && authentication.isAuthenticated()
+                && !(authentication instanceof AnonymousAuthenticationToken);
 
-        if (principal != null) {
+        if (isLoggedIn) {
             return "home/home";
         }
 

src/main/java/bg/softuni/invoice/web/controller/UserController.java

@@ -149,7 +149,7 @@ public String profileConfirm(@Valid
 
     @GetMapping("/all")
     @PageTitle("User all")
-    @PreAuthorize("hasRole('ROLE_ROOT')")
+    @PreAuthorize("hasRole('ROOT')")
     public String allUsers(Model model) {
 
         List<UserViewModel> users = this.userService.getAllUsers()
@@ -172,31 +172,31 @@ public String allUsers(Model model) {
     }
 
     @PostMapping("/set-admin/{id}")
-    @PreAuthorize("hasRole('ROLE_ROOT')")
+    @PreAuthorize("hasRole('ROOT')")
     public String setAdminRole(@PathVariable String id) {
         this.userService.setAdmin(id);
 
         return REDIRECT_USER_ALL;
     }
 
     @PostMapping("/set-user/{id}")
-    @PreAuthorize("hasRole('ROLE_ROOT')")
+    @PreAuthorize("hasRole('ROOT')")
     public String setUserRole(@PathVariable String id) {
         this.userService.setUser(id);
 
         return REDIRECT_USER_ALL;
     }
 
     @PostMapping("/set-enabled/{id}")
-    @PreAuthorize("hasRole('ROLE_ROOT')")
+    @PreAuthorize("hasRole('ROOT')")
     public String setEnabled(@PathVariable String id) {
         this.userService.setUserEnabled(id);
 
         return REDIRECT_USER_ALL;
     }
 
     @PostMapping("/set-disabled/{id}")
-    @PreAuthorize("hasRole('ROLE_ROOT')")
+    @PreAuthorize("hasRole('ROOT')")
     public String setDisabled(@PathVariable String id) {
         this.userService.setUserDisabled(id);
 

src/main/java/bg/softuni/invoice/web/interceptor/LoggingInterceptor.java

@@ -7,7 +7,7 @@
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
-import org.springframework.boot.autoconfigure.security.servlet.PathRequest;
+import org.springframework.boot.security.autoconfigure.web.servlet.PathRequest;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.HandlerInterceptor;
 

src/test/java/bg/softuni/invoice/repository/CompanyRepositoryTest.java

@@ -7,7 +7,7 @@
 import org.junit.jupiter.params.provider.NullSource;
 import org.junit.jupiter.params.provider.ValueSource;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+import org.springframework.boot.data.jpa.test.autoconfigure.DataJpaTest;
 
 import java.util.List;
 import java.util.Optional;

src/test/java/bg/softuni/invoice/repository/InvoiceRepositoryTest.java

@@ -9,7 +9,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+import org.springframework.boot.data.jpa.test.autoconfigure.DataJpaTest;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
@@ -84,7 +84,7 @@ void testGetAllByUser_withDifferentUser_returnsOnlyRelevantInvoices() {
         List<Invoice> resultForUser2 = invoiceRepository.getAllByUser(user2);
 
         assertThat(resultForUser1).hasSize(1);
-        assertThat(resultForUser1.get(0).getTotalValue()).isEqualByComparingTo("200.00");
+        assertThat(resultForUser1.getFirst().getTotalValue()).isEqualByComparingTo("200.00");
         assertThat(resultForUser2).isEmpty();
     }
 

src/test/java/bg/softuni/invoice/repository/ItemRepositoryTest.java

@@ -5,7 +5,7 @@
 import jakarta.persistence.EntityManager;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+import org.springframework.boot.data.jpa.test.autoconfigure.DataJpaTest;
 
 import java.math.BigDecimal;
 import java.util.Optional;

src/test/java/bg/softuni/invoice/repository/LogRepositoryTest.java

@@ -5,7 +5,7 @@
 import jakarta.persistence.EntityManager;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+import org.springframework.boot.data.jpa.test.autoconfigure.DataJpaTest;
 
 import java.time.LocalDateTime;
 import java.util.List;

src/test/java/bg/softuni/invoice/repository/RoleRepositoryTest.java

@@ -4,7 +4,7 @@
 import jakarta.persistence.EntityManager;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+import org.springframework.boot.data.jpa.test.autoconfigure.DataJpaTest;
 
 import java.util.Optional;
 

src/test/java/bg/softuni/invoice/repository/UserRepositoryTest.java

@@ -4,7 +4,7 @@
 import jakarta.persistence.EntityManager;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+import org.springframework.boot.data.jpa.test.autoconfigure.DataJpaTest;
 
 import java.util.Optional;
 

src/test/java/bg/softuni/invoice/web/controller/CompanyControllerTest.java

@@ -10,18 +10,20 @@
 import org.mockito.Mockito;
 import org.modelmapper.ModelMapper;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc;
 import org.springframework.http.MediaType;
-import org.springframework.security.test.context.support.WithMockUser;
 import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.web.servlet.MockMvc;
 
 import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf;
+import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.user;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.flash;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.redirectedUrl;
 
-@WebMvcTest(CompanyController.class)
+@SpringBootTest
+@AutoConfigureMockMvc
 class CompanyControllerTest {
 
     @Autowired
@@ -43,7 +45,6 @@ class CompanyControllerTest {
     private ItemService itemService;
 
     @Test
-    @WithMockUser(roles = {"ADMIN"})
     void testAddConfirm_withValidInput_shouldRedirectToAll() throws Exception {
         CompanyAddBindingModel validModel = new CompanyAddBindingModel();
         validModel.setName("Valid Name");
@@ -59,7 +60,7 @@ void testAddConfirm_withValidInput_shouldRedirectToAll() throws Exception {
         Mockito.when(companyService.getCompanyByUniqueIdentifier(validModel.getUniqueIdentifier())).thenReturn(null);
         Mockito.when(modelMapper.map(validModel, CompanyServiceModel.class)).thenReturn(serviceModel);
 
-        mockMvc.perform(post("/company/add")
+        mockMvc.perform(post("/company/add").with(user("test-admin").roles("ADMIN"))
                         .contentType(MediaType.APPLICATION_FORM_URLENCODED)
                         .with(csrf())
                         .param("name", validModel.getName())
@@ -69,7 +70,6 @@ void testAddConfirm_withValidInput_shouldRedirectToAll() throws Exception {
     }
 
     @Test
-    @WithMockUser(roles = {"ADMIN"})
     void testAddConfirm_withNameConflict_shouldRedirectToAdd() throws Exception {
         CompanyAddBindingModel conflictingModel = new CompanyAddBindingModel();
         conflictingModel.setName("Existing Company");
@@ -81,7 +81,7 @@ void testAddConfirm_withNameConflict_shouldRedirectToAdd() throws Exception {
 
         Mockito.when(companyService.getCompanyByName(conflictingModel.getName())).thenReturn(conflictingServiceModel);
 
-        mockMvc.perform(post("/company/add")
+        mockMvc.perform(post("/company/add").with(user("test-admin").roles("ADMIN"))
                         .contentType(MediaType.APPLICATION_FORM_URLENCODED)
                         .with(csrf())
                         .param("name", conflictingModel.getName())
@@ -93,7 +93,6 @@ void testAddConfirm_withNameConflict_shouldRedirectToAdd() throws Exception {
     }
 
     @Test
-    @WithMockUser(roles = {"ADMIN"})
     void testAddConfirm_withUniqueIdentifierConflict_shouldRedirectToAdd() throws Exception {
         CompanyAddBindingModel conflictingModel = new CompanyAddBindingModel();
         conflictingModel.setName("New Company");
@@ -106,7 +105,7 @@ void testAddConfirm_withUniqueIdentifierConflict_shouldRedirectToAdd() throws Ex
         Mockito.when(companyService.getCompanyByName(conflictingModel.getName())).thenReturn(null);
         Mockito.when(companyService.getCompanyByUniqueIdentifier(conflictingModel.getUniqueIdentifier())).thenReturn(conflictingServiceModel);
 
-        mockMvc.perform(post("/company/add")
+        mockMvc.perform(post("/company/add").with(user("test-admin").roles("ADMIN"))
                         .contentType(MediaType.APPLICATION_FORM_URLENCODED)
                         .with(csrf())
                         .param("name", conflictingModel.getName())
@@ -118,9 +117,8 @@ void testAddConfirm_withUniqueIdentifierConflict_shouldRedirectToAdd() throws Ex
     }
 
     @Test
-    @WithMockUser(roles = {"ADMIN"})
     void testAddConfirm_withValidationErrors_shouldRedirectToAdd() throws Exception {
-        mockMvc.perform(post("/company/add")
+        mockMvc.perform(post("/company/add").with(user("test-admin").roles("ADMIN"))
                         .contentType(MediaType.APPLICATION_FORM_URLENCODED)
                         .with(csrf())
                         .param("name", "")