Merging in bug fixes

[appc.git] / appc-adapters / appc-dmaap-adapter / appc-message-adapter-factory / src / main / java / org / openecomp / appc / adapter / factory / DmaapMessageAdapterFactoryImpl.java

diff --git a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/src/main/java/org/openecomp/appc/adapter/factory/DmaapMessageAdapterFactoryImpl.java b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/src/main/java/org/openecomp/appc/adapter/factory/DmaapMessageAdapterFactoryImpl.java
index ed27db9..d555f39 100644 (file)
--- a/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/src/main/java/org/openecomp/appc/adapter/factory/DmaapMessageAdapterFactoryImpl.java
+++ b/appc-adapters/appc-dmaap-adapter/appc-message-adapter-factory/src/main/java/org/openecomp/appc/adapter/factory/DmaapMessageAdapterFactoryImpl.java
@@ -30,21 +30,29 @@ import java.util.Set;
 import org.openecomp.appc.adapter.message.Consumer;
 import org.openecomp.appc.adapter.message.MessageAdapterFactory;
 import org.openecomp.appc.adapter.message.Producer;
+
 import org.openecomp.appc.adapter.messaging.dmaap.http.HttpDmaapConsumerImpl;
 import org.openecomp.appc.adapter.messaging.dmaap.http.HttpDmaapProducerImpl;
 
+import org.openecomp.appc.adapter.messaging.dmaap.impl.DmaapConsumerImpl;
+import org.openecomp.appc.adapter.messaging.dmaap.impl.DmaapProducerImpl;
+
 public class DmaapMessageAdapterFactoryImpl implements MessageAdapterFactory {
 
+       //Set to true if the HttpDmaap... should be used instead of the regular Dmaap...
+       private static final boolean HTTP = true;
+       
        public Producer createProducer(Collection<String> pools, String writeTopic, String apiKey, String apiSecret) {
-        return new HttpDmaapProducerImpl(pools, writeTopic);
+               return  HTTP ? new HttpDmaapProducerImpl(pools, writeTopic) : new DmaapProducerImpl(pools, writeTopic,apiKey, apiSecret);
        }
-       
+
        public Producer createProducer(Collection<String> pools, Set<String> writeTopics, String apiKey, String apiSecret) {
-               return new HttpDmaapProducerImpl(pools, writeTopics);
+               return HTTP ? new HttpDmaapProducerImpl(pools, writeTopics) : new DmaapProducerImpl(pools, writeTopics, apiKey, apiSecret);
        }
 
        public Consumer createConsumer(Collection<String> pool, String readTopic, 
-                                                     String clientName, String clientId, String filter_json, String apiKey, String apiSecret) {
-               return new HttpDmaapConsumerImpl(pool, readTopic, clientName, clientId, apiKey, apiSecret, filter_json);
+                       String clientName, String clientId, String filter_json, String apiKey, String apiSecret) {
+               return HTTP ? new HttpDmaapConsumerImpl(pool, readTopic, clientName, clientId, apiKey, apiSecret, filter_json) : 
+                       new DmaapConsumerImpl(pool, readTopic, clientName, clientId, apiKey, apiSecret, filter_json);
        }
 }