From 8ad28e89329809a3880dae8b64c4c46f5eacb33b Mon Sep 17 00:00:00 2001
From: redkale <redkale@qq.com>
Date: Thu, 19 Sep 2024 17:04:43 +0800
Subject: [PATCH] protobuf

---
 src/main/java/org/redkale/convert/ConvertFactory.java  |  6 ++++++
 .../java/org/redkale/convert/json/JsonDynEncoder.java  | 10 ++--------
 .../org/redkale/convert/pb/ProtobufDynEncoder.java     | 10 ++--------
 3 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/src/main/java/org/redkale/convert/ConvertFactory.java b/src/main/java/org/redkale/convert/ConvertFactory.java
index 660ebb65b..9711c88b9 100644
--- a/src/main/java/org/redkale/convert/ConvertFactory.java
+++ b/src/main/java/org/redkale/convert/ConvertFactory.java
@@ -553,6 +553,12 @@ public abstract class ConvertFactory<R extends Reader, W extends Writer> {
         return fname;
     }
 
+    public String readConvertFieldName(Class clazz, AccessibleObject element) {
+        ConvertColumnEntry ref = findRef(clazz, element);
+        String name = ref == null || ref.name().isEmpty() ? readGetSetFieldName(element) : ref.name();
+        return name;
+    }
+
     public String readGetSetFieldName(AccessibleObject element) {
         if (element instanceof Field) {
             return ((Field) element).getName();
diff --git a/src/main/java/org/redkale/convert/json/JsonDynEncoder.java b/src/main/java/org/redkale/convert/json/JsonDynEncoder.java
index 456322425..3e9c9bd0f 100644
--- a/src/main/java/org/redkale/convert/json/JsonDynEncoder.java
+++ b/src/main/java/org/redkale/convert/json/JsonDynEncoder.java
@@ -131,7 +131,7 @@ public abstract class JsonDynEncoder<T> implements Encodeable<JsonWriter, T> {
                 if (!factory.isSimpleMemberType(clazz, field.getGenericType(), field.getType())) {
                     return null;
                 }
-                String name = convertFieldName(factory, clazz, field);
+                String name = factory.readConvertFieldName(clazz, field);
                 if (names.contains(name)) {
                     continue;
                 }
@@ -182,7 +182,7 @@ public abstract class JsonDynEncoder<T> implements Encodeable<JsonWriter, T> {
                 if (!factory.isSimpleMemberType(clazz, method.getGenericReturnType(), method.getReturnType())) {
                     return null;
                 }
-                String name = convertFieldName(factory, clazz, method);
+                String name = factory.readConvertFieldName(clazz, method);
                 if (names.contains(name)) {
                     continue;
                 }
@@ -206,12 +206,6 @@ public abstract class JsonDynEncoder<T> implements Encodeable<JsonWriter, T> {
         }
     }
 
-    protected static String convertFieldName(final JsonFactory factory, Class clazz, AccessibleObject element) {
-        ConvertColumnEntry ref = factory.findRef(clazz, element);
-        String name = ref == null || ref.name().isEmpty() ? factory.readGetSetFieldName(element) : ref.name();
-        return name;
-    }
-
     protected static ConvertSmallString readConvertSmallString(JsonFactory factory, AccessibleObject element) {
         if (element instanceof Field) {
             return ((Field) element).getAnnotation(ConvertSmallString.class);
diff --git a/src/main/java/org/redkale/convert/pb/ProtobufDynEncoder.java b/src/main/java/org/redkale/convert/pb/ProtobufDynEncoder.java
index 2a9bf033f..5942d4f9e 100644
--- a/src/main/java/org/redkale/convert/pb/ProtobufDynEncoder.java
+++ b/src/main/java/org/redkale/convert/pb/ProtobufDynEncoder.java
@@ -115,7 +115,7 @@ public abstract class ProtobufDynEncoder<T> implements Encodeable<ProtobufWriter
                 if (!factory.isSimpleMemberType(clazz, field.getGenericType(), field.getType())) {
                     return null;
                 }
-                String name = convertFieldName(factory, clazz, field);
+                String name = factory.readConvertFieldName(clazz, field);
                 if (names.contains(name)) {
                     continue;
                 }
@@ -166,7 +166,7 @@ public abstract class ProtobufDynEncoder<T> implements Encodeable<ProtobufWriter
                 if (!factory.isSimpleMemberType(clazz, method.getGenericReturnType(), method.getReturnType())) {
                     return null;
                 }
-                String name = convertFieldName(factory, clazz, method);
+                String name = factory.readConvertFieldName(clazz, method);
                 if (names.contains(name)) {
                     continue;
                 }
@@ -190,12 +190,6 @@ public abstract class ProtobufDynEncoder<T> implements Encodeable<ProtobufWriter
         }
     }
 
-    protected static String convertFieldName(final ProtobufFactory factory, Class clazz, AccessibleObject element) {
-        ConvertColumnEntry ref = factory.findRef(clazz, element);
-        String name = ref == null || ref.name().isEmpty() ? factory.readGetSetFieldName(element) : ref.name();
-        return name;
-    }
-
     protected static ProtobufDynEncoder generateDyncEncoder(
             final ProtobufFactory factory, final Class clazz, final List<AccessibleObject> members) {
         final ObjectEncoder selfObjEncoder = factory.createObjectEncoder(clazz);