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 2021/05/11 14:57:43 UTC
svn commit: r1889761 - in /jackrabbit/oak/trunk:
oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/
oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/
...
Author: angela
Date: Tue May 11 14:57:42 2021
New Revision: 1889761
URL: http://svn.apache.org/viewvc?rev=1889761&view=rev
Log:
OAK-9426 : Drop usage of log.isDebugEnabled
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/ExternalLoginModule.java
jackrabbit/oak/trunk/oak-auth-ldap/src/main/java/org/apache/jackrabbit/oak/security/authentication/ldap/impl/LdapIdentityProvider.java
jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/DebugTimer.java
jackrabbit/oak/trunk/oak-core/pom.xml
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/permission/PermissionStoreImpl.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=1889761&r1=1889760&r2=1889761&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 Tue May 11 14:57:42 2021
@@ -155,6 +155,7 @@ public class DefaultSyncContext implemen
* @return the concatenated path
* @deprecated Since Oak 1.3.10. Please use {@link PathUtils#concatRelativePaths(String...)} instead.
*/
+ @Deprecated
public static String joinPaths(String... paths) {
return PathUtils.concatRelativePaths(paths);
}
@@ -257,7 +258,7 @@ public class DefaultSyncContext implemen
} else {
throw new IllegalArgumentException("identity must be user or group but was: " + identity);
}
- debug("sync({}) -> {} {}", ref.getString(), identity.getId(), timer.getString());
+ log.debug("sync({}) -> {} {}", ref.getString(), identity.getId(), timer);
if (created) {
ret.setStatus(SyncResult.Status.ADD);
}
@@ -306,7 +307,7 @@ public class DefaultSyncContext implemen
timer.mark("sync");
}
}
- debug("sync({}) -> {} {}", id, ref.getString(), timer.getString());
+ log.debug("sync({}) -> {} {}", id, ref.getString(), timer);
return ret;
} catch (RepositoryException | ExternalIdentityException e) {
throw new SyncException(e);
@@ -502,7 +503,7 @@ public class DefaultSyncContext implemen
if (depth <= 0) {
return;
}
- debug("Syncing membership '{}' -> '{}'", external.getExternalId().getString(), auth.getID());
+ log.debug("Syncing membership '{}' -> '{}'", external.getExternalId().getString(), auth.getID());
final DebugTimer timer = new DebugTimer();
Iterable<ExternalIdentityRef> externalGroups;
@@ -585,7 +586,7 @@ public class DefaultSyncContext implemen
log.debug("- removing member '{}' for group '{}'", auth.getID(), grp.getID());
}
timer.mark("removing");
- debug("syncMembership({}) {}", external.getId(), timer.getString());
+ log.debug("syncMembership({}) {}", external.getId(), timer);
}
/**
@@ -665,13 +666,13 @@ public class DefaultSyncContext implemen
protected boolean isExpired(@NotNull Authorizable auth, long expirationTime, @NotNull String type) throws RepositoryException {
Value[] values = auth.getProperty(REP_LAST_SYNCED);
if (values == null || values.length == 0) {
- debug("{} of {} '{}' need sync. {} not set.", type, auth.isGroup() ? "group" : "user", auth.getID(), REP_LAST_SYNCED);
+ log.debug("{} of {} '{}' need sync. {} not set.", type, authType(auth), auth.getID(), REP_LAST_SYNCED);
return true;
} else if (now - values[0].getLong() > expirationTime) {
- debug("{} of {} '{}' need sync. {} expired ({} > {})", type, auth.isGroup() ? "group" : "user", auth.getID(), now - values[0].getLong(), expirationTime, REP_LAST_SYNCED);
+ log.debug("{} of {} '{}' need sync. {} expired ({} > {})", type, authType(auth), auth.getID(), now - values[0].getLong(), expirationTime, REP_LAST_SYNCED);
return true;
} else {
- debug("{} of {} '{}' do not need sync.", type, auth.isGroup() ? "group" : "user", auth.getID());
+ log.debug("{} of {} '{}' do not need sync.", type, authType(auth), auth.getID());
return false;
}
}
@@ -756,9 +757,7 @@ public class DefaultSyncContext implemen
return idp.getName().equals(ref.getProviderName());
}
- private static void debug(@NotNull String mgs, @NotNull Object... objects) {
- if (log.isDebugEnabled()) {
- log.debug(mgs, objects);
- }
+ private static String authType(@NotNull Authorizable a) {
+ return a.isGroup() ? "group" : "user";
}
}
Modified: jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModule.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/ExternalLoginModule.java?rev=1889761&r1=1889760&r2=1889761&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModule.java (original)
+++ jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModule.java Tue May 11 14:57:42 2021
@@ -249,7 +249,7 @@ public class ExternalLoginModule extends
credentials = creds;
return true;
} else {
- debug("IDP {} returned null for {}", idp.getName(), logId.toString());
+ log.debug("IDP {} returned null for {}", idp.getName(), logId);
if (sId != null) {
// invalidate the user if it exists as synced variant
@@ -365,15 +365,15 @@ public class ExternalLoginModule extends
if (syncedIdentity != null) {
ExternalIdentityRef externalIdRef = syncedIdentity.getExternalIdRef();
if (externalIdRef == null) {
- debug("ignoring local user: {}", syncedIdentity.getId());
+ log.debug("ignoring local user: {}", syncedIdentity.getId());
return true;
} else if (!idp.getName().equals(externalIdRef.getProviderName())) {
- debug("ignoring foreign identity: {} (idp={})", externalIdRef.getString(), idp.getName());
+ log.debug("ignoring foreign identity: {} (idp={})", externalIdRef.getString(), idp.getName());
return true;
}
if (preAuthLogin != null && !syncHandler.requiresSync(syncedIdentity)) {
- debug("pre-authenticated external user {} does not require syncing.", syncedIdentity.toString());
+ log.debug("pre-authenticated external user {} does not require syncing.", syncedIdentity);
return true;
}
}
@@ -401,7 +401,7 @@ public class ExternalLoginModule extends
root.commit();
timer.mark("commit");
}
- debug("syncUser({}) {}, status: {}", user.getId(), timer.getString(), syncResult.getStatus().toString());
+ log.debug("syncUser({}) {}, status: {}", user.getId(), timer, syncResult.getStatus());
monitor.doneSyncExternalIdentity(watch.elapsed(NANOSECONDS), syncResult, numAttempt-1);
success = true;
} catch (CommitFailedException e) {
@@ -432,7 +432,7 @@ public class ExternalLoginModule extends
timer.mark("sync");
root.commit();
timer.mark("commit");
- debug("validateUser({}) {}", id, timer.getString());
+ log.debug("validateUser({}) {}", id, timer);
monitor.doneSyncId(watch.elapsed(NANOSECONDS), syncResult);
} catch (CommitFailedException e) {
throw new SyncException("User synchronization failed during commit.", e);
@@ -477,12 +477,6 @@ public class ExternalLoginModule extends
return userManager;
}
- private static void debug(@NotNull String msg, String... args) {
- if (log.isDebugEnabled()) {
- log.debug(msg, args);
- }
- }
-
//------------------------------------------------< AbstractLoginModule >---
@Override
Modified: jackrabbit/oak/trunk/oak-auth-ldap/src/main/java/org/apache/jackrabbit/oak/security/authentication/ldap/impl/LdapIdentityProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-ldap/src/main/java/org/apache/jackrabbit/oak/security/authentication/ldap/impl/LdapIdentityProvider.java?rev=1889761&r1=1889760&r2=1889761&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-auth-ldap/src/main/java/org/apache/jackrabbit/oak/security/authentication/ldap/impl/LdapIdentityProvider.java (original)
+++ jackrabbit/oak/trunk/oak-auth-ldap/src/main/java/org/apache/jackrabbit/oak/security/authentication/ldap/impl/LdapIdentityProvider.java Tue May 11 14:57:42 2021
@@ -258,7 +258,7 @@ public class LdapIdentityProvider implem
try {
Entry entry = getEntry(connection, config.getUserConfig(), userId, config.getCustomAttributes());
timer.mark("lookup");
- debug("getUser({}) {}", userId, timer.getString());
+ log.debug("getUser({}) {}", userId, timer);
if (entry != null) {
return createUser(entry, userId);
@@ -280,7 +280,7 @@ public class LdapIdentityProvider implem
try {
Entry entry = getEntry(connection, config.getGroupConfig(), name, config.getCustomAttributes());
timer.mark("lookup");
- debug("getGroup({}) {}", name, timer.getString());
+ log.debug("getGroup({}) {}", name, timer);
if (entry != null) {
return createGroup(entry, name);
@@ -365,7 +365,7 @@ public class LdapIdentityProvider implem
timer.mark("connect");
connection.bind(user.getEntry().getDn(), new String(creds.getPassword()));
timer.mark("bind");
- debug("authenticate({}) {}", user.getId(), timer.getString());
+ log.debug("authenticate({}) {}", user.getId(), timer);
} catch (LdapAuthenticationException e) {
throw new LoginException("Unable to authenticate against LDAP server: " + e.getMessage());
} catch (Exception e) {
@@ -425,7 +425,7 @@ public class LdapIdentityProvider implem
req.setBase(new Dn(config.getGroupConfig().getBaseDN()));
req.setFilter(searchFilter);
- debug("getDeclaredGroupRefs: using SearchRequest {}.", req);
+ log.debug("getDeclaredGroupRefs: using SearchRequest {}.", req);
Map<String, ExternalIdentityRef> groups = new HashMap<>();
DebugTimer timer = new DebugTimer();
@@ -443,8 +443,8 @@ public class LdapIdentityProvider implem
}
}
timer.mark("iterate");
- debug("getDeclaredGroupRefs: search below {} with {} found {} entries. {}",
- config.getGroupConfig().getBaseDN(), searchFilter, groups.size(), timer.getString());
+ log.debug("getDeclaredGroupRefs: search below {} with {} found {} entries. {}",
+ config.getGroupConfig().getBaseDN(), searchFilter, groups.size(), timer);
return groups;
} catch (Exception e) {
@@ -483,7 +483,7 @@ public class LdapIdentityProvider implem
}
}
timer.mark("iterate");
- debug("members lookup of {} found {} members. {}", ref.getId(), members.size(), timer.getString());
+ log.debug("members lookup of {} found {} members. {}", ref.getId(), members.size(), timer);
return members;
} catch (Exception e) {
@@ -597,7 +597,7 @@ public class LdapIdentityProvider implem
req.setBase(new Dn(idConfig.getBaseDN()));
req.setFilter(searchFilter);
- debug("getEntry: using SearchRequest {}.", req);
+ log.debug("getEntry: using SearchRequest {}.", req);
// Process the request
SearchCursor searchCursor = null;
@@ -619,9 +619,9 @@ public class LdapIdentityProvider implem
closeSearchCursor(searchCursor);
}
if (resultEntry == null) {
- debug("getEntry: search below {} with {} found 0 entries.", idConfig.getBaseDN(), searchFilter);
+ log.debug("getEntry: search below {} with {} found 0 entries.", idConfig.getBaseDN(), searchFilter);
} else {
- debug("getEntry: search below {} with {} found {}", idConfig.getBaseDN(), searchFilter, resultEntry.getDn());
+ log.debug("getEntry: search below {} with {} found {}", idConfig.getBaseDN(), searchFilter, resultEntry.getDn());
}
return resultEntry;
}
@@ -727,7 +727,7 @@ public class LdapIdentityProvider implem
page = new ArrayList<>();
try {
SearchRequest req = createSearchRequest(cookie, config.getCustomAttributes());
- debug("loadNextPage: using SearchRequest {}.", req);
+ log.debug("loadNextPage: using SearchRequest {}.", req);
searchCursor = connection.search(req);
while (searchCursor.next()) {
@@ -736,7 +736,7 @@ public class LdapIdentityProvider implem
if (response instanceof SearchResultEntry) {
Entry resultEntry = ((SearchResultEntry) response).getEntry();
page.add(resultEntry);
- debug("loadNextPage: search below {} with {} found {}", idConfig.getBaseDN(), searchFilter, resultEntry.getDn());
+ log.debug("loadNextPage: search below {} with {} found {}", idConfig.getBaseDN(), searchFilter, resultEntry.getDn());
}
}
@@ -891,13 +891,7 @@ public class LdapIdentityProvider implem
log.error(msg, e);
return new ExternalIdentityException(msg, e);
}
-
- private static void debug(@NotNull String msg, @NotNull Object... vars) {
- if (log.isDebugEnabled()) {
- log.debug(msg, vars);
- }
- }
-
+
private static void closeSearchCursor(@Nullable SearchCursor searchCursor) {
if (searchCursor != null) {
try {
Modified: jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/DebugTimer.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/DebugTimer.java?rev=1889761&r1=1889760&r2=1889761&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/DebugTimer.java (original)
+++ jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/DebugTimer.java Tue May 11 14:57:42 2021
@@ -61,6 +61,10 @@ public class DebugTimer {
}
return b.append(')').toString();
}
+
+ public String toString() {
+ return getString();
+ }
private static final class TimeStamp {
Modified: jackrabbit/oak/trunk/oak-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/pom.xml?rev=1889761&r1=1889760&r2=1889761&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-core/pom.xml Tue May 11 14:57:42 2021
@@ -182,6 +182,7 @@
<rule>
<element>PACKAGE</element>
<includes>
+ <include>org.apache.jackrabbit.oak.security.authentication.token</include>
<include>org.apache.jackrabbit.oak.security.authorization.accesscontrol</include>
<include>org.apache.jackrabbit.oak.security.authorization.composite</include>
<include>org.apache.jackrabbit.oak.security.authorization.permission</include>
@@ -199,22 +200,6 @@
</limit>
</limits>
</rule>
- <rule>
- <element>PACKAGE</element>
- <includes>
- <include>org.apache.jackrabbit.oak.security.authentication.token</include>
- </includes>
- <excludes>
- <exclude>*Test</exclude>
- </excludes>
- <limits>
- <limit>
- <counter>BRANCH</counter>
- <value>COVEREDRATIO</value>
- <minimum>0.97</minimum>
- </limit>
- </limits>
- </rule>
</rules>
</configuration>
</execution>
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=1889761&r1=1889760&r2=1889761&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 May 11 14:57:42 2021
@@ -479,9 +479,8 @@ class TokenProviderImpl implements Token
log.debug("Failed to cleanup expired token nodes", e);
root.refresh();
} finally {
- if (log.isDebugEnabled() && active + expired > 0) {
- log.debug("Token cleanup completed in {} ms: removed {}/{} tokens for {}.",
- System.currentTimeMillis() - start, expired, active + expired, userId);
+ if (active + expired > 0) {
+ log.debug("Token cleanup completed in {} ms: removed {}/{} tokens for {}.", System.currentTimeMillis() - start, expired, active + expired, userId);
}
}
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStoreImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStoreImpl.java?rev=1889761&r1=1889760&r2=1889761&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStoreImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStoreImpl.java Tue May 11 14:57:42 2021
@@ -132,9 +132,7 @@ class PermissionStoreImpl implements Per
ret.setFullyLoaded(true);
long t = System.nanoTime()-t0;
monitor.permissionAllLoaded(t);
- if (log.isDebugEnabled()) {
- log.debug(String.format("loaded %d entries in %.2fus for %s.%n", ret.getSize(), t / 1000.0, principalName));
- }
+ log.debug("loaded {} entries in {}us for {}.", ret.getSize(), t / 1000.0, principalName);
return ret;
}