1 files changed, 14 insertions, 4 deletions

diff --git a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/DistributionClientImpl.java b/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/DistributionClientImpl.java
index d051458..1543256 100644
--- a/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/DistributionClientImpl.java
+++ b/sdc-distribution-client/src/main/java/org/openecomp/sdc/impl/DistributionClientImpl.java
@@ -54,9 +54,10 @@ import com.att.nsa.apiClient.credentials.ApiCredential;
 import com.att.nsa.apiClient.http.HttpException;
 import com.att.nsa.cambria.client.CambriaBatchingPublisher;
 import com.att.nsa.cambria.client.CambriaClient.CambriaApiException;
-import com.att.nsa.cambria.client.CambriaClientBuilders.PublisherBuilder;
+import com.att.nsa.cambria.client.CambriaClientBuilders.AbstractAuthenticatedManagerBuilder;
 import com.att.nsa.cambria.client.CambriaClientBuilders.ConsumerBuilder;
 import com.att.nsa.cambria.client.CambriaClientBuilders.IdentityManagerBuilder;
+import com.att.nsa.cambria.client.CambriaClientBuilders.PublisherBuilder;
 import com.att.nsa.cambria.client.CambriaConsumer;
 import com.att.nsa.cambria.client.CambriaIdentityManager;
 import com.att.nsa.cambria.client.CambriaPublisher.message;
@@ -146,7 +147,7 @@ public class DistributionClientImpl implements IDistributionClient {
 		}
 		if (errorWrapper.isEmpty()) {
 			try {
-				cambriaConsumer = new ConsumerBuilder().authenticatedBy(credential.getApiKey(), credential.getApiSecret()).knownAs(configuration.getConsumerGroup(), configuration.getConsumerID()).onTopic(notificationTopic).usingHttps().usingHosts(brokerServers)
+				cambriaConsumer = new ConsumerBuilder().authenticatedBy(credential.getApiKey(), credential.getApiSecret()).knownAs(configuration.getConsumerGroup(), configuration.getConsumerID()).onTopic(notificationTopic).usingHttps(configuration.isUseHttpsWithDmaap()).usingHosts(brokerServers)
 						.withSocketTimeout(configuration.getPollingTimeout() * 1000).build();
 			} catch (MalformedURLException | GeneralSecurityException e) {
 				handleCambriaInitFailure(errorWrapper, e);
@@ -393,7 +394,7 @@ public class DistributionClientImpl implements IDistributionClient {
 	private Either<CambriaBatchingPublisher, IDistributionClientResult> getCambriaPublisher() {
 		CambriaBatchingPublisher cambriaPublisher = null;
 			try {
-				cambriaPublisher = new PublisherBuilder().onTopic(statusTopic).usingHttps().usingHosts(brokerServers).build();
+				cambriaPublisher = new PublisherBuilder().onTopic(statusTopic).usingHttps(configuration.isUseHttpsWithDmaap()).usingHosts(brokerServers).build();
 				cambriaPublisher.setApiCredentials(credential.getApiKey(), credential.getApiSecret());
 			} catch (MalformedURLException | GeneralSecurityException e) {
 				Wrapper<IDistributionClientResult> errorWrapper = new Wrapper<>();
@@ -477,6 +478,11 @@ public class DistributionClientImpl implements IDistributionClient {
 			if (conf.getConsumerGroup() == null) {
 				generateConsumerGroup();
 			}
+			
+			//Default use HTTPS with DMAAP
+			if (conf.isUseHttpsWithDmaap() == null){
+				configuration.setUseHttpsWithDmaap(true);
+			}
 		}
 
 		if (result != DistributionActionResultEnum.SUCCESS) {
@@ -582,7 +588,11 @@ public class DistributionClientImpl implements IDistributionClient {
 	private synchronized void initCambriaClient(Wrapper<IDistributionClientResult> errorWrapper) {
 		if (cambriaIdentityManager == null) {
 			try {
-				cambriaIdentityManager = new IdentityManagerBuilder().usingHttps().usingHosts(brokerServers).build();
+				AbstractAuthenticatedManagerBuilder<CambriaIdentityManager> managerBuilder = new IdentityManagerBuilder().usingHosts(brokerServers);
+				if (configuration.isUseHttpsWithDmaap()){
+					managerBuilder = managerBuilder.usingHttps();
+				}
+				cambriaIdentityManager = managerBuilder.build();
 			} catch (MalformedURLException | GeneralSecurityException e) {
 				handleCambriaInitFailure(errorWrapper, e);
 			}