Apply builder pattern for topic cnsmer prdcr

Modify endpoints event bus related classes to use builder pattern
in particular apply bus topic params object instead of
using parameters as it is. Rework based on commnts

Issue-ID: POLICY-1017
Change-Id: I572a72fa525cf4f664eb70d0415be73116499bd2
Signed-off-by: krisjinka <kris.jinka@samsung.com>

1 files changed, 24 insertions, 17 deletions

diff --git a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/InlineUebTopicSink.java b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/InlineUebTopicSink.java
index fefe6493..218e44b4 100644
--- a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/InlineUebTopicSink.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/internal/InlineUebTopicSink.java
@@ -3,13 +3,14 @@
  * policy-endpoints
  * ================================================================================
  * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Modified Copyright (C) 2018 Samsung Electronics Co., Ltd.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -39,21 +40,21 @@ public class InlineUebTopicSink extends InlineBusTopicSink implements UebTopicSi
     private static Logger logger = LoggerFactory.getLogger(InlineUebTopicSink.class);
 
     /**
-     * Argument-based UEB Topic Writer instantiation
-     * 
-     * @param servers list of UEB servers available for publishing
-     * @param topic the topic to publish to
-     * @param apiKey the api key (optional)
-     * @param apiSecret the api secret (optional)
-     * @param partitionId the partition key (optional, autogenerated if not provided)
-     * @param useHttps does connection use HTTPS?
-     * @param allowSelfSignedCerts are self-signed certificates allow
-     * 
+     * Argument-based UEB Topic Writer instantiation. BusTopicParams contains below mentioned
+     * attributes
+     *
+     * servers              list of UEB servers available for publishing
+     * topic                the topic to publish to
+     * apiKey               the api key (optional)
+     * apiSecret            the api secret (optional)
+     * partitionId          the partition key (optional, autogenerated if not provided)
+     * useHttps             does connection use HTTPS?
+     * allowSelfSignedCerts are self-signed certificates allow
+     * @param busTopicParams contains attributes needed
      * @throws IllegalArgumentException if invalid arguments are detected
      */
-    public InlineUebTopicSink(List<String> servers, String topic, String apiKey, String apiSecret, String partitionId,
-            boolean useHttps, boolean allowSelfSignedCerts) {
-        super(servers, topic, apiKey, apiSecret, partitionId, useHttps, allowSelfSignedCerts);
+    public InlineUebTopicSink(BusTopicParams busTopicParams) {
+        super(busTopicParams);
     }
 
     /**
@@ -62,8 +63,14 @@ public class InlineUebTopicSink extends InlineBusTopicSink implements UebTopicSi
     @Override
     public void init() {
 
-        this.publisher = new BusPublisher.CambriaPublisherWrapper(this.servers, this.topic, this.apiKey, this.apiSecret,
-                    null, null, this.useHttps, this.allowSelfSignedCerts);
+        this.publisher = new BusPublisher.CambriaPublisherWrapper(BusTopicParams.builder()
+                .servers(this.servers)
+                .topic(this.topic)
+                .apiKey(this.apiKey)
+                .apiSecret(this.apiSecret)
+                .useHttps(this.useHttps)
+                .allowSelfSignedCerts(this.allowSelfSignedCerts)
+                .build());
         logger.info("{}: UEB SINK created", this);
     }