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.tiny", "true");
-               System.setProperty("convert.bson.tiny", "true");
+               System.setProperty("convert.pool.size", "128");
-               System.setProperty("convert.json.pool.size", "128");
+               System.setProperty("convert.writer.buffer.defsize", "4096");
-               System.setProperty("convert.bson.pool.size", "128");
-               System.setProperty("convert.json.writer.buffer.defsize", "4096");
-               System.setProperty("convert.bson.writer.buffer.defsize", "4096");
                
             <properties>节点下也可包含非<property>节点.
             非<property>其节点可以通过@Resource(name="properties.xxxxxx")进行注入, 被注解的字段类型只能是AnyValue、AnyValue[]

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.tiny", "true");
-        System.setProperty("convert.json.tiny", "true");
+        System.setProperty("convert.pool.size", "128");
-        System.setProperty("convert.bson.pool.size", "128");
+        System.setProperty("convert.writer.buffer.defsize", "4096");
-        System.setProperty("convert.json.pool.size", "128");
-        System.setProperty("convert.bson.writer.buffer.defsize", "4096");
-        System.setProperty("convert.json.writer.buffer.defsize", "4096");
 
         final String confpath = this.confPath.toString();
         final String homepath = this.home.getCanonicalPath();

src/org/redkale/convert/ConvertFactory.java

@@ -214,6 +214,10 @@ public abstract class ConvertFactory<R extends Reader, W extends Writer> {
         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(); //是否可逆的

src/org/redkale/convert/EnMember.java

@@ -26,10 +26,10 @@ public final class EnMember<W extends Writer, T, F> {
 
     final Encodeable<W, F> 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<W extends Writer, T, F> {
         this.attribute = attribute;
         this.encoder = encoder;
         Class t = attribute.type();
-        this.istring = CharSequence.class.isAssignableFrom(t);
+        this.string = CharSequence.class.isAssignableFrom(t);
-        this.isbool = t == Boolean.class || t == boolean.class;
+        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<W extends Writer, T, F> {
     }
 
     public boolean isStringType() {
-        return istring;
+        return string;
     }
 
     public boolean isBoolType() {
-        return isbool;
+        return bool;
     }
 
     public int getIndex() {

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

src/org/redkale/convert/bson/BsonConvert.java

@@ -39,9 +39,9 @@ import org.redkale.util.*;
  */
 public class BsonConvert extends BinaryConvert<BsonReader, BsonWriter> {
 
-    private static final ObjectPool<BsonReader> readerPool = BsonReader.createPool(Integer.getInteger("convert.bson.pool.size", 16));
+    private static final ObjectPool<BsonReader> readerPool = BsonReader.createPool(Integer.getInteger("convert.bson.pool.size", Integer.getInteger("convert.pool.size", 16)));
 
-    private static final ObjectPool<BsonWriter> writerPool = BsonWriter.createPool(Integer.getInteger("convert.bson.pool.size", 16));
+    private static final ObjectPool<BsonWriter> writerPool = BsonWriter.createPool(Integer.getInteger("convert.bson.pool.size", Integer.getInteger("convert.pool.size", 16)));
 
     private final boolean tiny;
 

src/org/redkale/convert/bson/BsonFactory.java

@@ -24,7 +24,7 @@ import org.redkale.util.*;
 @SuppressWarnings("unchecked")
 public final class BsonFactory extends ConvertFactory<BsonReader, BsonWriter> {
 
-    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<BsonReader, BsonWriter> {
     }
 
     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

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;
 

src/org/redkale/convert/json/JsonConvert.java

@@ -30,9 +30,9 @@ public class JsonConvert extends TextConvert<JsonReader, JsonWriter> {
     public static final Type TYPE_RETRESULT_STRING = new TypeToken<RetResult<String>>() {
     }.getType();
 
-    private static final ObjectPool<JsonReader> readerPool = JsonReader.createPool(Integer.getInteger("convert.json.pool.size", 16));
+    private static final ObjectPool<JsonReader> readerPool = JsonReader.createPool(Integer.getInteger("convert.json.pool.size", Integer.getInteger("convert.pool.size", 16)));
 
-    private static final ObjectPool<JsonWriter> writerPool = JsonWriter.createPool(Integer.getInteger("convert.json.pool.size", 16));
+    private static final ObjectPool<JsonWriter> writerPool = JsonWriter.createPool(Integer.getInteger("convert.json.pool.size", Integer.getInteger("convert.pool.size", 16)));
 
     private final boolean tiny;
 

src/org/redkale/convert/json/JsonFactory.java

@@ -23,7 +23,7 @@ import org.redkale.util.*;
 @SuppressWarnings("unchecked")
 public final class JsonFactory extends ConvertFactory<JsonReader, JsonWriter> {
 
-    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<JsonReader, JsonWriter> {
     }
 
     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

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;