update to spring-boot 3 and fix tests

datasafe-business/pom.xml

@@ -179,7 +179,10 @@
  <artifactId>h2</artifactId>
  <scope>test</scope>
  </dependency>
-
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </dependency>
  </dependencies>
 
  <build>

datasafe-rest-impl/pom.xml

@@ -14,13 +14,13 @@
  <description>Spring Boot DataSafe Application</description>
 
  <properties>
- <java.version>1.8</java.version>
- <spring-boot.version>2.1.5.RELEASE</spring-boot.version>
+ <spring-boot.version>3.1.2</spring-boot.version>
  <springfox-swagger.version>2.9.2</springfox-swagger.version>
  <jjwt.version>0.10.5</jjwt.version>
  <spring-restdocs.version>2.0.3.RELEASE</spring-restdocs.version>
  <asciidoctor-maven-plugin.version>1.5.3</asciidoctor-maven-plugin.version>
  <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
+ <jakarta.validation-api.varsion>3.0.2</jakarta.validation-api.varsion>
  </properties>
 
  <dependencies>
@@ -77,6 +77,11 @@
  <version>${spring-boot.version}</version>
  <optional>true</optional>
  </dependency>
+ <dependency>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
+ <version>${jakarta.validation-api.varsion}</version>
+ </dependency>
  <dependency>
  <groupId>io.springfox</groupId>
  <artifactId>springfox-swagger2</artifactId>

datasafe-rest-impl/src/main/java/de/adorsys/datasafe/rest/impl/config/MvcConfig.java

@@ -2,16 +2,20 @@
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.format.support.FormattingConversionService;
 import org.springframework.http.MediaType;
 import org.springframework.util.AntPathMatcher;
 import org.springframework.util.StringUtils;
+import org.springframework.web.accept.ContentNegotiationManager;
 import org.springframework.web.servlet.config.annotation.ContentNegotiationConfigurer;
 import org.springframework.web.servlet.config.annotation.DefaultServletHandlerConfigurer;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
