Port to java 17

[ccsdk/apps.git] / ms / vlantag-api / src / main / java / org / onap / ccsdk / apps / ms / vlantagapi / core / ApplicationSecurityConfig.java

diff --git a/ms/vlantag-api/src/main/java/org/onap/ccsdk/apps/ms/vlantagapi/core/ApplicationSecurityConfig.java b/ms/vlantag-api/src/main/java/org/onap/ccsdk/apps/ms/vlantagapi/core/ApplicationSecurityConfig.java
index 80c42fb..01860fa 100644 (file)
--- a/ms/vlantag-api/src/main/java/org/onap/ccsdk/apps/ms/vlantagapi/core/ApplicationSecurityConfig.java
+++ b/ms/vlantag-api/src/main/java/org/onap/ccsdk/apps/ms/vlantagapi/core/ApplicationSecurityConfig.java
@@ -21,11 +21,11 @@ import java.util.List;
 import org.slf4j.Logger;\r
 import org.slf4j.LoggerFactory;\r
 import org.springframework.beans.factory.annotation.Autowired;\r
+import org.springframework.context.annotation.Bean;\r
 import org.springframework.context.annotation.Configuration;\r
 import org.springframework.core.env.Environment;\r
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;\r
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;\r
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;\r
 import org.springframework.security.config.http.SessionCreationPolicy;\r
 import org.springframework.security.core.userdetails.User;\r
 import org.springframework.security.core.userdetails.UserDetails;\r
@@ -33,6 +33,7 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.factory.PasswordEncoderFactories;\r
 import org.springframework.security.crypto.password.PasswordEncoder;\r
 import org.springframework.security.provisioning.InMemoryUserDetailsManager;\r
+import org.springframework.security.web.SecurityFilterChain;\r
 \r
 /**\r
  * ApplicationSecurityConfig.java Purpose: Configures and validates\r
@@ -42,14 +43,14 @@ import org.springframework.security.provisioning.InMemoryUserDetailsManager;
  * @version 1.0\r
  */\r
 @Configuration\r
-public class ApplicationSecurityConfig extends WebSecurityConfigurerAdapter{\r
+public class ApplicationSecurityConfig {\r
        private Logger logger = LoggerFactory.getLogger(ApplicationSecurityConfig.class);\r
         \r
        @Autowired\r
        private Environment environment;\r
 \r
-       @Override\r
-       protected void configure(AuthenticationManagerBuilder auth) throws Exception {\r
+       @Bean\r
+       public InMemoryUserDetailsManager userDetailsService() {\r
                List<UserDetails> userDetails = new ArrayList<>();\r
                \r
                // Explicitly set bcrypt password encoder rather than using default\r
@@ -74,7 +75,7 @@ public class ApplicationSecurityConfig extends WebSecurityConfigurerAdapter{
                }\r
                \r
                logger.info("-------------------------------{}",userDetails);\r
-               auth.userDetailsService(inMemoryUserDetailsManager(userDetails));\r
+               return new InMemoryUserDetailsManager(userDetails);\r
        }\r
        \r
     \r
@@ -82,13 +83,15 @@ public class ApplicationSecurityConfig extends WebSecurityConfigurerAdapter{
         return new InMemoryUserDetailsManager(userDetails);\r
     }\r
 \r
-       @Override\r
-       protected void configure(HttpSecurity http) throws Exception {\r
-               http.authorizeRequests().anyRequest().fullyAuthenticated();\r
-           http.httpBasic().and().sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS);\r
+       @Bean\r
+       public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {\r
+               http.authorizeHttpRequests().anyRequest().fullyAuthenticated();\r
+               http.httpBasic().and().sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS);\r
                http.csrf().disable();\r
+\r
+               return http.build();\r
        }\r
-       \r
+\r
     private static String[] decode(String encoded) {\r
         final byte[] decodedBytes \r
                 = Base64.getDecoder().decode(encoded.getBytes());\r