X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=POLICY-SDK-APP%2Fsrc%2Fmain%2Fjava%2Forg%2Fopenecomp%2Fpolicy%2Fcontroller%2FPolicyRolesController.java;h=219342063733f42008448c31a9d0aafe1edb7542;hb=87c95be02a8a4d77e165dede90777e811b59dcae;hp=82090773ccc41daa10e6a1405e25be91352c1e1c;hpb=e0addf5b588a1244f9679becd90999dfcb4c3a94;p=policy%2Fengine.git diff --git a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/controller/PolicyRolesController.java b/POLICY-SDK-APP/src/main/java/org/openecomp/policy/controller/PolicyRolesController.java index 82090773c..219342063 100644 --- a/POLICY-SDK-APP/src/main/java/org/openecomp/policy/controller/PolicyRolesController.java +++ b/POLICY-SDK-APP/src/main/java/org/openecomp/policy/controller/PolicyRolesController.java @@ -31,6 +31,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.json.JSONObject; +import org.openecomp.policy.common.logging.flexlogger.FlexLogger; +import org.openecomp.policy.common.logging.flexlogger.Logger; import org.openecomp.policy.rest.dao.CommonClassDao; import org.openecomp.policy.rest.jpa.PolicyEditorScopes; import org.openecomp.policy.rest.jpa.PolicyRoles; @@ -53,6 +55,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; @RequestMapping("/") public class PolicyRolesController extends RestrictedBaseController{ + private static final Logger LOGGER = FlexLogger.getLogger(PolicyRolesController.class); + @Autowired CommonClassDao commonClassDao; @@ -61,7 +65,7 @@ public class PolicyRolesController extends RestrictedBaseController{ @RequestMapping(value={"/get_RolesData"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE) public void getPolicyRolesEntityData(HttpServletRequest request, HttpServletResponse response){ try{ - Map model = new HashMap(); + Map model = new HashMap<>(); ObjectMapper mapper = new ObjectMapper(); model.put("rolesDatas", mapper.writeValueAsString(commonClassDao.getUserRoles())); JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model)); @@ -69,7 +73,7 @@ public class PolicyRolesController extends RestrictedBaseController{ response.getWriter().write(j.toString()); } catch (Exception e){ - e.printStackTrace(); + LOGGER.error("Exception Occured"+e); } } @@ -105,7 +109,7 @@ public class PolicyRolesController extends RestrictedBaseController{ out.write(j.toString()); } catch (Exception e){ - e.printStackTrace(); + LOGGER.error("Exception Occured"+e); } return null; } @@ -113,8 +117,8 @@ public class PolicyRolesController extends RestrictedBaseController{ @RequestMapping(value={"/get_PolicyRolesScopeData"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE) public void getPolicyScopesEntityData(HttpServletRequest request, HttpServletResponse response){ try{ - scopelist = new ArrayList(); - Map model = new HashMap(); + scopelist = new ArrayList<>(); + Map model = new HashMap<>(); ObjectMapper mapper = new ObjectMapper(); mapper.setVisibility(PropertyAccessor.FIELD, Visibility.ANY); List scopesData = commonClassDao.getDataByColumn(PolicyEditorScopes.class, "scopeName"); @@ -124,7 +128,7 @@ public class PolicyRolesController extends RestrictedBaseController{ response.getWriter().write(j.toString()); } catch (Exception e){ - e.printStackTrace(); + LOGGER.error("Exception Occured"+e); } } }