lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert增加readByteArray和writeByteArray方法

Browse Source
This commit is contained in:
Redkale
2018-07-16 18:38:02 +08:00
parent 681e3967d2
commit 28e72f9883
7 changed files with 107 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/org/redkale/convert/Reader.java
View File

@@ -107,6 +107,13 @@ public abstract class Reader {
*/
public abstract byte readByte();
/**
* 读取byte[]
*
* @return byte[]
*/
public abstract byte[] readByteArray();
/**
* 读取一个char值
*

7
src/org/redkale/convert/Writer.java
View File

@@ -182,6 +182,13 @@ public abstract class Writer {
*/
public abstract void writeByte(byte value);
/**
* 写入byte[]
*
* @param values byte[]
*/
public abstract void writeByteArray(byte[] values);
/**
* 写入一个char值
*

29
src/org/redkale/convert/bson/BsonReader.java
View File

@@ -248,6 +248,35 @@ public class BsonReader extends Reader {
return content[++this.position];
}
@Override
public final byte[] readByteArray() {
int len = readArrayB();
if (len == Reader.SIGN_NULL) return null;
if (len == Reader.SIGN_NOLENGTH) {
int size = 0;
byte[] data = new byte[8];
while (hasNext()) {
if (size >= data.length) {
byte[] newdata = new byte[data.length + 4];
System.arraycopy(data, 0, newdata, 0, size);
data = newdata;
}
data[size++] = readByte();
}
readArrayE();
byte[] newdata = new byte[size];
System.arraycopy(data, 0, newdata, 0, size);
return newdata;
} else {
byte[] values = new byte[len];
for (int i = 0; i < values.length; i++) {
values[i] = readByte();
}
readArrayE();
return values;
}
}
@Override
public char readChar() {
return (char) ((0xff00 & (content[++this.position] << 8)) | (0xff & content[++this.position]));

16
src/org/redkale/convert/bson/BsonWriter.java
View File

@@ -125,6 +125,22 @@ public class BsonWriter extends Writer {
writeTo(value);
}
@Override
public final void writeByteArray(byte[] values) {
if (values == null) {
writeNull();
return;
}
writeArrayB(values.length);
boolean flag = false;
for (byte v : values) {
if (flag) writeArrayMark();
writeByte(v);
flag = true;
}
writeArrayE();
}
@Override
public final void writeChar(final char value) {
writeTo((byte) ((value & 0xFF00) >> 8), (byte) (value & 0xFF));

41
src/org/redkale/convert/ext/ByteArraySimpledCoder.java
View File

@@ -11,7 +11,7 @@ import org.redkale.convert.Writer;
/**
* byte[] 的SimpledCoder实现
*
*
* <p>
* 详情见: https://redkale.org
*
@@ -25,47 +25,12 @@ public final class ByteArraySimpledCoder<R extends Reader, W extends Writer> ext
@Override
public void convertTo(W out, byte[] values) {
if (values == null) {
out.writeNull();
return;
}
out.writeArrayB(values.length);
boolean flag = false;
for (byte v : values) {
if (flag) out.writeArrayMark();
out.writeByte(v);
flag = true;
}
out.writeArrayE();
out.writeByteArray(values);
}
@Override
public byte[] convertFrom(R in) {
int len = in.readArrayB();
if (len == Reader.SIGN_NULL) return null;
if (len == Reader.SIGN_NOLENGTH) {
int size = 0;
byte[] data = new byte[8];
while (in.hasNext()) {
if (size >= data.length) {
byte[] newdata = new byte[data.length + 4];
System.arraycopy(data, 0, newdata, 0, size);
data = newdata;
}
data[size++] = in.readByte();
}
in.readArrayE();
byte[] newdata = new byte[size];
System.arraycopy(data, 0, newdata, 0, size);
return newdata;
} else {
byte[] values = new byte[len];
for (int i = 0; i < values.length; i++) {
values[i] = in.readByte();
}
in.readArrayE();
return values;
}
return in.readByteArray();
}
}

29
src/org/redkale/convert/json/JsonReader.java
View File

@@ -453,6 +453,35 @@ public class JsonReader extends Reader {
return (byte) readInt();
}
@Override
public final byte[] readByteArray() {
int len = readArrayB();
if (len == Reader.SIGN_NULL) return null;
if (len == Reader.SIGN_NOLENGTH) {
int size = 0;
byte[] data = new byte[8];
while (hasNext()) {
if (size >= data.length) {
byte[] newdata = new byte[data.length + 4];
System.arraycopy(data, 0, newdata, 0, size);
data = newdata;
}
data[size++] = readByte();
}
readArrayE();
byte[] newdata = new byte[size];
System.arraycopy(data, 0, newdata, 0, size);
return newdata;
} else {
byte[] values = new byte[len];
for (int i = 0; i < values.length; i++) {
values[i] = readByte();
}
readArrayE();
return values;
}
}
@Override
public final char readChar() {
return (char) readInt();

16
src/org/redkale/convert/json/JsonWriter.java
View File

@@ -188,6 +188,22 @@ public class JsonWriter extends Writer {
writeInt(value);
}
@Override
public final void writeByteArray(byte[] values) {
if (values == null) {
writeNull();
return;
}
writeArrayB(values.length);
boolean flag = false;
for (byte v : values) {
if (flag) writeArrayMark();
writeByte(v);
flag = true;
}
writeArrayE();
}
@Override
public final void writeChar(char value) {
writeInt(value);