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

pb

Browse Source
This commit is contained in:
redkale
2024-10-19 19:31:48 +08:00
parent e82f7e39b0
commit 9a085536fb
7 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/redkale/convert/ObjectEncoder.java
View File

@@ -338,7 +338,7 @@ public class ObjectEncoder<W extends Writer, T> implements Encodeable<W, T> {
int maxPosition = 0;
for (EnMember member : members) {
maxPosition = member.getPosition();
out.writeObjectField(member, value);
out.writeFieldValue(member, value);
}
if (out.objExtFunc != null) {
ConvertField[] extFields = out.objExtFunc.apply(value);
@@ -347,7 +347,7 @@ public class ObjectEncoder<W extends Writer, T> implements Encodeable<W, T> {
for (ConvertField en : extFields) {
if (en != null) {
maxPosition++;
out.writeObjectField(
out.writeFieldValue(
en.getName(),
en.getType(),
Math.max(en.getPosition(), maxPosition),

4
src/main/java/org/redkale/convert/Writer.java
View File

@@ -112,7 +112,7 @@ public abstract class Writer {
* @param obj 写入的对象
*/
@SuppressWarnings("unchecked")
public void writeObjectField(final EnMember member, Object obj) {
public void writeFieldValue(final EnMember member, Object obj) {
Object value;
if (objFieldFunc == null) {
value = member.getFieldValue(obj);
@@ -155,7 +155,7 @@ public abstract class Writer {
* @param value 写入的字段对象
*/
@SuppressWarnings("unchecked")
public void writeObjectField(
public void writeFieldValue(
final String fieldName, Type fieldType, int fieldPos, Encodeable anyEncoder, Object value) {
if (value == null) {
if (nullable()) {

2
src/main/java/org/redkale/convert/pb/ProtobufDynEncoder.java
View File

@@ -286,7 +286,7 @@ public abstract class ProtobufDynEncoder<T> extends ProtobufObjectEncoder<T> {
mv.visitMethodInsn(
INVOKEVIRTUAL,
pbwriterName,
"writeObjectField",
"writeFieldValue",
"(" + enMemberDesc + objectDesc + ")V",
false);
}

4
src/main/java/org/redkale/convert/pb/ProtobufObjectEncoder.java
View File

@@ -42,7 +42,7 @@ public class ProtobufObjectEncoder<T> extends ObjectEncoder<ProtobufWriter, T>
int maxPosition = 0;
for (EnMember fieldMember : members) {
maxPosition = fieldMember.getPosition();
subout.writeObjectField(fieldMember, value);
subout.writeFieldValue(fieldMember, value);
}
if (subout.objExtFunc() != null) {
ConvertField[] extFields = subout.objExtFunc().apply(value);
@@ -51,7 +51,7 @@ public class ProtobufObjectEncoder<T> extends ObjectEncoder<ProtobufWriter, T>
for (ConvertField en : extFields) {
if (en != null) {
maxPosition++;
subout.writeObjectField(
subout.writeFieldValue(
en.getName(),
en.getType(),
Math.max(en.getPosition(), maxPosition),

2
src/main/java/org/redkale/convert/pb/ProtobufWriter.java
View File

@@ -1054,7 +1054,7 @@ public abstract class ProtobufWriter extends Writer {
@Override
@ClassDepends // objExtFunc扩展字段时member=null
public final void writeObjectField(@Nullable EnMember member, Object obj) {
public final void writeFieldValue(@Nullable EnMember member, Object obj) {
Object value;
if (objFieldFunc == null) {
value = member.getFieldValue(obj);

2
src/test/java/org/redkale/test/convert/InnerCoderEntityTest.java
View File

@@ -99,7 +99,7 @@ public class InnerCoderEntityTest {
}
out.writeObjectB(value);
for (EnMember member : enMembers) {
out.writeObjectField(member, value);
out.writeFieldValue(member, value);
}
out.writeObjectE(value);
}

2
src/test/java/org/redkale/test/convert/pb/UserBeanProtoDynEncoder.java
View File

@@ -78,7 +78,7 @@ public class UserBeanProtoDynEncoder extends ProtobufDynEncoder<UserBean> {
subout.writeFieldBytesValue(23, value.getBit6());
subout.writeFieldStringsValue(23, value.getStrs());
subout.writeObjectField(mapEnMember, value);
subout.writeFieldValue(mapEnMember, value);
subout.writeObjectE(value);
offerWriter(out, subout);
}