Update to Spring Boot 3

pom.xml

@@ -55,14 +55,16 @@
         <spring.security.acl.mongo.version>5.2.4.RELEASE</spring.security.acl.mongo.version>
 
         <!-- Core -->
-        <springdoc.version>1.7.0</springdoc.version>
+        <springdoc.version>2.1.0</springdoc.version>
         <mongock.version>5.3.1</mongock.version>
-        <mongodb.spring-data.v3.version>3.4.5</mongodb.spring-data.v3.version>
+        <mongodb.spring-data.version>4.1.1</mongodb.spring-data.version>
         <rdf4j.version>4.3.2</rdf4j.version>
         <jwt.version>0.11.5</jwt.version>
         <lombok.version>1.18.28</lombok.version>
         <rdf-resolver.version>0.1.2-SNAPSHOT</rdf-resolver.version>
-        <log4j2.version>2.17.1</log4j2.version>
+
+        <!-- Test -->
+        <httpclient5.version>5.2.1</httpclient5.version>
 
         <!-- Plugins -->
         <plugin.license.version>4.2</plugin.license.version>
@@ -73,10 +75,6 @@
         <plugin.rdf4j_generator.version>0.2.0</plugin.rdf4j_generator.version>
         <plugin.checkstyle.version>3.3.0</plugin.checkstyle.version>
         <plugin.spotbugs.version>4.7.3.5</plugin.spotbugs.version>
-
-        <!-- override for security -->
-        <snakeyaml.version>1.31</snakeyaml.version>
-        <spring-security.version>5.7.5</spring-security.version>
     </properties>
 
     <repositories>
@@ -189,20 +187,20 @@
         </dependency>
         <dependency>
             <groupId>io.mongock</groupId>
-            <artifactId>mongodb-springdata-v3-driver</artifactId>
+            <artifactId>mongodb-springdata-v4-driver</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-mongodb</artifactId>
-            <version>${mongodb.spring-data.v3.version}</version>
+            <version>${mongodb.spring-data.version}</version>
         </dependency>
 
         <!-- ////////////////// -->
         <!--   Core             -->
         <!-- ////////////////// -->
         <dependency>
             <groupId>org.springdoc</groupId>
-            <artifactId>springdoc-openapi-ui</artifactId>
+            <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
             <version>${springdoc.version}</version>
         </dependency>
         <dependency>
@@ -279,6 +277,12 @@
             <artifactId>spring-security-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents.client5</groupId>
+            <artifactId>httpclient5</artifactId>
+            <version>${httpclient5.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -456,5 +460,4 @@
             </plugin>
         </plugins>
     </build>
-
 </project>

src/main/java/nl/dtls/fairdatapoint/api/controller/dashboard/DashboardController.java

@@ -23,6 +23,7 @@
 package nl.dtls.fairdatapoint.api.controller.dashboard;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletRequest;
 import nl.dtls.fairdatapoint.api.dto.dashboard.DashboardItemDTO;
 import nl.dtls.fairdatapoint.service.dashboard.DashboardService;
 import nl.dtls.fairdatapoint.service.metadata.exception.MetadataServiceException;
@@ -36,7 +37,6 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 import static nl.dtls.fairdatapoint.util.HttpUtil.getRequestURL;

src/main/java/nl/dtls/fairdatapoint/api/controller/exception/ExceptionControllerAdvice.java

@@ -30,6 +30,7 @@
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import jakarta.validation.ConstraintViolationException;
 import lombok.extern.slf4j.Slf4j;
 import nl.dtls.fairdatapoint.api.dto.error.ErrorDTO;
 import nl.dtls.fairdatapoint.entity.exception.*;
@@ -46,6 +47,7 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.authentication.BadCredentialsException;
+import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -79,6 +81,23 @@ public ErrorDTO handleBadRequest(Exception exception) {
         return new ErrorDTO(HttpStatus.BAD_REQUEST, exception.getMessage());
     }
 
+    @ExceptionHandler({ConstraintViolationException.class, MethodArgumentNotValidException.class})
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    @ResponseBody
+    @ApiResponse(
+            responseCode = "400",
+            description = "Bad request",
+            content = @Content(
+                    mediaType = MediaType.APPLICATION_JSON_VALUE,
+                    schema = @Schema(implementation = ErrorDTO.class)
+            )
+    )
+    public ErrorDTO handleConstraintViolation(Exception exception) {
+        log.warn(exception.getMessage());
+        log.debug("Handling bad request (ConstraintViolation)", exception);
+        return new ErrorDTO(HttpStatus.BAD_REQUEST, exception.getMessage());
+    }
+
     @ExceptionHandler(RdfValidationException.class)
     @ResponseStatus(HttpStatus.BAD_REQUEST)
     @ResponseBody

src/main/java/nl/dtls/fairdatapoint/api/controller/form/FormAutocompleteController.java

@@ -23,6 +23,7 @@
 package nl.dtls.fairdatapoint.api.controller.form;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import nl.dtls.fairdatapoint.api.dto.form.FormAutocompleteItemDTO;
 import nl.dtls.fairdatapoint.api.dto.form.FormAutocompleteRequestDTO;
 import nl.dtls.fairdatapoint.service.form.autocomplete.FormsAutocompleteService;
@@ -35,7 +36,6 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.Valid;
 import java.util.List;
 
 @Tag(name = "Client")
@@ -55,7 +55,6 @@ public ResponseEntity<List<FormAutocompleteItemDTO>> searchAutocompleteItems(
             @RequestBody @Valid FormAutocompleteRequestDTO reqDto
     ) {
         final List<FormAutocompleteItemDTO> items = autocompleteService.searchItems(reqDto);
-        System.out.println(items);
         return new ResponseEntity<>(items, HttpStatus.OK);
     }
 }

