From 28251435e424d318a55132783db8e4d0f0baa683 Mon Sep 17 00:00:00 2001
From: Redkale <22250530@qq.com>
Date: Mon, 8 Jan 2018 11:23:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0ConvertDisabled=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/org/redkale/convert/ConvertDisabled.java | 24 ++++++++++++++++++++
 src/org/redkale/convert/ObjectDecoder.java   |  2 +-
 src/org/redkale/convert/ObjectEncoder.java   |  2 +-
 src/org/redkale/util/AnyValue.java           |  3 ++-
 4 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 src/org/redkale/convert/ConvertDisabled.java

diff --git a/src/org/redkale/convert/ConvertDisabled.java b/src/org/redkale/convert/ConvertDisabled.java
new file mode 100644
index 000000000..f86e384ea
--- /dev/null
+++ b/src/org/redkale/convert/ConvertDisabled.java
@@ -0,0 +1,24 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.redkale.convert;
+
+import java.lang.annotation.*;
+import static java.lang.annotation.ElementType.*;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+/**
+ * 序列化时永久禁用该字段, 与ConvertColumn.ignore()的区别在于: ConvertDisabled不能通过ConvertEntity来解禁
+ *
+ * <p>
+ * 详情见: https://redkale.org
+ *
+ * @author zhangjx
+ */
+@Target({METHOD, FIELD})
+@Retention(RUNTIME)
+public @interface ConvertDisabled {
+
+}
diff --git a/src/org/redkale/convert/ObjectDecoder.java b/src/org/redkale/convert/ObjectDecoder.java
index f5208f871..d8612e638 100644
--- a/src/org/redkale/convert/ObjectDecoder.java
+++ b/src/org/redkale/convert/ObjectDecoder.java
@@ -89,7 +89,7 @@ public final class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T
                     if (method.isSynthetic()) continue;
                     if (method.getName().length() < 4) continue;
                     if (!method.getName().startsWith("set")) continue;
-                    if (method.getAnnotation(java.beans.Transient.class) != null) continue;
+                    if (method.getAnnotation(ConvertDisabled.class) != null) continue;
                     if (method.getParameterTypes().length != 1) continue;
                     if (method.getReturnType() != void.class) continue;
                     if (reversible && (cps == null || !ObjectEncoder.contains(cps, ConvertFactory.readGetSetFieldName(method)))) {
diff --git a/src/org/redkale/convert/ObjectEncoder.java b/src/org/redkale/convert/ObjectEncoder.java
index 3dcd5624d..6f4f5d532 100644
--- a/src/org/redkale/convert/ObjectEncoder.java
+++ b/src/org/redkale/convert/ObjectEncoder.java
@@ -80,7 +80,7 @@ public final class ObjectEncoder<W extends Writer, T> implements Encodeable<W, T
                     if (method.getName().length() < 3) continue;
                     if (method.getName().equals("getClass")) continue;
                     if (!method.getName().startsWith("is") && !method.getName().startsWith("get")) continue;
-                    if (method.getAnnotation(java.beans.Transient.class) != null) continue;
+                    if (method.getAnnotation(ConvertDisabled.class) != null) continue;
                     if (method.getParameterTypes().length != 0) continue;
                     if (method.getReturnType() == void.class) continue;
                     if (reversible && (cps == null || !contains(cps, ConvertFactory.readGetSetFieldName(method)))) {
diff --git a/src/org/redkale/util/AnyValue.java b/src/org/redkale/util/AnyValue.java
index 0b779b75a..5220e5433 100644
--- a/src/org/redkale/util/AnyValue.java
+++ b/src/org/redkale/util/AnyValue.java
@@ -8,6 +8,7 @@ package org.redkale.util;
 import java.lang.reflect.Array;
 import java.util.*;
 import java.util.function.*;
+import org.redkale.convert.ConvertDisabled;
 
 /**
  * 该类提供类似JSONObject的数据结构，主要用于读取xml配置文件和http-header存储
@@ -239,7 +240,7 @@ public abstract class AnyValue {
         }
 
         @Override
-        @java.beans.Transient
+        @ConvertDisabled
         public String[] getNames() {
             Set<String> set = new LinkedHashSet<>();
             for (Entry en : this.stringEntrys) {