Adding SONAR fixes for
[policy/engine.git] / POLICY-SDK-APP / src / main / java / org / onap / policy / admin / PolicyManagerServlet.java
index 4f42023..151d36a 100644 (file)
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -33,9 +33,11 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.PrintWriter;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -67,6 +69,7 @@ import org.onap.policy.common.logging.flexlogger.Logger;
 import org.onap.policy.components.HumanPolicyComponent;
 import org.onap.policy.controller.PolicyController;
 import org.onap.policy.controller.PolicyExportAndImportController;
+import org.onap.policy.model.Roles;
 import org.onap.policy.rest.XACMLRest;
 import org.onap.policy.rest.XACMLRestProperties;
 import org.onap.policy.rest.adapter.PolicyRestAdapter;
@@ -79,8 +82,7 @@ import org.onap.policy.rest.jpa.UserInfo;
 import org.onap.policy.utils.PolicyUtils;
 import org.onap.policy.xacml.api.XACMLErrorConstants;
 import org.onap.policy.xacml.util.XACMLPolicyScanner;
-import org.openecomp.policy.model.Roles;
-import org.openecomp.portalsdk.core.web.support.UserUtils;
+import org.onap.portalsdk.core.web.support.UserUtils;
 
 import com.att.research.xacml.util.XACMLProperties;
 import com.fasterxml.jackson.databind.JsonNode;
