Merge "Removed DCAE Related Log"

diff --combined engine-d/src/main/java/org/onap/holmes/engine/EngineDActiveApp.java
index 26b92a0,19a9153..7ac4642
--- 1/engine-d/src/main/java/org/onap/holmes/engine/EngineDActiveApp.java
--- 2/engine-d/src/main/java/org/onap/holmes/engine/EngineDActiveApp.java
+++ b/engine-d/src/main/java/org/onap/holmes/engine/EngineDActiveApp.java
@@@ -1,12 -1,12 +1,12 @@@
  /**
-  * Copyright 2017 ZTE Corporation.
-  *
+  * Copyright 2017-2018 ZTE Corporation.
+  * <p>
   * 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
-  *
+  * <p>
+  * http://www.apache.org/licenses/LICENSE-2.0
+  * <p>
   * 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.
@@@ -16,6 -16,7 +16,7 @@@
  package org.onap.holmes.engine;
  
  import io.dropwizard.setup.Environment;
+ 
  import java.util.EnumSet;
  import java.util.HashSet;
  import java.util.Set;
@@@ -23,6 -24,7 +24,7 @@@ import java.util.concurrent.Executors
  import java.util.concurrent.ScheduledExecutorService;
  import java.util.concurrent.TimeUnit;
  import javax.servlet.DispatcherType;
+ 
  import lombok.extern.slf4j.Slf4j;
  import org.onap.holmes.common.config.MicroServiceConfig;
  import org.onap.holmes.common.dropwizard.ioc.bundle.IOCApplication;
@@@ -41,7 -43,6 +43,7 @@@ public class EngineDActiveApp extends I
          new EngineDActiveApp().run(args);
      }
  
 +    @Override
      public void run(EngineDAppConfig configuration, Environment environment) throws Exception {
          super.run(configuration, environment);
  
@@@ -52,12 -53,15 +54,15 @@@
              log.warn(e.getMessage(), e);
          }
  
-         ScheduledExecutorService service = Executors.newSingleThreadScheduledExecutor();
-         service.scheduleAtFixedRate(
-                 new DcaeConfigurationPolling(MicroServiceConfig.getEnv(MicroServiceConfig.HOSTNAME)), 0,
-                 DcaeConfigurationPolling.POLLING_PERIOD, TimeUnit.MILLISECONDS);
-         environment.servlets().addFilter("logFilter",new TransactionIdFilter()).addMappingForUrlPatterns(EnumSet
-                 .allOf(DispatcherType.class),true,"/*");
+         if (!System.getenv("TESTING").equals("1")) {
+             ScheduledExecutorService service = Executors.newSingleThreadScheduledExecutor();
+             service.scheduleAtFixedRate(
+                     new DcaeConfigurationPolling(MicroServiceConfig.getEnv(MicroServiceConfig.HOSTNAME)), 0,
+                     DcaeConfigurationPolling.POLLING_PERIOD, TimeUnit.MILLISECONDS);
+         }
+ 
+         environment.servlets().addFilter("logFilter", new TransactionIdFilter()).addMappingForUrlPatterns(EnumSet
+                 .allOf(DispatcherType.class), true, "/*");
      }
  
      private MicroServiceInfo createMicroServiceInfo() {