From 053bd871061fe5a094c1c2c6bea65811c038c622 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 06 Jun 2014 14:19:37 +0000
Subject: [PATCH] (CR-3599) Convert all protocols message to use ByteArrayBuilder + ByteArrayScanner
---
opendj3-server-dev/src/server/org/opends/server/replication/protocol/ErrorMsg.java | 149 +++++++++++++------------------------------------
1 files changed, 41 insertions(+), 108 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/protocol/ErrorMsg.java b/opendj3-server-dev/src/server/org/opends/server/replication/protocol/ErrorMsg.java
index 9fd451d..83f1736 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/protocol/ErrorMsg.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/protocol/ErrorMsg.java
@@ -25,13 +25,12 @@
* Portions Copyright 2013-2014 ForgeRock AS.
*/
package org.opends.server.replication.protocol;
-import org.forgerock.i18n.LocalizableMessage;
-import static org.opends.server.util.StaticUtils.stackTraceToSingleLineString;
+import static org.opends.server.util.StaticUtils.*;
-import java.io.UnsupportedEncodingException;
import java.util.zip.DataFormatException;
+import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.slf4j.LocalizedLogger;
/**
@@ -41,18 +40,21 @@
*/
public class ErrorMsg extends RoutableMsg
{
- // The tracer object for the debug logger
+ /** The tracer object for the debug logger */
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- // Specifies the messageID built from the error that was detected
- private String msgID;
+ /** Specifies the messageID built from the error that was detected. */
+ private final String msgID;
- // Specifies the complementary details about the error that was detected
- private LocalizableMessage details = null;
+ /** Specifies the complementary details about the error that was detected. */
+ private final LocalizableMessage details;
- // The time of creation of this message.
- // protocol version previous to V4
- private Long creationTime = System.currentTimeMillis();
+ /**
+ * The time of creation of this message.
+ * <p>
+ * protocol version previous to V4
+ */
+ private long creationTime = System.currentTimeMillis();
/**
* Creates an ErrorMsg providing the destination server.
@@ -61,8 +63,7 @@
* @param destination The destination server or servers of this message.
* @param details The message containing the details of the error.
*/
- public ErrorMsg(int sender, int destination,
- LocalizableMessage details)
+ public ErrorMsg(int sender, int destination, LocalizableMessage details)
{
super(sender, destination);
this.msgID = getMessageId(details);
@@ -87,8 +88,7 @@
this.details = details;
this.creationTime = System.currentTimeMillis();
- if (logger.isTraceEnabled())
- logger.trace("new ErrorMsg=%s", this);
+ logger.trace("new ErrorMsg=%s", this);
}
/**
@@ -102,57 +102,28 @@
/**
* Creates a new ErrorMsg by decoding the provided byte array.
*
- * @param in A byte array containing the encoded information for the LocalizableMessage
+ * @param in A byte array containing the encoded information for the message
* @param version The protocol version to use to decode the msg.
* @throws DataFormatException If the in does not contain a properly
* encoded message.
*/
- public ErrorMsg(byte[] in, short version)
- throws DataFormatException
+ ErrorMsg(byte[] in, short version) throws DataFormatException
{
- super();
- try
+ final ByteArrayScanner scanner = new ByteArrayScanner(in);
+ final byte msgType = scanner.nextByte();
+ if (msgType != MSG_TYPE_ERROR)
{
- /* first byte is the type */
- if (in[0] != MSG_TYPE_ERROR)
- throw new DataFormatException("input is not a valid " +
- this.getClass().getCanonicalName());
- int pos = 1;
-
- // sender
- int length = getNextLength(in, pos);
- String senderString = new String(in, pos, length, "UTF-8");
- senderID = Integer.valueOf(senderString);
- pos += length +1;
-
- // destination
- length = getNextLength(in, pos);
- String serverIdString = new String(in, pos, length, "UTF-8");
- destination = Integer.valueOf(serverIdString);
- pos += length +1;
-
- // MsgID
- length = getNextLength(in, pos);
- msgID = new String(in, pos, length, "UTF-8");
- pos += length +1;
-
- // Details
- length = getNextLength(in, pos);
- details = LocalizableMessage.raw(new String(in, pos, length, "UTF-8"));
- pos += length +1;
-
- if (version >= ProtocolVersion.REPLICATION_PROTOCOL_V4)
- {
- // Creation Time
- length = getNextLength(in, pos);
- String creationTimeString = new String(in, pos, length, "UTF-8");
- creationTime = Long.valueOf(creationTimeString);
- pos += length +1;
- }
+ throw new DataFormatException("input is not a valid "
+ + getClass().getCanonicalName());
}
- catch (UnsupportedEncodingException e)
+ senderID = scanner.nextIntUTF8();
+ destination = scanner.nextIntUTF8();
+ msgID = scanner.nextString();
+ details = LocalizableMessage.raw(scanner.nextString());
+
+ if (version >= ProtocolVersion.REPLICATION_PROTOCOL_V4)
{
- throw new DataFormatException("UTF-8 is not supported by this jvm.");
+ creationTime = scanner.nextLongUTF8();
}
}
@@ -180,60 +151,21 @@
// Msg encoding
// ============
- /**
- * {@inheritDoc}
- */
+ /** {@inheritDoc} */
@Override
public byte[] getBytes(short version)
{
- try {
- byte[] byteSender = String.valueOf(senderID).getBytes("UTF-8");
- byte[] byteDestination = String.valueOf(destination).getBytes("UTF-8");
- byte[] byteErrMsgId = String.valueOf(msgID).getBytes("UTF-8");
- byte[] byteDetails = details.toString().getBytes("UTF-8");
- byte[] byteCreationTime = null;
-
- int length = 1 + byteSender.length + 1
- + byteDestination.length + 1
- + byteErrMsgId.length + 1
- + byteDetails.length + 1;
-
- if (version >= ProtocolVersion.REPLICATION_PROTOCOL_V4)
- {
- byteCreationTime = creationTime.toString().getBytes("UTF-8");
- length += byteCreationTime.length + 1;
- }
-
- byte[] resultByteArray = new byte[length];
-
- // put the type of the operation
- resultByteArray[0] = MSG_TYPE_ERROR;
- int pos = 1;
-
- // sender
- pos = addByteArray(byteSender, resultByteArray, pos);
-
- // destination
- pos = addByteArray(byteDestination, resultByteArray, pos);
-
- // MsgId
- pos = addByteArray(byteErrMsgId, resultByteArray, pos);
-
- // details
- pos = addByteArray(byteDetails, resultByteArray, pos);
-
- if (version >= ProtocolVersion.REPLICATION_PROTOCOL_V4)
- {
- // creation time
- pos = addByteArray(byteCreationTime, resultByteArray, pos);
- }
-
- return resultByteArray;
- }
- catch (UnsupportedEncodingException e)
+ final ByteArrayBuilder builder = new ByteArrayBuilder();
+ builder.append(MSG_TYPE_ERROR);
+ builder.appendUTF8(senderID);
+ builder.appendUTF8(destination);
+ builder.append(msgID);
+ builder.append(details.toString());
+ if (version >= ProtocolVersion.REPLICATION_PROTOCOL_V4)
{
- return null;
+ builder.appendUTF8(creationTime);
}
+ return builder.toByteArray();
}
/**
@@ -241,6 +173,7 @@
*
* @return the string representation of this message.
*/
+ @Override
public String toString()
{
return "ErrorMessage=["+
@@ -259,7 +192,7 @@
*
* @return the creation time of this message.
*/
- public Long getCreationTime()
+ public long getCreationTime()
{
return creationTime;
}
--
Gitblit v1.10.0