Merge "Added Junits for POLICY-SDK-APP controllers"

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

diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyRolesController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyRolesController.java
index 798a39d..daf3d6c 100644 (file)
--- a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyRolesController.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyRolesController.java
@@ -61,6 +61,10 @@ public class PolicyRolesController extends RestrictedBaseController{
        @Autowired
        CommonClassDao commonClassDao;
        
+       public void setCommonClassDao(CommonClassDao commonClassDao) {
+               this.commonClassDao = commonClassDao;
+       }
+       
        List<String> scopelist;
        
        @RequestMapping(value={"/get_RolesData"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
@@ -81,7 +85,7 @@ public class PolicyRolesController extends RestrictedBaseController{
        @RequestMapping(value={"/save_NonSuperRolesData"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
        public ModelAndView SaveRolesEntityData(HttpServletRequest request, HttpServletResponse response){
                try{
-                       String scopeName = null;
+                       StringBuilder scopeName = new StringBuilder();
                        ObjectMapper mapper = new ObjectMapper();
                        mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
                        String userId = UserUtils.getUserSession(request).getOrgUserId();
@@ -89,9 +93,9 @@ public class PolicyRolesController extends RestrictedBaseController{
                    ReadScopes adapter = mapper.readValue(root.get("editRoleData").toString(), ReadScopes.class);
                    for(int i = 0; i < adapter.getScope().size(); i++){
                        if(i == 0){
-                               scopeName       =       adapter.getScope().get(0);
+                               scopeName.append(adapter.getScope().get(0));
                        }else{
-                               scopeName       =       scopeName + "," + adapter.getScope().get(i);
+                               scopeName.append("," + adapter.getScope().get(i));
                        }       
                    }
                    LOGGER.info("****************************************Logging UserID for Roles Function********************************************************");
@@ -101,7 +105,7 @@ public class PolicyRolesController extends RestrictedBaseController{
                    roles.setId(adapter.getId());
                    roles.setLoginId(adapter.getLoginId());
                    roles.setRole(adapter.getRole());
-                   roles.setScope(scopeName);
+                   roles.setScope(scopeName.toString());
                    commonClassDao.update(roles);
                    response.setCharacterEncoding("UTF-8");
                        response.setContentType("application / json");
@@ -142,7 +146,7 @@ class ReadScopes{
        private int id;
        private UserInfo loginId;
        private String role;
-       private ArrayList<String> scope;
+       private List<String> scope;
        
        public int getId() {
                return id;
@@ -162,10 +166,10 @@ class ReadScopes{
        public void setRole(String role) {
                this.role = role;
        }
-       public ArrayList<String> getScope() {
+       public List<String> getScope() {
                return scope;
        }
-       public void setScope(ArrayList<String> scope) {
+       public void setScope(List<String> scope) {
                this.scope = scope;
        }