X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=ves-nf-oam-adopter%2Fves-nf-oam-adopter-app%2Fsrc%2Fmain%2Fjava%2Forg%2Fo%2Fran%2Foam%2Fnf%2Foam%2Fadopter%2Fapp%2Fconfig%2FSecurityConfiguration.java;h=de317f37d8435a7b1cf38f62ad2b5a91648d3308;hb=3b1e9c1e2ea636b0c90da826ecf37147a9b5f23d;hp=2fc030f807e8a5e21197fde711bcc16e5e7ab337;hpb=cbc3da1f8c19847297e2ad88ba4f70210605b59e;p=oam%2Fnf-oam-adopter.git

diff --git a/ves-nf-oam-adopter/ves-nf-oam-adopter-app/src/main/java/org/o/ran/oam/nf/oam/adopter/app/config/SecurityConfiguration.java b/ves-nf-oam-adopter/ves-nf-oam-adopter-app/src/main/java/org/o/ran/oam/nf/oam/adopter/app/config/SecurityConfiguration.java
index 2fc030f..de317f3 100644
--- a/ves-nf-oam-adopter/ves-nf-oam-adopter-app/src/main/java/org/o/ran/oam/nf/oam/adopter/app/config/SecurityConfiguration.java
+++ b/ves-nf-oam-adopter/ves-nf-oam-adopter-app/src/main/java/org/o/ran/oam/nf/oam/adopter/app/config/SecurityConfiguration.java
@@ -20,7 +20,6 @@
 package org.o.ran.oam.nf.oam.adopter.app.config;
 
 import org.o.ran.oam.nf.oam.adopter.app.properties.ServerProperties;
-import org.o.ran.oam.nf.oam.adopter.app.properties.SslProperties;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -43,10 +42,7 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
 
     @Override
     protected void configure(final HttpSecurity http) throws Exception {
-        final SslProperties ssl = properties.getSsl();
-        if (ssl != null && ssl.getEnabled() != null && ssl.getEnabled()) {
-            http.requiresChannel().anyRequest().requiresSecure();
-        }
+        http.requiresChannel().anyRequest().requiresSecure();
         http.csrf().disable()
                 .antMatcher("/adapters/**")
                 .authorizeRequests().anyRequest()
@@ -55,6 +51,7 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
     }
 
     @Bean
+    @Autowired
     public AuthenticationManager authenticationManagerBean() throws Exception {
         return super.authenticationManagerBean();
     }