Only enable CadiFilter if prop file set

Only enable CadiFilter if cadi.properties.path property is set

Issue-ID: CCSDK-3349
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: If275fb839996ebb93317e9de8a2f2256c99b87b9

diff --git a/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/SlibootApp.java b/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/SlibootApp.java
index 0d7a547..36048ea 100644 (file)
--- a/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/SlibootApp.java
+++ b/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/SlibootApp.java
@@ -24,6 +24,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;\r
 import org.springframework.boot.SpringApplication;\r
 import org.springframework.boot.autoconfigure.SpringBootApplication;\r
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;\r
 import org.springframework.boot.autoconfigure.domain.EntityScan;\r
 import org.springframework.boot.web.servlet.FilterRegistrationBean;\r
 import org.springframework.context.annotation.ComponentScan;\r
@@ -49,7 +50,10 @@ public class SlibootApp {
     SpringApplication.run(SlibootApp.class, args);\r
   }\r
 \r
+\r
+\r
   @Bean\r
+  @ConditionalOnProperty("cadi.properties.path")\r
        @Order(1)\r
        public FilterRegistrationBean<CadiFilter> cadiFilter() {\r
                CadiFilter filter = new CadiFilter();\r