@@ -91,16 +93,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 public class PolicyManagerServlet extends HttpServlet {
        private static final Logger LOGGER      = FlexLogger.getLogger(PolicyManagerServlet.class);
        private static final long serialVersionUID = -8453502699403909016L;
-       
-       private static boolean jUnit = false;
-
-       public static boolean isjUnit() {
-               return jUnit;
-       }
-
-       public static void setjUnit(boolean jUnit) {
-               PolicyManagerServlet.jUnit = jUnit;
-       }
 
        private enum Mode {
                LIST, RENAME, COPY, DELETE, EDITFILE, ADDFOLDER, DESCRIBEPOLICYFILE, VIEWPOLICY, ADDSUBSCOPE, SWITCHVERSION, EXPORT, SEARCHLIST
@@ -123,11 +115,11 @@ public class PolicyManagerServlet extends HttpServlet {
        private static String EDITOR = "editor";
        private static String GUEST = "guest";
        private static String RESULT = "result";
-       
+
        private static Path closedLoopJsonLocation;
        private static JsonArray policyNames;
        private static String testUserId = null;
-       
+
        public static JsonArray getPolicyNames() {
                return policyNames;
        }
@@ -154,7 +146,7 @@ public class PolicyManagerServlet extends HttpServlet {
                //
                PolicyManagerServlet.initializeJSONLoad();
        }
-       
+
        protected static void initializeJSONLoad() {
                closedLoopJsonLocation = Paths.get(XACMLProperties
                                .getProperty(XACMLRestProperties.PROP_ADMIN_CLOSEDLOOP));
@@ -163,7 +155,7 @@ public class PolicyManagerServlet extends HttpServlet {
                String location = closedLoopJsonLocation.toString();
                try {
                        inputStream = new FileInputStream(location);
-                       if (location.endsWith("json")) {        
+                       if (location.endsWith("json")) {
                                jsonReader = Json.createReader(inputStream);
                                policyNames = jsonReader.readArray();
                                serviceTypeNamesList = new ArrayList<>();
@@ -282,6 +274,12 @@ public class PolicyManagerServlet extends HttpServlet {
                        JSONObject jObj = new JSONObject(sb.toString());
                        JSONObject params = jObj.getJSONObject("params");
                        Mode mode = Mode.valueOf(params.getString("mode"));
+                       
+                       String userId = UserUtils.getUserSession(request).getOrgUserId();
+                       LOGGER.info("****************************************Logging UserID while doing actions on Editor tab*******************************************");
+                       LOGGER.info("UserId:  " + userId + "Action Mode:  "+ mode.toString() + "Action Params: "+params.toString());
+                       LOGGER.info("***********************************************************************************************************************************");
+                       
                        switch (mode) {
                        case ADDFOLDER:
                        case ADDSUBSCOPE:
@@ -341,7 +339,7 @@ public class PolicyManagerServlet extends HttpServlet {
                try {
                        //Get the Login Id of the User from Request
                        String userId =  UserUtils.getUserSession(request).getOrgUserId();
-                       //Check if the Role and Scope Size are Null get the values from db. 
+                       //Check if the Role and Scope Size are Null get the values from db.
                        List<Object> userRoles = controller.getRoles(userId);
                        roles = new ArrayList<>();
                        scopes = new HashSet<>();
@@ -356,7 +354,7 @@ public class PolicyManagerServlet extends HttpServlet {
                                                }
                                        }else{
                                                scopes.add(userRole.getScope());
-                                       }               
+                                       }
                                }
                        }
                        if (roles.contains(ADMIN) || roles.contains(EDITOR) || roles.contains(GUEST) ) {
@@ -373,7 +371,7 @@ public class PolicyManagerServlet extends HttpServlet {
                                                }
                                        }
                                }
-                       } 
+                       }
                        if(policyList!= null){
                                for(int i = 0; i < policyList.length(); i++){
                                        String policyName = policyList.get(i).toString().replace(".xml", "");
@@ -390,7 +388,7 @@ public class PolicyManagerServlet extends HttpServlet {
                                        if(!activeData.isEmpty()){
                                                PolicyVersion policy = (PolicyVersion) activeData.get(0);
                                                JSONObject el = new JSONObject();
-                                               el.put("name", policy.getPolicyName().replace(File.separator, "/"));    
+                                               el.put("name", policy.getPolicyName().replace(File.separator, "/"));
                                                el.put("date", policy.getModifiedDate());
                                                el.put("version", policy.getActiveVersion());
                                                el.put("size", "");
@@ -409,7 +407,7 @@ public class PolicyManagerServlet extends HttpServlet {
                                                PolicyVersion filterdata = (PolicyVersion) filter;
                                                try{
                                                        String scopeName = filterdata.getPolicyName().substring(0, filterdata.getPolicyName().lastIndexOf(File.separator));
-                                                       if(scopes.contains(scopeName)){ 
+                                                       if(scopes.contains(scopeName)){
                                                                policyData.add(filterdata);
                                                        }
                                                }catch(Exception e){
@@ -417,12 +415,12 @@ public class PolicyManagerServlet extends HttpServlet {
                                                }
                                        }
                                }
-                               
+
                                if(!policyData.isEmpty()){
                                        for(int i =0; i < policyData.size(); i++){
                                                PolicyVersion policy = (PolicyVersion) policyData.get(i);
                                                JSONObject el = new JSONObject();
-                                               el.put("name", policy.getPolicyName().replace(File.separator, "/"));    
+                                               el.put("name", policy.getPolicyName().replace(File.separator, "/"));
                                                el.put("date", policy.getModifiedDate());
                                                el.put("version", policy.getActiveVersion());
                                                el.put("size", "");
@@ -436,7 +434,7 @@ public class PolicyManagerServlet extends HttpServlet {
                }catch(Exception e){
                        LOGGER.error("Exception occured while reading policy Data from Policy Version table for Policy Search Data"+e);
                }
-                       
+
                return new JSONObject().put(RESULT, resultList);
        }
 
@@ -542,7 +540,7 @@ public class PolicyManagerServlet extends HttpServlet {
                peParams.put("split_1", split[1]);
                peParams.put("split_0", split[0]);
                List<Object> queryData = null;
-               if(jUnit){
+               if(PolicyController.isjUnit()){
                        queryData = controller.getDataByQuery(query, null);
                }else{
                        queryData = controller.getDataByQuery(query, peParams);
@@ -574,12 +572,12 @@ public class PolicyManagerServlet extends HttpServlet {
                }else{
                        return error("Error Occured while Describing the Policy");
                }
-               
+
                return object;
        }
 
        //Get the List of Policies and Scopes for Showing in Editor tab
-       private JSONObject list(JSONObject params, HttpServletRequest request) throws ServletException { 
+       private JSONObject list(JSONObject params, HttpServletRequest request) throws ServletException {
                Set<String> scopes = null;
                List<String> roles = null;
                try {
@@ -587,7 +585,7 @@ public class PolicyManagerServlet extends HttpServlet {
                        //Get the Login Id of the User from Request
                        String testUserID = getTestUserId();
                        String userId =  testUserID != null ? testUserID : UserUtils.getUserSession(request).getOrgUserId();
-                       //Check if the Role and Scope Size are Null get the values from db. 
+                       //Check if the Role and Scope Size are Null get the values from db.
                        List<Object> userRoles = controller.getRoles(userId);
                        roles = new ArrayList<>();
                        scopes = new HashSet<>();
@@ -602,7 +600,7 @@ public class PolicyManagerServlet extends HttpServlet {
                                                }
                                        }else{
                                                scopes.add(userRole.getScope());
-                                       }               
+                                       }
                                }
                        }
 
@@ -623,8 +621,8 @@ public class PolicyManagerServlet extends HttpServlet {
                                                scopes.add(tempScope);
                                        }
                                }
-                       } 
-                       
+                       }
+
                        if("/".equals(path)){
                                if(roles.contains(SUPERADMIN) || roles.contains(SUPEREDITOR) || roles.contains(SUPERGUEST)){
                                        List<Object> scopesList = queryPolicyEditorScopes(null);
@@ -632,8 +630,8 @@ public class PolicyManagerServlet extends HttpServlet {
                                                PolicyEditorScopes scope = (PolicyEditorScopes) list;
                                                if(!(scope.getScopeName().contains(File.separator))){
                                                        JSONObject el = new JSONObject();
-                                                       el.put("name", scope.getScopeName());   
-                                                       el.put("date", scope.getCreatedDate());
+                                                       el.put("name", scope.getScopeName());
+                                                       el.put("date", scope.getModifiedDate());
                                                        el.put("size", "");
                                                        el.put("type", "dir");
                                                        el.put("createdBy", scope.getUserCreatedBy().getUserName());
@@ -647,8 +645,8 @@ public class PolicyManagerServlet extends HttpServlet {
                                                List<Object> scopesList = queryPolicyEditorScopes(scope.toString());
                                                if(!scopesList.isEmpty()){
                                                        PolicyEditorScopes scopeById = (PolicyEditorScopes) scopesList.get(0);
-                                                       el.put("name", scopeById.getScopeName());       
-                                                       el.put("date", scopeById.getCreatedDate());
+                                                       el.put("name", scopeById.getScopeName());
+                                                       el.put("date", scopeById.getModifiedDate());
                                                        el.put("size", "");
                                                        el.put("type", "dir");
                                                        el.put("createdBy", scopeById.getUserCreatedBy().getUserName());
@@ -663,7 +661,7 @@ public class PolicyManagerServlet extends HttpServlet {
                                        activePolicyList(scopeName, resultList, roles, scopes, onlyFolders);
                                } catch (Exception ex) {
                                        LOGGER.error("Error Occured While reading Policy Files List"+ex );
-                               }                       
+                               }
                        }
 
                        return new JSONObject().put(RESULT, resultList);
@@ -684,7 +682,7 @@ public class PolicyManagerServlet extends HttpServlet {
                }
                PolicyController controller = getPolicyControllerInstance();
                List<Object> scopesList = null;
-               if(jUnit){
+               if(PolicyController.isjUnit()){
                        scopesList = controller.getDataByQuery(scopeNamequery, null);
                }else{
                        scopesList = controller.getDataByQuery(scopeNamequery, params);
@@ -703,13 +701,13 @@ public class PolicyManagerServlet extends HttpServlet {
                }
                String query = "from PolicyVersion where POLICY_NAME like :scopeName";
                String scopeNamequery = "from PolicyEditorScopes where SCOPENAME like :scopeName";
-               
+
                SimpleBindings params = new SimpleBindings();
                params.put("scopeName", scopeName + "%");
-               
+
                List<Object> activePolicies = null;
                List<Object> scopesList = null;
-               if(jUnit){
+               if(PolicyController.isjUnit()){
                        activePolicies = controller.getDataByQuery(query, null);
                        scopesList = controller.getDataByQuery(scopeNamequery, null);
                }else{
@@ -732,7 +730,7 @@ public class PolicyManagerServlet extends HttpServlet {
                                }
                                if(scopeName.equalsIgnoreCase(checkScope)){
                                        JSONObject el = new JSONObject();
-                                       el.put("name", scope);  
+                                       el.put("name", scope);
                                        el.put("date", scopeById.getModifiedDate());
                                        el.put("size", "");
                                        el.put("type", "dir");
@@ -740,7 +738,7 @@ public class PolicyManagerServlet extends HttpServlet {
                                        el.put("modifiedBy", scopeById.getUserModifiedBy().getUserName());
                                        resultList.add(el);
                                }
-                       }               
+                       }
                }
                String scopeNameCheck = null;
                for (Object list : activePolicies) {
@@ -754,7 +752,7 @@ public class PolicyManagerServlet extends HttpServlet {
                                }
                                if(scopeNameValue.equals(scopeNameCheck)){
                                        JSONObject el = new JSONObject();
-                                       el.put("name", policy.getPolicyName().substring(policy.getPolicyName().lastIndexOf(File.separator)+1)); 
+                                       el.put("name", policy.getPolicyName().substring(policy.getPolicyName().lastIndexOf(File.separator)+1));
                                        el.put("date", policy.getModifiedDate());
                                        el.put("version", policy.getActiveVersion());
                                        el.put("size", "");
@@ -765,7 +763,7 @@ public class PolicyManagerServlet extends HttpServlet {
                                }
                        }else if(!scopes.isEmpty() && scopes.contains(scopeNameValue)){
                                        JSONObject el = new JSONObject();
-                                       el.put("name", policy.getPolicyName().substring(policy.getPolicyName().lastIndexOf(File.separator)+1)); 
+                                       el.put("name", policy.getPolicyName().substring(policy.getPolicyName().lastIndexOf(File.separator)+1));
                                        el.put("date", policy.getModifiedDate());
                                        el.put("version", policy.getActiveVersion());
                                        el.put("size", "");
@@ -774,7 +772,7 @@ public class PolicyManagerServlet extends HttpServlet {
                                        el.put("modifiedBy", getUserName(policy.getModifiedBy()));
                                        resultList.add(el);
                        }
-               }       
+               }
        }
 
        private String getUserName(String loginId){
@@ -836,11 +834,11 @@ public class PolicyManagerServlet extends HttpServlet {
                                if(activePolicies.size() != policyActiveInPDP.size()){
                                        rename = true;
                                }
-       
+
                                UserInfo userInfo = new UserInfo();
                                userInfo.setUserLoginId(userId);
                                if(policyActiveInPDP.size() == 0){
-                                       renameScope(scopesList, scopeName, newScopeName, controller);   
+                                       renameScope(scopesList, scopeName, newScopeName, controller);
                                }else if(rename){
                                        renameScope(scopesList, scopeName, newScopeName, controller);
                                        for(String scope : scopeOfPolicyActiveInPDP){
@@ -853,7 +851,7 @@ public class PolicyManagerServlet extends HttpServlet {
                                }
                                if(isActive){
                                        return error("The Following policies rename failed. Since they are active in PDP Groups" +policyActiveInPDP);
-                               }       
+                               }
                        }
                        return success();
                } catch (Exception e) {
@@ -861,7 +859,7 @@ public class PolicyManagerServlet extends HttpServlet {
                        return error(e.getMessage());
                }
        }
-       
+
        private void renameScope(List<Object> scopesList, String scopeName, String newScopeName, PolicyController controller){
                for(Object object : scopesList){
                        PolicyEditorScopes editorScopeEntity = (PolicyEditorScopes) object;
@@ -874,7 +872,7 @@ public class PolicyManagerServlet extends HttpServlet {
                        controller.updateData(editorScopeEntity);
                }
        }
-       
+
        private JSONObject policyRename(String oldPath, String newPath, String userId) throws ServletException {
                try {
                        PolicyEntity entity = null;
@@ -909,7 +907,7 @@ public class PolicyManagerServlet extends HttpServlet {
                        String[] oldPolicySplit = oldPolicyCheck.split(":");
 
                        //Check PolicyEntity table with newPolicy Name
-                       String policyEntityquery = "FROM PolicyEntity where policyName = :newPolicySplit_1 and scope = :newPolicySplit_1";
+                       String policyEntityquery = "FROM PolicyEntity where policyName = :newPolicySplit_1 and scope = :newPolicySplit_0";
                        SimpleBindings policyParams = new SimpleBindings();
                        policyParams.put("newPolicySplit_1", newPolicySplit[1]);
                        policyParams.put("newPolicySplit_0", newPolicySplit[0]);
@@ -951,7 +949,7 @@ public class PolicyManagerServlet extends HttpServlet {
                        }else{
                                return error("Policy rename failed due to policy not able to retrieve from database. Please, contact super-admin.");
                        }
-                       
+
                        return success();
                } catch (Exception e) {
                        LOGGER.error(XACMLErrorConstants.ERROR_DATA_ISSUE+"Exception Occured While Renaming Policy"+e);
@@ -959,7 +957,7 @@ public class PolicyManagerServlet extends HttpServlet {
                }
        }
 
-       private JSONObject checkOldPolicyEntryAndUpdate(PolicyEntity entity, String newScope, String removenewPolicyExtension, String oldScope, String removeoldPolicyExtension, 
+       private JSONObject checkOldPolicyEntryAndUpdate(PolicyEntity entity, String newScope, String removenewPolicyExtension, String oldScope, String removeoldPolicyExtension,
                        String policyName, String  newpolicyName, String oldpolicyName, String userId) throws ServletException{
                try {
                        ConfigurationDataEntity configEntity = entity.getConfigurationData();
@@ -1151,7 +1149,7 @@ public class PolicyManagerServlet extends HttpServlet {
                                cloneRecord(newPolicySplit[1], oldPolicySplit[0], oldPolicySplit[1],  newPolicySplit[0], newPolicySplit[1], entity, userId);
                                success = true;
                        }
-                       
+
                        if(success){
                                PolicyVersion entityItem = new PolicyVersion();
                                entityItem.setActiveVersion(Integer.parseInt(version));
@@ -1159,6 +1157,7 @@ public class PolicyManagerServlet extends HttpServlet {
                                entityItem.setPolicyName(policyName);
                                entityItem.setCreatedBy(userId);
                                entityItem.setModifiedBy(userId);
+                               entityItem.setModifiedDate(new Date());
                                controller.saveData(entityItem);
                        }
 
@@ -1202,7 +1201,8 @@ public class PolicyManagerServlet extends HttpServlet {
                                        splitPolicyName = policyNamewithoutExtension.replace(".Decision_", ":Decision_");
                                }
                                String[] split = splitPolicyName.split(":");
-                               query = "FROM PolicyEntity where policyName like split_1 and scope = split_0";
+
+                               query = "FROM PolicyEntity where policyName like :split_1 and scope = :split_0";
                                policyParams.put("split_1", split[1] + "%");
                                policyParams.put("split_0", split[0]);
                        }else{
@@ -1210,7 +1210,7 @@ public class PolicyManagerServlet extends HttpServlet {
                                query = "FROM PolicyEntity where scope like :policyNamewithoutExtension";
                                policyParams.put("policyNamewithoutExtension", policyNamewithoutExtension + "%");
                        }
-                       
+
                        List<Object> policyEntityobjects = controller.getDataByQuery(query, policyParams);
                        String activePolicyName = null;
                        boolean pdpCheck = false;
@@ -1221,9 +1221,9 @@ public class PolicyManagerServlet extends HttpServlet {
                                        if(!policyEntityobjects.isEmpty()){
                                                for(Object object : policyEntityobjects){
                                                        policyEntity = (PolicyEntity) object;
-                                                       String groupEntityquery = "from PolicyGroupEntity where policyid = :policyId";
+                                                       String groupEntityquery = "from PolicyGroupEntity where policyid ='"+policyEntity.getPolicyId()+"'";
                                                        SimpleBindings pgeParams = new SimpleBindings();
-                                                       pgeParams.put("policyId", policyEntity.getPolicyId());
+                                                       //pgeParams.put("policyIdValue", policyEntity.getPolicyId());
                                                        List<Object> groupobject = controller.getDataByQuery(groupEntityquery, pgeParams);
                                                        if(!groupobject.isEmpty()){
                                                                pdpCheck = true;
@@ -1235,10 +1235,12 @@ public class PolicyManagerServlet extends HttpServlet {
                                                                //Delete the entity from Policy Entity table
                                                                controller.deleteData(policyEntity);
                                                                if(policyNamewithoutExtension.contains("Config_")){
+                                                                       Files.deleteIfExists(Paths.get(PolicyController.getConfigHome() + File.separator + policyEntity.getConfigurationData().getConfigurationName()));
                                                                        controller.deleteData(policyEntity.getConfigurationData());
                                                                }else if(policyNamewithoutExtension.contains("Action_")){
+                                                                       Files.deleteIfExists(Paths.get(PolicyController.getActionHome() + File.separator + policyEntity.getActionBodyEntity().getActionBodyName()));
                                                                        controller.deleteData(policyEntity.getActionBodyEntity());
-                                                               }                       
+                                                               }
                                                        }
                                                }
                                        }
@@ -1267,11 +1269,11 @@ public class PolicyManagerServlet extends HttpServlet {
                                        String currentVersionPolicyName = policyNamewithExtension.substring(policyNamewithExtension.lastIndexOf(File.separator)+1);
                                        String currentVersionScope = policyNamewithExtension.substring(0, policyNamewithExtension.lastIndexOf(File.separator)).replace(File.separator, ".");
                                        query = "FROM PolicyEntity where policyName = :currentVersionPolicyName and scope = :currentVersionScope";
-                                       
+
                                        SimpleBindings peParams = new SimpleBindings();
                                        peParams.put("currentVersionPolicyName", currentVersionPolicyName);
                                        peParams.put("currentVersionScope", currentVersionScope);
-                                       
+
                                        List<Object> policyEntitys = controller.getDataByQuery(query, peParams);
                                        if(!policyEntitys.isEmpty()){
                                                policyEntity = (PolicyEntity) policyEntitys.get(0);
@@ -1288,13 +1290,15 @@ public class PolicyManagerServlet extends HttpServlet {
                                                        //Delete the entity from Policy Entity table
                                                        controller.deleteData(policyEntity);
                                                        if(policyNamewithoutExtension.contains("Config_")){
+                                                               Files.deleteIfExists(Paths.get(PolicyController.getConfigHome() + File.separator + policyEntity.getConfigurationData().getConfigurationName()));
                                                                controller.deleteData(policyEntity.getConfigurationData());
                                                        }else if(policyNamewithoutExtension.contains("Action_")){
+                                                               Files.deleteIfExists(Paths.get(PolicyController.getActionHome() + File.separator + policyEntity.getActionBodyEntity().getActionBodyName()));
                                                                controller.deleteData(policyEntity.getActionBodyEntity());
                                                        }
-                                                       
+
                                                        if(version > 1){
-                                                               int highestVersion = 0; 
+                                                               int highestVersion = 0;
                                                                if(!policyEntityobjects.isEmpty()){
                                                                        for(Object object : policyEntityobjects){
                                                                                policyEntity = (PolicyEntity) object;
@@ -1325,7 +1329,7 @@ public class PolicyManagerServlet extends HttpServlet {
                                                        return error("Policy can't be deleted, it is active in PDP Groups.     PolicyName: '"+policyEntity.getScope() + "." +policyEntity.getPolicyName()+"'");
                                                }
                                        }
-                               }       
+                               }
                        }else{
                                List<String> activePoliciesInPDP = new ArrayList<String>();
                                if(!policyEntityobjects.isEmpty()){
@@ -1346,8 +1350,10 @@ public class PolicyManagerServlet extends HttpServlet {
                                                        controller.deleteData(policyEntity);
                                                        policyNamewithoutExtension = policyEntity.getPolicyName();
                                                        if(policyNamewithoutExtension.contains("Config_")){
+                                                               Files.deleteIfExists(Paths.get(PolicyController.getConfigHome() + File.separator + policyEntity.getConfigurationData().getConfigurationName()));
                                                                controller.deleteData(policyEntity.getConfigurationData());
                                                        }else if(policyNamewithoutExtension.contains("Action_")){
+                                                               Files.deleteIfExists(Paths.get(PolicyController.getActionHome() + File.separator + policyEntity.getActionBodyEntity().getActionBodyName()));
                                                                controller.deleteData(policyEntity.getActionBodyEntity());
                                                        }
                                                }
@@ -1355,7 +1361,7 @@ public class PolicyManagerServlet extends HttpServlet {
                                        //Delete from policyVersion and policyEditor Scope table
                                        String policyVersionQuery = "delete PolicyVersion where POLICY_NAME like '"+path.replace("\\", "\\\\")+"%' and id >0";
                                        controller.executeQuery(policyVersionQuery);
-                                       
+
                                        //Policy Notification
                                        PolicyVersion entity = new PolicyVersion();
                                        entity.setPolicyName(path);
@@ -1375,7 +1381,7 @@ public class PolicyManagerServlet extends HttpServlet {
                                                        insertactivePDPVersion.setModifiedBy(userId);
                                                        controller.saveData(insertactivePDPVersion);
                                                }
-                                               
+
                                                return error("All the Policies has been deleted in Scope. Except the following list of Policies:"+activePoliciesInPDP);
                                        }else{
                                                String policyScopeQuery = "delete PolicyEditorScopes where SCOPENAME like '"+path.replace("\\", "\\\\")+"%' and id >0";
@@ -1401,10 +1407,10 @@ public class PolicyManagerServlet extends HttpServlet {
                        String mode = params.getString("mode");
                        String path = params.getString("path");
                        LOGGER.debug("editFile path: {}"+ path);
-                       
+
                        String domain = path.substring(1, path.lastIndexOf("/"));
                        domain = domain.replace("/", ".");
-                       
+
                        path = path.substring(1);
                        path = path.replace("/", ".");
                        String dbCheckName = path;
@@ -1415,14 +1421,14 @@ public class PolicyManagerServlet extends HttpServlet {
                        }else if(dbCheckName.contains("Decision_")){
                                dbCheckName = dbCheckName.replace(".Decision_", ":Decision_");
                        }
-                       
+
                        String[] split = dbCheckName.split(":");
                        String query = "FROM PolicyEntity where policyName = :split_1 and scope = :split_0";
                        SimpleBindings peParams = new SimpleBindings();
                        peParams.put("split_1", split[1]);
                        peParams.put("split_0", split[0]);
                        List<Object> queryData = null;
-                       if(jUnit){
+                       if(PolicyController.isjUnit()){
                                queryData = controller.getDataByQuery(query, null);
                        }else{
                                queryData = controller.getDataByQuery(query, peParams);
@@ -1432,7 +1438,7 @@ public class PolicyManagerServlet extends HttpServlet {
 
 
                        Object policy = XACMLPolicyScanner.readPolicy(stream);
-                       PolicyRestAdapter policyAdapter  = new PolicyRestAdapter();             
+                       PolicyRestAdapter policyAdapter  = new PolicyRestAdapter();
                        policyAdapter.setData(policy);
 
                        if("viewPolicy".equalsIgnoreCase(mode)){
@@ -1442,7 +1448,7 @@ public class PolicyManagerServlet extends HttpServlet {
                                policyAdapter.setReadOnly(false);
                                policyAdapter.setEditPolicy(true);
                        }
-                       policyAdapter.setDomain(domain);
+                       
                        policyAdapter.setDomainDir(domain);
                        policyAdapter.setPolicyData(policy);
                        String policyName = path.replace(".xml", "");
@@ -1451,7 +1457,7 @@ public class PolicyManagerServlet extends HttpServlet {
 
                        PolicyAdapter setpolicyAdapter = PolicyAdapter.getInstance();
                        setpolicyAdapter.configure(policyAdapter,entity);
-                       
+
                        policyAdapter.setParentPath(null);
                        ObjectMapper mapper = new ObjectMapper();
                        String json = mapper.writeValueAsString(policyAdapter);
@@ -1478,7 +1484,7 @@ public class PolicyManagerServlet extends HttpServlet {
                                        }
                                }else{
                                        name = params.getString("name");
-                               }       
+                               }
                        }catch(Exception e){
                                name = params.getString("name");
                                LOGGER.error(XACMLErrorConstants.ERROR_DATA_ISSUE + "Exception Occured While Adding Scope"+e);
@@ -1493,7 +1499,7 @@ public class PolicyManagerServlet extends HttpServlet {
                                String validate = PolicyUtils.policySpecialCharValidator(validateName);
                                if(!validate.contains("success")){
                                        return error(validate);
-                               } 
+                               }
                        }
                        LOGGER.debug("addFolder path: {} name: {}" + path +name);
                        if(!name.equals("")){
@@ -1508,7 +1514,7 @@ public class PolicyManagerServlet extends HttpServlet {
                                        newScope.setScopeName(name);
                                        newScope.setUserCreatedBy(userInfo);
                                        newScope.setUserModifiedBy(userInfo);
-                                       controller.saveData(newScope);  
+                                       controller.saveData(newScope);
                                }else{
                                        return error("Scope Already Exists");
                                }
@@ -1543,7 +1549,7 @@ public class PolicyManagerServlet extends HttpServlet {
                        throw new ServletException(e);
                }
        }
-       
+
        private PolicyController getPolicyControllerInstance(){
                return policyController != null ? getPolicyController() : new PolicyController();
        }
@@ -1555,4 +1561,4 @@ public class PolicyManagerServlet extends HttpServlet {
        public static void setTestUserId(String testUserId) {
                PolicyManagerServlet.testUserId = testUserId;
        }
-}
\ No newline at end of file
+}