Author: angela
Date: Tue May 28 09:31:12 2019
New Revision: 1860216
URL: http://svn.apache.org/viewvc?rev=1860216&view=rev
Log:
OAK-8321 : Use format specifier for log output (in o.a.j.o.security.user)
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableIterator.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizablePropertiesImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/ImpersonationImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/MembershipProvider.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserAuthentication.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserManagerImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserPrincipalProvider.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserProvider.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableIterator.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableIterator.java?rev=1860216&r1=1860215&r2=1860216&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableIterator.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableIterator.java
Tue May 28 09:31:12 2019
@@ -101,7 +101,7 @@ final class AuthorizableIterator impleme
return a;
}
} catch (RepositoryException e) {
- log.debug("Failed to access authorizable " + oakPath);
+ log.debug("Failed to access authorizable {}", oakPath);
}
return null;
}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizablePropertiesImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizablePropertiesImpl.java?rev=1860216&r1=1860215&r2=1860216&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizablePropertiesImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizablePropertiesImpl.java
Tue May 28 09:31:12 2019
@@ -229,7 +229,7 @@ class AuthorizablePropertiesImpl impleme
Tree parent = propertyLocation.getParent().getTree();
if (parent == null) {
- log.debug("Unable to determine definition of authorizable property
at " + propertyLocation.getPath());
+ log.debug("Unable to determine definition of authorizable property
at {}", propertyLocation.getPath());
return null;
}
ReadOnlyNodeTypeManager nodeTypeManager =
authorizable.getUserManager().getNodeTypeManager();
@@ -246,8 +246,7 @@ class AuthorizablePropertiesImpl impleme
ReadOnlyNodeTypeManager nodeTypeManager =
authorizable.getUserManager().getNodeTypeManager();
PropertyDefinition def = nodeTypeManager.getDefinition(parent,
property, false);
if (def.isProtected()) {
- throw new ConstraintViolationException(
- "Attempt to set an protected property " +
property.getName());
+ throw new ConstraintViolationException("Attempt to set an
protected property " + property.getName());
}
}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/ImpersonationImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/ImpersonationImpl.java?rev=1860216&r1=1860215&r2=1860216&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/ImpersonationImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/ImpersonationImpl.java
Tue May 28 09:31:12 2019
@@ -70,7 +70,7 @@ class ImpersonationImpl implements Imper
for (final String pName : impersonators) {
Principal p = principalManager.getPrincipal(pName);
if (p == null) {
- log.debug("Impersonator " + pName + " does not correspond
to a known Principal.");
+ log.debug("Impersonator {} does not correspond to a known
Principal.", pName);
p = new PrincipalImpl(pName);
}
s.add(p);
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/MembershipProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/MembershipProvider.java?rev=1860216&r1=1860215&r2=1860216&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/MembershipProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/MembershipProvider.java
Tue May 28 09:31:12 2019
@@ -22,7 +22,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.jcr.RepositoryException;
import com.google.common.collect.Iterators;
import org.apache.jackrabbit.commons.iterator.AbstractLazyIterator;
@@ -172,7 +171,7 @@ class MembershipProvider extends Authori
}
}
} else {
- log.debug("Not a membership reference property " +
propPath);
+ log.debug("Not a membership reference property {}",
propPath);
}
return next;
}
@@ -245,7 +244,7 @@ class MembershipProvider extends Authori
@Override
protected boolean hasProcessedReference(@NotNull String value) {
if (groupContentId.equals(value)) {
- log.warn("Cyclic group membership detected for contentId "
+ groupContentId);
+ log.warn("Cyclic group membership detected for contentId
{}", groupContentId);
return false;
}
return processedRefs.add(value);
@@ -338,7 +337,6 @@ class MembershipProvider extends Authori
* @param groupTree the group to add the member to
* @param newMemberTree the tree of the new member
* @return {@code true} if the member was added
- * @throws RepositoryException if an error occurs
*/
boolean addMember(@NotNull Tree groupTree, @NotNull Tree newMemberTree) {
return writer.addMember(groupTree, getContentID(newMemberTree));
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserAuthentication.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserAuthentication.java?rev=1860216&r1=1860215&r2=1860216&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserAuthentication.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserAuthentication.java
Tue May 28 09:31:12 2019
@@ -195,22 +195,18 @@ class UserAuthentication implements Auth
if (newPasswordObject instanceof String) {
user.changePassword((String) newPasswordObject);
root.commit();
- log.debug("User " + loginId + ": changed user password");
+ log.debug("User {}: changed user password", loginId);
return true;
} else {
- log.warn("Aborted password change for user " + loginId
- + ": provided new password is of incompatible type
"
- + newPasswordObject.getClass().getName());
+ log.warn("Aborted password change for user {}: provided
new password is of incompatible type {}", loginId,
newPasswordObject.getClass().getName());
}
}
} catch (PasswordHistoryException e) {
credentials.setAttribute(e.getClass().getSimpleName(),
e.getMessage());
- log.error("Failed to change password for user " + loginId,
e.getMessage());
- } catch (RepositoryException e) {
- log.error("Failed to change password for user " + loginId,
e.getMessage());
- } catch (CommitFailedException e) {
+ log.error("Failed to change password for user {}: {}", loginId,
e.getMessage());
+ } catch (RepositoryException | CommitFailedException e) {
root.refresh();
- log.error("Failed to change password for user " + loginId,
e.getMessage());
+ log.error("Failed to change password for user {}: {}", loginId,
e.getMessage());
}
return false;
}
@@ -218,10 +214,10 @@ class UserAuthentication implements Auth
private boolean impersonate(AuthInfo info, User user) {
try {
if (user.getID().equals(info.getUserID())) {
- log.debug("User " + info.getUserID() + " wants to impersonate
himself -> success.");
+ log.debug("User {} wants to impersonate himself -> success.",
info.getUserID());
return true;
} else {
- log.debug("User " + info.getUserID() + " wants to impersonate
" + user.getID());
+ log.debug("User {} wants to impersonate {}", info.getUserID(),
user.getID());
Subject subject = new Subject(true, info.getPrincipals(),
Collections.emptySet(), Collections.emptySet());
return user.getImpersonation().allows(subject);
}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java?rev=1860216&r1=1860215&r2=1860216&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java
Tue May 28 09:31:12 2019
@@ -229,7 +229,7 @@ class UserImporter implements ProtectedP
} else {
Authorizable a = userManager.getAuthorizable(parent);
if (a == null) {
- log.debug("Cannot handle protected PropInfo " + propInfo + ".
Node " + parent + " doesn't represent an Authorizable.");
+ log.debug("Cannot handle protected PropInfo {}. Node {}
doesn't represent an Authorizable.", propInfo, parent);
return false;
}
@@ -402,7 +402,7 @@ class UserImporter implements ProtectedP
} // else: parent node is not of type rep:Members or
rep:MemberReferencesList
if (auth == null || !auth.isGroup()) {
- log.debug("Cannot handle protected node " + protectedParent + ".
It nor one of its parents represent a valid Group.");
+ log.debug("Cannot handle protected node {}. It doesn't represent a
valid Group, nor does any of its parents.", protectedParent);
return false;
} else {
currentMembership = getMembership(auth.getPath());
@@ -618,7 +618,7 @@ class UserImporter implements ProtectedP
// handling non-existing members in case of best-effort
if (!nonExisting.isEmpty()) {
- log.debug("ImportBehavior.BESTEFFORT: Found " +
nonExisting.size() + " entries of rep:members pointing to non-existing
authorizables. Adding to rep:members.");
+ log.debug("ImportBehavior.BESTEFFORT: Found {} entries of
rep:members pointing to non-existing authorizables. Adding to rep:members.",
nonExisting.size());
Tree groupTree = root.getTree(gr.getPath());
MembershipProvider membershipProvider =
userManager.getMembershipProvider();
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserManagerImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserManagerImpl.java?rev=1860216&r1=1860215&r2=1860216&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserManagerImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserManagerImpl.java
Tue May 28 09:31:12 2019
@@ -174,7 +174,7 @@ public class UserManagerImpl implements
User user = new UserImpl(userID, userTree, this);
onCreate(user, password);
- log.debug("User created: " + userID);
+ log.debug("User created: {}", userID);
return user;
}
@@ -189,7 +189,7 @@ public class UserManagerImpl implements
User user = new SystemUserImpl(userID, userTree, this);
- log.debug("System user created: " + userID);
+ log.debug("System user created: {}", userID);
return user;
}
@@ -223,7 +223,7 @@ public class UserManagerImpl implements
Group group = new GroupImpl(groupID, groupTree, this);
onCreate(group);
- log.debug("Group created: " + groupID);
+ log.debug("Group created: {}", groupID);
return group;
}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserPrincipalProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserPrincipalProvider.java?rev=1860216&r1=1860215&r2=1860216&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserPrincipalProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserPrincipalProvider.java
Tue May 28 09:31:12 2019
@@ -310,10 +310,10 @@ class UserPrincipalProvider implements P
Tree cache = authorizableNode.getChild(CacheConstants.REP_CACHE);
if (!cache.exists()) {
if (groupPrincipals.size() <= MEMBERSHIP_THRESHOLD) {
- log.debug("Omit cache creation for user without group
membership at " + authorizableNode.getPath());
+ log.debug("Omit cache creation for user without group
membership at {}", authorizableNode.getPath());
return;
} else {
- log.debug("Create new group membership cache at " +
authorizableNode.getPath());
+ log.debug("Create new group membership cache at {}",
authorizableNode.getPath());
cache = TreeUtil.addChild(authorizableNode,
CacheConstants.REP_CACHE, CacheConstants.NT_REP_CACHE);
}
}
@@ -328,12 +328,10 @@ class UserPrincipalProvider implements P
cache.setProperty(CacheConstants.REP_GROUP_PRINCIPAL_NAMES, value);
root.commit(CacheValidatorProvider.asCommitAttributes());
- log.debug("Cached group membership at " +
authorizableNode.getPath());
+ log.debug("Cached group membership at {}",
authorizableNode.getPath());
- } catch (AccessDeniedException e) {
- log.debug("Failed to cache group membership", e.getMessage());
- } catch (CommitFailedException e) {
- log.debug("Failed to cache group membership", e.getMessage(), e);
+ } catch (AccessDeniedException | CommitFailedException e) {
+ log.debug("Failed to cache group membership: {}", e.getMessage());
} finally {
root.refresh();
}
@@ -343,12 +341,12 @@ class UserPrincipalProvider implements P
private Set<Principal> readGroupsFromCache(@NotNull Tree authorizableNode)
{
Tree principalCache =
authorizableNode.getChild(CacheConstants.REP_CACHE);
if (!principalCache.exists()) {
- log.debug("No group cache at " + authorizableNode.getPath());
+ log.debug("No group cache at {}", authorizableNode.getPath());
return null;
}
if (isValidCache(principalCache)) {
- log.debug("Reading group membership at " +
authorizableNode.getPath());
+ log.debug("Reading group membership at {}",
authorizableNode.getPath());
String str = TreeUtil.getString(principalCache,
CacheConstants.REP_GROUP_PRINCIPAL_NAMES);
if (str == null || str.isEmpty()) {
@@ -362,7 +360,7 @@ class UserPrincipalProvider implements P
}
return groups;
} else {
- log.debug("Expired group cache for " + authorizableNode.getPath());
+ log.debug("Expired group cache for {}",
authorizableNode.getPath());
return null;
}
}
@@ -432,7 +430,7 @@ class UserPrincipalProvider implements P
// Group Principal implementations that retrieve member information on
demand
//--------------------------------------------------------------------------
- private static abstract class BaseGroupPrincipal extends
AbstractGroupPrincipal {
+ private abstract static class BaseGroupPrincipal extends
AbstractGroupPrincipal {
private final Root root;
private final UserConfiguration config;
@@ -445,6 +443,7 @@ class UserPrincipalProvider implements P
this.config = config;
}
+ @NotNull
@Override
UserManager getUserManager() {
if (userManager == null) {
@@ -510,19 +509,21 @@ class UserPrincipalProvider implements P
super(principalName, "", namePathMapper, root, config);
}
+ @Nullable
@Override
String getOakPath() {
String groupPath = getPath();
return (groupPath == null) ? null :
getNamePathMapper().getOakPath(getPath());
}
+ @Nullable
@Override
public String getPath() {
try {
org.apache.jackrabbit.api.security.user.Group gr = getGroup();
return (gr == null) ? null : gr.getPath();
} catch (RepositoryException e) {
- log.error("Failed to retrieve path from group principal",
e.getMessage());
+ log.error("Failed to retrieve path from group principal: {}",
e.getMessage());
return null;
}
}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserProvider.java?rev=1860216&r1=1860215&r2=1860216&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserProvider.java
Tue May 28 09:31:12 2019
@@ -311,7 +311,7 @@ class UserProvider extends AuthorizableB
Tree colliding = folder.getChild(nodeName);
String primaryType = TreeUtil.getPrimaryTypeName(colliding);
if (NT_REP_AUTHORIZABLE_FOLDER.equals(primaryType)) {
- log.debug("Existing folder node collides with user/group to be
created. Expanding path by: " + colliding.getName());
+ log.debug("Existing folder node collides with user/group to be
created. Expanding path by: {}", colliding.getName());
folder = colliding;
} else {
break;
