1 files changed, 0 insertions, 203 deletions
diff --git a/src/main/java/org/onap/music/MusicApplication.java b/src/main/java/org/onap/music/MusicApplication.java
deleted file mode 100755
index 22c9e7bf..00000000
--- a/src/main/java/org/onap/music/MusicApplication.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * ============LICENSE_START==========================================
- * org.onap.music
- * ===================================================================
- *  Copyright (c) 2017 AT&T Intellectual Property
- * ===================================================================
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- * 
- * ============LICENSE_END=============================================
- * ====================================================================
- */
-
-package org.onap.music;
-
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-
-import org.onap.aaf.cadi.PropAccess;
-import org.onap.music.authentication.CadiAuthFilter;
-import org.onap.music.authentication.MusicAuthorizationFilter;
-import org.onap.music.eelf.logging.EELFLoggerDelegate;
-import org.onap.music.eelf.logging.MusicLoggingServletFilter;
-import org.onap.music.main.MusicUtil;
-import org.onap.music.main.PropertiesLoader;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-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.servlet.support.SpringBootServletInitializer;
-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"})
-@EnableAutoConfiguration(exclude = { CassandraDataAutoConfiguration.class })
-@ComponentScan(value = { "org.onap.music" })
-@EnableScheduling
-public class MusicApplication extends SpringBootServletInitializer {
-
-    private static final String KEYSPACE_PATTERN = "/v2/keyspaces/*";
-    private static final String LOCKS_PATTERN = "/v2/locks/*";
-    private static final String Q_PATTERN = "/v2/priorityq/*";
-
-    @Autowired
-    private PropertiesLoader propertyLoader;
-    private EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(MusicApplication.class);
-
-
-    public static void main(String[] args) {
-        new MusicApplication().configure(new SpringApplicationBuilder(MusicApplication.class)).run(args);
-    }
-
-    @Override
-    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
-
-        return application.sources(MusicApplication.class);
-    }
-
-    @Bean("loadProperties")
-    public void loadProperties() {
-        propertyLoader.loadProperties();
-    }
-
-
-    @Bean
-    @DependsOn("loadProperties")
-    public PropAccess propAccess() {
-        if (MusicUtil.getIsCadi()) {
-            return new PropAccess(new String[] { 
-                "cadi_prop_files=/opt/app/music/etc/cadi.properties" });
-        } else {
-            return null;
-        }
-    }
-
-    @Bean(name = "cadiFilter")
-    @DependsOn("loadProperties")
-    public Filter cadiFilter() throws ServletException {
-        propertyLoader.loadProperties();
-        if (MusicUtil.getIsCadi()) {
-            PropAccess propAccess = propAccess();
-            return new CadiAuthFilter(propAccess);
-        } else {
-            return (ServletRequest request, ServletResponse response, FilterChain chain) -> {
-                // do nothing for now.
-            };
-        }
-    }
-    
-    /**
-     * Added for capturing custom header values from client.
-     * 
-     * order is set to 1 for this filter
-     * 
-     * sp931a
-     * 
-     * @return
-     * @throws ServletException
-     */
-    @Bean(name="logFilter")
-    @DependsOn("loadProperties")
-    public FilterRegistrationBean<Filter> loggingFilterRegistration() throws ServletException {
-        logger.info("loggingFilterRegistration called for log filter..");
-        propertyLoader.loadProperties();
-        FilterRegistrationBean<Filter> frb = new FilterRegistrationBean<>();
-        frb.setFilter(new MusicLoggingServletFilter());
-        frb.addUrlPatterns(
-            KEYSPACE_PATTERN,
-            LOCKS_PATTERN,
-            Q_PATTERN
-        );
-        frb.setName("logFilter");
-        frb.setOrder(1);
-        return frb;
-    }
-
-    @Bean
-    @DependsOn("loadProperties")
-    public FilterRegistrationBean<Filter> cadiFilterRegistration() throws ServletException {
-        logger.info("cadiFilterRegistration called for cadi filter..");
-        FilterRegistrationBean<Filter> frb = new FilterRegistrationBean<>();
-        frb.setFilter(cadiFilter());
-        if (MusicUtil.getIsCadi()) {
-            frb.addUrlPatterns(
-                KEYSPACE_PATTERN,
-                LOCKS_PATTERN,
-                Q_PATTERN
-            );
-        } else {
-            frb.addUrlPatterns("/v0/test");
-        }
-        frb.setName("cadiFilter");
-        frb.setOrder(2);
-        return frb;
-    }
-
-    
-    /**
-     * Added for Authorization using CADI
-     * 
-     * sp931a
-     * 
-     * @return
-     * @throws ServletException
-     */
-    @Bean
-    @DependsOn("loadProperties")
-    public FilterRegistrationBean<Filter> cadiFilterRegistrationForAuth() throws ServletException {
-        logger.info("cadiFilterRegistrationForAuth called for cadi auth filter..");
-        FilterRegistrationBean<Filter> frb = new FilterRegistrationBean<>();
-        frb.setFilter(cadiMusicAuthFilter());
-
-        if (MusicUtil.getIsCadi()) {
-            frb.addUrlPatterns(
-                KEYSPACE_PATTERN,
-                LOCKS_PATTERN,
-                Q_PATTERN
-                );
-        } else {
-            frb.addUrlPatterns("/v0/test");
-        }
-        frb.setName("cadiMusicAuthFilter");
-        frb.setOrder(3);
-        return frb;
-    }
-
-    @Bean(name = "cadiMusicAuthFilter")
-    @DependsOn("loadProperties")
-    public Filter cadiMusicAuthFilter() throws ServletException {
-        propertyLoader.loadProperties();
-        if (MusicUtil.getIsCadi()) {
-            return new MusicAuthorizationFilter();
-        } else {
-            return (ServletRequest request, ServletResponse response, FilterChain chain) -> {
-                // do nothing for now.
-            };
-        }
-    }
-
-    @Bean
-    @ConditionalOnMissingBean(RequestContextListener.class)
-    public RequestContextListener requestContextListener() {
-        return new RequestContextListener();
-    }
-}