Remove technical debt
[policy/engine.git] / POLICY-SDK-APP / src / main / java / org / onap / policy / controller / CreateClosedLoopFaultController.java
index 839a79f..d942939 100644 (file)
@@ -32,6 +32,7 @@ import java.util.Map;
 import org.onap.policy.common.logging.flexlogger.FlexLogger;
 import org.onap.policy.common.logging.flexlogger.Logger;
 import org.onap.policy.rest.adapter.ClosedLoopFaultBody;
+import org.onap.policy.rest.adapter.ClosedLoopFaultTrapDatas;
 import org.onap.policy.rest.adapter.ClosedLoopFaultTriggerUISignatures;
 import org.onap.policy.rest.adapter.ClosedLoopSignatures;
 import org.onap.policy.rest.adapter.PolicyRestAdapter;
@@ -62,25 +63,27 @@ import oasis.names.tc.xacml._3_0.core.schema.wd_17.TargetType;
 public class CreateClosedLoopFaultController extends RestrictedBaseController{
 
        private static final Logger policyLogger        = FlexLogger.getLogger(CreateClosedLoopFaultController.class);
-       
+
        protected PolicyRestAdapter policyAdapter = null;
-       
-       
+
+
        private static CommonClassDao commonclassdao;
-       
+
        @Autowired
        private CreateClosedLoopFaultController(CommonClassDao commonclassdao){
                CreateClosedLoopFaultController.commonclassdao = commonclassdao;
        }
-       
-       public CreateClosedLoopFaultController(){}
-       
+
+       public CreateClosedLoopFaultController(){
+               // Empty constructor
+       }
+
        public PolicyRestAdapter setDataToPolicyRestAdapter(PolicyRestAdapter policyData, JsonNode root){
                try{
                        ObjectMapper mapper = new ObjectMapper();
                        mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-                       TrapDatas trapDatas = mapper.readValue(root.get("trapData").toString(), TrapDatas.class);
-                       TrapDatas faultDatas = mapper.readValue(root.get("faultData").toString(), TrapDatas.class);
+                       ClosedLoopFaultTrapDatas trapDatas = mapper.readValue(root.get("trapData").toString(), ClosedLoopFaultTrapDatas.class);
+                       ClosedLoopFaultTrapDatas faultDatas = mapper.readValue(root.get("faultData").toString(), ClosedLoopFaultTrapDatas.class);
                        ClosedLoopGridJSONData policyJsonData = mapper.readValue(root.get("policyData").get("policy").toString(), ClosedLoopGridJSONData.class);
                        ClosedLoopFaultBody jsonBody = mapper.readValue(root.get("policyData").get("policy").get("jsonBodyData").toString(), ClosedLoopFaultBody.class);
 
@@ -93,21 +96,21 @@ public class CreateClosedLoopFaultController extends RestrictedBaseController{
                                faultSignatureDatas.add(faultDatas);
                        }
 
-                       String resultBody = "";
+                       StringBuilder resultBody = new StringBuilder();
                        if(!policyJsonData.getConnecttriggerSignatures().isEmpty()){
-                               resultBody = resultBody + "(";
+                               resultBody.append("(");
                                for(int i = policyJsonData.getConnecttriggerSignatures().size()-1; i>=0 ; i--){
                                        String connectBody = connectTriggerSignature(i, policyJsonData.getConnecttriggerSignatures(), trapSignatureDatas.get(0));
-                                       resultBody = resultBody  + connectBody;
+                                       resultBody.append(connectBody);
                                }
-                               resultBody = resultBody + ")";
+                               resultBody.append(resultBody + ")");
                        }else{
                                if(!trapSignatureDatas.isEmpty()){
-                                       resultBody = callTrap("nill", trapSignatureDatas.get(0));
+                                       resultBody.append(callTrap("nill", trapSignatureDatas.get(0)));
                                }
                        }
                        ClosedLoopSignatures triggerSignatures = new ClosedLoopSignatures();
-                       triggerSignatures.setSignatures(resultBody);
+                       triggerSignatures.setSignatures(resultBody.toString());
                        if(policyData.getClearTimeOut() != null){
                                triggerSignatures.setTimeWindow(Integer.parseInt(policyData.getClearTimeOut()));        
                                triggerSignatures.setTrapMaxAge(Integer.parseInt(policyData.getTrapMaxAge()));
@@ -124,21 +127,21 @@ public class CreateClosedLoopFaultController extends RestrictedBaseController{
                        }
 
                        jsonBody.setTriggerSignatures(triggerSignatures);
-                       String faultBody = "";
+                       StringBuilder faultBody = new StringBuilder();
                        if(!policyJsonData.getConnectVerificationSignatures().isEmpty()){
-                               faultBody = faultBody + "(";
+                               faultBody.append("(");
                                for(int i = policyJsonData.getConnectVerificationSignatures().size()-1; i>=0 ; i--){
                                        String connectBody = connectTriggerSignature(i, policyJsonData.getConnectVerificationSignatures(), faultSignatureDatas.get(0));
-                                       faultBody = faultBody  + connectBody;
+                                       faultBody.append(connectBody);
                                }
-                               faultBody = faultBody + ")";
+                               faultBody.append(")");
                        }else{
                                if(!faultSignatureDatas.isEmpty()){
-                                       faultBody = callTrap("nill", faultSignatureDatas.get(0));
+                                       faultBody.append(callTrap("nill", faultSignatureDatas.get(0)));
                                }
                        }
                        ClosedLoopSignatures faultSignatures = new ClosedLoopSignatures();
-                       faultSignatures.setSignatures(faultBody);
+                       faultSignatures.setSignatures(faultBody.toString());
                        if(policyData.getVerificationclearTimeOut() != null){
                                faultSignatures.setTimeWindow(Integer.parseInt(policyData.getVerificationclearTimeOut()));
                                ClosedLoopFaultTriggerUISignatures uifaultSignatures = new ClosedLoopFaultTriggerUISignatures();
@@ -162,35 +165,35 @@ public class CreateClosedLoopFaultController extends RestrictedBaseController{
                }
                return policyData;
        }
-       
+
 
        @SuppressWarnings("unchecked")
-       private String connectTriggerSignature(int index, ArrayList<Object> triggerSignatures, Object object) {
-               String resultBody = "";
+       private String connectTriggerSignature(int index, List<Object> triggerSignatures, Object object) {
+               StringBuilder resultBody = new StringBuilder();
                Map<String, String> connectTraps = (Map<String, String>) triggerSignatures.get(index);
                try{
                        String notBox = "";
                        if(connectTraps.keySet().contains("notBox")){
                                notBox = connectTraps.get("notBox");
                        }
-                       resultBody = resultBody + "(" + notBox;
+                       resultBody.append("(" + notBox);
                }catch(NullPointerException e){
                        policyLogger.info("General error" , e);
-                       resultBody = resultBody + "(";
+                       resultBody.append("(");
                }
                String connectTrap1 = connectTraps.get("connectTrap1");
                if(connectTrap1.startsWith("Trap") || connectTrap1.startsWith("Fault")){
                        String trapBody = callTrap(connectTrap1, object);
                        if(trapBody!=null){
-                               resultBody = resultBody + trapBody;
+                               resultBody.append(trapBody);
                        }
                }else if(connectTrap1.startsWith("C")){
                        for(int i=0; i<= triggerSignatures.size(); i++){
                                Map<String,String> triggerSignature = (Map<String, String>) triggerSignatures.get(i);
                                if(triggerSignature.get("id").equals(connectTrap1)){
-                                       resultBody = resultBody + "(";
+                                       resultBody.append("(");
                                        String connectBody = connectTriggerSignature(i, triggerSignatures, object);
-                                       resultBody = resultBody + connectBody + ")";
+                                       resultBody.append(connectBody + ")");
                                }else{
                                        i++;
                                }
@@ -198,13 +201,13 @@ public class CreateClosedLoopFaultController extends RestrictedBaseController{
                }
                try{
                        String trapCount1 = connectTraps.get("trapCount1");
-                       resultBody = resultBody + ", Time = " + trapCount1 + ")";
+                       resultBody.append(", Time = " + trapCount1 + ")");
                }catch(NullPointerException e){
                        policyLogger.info("General error" , e);
                }
                try{
                        String operatorBox = connectTraps.get("operatorBox");
-                       resultBody = resultBody + operatorBox +"(";
+                       resultBody.append(operatorBox +"(");
                }catch (NullPointerException e){
                        policyLogger.info("General error" , e);
                }
@@ -213,15 +216,15 @@ public class CreateClosedLoopFaultController extends RestrictedBaseController{
                        if(connectTrap2.startsWith("Trap") || connectTrap2.startsWith("Fault")){
                                String trapBody = callTrap(connectTrap2, object);
                                if(trapBody!=null){
-                                       resultBody = resultBody + trapBody;
+                                       resultBody.append(trapBody);
                                }
                        }else if(connectTrap2.startsWith("C")){
                                for(int i=0; i<= triggerSignatures.size(); i++){
                                        Map<String,String> triggerSignature = (Map<String, String>) triggerSignatures.get(i);
                                        if(triggerSignature.get("id").equals(connectTrap2)){
-                                               resultBody = resultBody + "(";
+                                               resultBody.append("(");
                                                String connectBody = connectTriggerSignature(i, triggerSignatures, object);
-                                               resultBody = resultBody + connectBody + ")";
+                                               resultBody.append(connectBody + ")");
                                        }else{
                                                i++;
                                        }
@@ -232,54 +235,54 @@ public class CreateClosedLoopFaultController extends RestrictedBaseController{
                }
                try{
                        String trapCount2 = connectTraps.get("trapCount2");
-                       resultBody = resultBody + ", Time = " + trapCount2 + ")";
+                       resultBody.append(", Time = " + trapCount2 + ")");
                }catch(NullPointerException e){
                        policyLogger.info("General error" , e);
                }
-               return resultBody;
+               return resultBody.toString();
        }
 
-       
+
        private String callTrap(String trap, Object object) {
                String signatureBody = "";
-               TrapDatas trapDatas = (TrapDatas) object;
-               ArrayList<Object> attributeList = new ArrayList<>();
+               ClosedLoopFaultTrapDatas trapDatas = (ClosedLoopFaultTrapDatas) object;
+               List<Object> attributeList = new ArrayList<>();
                // Read the Trap 
-               if(!trap.equals("nill")){
+               if(! "nill".equals(trap)){
                        try{
                                if(trap.startsWith("Trap")){
-                                       if(trap.equals("Trap1")){
-                                                attributeList = trapDatas.getTrap1();
-                                       }else if(trap.equals("Trap2")){
+                                       if("Trap1".equals(trap)){
+                                               attributeList = trapDatas.getTrap1();
+                                       }else if("Trap2".equals(trap)){
                                                attributeList = trapDatas.getTrap2();
-                                       }else if(trap.equals("Trap3")){
+                                       }else if("Trap3".equals(trap)){
                                                attributeList = trapDatas.getTrap3();
-                                       }else if(trap.equals("Trap4")){
+                                       }else if("Trap4".equals(trap)){
                                                attributeList = trapDatas.getTrap4();
-                                       }else if(trap.equals("Trap5")){
+                                       }else if("Trap5".equals(trap)){
                                                attributeList = trapDatas.getTrap5();
-                                       }else if(trap.equals("Trap6")){
+                                       }else if("Trap6".equals(trap)){
                                                attributeList = trapDatas.getTrap6();
                                        }
                                }else{
                                        if(trap.startsWith("Fault")){
-                                               if(trap.equals("Fault1")){
+                                               if("Fault1".equals(trap)){
                                                        attributeList = trapDatas.getTrap1();
-                                               }else if(trap.equals("Fault2")){
+                                               }else if("Fault2".equals(trap)){
                                                        attributeList = trapDatas.getTrap2();
-                                               }else if(trap.equals("Fault3")){
+                                               }else if("Fault3".equals(trap)){
                                                        attributeList = trapDatas.getTrap3();
-                                               }else if(trap.equals("Fault4")){
+                                               }else if("Fault4".equals(trap)){
                                                        attributeList = trapDatas.getTrap4();
-                                               }else if(trap.equals("Fault5")){
+                                               }else if("Fault5".equals(trap)){
                                                        attributeList = trapDatas.getTrap5();
-                                               }else if(trap.equals("Fault6")){
+                                               }else if("Fault6".equals(trap)){
                                                        attributeList = trapDatas.getTrap6();
                                                }       
                                        }
                                }
                        } catch(Exception e){
-                           policyLogger.warn("Error during callTrap" , e);
+                               policyLogger.warn("Error during callTrap" , e);
                                return "(" + trap + ")";
                        }
                }else{
@@ -292,9 +295,9 @@ public class CreateClosedLoopFaultController extends RestrictedBaseController{
                signatureBody = signatureBody + "(" + readAttributes(attributeList, attributeList.size()-1) + ")";
                return signatureBody;
        }
-       
+
        @SuppressWarnings("unchecked")
-       private String readAttributes(ArrayList<Object> object, int index) {
+       private String readAttributes(List<Object> object, int index) {
                String attributes = "";
                Map<String, String> trapSignatures = (Map<String, String>) object.get(index);
                // Read the Elements. 
@@ -363,144 +366,144 @@ public class CreateClosedLoopFaultController extends RestrictedBaseController{
                }
                return attributes;
        }
-       
+
        private String getVarbindOID(String attrib) {
                VarbindDictionary varbindId = null;
                try{
-                        varbindId = (VarbindDictionary) commonclassdao.getEntityItem(VarbindDictionary.class, "varbindName", attrib);
-                        return varbindId.getVarbindOID();
+                       varbindId = (VarbindDictionary) commonclassdao.getEntityItem(VarbindDictionary.class, "varbindName", attrib);
+                       return varbindId.getVarbindOID();
                }catch(Exception e){
-                   policyLogger.error("Error during retrieving varbindName " + attrib, e);
+                       policyLogger.error("Error during retrieving varbindName " + attrib, e);
                        return attrib;
                }
        }
 
-       
+
        //connect traps data set to JSON Body as String
-               @SuppressWarnings({ "unchecked", "rawtypes" })
-               private String getUIConnectTraps(ArrayList<Object> connectTrapSignatures) {
-                       String resultBody = "";
-                       String connectMainBody = "";
-                       for(int j = 0; j < connectTrapSignatures.size(); j++){
-                               Map<String, String> connectTraps = (Map<String, String>)connectTrapSignatures.get(j);
+       @SuppressWarnings({ "unchecked", "rawtypes" })
+       private String getUIConnectTraps(List<Object> connectTrapSignatures) {
+               StringBuilder resultBody = new StringBuilder();
+               String connectMainBody = "";
+               for(int j = 0; j < connectTrapSignatures.size(); j++){
+                       Map<String, String> connectTraps = (Map<String, String>)connectTrapSignatures.get(j);
+                       String connectBody = "";
+                       Object object = connectTraps;
+                       if(object instanceof LinkedHashMap<?, ?>){
+                               String notBox = "";
+                               String connectTrap1 = "";
+                               String trapCount1 = "";
+                               String operatorBox = "";
+                               String connectTrap2 = "";
+                               String trapCount2 = "";
+                               if(((LinkedHashMap) object).keySet().contains("notBox")){
+                                       notBox = ((LinkedHashMap) object).get("notBox").toString();
+                               }
+                               if(((LinkedHashMap) object).get("connectTrap1") != null){
+                                       connectTrap1 = ((LinkedHashMap) object).get("connectTrap1").toString();
+                               }
+                               if(((LinkedHashMap) object).get("trapCount1") != null){
+                                       trapCount1 = ((LinkedHashMap) object).get("trapCount1").toString();
+                               }
+                               if(((LinkedHashMap) object).get("operatorBox") != null){
+                                       operatorBox = ((LinkedHashMap) object).get("operatorBox").toString();
+                               }
+                               if(((LinkedHashMap) object).get("connectTrap2") != null){
+                                       connectTrap2 = ((LinkedHashMap) object).get("connectTrap2").toString();
+                               }
+                               if(((LinkedHashMap) object).get("trapCount2") != null){
+                                       trapCount2 = ((LinkedHashMap) object).get("trapCount2").toString();
+                               }
+                               connectBody = notBox + "@!" + connectTrap1 + "@!" + trapCount1 + "@!" + operatorBox + "@!" + connectTrap2 + "@!" + trapCount2 + "#!?!"; 
+                       }
+                       resultBody.append(connectBody);
+               }
+               connectMainBody = connectMainBody + resultBody;
+               return connectMainBody;
+       }
+
+
+
+       // get Trigger signature from JSON body
+       @SuppressWarnings({ "rawtypes", "unchecked" })
+       private String getUITriggerSignature(String trap, Object object2) {
+               StringBuilder triggerBody = new StringBuilder();
+               ClosedLoopFaultTrapDatas trapDatas = (ClosedLoopFaultTrapDatas) object2;
+               ArrayList<Object> attributeList = new ArrayList<>();
+               // Read the Trap 
+               if(trap.startsWith("Trap")){
+                       if(trapDatas.getTrap1()!= null){
+                               attributeList.add(trapDatas.getTrap1());
+                       }
+                       if(trapDatas.getTrap2()!= null){
+                               attributeList.add(trapDatas.getTrap2());
+                       }
+                       if(trapDatas.getTrap3()!= null){
+                               attributeList.add(trapDatas.getTrap3());
+                       }
+                       if(trapDatas.getTrap4()!= null){
+                               attributeList.add(trapDatas.getTrap4());
+                       }
+                       if(trapDatas.getTrap5()!= null){
+                               attributeList.add(trapDatas.getTrap5());
+                       }
+                       if(trapDatas.getTrap6()!= null){
+                               attributeList.add(trapDatas.getTrap6());
+                       }
+               }else{
+                       if(trap.startsWith("Fault")){
+                               if(trapDatas.getTrap1()!= null){
+                                       attributeList.add(trapDatas.getTrap1());
+                               }
+                               if(trapDatas.getTrap2()!= null){
+                                       attributeList.add(trapDatas.getTrap2());
+                               }
+                               if(trapDatas.getTrap3()!= null){
+                                       attributeList.add(trapDatas.getTrap3());
+                               }
+                               if(trapDatas.getTrap4()!= null){
+                                       attributeList.add(trapDatas.getTrap4());
+                               }
+                               if(trapDatas.getTrap5()!= null){
+                                       attributeList.add(trapDatas.getTrap5());
+                               }
+                               if(trapDatas.getTrap6()!= null){
+                                       attributeList.add(trapDatas.getTrap6());
+                               }                               
+                       }       
+               }
+
+               for(int j = 0; j < attributeList.size(); j++){
+                       StringBuilder signatureBody = new StringBuilder();
+                       ArrayList<Object> connectTraps = (ArrayList<Object>) attributeList.get(j);
+                       for(int i =0 ; i < connectTraps.size(); i++){
                                String connectBody = "";
-                               Object object = connectTraps;
+                               Object object = connectTraps.get(i);
                                if(object instanceof LinkedHashMap<?, ?>){
                                        String notBox = "";
-                                       String connectTrap1 = "";
-                                       String trapCount1 = "";
+                                       String trigger1 = "";
                                        String operatorBox = "";
-                                       String connectTrap2 = "";
-                                       String trapCount2 = "";
+                                       String trigger2 = "";
                                        if(((LinkedHashMap) object).keySet().contains("notBox")){
                                                notBox = ((LinkedHashMap) object).get("notBox").toString();
                                        }
-                                       if(((LinkedHashMap) object).get("connectTrap1") != null){
-                                               connectTrap1 = ((LinkedHashMap) object).get("connectTrap1").toString();
-                                       }
-                                       if(((LinkedHashMap) object).get("trapCount1") != null){
-                                               trapCount1 = ((LinkedHashMap) object).get("trapCount1").toString();
+                                       if(((LinkedHashMap) object).get("trigger1") != null){
+                                               trigger1 = ((LinkedHashMap) object).get("trigger1").toString();
                                        }
                                        if(((LinkedHashMap) object).get("operatorBox") != null){
                                                operatorBox = ((LinkedHashMap) object).get("operatorBox").toString();
                                        }
-                                       if(((LinkedHashMap) object).get("connectTrap2") != null){
-                                               connectTrap2 = ((LinkedHashMap) object).get("connectTrap2").toString();
-                                       }
-                                       if(((LinkedHashMap) object).get("trapCount2") != null){
-                                               trapCount2 = ((LinkedHashMap) object).get("trapCount2").toString();
+                                       if(((LinkedHashMap) object).get("trigger2") != null){
+                                               trigger2 = ((LinkedHashMap) object).get("trigger2").toString();
                                        }
-                                       connectBody = notBox + "@!" + connectTrap1 + "@!" + trapCount1 + "@!" + operatorBox + "@!" + connectTrap2 + "@!" + trapCount2 + "#!?!"; 
+                                       connectBody = notBox + "@!" + trigger1 + "@!" + operatorBox + "@!" + trigger2 + "#!"; 
                                }
-                               resultBody = resultBody + connectBody;
+                               signatureBody.append(connectBody);
                        }
-                       connectMainBody = connectMainBody + resultBody;
-                       return connectMainBody;
+                       triggerBody.append(signatureBody + "?!");
                }
 
-                       
-
-                       // get Trigger signature from JSON body
-                       @SuppressWarnings({ "rawtypes", "unchecked" })
-                       private String getUITriggerSignature(String trap, Object object2) {
-                               String triggerBody = "";
-                               TrapDatas trapDatas = (TrapDatas) object2;
-                               ArrayList<Object> attributeList = new ArrayList<>();
-                               // Read the Trap 
-                               if(trap.startsWith("Trap")){
-                                       if(trapDatas.getTrap1()!= null){
-                                               attributeList.add(trapDatas.getTrap1());
-                                       }
-                                       if(trapDatas.getTrap2()!= null){
-                                               attributeList.add(trapDatas.getTrap2());
-                                       }
-                                       if(trapDatas.getTrap3()!= null){
-                                               attributeList.add(trapDatas.getTrap3());
-                                       }
-                                       if(trapDatas.getTrap4()!= null){
-                                               attributeList.add(trapDatas.getTrap4());
-                                       }
-                                       if(trapDatas.getTrap5()!= null){
-                                               attributeList.add(trapDatas.getTrap5());
-                                       }
-                                       if(trapDatas.getTrap6()!= null){
-                                               attributeList.add(trapDatas.getTrap6());
-                                       }
-                               }else{
-                                       if(trap.startsWith("Fault")){
-                                               if(trapDatas.getTrap1()!= null){
-                                                       attributeList.add(trapDatas.getTrap1());
-                                               }
-                                               if(trapDatas.getTrap2()!= null){
-                                                       attributeList.add(trapDatas.getTrap2());
-                                               }
-                                               if(trapDatas.getTrap3()!= null){
-                                                       attributeList.add(trapDatas.getTrap3());
-                                               }
-                                               if(trapDatas.getTrap4()!= null){
-                                                       attributeList.add(trapDatas.getTrap4());
-                                               }
-                                               if(trapDatas.getTrap5()!= null){
-                                                       attributeList.add(trapDatas.getTrap5());
-                                               }
-                                               if(trapDatas.getTrap6()!= null){
-                                                       attributeList.add(trapDatas.getTrap6());
-                                               }                               
-                                       }       
-                               }
-
-                               for(int j = 0; j < attributeList.size(); j++){
-                                       String signatureBody = "";
-                                       ArrayList<Object> connectTraps = (ArrayList<Object>) attributeList.get(j);
-                                       for(int i =0 ; i < connectTraps.size(); i++){
-                                               String connectBody = "";
-                                               Object object = connectTraps.get(i);
-                                               if(object instanceof LinkedHashMap<?, ?>){
-                                                       String notBox = "";
-                                                       String trigger1 = "";
-                                                       String operatorBox = "";
-                                                       String trigger2 = "";
-                                                       if(((LinkedHashMap) object).keySet().contains("notBox")){
-                                                               notBox = ((LinkedHashMap) object).get("notBox").toString();
-                                                       }
-                                                       if(((LinkedHashMap) object).get("trigger1") != null){
-                                                               trigger1 = ((LinkedHashMap) object).get("trigger1").toString();
-                                                       }
-                                                       if(((LinkedHashMap) object).get("operatorBox") != null){
-                                                               operatorBox = ((LinkedHashMap) object).get("operatorBox").toString();
-                                                       }
-                                                       if(((LinkedHashMap) object).get("trigger2") != null){
-                                                               trigger2 = ((LinkedHashMap) object).get("trigger2").toString();
-                                                       }
-                                                       connectBody = notBox + "@!" + trigger1 + "@!" + operatorBox + "@!" + trigger2 + "#!"; 
-                                               }
-                                               signatureBody = signatureBody + connectBody;
-                                       }
-                                       triggerBody = triggerBody + signatureBody + "?!";
-                               }
-                               
-                               return triggerBody;             
-                       }
+               return triggerBody.toString();          
+       }
 
        public  void prePopulateClosedLoopFaultPolicyData(PolicyRestAdapter policyAdapter, PolicyEntity entity) {
                if (policyAdapter.getPolicyData() instanceof PolicyType) {
@@ -513,7 +516,7 @@ public class CreateClosedLoopFaultController extends RestrictedBaseController{
                        try{
                                description = policy.getDescription().substring(0, policy.getDescription().indexOf("@CreatedBy:"));
                        }catch(Exception e){
-                           policyLogger.error("Error during collecting the description tag info for createClosedLoopFault " + policyNameValue , e);
+                               policyLogger.error("Error during collecting the description tag info for createClosedLoopFault " + policyNameValue , e);
                                description = policy.getDescription();
                        }
                        policyAdapter.setPolicyDescription(description);
@@ -546,24 +549,24 @@ public class CreateClosedLoopFaultController extends RestrictedBaseController{
                                                                                String value = (String) attributeValue.getContent().get(0);
                                                                                AttributeDesignatorType designator = match.getAttributeDesignator();
                                                                                String attributeId = designator.getAttributeId();
-                                                                               
+
                                                                                // First match in the target is OnapName, so set that value.
-                                                                               if (attributeId.equals("ONAPName")) {
+                                                                               if ("ONAPName".equals(attributeId)) {
                                                                                        policyAdapter.setOnapName(value);
                                                                                        OnapName onapName = new OnapName();
                                                                                        onapName.setOnapName(value);
                                                                                        policyAdapter.setOnapNameField(onapName);
                                                                                }
-                                                                               if (attributeId.equals("RiskType")){
+                                                                               if ("RiskType".equals(attributeId)){
                                                                                        policyAdapter.setRiskType(value);
                                                                                }
-                                                                               if (attributeId.equals("RiskLevel")){
+                                                                               if ("RiskLevel".equals(attributeId)){
                                                                                        policyAdapter.setRiskLevel(value);
                                                                                }
-                                                                               if (attributeId.equals("guard")){
+                                                                               if ("guard".equals(attributeId)){
                                                                                        policyAdapter.setGuard(value);
                                                                                }
-                                                                               if (attributeId.equals("TTLDate") && !value.contains("NA")){
+                                                                               if ("TTLDate".equals(attributeId) && !value.contains("NA")){
                                                                                        PolicyController controller = new PolicyController();
                                                                                        String newDate = controller.convertDate(value);
                                                                                        policyAdapter.setTtlDate(newDate);
@@ -584,7 +587,7 @@ public class CreateClosedLoopFaultController extends RestrictedBaseController{
                ObjectMapper mapper = new ObjectMapper();
                try {
                        ClosedLoopFaultBody closedLoopBody = mapper.readValue(entity.getConfigurationData().getConfigBody(), ClosedLoopFaultBody.class);
-                       if(closedLoopBody.getClosedLoopPolicyStatus().equalsIgnoreCase("ACTIVE")){
+                       if("ACTIVE".equalsIgnoreCase(closedLoopBody.getClosedLoopPolicyStatus())){
                                closedLoopBody.setClosedLoopPolicyStatus("Active");
                        }else{
                                closedLoopBody.setClosedLoopPolicyStatus("InActive");
@@ -609,58 +612,13 @@ public class CreateClosedLoopFaultController extends RestrictedBaseController{
 
 }
 
-class TrapDatas{
-       private ArrayList<Object> trap1;
-       private ArrayList<Object> trap2;
-       private ArrayList<Object> trap3;
-       private ArrayList<Object> trap4;
-       private ArrayList<Object> trap5;
-       private ArrayList<Object> trap6;
-       public ArrayList<Object> getTrap1() {
-               return trap1;
-       }
-       public void setTrap1(ArrayList<Object> trap1) {
-               this.trap1 = trap1;
-       }
-       public ArrayList<Object> getTrap2() {
-               return trap2;
-       }
-       public void setTrap2(ArrayList<Object> trap2) {
-               this.trap2 = trap2;
-       }
-       public ArrayList<Object> getTrap3() {
-               return trap3;
-       }
-       public void setTrap3(ArrayList<Object> trap3) {
-               this.trap3 = trap3;
-       }
-       public ArrayList<Object> getTrap4() {
-               return trap4;
-       }
-       public void setTrap4(ArrayList<Object> trap4) {
-               this.trap4 = trap4;
-       }
-       public ArrayList<Object> getTrap5() {
-               return trap5;
-       }
-       public void setTrap5(ArrayList<Object> trap5) {
-               this.trap5 = trap5;
-       }
-       public ArrayList<Object> getTrap6() {
-               return trap6;
-       }
-       public void setTrap6(ArrayList<Object> trap6) {
-               this.trap6 = trap6;
-       }
-}
-
 class ClosedLoopGridJSONData{
 
        private String clearTimeOut;
        private String trapMaxAge;
        private String verificationclearTimeOut;
-       private ArrayList<Object> connecttriggerSignatures;
-       private ArrayList<Object> connectVerificationSignatures;
+       private List<Object> connecttriggerSignatures;
+       private List<Object> connectVerificationSignatures;
 
        public String getClearTimeOut() {
                return clearTimeOut;
@@ -680,18 +638,18 @@ class ClosedLoopGridJSONData{
        public void setVerificationclearTimeOut(String verificationclearTimeOut) {
                this.verificationclearTimeOut = verificationclearTimeOut;
        }
-       
 
-       public ArrayList<Object> getConnecttriggerSignatures() {
+
+       public List<Object> getConnecttriggerSignatures() {
                return connecttriggerSignatures;
        }
-       public void setConnecttriggerSignatures(ArrayList<Object> connecttriggerSignatures) {
+       public void setConnecttriggerSignatures(List<Object> connecttriggerSignatures) {
                this.connecttriggerSignatures = connecttriggerSignatures;
        }
-       public ArrayList<Object> getConnectVerificationSignatures() {
+       public List<Object> getConnectVerificationSignatures() {
                return connectVerificationSignatures;
        }
-       public void setConnectVerificationSignatures(ArrayList<Object> connectVerificationSignatures) {
+       public void setConnectVerificationSignatures(List<Object> connectVerificationSignatures) {
                this.connectVerificationSignatures = connectVerificationSignatures;
        }
 }
\ No newline at end of file