diff options
author | Pamela Dragosh <pdragosh@research.att.com> | 2019-10-11 08:56:16 -0400 |
---|---|---|
committer | Pamela Dragosh <pdragosh@research.att.com> | 2019-10-11 09:53:17 -0400 |
commit | f36e53a3637e1204a42491ec0eeed7b3c763f681 (patch) | |
tree | 903cc402afb1228fe8f96c550b2bf01c572fc41e /POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyRolesController.java | |
parent | b86c95c99240e8ed0ef91932a70ebed313dbd60c (diff) |
More sonar cleanup and line consolidation
Missing javadoc and some variable naming to remove consecutive
capitlization of letters.
120 line width reduction
Missing curly braces
Moving variables due to distance requirements
Add missing rawtype suppression or useless ones
There are some null return statements that are useless
Started doing some combining of lines at the risk of making the
code even more unreadable than it already is.
Started addressing some nested if's.
I see opportunity for a lot of common code to be combined or
put into a base controller or utility method.
Issue-ID: POLICY-2133
Change-Id: I6d4d9618bea685cf1d02899e3a9d4a43919a2a96
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
Diffstat (limited to 'POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyRolesController.java')
-rw-r--r-- | POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyRolesController.java | 28 |
1 files changed, 10 insertions, 18 deletions
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 f416386c5..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. @@ -82,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); } @@ -116,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()); @@ -129,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; @@ -153,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); } @@ -183,9 +177,7 @@ 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); } |