Remove the @Autowired annotation on the Babel Service Client and pass
this as a parameter so that Spring will inject the value.
This ensures that the EventCallback is not initialised with a null
value.
Issue-ID: AAI-1501
Change-Id: Ic1a66bf61afec4f707162acf323b83a8a48e8f28
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>
import java.util.ArrayList;
import java.util.List;
import java.util.ArrayList;
import java.util.List;
import org.onap.aai.cl.api.Logger;
import org.onap.aai.cl.eelf.LoggerFactory;
import org.onap.aai.cl.mdc.MdcContext;
import org.onap.aai.cl.api.Logger;
import org.onap.aai.cl.eelf.LoggerFactory;
import org.onap.aai.cl.mdc.MdcContext;
import org.onap.sdc.api.notification.IArtifactInfo;
import org.onap.sdc.api.notification.INotificationData;
import org.slf4j.MDC;
import org.onap.sdc.api.notification.IArtifactInfo;
import org.onap.sdc.api.notification.INotificationData;
import org.slf4j.MDC;
-import org.springframework.beans.factory.annotation.Autowired;
public class EventCallback implements INotificationCallback {
private static Logger logger = LoggerFactory.getInstance().getLogger(EventCallback.class.getName());
public class EventCallback implements INotificationCallback {
private static Logger logger = LoggerFactory.getInstance().getLogger(EventCallback.class.getName());
private NotificationPublisher notificationPublisher;
private IDistributionClient client;
private ModelLoaderConfig config;
private NotificationPublisher notificationPublisher;
private IDistributionClient client;
private ModelLoaderConfig config;
private BabelServiceClientFactory babelServiceClientFactory;
private BabelServiceClientFactory babelServiceClientFactory;
- public EventCallback(IDistributionClient client, ModelLoaderConfig config) {
+ public EventCallback(IDistributionClient client, ModelLoaderConfig config, BabelServiceClientFactory babelServiceClientFactory) {
this.client = client;
this.config = config;
this.client = client;
this.config = config;
+ this.babelServiceClientFactory = babelServiceClientFactory;
import java.io.IOException;
import java.nio.file.Files;
import java.io.IOException;
import java.nio.file.Files;
-import java.nio.file.Paths;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Properties;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Properties;
import java.util.Properties;
import java.util.Timer;
import java.util.TimerTask;
import java.util.Properties;
import java.util.Timer;
import java.util.TimerTask;
import javax.annotation.PostConstruct;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.annotation.PostConstruct;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import org.onap.aai.cl.api.Logger;
import org.onap.aai.cl.eelf.LoggerFactory;
import org.onap.aai.modelloader.config.ModelLoaderConfig;
import org.onap.aai.cl.api.Logger;
import org.onap.aai.cl.eelf.LoggerFactory;
import org.onap.aai.modelloader.config.ModelLoaderConfig;
// Initialize distribution client
logger.debug(ModelLoaderMsgs.INITIALIZING, "Initializing distribution client...");
client = DistributionClientFactory.createDistributionClient();
// Initialize distribution client
logger.debug(ModelLoaderMsgs.INITIALIZING, "Initializing distribution client...");
client = DistributionClientFactory.createDistributionClient();
- EventCallback callback = new EventCallback(client, config);
+ EventCallback callback = new EventCallback(client, config, babelClientFactory);
IDistributionClientResult initResult = client.init(config, callback);
IDistributionClientResult initResult = client.init(config, callback);
import java.io.IOException;
import java.util.List;
import java.util.Properties;
import java.io.IOException;
import java.util.List;
import java.util.Properties;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
mockDistributionClient = mock(IDistributionClient.class);
mockNotificationPublisher = mock(NotificationPublisher.class);
mockDistributionClient = mock(IDistributionClient.class);
mockNotificationPublisher = mock(NotificationPublisher.class);
- eventCallback = new EventCallback(mockDistributionClient, config);
+ eventCallback = new EventCallback(mockDistributionClient, config, null);
Whitebox.setInternalState(eventCallback, "artifactDeploymentManager", mockArtifactDeploymentManager);
Whitebox.setInternalState(eventCallback, "artifactDownloadManager", mockArtifactDownloadManager);
Whitebox.setInternalState(eventCallback, "artifactDeploymentManager", mockArtifactDeploymentManager);
Whitebox.setInternalState(eventCallback, "artifactDownloadManager", mockArtifactDownloadManager);