src/main/java/nl/dtls/fairdatapoint/api/controller/index/IndexAdminController.java

@@ -24,6 +24,8 @@
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
 import nl.dtls.fairdatapoint.api.dto.index.ping.PingDTO;
 import nl.dtls.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
@@ -37,8 +39,6 @@
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
 import java.util.UUID;
 
 @Tag(name = "Index")

src/main/java/nl/dtls/fairdatapoint/api/controller/index/IndexPingController.java

@@ -28,6 +28,8 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
 import nl.dtls.fairdatapoint.api.dto.index.ping.PingDTO;
 import nl.dtls.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
@@ -42,9 +44,6 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-
 @Tag(name = "Index")
 @Slf4j
 @RestController

src/main/java/nl/dtls/fairdatapoint/api/controller/index/IndexSettingsController.java

@@ -23,6 +23,7 @@
 package nl.dtls.fairdatapoint.api.controller.index;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import nl.dtls.fairdatapoint.api.dto.index.settings.IndexSettingsDTO;
 import nl.dtls.fairdatapoint.api.dto.index.settings.IndexSettingsUpdateDTO;
 import nl.dtls.fairdatapoint.service.index.settings.IndexSettingsService;
@@ -31,8 +32,6 @@
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
-
 @Tag(name = "Index")
 @RestController
 @RequestMapping("/index/settings")

src/main/java/nl/dtls/fairdatapoint/api/controller/metadata/GenericMemberController.java

@@ -24,6 +24,7 @@
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import nl.dtls.fairdatapoint.api.dto.member.MemberCreateDTO;
 import nl.dtls.fairdatapoint.api.dto.member.MemberDTO;
 import nl.dtls.fairdatapoint.entity.exception.ResourceNotFoundException;
@@ -41,7 +42,6 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
 import java.util.List;
 
 import static nl.dtls.fairdatapoint.entity.metadata.MetadataGetter.getMetadataIdentifier;

src/main/java/nl/dtls/fairdatapoint/api/controller/metadata/GenericMetaController.java

@@ -24,6 +24,7 @@
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import nl.dtls.fairdatapoint.api.dto.member.MemberDTO;
 import nl.dtls.fairdatapoint.api.dto.metadata.MetaDTO;
 import nl.dtls.fairdatapoint.api.dto.metadata.MetaPathDTO;
@@ -44,7 +45,6 @@
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;

src/main/java/nl/dtls/fairdatapoint/api/controller/profile/ProfileController.java

@@ -23,6 +23,7 @@
 package nl.dtls.fairdatapoint.api.controller.profile;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletRequest;
 import nl.dtls.fairdatapoint.entity.exception.ResourceNotFoundException;
 import nl.dtls.fairdatapoint.service.profile.ProfileService;
 import org.eclipse.rdf4j.model.IRI;
@@ -33,7 +34,6 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.Optional;
 
 import static java.lang.String.format;