+import org.springframework.web.servlet.resource.ResourceUrlProvider;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -34,8 +38,12 @@ public class MvcConfig extends WebMvcConfigurationSupport {
  */
  @Bean
  @Override
- public RequestMappingHandlerMapping requestMappingHandlerMapping() {
- RequestMappingHandlerMapping handlerMapping = super.requestMappingHandlerMapping();
+ public RequestMappingHandlerMapping requestMappingHandlerMapping(
+ @Qualifier("mvcContentNegotiationManager") ContentNegotiationManager contentNegotiationManager,
+ @Qualifier("mvcConversionService") FormattingConversionService conversionService,
+ @Qualifier("mvcResourceUrlProvider") ResourceUrlProvider resourceUrlProvider
+ ) {
+ RequestMappingHandlerMapping handlerMapping = super.requestMappingHandlerMapping(contentNegotiationManager, conversionService, resourceUrlProvider);
  handlerMapping.setPathMatcher(new ExtendedMatcher());
  return handlerMapping;
  }

datasafe-rest-impl/src/main/java/de/adorsys/datasafe/rest/impl/controller/AuthenticateController.java

@@ -11,6 +11,7 @@
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.authentication.AuthenticationManager;
@@ -22,7 +23,6 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletResponse;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;

datasafe-rest-impl/src/main/java/de/adorsys/datasafe/rest/impl/controller/DocumentController.java

@@ -16,6 +16,7 @@
 import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
@@ -29,7 +30,6 @@
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletResponse;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.List;

datasafe-rest-impl/src/main/java/de/adorsys/datasafe/rest/impl/controller/InboxController.java

@@ -16,6 +16,7 @@
 import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
@@ -29,7 +30,6 @@
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletResponse;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.List;

datasafe-rest-impl/src/main/java/de/adorsys/datasafe/rest/impl/controller/VersionController.java

@@ -20,6 +20,7 @@
 import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
@@ -33,7 +34,6 @@
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletResponse;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.List;

datasafe-rest-impl/src/main/java/de/adorsys/datasafe/rest/impl/dto/NewPasswordDTO.java

@@ -1,11 +1,10 @@
 package de.adorsys.datasafe.rest.impl.dto;
 
+import jakarta.validation.constraints.NotBlank;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.validation.constraints.NotBlank;
-
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

datasafe-rest-impl/src/main/java/de/adorsys/datasafe/rest/impl/dto/StorageCredsDTO.java

@@ -1,10 +1,9 @@
 package de.adorsys.datasafe.rest.impl.dto;
 
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-
 @Data
 public class StorageCredsDTO {
 

datasafe-rest-impl/src/main/java/de/adorsys/datasafe/rest/impl/dto/UserDTO.java

@@ -1,12 +1,11 @@
 package de.adorsys.datasafe.rest.impl.dto;
 
 import io.swagger.annotations.ApiModelProperty;
+import jakarta.validation.constraints.NotBlank;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.validation.constraints.NotBlank;
-
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

datasafe-rest-impl/src/main/java/de/adorsys/datasafe/rest/impl/dto/UserPrivateProfileDTO.java

@@ -3,13 +3,13 @@
 import de.adorsys.datasafe.directory.api.types.UserPrivateProfile;
 import de.adorsys.datasafe.types.api.global.Version;
 import de.adorsys.datasafe.types.api.resource.StorageIdentifier;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;

datasafe-rest-impl/src/main/java/de/adorsys/datasafe/rest/impl/dto/UserPublicProfileDTO.java

@@ -2,12 +2,11 @@
 
 import de.adorsys.datasafe.directory.api.types.UserPublicProfile;
 import de.adorsys.datasafe.types.api.global.Version;
+import jakarta.validation.constraints.NotBlank;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.validation.constraints.NotBlank;
-
 @Data
 @NoArgsConstructor
 @AllArgsConstructor

datasafe-rest-impl/src/main/java/de/adorsys/datasafe/rest/impl/security/JwtAuthorizationFilter.java

@@ -8,17 +8,17 @@
 import io.jsonwebtoken.MalformedJwtException;
 import io.jsonwebtoken.UnsupportedJwtException;
 import io.jsonwebtoken.security.SignatureException;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.web.authentication.www.BasicAuthenticationFilter;
 
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
 import java.util.stream.Collectors;

datasafe-rest-impl/src/main/java/de/adorsys/datasafe/rest/impl/security/SecurityConfig.java

@@ -1,18 +1,19 @@
 package de.adorsys.datasafe.rest.impl.security;
 
-import lombok.SneakyThrows;
 import org.springframework.context.annotation.Bean;
 import org.springframework.http.HttpMethod;
 import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.config.BeanIds;
-import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
+import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-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.core.userdetails.User;
+import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.security.provisioning.InMemoryUserDetailsManager;
+import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.security.web.firewall.HttpFirewall;
 import org.springframework.security.web.firewall.StrictHttpFirewall;
 import org.springframework.web.cors.CorsConfiguration;
@@ -22,10 +23,10 @@
 import static de.adorsys.datasafe.rest.impl.security.SecurityConstants.TOKEN_HEADER;
 
 @EnableWebSecurity
-@EnableGlobalMethodSecurity(securedEnabled = true)
-public class SecurityConfig extends WebSecurityConfigurerAdapter {
+@EnableMethodSecurity(securedEnabled = true)
+public class SecurityConfig {
 
- public static final String[] SWAGGER_RESOURCES = {
+ private static final String[] SWAGGER_RESOURCES = {
  "/v2/api-docs",
  "/configuration/ui",
  "/swagger-resources",
@@ -42,28 +43,32 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
  this.securityProperties = securityProperties;
  }
 
- @Override
- protected void configure(HttpSecurity http) throws Exception {
- http.cors().and()
- .csrf().disable()
- .authorizeRequests()
- .antMatchers(SWAGGER_RESOURCES).permitAll()
- .antMatchers("/static/**").permitAll()
- .antMatchers(SecurityConstants.AUTH_LOGIN_URL).permitAll()
- .antMatchers(HttpMethod.OPTIONS, "/**").permitAll()
- .anyRequest().authenticated()
- .and()
- .addFilter(new JwtAuthorizationFilter(authenticationManager(), securityProperties))
- .sessionManagement()
- .sessionCreationPolicy(SessionCreationPolicy.STATELESS);
+ @Bean
+ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
+ AuthenticationManager authenticationManager = http.getSharedObject(AuthenticationManager.class);
+ http.cors(AbstractHttpConfigurer::disable)
+ .csrf(AbstractHttpConfigurer::disable)
+ .authorizeHttpRequests(authz -> authz
+ .requestMatchers(SWAGGER_RESOURCES).permitAll()
+ .requestMatchers("/static/**").permitAll()
+ .requestMatchers(SecurityConstants.AUTH_LOGIN_URL).permitAll()
+ .requestMatchers(HttpMethod.OPTIONS, "/**").permitAll()
+ .anyRequest().authenticated()
+ )
+ .addFilter(new JwtAuthorizationFilter(authenticationManager, securityProperties))
+ .sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS));
+
+ return http.build();
  }
 
- @Override
- public void configure(AuthenticationManagerBuilder auth) throws Exception {
- auth.inMemoryAuthentication()
- .withUser(securityProperties.getDefaultUser())
- .password(passwordEncoder().encode(securityProperties.getDefaultPassword()))
- .authorities("ROLE_USER");
+ @Bean
+ public InMemoryUserDetailsManager userDetailsService(PasswordEncoder passwordEncoder) {
+ UserDetails user = User.withDefaultPasswordEncoder()
+ .username(securityProperties.getDefaultUser())
+ .password(passwordEncoder.encode(securityProperties.getDefaultPassword()))
+ .authorities("ROLE_USER")
+ .build();
+ return new InMemoryUserDetailsManager(user);
  }
 
  @Bean
@@ -94,16 +99,4 @@ public CorsConfigurationSource corsConfigurationSource() {
 
  return source;
  }
-
- @Bean(name = BeanIds.AUTHENTICATION_MANAGER)
- @Override
- public AuthenticationManager authenticationManagerBean() throws Exception {
- return super.authenticationManagerBean();
- }
-
- @Bean
- @SneakyThrows
- public JwtAuthorizationFilter jwtAuthorizationFilter() {
- return new JwtAuthorizationFilter(authenticationManager(), securityProperties);
- }
 }

datasafe-runtime-delegate/src/main/java/de/adorsys/datasafe/runtimedelegate/RuntimeDelegateProcessor.java

@@ -31,7 +31,7 @@
  * there is nothing associated with annotated class in {@link OverridesRegistry} - it calls default implementation.
  */
 @SupportedAnnotationTypes(ANNOTATION_CLASS)
-@SupportedSourceVersion(SourceVersion.RELEASE_8)
+@SupportedSourceVersion(SourceVersion.RELEASE_17)
 @AutoService(Processor.class)
 public class RuntimeDelegateProcessor extends AbstractProcessor {
 

datasafe-runtime-delegate/src/test/java/de/adorsys/datasafe/runtimedelegate/RuntimeDelegateTest.java

@@ -12,7 +12,6 @@
 import static com.google.testing.compile.CompilationSubject.assertThat;
 import static com.google.testing.compile.Compiler.javac;
 
-@Disabled
 class RuntimeDelegateTest {
 
  @ParameterizedTest

datasafe-runtime-delegate/src/test/resources/output/SimpleClassRuntimeDelegatable.java

@@ -1,7 +1,7 @@
 import de.adorsys.datasafe.types.api.context.overrides.OverridesRegistry;
+import jakarta.annotation.Generated;
 import java.lang.Override;
 import java.util.function.Function;
-import javax.annotation.Generated;
 import javax.annotation.Nullable;
 import javax.inject.Inject;
 

datasafe-runtime-delegate/src/test/resources/output/SimpleClassWithGenericRuntimeDelegatable.java

@@ -1,8 +1,8 @@
 import de.adorsys.datasafe.types.api.context.overrides.OverridesRegistry;
+import jakarta.annotation.Generated;
 import java.lang.Override;
 import java.util.List;
 import java.util.function.Function;
-import javax.annotation.Generated;
 import javax.annotation.Nullable;
 import javax.inject.Inject;
 

datasafe-runtime-delegate/src/test/resources/output/SimpleClassWithVoidRuntimeDelegatable.java

@@ -1,7 +1,7 @@
 import de.adorsys.datasafe.types.api.context.overrides.OverridesRegistry;
+import jakarta.annotation.Generated;
 import java.lang.Override;
 import java.util.function.Function;
-import javax.annotation.Generated;
 import javax.annotation.Nullable;
 import javax.inject.Inject;