From 25fa076db872cbdd8eaa4fb8016a6f8065b6a74d Mon Sep 17 00:00:00 2001
From: wentch <22250530@qq.com>
Date: Fri, 8 Jan 2016 10:38:47 +0800
Subject: [PATCH]

---
 src/org/redkale/convert/MapDecoder.java                | 4 ++--
 src/org/redkale/convert/ObjectDecoder.java             | 8 ++++----
 src/org/redkale/convert/Reader.java                    | 6 ++++--
 src/org/redkale/convert/bson/BsonReader.java           | 4 ++--
 src/org/redkale/convert/json/JsonByteBufferReader.java | 2 +-
 src/org/redkale/convert/json/JsonReader.java           | 8 ++++----
 6 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/org/redkale/convert/MapDecoder.java b/src/org/redkale/convert/MapDecoder.java
index 7b2385084..cef43f55f 100644
--- a/src/org/redkale/convert/MapDecoder.java
+++ b/src/org/redkale/convert/MapDecoder.java
@@ -55,14 +55,14 @@ public final class MapDecoder<K, V> implements Decodeable<Reader, Map<K, V>> {
         if (len == Reader.SIGN_NOLENGTH) {
             while (in.hasNext()) {
                 K key = keyDecoder.convertFrom(in);
-                in.skipBlank();
+                in.readBlank();
                 V value = valueDecoder.convertFrom(in);
                 result.put(key, value);
             }
         } else {
             for (int i = 0; i < len; i++) {
                 K key = keyDecoder.convertFrom(in);
-                in.skipBlank();
+                in.readBlank();
                 V value = valueDecoder.convertFrom(in);
                 result.put(key, value);
             }
diff --git a/src/org/redkale/convert/ObjectDecoder.java b/src/org/redkale/convert/ObjectDecoder.java
index 0fe9b0fa2..f391fd32b 100644
--- a/src/org/redkale/convert/ObjectDecoder.java
+++ b/src/org/redkale/convert/ObjectDecoder.java
@@ -181,14 +181,14 @@ public final class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T
             final T result = this.creator.create();
             while (in.hasNext()) {
                 DeMember member = in.readFieldName(members);
-                in.skipBlank();
+                in.readBlank();
                 if (member == null) {
                     in.skipValue(); //跳过不存在的属性的值
                 } else {
                     member.read(in, result);
                 }
             }
-            in.readObjectE();
+            in.readObjectE(typeClass);
             return result;
         } else {  //带参数的构造函数
             final DeMember<R, T, ?>[] fields = this.creatorConstructorMembers;
@@ -197,7 +197,7 @@ public final class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T
             int oc = 0;
             while (in.hasNext()) {
                 DeMember member = in.readFieldName(members);
-                in.skipBlank();
+                in.readBlank();
                 if (member == null) {
                     in.skipValue(); //跳过不存在的属性的值
                 } else {
@@ -213,7 +213,7 @@ public final class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T
                     if (flag) otherParams[oc++] = new Object[]{member.attribute, val};
                 }
             }
-            in.readObjectE();
+            in.readObjectE(typeClass);
             final T result = this.creator.create(constructorParams);
             for (int i = 0; i < oc; i++) {
                 ((Attribute) otherParams[i][0]).set(result, otherParams[i][1]);
diff --git a/src/org/redkale/convert/Reader.java b/src/org/redkale/convert/Reader.java
index 4f9db92bb..5afc6ebe3 100644
--- a/src/org/redkale/convert/Reader.java
+++ b/src/org/redkale/convert/Reader.java
@@ -36,11 +36,12 @@ public abstract class Reader {
     /**
      * /跳过字段与值之间的多余内容， json就是跳过:符, map跳过:
      */
-    public abstract void skipBlank();
+    public abstract void readBlank();
 
     /**
      * 读取对象的类名， 返回 null 表示对象为null， 返回空字符串表示当前class与返回的class一致，返回非空字符串表示class是当前class的子类。
      *
+     * @param clazz 类名
      * @return 返回字段数
      */
     public String readObjectB(final Class clazz) {
@@ -51,8 +52,9 @@ public abstract class Reader {
     /**
      * 读取对象的尾端
      *
+     * @param clazz 类名
      */
-    public abstract void readObjectE();
+    public abstract void readObjectE(final Class clazz);
 
     /**
      * 读取数组的开头并返回数组的长度
diff --git a/src/org/redkale/convert/bson/BsonReader.java b/src/org/redkale/convert/bson/BsonReader.java
index 13183a27c..9759032ff 100644
--- a/src/org/redkale/convert/bson/BsonReader.java
+++ b/src/org/redkale/convert/bson/BsonReader.java
@@ -170,7 +170,7 @@ public class BsonReader extends Reader {
     }
 
     @Override
-    public final void readObjectE() {
+    public final void readObjectE(final Class clazz) {
         if (readShort() != SIGN_OBJECTE) {
             throw new ConvertException("a bson object must end with " + (SIGN_OBJECTE)
                     + " (position = " + position + ") but '" + currentByte() + "'");
@@ -210,7 +210,7 @@ public class BsonReader extends Reader {
      * 判断下一个非空白字节是否:
      */
     @Override
-    public final void skipBlank() {
+    public final void readBlank() {
     }
 
     /**
diff --git a/src/org/redkale/convert/json/JsonByteBufferReader.java b/src/org/redkale/convert/json/JsonByteBufferReader.java
index 3c64f78c0..3e04a27d8 100644
--- a/src/org/redkale/convert/json/JsonByteBufferReader.java
+++ b/src/org/redkale/convert/json/JsonByteBufferReader.java
@@ -139,7 +139,7 @@ public class JsonByteBufferReader extends JsonReader {
      * 判断下一个非空白字符是否:
      */
     @Override
-    public final void skipBlank() {
+    public final void readBlank() {
         char ch = nextGoodChar();
         if (ch == ':') return;
         throw new ConvertException("expected a ':' but '" + ch + "'(position = " + position + ")");
diff --git a/src/org/redkale/convert/json/JsonReader.java b/src/org/redkale/convert/json/JsonReader.java
index 98a3d324a..5325f3eb8 100644
--- a/src/org/redkale/convert/json/JsonReader.java
+++ b/src/org/redkale/convert/json/JsonReader.java
@@ -93,7 +93,7 @@ public class JsonReader extends Reader {
         for (String key1 : keys) {
             while (this.hasNext()) {
                 String field = this.readSmallString();
-                skipBlank();
+                readBlank();
                 if (key1.equals(field)) break;
                 skipValue();
             }
@@ -113,7 +113,7 @@ public class JsonReader extends Reader {
         } else if (ch == '{') {
             while (hasNext()) {
                 this.readSmallString(); //读掉field
-                this.skipBlank();
+                this.readBlank();
                 this.skipValue();
             }
         } else if (ch == '[') {
@@ -189,7 +189,7 @@ public class JsonReader extends Reader {
     }
 
     @Override
-    public final void readObjectE() {
+    public final void readObjectE(final Class clazz) {
     }
 
     /**
@@ -237,7 +237,7 @@ public class JsonReader extends Reader {
      * 判断下一个非空白字符是否:
      */
     @Override
-    public void skipBlank() {
+    public void readBlank() {
         char ch = this.text[++this.position];
         if (ch == ':') return;
         if (ch <= ' ') {