From afefc16f5ebb3e7c287596d63c6a1f73a4be7a95 Mon Sep 17 00:00:00 2001
From: RedKale <22250530@qq.com>
Date: Tue, 16 Feb 2016 10:16:09 +0800
Subject: [PATCH]

---
 src/org/redkale/convert/AnyEncoder.java        |  4 ++--
 src/org/redkale/convert/ArrayDecoder.java      |  2 +-
 src/org/redkale/convert/ArrayEncoder.java      |  2 +-
 src/org/redkale/convert/CollectionDecoder.java |  2 +-
 src/org/redkale/convert/CollectionEncoder.java |  2 +-
 src/org/redkale/convert/Convert.java           |  6 +++---
 .../{Factory.java => ConvertFactory.java}      | 18 +++++++++---------
 src/org/redkale/convert/DeMember.java          |  2 +-
 src/org/redkale/convert/EnMember.java          |  2 +-
 src/org/redkale/convert/MapDecoder.java        |  2 +-
 src/org/redkale/convert/MapEncoder.java        |  2 +-
 src/org/redkale/convert/ObjectDecoder.java     |  6 +++---
 src/org/redkale/convert/ObjectEncoder.java     | 12 ++++++------
 src/org/redkale/convert/bson/BsonConvert.java  |  2 +-
 src/org/redkale/convert/bson/BsonFactory.java  |  2 +-
 src/org/redkale/convert/json/JsonFactory.java  |  4 ++--
 16 files changed, 35 insertions(+), 35 deletions(-)
 rename src/org/redkale/convert/{Factory.java => ConvertFactory.java} (94%)

