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

Browse Source
This commit is contained in:
Redkale
2020-09-28 14:15:07 +08:00
parent a9dd82dcf4
commit 2404f547ab
15 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/org/redkale/convert/ArrayEncoder.java
View File

@@ -66,7 +66,7 @@ public class ArrayEncoder<T> implements Encodeable<Writer, T[]> {
return;
}
if (value.length == 0) {
out.writeArrayB(0, componentEncoder, value);
out.writeArrayB(0, this, componentEncoder, value);
out.writeArrayE();
return;
}
@@ -81,7 +81,7 @@ public class ArrayEncoder<T> implements Encodeable<Writer, T[]> {
}
}
}
if (out.writeArrayB(value.length, componentEncoder, value) < 0) {
if (out.writeArrayB(value.length, this, componentEncoder, value) < 0) {
final Type comp = this.componentType;
boolean first = true;
for (Object v : value) {

8
src/org/redkale/convert/CollectionEncoder.java
View File

@@ -61,7 +61,7 @@ public class CollectionEncoder<T> implements Encodeable<Writer, Collection<T>> {
return;
}
if (value.isEmpty()) {
out.writeArrayB(0, componentEncoder, value);
out.writeArrayB(0, this, componentEncoder, value);
out.writeArrayE();
return;
}
@@ -76,18 +76,18 @@ public class CollectionEncoder<T> implements Encodeable<Writer, Collection<T>> {
}
}
}
if (out.writeArrayB(value.size(), componentEncoder, value) < 0) {
if (out.writeArrayB(value.size(), this, componentEncoder, value) < 0) {
boolean first = true;
for (Object v : value) {
if (!first) out.writeArrayMark();
writeValue(out, member, v);
writeMemberValue(out, member, v, first);
if (first) first = false;
}
}
out.writeArrayE();
}
protected void writeValue(Writer out, EnMember member, Object value) {
protected void writeMemberValue(Writer out, EnMember member, Object value, boolean first) {
componentEncoder.convertTo(out, value);
}

4
src/org/redkale/convert/StreamEncoder.java
View File

@@ -62,7 +62,7 @@ public class StreamEncoder<T> implements Encodeable<Writer, Stream<T>> {
}
Object[] array = value.toArray();
if (array.length == 0) {
out.writeArrayB(0, componentEncoder, array);
out.writeArrayB(0, this, componentEncoder, array);
out.writeArrayE();
return;
}
@@ -77,7 +77,7 @@ public class StreamEncoder<T> implements Encodeable<Writer, Stream<T>> {
}
}
}
if (out.writeArrayB(array.length, componentEncoder, array) < 0) {
if (out.writeArrayB(array.length, this, componentEncoder, array) < 0) {
boolean first = true;
for (Object v : array) {
if (!first) out.writeArrayMark();

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

@@ -186,12 +186,13 @@ public abstract class Writer {
* 输出一个数组前的操作
*
* @param size 数组长度
* @param arrayEncoder Encodeable 可能是ArrayEncoder、CollectionEncoder或StreamEncoder
* @param componentEncoder Encodeable
* @param obj 对象, 不一定是数组、Collection对象，也可能是伪Collection对象
*
* @return 返回-1表示还没有写入对象内容，大于-1表示已写入对象内容，返回对象内容大小
*/
public abstract int writeArrayB(int size, Encodeable<Writer, Object> componentEncoder, Object obj);
public abstract int writeArrayB(int size, Encodeable arrayEncoder, Encodeable<Writer, Object> componentEncoder, Object obj);
/**
* 输出数组元素间的间隔符

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

@@ -135,7 +135,7 @@ public class BsonWriter extends Writer {
writeNull();
return;
}
writeArrayB(values.length, null, values);
writeArrayB(values.length, null, null, values);
boolean flag = false;
for (byte v : values) {
if (flag) writeArrayMark();
@@ -254,7 +254,7 @@ public class BsonWriter extends Writer {
}
@Override
public final int writeArrayB(int size, Encodeable<Writer, Object> componentEncoder, Object obj) {
public final int writeArrayB(int size, Encodeable arrayEncoder, Encodeable<Writer, Object> componentEncoder, Object obj) {
writeInt(size);
if (componentEncoder != null && componentEncoder != ByteSimpledCoder.instance) {
writeByte(BsonFactory.typeEnum(componentEncoder.getType()));

2
src/org/redkale/convert/ext/BoolArraySimpledCoder.java
View File

@@ -29,7 +29,7 @@ public final class BoolArraySimpledCoder<R extends Reader, W extends Writer> ext
out.writeNull();
return;
}
if (out.writeArrayB(values.length, BoolSimpledCoder.instance, values) < 0) {
if (out.writeArrayB(values.length, this, BoolSimpledCoder.instance, values) < 0) {
boolean flag = false;
for (boolean v : values) {
if (flag) out.writeArrayMark();

2
src/org/redkale/convert/ext/ByteBufferSimpledCoder.java
View File

@@ -30,7 +30,7 @@ public final class ByteBufferSimpledCoder<R extends Reader, W extends Writer> ex
out.writeNull();
return;
}
if (out.writeArrayB(value.remaining(), ByteSimpledCoder.instance, value) < 0) {
if (out.writeArrayB(value.remaining(), this, ByteSimpledCoder.instance, value) < 0) {
boolean flag = false;
for (byte v : value.array()) {
if (flag) out.writeArrayMark();

2
src/org/redkale/convert/ext/CharArraySimpledCoder.java
View File

@@ -29,7 +29,7 @@ public final class CharArraySimpledCoder<R extends Reader, W extends Writer> ext
out.writeNull();
return;
}
if (out.writeArrayB(values.length, CharSimpledCoder.instance, values) < 0) {
if (out.writeArrayB(values.length, this, CharSimpledCoder.instance, values) < 0) {
boolean flag = false;
for (char v : values) {
if (flag) out.writeArrayMark();

2
src/org/redkale/convert/ext/DoubleArraySimpledCoder.java
View File

@@ -30,7 +30,7 @@ public final class DoubleArraySimpledCoder<R extends Reader, W extends Writer> e
out.writeNull();
return;
}
if (out.writeArrayB(values.length, DoubleSimpledCoder.instance, values) < 0) {
if (out.writeArrayB(values.length, this, DoubleSimpledCoder.instance, values) < 0) {
boolean flag = false;
for (double v : values) {
if (flag) out.writeArrayMark();

2
src/org/redkale/convert/ext/FloatArraySimpledCoder.java
View File

@@ -29,7 +29,7 @@ public final class FloatArraySimpledCoder<R extends Reader, W extends Writer> ex
out.writeNull();
return;
}
if (out.writeArrayB(values.length, FloatSimpledCoder.instance, values) < 0) {
if (out.writeArrayB(values.length, this, FloatSimpledCoder.instance, values) < 0) {
boolean flag = false;
for (float v : values) {
if (flag) out.writeArrayMark();

2
src/org/redkale/convert/ext/IntArraySimpledCoder.java
View File

@@ -30,7 +30,7 @@ public final class IntArraySimpledCoder<R extends Reader, W extends Writer> exte
out.writeNull();
return;
}
if (out.writeArrayB(values.length, IntSimpledCoder.instance, values) < 0) {
if (out.writeArrayB(values.length, this, IntSimpledCoder.instance, values) < 0) {
boolean flag = false;
for (int v : values) {
if (flag) out.writeArrayMark();

2
src/org/redkale/convert/ext/LongArraySimpledCoder.java
View File

@@ -30,7 +30,7 @@ public final class LongArraySimpledCoder<R extends Reader, W extends Writer> ext
out.writeNull();
return;
}
if (out.writeArrayB(values.length, LongSimpledCoder.instance, values) < 0) {
if (out.writeArrayB(values.length, this, LongSimpledCoder.instance, values) < 0) {
boolean flag = false;
for (long v : values) {
if (flag) out.writeArrayMark();

2
src/org/redkale/convert/ext/ShortArraySimpledCoder.java
View File

@@ -29,7 +29,7 @@ public final class ShortArraySimpledCoder<R extends Reader, W extends Writer> ex
out.writeNull();
return;
}
if (out.writeArrayB(values.length, ShortSimpledCoder.instance, values) < 0) {
if (out.writeArrayB(values.length, this, ShortSimpledCoder.instance, values) < 0) {
boolean flag = false;
for (short v : values) {
if (flag) out.writeArrayMark();

2
src/org/redkale/convert/ext/StringArraySimpledCoder.java
View File

@@ -27,7 +27,7 @@ public final class StringArraySimpledCoder<R extends Reader, W extends Writer> e
out.writeNull();
return;
}
if (out.writeArrayB(values.length, StringSimpledCoder.instance, values) < 0) {
if (out.writeArrayB(values.length, this, StringSimpledCoder.instance, values) < 0) {
boolean flag = false;
for (String v : values) {
if (flag) out.writeArrayMark();

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

@@ -197,7 +197,7 @@ public class JsonWriter extends Writer {
writeNull();
return;
}
writeArrayB(values.length, null, values);
writeArrayB(values.length, null, null, values);
boolean flag = false;
for (byte v : values) {
if (flag) writeArrayMark();
@@ -354,7 +354,7 @@ public class JsonWriter extends Writer {
}
@Override
public final int writeArrayB(int size, Encodeable<Writer, Object> componentEncoder, Object obj) {
public final int writeArrayB(int size, Encodeable arrayEncoder, Encodeable<Writer, Object> componentEncoder, Object obj) {
writeTo('[');
return -1;
}