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

Browse Source
This commit is contained in:
Redkale
2017-03-06 12:02:00 +08:00
parent 8ae39df2e8
commit a2e2c5e178
6 changed files with 70 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/org/redkale/convert/ConvertFactory.java
View File

@@ -105,6 +105,7 @@ public abstract class ConvertFactory<R extends Reader, W extends Writer> {
this.register(double[].class, DoubleArraySimpledCoder.instance);
this.register(String[].class, StringArraySimpledCoder.instance);
//---------------------------------------------------------
this.register(AnyValue.class, Creator.create(AnyValue.DefaultAnyValue.class));
this.register(HttpCookie.class, new Creator<HttpCookie>() {
@Override
@Creator.ConstructorParameters({"name", "value"})

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

@@ -13,7 +13,7 @@ import java.util.Set;
import org.redkale.util.*;
/**
* 自定义对象的反序列化操作类
* 自定义对象的反序列化操作类
*
* <p>
* 详情见: https://redkale.org
@@ -86,6 +86,7 @@ public final class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T
if (method.isSynthetic()) continue;
if (method.getName().length() < 4) continue;
if (!method.getName().startsWith("set")) continue;
if (method.getAnnotation(java.beans.Transient.class) != null) continue;
if (method.getParameterTypes().length != 1) continue;
if (method.getReturnType() != void.class) continue;
if (reversible && (cps == null || !ObjectEncoder.contains(cps, ConvertFactory.readGetSetFieldName(method)))) {

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

@@ -78,6 +78,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 (method.getAnnotation(java.beans.Transient.class) != null) continue;
if (method.getParameterTypes().length != 0) continue;
if (method.getReturnType() == void.class) continue;
if (reversible && (cps == null || !contains(cps, ConvertFactory.readGetSetFieldName(method)))) {

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

@@ -7,6 +7,7 @@ package org.redkale.convert.bson;
import java.io.Serializable;
import org.redkale.convert.*;
import org.redkale.util.AnyValue;
/**
*
@@ -27,6 +28,9 @@ public final class BsonFactory extends ConvertFactory<BsonReader, BsonWriter> {
static {
instance.register(Serializable.class, objectDecoder);
instance.register(Serializable.class, objectEncoder);
instance.register(AnyValue.class, instance.loadDecoder(AnyValue.DefaultAnyValue.class));
instance.register(AnyValue.class, instance.loadEncoder(AnyValue.DefaultAnyValue.class));
}
private BsonFactory(BsonFactory parent, boolean tiny) {

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

@@ -10,7 +10,7 @@ import java.math.BigInteger;
import java.net.*;
import org.redkale.convert.*;
import org.redkale.convert.ext.*;
import org.redkale.util.DLong;
import org.redkale.util.*;
/**
*
@@ -29,6 +29,9 @@ public final class JsonFactory extends ConvertFactory<JsonReader, JsonWriter> {
instance.register(DLong.class, DLongSimpledCoder.DLongJsonSimpledCoder.instance);
instance.register(BigInteger.class, BigIntegerSimpledCoder.BigIntegerJsonSimpledCoder.instance);
instance.register(Serializable.class, instance.loadEncoder(Object.class));
instance.register(AnyValue.class, instance.loadDecoder(AnyValue.DefaultAnyValue.class));
instance.register(AnyValue.class, instance.loadEncoder(AnyValue.DefaultAnyValue.class));
}
private JsonFactory(JsonFactory parent, boolean tiny) {

97
src/org/redkale/util/AnyValue.java
View File

@@ -39,11 +39,13 @@ public abstract class AnyValue {
*/
public static final BiPredicate<String, String> EQUALSIGNORE = (name1, name2) -> name1.equalsIgnoreCase(name2);
private final BiPredicate<String, String> predicate;
private boolean ignoreCase;
private Entry<String>[] stringValues = new Entry[0];
private BiPredicate<String, String> predicate;
private Entry<AnyValue>[] entityValues = new Entry[0];
private Entry<String>[] stringEntrys = new Entry[0];
private Entry<AnyValue>[] anyEntrys = new Entry[0];
/**
* 创建空的DefaultAnyValue对象
@@ -96,27 +98,19 @@ public abstract class AnyValue {
* @param ignoreCase name是否不区分大小写
*/
public DefaultAnyValue(boolean ignoreCase) {
this.ignoreCase = ignoreCase;
this.predicate = ignoreCase ? EQUALSIGNORE : EQUALS;
}
/**
* 创建DefaultAnyValue对象
*
* @param predicate name比较策略
*/
public DefaultAnyValue(BiPredicate<String, String> predicate) {
this.predicate = predicate;
}
/**
* 创建共享此内容的DefaultAnyValue对象
*
* @return DefaultAnyValue对象
*/
public DefaultAnyValue duplicate() {
DefaultAnyValue rs = new DefaultAnyValue(this.predicate);
rs.stringValues = this.stringValues;
rs.entityValues = this.entityValues;
DefaultAnyValue rs = new DefaultAnyValue(this.ignoreCase);
rs.stringEntrys = this.stringEntrys;
rs.anyEntrys = this.anyEntrys;
return rs;
}
@@ -124,13 +118,13 @@ public abstract class AnyValue {
if (av == null) return this;
if (av instanceof DefaultAnyValue) {
final DefaultAnyValue adv = (DefaultAnyValue) av;
if (adv.stringValues != null) {
for (Entry<String> en : adv.stringValues) {
if (adv.stringEntrys != null) {
for (Entry<String> en : adv.stringEntrys) {
this.addValue(en.name, en.value);
}
}
if (adv.entityValues != null) {
for (Entry<AnyValue> en : adv.entityValues) {
if (adv.anyEntrys != null) {
for (Entry<AnyValue> en : adv.anyEntrys) {
this.addValue(en.name, en.value);
}
}
@@ -155,13 +149,13 @@ public abstract class AnyValue {
if (av == null) return this;
if (av instanceof DefaultAnyValue) {
final DefaultAnyValue adv = (DefaultAnyValue) av;
if (adv.stringValues != null) {
for (Entry<String> en : adv.stringValues) {
if (adv.stringEntrys != null) {
for (Entry<String> en : adv.stringEntrys) {
this.setValue(en.name, en.value);
}
}
if (adv.entityValues != null) {
for (Entry<AnyValue> en : adv.entityValues) {
if (adv.anyEntrys != null) {
for (Entry<AnyValue> en : adv.anyEntrys) {
this.setValue(en.name, en.value);
}
}
@@ -184,21 +178,41 @@ public abstract class AnyValue {
@Override
public Entry<String>[] getStringEntrys() {
return stringValues;
return stringEntrys;
}
public void setStringEntrys(Entry<String>[] stringEntrys) {
this.stringEntrys = stringEntrys;
}
@Override
public Entry<AnyValue>[] getAnyEntrys() {
return entityValues;
return anyEntrys;
}
public void setAnyEntrys(Entry<AnyValue>[] anyEntrys) {
this.anyEntrys = anyEntrys;
}
public boolean isIgnoreCase() {
return ignoreCase;
}
public void setIgnoreCase(boolean ignoreCase) {
this.ignoreCase = ignoreCase;
if (this.predicate == null) {
this.predicate = ignoreCase ? EQUALSIGNORE : EQUALS;
}
}
@Override
@java.beans.Transient
public String[] getNames() {
Set<String> set = new LinkedHashSet<>();
for (Entry en : this.stringValues) {
for (Entry en : this.stringEntrys) {
set.add(en.name);
}
for (Entry en : this.entityValues) {
for (Entry en : this.anyEntrys) {
set.add(en.name);
}
return set.toArray(new String[set.size()]);
@@ -206,12 +220,12 @@ public abstract class AnyValue {
@Override
public String[] getValues(String... names) {
return Entry.getValues(this.predicate, String.class, this.stringValues, names);
return Entry.getValues(this.predicate, String.class, this.stringEntrys, names);
}
@Override
public AnyValue[] getAnyValues(String... names) {
return Entry.getValues(this.predicate, AnyValue.class, this.entityValues, names);
return Entry.getValues(this.predicate, AnyValue.class, this.anyEntrys, names);
}
@Override
@@ -220,8 +234,8 @@ public abstract class AnyValue {
}
public DefaultAnyValue clear() {
this.stringValues = new Entry[0];
this.entityValues = new Entry[0];
this.stringEntrys = new Entry[0];
this.anyEntrys = new Entry[0];
return this;
}
@@ -230,7 +244,7 @@ public abstract class AnyValue {
if (getValue(name) == null) {
this.addValue(name, value);
} else {
for (Entry<String> en : this.stringValues) {
for (Entry<String> en : this.stringEntrys) {
if (predicate.test(en.name, name)) {
en.value = value;
return this;
@@ -245,7 +259,7 @@ public abstract class AnyValue {
if (getValue(name) == null) {
this.addValue(name, value);
} else {
for (Entry<AnyValue> en : this.entityValues) {
for (Entry<AnyValue> en : this.anyEntrys) {
if (predicate.test(en.name, name)) {
en.value = value;
return this;
@@ -264,19 +278,19 @@ public abstract class AnyValue {
}
public DefaultAnyValue addValue(String name, String value) {
this.stringValues = Utility.append(this.stringValues, new Entry(name, value));
this.stringEntrys = Utility.append(this.stringEntrys, new Entry(name, value));
return this;
}
public DefaultAnyValue addValue(String name, AnyValue value) {
if (name == null || value == null) return this;
this.entityValues = Utility.append(this.entityValues, new Entry(name, value));
this.anyEntrys = Utility.append(this.anyEntrys, new Entry(name, value));
return this;
}
@Override
public AnyValue getAnyValue(String name) {
for (Entry<AnyValue> en : this.entityValues) {
for (Entry<AnyValue> en : this.anyEntrys) {
if (predicate.test(en.name, name)) {
return en.value;
}
@@ -286,7 +300,7 @@ public abstract class AnyValue {
@Override
public String getValue(String name) {
for (Entry<String> en : this.stringValues) {
for (Entry<String> en : this.stringEntrys) {
if (predicate.test(en.name, name)) {
return en.value;
}
@@ -296,12 +310,12 @@ public abstract class AnyValue {
@Override
public String[] getValues(String name) {
return Entry.getValues(this.predicate, String.class, this.stringValues, name);
return Entry.getValues(this.predicate, String.class, this.stringEntrys, name);
}
@Override
public AnyValue[] getAnyValues(String name) {
return Entry.getValues(this.predicate, AnyValue.class, this.entityValues, name);
return Entry.getValues(this.predicate, AnyValue.class, this.anyEntrys, name);
}
}
@@ -312,11 +326,16 @@ public abstract class AnyValue {
T value;
@java.beans.ConstructorProperties({"name", "value"})
public Entry(String name0, T value0) {
this.name = name0;
this.value = value0;
}
public String getName() {
return name;
}
public T getValue() {
return value;
}