Migration to spring boot 3 (#205)

InseeFrLab · Oct 16, 2023 · 881b6d3 · 881b6d3
1 parent 5d14bd8
commit 881b6d3
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 33 deletions.
diff --git a/...api/src/main/java/fr/insee/onyxia/api/configuration/properties/CatalogsConfiguration.java b/...api/src/main/java/fr/insee/onyxia/api/configuration/properties/CatalogsConfiguration.java
@@ -3,11 +3,11 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import fr.insee.onyxia.api.configuration.CatalogWrapper;
+import jakarta.annotation.PostConstruct;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import javax.annotation.PostConstruct;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;

diff --git a/...-api/src/main/java/fr/insee/onyxia/api/configuration/properties/RegionsConfiguration.java b/...-api/src/main/java/fr/insee/onyxia/api/configuration/properties/RegionsConfiguration.java
@@ -4,12 +4,12 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import fr.insee.onyxia.model.region.Region;
 import fr.insee.onyxia.model.service.Service;
+import jakarta.annotation.PostConstruct;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import javax.annotation.PostConstruct;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

diff --git a/onyxia-api/src/main/java/fr/insee/onyxia/api/configuration/proxy/SetProxy.java b/onyxia-api/src/main/java/fr/insee/onyxia/api/configuration/proxy/SetProxy.java
@@ -1,6 +1,6 @@
 package fr.insee.onyxia.api.configuration.proxy;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;

diff --git a/onyxia-api/src/main/java/fr/insee/onyxia/api/controller/api/utils/ProjectResolver.java b/onyxia-api/src/main/java/fr/insee/onyxia/api/controller/api/utils/ProjectResolver.java
@@ -4,7 +4,7 @@
 import fr.insee.onyxia.model.OnyxiaUser;
 import fr.insee.onyxia.model.project.Project;
 import fr.insee.onyxia.model.region.Region;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.MethodParameter;

diff --git a/onyxia-api/src/main/java/fr/insee/onyxia/api/controller/api/utils/RegionResolver.java b/onyxia-api/src/main/java/fr/insee/onyxia/api/controller/api/utils/RegionResolver.java
@@ -2,7 +2,7 @@
 
 import fr.insee.onyxia.api.configuration.properties.RegionsConfiguration;
 import fr.insee.onyxia.model.region.Region;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.MethodParameter;
 import org.springframework.stereotype.Service;

diff --git a/onyxia-api/src/main/java/fr/insee/onyxia/api/security/NoSecurityConfiguration.java b/onyxia-api/src/main/java/fr/insee/onyxia/api/security/NoSecurityConfiguration.java
@@ -1,30 +1,22 @@
 package fr.insee.onyxia.api.security;
 
-import fr.insee.onyxia.api.services.utils.HttpRequestUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.builders.WebSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.web.SecurityFilterChain;
 
 @Configuration
 @EnableWebSecurity
 @ConditionalOnExpression("'${authentication.mode}' == 'none' or '${authentication.mode}' == ''")
-public class NoSecurityConfiguration extends WebSecurityConfigurerAdapter {
+public class NoSecurityConfiguration {
 
-    @Autowired private HttpRequestUtils httpRequestUtils;
-
-    @Override
-    protected void configure(HttpSecurity http) throws Exception {
-        http.authorizeRequests().antMatchers("/**").permitAll();
+    @Bean
+    protected SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
+        http.authorizeHttpRequests(auth -> auth.anyRequest().permitAll());
         http.headers().frameOptions().disable();
         http.csrf().disable();
-    }
-
-    @Override
-    public void configure(WebSecurity web) {
-        web.ignoring().antMatchers("/**");
+        return http.build();
     }
 }
diff --git a/onyxia-api/src/main/java/fr/insee/onyxia/api/security/OIDCConfiguration.java b/onyxia-api/src/main/java/fr/insee/onyxia/api/security/OIDCConfiguration.java
@@ -67,10 +67,10 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
                 .and()
                 // manage routes securisation here
                 .authorizeRequests()
-                .antMatchers(HttpMethod.OPTIONS)
+                .requestMatchers(HttpMethod.OPTIONS)
                 .permitAll()
                 // configuration pour Swagger
-                .antMatchers(
+                .requestMatchers(
                         "/",
                         "/swagger-ui**",
                         "/swagger-ui/**",
@@ -83,7 +83,7 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
                         "/actuator/**",
                         "/actuator")
                 .permitAll()
-                .antMatchers(
+                .requestMatchers(
                         "/api",
                         "/api/swagger-ui**",
                         "/api/swagger-ui/**",
@@ -97,9 +97,9 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
                         "/api/actuator")
                 .permitAll()
                 // configuration pour public
-                .antMatchers("/public/**")
+                .requestMatchers("/public/**")
                 .permitAll()
-                .antMatchers("/api/public/**")
+                .requestMatchers("/api/public/**")
                 .permitAll()
                 .anyRequest()
                 .authenticated()

diff --git a/onyxia-api/src/main/java/fr/insee/onyxia/api/services/utils/HttpRequestUtils.java b/onyxia-api/src/main/java/fr/insee/onyxia/api/services/utils/HttpRequestUtils.java
@@ -1,6 +1,6 @@
 package fr.insee.onyxia.api.services.utils;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.stereotype.Service;
 
 @Service

diff --git a/onyxia-api/src/test/java/fr/insee/onyxia/api/configuration/BaseTest.java b/onyxia-api/src/test/java/fr/insee/onyxia/api/configuration/BaseTest.java
@@ -1,11 +1,14 @@
 package fr.insee.onyxia.api.configuration;
 
+import fr.insee.onyxia.api.security.NoSecurityConfiguration;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs;
+import org.springframework.context.annotation.Import;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 @ExtendWith(SpringExtension.class)
 @AutoConfigureRestDocs(outputDir = "target/snippets")
 @TestPropertySource("classpath:application-test.properties")
+@Import(NoSecurityConfiguration.class)
 public abstract class BaseTest {}
diff --git a/onyxia-model/pom.xml b/onyxia-model/pom.xml
@@ -35,12 +35,6 @@
             <artifactId>jackson-databind</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>2.3.1</version>
-        </dependency>
-
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-yaml</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.16</version>
+        <version>3.1.4</version>
     </parent>
     <modules>
         <module>onyxia-model</module>