Revert Spring Boot Uplift

[cps.git] / cps-application / src / main / java / org / onap / cps / config / WebSecurityConfig.java

diff --git a/cps-application/src/main/java/org/onap/cps/config/WebSecurityConfig.java b/cps-application/src/main/java/org/onap/cps/config/WebSecurityConfig.java
index aedc6a8..0b6d0db 100644 (file)
--- a/cps-application/src/main/java/org/onap/cps/config/WebSecurityConfig.java
+++ b/cps-application/src/main/java/org/onap/cps/config/WebSecurityConfig.java
@@ -27,6 +27,7 @@ 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.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
 import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.provisioning.InMemoryUserDetailsManager;
@@ -39,9 +40,7 @@ import org.springframework.security.web.SecurityFilterChain;
 @Configuration
 @EnableWebSecurity
 public class WebSecurityConfig {
-
     private static final String USER_ROLE = "USER";
-
     private final String username;
     private final String password;
     private final String[] permitUris;
@@ -54,9 +53,9 @@ public class WebSecurityConfig {
      * @param password   password
      */
     public WebSecurityConfig(
-        @Autowired @Value("${security.permit-uri}") final String permitUris,
-        @Autowired @Value("${security.auth.username}") final String username,
-        @Autowired @Value("${security.auth.password}") final String password
+            @Autowired @Value("${security.permit-uri}") final String permitUris,
+            @Autowired @Value("${security.auth.username}") final String username,
+            @Autowired @Value("${security.auth.password}") final String password
     ) {
         super();
         this.permitUris = permitUris.isEmpty() ? new String[] {"/v3/api-docs"} : permitUris.split("\\s{0,9},\\s{0,9}");
@@ -78,21 +77,19 @@ public class WebSecurityConfig {
     @SuppressWarnings("squid:S4502")
     public SecurityFilterChain filterChain(final HttpSecurity http) throws Exception {
         http
-                .httpBasic()
-                .and()
-                .authorizeRequests()
-                .antMatchers(permitUris).permitAll()
-                .anyRequest().authenticated()
-                .and()
-                .csrf().disable();
-
+                .httpBasic(httpBasicCustomizer -> {})
+                .authorizeHttpRequests(authorizeHttpRequestsCustomizer -> {
+                    authorizeHttpRequestsCustomizer.requestMatchers(permitUris).permitAll();
+                    authorizeHttpRequestsCustomizer.anyRequest().authenticated();
+                })
+                .csrf(AbstractHttpConfigurer::disable);
         return http.build();
     }
 
     /**
      * In memory user authentication details.
      *
-     * @return in memory authetication
+     * @return in memory authentication
      */
     @Bean
     public InMemoryUserDetailsManager userDetailsService() {