X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fmodelloader%2Fconfig%2FDistributionClientStartupConfig.java;h=cd9d919fa49f72c6c839e9b4c4c8efa65057b972;hb=HEAD;hp=84c79f2d8e24edd65a589ac406336bb42eec082b;hpb=f9999359c898143d0fb9a4a62063cbc51a40e25e;p=aai%2Fmodel-loader.git

diff --git a/src/main/java/org/onap/aai/modelloader/config/DistributionClientStartupConfig.java b/src/main/java/org/onap/aai/modelloader/config/DistributionClientStartupConfig.java
index 84c79f2..937c62d 100644
--- a/src/main/java/org/onap/aai/modelloader/config/DistributionClientStartupConfig.java
+++ b/src/main/java/org/onap/aai/modelloader/config/DistributionClientStartupConfig.java
@@ -23,6 +23,8 @@ import java.util.Date;
 import java.util.Timer;
 import java.util.TimerTask;
 
+import javax.annotation.PreDestroy;
+
 import org.onap.aai.cl.api.Logger;
 import org.onap.aai.cl.eelf.LoggerFactory;
 import org.onap.aai.modelloader.notification.EventCallback;
@@ -33,22 +35,22 @@ import org.onap.sdc.api.results.IDistributionClientResult;
 import org.onap.sdc.utils.DistributionActionResultEnum;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.event.ApplicationReadyEvent;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.context.event.EventListener;
-import org.springframework.stereotype.Component;
 
-@Component
+@Configuration
 @ConditionalOnProperty(value = "ml.distribution.connection.enabled", havingValue = "true", matchIfMissing = true)
 public class DistributionClientStartupConfig {
 
     private static final Logger logger = LoggerFactory.getInstance().getLogger(DistributionClientStartupConfig.class);
 
-    private final IDistributionClient client;
+    private final IDistributionClient distributionClient;
     private final ModelLoaderConfig config;
     private final EventCallback eventCallback;
 
-    public DistributionClientStartupConfig(IDistributionClient client, ModelLoaderConfig config,
+    public DistributionClientStartupConfig(IDistributionClient distributionClient, ModelLoaderConfig config,
             EventCallback eventCallback) {
-        this.client = client;
+        this.distributionClient = distributionClient;
         this.config = config;
         this.eventCallback = eventCallback;
     }
@@ -57,12 +59,13 @@ public class DistributionClientStartupConfig {
     protected void initSdcClient() {
         // Initialize distribution client
         logger.debug(ModelLoaderMsgs.INITIALIZING, "Initializing distribution client...");
-        IDistributionClientResult initResult = client.init(config, eventCallback);
+        IDistributionClientResult initResult = null;
+        initResult = distributionClient.init(config, eventCallback);
 
         if (initResult.getDistributionActionResult() == DistributionActionResultEnum.SUCCESS) {
             // Start distribution client
             logger.debug(ModelLoaderMsgs.INITIALIZING, "Starting distribution client...");
-            IDistributionClientResult startResult = client.start();
+            IDistributionClientResult startResult = distributionClient.start();
             if (startResult.getDistributionActionResult() == DistributionActionResultEnum.SUCCESS) {
                 logger.info(ModelLoaderMsgs.INITIALIZING, "Connection to SDC established");
             } else {
@@ -71,7 +74,7 @@ public class DistributionClientStartupConfig {
 
                 // Kick off a timer to retry the SDC connection
                 Timer timer = new Timer();
-                TimerTask task = new SdcConnectionJob(client, config, eventCallback, timer);
+                TimerTask task = new SdcConnectionJob(distributionClient, config, eventCallback, timer);
                 timer.schedule(task, new Date(), 60000);
             }
         } else {
@@ -80,8 +83,16 @@ public class DistributionClientStartupConfig {
 
             // Kick off a timer to retry the SDC connection
             Timer timer = new Timer();
-            TimerTask task = new SdcConnectionJob(client, config, eventCallback, timer);
+            TimerTask task = new SdcConnectionJob(distributionClient, config, eventCallback, timer);
             timer.schedule(task, new Date(), 60000);
         }
     }
+
+    @PreDestroy
+    public void destroy() {
+        logger.info(ModelLoaderMsgs.STOPPING_CLIENT);
+        if (distributionClient != null) {
+            distributionClient.stop();
+        }
+    }
 }