Resolved Policy GUI Issues

[policy/engine.git] / POLICY-SDK-APP / src / main / java / org / onap / policy / controller / CreateClosedLoopFaultController.java

diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateClosedLoopFaultController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateClosedLoopFaultController.java
index a7ce45e..20a671b 100644 (file)
--- a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateClosedLoopFaultController.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateClosedLoopFaultController.java
@@ -279,6 +279,7 @@ public class CreateClosedLoopFaultController extends RestrictedBaseController{
                                        }
                                }
                        } catch(Exception e){
+                           policyLogger.warn("Error during callTrap" , e);
                                return "(" + trap + ")";
                        }
                }else{
@@ -316,7 +317,7 @@ public class CreateClosedLoopFaultController extends RestrictedBaseController{
                                                attrib  = getVarbindOID(attrib);
                                                attributes = attributes + "("+ URLEncoder.encode(attrib, "UTF-8")+ ")";
                                        } catch (UnsupportedEncodingException e1) {
-                                               //logger.error("Caused Exception while Encoding Varbind Dictionary Values"+e1);
+                                               policyLogger.error("Caused Exception while Encoding Varbind Dictionary Values",e1);
                                        }
                                }
                        }else{
@@ -324,7 +325,7 @@ public class CreateClosedLoopFaultController extends RestrictedBaseController{
                                        attrib  = getVarbindOID(attrib);
                                        attributes = attributes + "("+ URLEncoder.encode(attrib, "UTF-8")+ ")";
                                } catch (UnsupportedEncodingException e) {
-                                       //logger.error("Caused Exception while Encoding Varbind Dictionary Values"+e);
+                                       policyLogger.error("Caused Exception while Encoding Varbind Dictionary Values",e);
                                }
                        }
                }else{
@@ -348,7 +349,7 @@ public class CreateClosedLoopFaultController extends RestrictedBaseController{
                                                attrib  = getVarbindOID(attrib);
                                                attributes = attributes + "("+ URLEncoder.encode(attrib, "UTF-8") + ")";
                                        } catch (UnsupportedEncodingException e1) {
-                                               //logger.error("Caused Exception while Encoding Varbind Dictionary Values"+e1);
+                                               policyLogger.error("Caused Exception while Encoding Varbind Dictionary Values",e1);
                                        }
                                }
                        }else{
@@ -356,7 +357,7 @@ public class CreateClosedLoopFaultController extends RestrictedBaseController{
                                        attrib  = getVarbindOID(attrib);
                                        attributes = attributes + "("+ URLEncoder.encode(attrib, "UTF-8") + ")";
                                } catch (UnsupportedEncodingException e) {
-                                       //logger.error("Caused Exception while Encoding Varbind Dictionary Values"+e);
+                                       policyLogger.error("Caused Exception while Encoding Varbind Dictionary Values",e);
                                }
                        }
                }
@@ -369,6 +370,7 @@ public class CreateClosedLoopFaultController extends RestrictedBaseController{
                         varbindId = (VarbindDictionary) commonclassdao.getEntityItem(VarbindDictionary.class, "varbindName", attrib);
                         return varbindId.getVarbindOID();
                }catch(Exception e){
+                   policyLogger.error("Error during retrieving varbindName " + attrib, e);
                        return attrib;
                }
        }
@@ -511,6 +513,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);
                                description = policy.getDescription();
                        }
                        policyAdapter.setPolicyDescription(description);
@@ -561,7 +564,8 @@ public class CreateClosedLoopFaultController extends RestrictedBaseController{
                                                                                        policyAdapter.setGuard(value);
                                                                                }
                                                                                if (attributeId.equals("TTLDate") && !value.contains("NA")){
-                                                                                       String newDate = convertDate(value, true);
+                                                                                       PolicyController controller = new PolicyController();
+                                                                                       String newDate = controller.convertDate(value);
                                                                                        policyAdapter.setTtlDate(newDate);
                                                                                }
                                                                        }
@@ -576,22 +580,6 @@ public class CreateClosedLoopFaultController extends RestrictedBaseController{
 
        }
 
-       private String convertDate(String dateTTL, boolean portalType) {
-               String formateDate = null;
-               String[] date;
-               String[] parts;
-
-               if (portalType){
-                       parts = dateTTL.split("-");
-                       formateDate = parts[2] + "-" + parts[1] + "-" + parts[0] + "T05:00:00.000Z";
-               } else {
-                       date  = dateTTL.split("T");
-                       parts = date[0].split("-");
-                       formateDate = parts[2] + "-" + parts[1] + "-" + parts[0];
-               }
-               return formateDate;
-       }
-
        private String readClosedLoopJSONFile(PolicyRestAdapter policyAdapter, PolicyEntity entity) {
                ObjectMapper mapper = new ObjectMapper();
                try {