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, 70 insertions, 49 deletions

diff --git a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/DmaapTopicSinkFactory.java b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/DmaapTopicSinkFactory.java
index 26e8d413..08a1db8f 100644
--- a/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/DmaapTopicSinkFactory.java
+++ b/policy-endpoints/src/main/java/org/onap/policy/common/endpoints/event/comm/bus/DmaapTopicSinkFactory.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.
@@ -27,6 +28,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 
+import org.onap.policy.common.endpoints.event.comm.bus.internal.BusTopicParams;
 import org.onap.policy.common.endpoints.event.comm.bus.internal.InlineDmaapTopicSink;
 import org.onap.policy.common.endpoints.properties.PolicyEndPointProperties;
 import org.slf4j.Logger;
@@ -47,53 +49,50 @@ public interface DmaapTopicSinkFactory {
 
     /**
      * Instantiates a new DMAAP Topic Sink
-     * 
-     * @param servers list of servers
-     * @param topic topic name
-     * @param apiKey API Key
-     * @param apiSecret API Secret
-     * @param userName AAF user name
-     * @param password AAF password
-     * @param partitionKey Consumer Group
-     * @param environment DME2 environment
-     * @param aftEnvironment DME2 AFT environment
-     * @param partner DME2 Partner
-     * @param latitude DME2 latitude
-     * @param longitude DME2 longitude
+     *
+     * @param servers         list of servers
+     * @param topic           topic name
+     * @param apiKey          API Key
+     * @param apiSecret       API Secret
+     * @param userName        AAF user name
+     * @param password        AAF password
+     * @param partitionKey    Consumer Group
+     * @param environment     DME2 environment
+     * @param aftEnvironment  DME2 AFT environment
+     * @param partner         DME2 Partner
+     * @param latitude        DME2 latitude
+     * @param longitude       DME2 longitude
      * @param additionalProps additional properties to pass to DME2
-     * @param managed is this sink endpoint managed?
-     * 
+     * @param managed         is this sink endpoint managed?
      * @return an DMAAP Topic Sink
      * @throws IllegalArgumentException if invalid parameters are present
      */
     public DmaapTopicSink build(List<String> servers, String topic, String apiKey, String apiSecret, String userName,
-            String password, String partitionKey, String environment, String aftEnvironment, String partner,
-            String latitude, String longitude, Map<String, String> additionalProps, boolean managed, boolean useHttps,
-            boolean allowSelfSignedCerts);
+                                String password, String partitionKey, String environment, String aftEnvironment, String partner,
+                                String latitude, String longitude, Map<String, String> additionalProps, boolean managed, boolean useHttps,
+                                boolean allowSelfSignedCerts);
 
     /**
      * Instantiates a new DMAAP Topic Sink
-     * 
-     * @param servers list of servers
-     * @param topic topic name
-     * @param apiKey API Key
-     * @param apiSecret API Secret
-     * @param userName AAF user name
-     * @param password AAF password
+     *
+     * @param servers      list of servers
+     * @param topic        topic name
+     * @param apiKey       API Key
+     * @param apiSecret    API Secret
+     * @param userName     AAF user name
+     * @param password     AAF password
      * @param partitionKey Consumer Group
-     * @param managed is this sink endpoint managed?
-     * 
+     * @param managed      is this sink endpoint managed?
      * @return an DMAAP Topic Sink
      * @throws IllegalArgumentException if invalid parameters are present
      */
     public DmaapTopicSink build(List<String> servers, String topic, String apiKey, String apiSecret, String userName,
-            String password, String partitionKey, boolean managed, boolean useHttps, boolean allowSelfSignedCerts);
+                                String password, String partitionKey, boolean managed, boolean useHttps, boolean allowSelfSignedCerts);
 
     /**
      * Creates an DMAAP Topic Sink based on properties files
-     * 
+     *
      * @param properties Properties containing initialization values
-     * 
      * @return an DMAAP Topic Sink
      * @throws IllegalArgumentException if invalid parameters are present
      */
