You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2017/03/09 16:10:45 UTC
svn commit: r1786196 - in
/sling/trunk/bundles/jcr/repoinit/src/main/java/org/apache/sling/jcr/repoinit/impl:
UserUtil.java UserVisitor.java
Author: olli
Date: Thu Mar 9 16:10:45 2017
New Revision: 1786196
URL: http://svn.apache.org/viewvc?rev=1786196&view=rev
Log:
improve readability and fix method name
Modified:
sling/trunk/bundles/jcr/repoinit/src/main/java/org/apache/sling/jcr/repoinit/impl/UserUtil.java
sling/trunk/bundles/jcr/repoinit/src/main/java/org/apache/sling/jcr/repoinit/impl/UserVisitor.java
Modified: sling/trunk/bundles/jcr/repoinit/src/main/java/org/apache/sling/jcr/repoinit/impl/UserUtil.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/repoinit/src/main/java/org/apache/sling/jcr/repoinit/impl/UserUtil.java?rev=1786196&r1=1786195&r2=1786196&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/repoinit/src/main/java/org/apache/sling/jcr/repoinit/impl/UserUtil.java (original)
+++ sling/trunk/bundles/jcr/repoinit/src/main/java/org/apache/sling/jcr/repoinit/impl/UserUtil.java Thu Mar 9 16:10:45 2017
@@ -24,7 +24,7 @@ import org.apache.jackrabbit.api.securit
import org.apache.jackrabbit.api.security.user.User;
import org.apache.jackrabbit.api.security.user.UserManager;
-/** Utilities for (Service) Users management */
+/** Utilities for User management */
public class UserUtil {
public static UserManager getUserManager(Session session) throws RepositoryException {
@@ -34,55 +34,55 @@ public class UserUtil {
return ((JackrabbitSession)session).getUserManager();
}
- public static Authorizable getAuthorizable(Session session, String username) throws RepositoryException {
- return getUserManager(session).getAuthorizable(username);
+ public static Authorizable getAuthorizable(Session session, String id) throws RepositoryException {
+ return getUserManager(session).getAuthorizable(id);
}
/** Create a service user - fails if it already exists */
- public static void createServiceUser(Session s, String username) throws RepositoryException {
- getUserManager(s).createSystemUser(username, null);
+ public static void createServiceUser(Session session, String username) throws RepositoryException {
+ getUserManager(session).createSystemUser(username, null);
}
/** True if specified service user exists */
public static boolean serviceUserExists(Session session, String username) throws RepositoryException {
boolean result = false;
- final Authorizable a = getAuthorizable(session, username);
- if(a != null) {
- final User u = (User)a;
- result = u.isSystemUser();
+ final Authorizable authorizable = getAuthorizable(session, username);
+ if(authorizable != null) {
+ final User user = (User)authorizable;
+ result = user.isSystemUser();
}
return result;
}
- public static void deleteUser(Session s, String username) throws RepositoryException {
- final Authorizable a = getUserManager(s).getAuthorizable(username);
- if(a == null) {
- throw new IllegalStateException("Authorizable not found:" + username);
+ public static void deleteUser(Session session, String id) throws RepositoryException {
+ final Authorizable authorizable = getUserManager(session).getAuthorizable(id);
+ if(authorizable == null) {
+ throw new IllegalStateException("Authorizable not found:" + id);
}
- a.remove();
+ authorizable.remove();
}
- /** Create a service user - fails if it already exists */
- public static void createUser(Session s, String username, String password) throws RepositoryException {
- getUserManager(s).createUser(username, password);
+ /** Create a user - fails if it already exists */
+ public static void createUser(Session session, String username, String password) throws RepositoryException {
+ getUserManager(session).createUser(username, password);
}
/** True if specified user exists */
- public static boolean serviceExists(Session session, String username) throws RepositoryException {
+ public static boolean userExists(Session session, String id) throws RepositoryException {
boolean result = false;
- final Authorizable a = getAuthorizable(session, username);
- if (a != null) {
- final User u = (User)a;
- result = !u.isSystemUser();
+ final Authorizable authorizable = getAuthorizable(session, id);
+ if (authorizable != null) {
+ final User user = (User)authorizable;
+ result = !user.isSystemUser(); // TODO
}
return result;
}
public static void deleteServiceUser(Session s, String username) throws RepositoryException {
- final Authorizable a = getUserManager(s).getAuthorizable(username);
- if(a == null) {
+ final Authorizable authorizable = getUserManager(s).getAuthorizable(username);
+ if(authorizable == null) {
throw new IllegalStateException("Authorizable not found:" + username);
}
- a.remove();
+ authorizable.remove();
}
}
Modified: sling/trunk/bundles/jcr/repoinit/src/main/java/org/apache/sling/jcr/repoinit/impl/UserVisitor.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/repoinit/src/main/java/org/apache/sling/jcr/repoinit/impl/UserVisitor.java?rev=1786196&r1=1786195&r2=1786196&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/repoinit/src/main/java/org/apache/sling/jcr/repoinit/impl/UserVisitor.java (original)
+++ sling/trunk/bundles/jcr/repoinit/src/main/java/org/apache/sling/jcr/repoinit/impl/UserVisitor.java Thu Mar 9 16:10:45 2017
@@ -39,61 +39,61 @@ class UserVisitor extends DoNothingVisit
@Override
public void visitCreateServiceUser(CreateServiceUser s) {
- final String id = s.getUsername();
+ final String username = s.getUsername();
try {
- if(!UserUtil.serviceUserExists(session, id)) {
- log.info("Creating service user {}", id);
- UserUtil.createServiceUser(session, id);
+ if(!UserUtil.serviceUserExists(session, username)) {
+ log.info("Creating service user {}", username);
+ UserUtil.createServiceUser(session, username);
} else {
- log.info("Service user {} already exists, no changes made", id);
+ log.info("Service user {} already exists, no changes made", username);
}
} catch(Exception e) {
- report(e, "Unable to create service user [" + id + "]:" + e);
+ report(e, "Unable to create service user [" + username + "]:" + e);
}
}
@Override
public void visitDeleteServiceUser(DeleteServiceUser s) {
- final String id = s.getUsername();
- log.info("Deleting service user {}", id);
+ final String username = s.getUsername();
+ log.info("Deleting service user {}", username);
try {
- UserUtil.deleteServiceUser(session, id);
+ UserUtil.deleteServiceUser(session, username);
} catch(Exception e) {
- report(e, "Unable to delete service user [" + id + "]:" + e);
+ report(e, "Unable to delete service user [" + username + "]:" + e);
}
}
@Override
public void visitCreateUser(CreateUser u) {
- final String id = u.getUsername();
+ final String username = u.getUsername();
try {
- if(!UserUtil.serviceExists(session, id)) {
+ if(!UserUtil.userExists(session, username)) {
final String pwd = u.getPassword();
if(pwd != null) {
// TODO we might revise this warning once we're able
// to create users by providing their encoded password
// using u.getPasswordEncoding - for now I think only cleartext works
- log.warn("Creating user {} with cleartext password - should NOT be used on production systems", id);
+ log.warn("Creating user {} with cleartext password - should NOT be used on production systems", username);
} else {
- log.info("Creating user {}", id);
+ log.info("Creating user {}", username);
}
- UserUtil.createUser(session, id, pwd);
+ UserUtil.createUser(session, username, pwd);
} else {
- log.info("User {} already exists, no changes made", id);
+ log.info("User {} already exists, no changes made", username);
}
} catch(Exception e) {
- report(e, "Unable to create user [" + id + "]:" + e);
+ report(e, "Unable to create user [" + username + "]:" + e);
}
}
@Override
public void visitDeleteUser(DeleteUser u) {
- final String id = u.getUsername();
- log.info("Deleting user {}", id);
+ final String username = u.getUsername();
+ log.info("Deleting user {}", username);
try {
- UserUtil.deleteUser(session, id);
+ UserUtil.deleteUser(session, username);
} catch(Exception e) {
- report(e, "Unable to delete user [" + id + "]:" + e);
+ report(e, "Unable to delete user [" + username + "]:" + e);
}
}