From 2d33be825ccf95ad433561b49e64ce995b756c27 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 25 Feb 2014 14:15:02 +0000
Subject: [PATCH] Transformed the following: logger.trace(.*, stackTraceToSingleLineString(e)); into: logger.traceException(e, .*);
---
opendj3-server-dev/src/server/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProvider.java | 27 +---
opendj3-server-dev/src/server/org/opends/server/replication/protocol/Session.java | 8
opendj3-server-dev/src/server/org/opends/server/api/AuthenticationPolicy.java | 12 -
opendj3-server-dev/src/server/org/opends/server/extensions/PasswordPolicySubentryVirtualAttributeProvider.java | 13 -
opendj3-server-dev/src/server/org/opends/server/api/AuthenticationPolicyState.java | 21 --
opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyState.java | 239 +++++++++------------------------------
opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyConfigManager.java | 21 +--
7 files changed, 85 insertions(+), 256 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/api/AuthenticationPolicy.java b/opendj3-server-dev/src/server/org/opends/server/api/AuthenticationPolicy.java
index 8767a00..f45cc5f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/api/AuthenticationPolicy.java
+++ b/opendj3-server-dev/src/server/org/opends/server/api/AuthenticationPolicy.java
@@ -24,14 +24,10 @@
* Portions Copyright 2011-2014 ForgeRock AS.
* Portions Copyright 2014 ForgeRock AS
*/
-
package org.opends.server.api;
-
-
import static org.opends.messages.CoreMessages.*;
import static org.opends.server.config.ConfigConstants.*;
-import static org.opends.server.util.StaticUtils.stackTraceToSingleLineString;
import java.util.List;
@@ -42,8 +38,6 @@
import org.forgerock.opendj.ldap.ResultCode;
import org.opends.server.util.TimeThread;
-
-
/**
* An abstract authentication policy.
*/
@@ -172,10 +166,8 @@
}
catch (Exception e)
{
- if (logger.isTraceEnabled()) {
- logger.trace("Could not parse password policy subentry DN %s for user %s: %s",
- subentry.getDN(), userDNString, stackTraceToSingleLineString(e));
- }
+ logger.traceException(e, "Could not parse password policy subentry DN %s for user %s",
+ subentry.getDN(), userDNString);
}
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/api/AuthenticationPolicyState.java b/opendj3-server-dev/src/server/org/opends/server/api/AuthenticationPolicyState.java
index 10004ab..ed59ee5 100644
--- a/opendj3-server-dev/src/server/org/opends/server/api/AuthenticationPolicyState.java
+++ b/opendj3-server-dev/src/server/org/opends/server/api/AuthenticationPolicyState.java
@@ -211,13 +211,8 @@
}
catch (final Exception e)
{
- if (logger.isTraceEnabled())
- {
- logger.traceException(e);
- logger.trace("Unable to decode value %s for attribute %s "
- + "in user entry %s: %s", v.getValue(), attributeType.getNameOrOID(), entry.getName(),
- stackTraceToSingleLineString(e));
- }
+ logger.traceException(e, "Unable to decode value %s for attribute %s in user entry %s",
+ v.getValue(), attributeType.getNameOrOID(), entry.getName());
final LocalizableMessage message = ERR_PWPSTATE_CANNOT_DECODE_GENERALIZED_TIME
.get(v.getValue(), attributeType.getNameOrOID(), entry.getName(), e);
@@ -313,17 +308,11 @@
}
catch (final Exception e)
{
- logger.traceException(e);
+ logger.traceException(e, "User %s is considered administratively "
+ + "disabled because an error occurred while "
+ + "attempting to make the determination.", userEntry.getName());
isDisabled = ConditionResult.TRUE;
- if (logger.isTraceEnabled())
- {
- logger.trace("User %s is considered administratively "
- + "disabled because an error occurred while "
- + "attempting to make the determination: %s.", userEntry.getName(),
- stackTraceToSingleLineString(e));
- }
-
return true;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyConfigManager.java b/opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyConfigManager.java
index 77a7052..f6f677b 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyConfigManager.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyConfigManager.java
@@ -359,11 +359,8 @@
}
catch (Exception e)
{
- if (logger.isTraceEnabled())
- {
- logger.trace("Could not create password policy subentry DN %s: %s",
- entry.getName(), stackTraceToSingleLineString(e));
- }
+ logger.traceException(e, "Could not create password policy subentry DN %s",
+ entry.getName());
}
}
}
@@ -406,11 +403,8 @@
}
catch (Exception e)
{
- if (logger.isTraceEnabled())
- {
- logger.trace("Could not create password policy subentry DN %s: %s",
- newEntry.getName(), stackTraceToSingleLineString(e));
- }
+ logger.traceException(e, "Could not create password policy subentry DN %s",
+ newEntry.getName());
}
}
}
@@ -439,11 +433,8 @@
}
catch (Exception e)
{
- if (logger.isTraceEnabled())
- {
- logger.trace("Could not create password policy subentry DN %s: %s",
- newEntry.getName(), stackTraceToSingleLineString(e));
- }
+ logger.traceException(e, "Could not create password policy subentry DN %s",
+ newEntry.getName());
}
}
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyState.java b/opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyState.java
index 1aee923..4caf136 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyState.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyState.java
@@ -237,15 +237,8 @@
}
catch (Exception e)
{
- if (logger.isTraceEnabled())
- {
- logger.traceException(e);
-
- logger.trace("Unable to decode value %s for attribute %s" +
- "in user entry %s: %s",
- v.getValue(), attributeType.getNameOrOID(),
- userDNString, stackTraceToSingleLineString(e));
- }
+ logger.traceException(e, "Unable to decode value %s for attribute %s in user entry %s",
+ v.getValue(), attributeType.getNameOrOID(), userDNString);
LocalizableMessage message = ERR_PWPSTATE_CANNOT_DECODE_GENERALIZED_TIME.
get(v.getValue(), attributeType.getNameOrOID(), userDNString, e);
@@ -258,12 +251,9 @@
if (timeValues.isEmpty())
{
- if (logger.isTraceEnabled())
- {
- logger.trace("Returning an empty list because attribute %s " +
- "does not exist in user entry %s",
- attributeType.getNameOrOID(), userDNString);
- }
+ logger.trace("Returning an empty list because attribute %s " +
+ "does not exist in user entry %s",
+ attributeType.getNameOrOID(), userDNString);
}
return timeValues;
}
@@ -546,17 +536,11 @@
}
catch (Exception e)
{
- logger.traceException(e);
+ logger.traceException(e, "User %s is considered to have an expired " +
+ "account because an error occurred while attempting to make " +
+ "the determination.", userDNString);
isAccountExpired = ConditionResult.TRUE;
- if (logger.isTraceEnabled())
- {
- logger.trace("User %s is considered to have an expired " +
- "account because an error occurred while attempting to make " +
- "the determination: %s.",
- userDNString, stackTraceToSingleLineString(e));
- }
-
return true;
}
@@ -564,33 +548,24 @@
{
// The user does have an expiration time, but it hasn't arrived yet.
isAccountExpired = ConditionResult.FALSE;
- if (logger.isTraceEnabled())
- {
- logger.trace("The account for user %s is not expired because " +
- "the expiration time has not yet arrived.", userDNString);
- }
+ logger.trace("The account for user %s is not expired because " +
+ "the expiration time has not yet arrived.", userDNString);
}
else if (accountExpirationTime >= 0)
{
// The user does have an expiration time, and it is in the past.
isAccountExpired = ConditionResult.TRUE;
- if (logger.isTraceEnabled())
- {
- logger.trace("The account for user %s is expired because the " +
- "expiration time in that account has passed.", userDNString);
- }
+ logger.trace("The account for user %s is expired because the " +
+ "expiration time in that account has passed.", userDNString);
}
else
{
// The user doesn't have an expiration time in their entry, so it
// can't be expired.
isAccountExpired = ConditionResult.FALSE;
- if (logger.isTraceEnabled())
- {
- logger.trace("The account for user %s is not expired because " +
- "there is no expiration time in the user's entry.",
- userDNString);
- }
+ logger.trace("The account for user %s is not expired because " +
+ "there is no expiration time in the user's entry.",
+ userDNString);
}
return isAccountExpired == ConditionResult.TRUE;
@@ -712,14 +687,8 @@
}
catch (Exception e)
{
- logger.traceException(e);
-
- if (logger.isTraceEnabled())
- {
- logger.trace("Error while processing auth failure times " +
- "for user %s: %s",
- userDNString, stackTraceToSingleLineString(e));
- }
+ logger.traceException(e, "Error while processing auth failure times for user %s",
+ userDNString);
authFailureTimes = new ArrayList<Long>();
@@ -973,16 +942,10 @@
}
catch (Exception e)
{
- logger.traceException(e);
+ logger.traceException(e,
+ "Returning current time for user %s because an error occurred", userDNString);
failureLockedTime = currentTime;
- if (logger.isTraceEnabled())
- {
- logger.trace("Returning current time for user %s because an " +
- "error occurred: %s",
- userDNString, stackTraceToSingleLineString(e));
- }
-
return failureLockedTime;
}
@@ -1372,15 +1335,8 @@
}
catch (Exception e)
{
- logger.traceException(e);
-
- if (logger.isTraceEnabled())
- {
- logger.trace("Unable to set last login time for user %s " +
- "because an error occurred: %s",
- userDNString, stackTraceToSingleLineString(e));
- }
-
+ logger.traceException(e, "Unable to set last login time for user %s " +
+ "because an error occurred", userDNString);
return;
}
@@ -1388,13 +1344,8 @@
String existingTimestamp = getValue(type);
if ((existingTimestamp != null) && timestamp.equals(existingTimestamp))
{
- if (logger.isTraceEnabled())
- {
- logger.trace("Not updating last login time for user %s " +
- "because the new value matches the existing value.",
- userDNString);
- }
-
+ logger.trace("Not updating last login time for user %s " +
+ "because the new value matches the existing value.", userDNString);
return;
}
@@ -1402,11 +1353,8 @@
Attribute a = Attributes.create(type, timestamp);
modifications.add(new Modification(ModificationType.REPLACE, a, true));
- if (logger.isTraceEnabled())
- {
- logger.trace("Updated the last login time for user %s to %s",
- userDNString, timestamp);
- }
+ logger.trace("Updated the last login time for user %s to %s",
+ userDNString, timestamp);
}
@@ -1570,13 +1518,8 @@
}
catch (Exception e)
{
- if (logger.isTraceEnabled())
- {
- logger.traceException(e);
-
- logger.trace("Returning true for user %s because an error " +
- "occurred: %s", userDNString, stackTraceToSingleLineString(e));
- }
+ logger.traceException(e, "Returning true for user %s because an error occurred",
+ userDNString);
mustChangePassword = ConditionResult.TRUE;
@@ -1586,23 +1529,16 @@
if(mustChangePassword == ConditionResult.UNDEFINED)
{
mustChangePassword = ConditionResult.FALSE;
- if (logger.isTraceEnabled())
- {
- logger.trace("Returning %b for user since the attribute \"%s\"" +
- " is not present in the entry.",
- false, userDNString, OP_ATTR_PWPOLICY_RESET_REQUIRED);
- }
+ logger.trace("Returning %b for user since the attribute \"%s\"" +
+ " is not present in the entry.",
+ false, userDNString, OP_ATTR_PWPOLICY_RESET_REQUIRED);
return false;
}
- if (logger.isTraceEnabled())
- {
- logger.trace("Returning %b for user %s.",
- (mustChangePassword == ConditionResult.TRUE), userDNString);
- }
-
- return mustChangePassword == ConditionResult.TRUE;
+ final boolean result = mustChangePassword == ConditionResult.TRUE;
+ logger.trace("Returning %b for user %s.", result, userDNString);
+ return result;
}
@@ -2082,24 +2018,15 @@
}
catch (Exception e)
{
- logger.traceException(e);
+ logger.traceException(e, "Returning %d for user %s because an error occurred",
+ requiredChangeTime, userDNString);
requiredChangeTime = -1;
- if (logger.isTraceEnabled())
- {
- logger.trace("Returning %d for user %s because an error " +
- "occurred: %s", requiredChangeTime, userDNString,
- stackTraceToSingleLineString(e));
- }
-
return requiredChangeTime;
}
- if (logger.isTraceEnabled())
- {
- logger.trace("Returning required change time of %d for user %s",
- requiredChangeTime, userDNString);
- }
+ logger.trace("Returning required change time of %d for user %s",
+ requiredChangeTime, userDNString);
return requiredChangeTime;
}
@@ -2193,25 +2120,14 @@
}
catch (Exception e)
{
- logger.traceException(e);
-
- if (logger.isTraceEnabled())
- {
- logger.trace("Unable to decode the warned time for user %s: " +
- "%s", userDNString, stackTraceToSingleLineString(e));
- }
-
+ logger.traceException(e, "Unable to decode the warned time for user %s",
+ userDNString);
warnedTime = -1;
}
}
-
- if (logger.isTraceEnabled())
- {
- logger.trace("Returning a warned time of %d for user %s",
- warnedTime, userDNString);
- }
-
+ logger.trace("Returning a warned time of %d for user %s",
+ warnedTime, userDNString);
return warnedTime;
}
@@ -2320,14 +2236,8 @@
}
catch (Exception e)
{
- logger.traceException(e);
-
- if (logger.isTraceEnabled())
- {
- logger.trace("Error while processing grace login times " +
- "for user %s: %s",
- userDNString, stackTraceToSingleLineString(e));
- }
+ logger.traceException(e, "Error while processing grace login times for user %s",
+ userDNString);
graceLoginTimes = new ArrayList<Long>();
@@ -2336,13 +2246,7 @@
}
}
-
- if (logger.isTraceEnabled())
- {
- logger.trace("Returning grace login times for user %s",
- userDNString);
- }
-
+ logger.trace("Returning grace login times for user %s", userDNString);
return graceLoginTimes;
}
@@ -2652,25 +2556,16 @@
}
catch (Exception e)
{
- logger.traceException(e);
-
- if (logger.isTraceEnabled())
- {
- logger.trace("An error occurred while attempting to " +
- "process a password value for user %s: %s",
- userDNString, stackTraceToSingleLineString(e));
- }
+ logger.traceException(e, "An error occurred while attempting to " +
+ "process a password value for user %s", userDNString);
}
}
}
// If we've gotten here, then we couldn't find a match.
- if (logger.isTraceEnabled())
- {
- logger.trace("Returning false because the provided password does " +
- "not match any of the stored password values for user %s",
- userDNString);
- }
+ logger.trace("Returning false because the provided password does " +
+ "not match any of the stored password values for user %s",
+ userDNString);
return false;
}
@@ -2895,27 +2790,17 @@
}
catch (Exception e)
{
- if (logger.isTraceEnabled())
- {
- logger.traceException(e);
-
- logger.trace("Skipping password value for user %s because " +
- "an error occurred while attempting to decode it based on " +
- "the user password syntax: %s",
- userDNString, stackTraceToSingleLineString(e));
- }
+ logger.traceException(e, "Skipping password value for user %s because " +
+ "an error occurred while attempting to decode it based on " +
+ "the user password syntax", userDNString);
}
}
}
if (removedValues.isEmpty())
{
- if (logger.isTraceEnabled())
- {
- logger.trace("User entry %s does not have any password values " +
- "encoded using deprecated schemes.", userDNString);
- }
-
+ logger.trace("User entry %s does not have any password values " +
+ "encoded using deprecated schemes.", userDNString);
return;
}
@@ -2943,10 +2828,8 @@
if (logger.isTraceEnabled())
{
- logger.trace("Unable to encode password for user %s using " +
- "default scheme %s: %s",
- userDNString, s.getStorageSchemeName(),
- stackTraceToSingleLineString(e));
+ logger.traceException(e, "Unable to encode password for user %s using " +
+ "default scheme %s", userDNString, s.getStorageSchemeName());
}
}
}
@@ -2954,13 +2837,9 @@
if (updatedValues.isEmpty())
{
- if (logger.isTraceEnabled())
- {
- logger.trace("Not updating user entry %s because removing " +
- "deprecated schemes would leave the user without a password.",
- userDNString);
- }
-
+ logger.trace("Not updating user entry %s because removing " +
+ "deprecated schemes would leave the user without a password.",
+ userDNString);
return;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProvider.java b/opendj3-server-dev/src/server/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProvider.java
index 6948f32..c157f67 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProvider.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/PasswordExpirationTimeVirtualAttributeProvider.java
@@ -41,7 +41,6 @@
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ExtensionMessages.*;
-import static org.opends.server.util.StaticUtils.*;
/**
* Provider for the password expiration time virtual attribute.
@@ -147,21 +146,15 @@
{
logger.error(de.getMessageObject());
- if (logger.isTraceEnabled())
- {
- logger.trace("Failed to retrieve password policy for user %s: %s",
- entry.getName(), stackTraceToSingleLineString(de));
- }
+ logger.traceException(de, "Failed to retrieve password policy for user %s",
+ entry.getName());
}
if (policy == null)
{
// No authentication policy: debug log this as an error since all
// entries should have at least the default password policy.
- if (logger.isTraceEnabled())
- {
- logger.trace("No applicable password policy for user %s", entry.getName());
- }
+ logger.trace("No applicable password policy for user %s", entry.getName());
}
else if (policy.isPasswordPolicy())
{
@@ -176,11 +169,8 @@
{
logger.error(de.getMessageObject());
- if (logger.isTraceEnabled())
- {
- logger.trace("Failed to retrieve password policy state for user %s: %s",
- entry.getName(), stackTraceToSingleLineString(de));
- }
+ logger.traceException(de, "Failed to retrieve password policy state for user %s",
+ entry.getName());
}
return pwpState.getPasswordExpirationTime();
@@ -189,11 +179,8 @@
else
{
// Not a password policy, could be PTA, etc.
- if (logger.isTraceEnabled())
- {
- logger.trace("Authentication policy %s found for user %s is not a password policy",
- policy.getDN(), entry.getName());
- }
+ logger.trace("Authentication policy %s found for user %s is not a password policy",
+ policy.getDN(), entry.getName());
}
return -1L;
diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/PasswordPolicySubentryVirtualAttributeProvider.java b/opendj3-server-dev/src/server/org/opends/server/extensions/PasswordPolicySubentryVirtualAttributeProvider.java
index ec753de..ce71c8c 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/PasswordPolicySubentryVirtualAttributeProvider.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/PasswordPolicySubentryVirtualAttributeProvider.java
@@ -40,7 +40,6 @@
import org.opends.server.types.*;
import org.forgerock.opendj.ldap.ResultCode;
import static org.opends.messages.ExtensionMessages.*;
-import static org.opends.server.util.StaticUtils.*;
/**
* This class implements a virtual attribute provider to serve
@@ -91,21 +90,15 @@
// retrieve password policy, log this.
logger.error(de.getMessageObject());
- if (logger.isTraceEnabled())
- {
- logger.trace("Failed to retrieve password policy for user %s: %s",
- entry.getName(), stackTraceToSingleLineString(de));
- }
+ logger.traceException(de, "Failed to retrieve password policy for user %s",
+ entry.getName());
}
if (policy == null)
{
// No authentication policy: debug log this as an error since all
// entries should have at least the default password policy.
- if (logger.isTraceEnabled())
- {
- logger.trace("No applicable password policy for user %s", entry.getName());
- }
+ logger.trace("No applicable password policy for user %s", entry.getName());
}
else if (policy.isPasswordPolicy())
{
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/protocol/Session.java b/opendj3-server-dev/src/server/org/opends/server/replication/protocol/Session.java
index 79555f9..b6c3c8f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/protocol/Session.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/protocol/Session.java
@@ -189,13 +189,11 @@
}
else
{
- logger.trace(
- "Aborting Session from %s to %s in %s due to the "
- + "following error: %s",
+ logger.traceException(localSessionError,
+ "Aborting Session from %s to %s in %s due to the following error",
plainSocket.getLocalSocketAddress(),
plainSocket.getRemoteSocketAddress(),
- stackTraceToSingleLineString(new Exception()),
- stackTraceToSingleLineString(localSessionError));
+ stackTraceToSingleLineString(new Exception()));
}
}
--
Gitblit v1.10.0