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;
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;
}
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 {
// 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 {
// 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();
+ }
+ }
}