Sonar cleanup in controllers etc

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

diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyController.java
index 40f6be8..7769ac7 100644 (file)
--- a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyController.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyController.java
@@ -435,7 +435,7 @@ public class PolicyController extends RestrictedBaseController {
             } else {
                 userRoles = getRoles(userId);
                 Pair<Set<String>, List<String>> pair = org.onap.policy.utils.UserUtils.checkRoleAndScope(userRoles);
-                roles = pair.u;
+                roles = pair.second;
                 if (!roles.contains(filteredRole)) {
                     savePolicyRoles(name, filteredRole, userId);
                 }
@@ -981,10 +981,10 @@ public class PolicyController extends RestrictedBaseController {
      * @return
      */
     public String convertDate(String dateTimeToLive) {
-        String formateDate = null;
+        String formatDate = null;
         if (dateTimeToLive.contains("-")) {
-            formateDate = dateTimeToLive.replace("-", "/");
+            formatDate = dateTimeToLive.replace("-", "/");
         }
-        return formateDate;
+        return formatDate;
     }
 }