X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=POLICY-SDK-APP%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fcontroller%2FPolicyRolesController.java;h=4e16a0ab4327b598c1ed367e9655666b67d63527;hb=f36e53a3637e1204a42491ec0eeed7b3c763f681;hp=29fdecdaa2e921900937e143c19a08b832e380d9;hpb=b831c6a3df8e1dc9017ae5e8ad002dc3b1002aab;p=policy%2Fengine.git

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 29fdecdaa..4e16a0ab4 100644
--- 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
@@ -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.
@@ -34,7 +34,8 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
+import lombok.Getter;
+import lombok.Setter;
 import org.json.JSONObject;
 import org.onap.policy.common.logging.flexlogger.FlexLogger;
 import org.onap.policy.common.logging.flexlogger.Logger;
@@ -81,9 +82,7 @@ public class PolicyRolesController extends RestrictedBaseController {
             Map<String, Object> model = new HashMap<>();
             ObjectMapper mapper = new ObjectMapper();
             model.put("rolesDatas", mapper.writeValueAsString(commonClassDao.getUserRoles()));
-            JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model));
-            JSONObject j = new JSONObject(msg);
-            response.getWriter().write(j.toString());
+            response.getWriter().write(new JSONObject(new JsonMessage(mapper.writeValueAsString(model))).toString());
         } catch (Exception e) {
             LOGGER.error("Exception Occured" + e);
         }
@@ -115,11 +114,11 @@ public class PolicyRolesController extends RestrictedBaseController {
                 }
             }
             LOGGER.info(
-                    "****************************************Logging UserID for Roles Function********************************************************");
+                    "*************************Logging UserID for Roles Function***********************************");
             LOGGER.info("UserId:  " + userId + "Updating the Scope for following user" + adapter.getLoginId()
                     + "ScopeNames" + adapter.getScope());
             LOGGER.info(
-                    "*********************************************************************************************************************************");
+                    "*********************************************************************************************");
             UserInfo userInfo = new UserInfo();
             userInfo.setUserLoginId(adapter.getLoginId().getUserName());
             userInfo.setUserName(adapter.getLoginId().getUserName());
@@ -128,11 +127,11 @@ public class PolicyRolesController extends RestrictedBaseController {
             if (adapter.getId() == 0 && "mechid".equals(adapter.getRole())) {
                 // Save new mechid scopes entity data.
                 LOGGER.info(
-                        "****************************************Logging UserID for New Mechid Function***************************************************");
+                        "*********************Logging UserID for New Mechid Function********************************");
                 LOGGER.info("UserId:" + userId + "Adding new mechid-scopes for following user" + adapter.getLoginId()
                         + "ScopeNames " + adapter.getScope());
                 LOGGER.info(
-                        "*********************************************************************************************************************************");
+                        "*******************************************************************************************");
                 // First add the mechid to userinfo
                 commonClassDao.save(userInfo);
                 checkNew = true;
@@ -152,12 +151,8 @@ public class PolicyRolesController extends RestrictedBaseController {
             response.setCharacterEncoding("UTF-8");
             response.setContentType("application / json");
             request.setCharacterEncoding("UTF-8");
-
-            PrintWriter out = response.getWriter();
-            String responseString = mapper.writeValueAsString(commonClassDao.getUserRoles());
-            JSONObject j = new JSONObject("{rolesDatas: " + responseString + "}");
-
-            out.write(j.toString());
+            response.getWriter().write(new JSONObject("{rolesDatas: "
+                + mapper.writeValueAsString(commonClassDao.getUserRoles()) + "}").toString());
         } catch (Exception e) {
             LOGGER.error("Exception Occured" + e);
         }
@@ -182,52 +177,18 @@ public class PolicyRolesController extends RestrictedBaseController {
             mapper.setVisibility(PropertyAccessor.FIELD, Visibility.ANY);
             List<String> scopesData = commonClassDao.getDataByColumn(PolicyEditorScopes.class, "scopeName");
             model.put("scopeDatas", mapper.writeValueAsString(scopesData));
-            JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model));
-            JSONObject j = new JSONObject(msg);
-            response.getWriter().write(j.toString());
+            response.getWriter().write(new JSONObject(new JsonMessage(mapper.writeValueAsString(model))).toString());
         } catch (Exception e) {
             LOGGER.error("Exception Occured" + e);
         }
     }
 }
 
-
+@Setter
+@Getter
 class ReadScopes {
     private int id;
     private UserInfo loginId;
     private String role;
     private List<String> scope;
-
-    public int getId() {
-        return id;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    public UserInfo getLoginId() {
-        return loginId;
-    }
-
-    public void setLoginId(UserInfo loginId) {
-        this.loginId = loginId;
-    }
-
-    public String getRole() {
-        return role;
-    }
-
-    public void setRole(String role) {
-        this.role = role;
-    }
-
-    public List<String> getScope() {
-        return scope;
-    }
-
-    public void setScope(List<String> scope) {
-        this.scope = scope;
-    }
-
 }