From b7818688761e1feb19bab6703f5eb022e6c999d1 Mon Sep 17 00:00:00 2001 From: Redkale <8730487+redkale@users.noreply.github.com> Date: Sun, 20 Sep 2020 21:56:35 +0800 Subject: [PATCH] --- src/META-INF/application-template.xml | 9 +++------ src/org/redkale/boot/Application.java | 9 +++------ src/org/redkale/convert/ConvertFactory.java | 4 ++++ src/org/redkale/convert/EnMember.java | 12 ++++++------ src/org/redkale/convert/Writer.java | 4 ++-- src/org/redkale/convert/bson/BsonConvert.java | 4 ++-- src/org/redkale/convert/bson/BsonFactory.java | 4 ++-- src/org/redkale/convert/bson/BsonWriter.java | 2 +- src/org/redkale/convert/json/JsonConvert.java | 4 ++-- src/org/redkale/convert/json/JsonFactory.java | 4 ++-- src/org/redkale/convert/json/JsonWriter.java | 2 +- 11 files changed, 28 insertions(+), 30 deletions(-) diff --git a/src/META-INF/application-template.xml b/src/META-INF/application-template.xml index 14e9efb9e..32c1d43ad 100644 --- a/src/META-INF/application-template.xml +++ b/src/META-INF/application-template.xml @@ -130,12 +130,9 @@ System.setProperty("net.transport.poolmaxconns", "100"); System.setProperty("net.transport.pinginterval", "30"); System.setProperty("net.transport.checkinterval", "30"); - System.setProperty("convert.json.tiny", "true"); - System.setProperty("convert.bson.tiny", "true"); - System.setProperty("convert.json.pool.size", "128"); - System.setProperty("convert.bson.pool.size", "128"); - System.setProperty("convert.json.writer.buffer.defsize", "4096"); - System.setProperty("convert.bson.writer.buffer.defsize", "4096"); + System.setProperty("convert.tiny", "true"); + System.setProperty("convert.pool.size", "128"); + System.setProperty("convert.writer.buffer.defsize", "4096"); 节点下也可包含非节点. 非其节点可以通过@Resource(name="properties.xxxxxx")进行注入, 被注解的字段类型只能是AnyValue、AnyValue[] diff --git a/src/org/redkale/boot/Application.java b/src/org/redkale/boot/Application.java index 9e06c9eac..2ecde58f8 100644 --- a/src/org/redkale/boot/Application.java +++ b/src/org/redkale/boot/Application.java @@ -534,12 +534,9 @@ public final class Application { System.setProperty("net.transport.poolmaxconns", "100"); System.setProperty("net.transport.pinginterval", "30"); System.setProperty("net.transport.checkinterval", "30"); - System.setProperty("convert.bson.tiny", "true"); - System.setProperty("convert.json.tiny", "true"); - System.setProperty("convert.bson.pool.size", "128"); - System.setProperty("convert.json.pool.size", "128"); - System.setProperty("convert.bson.writer.buffer.defsize", "4096"); - System.setProperty("convert.json.writer.buffer.defsize", "4096"); + System.setProperty("convert.tiny", "true"); + System.setProperty("convert.pool.size", "128"); + System.setProperty("convert.writer.buffer.defsize", "4096"); final String confpath = this.confPath.toString(); final String homepath = this.home.getCanonicalPath(); diff --git a/src/org/redkale/convert/ConvertFactory.java b/src/org/redkale/convert/ConvertFactory.java index ecb958a54..17dbe58be 100644 --- a/src/org/redkale/convert/ConvertFactory.java +++ b/src/org/redkale/convert/ConvertFactory.java @@ -214,6 +214,10 @@ public abstract class ConvertFactory { return type == ConvertType.PROTOBUF ? defProtobufConvert : null; } + protected static boolean getSystemPropertyBoolean(String key, String parentkey, boolean defvalue) { + return Boolean.parseBoolean(System.getProperty(key, System.getProperty(parentkey, String.valueOf(defvalue)))); + } + public abstract ConvertType getConvertType(); public abstract boolean isReversible(); //是否可逆的 diff --git a/src/org/redkale/convert/EnMember.java b/src/org/redkale/convert/EnMember.java index d7bab877f..487fedbae 100644 --- a/src/org/redkale/convert/EnMember.java +++ b/src/org/redkale/convert/EnMember.java @@ -26,10 +26,10 @@ public final class EnMember { final Encodeable encoder; - final boolean istring; + final boolean string; //final boolean isnumber; - final boolean isbool; + final boolean bool; protected int index; @@ -39,8 +39,8 @@ public final class EnMember { this.attribute = attribute; this.encoder = encoder; Class t = attribute.type(); - this.istring = CharSequence.class.isAssignableFrom(t); - this.isbool = t == Boolean.class || t == boolean.class; + this.string = CharSequence.class.isAssignableFrom(t); + this.bool = t == Boolean.class || t == boolean.class; //this.isnumber = Number.class.isAssignableFrom(t) || (!this.isbool && t.isPrimitive()); } @@ -74,11 +74,11 @@ public final class EnMember { } public boolean isStringType() { - return istring; + return string; } public boolean isBoolType() { - return isbool; + return bool; } public int getIndex() { diff --git a/src/org/redkale/convert/Writer.java b/src/org/redkale/convert/Writer.java index 78c99c8c3..330f2b57c 100644 --- a/src/org/redkale/convert/Writer.java +++ b/src/org/redkale/convert/Writer.java @@ -126,9 +126,9 @@ public abstract class Writer { } if (value == null) return; if (tiny()) { - if (member.istring) { + if (member.string) { if (((CharSequence) value).length() == 0) return; - } else if (member.isbool) { + } else if (member.bool) { if (!((Boolean) value)) return; } } diff --git a/src/org/redkale/convert/bson/BsonConvert.java b/src/org/redkale/convert/bson/BsonConvert.java index 0cf9032a1..f5da0303a 100644 --- a/src/org/redkale/convert/bson/BsonConvert.java +++ b/src/org/redkale/convert/bson/BsonConvert.java @@ -39,9 +39,9 @@ import org.redkale.util.*; */ public class BsonConvert extends BinaryConvert { - private static final ObjectPool readerPool = BsonReader.createPool(Integer.getInteger("convert.bson.pool.size", 16)); + private static final ObjectPool readerPool = BsonReader.createPool(Integer.getInteger("convert.bson.pool.size", Integer.getInteger("convert.pool.size", 16))); - private static final ObjectPool writerPool = BsonWriter.createPool(Integer.getInteger("convert.bson.pool.size", 16)); + private static final ObjectPool writerPool = BsonWriter.createPool(Integer.getInteger("convert.bson.pool.size", Integer.getInteger("convert.pool.size", 16))); private final boolean tiny; diff --git a/src/org/redkale/convert/bson/BsonFactory.java b/src/org/redkale/convert/bson/BsonFactory.java index 9c9da8a3a..e435a9da1 100644 --- a/src/org/redkale/convert/bson/BsonFactory.java +++ b/src/org/redkale/convert/bson/BsonFactory.java @@ -24,7 +24,7 @@ import org.redkale.util.*; @SuppressWarnings("unchecked") public final class BsonFactory extends ConvertFactory { - private static final BsonFactory instance = new BsonFactory(null, Boolean.getBoolean("convert.bson.tiny")); + private static final BsonFactory instance = new BsonFactory(null, getSystemPropertyBoolean("convert.bson.tiny", "convert.tiny", true)); static final Decodeable objectDecoder = instance.loadDecoder(Object.class); @@ -69,7 +69,7 @@ public final class BsonFactory extends ConvertFactory { } public static BsonFactory create() { - return new BsonFactory(null, Boolean.getBoolean("convert.bson.tiny")); + return new BsonFactory(null, getSystemPropertyBoolean("convert.bson.tiny", "convert.tiny", true)); } @Override diff --git a/src/org/redkale/convert/bson/BsonWriter.java b/src/org/redkale/convert/bson/BsonWriter.java index 9717cabd9..d72286ac4 100644 --- a/src/org/redkale/convert/bson/BsonWriter.java +++ b/src/org/redkale/convert/bson/BsonWriter.java @@ -20,7 +20,7 @@ import org.redkale.util.*; */ public class BsonWriter extends Writer { - private static final int defaultSize = Integer.getInteger("convert.bson.writer.buffer.defsize", 1024); + private static final int defaultSize = Integer.getInteger("convert.bson.writer.buffer.defsize", Integer.getInteger("convert.writer.buffer.defsize", 1024)); private byte[] content; diff --git a/src/org/redkale/convert/json/JsonConvert.java b/src/org/redkale/convert/json/JsonConvert.java index 45c0e35eb..414eb2f0d 100644 --- a/src/org/redkale/convert/json/JsonConvert.java +++ b/src/org/redkale/convert/json/JsonConvert.java @@ -30,9 +30,9 @@ public class JsonConvert extends TextConvert { public static final Type TYPE_RETRESULT_STRING = new TypeToken>() { }.getType(); - private static final ObjectPool readerPool = JsonReader.createPool(Integer.getInteger("convert.json.pool.size", 16)); + private static final ObjectPool readerPool = JsonReader.createPool(Integer.getInteger("convert.json.pool.size", Integer.getInteger("convert.pool.size", 16))); - private static final ObjectPool writerPool = JsonWriter.createPool(Integer.getInteger("convert.json.pool.size", 16)); + private static final ObjectPool writerPool = JsonWriter.createPool(Integer.getInteger("convert.json.pool.size", Integer.getInteger("convert.pool.size", 16))); private final boolean tiny; diff --git a/src/org/redkale/convert/json/JsonFactory.java b/src/org/redkale/convert/json/JsonFactory.java index 966e125e3..b8f67832e 100644 --- a/src/org/redkale/convert/json/JsonFactory.java +++ b/src/org/redkale/convert/json/JsonFactory.java @@ -23,7 +23,7 @@ import org.redkale.util.*; @SuppressWarnings("unchecked") public final class JsonFactory extends ConvertFactory { - private static final JsonFactory instance = new JsonFactory(null, Boolean.getBoolean("convert.json.tiny")); + private static final JsonFactory instance = new JsonFactory(null, getSystemPropertyBoolean("convert.json.tiny", "convert.tiny", true)); static { @@ -60,7 +60,7 @@ public final class JsonFactory extends ConvertFactory { } public static JsonFactory create() { - return new JsonFactory(null, Boolean.getBoolean("convert.json.tiny")); + return new JsonFactory(null, getSystemPropertyBoolean("convert.json.tiny", "convert.tiny", true)); } @Override diff --git a/src/org/redkale/convert/json/JsonWriter.java b/src/org/redkale/convert/json/JsonWriter.java index c92973759..b91e4741c 100644 --- a/src/org/redkale/convert/json/JsonWriter.java +++ b/src/org/redkale/convert/json/JsonWriter.java @@ -24,7 +24,7 @@ public class JsonWriter extends Writer { private static final char[] CHARS_FALSEVALUE = "false".toCharArray(); - private static final int defaultSize = Integer.getInteger("convert.json.writer.buffer.defsize", 1024); + private static final int defaultSize = Integer.getInteger("convert.json.writer.buffer.defsize", Integer.getInteger("convert.writer.buffer.defsize", 1024)); private int count;