clean up formatting on message.java

This commit is contained in:
Matt Parnell
2014-08-18 22:11:13 -05:00
parent 49a0279a54
commit c5331c063d
+117 -118
View File
@@ -28,132 +28,128 @@ import java.nio.ByteOrder;
import org.apache.mina.core.buffer.IoBuffer;
public abstract class Message {
protected byte[] data;
protected int opcode;
protected short sequence;
protected IoBuffer result;
public Message() {
}
public Message(byte[] data) {
this.data = data;
public Message(byte[] data) {
this.data = data;
}
public int getOpcode() {
return opcode;
}
public int getSize() {
return (data == null) ? 0 : data.length;
}
public byte[] getData() {
return data == null ? new byte[] { } : data.clone();
}
public abstract void deserialize(IoBuffer data);
public abstract IoBuffer serialize();
protected String getAsciiString(IoBuffer buffer)
{
return getString(buffer, "US-ASCII");
}
protected String getUnicodeString(IoBuffer buffer)
{
return getString(buffer, "UTF-16LE");
}
protected byte[] getAsciiString(String string)
{
return getString(string, "US-ASCII");
}
protected byte[] getUnicodeString(String string)
{
return getString(string, "UTF-16LE");
}
protected String getString(IoBuffer buffer, String charFormat)
{
String result;
int length;
if (charFormat == "UTF-16LE") length = buffer.order(ByteOrder.LITTLE_ENDIAN).getInt();
else length = buffer.order(ByteOrder.LITTLE_ENDIAN).getShort();
int bufferPosition = buffer.position();
try
{
result = new String(buffer.array(), bufferPosition, length, charFormat);
}
catch (UnsupportedEncodingException e)
{
e.printStackTrace();
return "";
}
//TODO: Verify if character position is set correctly after reading a UTF-16 string
buffer.position(bufferPosition + length);
return result;
}
private byte[] getString(String string, String charFormat)
{
ByteBuffer result;
int length = 2 + string.length();
if (charFormat == "UTF-16LE")
{
result = ByteBuffer.allocate(length * 2).order(ByteOrder.LITTLE_ENDIAN);
result.putInt(string.length());
}
else
{
result = ByteBuffer.allocate(length).order(ByteOrder.LITTLE_ENDIAN);
result.putShort((short) string.length());
}
try
{
result.put(string.getBytes(charFormat));
}
catch (UnsupportedEncodingException e)
{
e.printStackTrace();
return new byte[] {};
}
return result.array();
return data == null ? new byte[] {} : data.clone();
}
//FIXME: this is redundant and was also bugged. At some point, get rid of the redundant functions.
public abstract void deserialize(IoBuffer data);
public abstract IoBuffer serialize();
protected String getAsciiString(IoBuffer buffer) {
return getString(buffer, "US-ASCII");
}
protected String getUnicodeString(IoBuffer buffer) {
return getString(buffer, "UTF-16LE");
}
protected byte[] getAsciiString(String string) {
return getString(string, "US-ASCII");
}
protected byte[] getUnicodeString(String string) {
return getString(string, "UTF-16LE");
}
protected String getString(IoBuffer buffer, String charFormat) {
String result;
int length;
if (charFormat == "UTF-16LE")
length = buffer.order(ByteOrder.LITTLE_ENDIAN).getInt();
else
length = buffer.order(ByteOrder.LITTLE_ENDIAN).getShort();
int bufferPosition = buffer.position();
try {
result = new String(buffer.array(), bufferPosition, length,
charFormat);
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
return "";
}
// TODO: Verify if character position is set correctly after reading a
// UTF-16 string
buffer.position(bufferPosition + length);
return result;
}
private byte[] getString(String string, String charFormat) {
ByteBuffer result;
int length = 2 + string.length();
if (charFormat == "UTF-16LE") {
result = ByteBuffer.allocate(length * 2).order(
ByteOrder.LITTLE_ENDIAN);
result.putInt(string.length());
} else {
result = ByteBuffer.allocate(length).order(ByteOrder.LITTLE_ENDIAN);
result.putShort((short) string.length());
}
try {
result.put(string.getBytes(charFormat));
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
return new byte[] {};
}
return result.array();
}
// FIXME: this is redundant and was also bugged. At some point, get rid of
// the redundant functions.
/**
* Reads the next string in. It gets the length of the
* string from the short/int at the beginning of it
* @param bb The ByteBuffer to read from
* @param charset Charset of the string
* Reads the next string in. It gets the length of the string from the
* short/int at the beginning of it
*
* @param bb
* The ByteBuffer to read from
* @param charset
* Charset of the string
* @return The read string. Returns "" if exception is thrown
*/
protected String getNextString(IoBuffer bb, String charset) {
@@ -166,7 +162,7 @@ public abstract class Message {
}
if (length > bb.remaining())
return "";
byte [] data = new byte[length];
byte[] data = new byte[length];
bb.get(data);
return new String(data, charset);
} catch (Exception e) {
@@ -174,18 +170,21 @@ public abstract class Message {
}
return "";
}
/**
* Reads the next array with specified size and returns it
* @param bb The ByteBuffer to read from
* @param size Size of the array
*
* @param bb
* The ByteBuffer to read from
* @param size
* Size of the array
* @return The array that has been read, or an empty array if an exception
*/
protected byte [] getNextArray(IoBuffer bb, int size) {
protected byte[] getNextArray(IoBuffer bb, int size) {
try {
if (bb.remaining() < size)
return new byte[0];
byte [] tmp = new byte[size];
byte[] tmp = new byte[size];
bb.get(tmp);
return tmp;
} catch (Exception e) {
@@ -193,13 +192,13 @@ public abstract class Message {
}
return new byte[0];
}
protected String getNextAsciiString(IoBuffer buffer) {
return getNextString(buffer, "US-ASCII");
}
protected String getNextUnicodeString(IoBuffer buffer) {
return getNextString(buffer, "UTF-16LE");
}
}
}