@@ -101,10 +100,9 @@ public interface DmaapTopicSinkFactory {
 
     /**
      * Instantiates a new DMAAP Topic Sink
-     * 
+     *
      * @param servers list of servers
-     * @param topic topic name
-     * 
+     * @param topic   topic name
      * @return an DMAAP Topic Sink
      * @throws IllegalArgumentException if invalid parameters are present
      */
@@ -112,7 +110,7 @@ public interface DmaapTopicSinkFactory {
 
     /**
      * Destroys an DMAAP Topic Sink based on a topic
-     * 
+     *
      * @param topic topic name
      * @throws IllegalArgumentException if invalid parameters are present
      */
@@ -120,18 +118,17 @@ public interface DmaapTopicSinkFactory {
 
     /**
      * gets an DMAAP Topic Sink based on topic name
-     * 
+     *
      * @param topic the topic name
-     * 
      * @return an DMAAP Topic Sink with topic name
      * @throws IllegalArgumentException if an invalid topic is provided
-     * @throws IllegalStateException if the DMAAP Topic Reader is an incorrect state
+     * @throws IllegalStateException    if the DMAAP Topic Reader is an incorrect state
      */
     public DmaapTopicSink get(String topic);
 
     /**
      * Provides a snapshot of the DMAAP Topic Sinks
-     * 
+     *
      * @return a list of the DMAAP Topic Sinks
      */
     public List<DmaapTopicSink> inventory();
@@ -163,9 +160,9 @@ class IndexedDmaapTopicSinkFactory implements DmaapTopicSinkFactory {
 
     @Override
     public DmaapTopicSink build(List<String> servers, String topic, String apiKey, String apiSecret, String userName,
-            String password, String partitionKey, String environment, String aftEnvironment, String partner,
-            String latitude, String longitude, Map<String, String> additionalProps, boolean managed, boolean useHttps,
-            boolean allowSelfSignedCerts) {
+                                String password, String partitionKey, String environment, String aftEnvironment, String partner,
+                                String latitude, String longitude, Map<String, String> additionalProps, boolean managed, boolean useHttps,
+                                boolean allowSelfSignedCerts) {
 
         if (topic == null || topic.isEmpty()) {
             throw new IllegalArgumentException(MISSING_TOPIC);
@@ -176,9 +173,23 @@ class IndexedDmaapTopicSinkFactory implements DmaapTopicSinkFactory {
                 return dmaapTopicWriters.get(topic);
             }
 
-            DmaapTopicSink dmaapTopicSink = new InlineDmaapTopicSink(servers, topic, apiKey, apiSecret, userName,
-                    password, partitionKey, environment, aftEnvironment, partner, latitude, longitude, additionalProps,
-                    useHttps, allowSelfSignedCerts);
+            DmaapTopicSink dmaapTopicSink = new InlineDmaapTopicSink(BusTopicParams.builder()
+                    .servers(servers)
+                    .topic(topic)
+                    .apiKey(apiKey)
+                    .apiSecret(apiSecret)
+                    .userName(userName)
+                    .password(password)
+                    .partitionId(partitionKey)
+                    .environment(environment)
+                    .aftEnvironment(aftEnvironment)
+                    .partner(partner)
+                    .latitude(latitude)
+                    .longitude(longitude)
+                    .additionalProps(additionalProps)
+                    .useHttps(useHttps)
+                    .allowSelfSignedCerts(allowSelfSignedCerts)
+                    .build());
 
             if (managed) {
                 dmaapTopicWriters.put(topic, dmaapTopicSink);
@@ -189,7 +200,8 @@ class IndexedDmaapTopicSinkFactory implements DmaapTopicSinkFactory {
 
     @Override
     public DmaapTopicSink build(List<String> servers, String topic, String apiKey, String apiSecret, String userName,
-            String password, String partitionKey, boolean managed, boolean useHttps, boolean allowSelfSignedCerts) {
+                                String password, String partitionKey, boolean managed, boolean useHttps,
+                                boolean allowSelfSignedCerts) {
 
         if (topic == null || topic.isEmpty()) {
             throw new IllegalArgumentException(MISSING_TOPIC);
@@ -200,8 +212,17 @@ class IndexedDmaapTopicSinkFactory implements DmaapTopicSinkFactory {
                 return dmaapTopicWriters.get(topic);
             }
 
-            DmaapTopicSink dmaapTopicSink = new InlineDmaapTopicSink(servers, topic, apiKey, apiSecret, userName,
-                    password, partitionKey, useHttps, allowSelfSignedCerts);
+            DmaapTopicSink dmaapTopicSink = new InlineDmaapTopicSink(BusTopicParams.builder()
+                    .servers(servers)
+                    .topic(topic)
+                    .apiKey(apiKey)
+                    .apiSecret(apiSecret)
+                    .userName(userName)
+                    .password(password)
+                    .partitionId(partitionKey)
+                    .useHttps(useHttps)
+                    .allowSelfSignedCerts(allowSelfSignedCerts)
+                    .build());
 
             if (managed) {
                 dmaapTopicWriters.put(topic, dmaapTopicSink);