You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by an...@apache.org on 2019/06/03 10:26:45 UTC
svn commit: r1860550 - in
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security:
authentication/ authentication/token/ authorization/accesscontrol/
authorization/permission/ authorization/restriction/ privilege/ user/query/
Author: angela
Date: Mon Jun 3 10:26:45 2019
New Revision: 1860550
URL: http://svn.apache.org/viewvc?rev=1860550&view=rev
Log:
OAK-8321 : Use format specifier for log output
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/LoginContextProviderImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenLoginModule.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlImporter.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/CompiledPermissionImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryCache.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStoreEditor.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/RestrictionProviderImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeManagerImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/ResultRowToAuthorizable.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManager.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/LoginContextProviderImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/LoginContextProviderImpl.java?rev=1860550&r1=1860549&r2=1860550&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/LoginContextProviderImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/LoginContextProviderImpl.java Mon Jun 3 10:26:45 2019
@@ -142,7 +142,7 @@ class LoginContextProviderImpl implement
loginConfig = null;
}
} catch (SecurityException e) {
- log.info("Failed to retrieve login configuration: using default. " + e);
+ log.info("Failed to retrieve login configuration: using default. {}", e);
}
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenLoginModule.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenLoginModule.java?rev=1860550&r1=1860549&r2=1860550&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenLoginModule.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenLoginModule.java Mon Jun 3 10:26:45 2019
@@ -173,7 +173,7 @@ public final class TokenLoginModule exte
// failed to create token -> fail commit()
onError();
Object logId = sharedState.get(SHARED_KEY_LOGIN_NAME);
- log.error("TokenProvider failed to create a login token for user " + logId);
+ log.error("TokenProvider failed to create a login token for user {}", logId);
throw new LoginException("Failed to create login token for user " + logId);
}
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlImporter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlImporter.java?rev=1860550&r1=1860549&r2=1860550&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlImporter.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlImporter.java Mon Jun 3 10:26:45 2019
@@ -259,7 +259,7 @@ public class AccessControlImporter imple
if (principal == null) {
switch (importBehavior) {
case ImportBehavior.IGNORE:
- log.debug("Unknown principal " + principalName + " -> Ignoring this ACE.");
+ log.debug("Unknown principal {} -> Ignoring this ACE.", principalName);
ignore = true;
break;
case ImportBehavior.ABORT:
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/CompiledPermissionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/CompiledPermissionImpl.java?rev=1860550&r1=1860549&r2=1860550&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/CompiledPermissionImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/CompiledPermissionImpl.java Mon Jun 3 10:26:45 2019
@@ -192,7 +192,7 @@ final class CompiledPermissionImpl imple
} else {
Tree versionableTree = getVersionManager().getVersionable(tree, workspaceName);
if (versionableTree == null) {
- log.warn("Cannot retrieve versionable node for " + tree.getPath());
+ log.warn("Cannot retrieve versionable node for {}", tree.getPath());
return EMPTY;
} else {
/*
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryCache.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryCache.java?rev=1860550&r1=1860549&r2=1860550&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryCache.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionEntryCache.java Mon Jun 3 10:26:45 2019
@@ -77,7 +77,7 @@ class PermissionEntryCache {
}
}
} else {
- log.error("Failed to load entries for principal '%s' at path %s", principalName, path);
+ log.error("Failed to load entries for principal '{}' at path {}", principalName, path);
}
}
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStoreEditor.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStoreEditor.java?rev=1860550&r1=1860549&r2=1860550&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStoreEditor.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStoreEditor.java Mon Jun 3 10:26:45 2019
@@ -237,7 +237,7 @@ final class PermissionStoreEditor implem
long numEntries = ((ps == null) ? 0 : ps.getValue(Type.LONG)) + cnt;
if (numEntries < 0) {
// numEntries unexpectedly turned negative
- log.error("NumEntries counter for principal '"+principalName+"' turned negative -> removing 'rep:numPermissions' property.");
+ log.error("NumEntries counter for principal '{}' turned negative -> removing 'rep:numPermissions' property.", principalName);
principalRoot.removeProperty(REP_NUM_PERMISSIONS);
} else {
principalRoot.setProperty(REP_NUM_PERMISSIONS, numEntries, Type.LONG);
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/RestrictionProviderImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/RestrictionProviderImpl.java?rev=1860550&r1=1860549&r2=1860550&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/RestrictionProviderImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/RestrictionProviderImpl.java Mon Jun 3 10:26:45 2019
@@ -126,7 +126,7 @@ public class RestrictionProviderImpl ext
} else if (REP_ITEM_NAMES.equals(name)) {
patterns.add(new ItemNamePattern(r.getProperty().getValue(Type.NAMES)));
} else {
- log.debug("Ignoring unsupported restriction " + name);
+ log.debug("Ignoring unsupported restriction {}", name);
}
}
return CompositePattern.create(patterns);
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeManagerImpl.java?rev=1860550&r1=1860549&r2=1860550&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeManagerImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeManagerImpl.java Mon Jun 3 10:26:45 2019
@@ -179,7 +179,7 @@ class PrivilegeManagerImpl implements Pr
Set<Privilege> declaredAggregates = new HashSet<>(declaredAggregateNames.size());
for (String oakName : declaredAggregateNames) {
if (oakName.equals(definition.getName())) {
- log.warn("Found cyclic privilege aggregation -> ignore declared aggregate " + oakName);
+ log.warn("Found cyclic privilege aggregation -> ignore declared aggregate {}", oakName);
continue;
}
PrivilegeDefinition def = getPrivilegeDefinition(oakName);
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/ResultRowToAuthorizable.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/ResultRowToAuthorizable.java?rev=1860550&r1=1860549&r2=1860550&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/ResultRowToAuthorizable.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/ResultRowToAuthorizable.java Mon Jun 3 10:26:45 2019
@@ -75,7 +75,7 @@ class ResultRowToAuthorizable implements
authorizable = userManager.getAuthorizable(tree);
}
} catch (RepositoryException e) {
- log.debug("Failed to access authorizable " + resultPath);
+ log.debug("Failed to access authorizable {}", resultPath);
}
}
return authorizable;
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManager.java?rev=1860550&r1=1860549&r2=1860550&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManager.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/UserQueryManager.java Mon Jun 3 10:26:45 2019
@@ -233,7 +233,7 @@ public class UserQueryManager {
if (bound != null) {
if (sortCol == null) {
- log.warn("Ignoring bound {} since no sort order is specified");
+ log.warn("Ignoring bound {} since no sort order is specified", bound);
} else {
Condition boundCondition = builder.property(sortCol, QueryUtil.getCollation(sortDir), bound);
if (condition == null) {
@@ -339,7 +339,7 @@ public class UserQueryManager {
return authorizableIds.add(input.getID());
}
} catch (RepositoryException e) {
- log.debug("Failed to retrieve authorizable ID " + e.getMessage());
+ log.debug("Failed to retrieve authorizable ID {}", e.getMessage());
}
return false;
}