Sonar cleanup in controllers etc

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

diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/utils/UserUtils.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/utils/UserUtils.java
index 40c8396..f9f93c0 100644 (file)
--- a/POLICY-SDK-APP/src/main/java/org/onap/policy/utils/UserUtils.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/utils/UserUtils.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.
@@ -17,6 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
+
 package org.onap.policy.utils;
 
 import java.util.ArrayList;
@@ -35,18 +36,18 @@ public final class UserUtils {
     }
 
     public static class Pair<T, U> {
-        public final T t;
-        public final U u;
+        public final T first;
+        public final U second;
 
-        public Pair(T t, U u) {
-            this.t = t;
-            this.u = u;
+        public Pair(T first, U second) {
+            this.first = first;
+            this.second = second;
         }
     }
 
     /**
      * Check Role and its Scopes.
-     * 
+     *
      * @param userRoles list of UserRoles.
      * @return return role and scope from UserRole Object.
      */
@@ -75,7 +76,7 @@ public final class UserUtils {
 
     /**
      * Get Role by Scope based on UserRole Object.
-     * 
+     *
      * @param userRoles list of UserRoles.
      * @return return the map<scope, role>.
      */
@@ -94,8 +95,8 @@ public final class UserUtils {
 
     /**
      * Read non super role scopes and add to map.
-     * 
-     * @param userRole  Role Object.
+     *
+     * @param userRole Role Object.
      * @param rolesList roleList Object.
      * @return return the map<scope, role>.
      */
@@ -115,7 +116,7 @@ public final class UserUtils {
 
     /**
      * Trim Scope Value.
-     * 
+     *
      * @param scope string scope name.
      * @return trim scope.
      */