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/26 13:37:12 UTC
svn commit: r1862139 - in
/jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external:
basic/DefaultSyncContext.java impl/DynamicSyncContext.java
impl/principal/ExternalIdentityImporter.java
Author: angela
Date: Wed Jun 26 13:37:12 2019
New Revision: 1862139
URL: http://svn.apache.org/viewvc?rev=1862139&view=rev
Log:
OAK-8321 : Use format specifier for log output
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncContext.java
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DynamicSyncContext.java
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalIdentityImporter.java
Modified: jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncContext.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncContext.java?rev=1862139&r1=1862138&r2=1862139&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncContext.java (original)
+++ jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncContext.java Wed Jun 26 13:37:12 2019
@@ -671,14 +671,12 @@ public class DefaultSyncContext implemen
Value[] values = auth.getProperty(REP_LAST_SYNCED);
if (values == null || values.length == 0) {
if (log.isDebugEnabled()) {
- log.debug("{} of {} '{}' need sync. " + REP_LAST_SYNCED + " not set.",
- type, auth.isGroup() ? "group" : "user", auth.getID());
+ log.debug("{} of {} '{}' need sync. {} not set.", type, auth.isGroup() ? "group" : "user", auth.getID(), REP_LAST_SYNCED);
}
return true;
} else if (now - values[0].getLong() > expirationTime) {
if (log.isDebugEnabled()) {
- log.debug("{} of {} '{}' need sync. " + REP_LAST_SYNCED + " expired ({} > {})",
- type, auth.isGroup() ? "group" : "user", auth.getID(), now - values[0].getLong(), expirationTime);
+ log.debug("{} of {} '{}' need sync. {} expired ({} > {})", type, auth.isGroup() ? "group" : "user", auth.getID(), now - values[0].getLong(), expirationTime, REP_LAST_SYNCED);
}
return true;
} else {
Modified: jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DynamicSyncContext.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DynamicSyncContext.java?rev=1862139&r1=1862138&r2=1862139&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DynamicSyncContext.java (original)
+++ jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DynamicSyncContext.java Wed Jun 26 13:37:12 2019
@@ -131,7 +131,7 @@ public class DynamicSyncContext extends
}
auth.setProperty(ExternalIdentityConstants.REP_EXTERNAL_PRINCIPAL_NAMES, vs);
} catch (ExternalIdentityException e) {
- log.error("Failed to synchronize membership information for external identity " + external.getId(), e);
+ log.error("Failed to synchronize membership information for external identity {}", external.getId(), e);
}
}
}
Modified: jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalIdentityImporter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalIdentityImporter.java?rev=1862139&r1=1862138&r2=1862139&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalIdentityImporter.java (original)
+++ jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalIdentityImporter.java Wed Jun 26 13:37:12 2019
@@ -85,7 +85,7 @@ class ExternalIdentityImporter implement
public void propertiesCompleted(@NotNull Tree protectedParent) {
if (!isSystemSession) {
if (protectedParent.hasProperty(REP_EXTERNAL_PRINCIPAL_NAMES)) {
- log.debug("Found reserved property " + REP_EXTERNAL_PRINCIPAL_NAMES + " managed by the system => Removed from imported scope.");
+ log.debug("Found reserved property {} managed by the system => Removed from imported scope.", REP_EXTERNAL_PRINCIPAL_NAMES);
protectedParent.removeProperty(REP_EXTERNAL_PRINCIPAL_NAMES);
// force creation of rep:externalPrincipalNames by removing the
// rep:lastSynced property as well.