From 19df65dd04f8f3bd8f76bdf3e061a6d242ed3c69 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Wed, 02 Oct 2013 14:39:39 +0000
Subject: [PATCH] Fix OPENDJ-176 - Use SLF4J for logging in the SDK Review CR-2404
---
opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/asn1/ASN1OutputStreamWriter.java | 106 ++++++++++++----------------------------------------
1 files changed, 25 insertions(+), 81 deletions(-)
diff --git a/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/asn1/ASN1OutputStreamWriter.java b/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/asn1/ASN1OutputStreamWriter.java
index cbbd7bc..81a4798 100644
--- a/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/asn1/ASN1OutputStreamWriter.java
+++ b/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/asn1/ASN1OutputStreamWriter.java
@@ -22,17 +22,17 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions copyright 2012 ForgeRock AS.
+ * Portions copyright 2012-2013 ForgeRock AS.
*/
package org.forgerock.opendj.asn1;
import static com.forgerock.opendj.ldap.CoreMessages.ERR_ASN1_SEQUENCE_WRITE_NOT_STARTED;
+import static com.forgerock.opendj.util.StaticUtils.IO_LOG;
+import static com.forgerock.opendj.util.StaticUtils.byteToHex;
import java.io.IOException;
import java.io.OutputStream;
import java.util.ArrayList;
-import java.util.logging.Level;
-
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.ldap.ByteSequence;
import org.forgerock.opendj.ldap.ByteStringBuilder;
@@ -90,11 +90,8 @@
writeLength(1);
out.write(booleanValue ? ASN1.BOOLEAN_VALUE_TRUE : ASN1.BOOLEAN_VALUE_FALSE);
- if (StaticUtils.DEBUG_LOG.isLoggable(Level.FINEST)) {
- StaticUtils.DEBUG_LOG.finest(String.format(
- "WRITE ASN.1 BOOLEAN(type=0x%x, length=%d, value=%s)", type, 1, String
- .valueOf(booleanValue)));
- }
+ IO_LOG.trace("WRITE ASN.1 BOOLEAN(type=0x{}, length={}, value={})",
+ byteToHex(type), 1, String.valueOf(booleanValue));
return this;
}
@@ -121,10 +118,7 @@
writeLength(childStream.length());
childStream.writeTo(parentStream);
- if (StaticUtils.DEBUG_LOG.isLoggable(Level.FINEST)) {
- StaticUtils.DEBUG_LOG.finest(String.format("WRITE ASN.1 END SEQUENCE(length=%d)",
- childStream.length()));
- }
+ IO_LOG.trace("WRITE ASN.1 END SEQUENCE(length={})", childStream.length());
childStream.reset();
return this;
@@ -153,39 +147,27 @@
|| ((intValue & 0x0000007F) == intValue)) {
writeLength(1);
out.write((byte) (intValue & 0xFF));
- if (StaticUtils.DEBUG_LOG.isLoggable(Level.FINEST)) {
- StaticUtils.DEBUG_LOG.finest(String.format(
- "WRITE ASN.1 INTEGER(type=0x%x, length=%d, value=%d)", type, 1, intValue));
- }
+ IO_LOG.trace("WRITE ASN.1 INTEGER(type=0x{}, length={}, value={})", byteToHex(type), 1, intValue);
} else if (((intValue < 0) && ((intValue & 0xFFFF8000) == 0xFFFF8000))
|| ((intValue & 0x00007FFF) == intValue)) {
writeLength(2);
out.write((byte) ((intValue >> 8) & 0xFF));
out.write((byte) (intValue & 0xFF));
- if (StaticUtils.DEBUG_LOG.isLoggable(Level.FINEST)) {
- StaticUtils.DEBUG_LOG.finest(String.format(
- "WRITE ASN.1 INTEGER(type=0x%x, length=%d, value=%d)", type, 2, intValue));
- }
+ IO_LOG.trace("WRITE ASN.1 INTEGER(type=0x{}, length={}, value={})", byteToHex(type), 2, intValue);
} else if (((intValue < 0) && ((intValue & 0xFF800000) == 0xFF800000))
|| ((intValue & 0x007FFFFF) == intValue)) {
writeLength(3);
out.write((byte) ((intValue >> 16) & 0xFF));
out.write((byte) ((intValue >> 8) & 0xFF));
out.write((byte) (intValue & 0xFF));
- if (StaticUtils.DEBUG_LOG.isLoggable(Level.FINEST)) {
- StaticUtils.DEBUG_LOG.finest(String.format(
- "WRITE ASN.1 INTEGER(type=0x%x, length=%d, value=%d)", type, 3, intValue));
- }
+ IO_LOG.trace("WRITE ASN.1 INTEGER(type=0x{}, length={}, value={})", byteToHex(type), 3, intValue);
} else {
writeLength(4);
out.write((byte) ((intValue >> 24) & 0xFF));
out.write((byte) ((intValue >> 16) & 0xFF));
out.write((byte) ((intValue >> 8) & 0xFF));
out.write((byte) (intValue & 0xFF));
- if (StaticUtils.DEBUG_LOG.isLoggable(Level.FINEST)) {
- StaticUtils.DEBUG_LOG.finest(String.format(
- "WRITE ASN.1 INTEGER(type=0x%x, length=%d, value=%d)", type, 4, intValue));
- }
+ IO_LOG.trace("WRITE ASN.1 INTEGER(type=0x{}, length={}, value={})", byteToHex(type), 4, intValue);
}
return this;
}
@@ -199,29 +181,20 @@
|| ((longValue & 0x000000000000007FL) == longValue)) {
writeLength(1);
out.write((byte) (longValue & 0xFF));
- if (StaticUtils.DEBUG_LOG.isLoggable(Level.FINEST)) {
- StaticUtils.DEBUG_LOG.finest(String.format(
- "WRITE ASN.1 INTEGER(type=0x%x, length=%d, value=%d)", type, 1, longValue));
- }
+ IO_LOG.trace("WRITE ASN.1 INTEGER(type=0x{}, length={}, value={})", byteToHex(type), 1, longValue);
} else if (((longValue < 0) && ((longValue & 0xFFFFFFFFFFFF8000L) == 0xFFFFFFFFFFFF8000L))
|| ((longValue & 0x0000000000007FFFL) == longValue)) {
writeLength(2);
out.write((byte) ((longValue >> 8) & 0xFF));
out.write((byte) (longValue & 0xFF));
- if (StaticUtils.DEBUG_LOG.isLoggable(Level.FINEST)) {
- StaticUtils.DEBUG_LOG.finest(String.format(
- "WRITE ASN.1 INTEGER(type=0x%x, length=%d, value=%d)", type, 2, longValue));
- }
+ IO_LOG.trace("WRITE ASN.1 INTEGER(type=0x{}, length={}, value={})", byteToHex(type), 2, longValue);
} else if (((longValue < 0) && ((longValue & 0xFFFFFFFFFF800000L) == 0xFFFFFFFFFF800000L))
|| ((longValue & 0x00000000007FFFFFL) == longValue)) {
writeLength(3);
out.write((byte) ((longValue >> 16) & 0xFF));
out.write((byte) ((longValue >> 8) & 0xFF));
out.write((byte) (longValue & 0xFF));
- if (StaticUtils.DEBUG_LOG.isLoggable(Level.FINEST)) {
- StaticUtils.DEBUG_LOG.finest(String.format(
- "WRITE ASN.1 INTEGER(type=0x%x, length=%d, value=%d)", type, 3, longValue));
- }
+ IO_LOG.trace("WRITE ASN.1 INTEGER(type=0x{}, length={}, value={})", byteToHex(type), 3, longValue);
} else if (((longValue < 0) && ((longValue & 0xFFFFFFFF80000000L) == 0xFFFFFFFF80000000L))
|| ((longValue & 0x000000007FFFFFFFL) == longValue)) {
writeLength(4);
@@ -229,10 +202,7 @@
out.write((byte) ((longValue >> 16) & 0xFF));
out.write((byte) ((longValue >> 8) & 0xFF));
out.write((byte) (longValue & 0xFF));
- if (StaticUtils.DEBUG_LOG.isLoggable(Level.FINEST)) {
- StaticUtils.DEBUG_LOG.finest(String.format(
- "WRITE ASN.1 INTEGER(type=0x%x, length=%d, value=%d)", type, 4, longValue));
- }
+ IO_LOG.trace("WRITE ASN.1 INTEGER(type=0x{}, length={}, value={})", byteToHex(type), 4, longValue);
} else if (((longValue < 0) && ((longValue & 0xFFFFFF8000000000L) == 0xFFFFFF8000000000L))
|| ((longValue & 0x0000007FFFFFFFFFL) == longValue)) {
writeLength(5);
@@ -241,10 +211,7 @@
out.write((byte) ((longValue >> 16) & 0xFF));
out.write((byte) ((longValue >> 8) & 0xFF));
out.write((byte) (longValue & 0xFF));
- if (StaticUtils.DEBUG_LOG.isLoggable(Level.FINEST)) {
- StaticUtils.DEBUG_LOG.finest(String.format(
- "WRITE ASN.1 INTEGER(type=0x%x, length=%d, value=%d)", type, 5, longValue));
- }
+ IO_LOG.trace("WRITE ASN.1 INTEGER(type=0x{}, length={}, value={})", byteToHex(type), 5, longValue);
} else if (((longValue < 0) && ((longValue & 0xFFFF800000000000L) == 0xFFFF800000000000L))
|| ((longValue & 0x00007FFFFFFFFFFFL) == longValue)) {
writeLength(6);
@@ -254,10 +221,7 @@
out.write((byte) ((longValue >> 16) & 0xFF));
out.write((byte) ((longValue >> 8) & 0xFF));
out.write((byte) (longValue & 0xFF));
- if (StaticUtils.DEBUG_LOG.isLoggable(Level.FINEST)) {
- StaticUtils.DEBUG_LOG.finest(String.format(
- "WRITE ASN.1 INTEGER(type=0x%x, length=%d, value=%d)", type, 6, longValue));
- }
+ IO_LOG.trace("WRITE ASN.1 INTEGER(type=0x{}, length={}, value={})", byteToHex(type), 6, longValue);
} else if (((longValue < 0) && ((longValue & 0xFF80000000000000L) == 0xFF80000000000000L))
|| ((longValue & 0x007FFFFFFFFFFFFFL) == longValue)) {
writeLength(7);
@@ -268,10 +232,7 @@
out.write((byte) ((longValue >> 16) & 0xFF));
out.write((byte) ((longValue >> 8) & 0xFF));
out.write((byte) (longValue & 0xFF));
- if (StaticUtils.DEBUG_LOG.isLoggable(Level.FINEST)) {
- StaticUtils.DEBUG_LOG.finest(String.format(
- "WRITE ASN.1 INTEGER(type=0x%x, length=%d, value=%d)", type, 7, longValue));
- }
+ IO_LOG.trace("WRITE ASN.1 INTEGER(type=0x{}, length={}, value={})", byteToHex(type), 7, longValue);
} else {
writeLength(8);
out.write((byte) ((longValue >> 56) & 0xFF));
@@ -282,10 +243,7 @@
out.write((byte) ((longValue >> 16) & 0xFF));
out.write((byte) ((longValue >> 8) & 0xFF));
out.write((byte) (longValue & 0xFF));
- if (StaticUtils.DEBUG_LOG.isLoggable(Level.FINEST)) {
- StaticUtils.DEBUG_LOG.finest(String.format(
- "WRITE ASN.1 INTEGER(type=0x%x, length=%d, value=%d)", type, 8, longValue));
- }
+ IO_LOG.trace("WRITE ASN.1 INTEGER(type=0x{}, length={}, value={})", byteToHex(type), 8, longValue);
}
return this;
}
@@ -297,10 +255,7 @@
out.write(type);
writeLength(0);
- if (StaticUtils.DEBUG_LOG.isLoggable(Level.FINEST)) {
- StaticUtils.DEBUG_LOG.finest(String.format("WRITE ASN.1 NULL(type=0x%x, length=%d)",
- type, 0));
- }
+ IO_LOG.trace("WRITE ASN.1 NULL(type=0x{}, length={})", byteToHex(type), 0);
return this;
}
@@ -313,10 +268,7 @@
writeLength(length);
out.write(value, offset, length);
- if (StaticUtils.DEBUG_LOG.isLoggable(Level.FINEST)) {
- StaticUtils.DEBUG_LOG.finest(String.format(
- "WRITE ASN.1 OCTETSTRING(type=0x%x, length=%d)", type, length));
- }
+ IO_LOG.trace("WRITE ASN.1 OCTETSTRING(type=0x{}, length={})", byteToHex(type), length);
return this;
}
@@ -329,10 +281,8 @@
writeLength(value.length());
value.copyTo(out);
- if (StaticUtils.DEBUG_LOG.isLoggable(Level.FINEST)) {
- StaticUtils.DEBUG_LOG.finest(String.format(
- "WRITE ASN.1 OCTETSTRING(type=0x%x, length=%d)", type, value.length()));
- }
+ IO_LOG.trace("WRITE ASN.1 OCTETSTRING(type=0x{}, length={})", byteToHex(type), value.length());
+
return this;
}
@@ -351,11 +301,8 @@
writeLength(bytes.length);
out.write(bytes);
- if (StaticUtils.DEBUG_LOG.isLoggable(Level.FINEST)) {
- StaticUtils.DEBUG_LOG.finest(String.format(
- "WRITE ASN.1 OCTETSTRING(type=0x%x, length=%d, " + "value=%s)", type,
- bytes.length, value));
- }
+ IO_LOG.trace("WRITE ASN.1 OCTETSTRING(type=0x{}, length={}, value={})",
+ byteToHex(type), bytes.length, value);
return this;
}
@@ -379,10 +326,7 @@
out = streamStack.get(stackDepth);
}
- if (StaticUtils.DEBUG_LOG.isLoggable(Level.FINEST)) {
- StaticUtils.DEBUG_LOG.finest(String.format("WRITE ASN.1 START SEQUENCE(type=0x%x)",
- type));
- }
+ IO_LOG.trace("WRITE ASN.1 START SEQUENCE(type=0x{})", byteToHex(type));
return this;
}
--
Gitblit v1.10.0