Author: dbrosius
Date: Tue Jul 14 03:55:18 2015
New Revision: 1690860
URL: http://svn.apache.org/r1690860
Log:
fix minor issues with slf4j logging parameters
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoBlobStore.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/UnionQueryImpl.java
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/TokenProviderImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/principal/PrincipalProviderImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AbstractGroupPrincipal.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/query/GroupPredicate.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/PasswordValidationAction.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java?rev=1690860&r1=1690859&r2=1690860&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java
Tue Jul 14 03:55:18 2015
@@ -302,7 +302,7 @@ public class MarkSweepGarbageCollector i
int count = 0;
state = State.SWEEPING;
LOG.debug("Starting sweep phase of the garbage collector");
- LOG.debug("Sweeping blobs with modified time > than the configured max
deleted time ({}). " +
+ LOG.debug("Sweeping blobs with modified time > than the configured max
deleted time ({}). ",
timestampToString(getLastMaxModifiedTime(earliestRefAvailTime)));
ConcurrentLinkedQueue<String> exceptionQueue = new
ConcurrentLinkedQueue<String>();
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoBlobStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoBlobStore.java?rev=1690860&r1=1690859&r2=1690860&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoBlobStore.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoBlobStore.java
Tue Jul 14 03:55:18 2015
@@ -140,7 +140,7 @@ public class MongoBlobStore extends Cach
new BasicDBObject(MongoBlob.KEY_LAST_MOD,
System.currentTimeMillis()));
WriteResult writeResult = getBlobCollection().update(query, update);
if (writeResult.getError() != null) {
- LOG.error("Mark failed for blob %s: %s", id,
writeResult.getError());
+ LOG.error("Mark failed for blob {}: {}", id,
writeResult.getError());
}
}
@@ -150,7 +150,7 @@ public class MongoBlobStore extends Cach
long countBefore = getBlobCollection().count(query);
WriteResult writeResult = getBlobCollection().remove(query);
if (writeResult.getError() != null) {
- LOG.error("Sweep failed: %s", writeResult.getError());
+ LOG.error("Sweep failed: {}", writeResult.getError());
}
long countAfter = getBlobCollection().count(query);
@@ -254,4 +254,4 @@ public class MongoBlobStore extends Cach
}
};
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/UnionQueryImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/UnionQueryImpl.java?rev=1690860&r1=1690859&r2=1690860&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/UnionQueryImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/UnionQueryImpl.java
Tue Jul 14 03:55:18 2015
@@ -42,7 +42,7 @@ import com.google.common.collect.Iterato
*/
public class UnionQueryImpl implements Query {
- private static final Logger LOG = LoggerFactory.getLogger(QueryImpl.class);
+ private static final Logger LOG =
LoggerFactory.getLogger(UnionQueryImpl.class);
private final boolean unionAll;
private final Query left, right;
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=1690860&r1=1690859&r2=1690860&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
Tue Jul 14 03:55:18 2015
@@ -92,7 +92,7 @@ class LoginContextProviderImpl implement
try {
subject = Subject.getSubject(AccessController.getContext());
} catch (SecurityException e) {
- log.debug("Can't check for pre-authenticated subject. Reason:",
e.getMessage());
+ log.debug("Can't check for pre-authenticated subject. Reason: {}",
e.getMessage());
}
return subject;
}
@@ -152,4 +152,4 @@ class LoginContextProviderImpl implement
}
return configuration;
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenProviderImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenProviderImpl.java?rev=1690860&r1=1690859&r2=1690860&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenProviderImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenProviderImpl.java
Tue Jul 14 03:55:18 2015
@@ -186,7 +186,7 @@ class TokenProviderImpl implements Token
*/
@Override
public TokenInfo createToken(@Nonnull String userId, @Nonnull Map<String,
?> attributes) {
- String error = "Failed to create login token. ";
+ String error = "Failed to create login token. {}";
User user = getUser(userId);
NodeUtil tokenParent = getTokenParent(user);
if (tokenParent != null && user != null) {
@@ -336,7 +336,7 @@ class TokenProviderImpl implements Token
return authorizable.getID();
}
} catch (RepositoryException e) {
- log.debug("Cannot determine userID from token: ",
e.getMessage());
+ log.debug("Cannot determine userID from token: {}",
e.getMessage());
}
}
return null;
@@ -375,11 +375,11 @@ class TokenProviderImpl implements Token
root.commit();
} catch (RepositoryException e) {
// error while creating token node.
- log.debug("Error while creating token node ", e.getMessage());
+ log.debug("Error while creating token node {}", e.getMessage());
} catch (CommitFailedException e) {
// conflict while creating token store for this user -> refresh and
// try to get the tree from the updated root.
- log.debug("Conflict while creating token store -> retrying",
e.getMessage());
+ log.debug("Conflict while creating token store -> retrying {}",
e.getMessage());
root.refresh();
Tree parentTree = root.getTree(parentPath);
if (parentTree.exists()) {
@@ -509,7 +509,7 @@ class TokenProviderImpl implements Token
log.debug("Successfully reset token expiration
time.");
return true;
} catch (CommitFailedException e) {
- log.debug("Failed to reset token expiration",
e.getMessage());
+ log.debug("Failed to reset token expiration {}",
e.getMessage());
root.refresh();
}
}
@@ -528,7 +528,7 @@ class TokenProviderImpl implements Token
return true;
}
} catch (CommitFailedException e) {
- log.debug("Error while removing expired token",
e.getMessage());
+ log.debug("Error while removing expired token {}",
e.getMessage());
}
}
return false;
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImpl.java?rev=1690860&r1=1690859&r2=1690860&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImpl.java
Tue Jul 14 03:55:18 2015
@@ -549,7 +549,7 @@ public class AccessControlManagerImpl ex
QueryEngine.NO_BINDINGS, QueryEngine.NO_MAPPINGS);
} catch (ParseException e) {
String msg = "Error while collecting effective policies.";
- log.error(msg, e.getMessage());
+ log.error(msg, e);
throw new RepositoryException(msg, e);
}
}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/principal/PrincipalProviderImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/principal/PrincipalProviderImpl.java?rev=1690860&r1=1690859&r2=1690860&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/principal/PrincipalProviderImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/principal/PrincipalProviderImpl.java
Tue Jul 14 03:55:18 2015
@@ -139,7 +139,7 @@ class PrincipalProviderImpl implements P
try {
return userManager.getAuthorizable(principal);
} catch (RepositoryException e) {
- log.debug("Error while retrieving principal: ", e.getMessage());
+ log.debug("Error while retrieving principal: {}", e.getMessage());
return null;
}
}
@@ -231,4 +231,4 @@ class PrincipalProviderImpl implements P
}
}
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AbstractGroupPrincipal.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AbstractGroupPrincipal.java?rev=1690860&r1=1690859&r2=1690860&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AbstractGroupPrincipal.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AbstractGroupPrincipal.java
Tue Jul 14 03:55:18 2015
@@ -69,7 +69,7 @@ abstract class AbstractGroupPrincipal ex
}
}
} catch (RepositoryException e) {
- log.warn("Failed to determine group membership", e.getMessage());
+ log.warn("Failed to determine group membership: {}",
e.getMessage());
}
// principal doesn't represent a known authorizable or an error
occurred.
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=1690860&r1=1690859&r2=1690860&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 Jul 14 03:55:18 2015
@@ -188,7 +188,7 @@ class UserAuthentication implements Auth
return user.getImpersonation().allows(subject);
}
} catch (RepositoryException e) {
- log.debug("Error while validating impersonation", e.getMessage());
+ log.debug("Error while validating impersonation: {}",
e.getMessage());
}
return false;
}
@@ -234,4 +234,4 @@ class UserAuthentication implements Auth
}
return expired;
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/GroupPredicate.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/GroupPredicate.java?rev=1690860&r1=1690859&r2=1690860&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/GroupPredicate.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/GroupPredicate.java
Tue Jul 14 03:55:18 2015
@@ -71,7 +71,7 @@ class GroupPredicate implements Predicat
}
}
} catch (RepositoryException e) {
- log.debug("Cannot determine group membership for {}",
authorizable, e.getMessage());
+ log.debug("Cannot determine group membership for {}",
authorizable, e);
}
}
return false;
@@ -82,8 +82,8 @@ class GroupPredicate implements Predicat
try {
return authorizable.getID();
} catch (RepositoryException e) {
- log.debug("Error while retrieving ID for authorizable {}",
authorizable, e.getMessage());
+ log.debug("Error while retrieving ID for authorizable {}",
authorizable, e);
}
return null;
}
-}
\ No newline at end of file
+}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/PasswordValidationAction.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/PasswordValidationAction.java?rev=1690860&r1=1690859&r2=1690860&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/PasswordValidationAction.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/PasswordValidationAction.java
Tue Jul 14 03:55:18 2015
@@ -86,7 +86,7 @@ public class PasswordValidationAction ex
try {
pattern = Pattern.compile(constraint);
} catch (PatternSyntaxException e) {
- log.warn("Invalid password constraint: ", e.getMessage());
+ log.warn("Invalid password constraint: {}", e.getMessage());
}
}
@@ -106,4 +106,4 @@ public class PasswordValidationAction ex
}
}
}
-}
\ No newline at end of file
+}