diff --git a/src/org/redkale/convert/AnyEncoder.java b/src/org/redkale/convert/AnyEncoder.java
index b4f4ccced..9a2ff74fb 100644
--- a/src/org/redkale/convert/AnyEncoder.java
+++ b/src/org/redkale/convert/AnyEncoder.java
@@ -16,9 +16,9 @@ import java.lang.reflect.Type;
  */
 public final class AnyEncoder<T> implements Encodeable<Writer, T> {
 
-    final Factory factory;
+    final ConvertFactory factory;
 
-    AnyEncoder(Factory factory) {
+    AnyEncoder(ConvertFactory factory) {
         this.factory = factory;
     }
 
diff --git a/src/org/redkale/convert/ArrayDecoder.java b/src/org/redkale/convert/ArrayDecoder.java
index 9f4ad00d5..3aa1c5e31 100644
--- a/src/org/redkale/convert/ArrayDecoder.java
+++ b/src/org/redkale/convert/ArrayDecoder.java
@@ -30,7 +30,7 @@ public final class ArrayDecoder<T> implements Decodeable<Reader, T[]> {
 
     private final Decodeable<Reader, T> decoder;
 
-    public ArrayDecoder(final Factory factory, final Type type) {
+    public ArrayDecoder(final ConvertFactory factory, final Type type) {
         this.type = type;
         if (type instanceof GenericArrayType) {
             Type t = ((GenericArrayType) type).getGenericComponentType();
diff --git a/src/org/redkale/convert/ArrayEncoder.java b/src/org/redkale/convert/ArrayEncoder.java
index e1d5aa812..1cc5c4b18 100644
--- a/src/org/redkale/convert/ArrayEncoder.java
+++ b/src/org/redkale/convert/ArrayEncoder.java
@@ -29,7 +29,7 @@ public final class ArrayEncoder<T> implements Encodeable<Writer, T[]> {
 
     private final Encodeable<Writer, Object> encoder;
 
-    public ArrayEncoder(final Factory factory, final Type type) {
+    public ArrayEncoder(final ConvertFactory factory, final Type type) {
         this.type = type;
         if (type instanceof GenericArrayType) {
             Type t = ((GenericArrayType) type).getGenericComponentType();
diff --git a/src/org/redkale/convert/CollectionDecoder.java b/src/org/redkale/convert/CollectionDecoder.java
index cd2e85f77..8c9ed24b8 100644
--- a/src/org/redkale/convert/CollectionDecoder.java
+++ b/src/org/redkale/convert/CollectionDecoder.java
@@ -32,7 +32,7 @@ public final class CollectionDecoder<T> implements Decodeable<Reader, Collection
 
     private final Decodeable<Reader, T> decoder;
 
-    public CollectionDecoder(final Factory factory, final Type type) {
+    public CollectionDecoder(final ConvertFactory factory, final Type type) {
         this.type = type;
         if (type instanceof ParameterizedType) {
             final ParameterizedType pt = (ParameterizedType) type;
diff --git a/src/org/redkale/convert/CollectionEncoder.java b/src/org/redkale/convert/CollectionEncoder.java
index 528d01363..ebf3b211b 100644
--- a/src/org/redkale/convert/CollectionEncoder.java
+++ b/src/org/redkale/convert/CollectionEncoder.java
@@ -24,7 +24,7 @@ public final class CollectionEncoder<T> implements Encodeable<Writer, Collection
 
     private final Encodeable<Writer, Object> encoder;
 
-    public CollectionEncoder(final Factory factory, final Type type) {
+    public CollectionEncoder(final ConvertFactory factory, final Type type) {
         this.type = type;
         if (type instanceof ParameterizedType) {
             Type t = ((ParameterizedType) type).getActualTypeArguments()[0];
diff --git a/src/org/redkale/convert/Convert.java b/src/org/redkale/convert/Convert.java
index 400df7195..19b7ab5bf 100644
--- a/src/org/redkale/convert/Convert.java
+++ b/src/org/redkale/convert/Convert.java
@@ -17,13 +17,13 @@ package org.redkale.convert;
  */
 public abstract class Convert<R extends Reader, W extends Writer> {
 
-    protected final Factory<R, W> factory;
+    protected final ConvertFactory<R, W> factory;
 
-    protected Convert(Factory<R, W> factory) {
+    protected Convert(ConvertFactory<R, W> factory) {
         this.factory = factory;
     }
 
-    public Factory<R, W> getFactory() {
+    public ConvertFactory<R, W> getFactory() {
         return this.factory;
     }
 }
diff --git a/src/org/redkale/convert/Factory.java b/src/org/redkale/convert/ConvertFactory.java
similarity index 94%
rename from src/org/redkale/convert/Factory.java
rename to src/org/redkale/convert/ConvertFactory.java
index 79533ba31..7825c1295 100644
--- a/src/org/redkale/convert/Factory.java
+++ b/src/org/redkale/convert/ConvertFactory.java
@@ -29,9 +29,9 @@ import org.redkale.util.*;
  * @param <W> Writer输出的子类
  */
 @SuppressWarnings("unchecked")
-public abstract class Factory<R extends Reader, W extends Writer> {
+public abstract class ConvertFactory<R extends Reader, W extends Writer> {
 
-    private final Factory parent;
+    private final ConvertFactory parent;
 
     protected Convert<R, W> convert;
 
@@ -54,7 +54,7 @@ public abstract class Factory<R extends Reader, W extends Writer> {
 
     private boolean skipAllIgnore = false;
 
-    protected Factory(Factory<R, W> parent, boolean tiny) {
+    protected ConvertFactory(ConvertFactory<R, W> parent, boolean tiny) {
         this.tiny = tiny;
         this.parent = parent;
         if (parent == null) {
@@ -108,7 +108,7 @@ public abstract class Factory<R extends Reader, W extends Writer> {
         }
     }
 
-    public Factory parent() {
+    public ConvertFactory parent() {
         return this.parent;
     }
 
@@ -116,15 +116,15 @@ public abstract class Factory<R extends Reader, W extends Writer> {
 
     public abstract boolean isReversible();
 
-    public abstract Factory createChild();
+    public abstract ConvertFactory createChild();
 
-    public abstract Factory createChild(boolean tiny);
+    public abstract ConvertFactory createChild(boolean tiny);
 
     public Convert getConvert() {
         return convert;
     }
 
-    public Factory tiny(boolean tiny) {
+    public ConvertFactory tiny(boolean tiny) {
         this.tiny = tiny;
         return this;
     }
@@ -378,7 +378,7 @@ public abstract class Factory<R extends Reader, W extends Writer> {
                 if (!Modifier.isStatic(method.getModifiers())) continue;
                 Class[] paramTypes = method.getParameterTypes();
                 if (paramTypes.length != 1) continue;
-                if (paramTypes[0] != Factory.class && paramTypes[0] != this.getClass()) continue;
+                if (paramTypes[0] != ConvertFactory.class && paramTypes[0] != this.getClass()) continue;
                 if (!Decodeable.class.isAssignableFrom(method.getReturnType())) continue;
                 try {
                     method.setAccessible(true);
@@ -458,7 +458,7 @@ public abstract class Factory<R extends Reader, W extends Writer> {
                 if (!Modifier.isStatic(method.getModifiers())) continue;
                 Class[] paramTypes = method.getParameterTypes();
                 if (paramTypes.length != 1) continue;
-                if (paramTypes[0] != Factory.class && paramTypes[0] != this.getClass()) continue;
+                if (paramTypes[0] != ConvertFactory.class && paramTypes[0] != this.getClass()) continue;
                 if (!Encodeable.class.isAssignableFrom(method.getReturnType())) continue;
                 try {
                     method.setAccessible(true);
diff --git a/src/org/redkale/convert/DeMember.java b/src/org/redkale/convert/DeMember.java
index 67ecb6cab..3278c5618 100644
--- a/src/org/redkale/convert/DeMember.java
+++ b/src/org/redkale/convert/DeMember.java
@@ -34,7 +34,7 @@ public final class DeMember<R extends Reader, T, F> implements Comparable<DeMemb
         this.decoder = decoder;
     }
 
-    public static <R extends Reader, T, F> DeMember<R, T, F> create(final Factory factory, final Class<T> clazz, final String fieldname) {
+    public static <R extends Reader, T, F> DeMember<R, T, F> create(final ConvertFactory factory, final Class<T> clazz, final String fieldname) {
         try {
             Field field = clazz.getDeclaredField(fieldname);
             return new DeMember<>(Attribute.create(field), factory.loadDecoder(field.getGenericType()));
diff --git a/src/org/redkale/convert/EnMember.java b/src/org/redkale/convert/EnMember.java
index f6f295522..e31dcf2bb 100644
--- a/src/org/redkale/convert/EnMember.java
+++ b/src/org/redkale/convert/EnMember.java
@@ -39,7 +39,7 @@ public final class EnMember<W extends Writer, T, F> implements Comparable<EnMemb
         //this.isnumber = Number.class.isAssignableFrom(t) || (!this.isbool && t.isPrimitive());
     }
 
-    public static <W extends Writer, T, F> EnMember<W, T, F> create(final Factory factory, final Class<T> clazz, final String fieldname) {
+    public static <W extends Writer, T, F> EnMember<W, T, F> create(final ConvertFactory factory, final Class<T> clazz, final String fieldname) {
         try {
             Field field = clazz.getDeclaredField(fieldname);
             return new EnMember<>(Attribute.create(field), factory.loadEncoder(field.getGenericType()));
diff --git a/src/org/redkale/convert/MapDecoder.java b/src/org/redkale/convert/MapDecoder.java
index cef43f55f..22fb3a3c8 100644
--- a/src/org/redkale/convert/MapDecoder.java
+++ b/src/org/redkale/convert/MapDecoder.java
@@ -32,7 +32,7 @@ public final class MapDecoder<K, V> implements Decodeable<Reader, Map<K, V>> {
 
     private final Decodeable<Reader, V> valueDecoder;
 
-    public MapDecoder(final Factory factory, final Type type) {
+    public MapDecoder(final ConvertFactory factory, final Type type) {
         this.type = type;
         if (type instanceof ParameterizedType) {
             final ParameterizedType pt = (ParameterizedType) type;
diff --git a/src/org/redkale/convert/MapEncoder.java b/src/org/redkale/convert/MapEncoder.java
index ae542704e..1b1f2a264 100644
--- a/src/org/redkale/convert/MapEncoder.java
+++ b/src/org/redkale/convert/MapEncoder.java
@@ -27,7 +27,7 @@ public final class MapEncoder<K, V> implements Encodeable<Writer, Map<K, V>> {
 
     private final Encodeable<Writer, V> valencoder;
 
-    public MapEncoder(final Factory factory, final Type type) {
+    public MapEncoder(final ConvertFactory factory, final Type type) {
         this.type = type;
         if (type instanceof ParameterizedType) {
             final Type[] pt = ((ParameterizedType) type).getActualTypeArguments();
diff --git a/src/org/redkale/convert/ObjectDecoder.java b/src/org/redkale/convert/ObjectDecoder.java
index 83bee3bb1..8bd7d5c12 100644
--- a/src/org/redkale/convert/ObjectDecoder.java
+++ b/src/org/redkale/convert/ObjectDecoder.java
@@ -34,7 +34,7 @@ public final class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T
 
     protected DeMember<R, T, ?>[] members;
 
-    protected Factory factory;
+    protected ConvertFactory factory;
 
     private boolean inited = false;
 
@@ -51,7 +51,7 @@ public final class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T
         this.members = new DeMember[0];
     }
 
-    public void init(final Factory factory) {
+    public void init(final ConvertFactory factory) {
         this.factory = factory;
         try {
             if (type == Object.class) return;
@@ -87,7 +87,7 @@ public final class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T
                     if (!method.getName().startsWith("set")) continue;
                     if (method.getParameterTypes().length != 1) continue;
                     if (method.getReturnType() != void.class) continue;
-                    if (reversible && (cps == null || !ObjectEncoder.contains(cps, Factory.readGetSetFieldName(method)))) {
+                    if (reversible && (cps == null || !ObjectEncoder.contains(cps, ConvertFactory.readGetSetFieldName(method)))) {
                         boolean is = method.getParameterTypes()[0] == boolean.class || method.getParameterTypes()[0] == Boolean.class;
                         try {
                             clazz.getMethod(method.getName().replaceFirst("set", is ? "is" : "get"));
diff --git a/src/org/redkale/convert/ObjectEncoder.java b/src/org/redkale/convert/ObjectEncoder.java
index e4b6f81de..0e3a94281 100644
--- a/src/org/redkale/convert/ObjectEncoder.java
+++ b/src/org/redkale/convert/ObjectEncoder.java
@@ -30,7 +30,7 @@ public final class ObjectEncoder<W extends Writer, T> implements Encodeable<W, T
 
     protected EnMember[] members;
 
-    protected Factory factory;
+    protected ConvertFactory factory;
 
     private boolean inited = false;
 
@@ -47,7 +47,7 @@ public final class ObjectEncoder<W extends Writer, T> implements Encodeable<W, T
         this.members = new EnMember[0];
     }
 
-    public void init(final Factory factory) {
+    public void init(final ConvertFactory factory) {
         this.factory = factory;
         try {
             if (type == Object.class) return;
@@ -80,7 +80,7 @@ public final class ObjectEncoder<W extends Writer, T> implements Encodeable<W, T
                     if (!method.getName().startsWith("is") && !method.getName().startsWith("get")) continue;
                     if (method.getParameterTypes().length != 0) continue;
                     if (method.getReturnType() == void.class) continue;
-                    if (reversible && (cps == null || !contains(cps, Factory.readGetSetFieldName(method)))) {
+                    if (reversible && (cps == null || !contains(cps, ConvertFactory.readGetSetFieldName(method)))) {
                         boolean is = method.getName().startsWith("is");
                         try {
                             clazz.getMethod(method.getName().replaceFirst(is ? "is" : "get", "set"), method.getReturnType());
@@ -246,14 +246,14 @@ public final class ObjectEncoder<W extends Writer, T> implements Encodeable<W, T
         }
     }
 
-    static Attribute createAttribute(final Factory factory, Class clazz, final Field field, final Method getter, final Method setter) {
+    static Attribute createAttribute(final ConvertFactory factory, Class clazz, final Field field, final Method getter, final Method setter) {
         String fieldalias;
         if (field != null) { // public field
             ConvertColumnEntry ref = factory.findRef(field);
             fieldalias = ref == null || ref.name().isEmpty() ? field.getName() : ref.name();
         } else if (getter != null) {
             ConvertColumnEntry ref = factory.findRef(getter);
-            String mfieldname = Factory.readGetSetFieldName(getter);
+            String mfieldname = ConvertFactory.readGetSetFieldName(getter);
             if (ref == null) {
                 try {
                     ref = factory.findRef(clazz.getDeclaredField(mfieldname));
@@ -263,7 +263,7 @@ public final class ObjectEncoder<W extends Writer, T> implements Encodeable<W, T
             fieldalias = ref == null || ref.name().isEmpty() ? mfieldname : ref.name();
         } else { // setter != null
             ConvertColumnEntry ref = factory.findRef(setter);
-            String mfieldname = Factory.readGetSetFieldName(setter);
+            String mfieldname = ConvertFactory.readGetSetFieldName(setter);
             if (ref == null) {
                 try {
                     ref = factory.findRef(clazz.getDeclaredField(mfieldname));
diff --git a/src/org/redkale/convert/bson/BsonConvert.java b/src/org/redkale/convert/bson/BsonConvert.java
index 3cb27c157..2d77dc0f5 100644
--- a/src/org/redkale/convert/bson/BsonConvert.java
+++ b/src/org/redkale/convert/bson/BsonConvert.java
@@ -45,7 +45,7 @@ public final class BsonConvert extends Convert<BsonReader, BsonWriter> {
 
     private final boolean tiny;
 
-    protected BsonConvert(Factory<BsonReader, BsonWriter> factory, boolean tiny) {
+    protected BsonConvert(ConvertFactory<BsonReader, BsonWriter> factory, boolean tiny) {
         super(factory);
         this.tiny = tiny;
     }
diff --git a/src/org/redkale/convert/bson/BsonFactory.java b/src/org/redkale/convert/bson/BsonFactory.java
index 62441c712..5eb706f04 100644
--- a/src/org/redkale/convert/bson/BsonFactory.java
+++ b/src/org/redkale/convert/bson/BsonFactory.java
@@ -15,7 +15,7 @@ import org.redkale.convert.*;
  *
  * @author zhangjx
  */
-public final class BsonFactory extends Factory<BsonReader, BsonWriter> {
+public final class BsonFactory extends ConvertFactory<BsonReader, BsonWriter> {
 
     private static final BsonFactory instance = new BsonFactory(null, Boolean.getBoolean("convert.bson.tiny"));
 
diff --git a/src/org/redkale/convert/json/JsonFactory.java b/src/org/redkale/convert/json/JsonFactory.java
index b6f380324..c7d24d520 100644
--- a/src/org/redkale/convert/json/JsonFactory.java
+++ b/src/org/redkale/convert/json/JsonFactory.java
@@ -6,7 +6,7 @@
 package org.redkale.convert.json;
 
 import org.redkale.convert.ConvertType;
-import org.redkale.convert.Factory;
+import org.redkale.convert.ConvertFactory;
 import java.io.Serializable;
 import java.math.*;
 import java.net.*;
@@ -20,7 +20,7 @@ import org.redkale.util.*;
  *
  * @author zhangjx
  */
-public final class JsonFactory extends Factory<JsonReader, JsonWriter> {
+public final class JsonFactory extends ConvertFactory<JsonReader, JsonWriter> {
 
     private static final JsonFactory instance = new JsonFactory(null, Boolean.getBoolean("convert.json.tiny"));