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

Convert.newConvert 增加第2个Function参数

Browse Source
This commit is contained in:
Redkale
2019-10-13 12:55:00 +08:00
parent f4548bbe34
commit ef98edd91a
8 changed files with 113 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/org/redkale/convert/Convert.java
View File

@@ -36,12 +36,15 @@ public abstract class Convert<R extends Reader, W extends Writer> {
return writer;
}
protected <S extends W> S fieldFunc(S writer, BiFunction<Attribute, Object, Object> fieldFunc) {
writer.fieldFunc = fieldFunc;
protected <S extends W> S fieldFunc(S writer, BiFunction<Attribute, Object, Object> objFieldFunc, Function<Object, EnFieldObject[]> objExtFunc) {
writer.objFieldFunc = objFieldFunc;
writer.objExtFunc = objExtFunc;
return writer;
}
public abstract Convert<R, W> newConvert(final BiFunction<Attribute, Object, Object> fieldFunc);
public abstract Convert<R, W> newConvert(final BiFunction<Attribute, Object, Object> objFieldFunc);
public abstract Convert<R, W> newConvert(final BiFunction<Attribute, Object, Object> objFieldFunc, Function<Object, EnFieldObject[]> objExtFunc);
public abstract boolean isBinary();

13
src/org/redkale/convert/ObjectEncoder.java
View File

@@ -164,9 +164,22 @@ public class ObjectEncoder<W extends Writer, T> implements Encodeable<W, T> {
return;
}
if (out.writeObjectB(value) < 0) {
int maxPosition = 0;
for (EnMember member : members) {
maxPosition = member.getPosition();
out.writeObjectField(member, value);
}
if (out.objExtFunc != null) {
EnFieldObject[] extFields = out.objExtFunc.apply(value);
if (extFields != null) {
Encodeable<W, ?> anyEncoder = factory.getAnyEncoder();
for (EnFieldObject en : extFields) {
if (en == null) continue;
maxPosition++;
out.writeObjectField(en.getName(), en.getType(), Math.max(en.getPosition(), maxPosition), anyEncoder, en.getValue());
}
}
}
}
out.writeObjectE(value);
}

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

