From cb4747bbf877fd90b5e6669d13252a2eee959251 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 05 Feb 2014 14:31:48 +0000
Subject: [PATCH] OPENDJ-1307 Migrate server ASN1 classes to SDK
---
opendj-sdk/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ASN1BufferWriter.java | 51 ++++++++++++++++++++++++---------------------------
1 files changed, 24 insertions(+), 27 deletions(-)
diff --git a/opendj-sdk/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ASN1BufferWriter.java b/opendj-sdk/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ASN1BufferWriter.java
index 5b65463..ad57ccf 100644
--- a/opendj-sdk/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ASN1BufferWriter.java
+++ b/opendj-sdk/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ASN1BufferWriter.java
@@ -22,18 +22,17 @@
*
*
* Copyright 2010 Sun Microsystems, Inc.
- * Portions copyright 2012-2013 ForgeRock AS.
+ * Portions copyright 2012-2014 ForgeRock AS.
*/
package org.forgerock.opendj.grizzly;
-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 static com.forgerock.opendj.ldap.CoreMessages.*;
import java.io.IOException;
import java.nio.ByteBuffer;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.io.ASN1;
import org.forgerock.opendj.io.ASN1Writer;
import org.forgerock.opendj.io.AbstractASN1Writer;
@@ -60,7 +59,7 @@
writeLength(parent, buffer.length());
parent.writeByteArray(buffer.getBackingArray(), 0, buffer.length());
- IO_LOG.trace("WRITE ASN.1 END SEQUENCE(length={})", buffer.length());
+ logger.trace("WRITE ASN.1 END SEQUENCE(length=%d)", buffer.length());
return parent;
}
@@ -161,6 +160,8 @@
public void writeByteArray(byte[] bs, int offset, int length) throws IOException;
}
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
+
private static final int BUFFER_INIT_SIZE = 1024;
/**
@@ -224,9 +225,7 @@
writeLength(sequenceBuffer, 1);
sequenceBuffer.writeByte(booleanValue ? ASN1.BOOLEAN_VALUE_TRUE : ASN1.BOOLEAN_VALUE_FALSE);
- IO_LOG.trace("WRITE ASN.1 BOOLEAN(type=0x{}, length={}, value={})",
- byteToHex(type), 1, String.valueOf(booleanValue));
-
+ logger.trace("WRITE ASN.1 BOOLEAN(type=0x%x, length=%d, value=%s)", type, 1, booleanValue);
return this;
}
@@ -262,27 +261,27 @@
|| ((intValue & 0x0000007F) == intValue)) {
writeLength(sequenceBuffer, 1);
sequenceBuffer.writeByte((byte) (intValue & 0xFF));
- IO_LOG.trace("WRITE ASN.1 INTEGER(type=0x{}, length={}, value={})", byteToHex(type), 1, intValue);
+ logger.trace("WRITE ASN.1 INTEGER(type=0x%x, length=%d, value=%d)", type, 1, intValue);
} else if (((intValue < 0) && ((intValue & 0xFFFF8000) == 0xFFFF8000))
|| ((intValue & 0x00007FFF) == intValue)) {
writeLength(sequenceBuffer, 2);
sequenceBuffer.writeByte((byte) ((intValue >> 8) & 0xFF));
sequenceBuffer.writeByte((byte) (intValue & 0xFF));
- IO_LOG.trace("WRITE ASN.1 INTEGER(type=0x{}, length={}, value={})", byteToHex(type), 2, intValue);
+ logger.trace("WRITE ASN.1 INTEGER(type=0x%x, length=%d, value=%d)", type, 2, intValue);
} else if (((intValue < 0) && ((intValue & 0xFF800000) == 0xFF800000))
|| ((intValue & 0x007FFFFF) == intValue)) {
writeLength(sequenceBuffer, 3);
sequenceBuffer.writeByte((byte) ((intValue >> 16) & 0xFF));
sequenceBuffer.writeByte((byte) ((intValue >> 8) & 0xFF));
sequenceBuffer.writeByte((byte) (intValue & 0xFF));
- IO_LOG.trace("WRITE ASN.1 INTEGER(type=0x{}, length={}, value={})", byteToHex(type), 3, intValue);
+ logger.trace("WRITE ASN.1 INTEGER(type=0x%x, length=%d, value=%d)", type, 3, intValue);
} else {
writeLength(sequenceBuffer, 4);
sequenceBuffer.writeByte((byte) ((intValue >> 24) & 0xFF));
sequenceBuffer.writeByte((byte) ((intValue >> 16) & 0xFF));
sequenceBuffer.writeByte((byte) ((intValue >> 8) & 0xFF));
sequenceBuffer.writeByte((byte) (intValue & 0xFF));
- IO_LOG.trace("WRITE ASN.1 INTEGER(type=0x{}, length={}, value={})", byteToHex(type), 4, intValue);
+ logger.trace("WRITE ASN.1 INTEGER(type=0x%x, length=%d, value=%d)", type, 4, intValue);
}
return this;
}
@@ -296,20 +295,20 @@
|| ((longValue & 0x000000000000007FL) == longValue)) {
writeLength(sequenceBuffer, 1);
sequenceBuffer.writeByte((byte) (longValue & 0xFF));
- IO_LOG.trace("WRITE ASN.1 INTEGER(type=0x{}, length={}, value={})", byteToHex(type), 1, longValue);
+ logger.trace("WRITE ASN.1 INTEGER(type=0x%x, length=%d, value=%d)", type, 1, longValue);
} else if (((longValue < 0) && ((longValue & 0xFFFFFFFFFFFF8000L) == 0xFFFFFFFFFFFF8000L))
|| ((longValue & 0x0000000000007FFFL) == longValue)) {
writeLength(sequenceBuffer, 2);
sequenceBuffer.writeByte((byte) ((longValue >> 8) & 0xFF));
sequenceBuffer.writeByte((byte) (longValue & 0xFF));
- IO_LOG.trace("WRITE ASN.1 INTEGER(type=0x{}, length={}, value={})", byteToHex(type), 2, longValue);
+ logger.trace("WRITE ASN.1 INTEGER(type=0x%x, length=%d, value=%d)", type, 2, longValue);
} else if (((longValue < 0) && ((longValue & 0xFFFFFFFFFF800000L) == 0xFFFFFFFFFF800000L))
|| ((longValue & 0x00000000007FFFFFL) == longValue)) {
writeLength(sequenceBuffer, 3);
sequenceBuffer.writeByte((byte) ((longValue >> 16) & 0xFF));
sequenceBuffer.writeByte((byte) ((longValue >> 8) & 0xFF));
sequenceBuffer.writeByte((byte) (longValue & 0xFF));
- IO_LOG.trace("WRITE ASN.1 INTEGER(type=0x{}, length={}, value={})", byteToHex(type), 3, longValue);
+ logger.trace("WRITE ASN.1 INTEGER(type=0x%x, length=%d, value=%d)", type, 3, longValue);
} else if (((longValue < 0) && ((longValue & 0xFFFFFFFF80000000L) == 0xFFFFFFFF80000000L))
|| ((longValue & 0x000000007FFFFFFFL) == longValue)) {
writeLength(sequenceBuffer, 4);
@@ -317,7 +316,7 @@
sequenceBuffer.writeByte((byte) ((longValue >> 16) & 0xFF));
sequenceBuffer.writeByte((byte) ((longValue >> 8) & 0xFF));
sequenceBuffer.writeByte((byte) (longValue & 0xFF));
- IO_LOG.trace("WRITE ASN.1 INTEGER(type=0x{}, length={}, value={})", byteToHex(type), 4, longValue);
+ logger.trace("WRITE ASN.1 INTEGER(type=0x%x, length=%d, value=%d)", type, 4, longValue);
} else if (((longValue < 0) && ((longValue & 0xFFFFFF8000000000L) == 0xFFFFFF8000000000L))
|| ((longValue & 0x0000007FFFFFFFFFL) == longValue)) {
writeLength(sequenceBuffer, 5);
@@ -326,7 +325,7 @@
sequenceBuffer.writeByte((byte) ((longValue >> 16) & 0xFF));
sequenceBuffer.writeByte((byte) ((longValue >> 8) & 0xFF));
sequenceBuffer.writeByte((byte) (longValue & 0xFF));
- IO_LOG.trace("WRITE ASN.1 INTEGER(type=0x{}, length={}, value={})", byteToHex(type), 5, longValue);
+ logger.trace("WRITE ASN.1 INTEGER(type=0x%x, length=%d, value=%d)", type, 5, longValue);
} else if (((longValue < 0) && ((longValue & 0xFFFF800000000000L) == 0xFFFF800000000000L))
|| ((longValue & 0x00007FFFFFFFFFFFL) == longValue)) {
writeLength(sequenceBuffer, 6);
@@ -336,7 +335,7 @@
sequenceBuffer.writeByte((byte) ((longValue >> 16) & 0xFF));
sequenceBuffer.writeByte((byte) ((longValue >> 8) & 0xFF));
sequenceBuffer.writeByte((byte) (longValue & 0xFF));
- IO_LOG.trace("WRITE ASN.1 INTEGER(type=0x{}, length={}, value={})", byteToHex(type), 6, longValue);
+ logger.trace("WRITE ASN.1 INTEGER(type=0x%x, length=%d, value=%d)", type, 6, longValue);
} else if (((longValue < 0) && ((longValue & 0xFF80000000000000L) == 0xFF80000000000000L))
|| ((longValue & 0x007FFFFFFFFFFFFFL) == longValue)) {
writeLength(sequenceBuffer, 7);
@@ -347,7 +346,7 @@
sequenceBuffer.writeByte((byte) ((longValue >> 16) & 0xFF));
sequenceBuffer.writeByte((byte) ((longValue >> 8) & 0xFF));
sequenceBuffer.writeByte((byte) (longValue & 0xFF));
- IO_LOG.trace("WRITE ASN.1 INTEGER(type=0x{}, length={}, value={})", byteToHex(type), 7, longValue);
+ logger.trace("WRITE ASN.1 INTEGER(type=0x%x, length=%d, value=%d)", type, 7, longValue);
} else {
writeLength(sequenceBuffer, 8);
sequenceBuffer.writeByte((byte) ((longValue >> 56) & 0xFF));
@@ -358,7 +357,7 @@
sequenceBuffer.writeByte((byte) ((longValue >> 16) & 0xFF));
sequenceBuffer.writeByte((byte) ((longValue >> 8) & 0xFF));
sequenceBuffer.writeByte((byte) (longValue & 0xFF));
- IO_LOG.trace("WRITE ASN.1 INTEGER(type=0x{}, length={}, value={})", byteToHex(type), 8, longValue);
+ logger.trace("WRITE ASN.1 INTEGER(type=0x%x, length=%d, value=%d)", type, 8, longValue);
}
return this;
}
@@ -370,8 +369,7 @@
sequenceBuffer.writeByte(type);
writeLength(sequenceBuffer, 0);
- IO_LOG.trace("WRITE ASN.1 NULL(type=0x{}, length={})", byteToHex(type), 0);
-
+ logger.trace("WRITE ASN.1 NULL(type=0x%x, length=%d)", type, 0);
return this;
}
@@ -384,7 +382,7 @@
writeLength(sequenceBuffer, length);
sequenceBuffer.writeByteArray(value, offset, length);
- IO_LOG.trace("WRITE ASN.1 OCTETSTRING(type=0x{}, length={})", byteToHex(type), length);
+ logger.trace("WRITE ASN.1 OCTETSTRING(type=0x%x, length=%d)", type, length);
return this;
}
@@ -400,7 +398,7 @@
sequenceBuffer.writeByte(value.byteAt(i));
}
- IO_LOG.trace("WRITE ASN.1 OCTETSTRING(type=0x{}, length={})", byteToHex(type), value.length());
+ logger.trace("WRITE ASN.1 OCTETSTRING(type=0x%x, length=%d)", type, value.length());
return this;
}
@@ -419,8 +417,7 @@
writeLength(sequenceBuffer, bytes.length);
sequenceBuffer.writeByteArray(bytes, 0, bytes.length);
- IO_LOG.trace("WRITE ASN.1 OCTETSTRING(type=0x{}, length={}, value={})", byteToHex(type),
- bytes.length, value);
+ logger.trace("WRITE ASN.1 OCTETSTRING(type=0x%x, length=%d, value=%s)", type, bytes.length, value);
return this;
}
@@ -431,7 +428,7 @@
// Get a child sequence buffer
sequenceBuffer = sequenceBuffer.startSequence(type);
- IO_LOG.trace("WRITE ASN.1 START SEQUENCE(type=0x{})", byteToHex(type));
+ logger.trace("WRITE ASN.1 START SEQUENCE(type=0x%x)", type);
return this;
}
--
Gitblit v1.10.0