Rename Users.CURRENT to UserId.CURRENT

Author: rogersteblerbsi

code/contacts/org.eclipse.scout.contacts.server/src/main/java/org/eclipse/scout/contacts/server/ServerSession.java

@@ -11,7 +11,7 @@
 
 import org.eclipse.scout.rt.server.AbstractServerSession;
 import org.eclipse.scout.rt.server.session.ServerSessionProvider;
-import org.eclipse.scout.rt.shared.user.Users;
+import org.eclipse.scout.rt.shared.user.UserId;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -33,6 +33,6 @@ public static ServerSession get() {
 
   @Override
   protected void execLoadSession() {
-    LOG.info("initialized server session for user {}", Users.CURRENT.get());
+    LOG.info("initialized server session for user {}", UserId.CURRENT.get());
   }
 }

code/contacts/org.eclipse.scout.contacts.shared/src/main/java/org/eclipse/scout/contacts/shared/security/AccessControlService.java

@@ -12,10 +12,10 @@
 import org.eclipse.scout.rt.security.AbstractAccessControlService;
 import org.eclipse.scout.rt.security.IAccessControlService;
 import org.eclipse.scout.rt.security.IPermissionCollection;
-import org.eclipse.scout.rt.shared.user.Users;
+import org.eclipse.scout.rt.shared.user.UserId;
 
 /**
- * {@link IAccessControlService} service that uses {@link Users#CURRENT} as internal cache key required by
+ * {@link IAccessControlService} service that uses {@link UserId#CURRENT} as internal cache key required by
  * {@link AbstractAccessControlService} implementation.
  * <p>
  * Replace this service at server side to load permission collection. It is <b>not</b> required to implement
@@ -25,7 +25,7 @@ public class AccessControlService extends AbstractAccessControlService<String> {
 
   @Override
   protected String getCurrentUserCacheKey() {
-    return Users.CURRENT.get();
+    return UserId.CURRENT.get();
   }
 
   @Override

code/widgets/org.eclipse.scout.jswidgets.ui.html/src/main/java/org/eclipse/scout/jswidgets/ui/html/security/AccessControlService.java

@@ -13,7 +13,7 @@
 import org.eclipse.scout.rt.security.AbstractAccessControlService;
 import org.eclipse.scout.rt.security.AllPermissionCollection;
 import org.eclipse.scout.rt.security.IPermissionCollection;
-import org.eclipse.scout.rt.shared.user.Users;
+import org.eclipse.scout.rt.shared.user.UserId;
 
 /**
  * Implementation of {@link org.eclipse.scout.rt.security.IAccessControlService}
@@ -22,7 +22,7 @@ public class AccessControlService extends AbstractAccessControlService<String> {
 
   @Override
   protected String getCurrentUserCacheKey() {
-    return Users.CURRENT.get();
+    return UserId.CURRENT.get();
   }
 
   @Override

code/widgets/org.eclipse.scout.widgets.shared/src/main/java/org/eclipse/scout/widgets/shared/services/AccessControlService.java

@@ -13,7 +13,7 @@
 import org.eclipse.scout.rt.security.AbstractAccessControlService;
 import org.eclipse.scout.rt.security.AllPermissionCollection;
 import org.eclipse.scout.rt.security.IPermissionCollection;
-import org.eclipse.scout.rt.shared.user.Users;
+import org.eclipse.scout.rt.shared.user.UserId;
 
 /**
  * Implementation of {@link org.eclipse.scout.rt.security.IAccessControlService}
@@ -22,7 +22,7 @@ public class AccessControlService extends AbstractAccessControlService<String> {
 
   @Override
   protected String getCurrentUserCacheKey() {
-    return Users.CURRENT.get();
+    return UserId.CURRENT.get();
   }
 
   @Override