@@ -6,7 +6,7 @@
package org.redkale.convert;
import java.lang.reflect.*;
import java.util.function.BiFunction;
import java.util.function.*;
import org.redkale.util.*;
/**
@@ -26,7 +26,10 @@ public abstract class Writer {
protected Type specify;
//对某个字段值进行动态处理
protected BiFunction<Attribute, Object, Object> fieldFunc;
protected BiFunction<Attribute, Object, Object> objFieldFunc;
//对某个对象进行动态扩展字段值处理
protected Function<Object, EnFieldObject[]> objExtFunc;
/**
* 设置specify
@@ -44,7 +47,7 @@ public abstract class Writer {
}
protected boolean recycle() {
this.fieldFunc = null;
this.objFieldFunc = null;
return true;
}
@@ -116,10 +119,10 @@ public abstract class Writer {
@SuppressWarnings("unchecked")
public void writeObjectField(final EnMember member, Object obj) {
Object value;
if (fieldFunc == null) {
if (objFieldFunc == null) {
value = member.attribute.get(obj);
} else {
value = fieldFunc.apply(member.attribute, obj);
value = objFieldFunc.apply(member.attribute, obj);
}
if (value == null) return;
if (tiny()) {
@@ -129,11 +132,49 @@ public abstract class Writer {
if (!((Boolean) value)) return;
}
}
this.writeFieldName(member);
Attribute attr = member.getAttribute();
this.writeFieldName(attr.field(), attr.genericType(), member.getPosition());
member.encoder.convertTo(this, value);
this.comma = true;
}
/**
* 输出一个对象的某个扩展字段
*
*
* @param fieldName 字段名称
* @param fieldType 字段类型
* @param fieldPos 字段顺序
* @param anyEncoder Encoder
* @param value 写入的字段对象
*/
@SuppressWarnings("unchecked")
public void writeObjectField(final String fieldName, Type fieldType, int fieldPos, Encodeable anyEncoder, Object value) {
if (value == null) return;
if (fieldType == null) fieldType = value.getClass();
if (tiny() && fieldType instanceof Class) {
Class clazz = (Class) fieldType;
if (CharSequence.class.isAssignableFrom(clazz)) {
if (((CharSequence) value).length() == 0) return;
} else if (clazz == boolean.class || clazz == Boolean.class) {
if (!((Boolean) value)) return;
}
}
this.writeFieldName(fieldName, fieldType, fieldPos);
anyEncoder.convertTo(this, value);
this.comma = true;
}
/**
* 输出一个字段名
*
* @param member 字段
*/
public final void writeFieldName(final EnMember member) {
Attribute attr = member.getAttribute();
this.writeFieldName(attr.field(), attr.genericType(), member.getPosition());
}
/**
* 输出一个对象后的操作
*
@@ -191,9 +232,11 @@ public abstract class Writer {
/**
* 输出一个字段名
*
* @param member 字段的EnMember对象
* @param fieldName 字段名称
* @param fieldType 字段类型
* @param fieldPos 字段顺序
*/
public abstract void writeFieldName(EnMember member);
public abstract void writeFieldName(String fieldName, Type fieldType, int fieldPos);
/**
* 写入一个boolean值

7
src/org/redkale/convert/bson/BsonConvert.java
View File

@@ -61,10 +61,15 @@ public class BsonConvert extends BinaryConvert<BsonReader, BsonWriter> {
@Override
public BsonConvert newConvert(final BiFunction<Attribute, Object, Object> fieldFunc) {
return newConvert(fieldFunc, null);
}
@Override
public BsonConvert newConvert(final BiFunction<Attribute, Object, Object> fieldFunc, Function<Object, EnFieldObject[]> objExtFunc) {
return new BsonConvert(getFactory(), tiny) {
@Override
protected <S extends BsonWriter> S configWrite(S writer) {
return fieldFunc(writer, fieldFunc);
return fieldFunc(writer, fieldFunc, objExtFunc);
}
};
}

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

@@ -5,6 +5,7 @@
*/
package org.redkale.convert.bson;
import java.lang.reflect.Type;
import java.nio.ByteBuffer;
import org.redkale.convert.*;
import org.redkale.convert.ext.ByteSimpledCoder;
@@ -200,11 +201,10 @@ public class BsonWriter extends Writer {
}
@Override
public final void writeFieldName(EnMember member) {
Attribute attribute = member.getAttribute();
public final void writeFieldName(String fieldName, Type fieldType, int fieldPos) {
writeByte(BsonReader.SIGN_HASNEXT);
writeSmallString(attribute.field());
writeByte(BsonFactory.typeEnum(attribute.type()));
writeSmallString(fieldName);
writeByte(BsonFactory.typeEnum(fieldType));
}
/**

7
src/org/redkale/convert/json/JsonConvert.java
View File

@@ -48,10 +48,15 @@ public class JsonConvert extends TextConvert<JsonReader, JsonWriter> {
@Override
public JsonConvert newConvert(final BiFunction<Attribute, Object, Object> fieldFunc) {
return newConvert(fieldFunc, null);
}
@Override
public JsonConvert newConvert(final BiFunction<Attribute, Object, Object> fieldFunc, Function<Object, EnFieldObject[]> objExtFunc) {
return new JsonConvert(getFactory(), tiny) {
@Override
protected <S extends JsonWriter> S configWrite(S writer) {
return fieldFunc(writer, fieldFunc);
return fieldFunc(writer, fieldFunc, objExtFunc);
}
};
}

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

@@ -5,6 +5,7 @@
*/
package org.redkale.convert.json;
import java.lang.reflect.Type;
import java.nio.ByteBuffer;
import org.redkale.convert.*;
import org.redkale.util.*;
@@ -159,9 +160,9 @@ public class JsonWriter extends Writer {
}
@Override
public final void writeFieldName(EnMember member) {
public final void writeFieldName(String fieldName, Type fieldType, int fieldPos) {
if (this.comma) writeTo(',');
writeTo(true, member.getAttribute().field());
writeTo(true, fieldName);
writeTo(':');
}