1 files changed, 11 insertions, 20 deletions
diff --git a/dcae-analytics-dmaap/src/main/java/org/onap/dcae/apod/analytics/dmaap/domain/config/DMaaPMRPublisherConfig.java b/dcae-analytics-dmaap/src/main/java/org/onap/dcae/apod/analytics/dmaap/domain/config/DMaaPMRPublisherConfig.java
index 8dfc289..e5e67e6 100644
--- a/dcae-analytics-dmaap/src/main/java/org/onap/dcae/apod/analytics/dmaap/domain/config/DMaaPMRPublisherConfig.java
+++ b/dcae-analytics-dmaap/src/main/java/org/onap/dcae/apod/analytics/dmaap/domain/config/DMaaPMRPublisherConfig.java
@@ -47,24 +47,16 @@ public class DMaaPMRPublisherConfig extends DMaaPMRBaseConfig {
     private int maxRecoveryQueueSize;
 
 
-    private DMaaPMRPublisherConfig(@Nonnull String hostName,
-                                   @Nonnull Integer portNumber,
-                                   @Nonnull String topicName,
-                                   @Nonnull String protocol,
-                                   String userName,
-                                   String userPassword,
-                                   @Nonnull String contentType,
-                                   int maxBatchSize,
-                                   int maxRecoveryQueueSize) {
-        this.hostName = hostName;
-        this.portNumber = portNumber;
-        this.topicName = topicName;
-        this.protocol = protocol;
-        this.userName = userName;
-        this.userPassword = userPassword;
-        this.contentType = contentType;
-        this.maxBatchSize = maxBatchSize;
-        this.maxRecoveryQueueSize = maxRecoveryQueueSize;
+    private DMaaPMRPublisherConfig(Builder builder) {
+        this.hostName = builder.hostName;
+        this.portNumber = builder.portNumber;
+        this.topicName = builder.topicName;
+        this.protocol = builder.protocol;
+        this.userName = builder.userName;
+        this.userPassword = builder.userPassword;
+        this.contentType = builder.contentType;
+        this.maxBatchSize = builder.maxBatchSize;
+        this.maxRecoveryQueueSize = builder.maxRecoveryQueueSize;
     }
 
 
@@ -189,8 +181,7 @@ public class DMaaPMRPublisherConfig extends DMaaPMRBaseConfig {
          * @return Builds and returns thread safe, immutable {@link DMaaPMRPublisherConfig} object
          */
         public DMaaPMRPublisherConfig build() {
-            return new DMaaPMRPublisherConfig(hostName, portNumber, topicName, protocol, userName, userPassword,
-                    contentType, maxBatchSize, maxRecoveryQueueSize);
+            return new DMaaPMRPublisherConfig(this);
         }
 
     }