Resolved Policy GUI Issues

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

diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateBRMSParamController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateBRMSParamController.java
index 3107950..fc7cb60 100644 (file)
--- a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateBRMSParamController.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateBRMSParamController.java
@@ -20,12 +20,7 @@
 
 package org.onap.policy.controller;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
 import java.io.PrintWriter;
-import java.nio.file.Files;
-import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -342,50 +337,22 @@ public class CreateBRMSParamController extends RestrictedBaseController {
                                policyAdapter.setGuard(value);
                        }
                        if ("TTLDate".equals(attributeId) && !value.contains("NA")){
-                               String newDate = convertDate(value, true);
+                               PolicyController controller = new PolicyController();
+                               String newDate = controller.convertDate(value);
                                policyAdapter.setTtlDate(newDate);
                        }
                }
        }
 
-       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;
-       }
        // This method generates the UI from rule configuration
        public void paramUIGenerate(PolicyRestAdapter policyAdapter, PolicyEntity entity) {
                String data = entity.getConfigurationData().getConfigBody();
                if(data != null){
-                       File file = new File(PolicyController.getConfigHome() +File.separator+ entity.getConfigurationData().getConfigurationName());
-                       if(file.exists()){
-                               try (BufferedReader br = new BufferedReader(new FileReader(file))) {
-                                       StringBuilder sb = new StringBuilder();
-                                       String line = br.readLine();
-                                       while (line != null) {
-                                               sb.append(line);
-                                               sb.append("\n");
-                                               line = br.readLine();
-                                       }
-                               }catch(Exception e){
-                                       policyLogger.error(XACMLErrorConstants.ERROR_DATA_ISSUE+ e.getMessage() + e);
-                               }
-                       }
                        try {   
                                StringBuilder params = new StringBuilder("");
                                Boolean flag = false;
                                Boolean comment = false;
-                               for (String line : Files.readAllLines(Paths.get(file.toString()))) {
+                               for (String line : data.split("\n")) {
                                        if (line.isEmpty() || line.startsWith("//")) {
                                                continue;
                                        }