From 9f9078cdc5e480b674e234a6e2853c3f8fba77a0 Mon Sep 17 00:00:00 2001
From: Redkale <22250530@qq.com>
Date: Mon, 16 Jul 2018 00:33:45 +0800
Subject: [PATCH]

---
 src/org/redkale/convert/DeMember.java      | 13 ++++++++-----
 src/org/redkale/convert/EnMember.java      | 13 ++++++++-----
 src/org/redkale/convert/ObjectDecoder.java |  8 +++++---
 src/org/redkale/convert/ObjectEncoder.java |  6 ++++--
 4 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/src/org/redkale/convert/DeMember.java b/src/org/redkale/convert/DeMember.java
index 3dd077619..e6acf6d03 100644
--- a/src/org/redkale/convert/DeMember.java
+++ b/src/org/redkale/convert/DeMember.java
@@ -20,11 +20,11 @@ import org.redkale.util.Attribute;
  * @param <F> 字段的数据类型
  */
 @SuppressWarnings("unchecked")
-public final class DeMember<R extends Reader, T, F> implements Comparable<DeMember<R, T, F>> {
+public final class DeMember<R extends Reader, T, F> {
 
     protected int index;
 
-    protected boolean fieldSort;
+    protected int position; //从1开始
 
     protected final Attribute<T, F> attribute;
 
@@ -76,8 +76,11 @@ public final class DeMember<R extends Reader, T, F> implements Comparable<DeMemb
         return this.index;
     }
 
-    @Override
-    public final int compareTo(DeMember<R, T, F> o) {
+    public int getPosition() {
+        return this.position;
+    }
+
+    public int compareTo(boolean fieldSort, DeMember<R, T, F> o) {
         if (o == null) return -1;
         if (this.index != o.index) return (this.index == 0 ? Integer.MAX_VALUE : this.index) - (o.index == 0 ? Integer.MAX_VALUE : o.index);
         return fieldSort ? this.attribute.field().compareTo(o.attribute.field()) : 0;
@@ -88,7 +91,7 @@ public final class DeMember<R extends Reader, T, F> implements Comparable<DeMemb
         if (this == obj) return true;
         if (!(obj instanceof DeMember)) return false;
         DeMember other = (DeMember) obj;
-        return compareTo(other) == 0;
+        return compareTo(true, other) == 0;
     }
 
     @Override
diff --git a/src/org/redkale/convert/EnMember.java b/src/org/redkale/convert/EnMember.java
index 60884ead6..cc9dc77ad 100644
--- a/src/org/redkale/convert/EnMember.java
+++ b/src/org/redkale/convert/EnMember.java
@@ -20,7 +20,7 @@ import org.redkale.util.Attribute;
  * @param <F> 字段的数据类型
  */
 @SuppressWarnings("unchecked")
-public final class EnMember<W extends Writer, T, F> implements Comparable<EnMember<W, T, F>> {
+public final class EnMember<W extends Writer, T, F> {
 
     final Attribute<T, F> attribute;
 
@@ -33,7 +33,7 @@ public final class EnMember<W extends Writer, T, F> implements Comparable<EnMemb
 
     protected int index;
 
-    protected boolean fieldSort;
+    protected int position; //从1开始
 
     public EnMember(Attribute<T, F> attribute, Encodeable<W, F> encoder) {
         this.attribute = attribute;
@@ -69,8 +69,11 @@ public final class EnMember<W extends Writer, T, F> implements Comparable<EnMemb
         return this.index;
     }
 
-    @Override
-    public final int compareTo(EnMember<W, T, F> o) {
+    public int getPosition() {
+        return this.position;
+    }
+
+    public int compareTo(boolean fieldSort, EnMember<W, T, F> o) {
         if (o == null) return -1;
         if (this.index != o.index) return (this.index == 0 ? Integer.MAX_VALUE : this.index) - (o.index == 0 ? Integer.MAX_VALUE : o.index);
         return fieldSort ? this.attribute.field().compareTo(o.attribute.field()) : 0;
@@ -81,7 +84,7 @@ public final class EnMember<W extends Writer, T, F> implements Comparable<EnMemb
         if (this == obj) return true;
         if (!(obj instanceof EnMember)) return false;
         EnMember other = (EnMember) obj;
-        return compareTo(other) == 0;
+        return compareTo(true, other) == 0;
     }
 
     @Override
diff --git a/src/org/redkale/convert/ObjectDecoder.java b/src/org/redkale/convert/ObjectDecoder.java
index f31ae8d5b..6cda94c08 100644
--- a/src/org/redkale/convert/ObjectDecoder.java
+++ b/src/org/redkale/convert/ObjectDecoder.java
@@ -33,7 +33,7 @@ public final class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T
 
     protected DeMember<R, T, ?>[] creatorConstructorMembers = new DeMember[0];
 
-    protected DeMember<R, T, ?>[] members;
+    protected DeMember[] members;
 
     protected ConvertFactory factory;
 
@@ -97,7 +97,6 @@ public final class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T
                     if (ref != null && ref.ignore()) continue;
                     Type t = TypeToken.createClassType(TypeToken.getGenericType(field.getGenericType(), this.type), this.type);
                     DeMember member = new DeMember(ObjectEncoder.createAttribute(factory, clazz, field, null, null), factory.loadDecoder(t));
-                    member.fieldSort = factory.isFieldSort();
                     if (ref != null) member.index = ref.getIndex();
                     list.add(member);
                 }
@@ -157,7 +156,10 @@ public final class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T
                     }
                 }
                 this.members = list.toArray(new DeMember[list.size()]);
-                Arrays.sort(this.members);
+                Arrays.sort(this.members, (a, b) -> a.compareTo(factory.isFieldSort(), b));
+                for (int i = 0; i < this.members.length; i++) {
+                    this.members[i].position = (i + 1);
+                }
 
                 if (cps != null) {
                     final String[] fields = cps;
diff --git a/src/org/redkale/convert/ObjectEncoder.java b/src/org/redkale/convert/ObjectEncoder.java
index 39c05783b..9ae096f51 100644
--- a/src/org/redkale/convert/ObjectEncoder.java
+++ b/src/org/redkale/convert/ObjectEncoder.java
@@ -104,12 +104,14 @@ public final class ObjectEncoder<W extends Writer, T> implements Encodeable<W, T
                     if (ref != null && ref.ignore()) continue;
                     Type t = TypeToken.createClassType(TypeToken.getGenericType(method.getGenericReturnType(), this.type), this.type);
                     EnMember member = new EnMember(createAttribute(factory, clazz, null, method, null), factory.loadEncoder(t));
-                    member.fieldSort = factory.isFieldSort();
                     if (ref != null) member.index = ref.getIndex();
                     list.add(member);
                 }
                 this.members = list.toArray(new EnMember[list.size()]);
-                Arrays.sort(this.members);
+                Arrays.sort(this.members, (a, b) -> a.compareTo(factory.isFieldSort(), b));
+                for (int i = 0; i < this.members.length; i++) {
+                    this.members[i].position = (i + 1);
+                }
 
             } catch (Exception ex) {
                 throw new ConvertException(ex);