1 files changed, 102 insertions, 97 deletions
diff --git a/src/main/java/org/onap/dcaegen2/services/sonhms/utils/DmaapUtils.java b/src/main/java/org/onap/dcaegen2/services/sonhms/utils/DmaapUtils.java
index ad6c385..f5efd3b 100644
--- a/src/main/java/org/onap/dcaegen2/services/sonhms/utils/DmaapUtils.java
+++ b/src/main/java/org/onap/dcaegen2/services/sonhms/utils/DmaapUtils.java
@@ -21,11 +21,6 @@
 
 package org.onap.dcaegen2.services.sonhms.utils;
 
-import java.net.MalformedURLException;
-import java.security.GeneralSecurityException;
-
-import org.onap.dcaegen2.services.sonhms.Configuration;
-
 import com.att.nsa.cambria.client.CambriaBatchingPublisher;
 import com.att.nsa.cambria.client.CambriaClient;
 import com.att.nsa.cambria.client.CambriaClientBuilders;
@@ -35,99 +30,109 @@ import com.att.nsa.cambria.client.CambriaClientBuilders.TopicManagerBuilder;
 import com.att.nsa.cambria.client.CambriaConsumer;
 import com.att.nsa.cambria.client.CambriaTopicManager;
 
+import java.net.MalformedURLException;
+import java.security.GeneralSecurityException;
+
+import org.onap.dcaegen2.services.sonhms.Configuration;
+
 public class DmaapUtils {
 
-	public CambriaBatchingPublisher buildPublisher(Configuration config, String topic) {
-		try {
-			return builder(config, topic).build();
-		} catch (MalformedURLException | GeneralSecurityException e) {
-			// TODO Auto-generated catch block
-			return null;
-
-		}
-	}
-
-	public CambriaConsumer buildConsumer(Configuration config, String topic) {
-
-		try {
-			return builderConsumer(config, topic).build();
-		} catch (MalformedURLException | GeneralSecurityException e) {
-			// TODO Auto-generated catch block
-			return null;
-		}
-
-	}
-
-	private static PublisherBuilder builder(Configuration config, String topic) {
-		if (config.isSecured()) {
-			return authenticatedBuilder(config, topic);
-		} else {
-			return unAuthenticatedBuilder(config, topic);
-		}
-	}
-
-	private static PublisherBuilder authenticatedBuilder(Configuration config, String topic) {
-		return unAuthenticatedBuilder(config, topic).usingHttps().authenticatedByHttp(config.getAafUsername(),
-				config.getAafPassword());
-	}
-
-	private static PublisherBuilder unAuthenticatedBuilder(Configuration config, String topic) {
-		return new CambriaClientBuilders.PublisherBuilder().usingHosts(config.getDmaapServers()).onTopic(topic)
-				.logSendFailuresAfter(5);
-	}
-
-	private static ConsumerBuilder builderConsumer(Configuration config, String topic) {
-		if (config.isSecured()) {
-			return authenticatedConsumerBuilder(config, topic);
-		} else {
-			return unAuthenticatedConsumerBuilder(config, topic);
-		}
-	}
-
-	private static ConsumerBuilder unAuthenticatedConsumerBuilder(Configuration config, String topic) {
-		// TODO Auto-generated method stub
-		return new CambriaClientBuilders.ConsumerBuilder().usingHosts(config.getDmaapServers()).onTopic(topic)
-				.knownAs(config.getCg(), config.getCid()).withSocketTimeout(config.getPollingTimeout() * 1000);
-	}
-
-	private static ConsumerBuilder authenticatedConsumerBuilder(Configuration config, String topic) {
-		return unAuthenticatedConsumerBuilder(config, topic).usingHttps().authenticatedByHttp(config.getAafUsername(),
-				config.getAafPassword());
-	}
-
-	public CambriaTopicManager cambriaCLientBuilder(Configuration configuration) {
-		if(configuration.isSecured()) {
-			return authenticatedCambriaCLientBuilder(configuration);
-		}
-		else
-		{
-			return unAuthenticatedCambriaCLientBuilder(configuration);
-					
-		}
-	}
-	
-	private static CambriaTopicManager authenticatedCambriaCLientBuilder(Configuration config) {
-		try {
-			return buildCambriaClient(new TopicManagerBuilder().usingHosts(config.getDmaapServers())
-					.authenticatedByHttp(config.getAafUsername(), config.getAafPassword()));
-		} catch (MalformedURLException | GeneralSecurityException e) {
-			return null;
-		}
-	}
-
-	private static CambriaTopicManager unAuthenticatedCambriaCLientBuilder(Configuration config) {
-		try {
-			return buildCambriaClient(new TopicManagerBuilder().usingHosts(config.getDmaapServers()));
-		} catch (MalformedURLException | GeneralSecurityException e) {
-			return null;
-
-		}
-	}
-	@SuppressWarnings("unchecked")
-	private static <T extends CambriaClient> T buildCambriaClient(
-			CambriaClientBuilders.AbstractAuthenticatedManagerBuilder<? extends CambriaClient> client)
-			throws MalformedURLException, GeneralSecurityException {
-		return (T) client.build();
-	}
+    /**
+     * Build publisher.
+     */
+    public CambriaBatchingPublisher buildPublisher(Configuration config, String topic) {
+        try {
+            return builder(config, topic).build();
+        } catch (MalformedURLException | GeneralSecurityException e) {
+            return null;
+
+        }
+    }
+
+    /**
+     * Build consumer.
+     */
+    public CambriaConsumer buildConsumer(Configuration config, String topic) {
+
+        try {
+            return builderConsumer(config, topic).build();
+        } catch (MalformedURLException | GeneralSecurityException e) {
+            return null;
+        }
+
+    }
+
+    private static PublisherBuilder builder(Configuration config, String topic) {
+        if (config.isSecured()) {
+            return authenticatedBuilder(config, topic);
+        } else {
+            return unAuthenticatedBuilder(config, topic);
+        }
+    }
+
+    private static PublisherBuilder authenticatedBuilder(Configuration config, String topic) {
+        return unAuthenticatedBuilder(config, topic).usingHttps().authenticatedByHttp(config.getAafUsername(),
+                config.getAafPassword());
+    }
+
+    private static PublisherBuilder unAuthenticatedBuilder(Configuration config, String topic) {
+        return new CambriaClientBuilders.PublisherBuilder().usingHosts(config.getDmaapServers()).onTopic(topic)
+                .logSendFailuresAfter(5);
+    }
+
+    private static ConsumerBuilder builderConsumer(Configuration config, String topic) {
+        if (config.isSecured()) {
+            return authenticatedConsumerBuilder(config, topic);
+        } else {
+            return unAuthenticatedConsumerBuilder(config, topic);
+        }
+    }
+
+    private static ConsumerBuilder unAuthenticatedConsumerBuilder(Configuration config, String topic) {
+        return new CambriaClientBuilders.ConsumerBuilder().usingHosts(config.getDmaapServers()).onTopic(topic)
+                .knownAs(config.getCg(), config.getCid()).withSocketTimeout(config.getPollingTimeout() * 1000);
+    }
+
+    private static ConsumerBuilder authenticatedConsumerBuilder(Configuration config, String topic) {
+        return unAuthenticatedConsumerBuilder(config, topic).usingHttps().authenticatedByHttp(config.getAafUsername(),
+                config.getAafPassword());
+    }
+
+    /**
+     * Build cambriaClient.
+     */
+    public CambriaTopicManager cambriaCLientBuilder(Configuration configuration) {
+        if (configuration.isSecured()) {
+            return authenticatedCambriaCLientBuilder(configuration);
+        } else {
+            return unAuthenticatedCambriaCLientBuilder(configuration);
+
+        }
+    }
+
+    private static CambriaTopicManager authenticatedCambriaCLientBuilder(Configuration config) {
+        try {
+            return buildCambriaClient(new TopicManagerBuilder().usingHosts(config.getDmaapServers())
+                    .authenticatedByHttp(config.getAafUsername(), config.getAafPassword()));
+        } catch (MalformedURLException | GeneralSecurityException e) {
+            return null;
+        }
+    }
+
+    private static CambriaTopicManager unAuthenticatedCambriaCLientBuilder(Configuration config) {
+        try {
+            return buildCambriaClient(new TopicManagerBuilder().usingHosts(config.getDmaapServers()));
+        } catch (MalformedURLException | GeneralSecurityException e) {
+            return null;
+
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    private static <T extends CambriaClient> T buildCambriaClient(
+            CambriaClientBuilders.AbstractAuthenticatedManagerBuilder<? extends CambriaClient> client)
+            throws MalformedURLException, GeneralSecurityException {
+        return (T) client.build();
+    }
 
 }