From 9a085536fbb9b04e027eb0700f5f514a32095bd8 Mon Sep 17 00:00:00 2001 From: redkale Date: Sat, 19 Oct 2024 19:31:48 +0800 Subject: [PATCH] pb --- src/main/java/org/redkale/convert/ObjectEncoder.java | 4 ++-- src/main/java/org/redkale/convert/Writer.java | 4 ++-- src/main/java/org/redkale/convert/pb/ProtobufDynEncoder.java | 2 +- .../java/org/redkale/convert/pb/ProtobufObjectEncoder.java | 4 ++-- src/main/java/org/redkale/convert/pb/ProtobufWriter.java | 2 +- .../java/org/redkale/test/convert/InnerCoderEntityTest.java | 2 +- .../org/redkale/test/convert/pb/UserBeanProtoDynEncoder.java | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/redkale/convert/ObjectEncoder.java b/src/main/java/org/redkale/convert/ObjectEncoder.java index 77b55ad98..fcd15cd0b 100644 --- a/src/main/java/org/redkale/convert/ObjectEncoder.java +++ b/src/main/java/org/redkale/convert/ObjectEncoder.java @@ -338,7 +338,7 @@ public class ObjectEncoder implements Encodeable { 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 implements Encodeable { for (ConvertField en : extFields) { if (en != null) { maxPosition++; - out.writeObjectField( + out.writeFieldValue( en.getName(), en.getType(), Math.max(en.getPosition(), maxPosition), diff --git a/src/main/java/org/redkale/convert/Writer.java b/src/main/java/org/redkale/convert/Writer.java index 816fe9566..3e5535fee 100644 --- a/src/main/java/org/redkale/convert/Writer.java +++ b/src/main/java/org/redkale/convert/Writer.java @@ -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()) { diff --git a/src/main/java/org/redkale/convert/pb/ProtobufDynEncoder.java b/src/main/java/org/redkale/convert/pb/ProtobufDynEncoder.java index 6d061eac6..53e8fa452 100644 --- a/src/main/java/org/redkale/convert/pb/ProtobufDynEncoder.java +++ b/src/main/java/org/redkale/convert/pb/ProtobufDynEncoder.java @@ -286,7 +286,7 @@ public abstract class ProtobufDynEncoder extends ProtobufObjectEncoder { mv.visitMethodInsn( INVOKEVIRTUAL, pbwriterName, - "writeObjectField", + "writeFieldValue", "(" + enMemberDesc + objectDesc + ")V", false); } diff --git a/src/main/java/org/redkale/convert/pb/ProtobufObjectEncoder.java b/src/main/java/org/redkale/convert/pb/ProtobufObjectEncoder.java index 7e916def3..13b410a7e 100644 --- a/src/main/java/org/redkale/convert/pb/ProtobufObjectEncoder.java +++ b/src/main/java/org/redkale/convert/pb/ProtobufObjectEncoder.java @@ -42,7 +42,7 @@ public class ProtobufObjectEncoder extends ObjectEncoder 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 extends ObjectEncoder for (ConvertField en : extFields) { if (en != null) { maxPosition++; - subout.writeObjectField( + subout.writeFieldValue( en.getName(), en.getType(), Math.max(en.getPosition(), maxPosition), diff --git a/src/main/java/org/redkale/convert/pb/ProtobufWriter.java b/src/main/java/org/redkale/convert/pb/ProtobufWriter.java index 58e07587d..69a9c7c18 100644 --- a/src/main/java/org/redkale/convert/pb/ProtobufWriter.java +++ b/src/main/java/org/redkale/convert/pb/ProtobufWriter.java @@ -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); diff --git a/src/test/java/org/redkale/test/convert/InnerCoderEntityTest.java b/src/test/java/org/redkale/test/convert/InnerCoderEntityTest.java index f47b63385..19cb550ef 100644 --- a/src/test/java/org/redkale/test/convert/InnerCoderEntityTest.java +++ b/src/test/java/org/redkale/test/convert/InnerCoderEntityTest.java @@ -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); } diff --git a/src/test/java/org/redkale/test/convert/pb/UserBeanProtoDynEncoder.java b/src/test/java/org/redkale/test/convert/pb/UserBeanProtoDynEncoder.java index 7e96ae495..a1301e956 100644 --- a/src/test/java/org/redkale/test/convert/pb/UserBeanProtoDynEncoder.java +++ b/src/test/java/org/redkale/test/convert/pb/UserBeanProtoDynEncoder.java @@ -78,7 +78,7 @@ public class UserBeanProtoDynEncoder extends ProtobufDynEncoder { subout.writeFieldBytesValue(23, value.getBit6()); subout.writeFieldStringsValue(23, value.getStrs()); - subout.writeObjectField(mapEnMember, value); + subout.writeFieldValue(mapEnMember, value); subout.writeObjectE(value); offerWriter(out, subout); }