Revert "AuthenticatedUser not to expose internal

implementation"

This reverts commit 37e5de08510c2d8c0bc5942aea527105f6795ef1.

Change-Id: I059f7b3f01732e55ae943303e7855c2a2c222706
Signed-off-by: Ed Warnicke <eaw@cisco.com>

diff --git a/opendaylight/usermanager/api/src/main/java/org/opendaylight/controller/usermanager/AuthenticatedUser.java b/opendaylight/usermanager/api/src/main/java/org/opendaylight/controller/usermanager/AuthenticatedUser.java
index 809ca134f77cf4cb62e4517d152b0e8b9342f9cd..94200e66e077e440fe379711904ca5720dd130f4 100644 (file)
--- a/opendaylight/usermanager/api/src/main/java/org/opendaylight/controller/usermanager/AuthenticatedUser.java
+++ b/opendaylight/usermanager/api/src/main/java/org/opendaylight/controller/usermanager/AuthenticatedUser.java
@@ -10,7 +10,6 @@ package org.opendaylight.controller.usermanager;
 
 import java.io.Serializable;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
@@ -48,7 +47,7 @@ public class AuthenticatedUser implements Serializable {
     }
 
     public List<String> getUserRoles() {
-        return userRoles == null ? Collections.<String> emptyList() : new ArrayList<String>(userRoles);
+        return userRoles;
     }
 
     public void addUserRole(String string) {

diff --git a/opendaylight/usermanager/api/src/test/java/org/opendaylight/controller/usermanager/AuthenticatedUserTest.java b/opendaylight/usermanager/api/src/test/java/org/opendaylight/controller/usermanager/AuthenticatedUserTest.java
index d32799e3eb7462fc223a1af458a179a5c3a3782d..b8a1a987694cfec72ae8898256cabe1e12e0fe7f 100644 (file)
--- a/opendaylight/usermanager/api/src/test/java/org/opendaylight/controller/usermanager/AuthenticatedUserTest.java
+++ b/opendaylight/usermanager/api/src/test/java/org/opendaylight/controller/usermanager/AuthenticatedUserTest.java
@@ -8,15 +8,15 @@
 
 package org.opendaylight.controller.usermanager;
 
-import java.util.Arrays;
-import java.util.List;
-
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.opendaylight.controller.sal.authorization.UserLevel;
 import org.springframework.security.core.GrantedAuthority;
 
+import java.util.Arrays;
+import java.util.List;
+
 public class AuthenticatedUserTest {
 
         static String[] roleArray;
@@ -33,7 +33,7 @@ public class AuthenticatedUserTest {
                 user = new AuthenticatedUser("auser");
 
                 Assert.assertFalse(user.getAccessDate().isEmpty());
-        Assert.assertNotNull(user.getUserRoles());
+                Assert.assertNull(user.getUserRoles());
         }
 
         @Test