From 455897cc245b67d929f409a93cfa7106e835cc1f Mon Sep 17 00:00:00 2001
From: boli <boli@localhost>
Date: Thu, 01 Mar 2007 03:27:06 +0000
Subject: [PATCH] This removes old debug logging framework method calls that are going to be automatically instrumented by AspectJ. Non instrumented debug method calls are updated to use the new debug framework methods. However, the new debug logging framework is not yet active as the Aspects are not weaved in. After this revision, debug logging will be disabled in the server until the new AOP framework is complete.
---
opends/src/server/org/opends/server/config/IntegerConfigAttribute.java | 128 ++++++++----------------------------------
1 files changed, 24 insertions(+), 104 deletions(-)
diff --git a/opends/src/server/org/opends/server/config/IntegerConfigAttribute.java b/opends/src/server/org/opends/server/config/IntegerConfigAttribute.java
index 3bd49e3..553678d 100644
--- a/opends/src/server/org/opends/server/config/IntegerConfigAttribute.java
+++ b/opends/src/server/org/opends/server/config/IntegerConfigAttribute.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Portions Copyright 2006 Sun Microsystems, Inc.
+ * Portions Copyright 2006-2007 Sun Microsystems, Inc.
*/
package org.opends.server.config;
@@ -43,10 +43,12 @@
import org.opends.server.types.AttributeValue;
import org.opends.server.types.ErrorLogCategory;
import org.opends.server.types.ErrorLogSeverity;
+import org.opends.server.types.DebugLogLevel;
import static org.opends.server.config.ConfigConstants.*;
-import static org.opends.server.loggers.Debug.*;
import static org.opends.server.loggers.Error.*;
+import static org.opends.server.loggers.debug.DebugLogger.debugCought;
+import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import static org.opends.server.messages.ConfigMessages.*;
import static org.opends.server.messages.MessageHandler.*;
import static org.opends.server.util.ServerConstants.*;
@@ -62,11 +64,6 @@
public class IntegerConfigAttribute
extends ConfigAttribute
{
- /**
- * The fully-qualified name of this class for debugging purposes.
- */
- private static final String CLASS_NAME =
- "org.opends.server.config.IntegerConfigAttribute";
@@ -122,19 +119,6 @@
{
super(name, description, isRequired, isMultiValued, requiresAdminAction);
- assert debugConstructor(CLASS_NAME,
- new String[]
- {
- String.valueOf(name),
- String.valueOf(isRequired),
- String.valueOf(isMultiValued),
- String.valueOf(description),
- String.valueOf(requiresAdminAction),
- String.valueOf(hasLowerBound),
- String.valueOf(lowerBound),
- String.valueOf(hasUpperBound),
- String.valueOf(upperBound)
- });
this.hasLowerBound = hasLowerBound;
this.lowerBound = lowerBound;
@@ -182,20 +166,6 @@
super(name, description, isRequired, isMultiValued, requiresAdminAction,
getValueSet(value));
- assert debugConstructor(CLASS_NAME,
- new String[]
- {
- String.valueOf(name),
- String.valueOf(isRequired),
- String.valueOf(isMultiValued),
- String.valueOf(description),
- String.valueOf(requiresAdminAction),
- String.valueOf(hasLowerBound),
- String.valueOf(lowerBound),
- String.valueOf(hasUpperBound),
- String.valueOf(upperBound),
- String.valueOf(value)
- });
this.hasLowerBound = hasLowerBound;
this.lowerBound = lowerBound;
@@ -245,20 +215,6 @@
super(name, description, isRequired, isMultiValued, requiresAdminAction,
getValueSet(values));
- assert debugConstructor(CLASS_NAME,
- new String[]
- {
- String.valueOf(name),
- String.valueOf(isRequired),
- String.valueOf(isMultiValued),
- String.valueOf(description),
- String.valueOf(requiresAdminAction),
- String.valueOf(hasLowerBound),
- String.valueOf(lowerBound),
- String.valueOf(hasUpperBound),
- String.valueOf(upperBound),
- String.valueOf(values)
- });
this.hasLowerBound = hasLowerBound;
this.lowerBound = lowerBound;
@@ -318,21 +274,6 @@
getValueSet(activeValues), (pendingValues != null),
getValueSet(pendingValues));
- assert debugConstructor(CLASS_NAME,
- new String[]
- {
- String.valueOf(name),
- String.valueOf(isRequired),
- String.valueOf(isMultiValued),
- String.valueOf(description),
- String.valueOf(requiresAdminAction),
- String.valueOf(hasLowerBound),
- String.valueOf(lowerBound),
- String.valueOf(hasUpperBound),
- String.valueOf(upperBound),
- String.valueOf(activeValues),
- String.valueOf(pendingValues)
- });
this.hasLowerBound = hasLowerBound;
this.lowerBound = lowerBound;
@@ -370,7 +311,6 @@
*/
public String getDataType()
{
- assert debugEnter(CLASS_NAME, "getDataType");
return "Integer";
}
@@ -384,7 +324,6 @@
*/
public AttributeSyntax getSyntax()
{
- assert debugEnter(CLASS_NAME, "getSyntax");
return DirectoryServer.getDefaultIntegerSyntax();
}
@@ -403,7 +342,6 @@
public long activeValue()
throws ConfigException
{
- assert debugEnter(CLASS_NAME, "activeValue");
if ((activeValues == null) || activeValues.isEmpty())
{
@@ -439,7 +377,6 @@
public int activeIntValue()
throws ConfigException
{
- assert debugEnter(CLASS_NAME, "activeIntValue");
if ((activeValues == null) || activeValues.isEmpty())
{
@@ -478,7 +415,6 @@
*/
public List<Long> activeValues()
{
- assert debugEnter(CLASS_NAME, "activeValues");
return activeValues;
}
@@ -499,7 +435,6 @@
public long pendingValue()
throws ConfigException
{
- assert debugEnter(CLASS_NAME, "pendingValue");
if (! hasPendingValues())
{
@@ -541,7 +476,6 @@
public int pendingIntValue()
throws ConfigException
{
- assert debugEnter(CLASS_NAME, "pendingIntValue");
if (! hasPendingValues())
{
@@ -587,7 +521,6 @@
*/
public List<Long> pendingValues()
{
- assert debugEnter(CLASS_NAME, "pendingValues");
if (! hasPendingValues())
{
@@ -609,7 +542,6 @@
*/
public boolean hasLowerBound()
{
- assert debugEnter(CLASS_NAME, "hasLowerBound");
return hasLowerBound;
}
@@ -623,7 +555,6 @@
*/
public long getLowerBound()
{
- assert debugEnter(CLASS_NAME, "getLowerBound");
return lowerBound;
}
@@ -640,7 +571,6 @@
*/
public boolean hasUpperBound()
{
- assert debugEnter(CLASS_NAME, "hasUpperBound");
return hasUpperBound;
}
@@ -656,7 +586,6 @@
*/
public long getUpperBound()
{
- assert debugEnter(CLASS_NAME, "getUpperBound");
return upperBound;
}
@@ -673,7 +602,6 @@
public void setValue(long value)
throws ConfigException
{
- assert debugEnter(CLASS_NAME, "setValue", String.valueOf(value));
if (hasLowerBound && (value < lowerBound))
{
@@ -717,7 +645,6 @@
public void setValues(List<Long> values)
throws ConfigException
{
- assert debugEnter(CLASS_NAME, "setValues", String.valueOf(values));
// First check if the set is empty and if that is allowed.
@@ -816,7 +743,6 @@
*/
private static LinkedHashSet<AttributeValue> getValueSet(long value)
{
- assert debugEnter(CLASS_NAME, "getValueSet", String.valueOf(value));
LinkedHashSet<AttributeValue> valueSet =
new LinkedHashSet<AttributeValue>(1);
@@ -839,7 +765,6 @@
*/
private static LinkedHashSet<AttributeValue> getValueSet(List<Long> values)
{
- assert debugEnter(CLASS_NAME, "getValueSet", String.valueOf(values));
if (values == null)
{
@@ -868,7 +793,6 @@
*/
public void applyPendingValues()
{
- assert debugEnter(CLASS_NAME, "applyPendingValues");
if (! hasPendingValues())
{
@@ -896,8 +820,6 @@
public boolean valueIsAcceptable(AttributeValue value,
StringBuilder rejectReason)
{
- assert debugEnter(CLASS_NAME, "valueIsAcceptable", String.valueOf(value),
- "java.lang.StringBuilder");
// First, make sure we can represent it as a long.
@@ -909,7 +831,10 @@
}
catch (Exception e)
{
- assert debugException(CLASS_NAME, "valueIsAcceptable", e);
+ if (debugEnabled())
+ {
+ debugCought(DebugLogLevel.ERROR, e);
+ }
rejectReason.append(getMessage(MSGID_CONFIG_ATTR_INVALID_INT_VALUE,
stringValue, String.valueOf(e)));
@@ -963,9 +888,6 @@
boolean allowFailures)
throws ConfigException
{
- assert debugEnter(CLASS_NAME, "stringsToValues",
- String.valueOf(valueStrings),
- String.valueOf(allowFailures));
if ((valueStrings == null) || valueStrings.isEmpty())
{
@@ -1002,7 +924,10 @@
}
catch (Exception e)
{
- assert debugException(CLASS_NAME, "stringsToValues", e);
+ if (debugEnabled())
+ {
+ debugCought(DebugLogLevel.ERROR, e);
+ }
int msgID = MSGID_CONFIG_ATTR_INT_COULD_NOT_PARSE;
String message = getMessage(msgID, valueString, getName(),
@@ -1090,7 +1015,6 @@
*/
public List<String> activeValuesToStrings()
{
- assert debugEnter(CLASS_NAME, "activeValuesToStrings");
ArrayList<String> valueStrings =
new ArrayList<String>(activeValues.size());
@@ -1117,7 +1041,6 @@
*/
public List<String> pendingValuesToStrings()
{
- assert debugEnter(CLASS_NAME, "pendingValuesToStrings");
if (hasPendingValues())
{
@@ -1162,8 +1085,6 @@
public ConfigAttribute getConfigAttribute(List<Attribute> attributeList)
throws ConfigException
{
- assert debugEnter(CLASS_NAME, "getConfigAttribute",
- String.valueOf(attributeList));
ArrayList<Long> activeValues = null;
@@ -1373,7 +1294,6 @@
*/
private javax.management.Attribute _toJMXAttribute(boolean pending)
{
- assert debugEnter(CLASS_NAME, "_toJMXAttribute");
List<Long> requestedValues ;
String name ;
if (pending)
@@ -1421,7 +1341,6 @@
*/
public javax.management.Attribute toJMXAttribute()
{
- assert debugEnter(CLASS_NAME, "toJMXAttribute");
return _toJMXAttribute(false);
}
@@ -1435,7 +1354,6 @@
*/
public javax.management.Attribute toJMXAttributePending()
{
- assert debugEnter(CLASS_NAME, "toJMXAttributePending");
return _toJMXAttribute(true);
}
@@ -1455,8 +1373,6 @@
*/
public void toJMXAttribute(AttributeList attributeList)
{
- assert debugEnter(CLASS_NAME, "toJMXAttribute",
- String.valueOf(attributeList));
if (activeValues.size() > 0)
{
@@ -1529,8 +1445,6 @@
*/
public void toJMXAttributeInfo(List<MBeanAttributeInfo> attributeInfoList)
{
- assert debugEnter(CLASS_NAME, "toJMXAttributeInfo",
- String.valueOf(attributeInfoList));
if (isMultiValued())
@@ -1579,7 +1493,6 @@
*/
public MBeanParameterInfo toJMXParameterInfo()
{
- assert debugEnter(CLASS_NAME, "toJMXParameterInfo");
if (isMultiValued())
{
@@ -1609,7 +1522,6 @@
public void setValue(javax.management.Attribute jmxAttribute)
throws ConfigException
{
- assert debugEnter(CLASS_NAME, "setValue", String.valueOf(jmxAttribute));
Object value = jmxAttribute.getValue();
if (value instanceof Long)
@@ -1628,7 +1540,10 @@
}
catch (Exception e)
{
- assert debugException(CLASS_NAME, "setValue", e);
+ if (debugEnabled())
+ {
+ debugCought(DebugLogLevel.ERROR, e);
+ }
int msgID = MSGID_CONFIG_ATTR_INT_COULD_NOT_PARSE;
String message = getMessage(msgID, String.valueOf(value), getName(),
@@ -1686,13 +1601,19 @@
}
catch (ConfigException ce)
{
- assert debugException(CLASS_NAME, "setValue", ce);
+ if (debugEnabled())
+ {
+ debugCought(DebugLogLevel.ERROR, ce);
+ }
throw ce;
}
catch (Exception e)
{
- assert debugException(CLASS_NAME, "setValue", e);
+ if (debugEnabled())
+ {
+ debugCought(DebugLogLevel.ERROR, e);
+ }
int msgID = MSGID_CONFIG_ATTR_INT_COULD_NOT_PARSE;
String message = getMessage(msgID, componentType + "[" + length + "]",
@@ -1718,7 +1639,6 @@
*/
public ConfigAttribute duplicate()
{
- assert debugEnter(CLASS_NAME, "duplicate");
return new IntegerConfigAttribute(getName(), getDescription(), isRequired(),
isMultiValued(), requiresAdminAction(),
--
Gitblit v1.10.0