1 files changed, 28 insertions, 26 deletions
diff --git a/certService/src/main/java/org/onap/aaf/certservice/cmpv2client/impl/CmpMessageBuilder.java b/certService/src/main/java/org/onap/aaf/certservice/cmpv2client/impl/CmpMessageBuilder.java
index 2ab9b2cf..1f370f93 100644
--- a/certService/src/main/java/org/onap/aaf/certservice/cmpv2client/impl/CmpMessageBuilder.java
+++ b/certService/src/main/java/org/onap/aaf/certservice/cmpv2client/impl/CmpMessageBuilder.java
@@ -26,30 +26,32 @@ import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
-/** Generic Builder Class for creating CMP Message. */
-public class CmpMessageBuilder<T> {
-
-  private final Supplier<T> instantiator;
-  private final List<Consumer<T>> instanceModifiers = new ArrayList<>();
-
-  public CmpMessageBuilder(Supplier<T> instantiator) {
-    this.instantiator = instantiator;
-  }
-
-  public static <T> CmpMessageBuilder<T> of(Supplier<T> instantiator) {
-    return new CmpMessageBuilder<>(instantiator);
-  }
-
-  public <U> CmpMessageBuilder<T> with(BiConsumer<T, U> consumer, U value) {
-    Consumer<T> c = instance -> consumer.accept(instance, value);
-    instanceModifiers.add(c);
-    return this;
-  }
-
-  public T build() {
-    T value = instantiator.get();
-    instanceModifiers.forEach(modifier -> modifier.accept(value));
-    instanceModifiers.clear();
-    return value;
-  }
+/**
+ * Generic Builder Class for creating CMP Message.
+ */
+public final class CmpMessageBuilder<T> {
+
+    private final Supplier<T> instantiator;
+    private final List<Consumer<T>> instanceModifiers = new ArrayList<>();
+
+    public CmpMessageBuilder(Supplier<T> instantiator) {
+        this.instantiator = instantiator;
+    }
+
+    public static <T> CmpMessageBuilder<T> of(Supplier<T> instantiator) {
+        return new CmpMessageBuilder<>(instantiator);
+    }
+
+    public <U> CmpMessageBuilder<T> with(BiConsumer<T, U> consumer, U value) {
+        Consumer<T> valueConsumer = instance -> consumer.accept(instance, value);
+        instanceModifiers.add(valueConsumer);
+        return this;
+    }
+
+    public T build() {
+        T value = instantiator.get();
+        instanceModifiers.forEach(modifier -> modifier.accept(value));
+        instanceModifiers.clear();
+        return value;
+    }
 }