X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=engine-d%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fholmes%2Fengine%2FEngineDActiveApp.java;h=f5d6d8afc192296c3c27b76ce9974f0b0d02da24;hb=c4bd70c1f74cd04c441f76de4359e166a089660a;hp=67ea418a4644a48aba3c8ba29b9292abf309d15f;hpb=f37f55b899a47b78b78fc7814b161a50cb2b6cd6;p=holmes%2Fengine-management.git

diff --git a/engine-d/src/main/java/org/onap/holmes/engine/EngineDActiveApp.java b/engine-d/src/main/java/org/onap/holmes/engine/EngineDActiveApp.java
index 67ea418..f5d6d8a 100644
--- a/engine-d/src/main/java/org/onap/holmes/engine/EngineDActiveApp.java
+++ b/engine-d/src/main/java/org/onap/holmes/engine/EngineDActiveApp.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017-2018 ZTE Corporation.
+ * Copyright 2017-2022 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.
@@ -15,75 +15,36 @@
  */
 package org.onap.holmes.engine;
 
-import io.dropwizard.setup.Environment;
+import lombok.extern.slf4j.Slf4j;
+import org.onap.holmes.common.ConfigFileScanner;
+import org.onap.holmes.engine.dcae.ConfigFileScanningTask;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.web.servlet.ServletComponentScan;
+import org.springframework.context.annotation.ComponentScan;
 
-import java.util.EnumSet;
-import java.util.HashSet;
-import java.util.Set;
 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;
-import org.onap.holmes.common.exception.CorrelationException;
-import org.onap.holmes.common.utils.MSBRegisterUtil;
-import org.onap.holmes.common.utils.transactionid.TransactionIdFilter;
-import org.onap.holmes.engine.dcae.DcaeConfigurationPolling;
-import org.onap.holmes.engine.resources.EngineResources;
-import org.onap.msb.sdk.discovery.entity.MicroServiceInfo;
-import org.onap.msb.sdk.discovery.entity.Node;
 
 @Slf4j
-public class EngineDActiveApp extends IOCApplication<EngineDAppConfig> {
-
-    public static void main(String[] args) throws Exception {
-        new EngineDActiveApp().run(args);
+@SpringBootApplication
+@ServletComponentScan
+@ComponentScan(basePackages = {"org.onap.holmes"})
+public class EngineDActiveApp implements ApplicationRunner {
+    public static void main(String[] args) {
+        SpringApplication.run(EngineDActiveApp.class, args);
     }
 
     @Override
-    public void run(EngineDAppConfig configuration, Environment environment) throws Exception {
-        super.run(configuration, environment);
-
-        environment.jersey().register(new EngineResources());
-        try {
-            new MSBRegisterUtil().register2Msb(createMicroServiceInfo());
-        } catch (CorrelationException e) {
-            log.warn(e.getMessage(), e);
-        }
-
-        if (!"1".equals(System.getenv("TESTING"))) {
-            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, "/*");
-    }
+    public void run(ApplicationArguments args) {
+        ScheduledExecutorService service = Executors.newSingleThreadScheduledExecutor();
+        service.scheduleAtFixedRate(
+                new ConfigFileScanningTask(new ConfigFileScanner()), 60L,
+                ConfigFileScanningTask.POLLING_PERIOD, TimeUnit.SECONDS);
 
-    private MicroServiceInfo createMicroServiceInfo() {
-        String[] serviceAddrInfo = MicroServiceConfig.getMicroServiceIpAndPort();
-        MicroServiceInfo msinfo = new MicroServiceInfo();
-        msinfo.setServiceName("holmes-engine-mgmt");
-        msinfo.setVersion("v1");
-        msinfo.setUrl("/api/holmes-engine-mgmt/v1");
-        msinfo.setProtocol("REST");
-        msinfo.setVisualRange("0|1");
-        msinfo.setEnable_ssl(true);
-        Set<Node> nodes = new HashSet<>();
-        Node node = new Node();
-        node.setIp(serviceAddrInfo[0]);
-        node.setPort(serviceAddrInfo[1]);
-        node.setCheckType("HTTP");
-        node.setCheckUrl(String.format("https://%s:%s/api/holmes-engine-mgmt/v1/healthcheck", serviceAddrInfo[0], "9102"));
-        node.setCheckTimeOut("60s");
-        node.setCheckInterval("60s");
-        nodes.add(node);
-        msinfo.setNodes(nodes);
-        return msinfo;
+        Initializer.setReadyForMsbReg(true);
     }
 }