src/main/java/nl/dtls/fairdatapoint/api/controller/reset/ResetController.java

@@ -23,6 +23,7 @@
 package nl.dtls.fairdatapoint.api.controller.reset;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import nl.dtls.fairdatapoint.api.dto.reset.ResetDTO;
 import nl.dtls.fairdatapoint.service.reset.ResetService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,8 +35,6 @@
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.Valid;
-
 @Tag(name = "Client")
 @RestController
 public class ResetController {

src/main/java/nl/dtls/fairdatapoint/api/controller/resource/ResourceDefinitionController.java

@@ -23,6 +23,7 @@
 package nl.dtls.fairdatapoint.api.controller.resource;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import nl.dtls.fairdatapoint.api.dto.resource.ResourceDefinitionChangeDTO;
 import nl.dtls.fairdatapoint.api.dto.resource.ResourceDefinitionDTO;
 import nl.dtls.fairdatapoint.entity.exception.ResourceNotFoundException;
@@ -34,7 +35,6 @@
 import org.springframework.validation.BindException;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
 import java.util.List;
 import java.util.Optional;
 

src/main/java/nl/dtls/fairdatapoint/api/controller/schema/MetadataSchemaController.java

@@ -23,6 +23,7 @@
 package nl.dtls.fairdatapoint.api.controller.schema;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import nl.dtls.fairdatapoint.api.dto.schema.*;
 import nl.dtls.fairdatapoint.entity.exception.ResourceNotFoundException;
 import nl.dtls.fairdatapoint.entity.exception.UnauthorizedException;
@@ -36,7 +37,6 @@
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
 import java.util.List;
 import java.util.Optional;
 

src/main/java/nl/dtls/fairdatapoint/api/controller/search/SearchController.java

@@ -23,6 +23,7 @@
 package nl.dtls.fairdatapoint.api.controller.search;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import nl.dtls.fairdatapoint.api.dto.search.*;
 import nl.dtls.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException;
 import nl.dtls.fairdatapoint.service.search.SearchService;
@@ -33,7 +34,6 @@
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
 import java.util.List;
 
 @Tag(name = "Search")

src/main/java/nl/dtls/fairdatapoint/api/controller/search/SearchSavedQueryController.java

@@ -23,6 +23,7 @@
 package nl.dtls.fairdatapoint.api.controller.search;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import nl.dtls.fairdatapoint.api.dto.search.SearchResultDTO;
 import nl.dtls.fairdatapoint.api.dto.search.SearchSavedQueryChangeDTO;
 import nl.dtls.fairdatapoint.api.dto.search.SearchSavedQueryDTO;
@@ -37,7 +38,6 @@
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
 import java.util.List;
 import java.util.Optional;
 

src/main/java/nl/dtls/fairdatapoint/api/controller/settings/SettingsController.java

@@ -23,6 +23,7 @@
 package nl.dtls.fairdatapoint.api.controller.settings;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import nl.dtls.fairdatapoint.api.dto.settings.SettingsDTO;
 import nl.dtls.fairdatapoint.api.dto.settings.SettingsUpdateDTO;
 import nl.dtls.fairdatapoint.service.settings.SettingsService;
@@ -31,8 +32,6 @@
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
-
 @Tag(name = "Client")
 @RestController
 @RequestMapping("/settings")

src/main/java/nl/dtls/fairdatapoint/api/controller/token/TokenController.java

@@ -23,6 +23,7 @@
 package nl.dtls.fairdatapoint.api.controller.token;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import nl.dtls.fairdatapoint.api.dto.auth.AuthDTO;
 import nl.dtls.fairdatapoint.api.dto.auth.TokenDTO;
 import nl.dtls.fairdatapoint.service.jwt.JwtService;
@@ -34,8 +35,6 @@
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
-
 @Tag(name = "Authentication and Authorization")
 @RestController
 @RequestMapping("/tokens")

src/main/java/nl/dtls/fairdatapoint/api/controller/user/UserController.java

@@ -23,6 +23,7 @@
 package nl.dtls.fairdatapoint.api.controller.user;
 
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import nl.dtls.fairdatapoint.api.dto.user.*;
 import nl.dtls.fairdatapoint.entity.exception.ForbiddenException;
 import nl.dtls.fairdatapoint.entity.exception.ResourceNotFoundException;
@@ -33,7 +34,6 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
 import java.util.List;
 import java.util.Optional;