From 450b390ac453d81502bbd5958e48b6191d5d26c0 Mon Sep 17 00:00:00 2001
From: Redkale <22250530@qq.com>
Date: Wed, 7 Feb 2018 14:50:43 +0800
Subject: [PATCH] =?UTF-8?q?Convert=E6=94=AF=E6=8C=81=E9=83=A8=E5=88=86Type?=
 =?UTF-8?q?Variable?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/org/redkale/convert/ObjectDecoder.java | 16 ++++++++++++++++
 src/org/redkale/convert/ObjectEncoder.java | 10 +++++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/src/org/redkale/convert/ObjectDecoder.java b/src/org/redkale/convert/ObjectDecoder.java
index 8ae248613..ed482784f 100644
--- a/src/org/redkale/convert/ObjectDecoder.java
+++ b/src/org/redkale/convert/ObjectDecoder.java
@@ -46,6 +46,14 @@ public final class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T
         if (type instanceof ParameterizedType) {
             final ParameterizedType pt = (ParameterizedType) type;
             this.typeClass = (Class) pt.getRawType();
+        } else if (type instanceof TypeVariable) {
+            TypeVariable tv = (TypeVariable) type;
+            Type[] ts = tv.getBounds();
+            if (ts.length == 1 && ts[0] instanceof Class) {
+                this.typeClass = (Class) ts[0];
+            } else {
+                throw new ConvertException("[" + type + "] is no a class or ParameterizedType");
+            }
         } else {
             this.typeClass = (Class) type;
         }
@@ -61,6 +69,14 @@ public final class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T
             if (type instanceof ParameterizedType) {
                 final ParameterizedType pts = (ParameterizedType) type;
                 clazz = (Class) (pts).getRawType();
+            } else if (type instanceof TypeVariable) {
+                TypeVariable tv = (TypeVariable) type;
+                Type[] ts = tv.getBounds();
+                if (ts.length == 1 && ts[0] instanceof Class) {
+                    clazz = (Class) ts[0];
+                } else {
+                    throw new ConvertException("[" + type + "] is no a class or TypeVariable");
+                }
             } else if (!(type instanceof Class)) {
                 throw new ConvertException("[" + type + "] is no a class");
             } else {
diff --git a/src/org/redkale/convert/ObjectEncoder.java b/src/org/redkale/convert/ObjectEncoder.java
index caf4f3956..bd3b9c8f6 100644
--- a/src/org/redkale/convert/ObjectEncoder.java
+++ b/src/org/redkale/convert/ObjectEncoder.java
@@ -41,6 +41,14 @@ public final class ObjectEncoder<W extends Writer, T> implements Encodeable<W, T
         if (type instanceof ParameterizedType) {
             final ParameterizedType pt = (ParameterizedType) type;
             this.typeClass = (Class) pt.getRawType();
+        } else if (type instanceof TypeVariable) {
+            TypeVariable tv = (TypeVariable) type;
+            Type[] ts = tv.getBounds();
+            if (ts.length == 1 && ts[0] instanceof Class) {
+                this.typeClass = (Class) ts[0];
+            } else {
+                throw new ConvertException("[" + type + "] is no a class or ParameterizedType");
+            }
         } else {
             this.typeClass = (Class) type;
         }
@@ -81,7 +89,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 (factory.isConvertDisabled(method)) continue; 
+                    if (factory.isConvertDisabled(method)) continue;
                     if (method.getParameterTypes().length != 0) continue;
                     if (method.getReturnType() == void.class) continue;
                     if (reversible && (cps == null || !contains(cps, ConvertFactory.readGetSetFieldName(method)))) {