1 files changed, 20 insertions, 10 deletions
diff --git a/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/BusPublisher.java b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/BusPublisher.java
index 852c9c16..8e18bba8 100644
--- a/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/BusPublisher.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/drools/event/comm/bus/internal/BusPublisher.java
@@ -74,18 +74,23 @@ public interface BusPublisher {
 		public CambriaPublisherWrapper(List<String> servers, String topic,
 						               String apiKey,
 						               String apiSecret, boolean useHttps) {
+			this(servers, topic, apiKey, apiSecret, null, null, useHttps);
+		}
+
+		public CambriaPublisherWrapper(List<String> servers, String topic,
+						               String apiKey, String apiSecret,
+						               String username, String password,
+						               boolean useHttps) {
+
 			PublisherBuilder builder = new CambriaClientBuilders.PublisherBuilder();
-		
 
-			if (useHttps){
-				
-				builder.usingHosts(servers)
-			       .onTopic(topic)
-			       .usingHttps();
-			}
-			else{
-				builder.usingHosts(servers)
-			       .onTopic(topic);
+            builder.usingHosts(servers).onTopic(topic);
+            
+			// Set read timeout to 30 seconds (TBD: this should be configurable)
+			builder.withSocketTimeout(30000);
+
+			if (useHttps){				
+				builder.usingHttps();
 			}
 		
 			
@@ -94,6 +99,11 @@ public interface BusPublisher {
 				builder.authenticatedBy(apiKey, apiSecret);
 			}
 			
+			if (username != null && !username.isEmpty() &&
+				password != null && !password.isEmpty()) {
+				builder.authenticatedByHttp(username, password);
+			}
+			
 			try {
 				this.publisher = builder.build();
 			} catch (MalformedURLException | GeneralSecurityException e) {