X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fmusic%2FMusicApplication.java;h=aa4de01e10990ea7fb02b5185578108f86652710;hb=7a8411afab33104f8bea2048411bb9da5e7b0f68;hp=8f5f773e6b2e4d1094efc996367b15d80b0581d2;hpb=641255c612fae09ff8840124eb7dcf5046083dd0;p=music.git

diff --git a/src/main/java/org/onap/music/MusicApplication.java b/src/main/java/org/onap/music/MusicApplication.java
index 8f5f773e..aa4de01e 100755
--- a/src/main/java/org/onap/music/MusicApplication.java
+++ b/src/main/java/org/onap/music/MusicApplication.java
@@ -42,30 +42,29 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
 import org.springframework.boot.autoconfigure.data.cassandra.CassandraDataAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
-//import org.springframework.boot.web.support.SpringBootServletInitializer;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
-import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.DependsOn;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.web.context.request.RequestContextListener;
 
-@SpringBootApplication(scanBasePackages = { "org.onap.music.rest" })
+@SpringBootApplication(scanBasePackages = { "org.onap.music.rest"})
 @EnableAutoConfiguration(exclude = { CassandraDataAutoConfiguration.class })
 @ComponentScan(value = { "org.onap.music" })
 @EnableScheduling
 public class MusicApplication extends SpringBootServletInitializer {
 
+    private final String KEYSPACE_PATTERN = "/v2/keyspaces/*";
+    private final String LOCKS_PATTERN = "/v2/locks/*";
+    private final String Q_PATTERN = "/v2/priorityq/*";
+
     @Autowired
     private PropertiesLoader propertyLoader;
     private EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(MusicApplication.class);
 
+
     public static void main(String[] args) {
-        System.setProperty("AFT_DME2_CLIENT_IGNORE_SSL_CONFIG", "false");
-        System.setProperty("AFT_DME2_CLIENT_KEYSTORE", "/opt/app/music/etc/truststore2018.jks");
-        System.setProperty("AFT_DME2_CLIENT_KEYSTORE_PASSWORD", "changeit");
-        System.setProperty("AFT_DME2_CLIENT_SSL_INCLUDE_PROTOCOLS", "TLSv1.1,TLSv1.2");
         new MusicApplication().configure(new SpringApplicationBuilder(MusicApplication.class)).run(args);
     }
 
@@ -80,8 +79,6 @@ public class MusicApplication extends SpringBootServletInitializer {
         propertyLoader.loadProperties();
     }
 
-    @Autowired
-    private ApplicationContext appContext;
 
     @Bean
     @DependsOn("loadProperties")
@@ -100,9 +97,7 @@ public class MusicApplication extends SpringBootServletInitializer {
         propertyLoader.loadProperties();
         if (MusicUtil.getIsCadi()) {
             PropAccess propAccess = propAccess();
-            CadiAuthFilter cadiFilter = new CadiAuthFilter(propAccess);
-
-            return cadiFilter;
+            return new CadiAuthFilter(propAccess);
         } else {
             return (ServletRequest request, ServletResponse response, FilterChain chain) -> {
                 // do nothing for now.
@@ -128,15 +123,14 @@ public class MusicApplication extends SpringBootServletInitializer {
         FilterRegistrationBean<Filter> frb = new FilterRegistrationBean<>();
         frb.setFilter(new MusicLoggingServletFilter());
         frb.addUrlPatterns(
-            "/v2/keyspaces/*", 
-            "/v2/locks/*", 
-            "/v2/priorityq/*"
+            KEYSPACE_PATTERN,
+            LOCKS_PATTERN,
+            Q_PATTERN
         );
         frb.setName("logFilter");
         frb.setOrder(1);
         return frb;
     }
-    
 
     @Bean
     @DependsOn("loadProperties")
@@ -144,14 +138,11 @@ public class MusicApplication extends SpringBootServletInitializer {
         logger.info("cadiFilterRegistration called for cadi filter..");
         FilterRegistrationBean<Filter> frb = new FilterRegistrationBean<>();
         frb.setFilter(cadiFilter());
-
-        // The Following Patterns are used to control what APIs will be secure
-        // TODO: Make this a configurable item. Build this from an array?
         if (MusicUtil.getIsCadi()) {
             frb.addUrlPatterns(
-                "/v2/keyspaces/*", 
-                "/v2/locks/*", 
-                "/v2/priorityq/*"
+                KEYSPACE_PATTERN,
+                LOCKS_PATTERN,
+                Q_PATTERN
             );
         } else {
             frb.addUrlPatterns("/v0/test");
@@ -179,10 +170,10 @@ public class MusicApplication extends SpringBootServletInitializer {
 
         if (MusicUtil.getIsCadi()) {
             frb.addUrlPatterns(
-                "/v2/keyspaces/*", 
-                "/v2/locks/*", 
-                "/v2/priorityq/*"
-            );
+                KEYSPACE_PATTERN,
+                LOCKS_PATTERN,
+                Q_PATTERN
+                );
         } else {
             frb.addUrlPatterns("/v0/test");
         }
@@ -196,8 +187,7 @@ public class MusicApplication extends SpringBootServletInitializer {
     public Filter cadiMusicAuthFilter() throws ServletException {
         propertyLoader.loadProperties();
         if (MusicUtil.getIsCadi()) {
-            MusicAuthorizationFilter authFilter = new MusicAuthorizationFilter();
-            return authFilter;
+            return new MusicAuthorizationFilter();
         } else {
             return (ServletRequest request, ServletResponse response, FilterChain chain) -> {
                 // do nothing for now.
@@ -210,4 +200,4 @@ public class MusicApplication extends SpringBootServletInitializer {
     public RequestContextListener requestContextListener() {
         return new RequestContextListener();
     }
-}
\ No newline at end of file
+}