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/MultiChoiceConfigAttribute.java | 96 ++++++------------------------------------------
1 files changed, 12 insertions(+), 84 deletions(-)
diff --git a/opends/src/server/org/opends/server/config/MultiChoiceConfigAttribute.java b/opends/src/server/org/opends/server/config/MultiChoiceConfigAttribute.java
index c8a7c59..3532ca5 100644
--- a/opends/src/server/org/opends/server/config/MultiChoiceConfigAttribute.java
+++ b/opends/src/server/org/opends/server/config/MultiChoiceConfigAttribute.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;
@@ -44,9 +44,11 @@
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.debug.DebugLogger.debugCought;
+import static org.opends.server.loggers.debug.DebugLogger.debugEnabled;
import static org.opends.server.loggers.Error.*;
import static org.opends.server.messages.ConfigMessages.*;
import static org.opends.server.messages.MessageHandler.*;
@@ -62,11 +64,6 @@
public class MultiChoiceConfigAttribute
extends ConfigAttribute
{
- /**
- * The fully-qualified name of this class for debugging purposes.
- */
- private static final String CLASS_NAME =
- "org.opends.server.config.MultiChoiceConfigAttribute";
@@ -108,16 +105,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(allowedValues)
- });
this.allowedValues = allowedValues;
@@ -156,17 +143,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(allowedValues),
- String.valueOf(value)
- });
this.allowedValues = allowedValues;
@@ -215,17 +191,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(allowedValues),
- String.valueOf(values)
- });
this.allowedValues = allowedValues;
@@ -277,18 +242,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(allowedValues),
- String.valueOf(activeValues),
- String.valueOf(pendingValues)
- });
this.allowedValues = allowedValues;
@@ -323,7 +276,6 @@
*/
public String getDataType()
{
- assert debugEnter(CLASS_NAME, "getDataType");
return "MultiChoice";
}
@@ -337,7 +289,6 @@
*/
public AttributeSyntax getSyntax()
{
- assert debugEnter(CLASS_NAME, "getSyntax");
return DirectoryServer.getDefaultStringSyntax();
}
@@ -356,7 +307,6 @@
public String activeValue()
throws ConfigException
{
- assert debugEnter(CLASS_NAME, "activeValue");
if ((activeValues == null) || activeValues.isEmpty())
{
@@ -384,7 +334,6 @@
*/
public List<String> activeValues()
{
- assert debugEnter(CLASS_NAME, "activeValues");
return activeValues;
}
@@ -405,7 +354,6 @@
public String pendingValue()
throws ConfigException
{
- assert debugEnter(CLASS_NAME, "pendingValue");
if (! hasPendingValues())
{
@@ -440,7 +388,6 @@
*/
public List<String> pendingValues()
{
- assert debugEnter(CLASS_NAME, "pendingValues");
if (! hasPendingValues())
{
@@ -461,7 +408,6 @@
*/
public Set<String> allowedValues()
{
- assert debugEnter(CLASS_NAME, "getAllowedValues");
return allowedValues;
}
@@ -478,7 +424,6 @@
public void setValue(String value)
throws ConfigException
{
- assert debugEnter(CLASS_NAME, "setValue", String.valueOf(value));
if ((value == null) || (value.length() == 0))
{
@@ -522,7 +467,6 @@
public void setValues(List<String> values)
throws ConfigException
{
- assert debugEnter(CLASS_NAME, "setValues", String.valueOf(values));
// First check if the set is empty and if that is allowed.
@@ -621,7 +565,6 @@
*/
private static LinkedHashSet<AttributeValue> getValueSet(String value)
{
- assert debugEnter(CLASS_NAME, "getValueSet", String.valueOf(value));
LinkedHashSet<AttributeValue> valueSet =
new LinkedHashSet<AttributeValue>(1);
@@ -643,7 +586,6 @@
*/
private static LinkedHashSet<AttributeValue> getValueSet(List<String> values)
{
- assert debugEnter(CLASS_NAME, "getValueSet", String.valueOf(values));
if (values == null)
{
@@ -671,7 +613,6 @@
*/
public void applyPendingValues()
{
- assert debugEnter(CLASS_NAME, "applyPendingValues");
if (! hasPendingValues())
{
@@ -699,8 +640,6 @@
public boolean valueIsAcceptable(AttributeValue value,
StringBuilder rejectReason)
{
- assert debugEnter(CLASS_NAME, "valueIsAcceptable", String.valueOf(value),
- "java.lang.StringBuilder");
// Make sure that the value is non-empty.
@@ -752,9 +691,6 @@
boolean allowFailures)
throws ConfigException
{
- assert debugEnter(CLASS_NAME, "stringsToValues",
- String.valueOf(valueStrings),
- String.valueOf(allowFailures));
if ((valueStrings == null) || valueStrings.isEmpty())
{
@@ -851,7 +787,6 @@
*/
public List<String> activeValuesToStrings()
{
- assert debugEnter(CLASS_NAME, "activeValuesToStrings");
return activeValues;
}
@@ -871,7 +806,6 @@
*/
public List<String> pendingValuesToStrings()
{
- assert debugEnter(CLASS_NAME, "pendingValuesToStrings");
if (hasPendingValues())
{
@@ -909,8 +843,6 @@
public ConfigAttribute getConfigAttribute(List<Attribute> attributeList)
throws ConfigException
{
- assert debugEnter(CLASS_NAME, "getConfigAttribute",
- String.valueOf(attributeList));
ArrayList<String> activeValues = null;
@@ -1077,7 +1009,6 @@
*/
private javax.management.Attribute _toJMXAttribute(boolean pending)
{
- assert debugEnter(CLASS_NAME, "_toJMXAttribute");
List<String> requestedValues ;
String name ;
@@ -1122,7 +1053,6 @@
*/
public javax.management.Attribute toJMXAttribute()
{
- assert debugEnter(CLASS_NAME, "toJMXAttribute");
return _toJMXAttribute(false) ;
}
@@ -1136,7 +1066,6 @@
*/
public javax.management.Attribute toJMXAttributePending()
{
- assert debugEnter(CLASS_NAME, "toJMXAttributePending");
return _toJMXAttribute(true) ;
}
@@ -1155,8 +1084,6 @@
*/
public void toJMXAttribute(AttributeList attributeList)
{
- assert debugEnter(CLASS_NAME, "toJMXAttribute",
- String.valueOf(attributeList));
if (activeValues.size() > 0)
{
@@ -1223,8 +1150,6 @@
*/
public void toJMXAttributeInfo(List<MBeanAttributeInfo> attributeInfoList)
{
- assert debugEnter(CLASS_NAME, "toJMXAttributeInfo",
- String.valueOf(attributeInfoList));
if (isMultiValued())
@@ -1275,7 +1200,6 @@
*/
public MBeanParameterInfo toJMXParameterInfo()
{
- assert debugEnter(CLASS_NAME, "toJMXParameterInfo");
if (isMultiValued())
{
@@ -1305,7 +1229,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 String)
@@ -1332,13 +1255,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_INVALID_STRING_VALUE;
String message = getMessage(msgID, getName(), String.valueOf(value),
@@ -1371,7 +1300,6 @@
*/
public ConfigAttribute duplicate()
{
- assert debugEnter(CLASS_NAME, "duplicate");
return new MultiChoiceConfigAttribute(getName(), getDescription(),
isRequired(), isMultiValued(),
--
Gitblit v1.10.0