From 1ce0a00053e6461c53522e24549c7b4c95857d95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Such=C3=A1nek?= Date: Tue, 27 Jun 2023 14:10:00 +0200 Subject: [PATCH] Update to Spring Boot 3 --- pom.xml | 25 ++++---- .../dashboard/DashboardController.java | 2 +- .../exception/ExceptionControllerAdvice.java | 19 ++++++ .../form/FormAutocompleteController.java | 3 +- .../index/IndexAdminController.java | 4 +- .../controller/index/IndexPingController.java | 5 +- .../index/IndexSettingsController.java | 3 +- .../metadata/GenericMemberController.java | 2 +- .../metadata/GenericMetaController.java | 2 +- .../controller/profile/ProfileController.java | 2 +- .../api/controller/reset/ResetController.java | 3 +- .../ResourceDefinitionController.java | 2 +- .../schema/MetadataSchemaController.java | 2 +- .../controller/search/SearchController.java | 2 +- .../search/SearchSavedQueryController.java | 2 +- .../settings/SettingsController.java | 3 +- .../api/controller/token/TokenController.java | 3 +- .../api/controller/user/UserController.java | 2 +- .../fairdatapoint/api/dto/auth/AuthDTO.java | 7 +-- .../dto/form/FormAutocompleteRequestDTO.java | 3 +- .../api/dto/index/entry/IndexEntryDTO.java | 3 +- .../dto/index/entry/IndexEntryDetailDTO.java | 2 +- .../api/dto/index/event/EventDTO.java | 2 +- .../api/dto/index/ping/PingDTO.java | 3 +- .../dto/index/settings/IndexSettingsDTO.java | 3 +- .../index/settings/IndexSettingsPingDTO.java | 2 +- .../settings/IndexSettingsRetrievalDTO.java | 3 +- .../settings/IndexSettingsUpdateDTO.java | 5 +- .../api/dto/member/MemberCreateDTO.java | 3 +- .../api/dto/metadata/MetaDTO.java | 2 +- .../api/dto/metadata/MetaPathDTO.java | 3 +- .../resource/ResourceDefinitionChangeDTO.java | 6 +- .../dto/resource/ResourceDefinitionDTO.java | 6 +- .../dto/schema/MetadataSchemaChangeDTO.java | 4 +- .../api/dto/schema/MetadataSchemaDTO.java | 4 +- .../dto/schema/MetadataSchemaDraftDTO.java | 4 +- .../MetadataSchemaPreviewRequestDTO.java | 2 +- .../dto/schema/MetadataSchemaReleaseDTO.java | 3 +- .../dto/schema/MetadataSchemaRemoteDTO.java | 5 +- .../dto/schema/MetadataSchemaUpdateDTO.java | 5 +- .../dto/schema/MetadataSchemaVersionDTO.java | 4 +- .../api/dto/search/SearchFilterDTO.java | 4 +- .../api/dto/search/SearchQueryDTO.java | 3 +- .../dto/search/SearchQueryTemplateDTO.java | 3 +- .../dto/search/SearchQueryVariablesDTO.java | 3 +- .../dto/search/SearchSavedQueryChangeDTO.java | 7 +-- .../api/dto/search/SearchSavedQueryDTO.java | 6 +- .../SettingsAutocompleteSourceDTO.java | 3 +- .../SettingsFormsAutocompleteDTO.java | 2 +- .../api/dto/settings/SettingsFormsDTO.java | 3 +- .../api/dto/settings/SettingsPingDTO.java | 2 +- .../dto/settings/SettingsPingUpdateDTO.java | 2 +- .../api/dto/settings/SettingsSearchDTO.java | 4 +- .../api/dto/settings/SettingsUpdateDTO.java | 2 +- .../api/dto/user/UserChangeDTO.java | 5 +- .../api/dto/user/UserCreateDTO.java | 5 +- .../api/dto/user/UserProfileChangeDTO.java | 3 +- .../fairdatapoint/api/filter/CORSFilter.java | 8 +-- .../api/filter/JwtTokenFilter.java | 8 +-- .../api/filter/LoggingFilter.java | 8 +-- .../api/validator/DurationValidator.java | 4 +- .../api/validator/IriValidator.java | 4 +- .../api/validator/SemVerValidator.java | 5 +- .../api/validator/ValidDuration.java | 5 +- .../fairdatapoint/api/validator/ValidIri.java | 5 +- .../api/validator/ValidSemVer.java | 5 +- .../fairdatapoint/config/MongoConfig.java | 4 +- .../fairdatapoint/config/SecurityConfig.java | 60 +++++++++---------- .../development/MigrationRunner.java | 3 +- .../RdfDevelopmentMigrationRunner.java | 3 +- .../CatalogMetadataRepositoryImpl.java | 2 +- .../index/entry/RepositoryMetadata.java | 2 +- .../entity/index/event/Event.java | 2 +- .../entity/index/http/Request.java | 2 +- .../entity/index/settings/IndexSettings.java | 2 +- .../index/settings/IndexSettingsPing.java | 2 +- .../settings/IndexSettingsRetrieval.java | 2 +- .../entity/index/webhook/Webhook.java | 2 +- .../resource/ResourceDefinitionChild.java | 5 +- .../ResourceDefinitionChildListView.java | 4 +- ...sourceDefinitionChildListViewMetadata.java | 3 +- .../resource/ResourceDefinitionLink.java | 2 +- .../entity/schema/MetadataSchema.java | 4 +- .../entity/schema/MetadataSchemaDraft.java | 4 +- .../entity/settings/SettingsPing.java | 2 +- .../fairdatapoint/service/UtilityService.java | 3 +- .../index/entry/IndexEntryService.java | 2 +- .../service/index/event/EventService.java | 4 +- .../index/event/IncomingPingUtils.java | 2 +- .../service/index/webhook/WebhookService.java | 2 +- .../fairdatapoint/service/jwt/JwtService.java | 2 +- .../service/openapi/OpenApiService.java | 2 +- .../resource/ResourceDefinitionCache.java | 2 +- .../ResourceDefinitionTargetClassesCache.java | 2 +- .../service/schema/MetadataSchemaService.java | 2 +- .../service/search/SearchFilterCache.java | 3 +- .../service/settings/SettingsCache.java | 3 +- .../nl/dtls/fairdatapoint/util/HttpUtil.java | 2 +- .../acceptance/actuator/ActuatorInfoDTO.java | 5 +- .../index/admin/List_Trigger_POST.java | 2 +- .../fairdatapoint/utils/HttpUtilTest.java | 3 +- 101 files changed, 206 insertions(+), 224 deletions(-) diff --git a/pom.xml b/pom.xml index f5fa9d7f2..e3d262797 100644 --- a/pom.xml +++ b/pom.xml @@ -55,14 +55,16 @@ 5.2.4.RELEASE - 1.7.0 + 2.1.0 5.3.1 - 3.4.5 + 4.1.1 4.3.2 0.11.5 1.18.28 0.1.2-SNAPSHOT - 2.17.1 + + + 5.2.1 4.2 @@ -73,10 +75,6 @@ 0.2.0 3.3.0 4.7.3.5 - - - 1.31 - 5.7.5 @@ -189,12 +187,12 @@ io.mongock - mongodb-springdata-v3-driver + mongodb-springdata-v4-driver org.springframework.data spring-data-mongodb - ${mongodb.spring-data.v3.version} + ${mongodb.spring-data.version} @@ -202,7 +200,7 @@ org.springdoc - springdoc-openapi-ui + springdoc-openapi-starter-webmvc-ui ${springdoc.version} @@ -279,6 +277,12 @@ spring-security-test test + + org.apache.httpcomponents.client5 + httpclient5 + ${httpclient5.version} + test + @@ -456,5 +460,4 @@ - diff --git a/src/main/java/nl/dtls/fairdatapoint/api/controller/dashboard/DashboardController.java b/src/main/java/nl/dtls/fairdatapoint/api/controller/dashboard/DashboardController.java index 6f84464c5..4ba66cfea 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/controller/dashboard/DashboardController.java +++ b/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; diff --git a/src/main/java/nl/dtls/fairdatapoint/api/controller/exception/ExceptionControllerAdvice.java b/src/main/java/nl/dtls/fairdatapoint/api/controller/exception/ExceptionControllerAdvice.java index a4b85a5b6..fef881232 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/controller/exception/ExceptionControllerAdvice.java +++ b/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 diff --git a/src/main/java/nl/dtls/fairdatapoint/api/controller/form/FormAutocompleteController.java b/src/main/java/nl/dtls/fairdatapoint/api/controller/form/FormAutocompleteController.java index 07ff3586d..3d991c2a3 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/controller/form/FormAutocompleteController.java +++ b/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> searchAutocompleteItems( @RequestBody @Valid FormAutocompleteRequestDTO reqDto ) { final List items = autocompleteService.searchItems(reqDto); - System.out.println(items); return new ResponseEntity<>(items, HttpStatus.OK); } } diff --git a/src/main/java/nl/dtls/fairdatapoint/api/controller/index/IndexAdminController.java b/src/main/java/nl/dtls/fairdatapoint/api/controller/index/IndexAdminController.java index 7df2083ce..1880baca5 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/controller/index/IndexAdminController.java +++ b/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") diff --git a/src/main/java/nl/dtls/fairdatapoint/api/controller/index/IndexPingController.java b/src/main/java/nl/dtls/fairdatapoint/api/controller/index/IndexPingController.java index 77adfde58..ddf45d92c 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/controller/index/IndexPingController.java +++ b/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 diff --git a/src/main/java/nl/dtls/fairdatapoint/api/controller/index/IndexSettingsController.java b/src/main/java/nl/dtls/fairdatapoint/api/controller/index/IndexSettingsController.java index 0ad99c37c..397cabb59 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/controller/index/IndexSettingsController.java +++ b/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") diff --git a/src/main/java/nl/dtls/fairdatapoint/api/controller/metadata/GenericMemberController.java b/src/main/java/nl/dtls/fairdatapoint/api/controller/metadata/GenericMemberController.java index 197bd7e9a..dc11e8fcf 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/controller/metadata/GenericMemberController.java +++ b/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; diff --git a/src/main/java/nl/dtls/fairdatapoint/api/controller/metadata/GenericMetaController.java b/src/main/java/nl/dtls/fairdatapoint/api/controller/metadata/GenericMetaController.java index eb8e191f6..9aebcb985 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/controller/metadata/GenericMetaController.java +++ b/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; diff --git a/src/main/java/nl/dtls/fairdatapoint/api/controller/profile/ProfileController.java b/src/main/java/nl/dtls/fairdatapoint/api/controller/profile/ProfileController.java index 6f0384f18..d95c3ddd2 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/controller/profile/ProfileController.java +++ b/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; diff --git a/src/main/java/nl/dtls/fairdatapoint/api/controller/reset/ResetController.java b/src/main/java/nl/dtls/fairdatapoint/api/controller/reset/ResetController.java index 475626df8..9a90afa80 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/controller/reset/ResetController.java +++ b/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 { diff --git a/src/main/java/nl/dtls/fairdatapoint/api/controller/resource/ResourceDefinitionController.java b/src/main/java/nl/dtls/fairdatapoint/api/controller/resource/ResourceDefinitionController.java index 53e78f169..a06177e45 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/controller/resource/ResourceDefinitionController.java +++ b/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; diff --git a/src/main/java/nl/dtls/fairdatapoint/api/controller/schema/MetadataSchemaController.java b/src/main/java/nl/dtls/fairdatapoint/api/controller/schema/MetadataSchemaController.java index 7f969e76e..b673af403 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/controller/schema/MetadataSchemaController.java +++ b/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; diff --git a/src/main/java/nl/dtls/fairdatapoint/api/controller/search/SearchController.java b/src/main/java/nl/dtls/fairdatapoint/api/controller/search/SearchController.java index 57168f529..e0eda44d4 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/controller/search/SearchController.java +++ b/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") diff --git a/src/main/java/nl/dtls/fairdatapoint/api/controller/search/SearchSavedQueryController.java b/src/main/java/nl/dtls/fairdatapoint/api/controller/search/SearchSavedQueryController.java index 343f550af..f9c3fd837 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/controller/search/SearchSavedQueryController.java +++ b/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; diff --git a/src/main/java/nl/dtls/fairdatapoint/api/controller/settings/SettingsController.java b/src/main/java/nl/dtls/fairdatapoint/api/controller/settings/SettingsController.java index a5a938642..bf565d21c 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/controller/settings/SettingsController.java +++ b/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") diff --git a/src/main/java/nl/dtls/fairdatapoint/api/controller/token/TokenController.java b/src/main/java/nl/dtls/fairdatapoint/api/controller/token/TokenController.java index d53633357..e1cbe6c2c 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/controller/token/TokenController.java +++ b/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") diff --git a/src/main/java/nl/dtls/fairdatapoint/api/controller/user/UserController.java b/src/main/java/nl/dtls/fairdatapoint/api/controller/user/UserController.java index ddbd4978b..e61bd9b41 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/controller/user/UserController.java +++ b/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; diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/auth/AuthDTO.java b/src/main/java/nl/dtls/fairdatapoint/api/dto/auth/AuthDTO.java index 8b215a3a8..53154e33d 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/dto/auth/AuthDTO.java +++ b/src/main/java/nl/dtls/fairdatapoint/api/dto/auth/AuthDTO.java @@ -22,15 +22,14 @@ */ package nl.dtls.fairdatapoint.api.dto.auth; +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import javax.validation.constraints.Email; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; - @NoArgsConstructor @AllArgsConstructor @Getter diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/form/FormAutocompleteRequestDTO.java b/src/main/java/nl/dtls/fairdatapoint/api/dto/form/FormAutocompleteRequestDTO.java index cb3d94a89..5a208b54f 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/dto/form/FormAutocompleteRequestDTO.java +++ b/src/main/java/nl/dtls/fairdatapoint/api/dto/form/FormAutocompleteRequestDTO.java @@ -22,11 +22,10 @@ */ package nl.dtls.fairdatapoint.api.dto.form; +import jakarta.validation.constraints.NotNull; import lombok.*; import nl.dtls.fairdatapoint.api.validator.ValidIri; -import javax.validation.constraints.NotNull; - @NoArgsConstructor @AllArgsConstructor @Getter diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/index/entry/IndexEntryDTO.java b/src/main/java/nl/dtls/fairdatapoint/api/dto/index/entry/IndexEntryDTO.java index b891d7d27..b76213859 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/dto/index/entry/IndexEntryDTO.java +++ b/src/main/java/nl/dtls/fairdatapoint/api/dto/index/entry/IndexEntryDTO.java @@ -22,14 +22,13 @@ */ package nl.dtls.fairdatapoint.api.dto.index.entry; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; import org.hibernate.validator.constraints.URL; -import javax.validation.constraints.NotNull; - @NoArgsConstructor @AllArgsConstructor @Getter diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/index/entry/IndexEntryDetailDTO.java b/src/main/java/nl/dtls/fairdatapoint/api/dto/index/entry/IndexEntryDetailDTO.java index 28583103e..b821a86e0 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/dto/index/entry/IndexEntryDetailDTO.java +++ b/src/main/java/nl/dtls/fairdatapoint/api/dto/index/entry/IndexEntryDetailDTO.java @@ -22,6 +22,7 @@ */ package nl.dtls.fairdatapoint.api.dto.index.entry; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; @@ -30,7 +31,6 @@ import nl.dtls.fairdatapoint.entity.index.entry.RepositoryMetadata; import org.hibernate.validator.constraints.URL; -import javax.validation.constraints.NotNull; import java.util.List; @NoArgsConstructor diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/index/event/EventDTO.java b/src/main/java/nl/dtls/fairdatapoint/api/dto/index/event/EventDTO.java index 0bae018af..3b5ab5891 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/dto/index/event/EventDTO.java +++ b/src/main/java/nl/dtls/fairdatapoint/api/dto/index/event/EventDTO.java @@ -22,13 +22,13 @@ */ package nl.dtls.fairdatapoint.api.dto.index.event; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; import nl.dtls.fairdatapoint.entity.index.event.EventType; -import javax.validation.constraints.NotNull; import java.util.UUID; @NoArgsConstructor diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/index/ping/PingDTO.java b/src/main/java/nl/dtls/fairdatapoint/api/dto/index/ping/PingDTO.java index c14d82126..229c776fd 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/dto/index/ping/PingDTO.java +++ b/src/main/java/nl/dtls/fairdatapoint/api/dto/index/ping/PingDTO.java @@ -22,14 +22,13 @@ */ package nl.dtls.fairdatapoint.api.dto.index.ping; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; import org.hibernate.validator.constraints.URL; -import javax.validation.constraints.NotNull; - @NoArgsConstructor @AllArgsConstructor @Getter diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/index/settings/IndexSettingsDTO.java b/src/main/java/nl/dtls/fairdatapoint/api/dto/index/settings/IndexSettingsDTO.java index 448d4969d..2f1ae628d 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/dto/index/settings/IndexSettingsDTO.java +++ b/src/main/java/nl/dtls/fairdatapoint/api/dto/index/settings/IndexSettingsDTO.java @@ -22,13 +22,12 @@ */ package nl.dtls.fairdatapoint.api.dto.index.settings; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import javax.validation.constraints.NotNull; - @NoArgsConstructor @AllArgsConstructor @Getter diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/index/settings/IndexSettingsPingDTO.java b/src/main/java/nl/dtls/fairdatapoint/api/dto/index/settings/IndexSettingsPingDTO.java index 616e6826c..23224c0bc 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/dto/index/settings/IndexSettingsPingDTO.java +++ b/src/main/java/nl/dtls/fairdatapoint/api/dto/index/settings/IndexSettingsPingDTO.java @@ -22,13 +22,13 @@ */ package nl.dtls.fairdatapoint.api.dto.index.settings; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; import nl.dtls.fairdatapoint.api.validator.ValidDuration; -import javax.validation.constraints.NotNull; import java.util.List; @NoArgsConstructor diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/index/settings/IndexSettingsRetrievalDTO.java b/src/main/java/nl/dtls/fairdatapoint/api/dto/index/settings/IndexSettingsRetrievalDTO.java index d630da343..cc6bc6b16 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/dto/index/settings/IndexSettingsRetrievalDTO.java +++ b/src/main/java/nl/dtls/fairdatapoint/api/dto/index/settings/IndexSettingsRetrievalDTO.java @@ -22,14 +22,13 @@ */ package nl.dtls.fairdatapoint.api.dto.index.settings; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; import nl.dtls.fairdatapoint.api.validator.ValidDuration; -import javax.validation.constraints.NotNull; - @NoArgsConstructor @AllArgsConstructor @Getter diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/index/settings/IndexSettingsUpdateDTO.java b/src/main/java/nl/dtls/fairdatapoint/api/dto/index/settings/IndexSettingsUpdateDTO.java index 09905c30f..ccd3011b8 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/dto/index/settings/IndexSettingsUpdateDTO.java +++ b/src/main/java/nl/dtls/fairdatapoint/api/dto/index/settings/IndexSettingsUpdateDTO.java @@ -22,14 +22,13 @@ */ package nl.dtls.fairdatapoint.api.dto.index.settings; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - @NoArgsConstructor @AllArgsConstructor @Getter diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/member/MemberCreateDTO.java b/src/main/java/nl/dtls/fairdatapoint/api/dto/member/MemberCreateDTO.java index 1ca587b62..ff263e964 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/dto/member/MemberCreateDTO.java +++ b/src/main/java/nl/dtls/fairdatapoint/api/dto/member/MemberCreateDTO.java @@ -22,13 +22,12 @@ */ package nl.dtls.fairdatapoint.api.dto.member; +import jakarta.validation.constraints.NotBlank; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import javax.validation.constraints.NotBlank; - @NoArgsConstructor @AllArgsConstructor @Getter diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/metadata/MetaDTO.java b/src/main/java/nl/dtls/fairdatapoint/api/dto/metadata/MetaDTO.java index aa6598cca..b04e97e43 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/dto/metadata/MetaDTO.java +++ b/src/main/java/nl/dtls/fairdatapoint/api/dto/metadata/MetaDTO.java @@ -24,13 +24,13 @@ import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; import nl.dtls.fairdatapoint.api.dto.member.MemberDTO; -import javax.validation.constraints.NotNull; import java.util.Map; @Schema(name = "MetaDTO") diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/metadata/MetaPathDTO.java b/src/main/java/nl/dtls/fairdatapoint/api/dto/metadata/MetaPathDTO.java index e0284412a..63e401f96 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/dto/metadata/MetaPathDTO.java +++ b/src/main/java/nl/dtls/fairdatapoint/api/dto/metadata/MetaPathDTO.java @@ -23,10 +23,9 @@ package nl.dtls.fairdatapoint.api.dto.metadata; import com.fasterxml.jackson.annotation.JsonInclude; +import jakarta.validation.constraints.NotNull; import lombok.*; -import javax.validation.constraints.NotNull; - @NoArgsConstructor @AllArgsConstructor @Getter diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/resource/ResourceDefinitionChangeDTO.java b/src/main/java/nl/dtls/fairdatapoint/api/dto/resource/ResourceDefinitionChangeDTO.java index fd02ba834..0e597bbda 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/dto/resource/ResourceDefinitionChangeDTO.java +++ b/src/main/java/nl/dtls/fairdatapoint/api/dto/resource/ResourceDefinitionChangeDTO.java @@ -22,6 +22,9 @@ */ package nl.dtls.fairdatapoint.api.dto.resource; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; @@ -29,9 +32,6 @@ import nl.dtls.fairdatapoint.entity.resource.ResourceDefinitionChild; import nl.dtls.fairdatapoint.entity.resource.ResourceDefinitionLink; -import javax.validation.Valid; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import java.util.List; @NoArgsConstructor diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/resource/ResourceDefinitionDTO.java b/src/main/java/nl/dtls/fairdatapoint/api/dto/resource/ResourceDefinitionDTO.java index 5754b604a..f05724cde 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/dto/resource/ResourceDefinitionDTO.java +++ b/src/main/java/nl/dtls/fairdatapoint/api/dto/resource/ResourceDefinitionDTO.java @@ -22,6 +22,9 @@ */ package nl.dtls.fairdatapoint.api.dto.resource; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; @@ -29,9 +32,6 @@ import nl.dtls.fairdatapoint.entity.resource.ResourceDefinitionChild; import nl.dtls.fairdatapoint.entity.resource.ResourceDefinitionLink; -import javax.validation.Valid; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import java.util.List; @NoArgsConstructor diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/schema/MetadataSchemaChangeDTO.java b/src/main/java/nl/dtls/fairdatapoint/api/dto/schema/MetadataSchemaChangeDTO.java index 47009302b..3d7cb4763 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/dto/schema/MetadataSchemaChangeDTO.java +++ b/src/main/java/nl/dtls/fairdatapoint/api/dto/schema/MetadataSchemaChangeDTO.java @@ -22,10 +22,10 @@ */ package nl.dtls.fairdatapoint.api.dto.schema; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.*; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import java.util.List; @NoArgsConstructor diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/schema/MetadataSchemaDTO.java b/src/main/java/nl/dtls/fairdatapoint/api/dto/schema/MetadataSchemaDTO.java index b140961dd..c35e8427a 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/dto/schema/MetadataSchemaDTO.java +++ b/src/main/java/nl/dtls/fairdatapoint/api/dto/schema/MetadataSchemaDTO.java @@ -23,10 +23,10 @@ package nl.dtls.fairdatapoint.api.dto.schema; import com.fasterxml.jackson.annotation.JsonInclude; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.*; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import java.util.List; @NoArgsConstructor diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/schema/MetadataSchemaDraftDTO.java b/src/main/java/nl/dtls/fairdatapoint/api/dto/schema/MetadataSchemaDraftDTO.java index 112c14d4f..5a6734ef8 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/dto/schema/MetadataSchemaDraftDTO.java +++ b/src/main/java/nl/dtls/fairdatapoint/api/dto/schema/MetadataSchemaDraftDTO.java @@ -23,10 +23,10 @@ package nl.dtls.fairdatapoint.api.dto.schema; import com.fasterxml.jackson.annotation.JsonInclude; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.*; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import java.util.List; @NoArgsConstructor diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/schema/MetadataSchemaPreviewRequestDTO.java b/src/main/java/nl/dtls/fairdatapoint/api/dto/schema/MetadataSchemaPreviewRequestDTO.java index 77cdc4b72..a22287a1f 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/dto/schema/MetadataSchemaPreviewRequestDTO.java +++ b/src/main/java/nl/dtls/fairdatapoint/api/dto/schema/MetadataSchemaPreviewRequestDTO.java @@ -22,12 +22,12 @@ */ package nl.dtls.fairdatapoint.api.dto.schema; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import javax.validation.constraints.NotNull; import java.util.List; @NoArgsConstructor diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/schema/MetadataSchemaReleaseDTO.java b/src/main/java/nl/dtls/fairdatapoint/api/dto/schema/MetadataSchemaReleaseDTO.java index 0c67e259f..9d69293e3 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/dto/schema/MetadataSchemaReleaseDTO.java +++ b/src/main/java/nl/dtls/fairdatapoint/api/dto/schema/MetadataSchemaReleaseDTO.java @@ -22,14 +22,13 @@ */ package nl.dtls.fairdatapoint.api.dto.schema; +import jakarta.validation.constraints.NotBlank; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; import nl.dtls.fairdatapoint.api.validator.ValidSemVer; -import javax.validation.constraints.NotBlank; - @NoArgsConstructor @AllArgsConstructor @Getter diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/schema/MetadataSchemaRemoteDTO.java b/src/main/java/nl/dtls/fairdatapoint/api/dto/schema/MetadataSchemaRemoteDTO.java index b91e0cf3d..bd8216e3f 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/dto/schema/MetadataSchemaRemoteDTO.java +++ b/src/main/java/nl/dtls/fairdatapoint/api/dto/schema/MetadataSchemaRemoteDTO.java @@ -22,11 +22,10 @@ */ package nl.dtls.fairdatapoint.api.dto.schema; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.*; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; - @NoArgsConstructor @AllArgsConstructor @Getter diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/schema/MetadataSchemaUpdateDTO.java b/src/main/java/nl/dtls/fairdatapoint/api/dto/schema/MetadataSchemaUpdateDTO.java index d6c7a2e5c..fdc0d4b1c 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/dto/schema/MetadataSchemaUpdateDTO.java +++ b/src/main/java/nl/dtls/fairdatapoint/api/dto/schema/MetadataSchemaUpdateDTO.java @@ -22,14 +22,13 @@ */ package nl.dtls.fairdatapoint.api.dto.schema; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; - @NoArgsConstructor @AllArgsConstructor @Getter diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/schema/MetadataSchemaVersionDTO.java b/src/main/java/nl/dtls/fairdatapoint/api/dto/schema/MetadataSchemaVersionDTO.java index 9b3a9849b..99943e32d 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/dto/schema/MetadataSchemaVersionDTO.java +++ b/src/main/java/nl/dtls/fairdatapoint/api/dto/schema/MetadataSchemaVersionDTO.java @@ -23,11 +23,11 @@ package nl.dtls.fairdatapoint.api.dto.schema; import com.fasterxml.jackson.annotation.JsonInclude; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.*; import nl.dtls.fairdatapoint.entity.schema.MetadataSchemaType; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import java.util.List; import java.util.Set; diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/search/SearchFilterDTO.java b/src/main/java/nl/dtls/fairdatapoint/api/dto/search/SearchFilterDTO.java index 0134ddbb1..94b7c38ac 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/dto/search/SearchFilterDTO.java +++ b/src/main/java/nl/dtls/fairdatapoint/api/dto/search/SearchFilterDTO.java @@ -22,12 +22,12 @@ */ package nl.dtls.fairdatapoint.api.dto.search; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import lombok.*; import nl.dtls.fairdatapoint.api.validator.ValidIri; import nl.dtls.fairdatapoint.entity.search.SearchFilterType; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; import java.util.List; @NoArgsConstructor diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/search/SearchQueryDTO.java b/src/main/java/nl/dtls/fairdatapoint/api/dto/search/SearchQueryDTO.java index dd2a47786..14eabf5b0 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/dto/search/SearchQueryDTO.java +++ b/src/main/java/nl/dtls/fairdatapoint/api/dto/search/SearchQueryDTO.java @@ -22,13 +22,12 @@ */ package nl.dtls.fairdatapoint.api.dto.search; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import javax.validation.constraints.NotNull; - @NoArgsConstructor @AllArgsConstructor @Getter diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/search/SearchQueryTemplateDTO.java b/src/main/java/nl/dtls/fairdatapoint/api/dto/search/SearchQueryTemplateDTO.java index 003f7ebae..2df5edbee 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/dto/search/SearchQueryTemplateDTO.java +++ b/src/main/java/nl/dtls/fairdatapoint/api/dto/search/SearchQueryTemplateDTO.java @@ -22,13 +22,12 @@ */ package nl.dtls.fairdatapoint.api.dto.search; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import javax.validation.constraints.NotNull; - @NoArgsConstructor @AllArgsConstructor @Getter diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/search/SearchQueryVariablesDTO.java b/src/main/java/nl/dtls/fairdatapoint/api/dto/search/SearchQueryVariablesDTO.java index 15b116dca..0f6b76af8 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/dto/search/SearchQueryVariablesDTO.java +++ b/src/main/java/nl/dtls/fairdatapoint/api/dto/search/SearchQueryVariablesDTO.java @@ -22,10 +22,9 @@ */ package nl.dtls.fairdatapoint.api.dto.search; +import jakarta.validation.constraints.NotNull; import lombok.*; -import javax.validation.constraints.NotNull; - @NoArgsConstructor @AllArgsConstructor @Getter diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/search/SearchSavedQueryChangeDTO.java b/src/main/java/nl/dtls/fairdatapoint/api/dto/search/SearchSavedQueryChangeDTO.java index 5020b08d0..c9a215e47 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/dto/search/SearchSavedQueryChangeDTO.java +++ b/src/main/java/nl/dtls/fairdatapoint/api/dto/search/SearchSavedQueryChangeDTO.java @@ -22,13 +22,12 @@ */ package nl.dtls.fairdatapoint.api.dto.search; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.*; import nl.dtls.fairdatapoint.entity.search.SearchSavedQueryType; -import javax.validation.Valid; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; - @NoArgsConstructor @AllArgsConstructor @Getter diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/search/SearchSavedQueryDTO.java b/src/main/java/nl/dtls/fairdatapoint/api/dto/search/SearchSavedQueryDTO.java index 4345efd75..423ee724f 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/dto/search/SearchSavedQueryDTO.java +++ b/src/main/java/nl/dtls/fairdatapoint/api/dto/search/SearchSavedQueryDTO.java @@ -23,13 +23,13 @@ package nl.dtls.fairdatapoint.api.dto.search; import com.fasterxml.jackson.annotation.JsonInclude; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.*; import nl.dtls.fairdatapoint.api.dto.user.UserDTO; import nl.dtls.fairdatapoint.entity.search.SearchSavedQueryType; -import javax.validation.Valid; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import java.time.Instant; @NoArgsConstructor diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/settings/SettingsAutocompleteSourceDTO.java b/src/main/java/nl/dtls/fairdatapoint/api/dto/settings/SettingsAutocompleteSourceDTO.java index 3cf24b59e..474260865 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/dto/settings/SettingsAutocompleteSourceDTO.java +++ b/src/main/java/nl/dtls/fairdatapoint/api/dto/settings/SettingsAutocompleteSourceDTO.java @@ -22,11 +22,10 @@ */ package nl.dtls.fairdatapoint.api.dto.settings; +import jakarta.validation.constraints.NotNull; import lombok.*; import nl.dtls.fairdatapoint.api.validator.ValidIri; -import javax.validation.constraints.NotNull; - @NoArgsConstructor @AllArgsConstructor @Getter diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/settings/SettingsFormsAutocompleteDTO.java b/src/main/java/nl/dtls/fairdatapoint/api/dto/settings/SettingsFormsAutocompleteDTO.java index 86cfd4d1d..b7482e700 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/dto/settings/SettingsFormsAutocompleteDTO.java +++ b/src/main/java/nl/dtls/fairdatapoint/api/dto/settings/SettingsFormsAutocompleteDTO.java @@ -22,9 +22,9 @@ */ package nl.dtls.fairdatapoint.api.dto.settings; +import jakarta.validation.constraints.NotNull; import lombok.*; -import javax.validation.constraints.NotNull; import java.util.List; @NoArgsConstructor diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/settings/SettingsFormsDTO.java b/src/main/java/nl/dtls/fairdatapoint/api/dto/settings/SettingsFormsDTO.java index 670414351..862d6906f 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/dto/settings/SettingsFormsDTO.java +++ b/src/main/java/nl/dtls/fairdatapoint/api/dto/settings/SettingsFormsDTO.java @@ -22,10 +22,9 @@ */ package nl.dtls.fairdatapoint.api.dto.settings; +import jakarta.validation.constraints.NotNull; import lombok.*; -import javax.validation.constraints.NotNull; - @NoArgsConstructor @AllArgsConstructor @Getter diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/settings/SettingsPingDTO.java b/src/main/java/nl/dtls/fairdatapoint/api/dto/settings/SettingsPingDTO.java index f940029f2..3efef6521 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/dto/settings/SettingsPingDTO.java +++ b/src/main/java/nl/dtls/fairdatapoint/api/dto/settings/SettingsPingDTO.java @@ -22,9 +22,9 @@ */ package nl.dtls.fairdatapoint.api.dto.settings; +import jakarta.validation.constraints.NotNull; import lombok.*; -import javax.validation.constraints.NotNull; import java.util.List; @NoArgsConstructor diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/settings/SettingsPingUpdateDTO.java b/src/main/java/nl/dtls/fairdatapoint/api/dto/settings/SettingsPingUpdateDTO.java index 46dadb201..99243c1ea 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/dto/settings/SettingsPingUpdateDTO.java +++ b/src/main/java/nl/dtls/fairdatapoint/api/dto/settings/SettingsPingUpdateDTO.java @@ -22,9 +22,9 @@ */ package nl.dtls.fairdatapoint.api.dto.settings; +import jakarta.validation.constraints.NotNull; import lombok.*; -import javax.validation.constraints.NotNull; import java.util.List; @NoArgsConstructor diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/settings/SettingsSearchDTO.java b/src/main/java/nl/dtls/fairdatapoint/api/dto/settings/SettingsSearchDTO.java index e120618a6..8e4ef041f 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/dto/settings/SettingsSearchDTO.java +++ b/src/main/java/nl/dtls/fairdatapoint/api/dto/settings/SettingsSearchDTO.java @@ -22,11 +22,11 @@ */ package nl.dtls.fairdatapoint.api.dto.settings; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import lombok.*; import nl.dtls.fairdatapoint.api.dto.search.SearchFilterDTO; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; import java.util.List; @NoArgsConstructor diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/settings/SettingsUpdateDTO.java b/src/main/java/nl/dtls/fairdatapoint/api/dto/settings/SettingsUpdateDTO.java index 03df173bd..7607b9906 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/dto/settings/SettingsUpdateDTO.java +++ b/src/main/java/nl/dtls/fairdatapoint/api/dto/settings/SettingsUpdateDTO.java @@ -22,10 +22,10 @@ */ package nl.dtls.fairdatapoint.api.dto.settings; +import jakarta.validation.constraints.NotNull; import lombok.*; import nl.dtls.fairdatapoint.entity.settings.SettingsMetricsEntry; -import javax.validation.constraints.NotNull; import java.util.List; @NoArgsConstructor diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/user/UserChangeDTO.java b/src/main/java/nl/dtls/fairdatapoint/api/dto/user/UserChangeDTO.java index db97415f2..c8dd11e92 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/dto/user/UserChangeDTO.java +++ b/src/main/java/nl/dtls/fairdatapoint/api/dto/user/UserChangeDTO.java @@ -22,15 +22,14 @@ */ package nl.dtls.fairdatapoint.api.dto.user; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; import nl.dtls.fairdatapoint.entity.user.UserRole; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; - @NoArgsConstructor @AllArgsConstructor @Getter diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/user/UserCreateDTO.java b/src/main/java/nl/dtls/fairdatapoint/api/dto/user/UserCreateDTO.java index 6bfa94a96..4e2dc15ba 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/dto/user/UserCreateDTO.java +++ b/src/main/java/nl/dtls/fairdatapoint/api/dto/user/UserCreateDTO.java @@ -22,15 +22,14 @@ */ package nl.dtls.fairdatapoint.api.dto.user; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; import nl.dtls.fairdatapoint.entity.user.UserRole; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; - @NoArgsConstructor @AllArgsConstructor @Getter diff --git a/src/main/java/nl/dtls/fairdatapoint/api/dto/user/UserProfileChangeDTO.java b/src/main/java/nl/dtls/fairdatapoint/api/dto/user/UserProfileChangeDTO.java index 6dd65f186..a0b324e2d 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/dto/user/UserProfileChangeDTO.java +++ b/src/main/java/nl/dtls/fairdatapoint/api/dto/user/UserProfileChangeDTO.java @@ -22,13 +22,12 @@ */ package nl.dtls.fairdatapoint.api.dto.user; +import jakarta.validation.constraints.NotBlank; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import javax.validation.constraints.NotBlank; - @NoArgsConstructor @AllArgsConstructor @Getter diff --git a/src/main/java/nl/dtls/fairdatapoint/api/filter/CORSFilter.java b/src/main/java/nl/dtls/fairdatapoint/api/filter/CORSFilter.java index fce7ae893..78c770b35 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/filter/CORSFilter.java +++ b/src/main/java/nl/dtls/fairdatapoint/api/filter/CORSFilter.java @@ -27,15 +27,15 @@ */ package nl.dtls.fairdatapoint.api.filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.http.HttpHeaders; import org.springframework.stereotype.Component; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.filter.OncePerRequestFilter; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.io.IOException; import static java.lang.String.format; diff --git a/src/main/java/nl/dtls/fairdatapoint/api/filter/JwtTokenFilter.java b/src/main/java/nl/dtls/fairdatapoint/api/filter/JwtTokenFilter.java index a4099bc32..9bb8b0981 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/filter/JwtTokenFilter.java +++ b/src/main/java/nl/dtls/fairdatapoint/api/filter/JwtTokenFilter.java @@ -23,6 +23,10 @@ package nl.dtls.fairdatapoint.api.filter; import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import nl.dtls.fairdatapoint.api.dto.error.ErrorDTO; import nl.dtls.fairdatapoint.entity.exception.UnauthorizedException; import nl.dtls.fairdatapoint.service.apikey.ApiKeyService; @@ -35,10 +39,6 @@ import org.springframework.stereotype.Component; import org.springframework.web.filter.OncePerRequestFilter; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.io.IOException; import static nl.dtls.fairdatapoint.util.HttpUtil.getToken; diff --git a/src/main/java/nl/dtls/fairdatapoint/api/filter/LoggingFilter.java b/src/main/java/nl/dtls/fairdatapoint/api/filter/LoggingFilter.java index 22564e976..dea6a1f1c 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/filter/LoggingFilter.java +++ b/src/main/java/nl/dtls/fairdatapoint/api/filter/LoggingFilter.java @@ -27,6 +27,10 @@ */ package nl.dtls.fairdatapoint.api.filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import nl.dtls.fairdatapoint.service.UtilityService; import org.apache.logging.log4j.ThreadContext; import org.springframework.beans.factory.annotation.Autowired; @@ -34,10 +38,6 @@ import org.springframework.stereotype.Component; import org.springframework.web.filter.OncePerRequestFilter; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; import java.io.IOException; @Component diff --git a/src/main/java/nl/dtls/fairdatapoint/api/validator/DurationValidator.java b/src/main/java/nl/dtls/fairdatapoint/api/validator/DurationValidator.java index b99307990..888707fbb 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/validator/DurationValidator.java +++ b/src/main/java/nl/dtls/fairdatapoint/api/validator/DurationValidator.java @@ -22,8 +22,8 @@ */ package nl.dtls.fairdatapoint.api.validator; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; import java.time.Duration; diff --git a/src/main/java/nl/dtls/fairdatapoint/api/validator/IriValidator.java b/src/main/java/nl/dtls/fairdatapoint/api/validator/IriValidator.java index 5a8f0a672..0b0dcb461 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/validator/IriValidator.java +++ b/src/main/java/nl/dtls/fairdatapoint/api/validator/IriValidator.java @@ -22,8 +22,8 @@ */ package nl.dtls.fairdatapoint.api.validator; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; import static nl.dtls.fairdatapoint.util.ValueFactoryHelper.i; diff --git a/src/main/java/nl/dtls/fairdatapoint/api/validator/SemVerValidator.java b/src/main/java/nl/dtls/fairdatapoint/api/validator/SemVerValidator.java index c0654d265..f43da0e80 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/validator/SemVerValidator.java +++ b/src/main/java/nl/dtls/fairdatapoint/api/validator/SemVerValidator.java @@ -22,11 +22,10 @@ */ package nl.dtls.fairdatapoint.api.validator; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; import nl.dtls.fairdatapoint.entity.schema.SemVer; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; - public class SemVerValidator implements ConstraintValidator { @Override diff --git a/src/main/java/nl/dtls/fairdatapoint/api/validator/ValidDuration.java b/src/main/java/nl/dtls/fairdatapoint/api/validator/ValidDuration.java index f46b8ac4e..a419febb9 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/validator/ValidDuration.java +++ b/src/main/java/nl/dtls/fairdatapoint/api/validator/ValidDuration.java @@ -22,8 +22,9 @@ */ package nl.dtls.fairdatapoint.api.validator; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; + import java.lang.annotation.*; @Documented diff --git a/src/main/java/nl/dtls/fairdatapoint/api/validator/ValidIri.java b/src/main/java/nl/dtls/fairdatapoint/api/validator/ValidIri.java index 4daaf9cf0..6a546a64f 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/validator/ValidIri.java +++ b/src/main/java/nl/dtls/fairdatapoint/api/validator/ValidIri.java @@ -22,8 +22,9 @@ */ package nl.dtls.fairdatapoint.api.validator; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; + import java.lang.annotation.*; @Documented diff --git a/src/main/java/nl/dtls/fairdatapoint/api/validator/ValidSemVer.java b/src/main/java/nl/dtls/fairdatapoint/api/validator/ValidSemVer.java index 4864f7cd2..3ebe9cd84 100644 --- a/src/main/java/nl/dtls/fairdatapoint/api/validator/ValidSemVer.java +++ b/src/main/java/nl/dtls/fairdatapoint/api/validator/ValidSemVer.java @@ -22,8 +22,9 @@ */ package nl.dtls.fairdatapoint.api.validator; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; + import java.lang.annotation.*; @Documented diff --git a/src/main/java/nl/dtls/fairdatapoint/config/MongoConfig.java b/src/main/java/nl/dtls/fairdatapoint/config/MongoConfig.java index 4efabd10a..07c835de4 100644 --- a/src/main/java/nl/dtls/fairdatapoint/config/MongoConfig.java +++ b/src/main/java/nl/dtls/fairdatapoint/config/MongoConfig.java @@ -23,7 +23,7 @@ package nl.dtls.fairdatapoint.config; import io.mongock.api.config.LegacyMigration; -import io.mongock.driver.mongodb.springdata.v3.SpringDataMongoV3Driver; +import io.mongock.driver.mongodb.springdata.v4.SpringDataMongoV4Driver; import io.mongock.runner.springboot.MongockSpringboot; import io.mongock.runner.springboot.base.MongockInitializingBeanRunner; import nl.dtls.fairdatapoint.service.resource.ResourceDefinitionCache; @@ -63,7 +63,7 @@ public MongockInitializingBeanRunner mongockApplicationRunner( MongoTemplate mongoTemplate ) { return MongockSpringboot.builder() - .setDriver(SpringDataMongoV3Driver.withDefaultLock(mongoTemplate)) + .setDriver(SpringDataMongoV4Driver.withDefaultLock(mongoTemplate)) .addMigrationScanPackage( "nl.dtls.fairdatapoint.database.mongo.migration.production" ) diff --git a/src/main/java/nl/dtls/fairdatapoint/config/SecurityConfig.java b/src/main/java/nl/dtls/fairdatapoint/config/SecurityConfig.java index ad22d0975..c57eb3e6a 100644 --- a/src/main/java/nl/dtls/fairdatapoint/config/SecurityConfig.java +++ b/src/main/java/nl/dtls/fairdatapoint/config/SecurityConfig.java @@ -23,52 +23,46 @@ package nl.dtls.fairdatapoint.config; import nl.dtls.fairdatapoint.api.filter.FilterConfigurer; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.http.HttpMethod; import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; import org.springframework.security.config.http.SessionCreationPolicy; +import org.springframework.security.web.SecurityFilterChain; @Configuration -public class SecurityConfig extends WebSecurityConfigurerAdapter { - // TODO: deprecated WebSecurityConfigurerAdapter - - private static final String MATCH_ALL = "/**"; - - @Autowired - private FilterConfigurer filterConfigurer; +public class SecurityConfig { @Bean - @Override - public AuthenticationManager authenticationManagerBean() throws Exception { - return super.authenticationManagerBean(); + public AuthenticationManager authenticationManager(AuthenticationConfiguration authenticationConfiguration) throws Exception { + return authenticationConfiguration.getAuthenticationManager(); } - @Override - protected void configure(HttpSecurity http) throws Exception { + @Bean + public SecurityFilterChain filterChain(HttpSecurity http, FilterConfigurer filterConfigurer) throws Exception { http - .httpBasic().disable() - .csrf().disable() - .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS) - .and() - .authorizeRequests() - .antMatchers(HttpMethod.OPTIONS, MATCH_ALL).permitAll() - .antMatchers("/dashboard").authenticated() - .antMatchers("/users**").authenticated() - .antMatchers("/api-keys**").authenticated() - .antMatchers("/users/**").authenticated() - .antMatchers("/memberships**").authenticated() - .antMatchers("/tokens").permitAll() - .antMatchers("/search**").permitAll() - .antMatchers("/index/admin**").authenticated() - .antMatchers("/index**").permitAll() - .antMatchers(HttpMethod.PUT, MATCH_ALL).authenticated() - .anyRequest().permitAll() - .and() + .csrf(AbstractHttpConfigurer::disable) + .httpBasic(AbstractHttpConfigurer::disable) + .sessionManagement(sessionMgmt -> sessionMgmt.sessionCreationPolicy(SessionCreationPolicy.STATELESS)) + .authorizeHttpRequests( + authz -> authz + .requestMatchers(HttpMethod.OPTIONS).permitAll() + .requestMatchers("/dashboard").authenticated() + .requestMatchers("/users**").authenticated() + .requestMatchers("/api-keys**").authenticated() + .requestMatchers("/users/**").authenticated() + .requestMatchers("/memberships**").authenticated() + .requestMatchers("/tokens").permitAll() + .requestMatchers("/search**").permitAll() + .requestMatchers("/index/admin**").authenticated() + .requestMatchers("/index**").permitAll() + .requestMatchers(HttpMethod.PUT).authenticated() + .anyRequest().permitAll() + ) .apply(filterConfigurer); + return http.build(); } - } diff --git a/src/main/java/nl/dtls/fairdatapoint/database/mongo/migration/development/MigrationRunner.java b/src/main/java/nl/dtls/fairdatapoint/database/mongo/migration/development/MigrationRunner.java index 20434b6d7..9720b32ff 100644 --- a/src/main/java/nl/dtls/fairdatapoint/database/mongo/migration/development/MigrationRunner.java +++ b/src/main/java/nl/dtls/fairdatapoint/database/mongo/migration/development/MigrationRunner.java @@ -22,6 +22,7 @@ */ package nl.dtls.fairdatapoint.database.mongo.migration.development; +import jakarta.annotation.PostConstruct; import nl.dtls.fairdatapoint.Profiles; import nl.dtls.fairdatapoint.database.mongo.migration.development.acl.AclMigration; import nl.dtls.fairdatapoint.database.mongo.migration.development.apikey.ApiKeyMigration; @@ -41,8 +42,6 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import javax.annotation.PostConstruct; - @Service @Profile(Profiles.NON_PRODUCTION) public class MigrationRunner { diff --git a/src/main/java/nl/dtls/fairdatapoint/database/rdf/migration/development/RdfDevelopmentMigrationRunner.java b/src/main/java/nl/dtls/fairdatapoint/database/rdf/migration/development/RdfDevelopmentMigrationRunner.java index f168e4476..cb2a5b358 100644 --- a/src/main/java/nl/dtls/fairdatapoint/database/rdf/migration/development/RdfDevelopmentMigrationRunner.java +++ b/src/main/java/nl/dtls/fairdatapoint/database/rdf/migration/development/RdfDevelopmentMigrationRunner.java @@ -22,6 +22,7 @@ */ package nl.dtls.fairdatapoint.database.rdf.migration.development; +import jakarta.annotation.PostConstruct; import nl.dtls.fairdatapoint.Profiles; import nl.dtls.fairdatapoint.database.rdf.migration.development.metadata.RdfMetadataMigration; import org.springframework.beans.factory.annotation.Autowired; @@ -29,8 +30,6 @@ import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import javax.annotation.PostConstruct; - @Service @DependsOn("mongockRunner") @Profile(Profiles.NON_PRODUCTION) diff --git a/src/main/java/nl/dtls/fairdatapoint/database/rdf/repository/catalog/CatalogMetadataRepositoryImpl.java b/src/main/java/nl/dtls/fairdatapoint/database/rdf/repository/catalog/CatalogMetadataRepositoryImpl.java index 7c745e8c0..97c5391f6 100644 --- a/src/main/java/nl/dtls/fairdatapoint/database/rdf/repository/catalog/CatalogMetadataRepositoryImpl.java +++ b/src/main/java/nl/dtls/fairdatapoint/database/rdf/repository/catalog/CatalogMetadataRepositoryImpl.java @@ -22,6 +22,7 @@ */ package nl.dtls.fairdatapoint.database.rdf.repository.catalog; +import jakarta.annotation.PostConstruct; import nl.dtls.fairdatapoint.database.rdf.repository.common.AbstractMetadataRepository; import nl.dtls.fairdatapoint.database.rdf.repository.exception.MetadataRepositoryException; import org.eclipse.rdf4j.model.IRI; @@ -30,7 +31,6 @@ import org.springframework.cache.concurrent.ConcurrentMapCacheManager; import org.springframework.stereotype.Service; -import javax.annotation.PostConstruct; import java.util.List; import java.util.Map; import java.util.stream.Collectors; diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/index/entry/RepositoryMetadata.java b/src/main/java/nl/dtls/fairdatapoint/entity/index/entry/RepositoryMetadata.java index e7ab9a63d..fa64fbe75 100644 --- a/src/main/java/nl/dtls/fairdatapoint/entity/index/entry/RepositoryMetadata.java +++ b/src/main/java/nl/dtls/fairdatapoint/entity/index/entry/RepositoryMetadata.java @@ -22,9 +22,9 @@ */ package nl.dtls.fairdatapoint.entity.index.entry; +import jakarta.validation.constraints.NotNull; import lombok.*; -import javax.validation.constraints.NotNull; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/index/event/Event.java b/src/main/java/nl/dtls/fairdatapoint/entity/index/event/Event.java index 6919ab66d..06450d17a 100644 --- a/src/main/java/nl/dtls/fairdatapoint/entity/index/event/Event.java +++ b/src/main/java/nl/dtls/fairdatapoint/entity/index/event/Event.java @@ -22,6 +22,7 @@ */ package nl.dtls.fairdatapoint.entity.index.event; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -32,7 +33,6 @@ import org.springframework.data.mongodb.core.mapping.Document; import org.springframework.format.annotation.DateTimeFormat; -import javax.validation.constraints.NotNull; import java.time.Instant; import java.util.UUID; diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/index/http/Request.java b/src/main/java/nl/dtls/fairdatapoint/entity/index/http/Request.java index e662148c4..16ce1cbcf 100644 --- a/src/main/java/nl/dtls/fairdatapoint/entity/index/http/Request.java +++ b/src/main/java/nl/dtls/fairdatapoint/entity/index/http/Request.java @@ -22,12 +22,12 @@ */ package nl.dtls.fairdatapoint.entity.index.http; +import jakarta.servlet.http.HttpServletRequest; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import org.springframework.http.HttpEntity; -import javax.servlet.http.HttpServletRequest; import java.net.http.HttpRequest; import java.util.List; import java.util.Map; diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/index/settings/IndexSettings.java b/src/main/java/nl/dtls/fairdatapoint/entity/index/settings/IndexSettings.java index 79171d92c..ca4a05c5c 100644 --- a/src/main/java/nl/dtls/fairdatapoint/entity/index/settings/IndexSettings.java +++ b/src/main/java/nl/dtls/fairdatapoint/entity/index/settings/IndexSettings.java @@ -22,12 +22,12 @@ */ package nl.dtls.fairdatapoint.entity.index.settings; +import jakarta.validation.constraints.NotNull; import lombok.*; import org.bson.types.ObjectId; import org.springframework.data.annotation.Id; import org.springframework.data.mongodb.core.mapping.Document; -import javax.validation.constraints.NotNull; import java.util.Objects; @Document diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/index/settings/IndexSettingsPing.java b/src/main/java/nl/dtls/fairdatapoint/entity/index/settings/IndexSettingsPing.java index 111fb3ccf..0a9982715 100644 --- a/src/main/java/nl/dtls/fairdatapoint/entity/index/settings/IndexSettingsPing.java +++ b/src/main/java/nl/dtls/fairdatapoint/entity/index/settings/IndexSettingsPing.java @@ -22,9 +22,9 @@ */ package nl.dtls.fairdatapoint.entity.index.settings; +import jakarta.validation.constraints.NotNull; import lombok.*; -import javax.validation.constraints.NotNull; import java.time.Duration; import java.util.Collections; import java.util.List; diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/index/settings/IndexSettingsRetrieval.java b/src/main/java/nl/dtls/fairdatapoint/entity/index/settings/IndexSettingsRetrieval.java index 20df731b0..a5d8ee919 100644 --- a/src/main/java/nl/dtls/fairdatapoint/entity/index/settings/IndexSettingsRetrieval.java +++ b/src/main/java/nl/dtls/fairdatapoint/entity/index/settings/IndexSettingsRetrieval.java @@ -22,9 +22,9 @@ */ package nl.dtls.fairdatapoint.entity.index.settings; +import jakarta.validation.constraints.NotNull; import lombok.*; -import javax.validation.constraints.NotNull; import java.time.Duration; @NoArgsConstructor diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/index/webhook/Webhook.java b/src/main/java/nl/dtls/fairdatapoint/entity/index/webhook/Webhook.java index 9892411bb..5f24c7607 100644 --- a/src/main/java/nl/dtls/fairdatapoint/entity/index/webhook/Webhook.java +++ b/src/main/java/nl/dtls/fairdatapoint/entity/index/webhook/Webhook.java @@ -22,6 +22,7 @@ */ package nl.dtls.fairdatapoint.entity.index.webhook; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -29,7 +30,6 @@ import org.springframework.data.annotation.Id; import org.springframework.data.mongodb.core.mapping.Document; -import javax.validation.constraints.NotNull; import java.util.ArrayList; import java.util.List; import java.util.UUID; diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/resource/ResourceDefinitionChild.java b/src/main/java/nl/dtls/fairdatapoint/entity/resource/ResourceDefinitionChild.java index c633bfc48..a871883f3 100644 --- a/src/main/java/nl/dtls/fairdatapoint/entity/resource/ResourceDefinitionChild.java +++ b/src/main/java/nl/dtls/fairdatapoint/entity/resource/ResourceDefinitionChild.java @@ -22,12 +22,11 @@ */ package nl.dtls.fairdatapoint.entity.resource; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotBlank; import lombok.*; import nl.dtls.fairdatapoint.api.validator.ValidIri; -import javax.validation.Valid; -import javax.validation.constraints.NotBlank; - @NoArgsConstructor @AllArgsConstructor @Getter diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/resource/ResourceDefinitionChildListView.java b/src/main/java/nl/dtls/fairdatapoint/entity/resource/ResourceDefinitionChildListView.java index 8405c0930..0bc74d203 100644 --- a/src/main/java/nl/dtls/fairdatapoint/entity/resource/ResourceDefinitionChildListView.java +++ b/src/main/java/nl/dtls/fairdatapoint/entity/resource/ResourceDefinitionChildListView.java @@ -22,11 +22,11 @@ */ package nl.dtls.fairdatapoint.entity.resource; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotBlank; import lombok.*; import nl.dtls.fairdatapoint.api.validator.ValidIri; -import javax.validation.Valid; -import javax.validation.constraints.NotBlank; import java.util.List; @NoArgsConstructor diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/resource/ResourceDefinitionChildListViewMetadata.java b/src/main/java/nl/dtls/fairdatapoint/entity/resource/ResourceDefinitionChildListViewMetadata.java index f584fdc0a..983eb78c2 100644 --- a/src/main/java/nl/dtls/fairdatapoint/entity/resource/ResourceDefinitionChildListViewMetadata.java +++ b/src/main/java/nl/dtls/fairdatapoint/entity/resource/ResourceDefinitionChildListViewMetadata.java @@ -22,11 +22,10 @@ */ package nl.dtls.fairdatapoint.entity.resource; +import jakarta.validation.constraints.NotBlank; import lombok.*; import nl.dtls.fairdatapoint.api.validator.ValidIri; -import javax.validation.constraints.NotBlank; - @NoArgsConstructor @AllArgsConstructor @Getter diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/resource/ResourceDefinitionLink.java b/src/main/java/nl/dtls/fairdatapoint/entity/resource/ResourceDefinitionLink.java index edbd7fde4..ac6abd705 100644 --- a/src/main/java/nl/dtls/fairdatapoint/entity/resource/ResourceDefinitionLink.java +++ b/src/main/java/nl/dtls/fairdatapoint/entity/resource/ResourceDefinitionLink.java @@ -22,10 +22,10 @@ */ package nl.dtls.fairdatapoint.entity.resource; +import jakarta.validation.constraints.NotBlank; import lombok.*; import nl.dtls.fairdatapoint.api.validator.ValidIri; -import javax.validation.constraints.NotBlank; @NoArgsConstructor @AllArgsConstructor diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/schema/MetadataSchema.java b/src/main/java/nl/dtls/fairdatapoint/entity/schema/MetadataSchema.java index fc22fc654..f1c403546 100644 --- a/src/main/java/nl/dtls/fairdatapoint/entity/schema/MetadataSchema.java +++ b/src/main/java/nl/dtls/fairdatapoint/entity/schema/MetadataSchema.java @@ -22,6 +22,8 @@ */ package nl.dtls.fairdatapoint.entity.schema; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.*; import org.bson.types.ObjectId; import org.springframework.data.annotation.Id; @@ -30,8 +32,6 @@ import org.springframework.data.mongodb.core.index.Indexed; import org.springframework.data.mongodb.core.mapping.Document; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import java.time.Instant; import java.util.ArrayList; import java.util.HashSet; diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/schema/MetadataSchemaDraft.java b/src/main/java/nl/dtls/fairdatapoint/entity/schema/MetadataSchemaDraft.java index 15279fe90..ebf091143 100644 --- a/src/main/java/nl/dtls/fairdatapoint/entity/schema/MetadataSchemaDraft.java +++ b/src/main/java/nl/dtls/fairdatapoint/entity/schema/MetadataSchemaDraft.java @@ -22,14 +22,14 @@ */ package nl.dtls.fairdatapoint.entity.schema; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.*; import org.bson.types.ObjectId; import org.springframework.data.annotation.Id; import org.springframework.data.mongodb.core.index.Indexed; import org.springframework.data.mongodb.core.mapping.Document; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import java.time.Instant; import java.util.List; import java.util.Set; diff --git a/src/main/java/nl/dtls/fairdatapoint/entity/settings/SettingsPing.java b/src/main/java/nl/dtls/fairdatapoint/entity/settings/SettingsPing.java index d13fca445..a3d4f68ad 100644 --- a/src/main/java/nl/dtls/fairdatapoint/entity/settings/SettingsPing.java +++ b/src/main/java/nl/dtls/fairdatapoint/entity/settings/SettingsPing.java @@ -22,9 +22,9 @@ */ package nl.dtls.fairdatapoint.entity.settings; +import jakarta.validation.constraints.NotNull; import lombok.*; -import javax.validation.constraints.NotNull; import java.util.List; @NoArgsConstructor diff --git a/src/main/java/nl/dtls/fairdatapoint/service/UtilityService.java b/src/main/java/nl/dtls/fairdatapoint/service/UtilityService.java index 070b2276f..a280c7a3d 100644 --- a/src/main/java/nl/dtls/fairdatapoint/service/UtilityService.java +++ b/src/main/java/nl/dtls/fairdatapoint/service/UtilityService.java @@ -22,13 +22,12 @@ */ package nl.dtls.fairdatapoint.service; +import jakarta.servlet.http.HttpServletRequest; import nl.dtls.fairdatapoint.config.properties.InstanceProperties; import nl.dtls.fairdatapoint.util.HttpUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.servlet.http.HttpServletRequest; - @Service public class UtilityService { diff --git a/src/main/java/nl/dtls/fairdatapoint/service/index/entry/IndexEntryService.java b/src/main/java/nl/dtls/fairdatapoint/service/index/entry/IndexEntryService.java index 8e618770a..dc6787bdd 100644 --- a/src/main/java/nl/dtls/fairdatapoint/service/index/entry/IndexEntryService.java +++ b/src/main/java/nl/dtls/fairdatapoint/service/index/entry/IndexEntryService.java @@ -22,6 +22,7 @@ */ package nl.dtls.fairdatapoint.service.index.entry; +import jakarta.validation.Valid; import lombok.extern.slf4j.Slf4j; import nl.dtls.fairdatapoint.api.dto.index.entry.IndexEntryDTO; import nl.dtls.fairdatapoint.api.dto.index.entry.IndexEntryDetailDTO; @@ -47,7 +48,6 @@ import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; -import javax.validation.Valid; import java.time.Instant; import java.util.*; import java.util.stream.StreamSupport; diff --git a/src/main/java/nl/dtls/fairdatapoint/service/index/event/EventService.java b/src/main/java/nl/dtls/fairdatapoint/service/index/event/EventService.java index d6c6391e6..3ee5b4a80 100644 --- a/src/main/java/nl/dtls/fairdatapoint/service/index/event/EventService.java +++ b/src/main/java/nl/dtls/fairdatapoint/service/index/event/EventService.java @@ -23,6 +23,8 @@ package nl.dtls.fairdatapoint.service.index.event; import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.annotation.PostConstruct; +import jakarta.servlet.http.HttpServletRequest; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import nl.dtls.fairdatapoint.api.dto.index.ping.PingDTO; @@ -56,8 +58,6 @@ import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Service; -import javax.annotation.PostConstruct; -import javax.servlet.http.HttpServletRequest; import java.net.http.HttpClient; import java.time.Instant; import java.util.Collections; diff --git a/src/main/java/nl/dtls/fairdatapoint/service/index/event/IncomingPingUtils.java b/src/main/java/nl/dtls/fairdatapoint/service/index/event/IncomingPingUtils.java index 86632c601..ee23453f1 100644 --- a/src/main/java/nl/dtls/fairdatapoint/service/index/event/IncomingPingUtils.java +++ b/src/main/java/nl/dtls/fairdatapoint/service/index/event/IncomingPingUtils.java @@ -24,6 +24,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.servlet.http.HttpServletRequest; import nl.dtls.fairdatapoint.api.dto.index.ping.PingDTO; import nl.dtls.fairdatapoint.entity.index.event.Event; import nl.dtls.fairdatapoint.entity.index.event.IncomingPing; @@ -32,7 +33,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.servlet.http.HttpServletRequest; import java.util.*; @Service diff --git a/src/main/java/nl/dtls/fairdatapoint/service/index/webhook/WebhookService.java b/src/main/java/nl/dtls/fairdatapoint/service/index/webhook/WebhookService.java index ed56f660f..4a6001b58 100644 --- a/src/main/java/nl/dtls/fairdatapoint/service/index/webhook/WebhookService.java +++ b/src/main/java/nl/dtls/fairdatapoint/service/index/webhook/WebhookService.java @@ -24,6 +24,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; import nl.dtls.fairdatapoint.api.dto.index.webhook.WebhookPayloadDTO; import nl.dtls.fairdatapoint.database.mongo.repository.EventRepository; @@ -42,7 +43,6 @@ import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Service; -import javax.servlet.http.HttpServletRequest; import java.security.NoSuchAlgorithmException; import java.util.Optional; import java.util.UUID; diff --git a/src/main/java/nl/dtls/fairdatapoint/service/jwt/JwtService.java b/src/main/java/nl/dtls/fairdatapoint/service/jwt/JwtService.java index 98cb077d3..db1cfe854 100644 --- a/src/main/java/nl/dtls/fairdatapoint/service/jwt/JwtService.java +++ b/src/main/java/nl/dtls/fairdatapoint/service/jwt/JwtService.java @@ -23,6 +23,7 @@ package nl.dtls.fairdatapoint.service.jwt; import io.jsonwebtoken.*; +import jakarta.annotation.PostConstruct; import nl.dtls.fairdatapoint.api.dto.auth.AuthDTO; import nl.dtls.fairdatapoint.database.mongo.repository.UserRepository; import nl.dtls.fairdatapoint.entity.exception.UnauthorizedException; @@ -37,7 +38,6 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.stereotype.Component; -import javax.annotation.PostConstruct; import javax.crypto.spec.SecretKeySpec; import java.security.Key; import java.util.Base64; diff --git a/src/main/java/nl/dtls/fairdatapoint/service/openapi/OpenApiService.java b/src/main/java/nl/dtls/fairdatapoint/service/openapi/OpenApiService.java index c8196fc85..1c4cfc6fc 100644 --- a/src/main/java/nl/dtls/fairdatapoint/service/openapi/OpenApiService.java +++ b/src/main/java/nl/dtls/fairdatapoint/service/openapi/OpenApiService.java @@ -25,13 +25,13 @@ import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.PathItem; import io.swagger.v3.oas.models.Paths; +import jakarta.annotation.PostConstruct; import lombok.extern.log4j.Log4j2; import nl.dtls.fairdatapoint.database.mongo.repository.ResourceDefinitionRepository; import nl.dtls.fairdatapoint.entity.resource.ResourceDefinition; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.PostConstruct; import java.util.List; import java.util.Map; import java.util.Set; diff --git a/src/main/java/nl/dtls/fairdatapoint/service/resource/ResourceDefinitionCache.java b/src/main/java/nl/dtls/fairdatapoint/service/resource/ResourceDefinitionCache.java index d6fd58bc2..a732e116d 100644 --- a/src/main/java/nl/dtls/fairdatapoint/service/resource/ResourceDefinitionCache.java +++ b/src/main/java/nl/dtls/fairdatapoint/service/resource/ResourceDefinitionCache.java @@ -22,6 +22,7 @@ */ package nl.dtls.fairdatapoint.service.resource; +import jakarta.annotation.PostConstruct; import lombok.Getter; import nl.dtls.fairdatapoint.database.mongo.repository.ResourceDefinitionRepository; import nl.dtls.fairdatapoint.entity.resource.ResourceDefinition; @@ -30,7 +31,6 @@ import org.springframework.cache.concurrent.ConcurrentMapCacheManager; import org.springframework.stereotype.Service; -import javax.annotation.PostConstruct; import java.util.Collections; import java.util.HashSet; import java.util.List; diff --git a/src/main/java/nl/dtls/fairdatapoint/service/resource/ResourceDefinitionTargetClassesCache.java b/src/main/java/nl/dtls/fairdatapoint/service/resource/ResourceDefinitionTargetClassesCache.java index 1f3d133e1..628c48785 100644 --- a/src/main/java/nl/dtls/fairdatapoint/service/resource/ResourceDefinitionTargetClassesCache.java +++ b/src/main/java/nl/dtls/fairdatapoint/service/resource/ResourceDefinitionTargetClassesCache.java @@ -22,6 +22,7 @@ */ package nl.dtls.fairdatapoint.service.resource; +import jakarta.annotation.PostConstruct; import nl.dtls.fairdatapoint.database.mongo.repository.ResourceDefinitionRepository; import nl.dtls.fairdatapoint.database.mongo.repository.MetadataSchemaRepository; import nl.dtls.fairdatapoint.entity.resource.ResourceDefinition; @@ -31,7 +32,6 @@ import org.springframework.cache.concurrent.ConcurrentMapCacheManager; import org.springframework.stereotype.Service; -import javax.annotation.PostConstruct; import java.util.*; import static nl.dtls.fairdatapoint.config.CacheConfig.RESOURCE_DEFINITION_TARGET_CLASSES_CACHE; diff --git a/src/main/java/nl/dtls/fairdatapoint/service/schema/MetadataSchemaService.java b/src/main/java/nl/dtls/fairdatapoint/service/schema/MetadataSchemaService.java index c03bb65e9..63fc3b531 100644 --- a/src/main/java/nl/dtls/fairdatapoint/service/schema/MetadataSchemaService.java +++ b/src/main/java/nl/dtls/fairdatapoint/service/schema/MetadataSchemaService.java @@ -22,6 +22,7 @@ */ package nl.dtls.fairdatapoint.service.schema; +import jakarta.validation.Valid; import lombok.extern.slf4j.Slf4j; import nl.dtls.fairdatapoint.api.dto.schema.*; import nl.dtls.fairdatapoint.database.mongo.repository.MetadataSchemaDraftRepository; @@ -40,7 +41,6 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.stereotype.Service; -import javax.validation.Valid; import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; diff --git a/src/main/java/nl/dtls/fairdatapoint/service/search/SearchFilterCache.java b/src/main/java/nl/dtls/fairdatapoint/service/search/SearchFilterCache.java index 43b977970..16fb03802 100644 --- a/src/main/java/nl/dtls/fairdatapoint/service/search/SearchFilterCache.java +++ b/src/main/java/nl/dtls/fairdatapoint/service/search/SearchFilterCache.java @@ -22,6 +22,7 @@ */ package nl.dtls.fairdatapoint.service.search; +import jakarta.annotation.PostConstruct; import lombok.extern.slf4j.Slf4j; import nl.dtls.fairdatapoint.entity.search.SearchFilterCacheContainer; import nl.dtls.fairdatapoint.service.label.LabelService; @@ -31,8 +32,6 @@ import org.springframework.cache.concurrent.ConcurrentMapCacheManager; import org.springframework.stereotype.Component; -import javax.annotation.PostConstruct; - import static java.lang.String.format; import static nl.dtls.fairdatapoint.config.CacheConfig.SEARCH_FILTERS_CACHE; diff --git a/src/main/java/nl/dtls/fairdatapoint/service/settings/SettingsCache.java b/src/main/java/nl/dtls/fairdatapoint/service/settings/SettingsCache.java index a668b1771..ca1a7cb57 100644 --- a/src/main/java/nl/dtls/fairdatapoint/service/settings/SettingsCache.java +++ b/src/main/java/nl/dtls/fairdatapoint/service/settings/SettingsCache.java @@ -22,6 +22,7 @@ */ package nl.dtls.fairdatapoint.service.settings; +import jakarta.annotation.PostConstruct; import nl.dtls.fairdatapoint.database.mongo.repository.SettingsRepository; import nl.dtls.fairdatapoint.entity.settings.Settings; import org.springframework.beans.factory.annotation.Autowired; @@ -29,8 +30,6 @@ import org.springframework.cache.concurrent.ConcurrentMapCacheManager; import org.springframework.stereotype.Service; -import javax.annotation.PostConstruct; - import static nl.dtls.fairdatapoint.config.CacheConfig.SETTINGS_CACHE; @Service diff --git a/src/main/java/nl/dtls/fairdatapoint/util/HttpUtil.java b/src/main/java/nl/dtls/fairdatapoint/util/HttpUtil.java index 25ceb7f4e..3d451c8f0 100644 --- a/src/main/java/nl/dtls/fairdatapoint/util/HttpUtil.java +++ b/src/main/java/nl/dtls/fairdatapoint/util/HttpUtil.java @@ -22,13 +22,13 @@ */ package nl.dtls.fairdatapoint.util; +import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; import nl.dtls.fairdatapoint.entity.exception.ValidationException; import org.eclipse.rdf4j.model.IRI; import org.eclipse.rdf4j.rio.RDFFormat; import org.springframework.http.HttpHeaders; -import javax.servlet.http.HttpServletRequest; import java.net.MalformedURLException; import java.net.URL; import java.util.UUID; diff --git a/src/test/java/nl/dtls/fairdatapoint/acceptance/actuator/ActuatorInfoDTO.java b/src/test/java/nl/dtls/fairdatapoint/acceptance/actuator/ActuatorInfoDTO.java index a595bc9f6..dc179735d 100644 --- a/src/test/java/nl/dtls/fairdatapoint/acceptance/actuator/ActuatorInfoDTO.java +++ b/src/test/java/nl/dtls/fairdatapoint/acceptance/actuator/ActuatorInfoDTO.java @@ -23,14 +23,13 @@ package nl.dtls.fairdatapoint.acceptance.actuator; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; - @NoArgsConstructor @AllArgsConstructor @Getter diff --git a/src/test/java/nl/dtls/fairdatapoint/acceptance/index/admin/List_Trigger_POST.java b/src/test/java/nl/dtls/fairdatapoint/acceptance/index/admin/List_Trigger_POST.java index 651036181..9c81a0262 100644 --- a/src/test/java/nl/dtls/fairdatapoint/acceptance/index/admin/List_Trigger_POST.java +++ b/src/test/java/nl/dtls/fairdatapoint/acceptance/index/admin/List_Trigger_POST.java @@ -130,7 +130,7 @@ public void res403_nonAdminToken() { @Test @DisplayName("HTTP 400: malformed URL") - public void res403_malformedUrl() { + public void res400_malformedUrl() { // GIVEN: prepare data String clientUrl = "http://example.com"; PingDTO reqDTO = reqDTO(clientUrl); diff --git a/src/test/java/nl/dtls/fairdatapoint/utils/HttpUtilTest.java b/src/test/java/nl/dtls/fairdatapoint/utils/HttpUtilTest.java index b53ed0484..e5bb2fc6f 100644 --- a/src/test/java/nl/dtls/fairdatapoint/utils/HttpUtilTest.java +++ b/src/test/java/nl/dtls/fairdatapoint/utils/HttpUtilTest.java @@ -22,13 +22,12 @@ */ package nl.dtls.fairdatapoint.utils; +import jakarta.servlet.http.HttpServletRequest; import org.eclipse.rdf4j.model.IRI; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; -import javax.servlet.http.HttpServletRequest; - import static nl.dtls.fairdatapoint.util.HttpUtil.*; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is;