Optimize PAP policy constructor with builder

Fix sonar issue about constructor using more than 7 params.
Use builder parameters object for setting the attributes of
std pap policy.Recommit1

Issue-ID: POLICY-1016
Change-Id: Id9631a42813960baa78df4ab0c0f6706244c3180
Signed-off-by: Krishnajinka <kris.jinka@samsung.com>

3 files changed, 240 insertions, 248 deletions

diff --git a/ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pap/StdPAPPolicy.java b/ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pap/StdPAPPolicy.java
index 435e3c347..74ded6d43 100644
--- a/ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pap/StdPAPPolicy.java
+++ b/ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pap/StdPAPPolicy.java
@@ -36,7 +36,7 @@ public class StdPAPPolicy implements OnapPAPPolicy, Serializable {
     private String policyDescription = null;
     private String onapName = null;
     private String configName = null;
-    private Map<String, String> dyanamicFieldConfigAttributes = new HashMap<>();
+    private Map<String, String> dynamicFieldConfigAttributes = new HashMap<>();
     private Map<String, String> treatments = new HashMap<>();
     private Map<String, String> dropDownMap = new HashMap<>();
     private Map<String, String> dynamicSettingsMap = new HashMap<>();
@@ -117,7 +117,7 @@ public class StdPAPPolicy implements OnapPAPPolicy, Serializable {
         this.onapName = stdPAPPolicyParams.getOnapName();
         this.providerComboBox = stdPAPPolicyParams.getProviderComboBox();
         this.configName = stdPAPPolicyParams.getConfigName();
-        this.dyanamicFieldConfigAttributes = stdPAPPolicyParams.getDyanamicFieldConfigAttributes();
+        this.dynamicFieldConfigAttributes = stdPAPPolicyParams.getDynamicFieldConfigAttributes();
         this.dynamicSettingsMap = stdPAPPolicyParams.getDynamicSettingsMap();
         this.configType = stdPAPPolicyParams.getConfigType();
         this.configBodyData = stdPAPPolicyParams.getConfigBodyData();
@@ -138,113 +138,19 @@ public class StdPAPPolicy implements OnapPAPPolicy, Serializable {
         this.actionPerformer = stdPAPPolicyParams.getActionPerformer();
         this.actionAttribute = stdPAPPolicyParams.getActionAttribute();
         this.treatments = stdPAPPolicyParams.getTreatments();
-    }
-
-    //convenience constructor
-    public StdPAPPolicy(String configPolicyType, String policyName, String description, String onapName,
-                        String configName, Map<String, String> attributes, String body, String policyID,
-                        String ruleID, String configType, Boolean editPolicy, String version, String domain,
-                        String riskLevel, String riskType, String guard, String ttlDate) {
-        this(configPolicyType, policyName, description, onapName, configName, attributes, body, policyID,
-                ruleID, configType, editPolicy, version, domain, 1, riskLevel, riskType, guard, ttlDate);
-    }
-
-    //Constructor for Updating Config Policies from Admin Console
-    public StdPAPPolicy(String configPolicyType, String policyName, String description, String onapName,
-                        String configName, Map<String, String> attributes, String body, String policyID,
-                        String ruleID, String configType, Boolean editPolicy, String version, String domain,
-                        int highestVersion, String riskLevel, String riskType, String guard, String ttlDate) {
-
-        this.configPolicyType = configPolicyType;
-        this.policyName = policyName;
-        this.policyDescription = description;
-        this.onapName = onapName;
-        this.configName = configName;
-        this.dyanamicFieldConfigAttributes = attributes;
-        this.configBodyData = body;
-        this.policyID = policyID;
-        this.ruleID = ruleID;
-        this.configType = configType;
-        this.editPolicy = editPolicy;
-        this.version = version;
-        this.domain = domain;
-        this.highestVersion = highestVersion;
-        this.riskLevel = riskLevel;
-        this.riskType = riskType;
-        this.guard = guard;
-        this.ttlDate = ttlDate;
-    }
-
-
-    //Constructor for Creating Config Firewall Policies
-    public StdPAPPolicy(String configPolicyType, String policyName, String description, String configName,
-                        Boolean editPolicy, String domain, String jsonBody, Integer highestVersion, String riskLevel,
-                        String riskType, String guard, String ttlDate) {
-
-        this.configPolicyType = configPolicyType;
-        this.policyName = policyName;
-        this.policyDescription = description;
-        this.configName = configName;
-        this.editPolicy = editPolicy;
-        this.domain = domain;
-        this.jsonBody = jsonBody;
-        this.highestVersion = highestVersion;
-        this.riskLevel = riskLevel;
-        this.riskType = riskType;
-        this.guard = guard;
-        this.ttlDate = ttlDate;
-
-    }
-
-    //Constructor for Creating Goc Policies
-    public StdPAPPolicy(String configPolicyType, String policyName, String description, String configName,
-                        Boolean editPolicy, String domain, String jsonBody, Integer highestVersion, String eCompName,
-                        String riskLevel, String riskType, String guard, String ttlDate) {
-
-        this.configPolicyType = configPolicyType;
-        this.policyName = policyName;
-        this.policyDescription = description;
-        this.configName = configName;
-        this.editPolicy = editPolicy;
-        this.domain = domain;
-        this.jsonBody = jsonBody;
-        this.highestVersion = highestVersion;
-        this.onapName = eCompName;
-        this.riskLevel = riskLevel;
-        this.riskType = riskType;
-        this.guard = guard;
-        this.ttlDate = ttlDate;
-    }
-
-    //Constructor for Creating BRMS Policies from the Admin Console
-    public StdPAPPolicy(String configPolicyType, String policyName, String description,
-                        String configName, Boolean editPolicy, String domain,
-                        Map<String, String> dyanamicFieldConfigAttributes, Integer highestVersion, String eCompName,
-                        String configBodyData, String riskLevel, String riskType, String guard, String ttlDate,
-                        String brmsController, List<String> brmsDependency) {
-
-        this.configPolicyType = configPolicyType;
-        this.policyName = policyName;
-        this.policyDescription = description;
-        this.configName = configName;
-        this.editPolicy = editPolicy;
-        this.domain = domain;
-        this.dyanamicFieldConfigAttributes = dyanamicFieldConfigAttributes;
-        this.highestVersion = highestVersion;
-        this.onapName = eCompName;
-        this.configBodyData = configBodyData;
-        this.riskLevel = riskLevel;
-        this.riskType = riskType;
-        this.guard = guard;
-        this.ttlDate = ttlDate;
-        this.brmsController = brmsController;
-        this.brmsDependency = brmsDependency;
+        this.policyID = stdPAPPolicyParams.getPolicyID();
+        this.ruleID = stdPAPPolicyParams.getRuleID();
+        this.version = stdPAPPolicyParams.getVersion();
+        this.jsonBody = stdPAPPolicyParams.getJsonBody();
+        this.brmsController = stdPAPPolicyParams.getBrmsController();
+        this.brmsDependency = stdPAPPolicyParams.getBrmsDependency();
+        this.drlRuleAndUIParams = stdPAPPolicyParams.getDrlRuleAndUIParams();
     }
 
     //Constructor for Creating BRMS Param Policies from the Admin Console
     public StdPAPPolicy(String configPolicyType, String policyName, String description,
                         String configName, Boolean editPolicy, String domain,
-                        Map<String, String> dyanamicFieldConfigAttributes, Integer highestVersion, String eCompName,
+                        Map<String, String> dynamicFieldConfigAttributes, Integer highestVersion, String eCompName,
                         String configBodyData, Map<String, String> drlRuleAndUIParams, String riskLevel,
                         String riskType, String guard, String ttlDate, String brmsController,
                         List<String> brmsDependency) {
@@ -255,7 +161,7 @@ public class StdPAPPolicy implements OnapPAPPolicy, Serializable {
         this.configName = configName;
         this.editPolicy = editPolicy;
         this.domain = domain;
-        this.dyanamicFieldConfigAttributes = dyanamicFieldConfigAttributes;
+        this.dynamicFieldConfigAttributes = dynamicFieldConfigAttributes;
         this.highestVersion = highestVersion;
         this.onapName = eCompName;
         this.configBodyData = configBodyData;
@@ -292,29 +198,6 @@ public class StdPAPPolicy implements OnapPAPPolicy, Serializable {
         this.ttlDate = ttlDate;
     }
 
-    //Constructor for Updating Config Firewall Policies from the Admin Console
-    public StdPAPPolicy(String configPolicyType, String policyName, String description, String configName,
-                        Boolean editPolicy, String domain, String policyID,
-                        String ruleID, String version, String jsonBody, Integer highestVersion, String riskLevel,
-                        String riskType, String guard, String ttlDate) {
-
-        this.configPolicyType = configPolicyType;
-        this.policyName = policyName;
-        this.policyDescription = description;
-        this.configName = configName;
-        this.editPolicy = editPolicy;
-        this.domain = domain;
-        this.policyID = policyID;
-        this.ruleID = ruleID;
-        this.version = version;
-        this.jsonBody = jsonBody;
-        this.highestVersion = highestVersion;
-        this.riskLevel = riskLevel;
-        this.riskType = riskType;
-        this.guard = guard;
-        this.ttlDate = ttlDate;
-    }
-
     //Constructor for Micro Service Creating/Updating Policies from the Admin Console
     public StdPAPPolicy(String configPolicyType, String policyName, String description, String onapName,
                         String configName, String serviceType, String uuid,
@@ -342,84 +225,6 @@ public class StdPAPPolicy implements OnapPAPPolicy, Serializable {
         this.ttlDate = ttlDate;
     }
 
-    //Constructor for Updating Goc Policies from the Admin Console
-    public StdPAPPolicy(String configPolicyType, String policyName, String description,
-                        String configName, Boolean editPolicy, String domain,
-                        String policyID, String ruleID, String version,
-                        String jsonBody, Integer highestVersion, String eCompName, String riskLevel, String riskType,
-                        String guard, String ttlDate) {
-
-        this.configPolicyType = configPolicyType;
-        this.policyName = policyName;
-        this.policyDescription = description;
-        this.configName = configName;
-        this.editPolicy = editPolicy;
-        this.domain = domain;
-        this.policyID = policyID;
-        this.ruleID = ruleID;
-        this.version = version;
-        this.jsonBody = jsonBody;
-        this.highestVersion = highestVersion;
-        this.onapName = eCompName;
-        this.riskLevel = riskLevel;
-        this.riskType = riskType;
-        this.guard = guard;
-        this.ttlDate = ttlDate;
-    }
-
-    //Constructor for Updating Brms Policies from the Admin Console
-    public StdPAPPolicy(String configPolicyType, String policyName, String description,
-                        String configName, Boolean editPolicy, String domain,
-                        String policyID, String ruleID, String version,
-                        Map<String, String> dyanamicFieldConfigAttributes, Integer highestVersion, String eCompName,
-                        String configBodyData, String riskLevel, String riskType, String guard, String ttlDate
-    ) {
-        this.configPolicyType = configPolicyType;
-        this.policyName = policyName;
-        this.policyDescription = description;
-        this.configName = configName;
-        this.editPolicy = editPolicy;
-        this.domain = domain;
-        this.policyID = policyID;
-        this.ruleID = ruleID;
-        this.version = version;
-        this.dyanamicFieldConfigAttributes = dyanamicFieldConfigAttributes;
-        this.highestVersion = highestVersion;
-        this.onapName = eCompName;
-        this.configBodyData = configBodyData;
-        this.riskLevel = riskLevel;
-        this.riskType = riskType;
-        this.guard = guard;
-        this.ttlDate = ttlDate;
-    }
-
-    //Constructor for Updating Brms Param Policies from the Admin Console
-    public StdPAPPolicy(String configPolicyType, String policyName, String description,
-                        String configName, Boolean editPolicy, String domain,
-                        String policyID, String ruleID, String version,
-                        Map<String, String> dyanamicFieldConfigAttributes, Integer highestVersion, String eCompName,
-                        Map<String, String> drlRuleAndUIParams, String riskLevel, String riskType, String guard,
-                        String ttlDate
-    ) {
-        this.configPolicyType = configPolicyType;
-        this.policyName = policyName;
-        this.policyDescription = description;
-        this.configName = configName;
-        this.editPolicy = editPolicy;
-        this.domain = domain;
-        this.policyID = policyID;
-        this.ruleID = ruleID;
-        this.version = version;
-        this.dyanamicFieldConfigAttributes = dyanamicFieldConfigAttributes;
-        this.highestVersion = highestVersion;
-        this.onapName = eCompName;
-        this.drlRuleAndUIParams = drlRuleAndUIParams;
-        this.riskLevel = riskLevel;
-        this.riskType = riskType;
-        this.guard = guard;
-        this.ttlDate = ttlDate;
-    }
-
     // Constructor for deleting policies from the API
     public StdPAPPolicy(String policyName, String deleteCondition) {
         this.policyName = policyName;
@@ -455,7 +260,7 @@ public class StdPAPPolicy implements OnapPAPPolicy, Serializable {
 
     @Override
     public Map<String, String> getDynamicFieldConfigAttributes() {
-        return dyanamicFieldConfigAttributes;
+        return dynamicFieldConfigAttributes;
     }
 
     @Override
@@ -666,8 +471,8 @@ public class StdPAPPolicy implements OnapPAPPolicy, Serializable {
     @Override
     public String toString() {
         return "StdPAPPolicy [policyName=" + policyName + ", policyDescription=" + policyDescription + ", onapName="
-                + onapName + ", configName=" + configName + ", dyanamicFieldConfigAttributes=" +
-                dyanamicFieldConfigAttributes + ", configBodyData=" + configBodyData
+                + onapName + ", configName=" + configName + ", dynamicFieldConfigAttributes=" +
+                dynamicFieldConfigAttributes + ", configBodyData=" + configBodyData
                 + ", policyID=" + policyID + ", ruleID=" + ruleID + ", configType=" + configType + ", editPolicy=" +
                 ", version=" + ", domain=" + domain
                 + ", configPolicyType=" + configPolicyType + ", jsonBody=" + jsonBody + ", highestVersion=" +
@@ -710,9 +515,9 @@ public class StdPAPPolicy implements OnapPAPPolicy, Serializable {
         this.configName = configName;
     }
 
-    public void setDyanamicFieldConfigAttributes(
-            Map<String, String> dyanamicFieldConfigAttributes) {
-        this.dyanamicFieldConfigAttributes = dyanamicFieldConfigAttributes;
+    public void setDynamicFieldConfigAttributes(
+            Map<String, String> dynamicFieldConfigAttributes) {
+        this.dynamicFieldConfigAttributes = dynamicFieldConfigAttributes;
     }
 
     public void setConfigBodyData(String configBodyData) {
diff --git a/ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pap/StdPAPPolicyParams.java b/ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pap/StdPAPPolicyParams.java
index 0e183e08a..7eb422b99 100644
--- a/ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pap/StdPAPPolicyParams.java
+++ b/ONAP-XACML/src/main/java/org/onap/policy/xacml/std/pap/StdPAPPolicyParams.java
@@ -32,7 +32,7 @@ public class StdPAPPolicyParams {
     private String description;
     private String onapName;
     private String configName;
-    private Map<String, String> dyanamicFieldConfigAttributes;
+    private Map<String, String> dynamicFieldConfigAttributes;
     private String configType;
     private String configBodyData;
     private Boolean editPolicy;
@@ -54,6 +54,13 @@ public class StdPAPPolicyParams {
     private List<String> dataTypeList;
     private Map<String, String> dropDownMap;
     private Map<String,String> treatments;
+    private String policyID;
+    private String ruleID;
+    private String version;
+    private String jsonBody;
+    private String brmsController;
+    private List<String> brmsDependency;
+    private Map<String,String> drlRuleAndUIParams;
 
     /**
      * Default constructor
@@ -90,8 +97,8 @@ public class StdPAPPolicyParams {
         return configName;
     }
 
-    public Map<String, String> getDyanamicFieldConfigAttributes() {
-        return dyanamicFieldConfigAttributes;
+    public Map<String, String> getDynamicFieldConfigAttributes() {
+        return dynamicFieldConfigAttributes;
     }
 
     public String getConfigType() {
@@ -174,6 +181,34 @@ public class StdPAPPolicyParams {
         return treatments;
     }
 
+    public String getPolicyID() {
+        return policyID;
+    }
+
+    public String getRuleID() {
+        return ruleID;
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    public String getJsonBody() {
+        return jsonBody;
+    }
+
+    public String getBrmsController() {
+        return brmsController;
+    }
+
+    public List<String> getBrmsDependency() {
+        return brmsDependency;
+    }
+
+    public Map<String,String> getDrlRuleAndUIParams() {
+        return drlRuleAndUIParams;
+    }
+
     /**
      * Builder class for the Policy parameters
      */
@@ -210,8 +245,8 @@ public class StdPAPPolicyParams {
             return this;
         }
 
-        public StdPAPPolicyParamsBuilder dyanamicFieldConfigAttributes(Map<String, String> attributes) {
-            m.dyanamicFieldConfigAttributes = attributes;
+        public StdPAPPolicyParamsBuilder dynamicFieldConfigAttributes(Map<String, String> attributes) {
+            m.dynamicFieldConfigAttributes = attributes;
             return this;
         }
 
@@ -319,5 +354,40 @@ public class StdPAPPolicyParams {
             m.treatments = treatments;
             return this;
         }
+
+        public StdPAPPolicyParamsBuilder policyID(String policyID) {
+            m.policyID = policyID;
+            return this;
+        }
+
+        public StdPAPPolicyParamsBuilder ruleID(String ruleID) {
+            m.ruleID = ruleID;
+            return this;
+        }
+
+        public StdPAPPolicyParamsBuilder version(String version) {
+            m.version = version;
+            return this;
+        }
+
+        public StdPAPPolicyParamsBuilder jsonBody(String jsonBody) {
+            m.jsonBody = jsonBody;
+            return this;
+        }
+
+        public StdPAPPolicyParamsBuilder brmsController(String controllerName) {
+            m.brmsController = controllerName;
+            return this;
+        }
+
+        public StdPAPPolicyParamsBuilder brmsDependency(List<String> dependencyNames) {
+            m.brmsDependency = dependencyNames;
+            return this;
+        }
+
+        public StdPAPPolicyParamsBuilder drlRuleAndUIParams(Map<String,String> drlRuleAndUIParams) {
+            m.drlRuleAndUIParams = drlRuleAndUIParams;
+            return this;
+        }
     }
 }
diff --git a/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pap/StdPAPPolicyTest.java b/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pap/StdPAPPolicyTest.java
index 4a9370c41..2de4a0456 100644
--- a/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pap/StdPAPPolicyTest.java
+++ b/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pap/StdPAPPolicyTest.java
@@ -3,6 +3,7 @@
  * ONAP-XACML
  * ================================================================================
  * Copyright (C) 2017 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.
@@ -586,7 +587,7 @@ public class StdPAPPolicyTest {
                         .description("description")
                         .onapName("onapName")
                         .configName("configName")
-                        .dyanamicFieldConfigAttributes(attributes)
+                        .dynamicFieldConfigAttributes(attributes)
                         .configType("configType")
                         .configBodyData("body")
                         .editPolicy(true)
@@ -625,7 +626,7 @@ public class StdPAPPolicyTest {
         List<String> dynamicRuleAlgorithmField2 = new ArrayList<>();
         dynamicRuleAlgorithmField2.add("dynamicRuleAlgorithmField2");
         StdPAPPolicy stdPAPPolicy = new StdPAPPolicy(StdPAPPolicyParams.builder().policyName("policyName").description("description")
-                .dyanamicFieldConfigAttributes(attributes)
+                .dynamicFieldConfigAttributes(attributes)
                 .dynamicRuleAlgorithmLabels(dynamicRuleAlgorithmLabels)
                 .dynamicRuleAlgorithmCombo(dynamicRuleAlgorithmCombo)
                 .dynamicRuleAlgorithmField1(dynamicRuleAlgorithmField1)
@@ -677,7 +678,7 @@ public class StdPAPPolicyTest {
                 .description("description")
                 .onapName("onapName")
                 .providerComboBox("providerComboBox")
-                .dyanamicFieldConfigAttributes(attributes)
+                .dynamicFieldConfigAttributes(attributes)
                 .dynamicSettingsMap(settings)
                 .treatments(treatments)
                 .dynamicRuleAlgorithmLabels(dynamicRuleAlgorithmLabels)
@@ -715,10 +716,26 @@ public class StdPAPPolicyTest {
             throws URISyntaxException {
         Map<String, String> attributes = new HashMap<>();
         attributes.put("aKey", "aValue");
-        StdPAPPolicy stdPAPPolicy = new StdPAPPolicy("configTypePolicy", "policyName", "description", "onapName",
-                "configName", attributes,
-                "body", "policyId", "ruleId", "configType", true, "version", "domain", 1, "riskLevel", "riskType",
-                "guard", "ttlDate");
+        StdPAPPolicy stdPAPPolicy = new StdPAPPolicy(StdPAPPolicyParams.builder()
+                .configPolicyType("configTypePolicy")
+                .policyName("policyName")
+                .description("description")
+                .onapName("onapName")
+                .configName("configName")
+                .dynamicFieldConfigAttributes(attributes)
+                .configBodyData("body")
+                .policyID("policyId")
+                .ruleID("ruleId")
+                .configType("configType")
+                .editPolicy(true)
+                .version("version")
+                .domain("domain")
+                .highestVersion(1)
+                .riskLevel("riskLevel")
+                .riskType("riskType")
+                .guard("guard")
+                .ttlDate("ttlDate")
+                .build());
         assertEquals("configTypePolicy", stdPAPPolicy.getConfigPolicyType());
         assertEquals("policyName", stdPAPPolicy.getPolicyName());
         assertEquals("description", stdPAPPolicy.getPolicyDescription());
@@ -742,9 +759,20 @@ public class StdPAPPolicyTest {
     @Test
     public void testConstructorStringStringStringStringBooleanStringStringIntegerStringStringStringString()
             throws URISyntaxException {
-        StdPAPPolicy stdPAPPolicy = new StdPAPPolicy("configTypePolicy", "policyName", "description", "configName",
-                true,
-                "domain", "jasonBody", 1, "riskLevel", "riskType", "guard", "ttlDate");
+        StdPAPPolicy stdPAPPolicy = new StdPAPPolicy(StdPAPPolicyParams.builder()
+                .configPolicyType("configTypePolicy")
+                .policyName("policyName")
+                .description("description")
+                .configName("configName")
+                .editPolicy(true)
+                .domain("domain")
+                .jsonBody("jasonBody")
+                .highestVersion(1)
+                .riskLevel("riskLevel")
+                .riskType("riskType")
+                .guard("guard")
+                .ttlDate("ttlDate")
+                .build());
         assertEquals("configTypePolicy", stdPAPPolicy.getConfigPolicyType());
         assertEquals("policyName", stdPAPPolicy.getPolicyName());
         assertEquals("description", stdPAPPolicy.getPolicyDescription());
@@ -762,9 +790,21 @@ public class StdPAPPolicyTest {
     @Test
     public void testConstructorStringStringStringStringBooleanStringStringIntegerStringStringStringStringString()
             throws URISyntaxException {
-        StdPAPPolicy stdPAPPolicy = new StdPAPPolicy("configTypePolicy", "policyName", "description", "configName",
-                true,
-                "domain", "jasonBody", 1, "eCompName", "riskLevel", "riskType", "guard", "ttlDate");
+        StdPAPPolicy stdPAPPolicy = new StdPAPPolicy(StdPAPPolicyParams.builder()
+                .configPolicyType("configTypePolicy")
+                .policyName("policyName")
+                .description("description")
+                .configName("configName")
+                .editPolicy(true)
+                .domain("domain")
+                .jsonBody("jasonBody")
+                .highestVersion(1)
+                .onapName("eCompName")
+                .riskLevel("riskLevel")
+                .riskType("riskType")
+                .guard("guard")
+                .ttlDate("ttlDate")
+                .build());
         assertEquals("configTypePolicy", stdPAPPolicy.getConfigPolicyType());
         assertEquals("policyName", stdPAPPolicy.getPolicyName());
         assertEquals("description", stdPAPPolicy.getPolicyDescription());
@@ -787,10 +827,24 @@ public class StdPAPPolicyTest {
         dyanamicFieldConfigAttributes.put("aKey", "aValue");
         ArrayList<String> brmsDependency = new ArrayList<>();
         brmsDependency.add("brmsDependency");
-        StdPAPPolicy stdPAPPolicy = new StdPAPPolicy("configTypePolicy", "policyName", "description", "configName",
-                true,
-                "domain", dyanamicFieldConfigAttributes, 1, "eCompName", "configBodyData", "riskLevel", "riskType",
-                "guard", "ttlDate", "brmsController", brmsDependency);
+        StdPAPPolicy stdPAPPolicy = new StdPAPPolicy(StdPAPPolicyParams.builder()
+                .configPolicyType("configTypePolicy")
+                .policyName("policyName")
+                .description("description")
+                .configName("configName")
+                .editPolicy(true)
+                .domain("domain")
+                .dynamicFieldConfigAttributes(dyanamicFieldConfigAttributes)
+                .highestVersion(1)
+                .onapName("eCompName")
+                .configBodyData("configBodyData")
+                .riskLevel("riskLevel")
+                .riskType("riskType")
+                .guard("guard")
+                .ttlDate("ttlDate")
+                .brmsController("brmsController")
+                .brmsDependency(brmsDependency)
+                .build());
         assertEquals("configTypePolicy", stdPAPPolicy.getConfigPolicyType());
         assertEquals("policyName", stdPAPPolicy.getPolicyName());
         assertEquals("description", stdPAPPolicy.getPolicyDescription());
@@ -867,9 +921,24 @@ public class StdPAPPolicyTest {
     @Test
     public void testConstructorStringStringStringStringBooleanStringStringStringStringStringIntegerStringStringStringString()
             throws URISyntaxException {
-        StdPAPPolicy stdPAPPolicy = new StdPAPPolicy("configTypePolicy", "policyName", "description", "configName",
-                true, "domain", "policyId", "ruleId",
-                "version", "jasonBody", 1, "riskLevel", "riskType", "guard", "ttlDate");
+        //test for Updating Config Firewall Policies from the Admin Console
+        StdPAPPolicy stdPAPPolicy = new StdPAPPolicy(StdPAPPolicyParams.builder()
+                .configPolicyType("configTypePolicy")
+                .policyName("policyName")
+                .description("description")
+                .configName("configName")
+                .editPolicy(true)
+                .domain("domain")
+                .policyID("policyId")
+                .ruleID("ruleId")
+                .version("version")
+                .jsonBody("jasonBody")
+                .highestVersion(1)
+                .riskLevel("riskLevel")
+                .riskType("riskType")
+                .guard("guard")
+                .ttlDate("ttlDate")
+                .build());
         assertEquals("configTypePolicy", stdPAPPolicy.getConfigPolicyType());
         assertEquals("policyName", stdPAPPolicy.getPolicyName());
         assertEquals("description", stdPAPPolicy.getPolicyDescription());
@@ -917,9 +986,25 @@ public class StdPAPPolicyTest {
     @Test
     public void testConstructorStringStringStringStringBooleanStringStringStringStringStringIntegerStringStringStringStringString()
             throws URISyntaxException {
-        StdPAPPolicy stdPAPPolicy = new StdPAPPolicy("configTypePolicy", "policyName", "description", "configName",
-                true, "domain", "policyId", "ruleId", "version",
-                "jasonBody", 1, "ecompName", "riskLevel", "riskType", "guard", "ttlDate");
+        //test for Updating Goc Policies from the Admin Console
+        StdPAPPolicy stdPAPPolicy = new StdPAPPolicy(StdPAPPolicyParams.builder()
+                .configPolicyType("configTypePolicy")
+                .policyName("policyName")
+                .description("description")
+                .configName("configName")
+                .editPolicy(true)
+                .domain("domain")
+                .policyID("policyId")
+                .ruleID("ruleId")
+                .version("version")
+                .jsonBody("jasonBody")
+                .highestVersion(1)
+                .onapName("ecompName")
+                .riskLevel("riskLevel")
+                .riskType("riskType")
+                .guard("guard")
+                .ttlDate("ttlDate")
+                .build());
         assertEquals("configTypePolicy", stdPAPPolicy.getConfigPolicyType());
         assertEquals("policyName", stdPAPPolicy.getPolicyName());
         assertEquals("description", stdPAPPolicy.getPolicyDescription());
@@ -941,12 +1026,28 @@ public class StdPAPPolicyTest {
     @Test
     public void testConstructorStringStringStringStringBooleanStringStringStringStringMapStringStringIntegerStringStringStringStringString()
             throws URISyntaxException {
+        //for Updating Brms Policies from the Admin Console
         Map<String, String> dyanamicFieldConfigAttributes = new HashMap<>();
         dyanamicFieldConfigAttributes.put("aKey", "aValue");
-        StdPAPPolicy stdPAPPolicy = new StdPAPPolicy("configTypePolicy", "policyName", "description", "configName",
-                true,
-                "domain", "policyId", "ruleId", "version", dyanamicFieldConfigAttributes, 1, "eCompName",
-                "configBodyData", "riskLevel", "riskType", "guard", "ttlDate");
+        StdPAPPolicy stdPAPPolicy = new StdPAPPolicy(StdPAPPolicyParams.builder()
+                .configPolicyType("configTypePolicy")
+                .policyName("policyName")
+                .description("description")
+                .configName("configName")
+                .editPolicy(true)
+                .domain("domain")
+                .policyID("policyId")
+                .ruleID("ruleId")
+                .version("version")
+                .dynamicFieldConfigAttributes(dyanamicFieldConfigAttributes)
+                .highestVersion(1)
+                .onapName("eCompName")
+                .configBodyData("configBodyData")
+                .riskLevel("riskLevel")
+                .riskType("riskType")
+                .guard("guard")
+                .ttlDate("ttlDate")
+                .build());
         assertEquals("configTypePolicy", stdPAPPolicy.getConfigPolicyType());
         assertEquals("policyName", stdPAPPolicy.getPolicyName());
         assertEquals("description", stdPAPPolicy.getPolicyDescription());
@@ -969,14 +1070,30 @@ public class StdPAPPolicyTest {
     @Test
     public void testConstructorStringStringStringStringBooleanStringStringStringStringMapStringStringIntegerStringMapStringStringStringStringStringString()
             throws URISyntaxException {
+        //for Updating Brms Param Policies from the Admin Console
         Map<String, String> dyanamicFieldConfigAttributes = new HashMap<>();
         dyanamicFieldConfigAttributes.put("aKey", "aValue");
         Map<String, String> drlRuleAndUIParams = new HashMap<>();
         drlRuleAndUIParams.put("aDrlRuleKey", "aDrlRuleValue");
-        StdPAPPolicy stdPAPPolicy = new StdPAPPolicy("configTypePolicy", "policyName", "description", "configName",
-                true,
-                "domain", "policyId", "ruleId", "version", dyanamicFieldConfigAttributes, 1, "eCompName",
-                drlRuleAndUIParams, "riskLevel", "riskType", "guard", "ttlDate");
+        StdPAPPolicy stdPAPPolicy = new StdPAPPolicy(StdPAPPolicyParams.builder()
+                .configPolicyType("configTypePolicy")
+                .policyName("policyName")
+                .description("description")
+                .configName("configName")
+                .editPolicy(true)
+                .domain("domain")
+                .policyID("policyId")
+                .ruleID("ruleId")
+                .version("version")
+                .dynamicFieldConfigAttributes(dyanamicFieldConfigAttributes)
+                .highestVersion(1)
+                .onapName("eCompName")
+                .drlRuleAndUIParams(drlRuleAndUIParams)
+                .riskLevel("riskLevel")
+                .riskType("riskType")
+                .guard("guard")
+                .ttlDate("ttlDate")
+                .build());
         assertEquals("configTypePolicy", stdPAPPolicy.getConfigPolicyType());
         assertEquals("policyName", stdPAPPolicy.getPolicyName());
         assertEquals("description", stdPAPPolicy.getPolicyDescription());