lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
RedKale
2016-02-16 10:16:09 +08:00
parent ce2293fe24
commit afefc16f5e
16 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/org/redkale/convert/AnyEncoder.java
View File

@@ -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;
}

2
src/org/redkale/convert/ArrayDecoder.java
View File

@@ -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();

2
src/org/redkale/convert/ArrayEncoder.java
View File

@@ -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();

2
src/org/redkale/convert/CollectionDecoder.java
View File

@@ -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;

2
src/org/redkale/convert/CollectionEncoder.java
View File

@@ -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];

6
src/org/redkale/convert/Convert.java
View File

@@ -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;
}
}

18
src/org/redkale/convert/Factory.java → src/org/redkale/convert/ConvertFactory.java
View File

@@ -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);

2
src/org/redkale/convert/DeMember.java
View File

@@ -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()));

2
src/org/redkale/convert/EnMember.java
View File

@@ -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()));

2
src/org/redkale/convert/MapDecoder.java
View File

@@ -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;

2
src/org/redkale/convert/MapEncoder.java
View File

@@ -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();

6
src/org/redkale/convert/ObjectDecoder.java
View File

@@ -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"));

12
src/org/redkale/convert/ObjectEncoder.java
View File

@@ -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));

2
src/org/redkale/convert/bson/BsonConvert.java
View File

@@ -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;
}

2
src/org/redkale/convert/bson/BsonFactory.java
View File

@@ -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"));

4
src/org/redkale/convert/json/JsonFactory.java
View File

@@ -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"));