el.put("modifiedBy", getUserName(policy.getModifiedBy()));
resultList.add(el);
}
- }else if(!scopes.isEmpty()){
- if(scopes.contains(scopeNameValue)){
+ }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("date", policy.getModifiedDate());
el.put("createdBy", getUserName(policy.getCreatedBy()));
el.put("modifiedBy", getUserName(policy.getModifiedBy()));
resultList.add(el);
- }
}
}
}
validateName = name;
}
if(!name.isEmpty()){
- String validate = PolicyUtils.emptyPolicyValidator(validateName);
+ String validate = PolicyUtils.policySpecialCharValidator(validateName);
if(!validate.contains("success")){
return error(validate);
}