From 4f27d1edaddaf88cdeecf91c1220f0d065d8edd3 Mon Sep 17 00:00:00 2001 From: wentch <22250530@qq.com> Date: Thu, 7 Jan 2016 09:30:05 +0800 Subject: [PATCH] --- test/org/redkale/source/FilterNodeTest.java | 10 +++++----- test/org/redkale/test/convert/BasedEntity.java | 4 ++-- test/org/redkale/test/convert/BsonTestMain.java | 8 ++++---- .../redkale/test/convert/ConstructorArgsEntity.java | 4 ++-- test/org/redkale/test/convert/GenericEntity.java | 9 +++++---- test/org/redkale/test/convert/InnerCoderEntity.java | 4 ++-- test/org/redkale/test/convert/JsonTestMain.java | 6 +++--- test/org/redkale/test/convert/SimpleEntity.java | 6 +++--- test/org/redkale/test/sncp/SncpTestBean.java | 6 +++--- test/org/redkale/test/source/LoginTestRecord.java | 4 ++-- test/org/redkale/test/source/TestSourceCache.java | 4 ++-- test/org/redkale/test/util/CreatorRecord.java | 4 ++-- 12 files changed, 35 insertions(+), 34 deletions(-) diff --git a/test/org/redkale/source/FilterNodeTest.java b/test/org/redkale/source/FilterNodeTest.java index 6b31abd64..c635f3c25 100644 --- a/test/org/redkale/source/FilterNodeTest.java +++ b/test/org/redkale/source/FilterNodeTest.java @@ -6,11 +6,11 @@ package org.redkale.source; import org.redkale.util.AutoLoad; -import org.redkale.convert.json.JsonFactory; import static org.redkale.source.FilterExpress.*; import java.util.*; import java.util.function.*; import javax.persistence.*; +import org.redkale.convert.json.*; /** * @@ -77,7 +77,7 @@ public class FilterNodeTest { @Override public String toString() { - return JsonFactory.root().getConvert().convertTo(this); + return JsonConvert.root().convertTo(this); } public static boolean caridTransient() { @@ -178,7 +178,7 @@ public class FilterNodeTest { @Override public String toString() { - return JsonFactory.root().getConvert().convertTo(this); + return JsonConvert.root().convertTo(this); } } @@ -219,7 +219,7 @@ public class FilterNodeTest { @Override public String toString() { - return JsonFactory.root().getConvert().convertTo(this); + return JsonConvert.root().convertTo(this); } public int getCartype() { @@ -271,7 +271,7 @@ public class FilterNodeTest { @Override public String toString() { - return JsonFactory.root().getConvert().convertTo(this); + return JsonConvert.root().convertTo(this); } public int getUserid() { diff --git a/test/org/redkale/test/convert/BasedEntity.java b/test/org/redkale/test/convert/BasedEntity.java index 180b31f19..d1dc3867c 100644 --- a/test/org/redkale/test/convert/BasedEntity.java +++ b/test/org/redkale/test/convert/BasedEntity.java @@ -5,8 +5,8 @@ */ package org.redkale.test.convert; -import org.redkale.convert.json.JsonFactory; import java.io.Serializable; +import org.redkale.convert.json.*; /** * @@ -16,6 +16,6 @@ public abstract class BasedEntity implements Serializable { @Override public String toString() { - return JsonFactory.root().getConvert().convertTo(this); + return JsonConvert.root().convertTo(this); } } diff --git a/test/org/redkale/test/convert/BsonTestMain.java b/test/org/redkale/test/convert/BsonTestMain.java index ce094df3a..ec771f6ee 100644 --- a/test/org/redkale/test/convert/BsonTestMain.java +++ b/test/org/redkale/test/convert/BsonTestMain.java @@ -10,9 +10,9 @@ import org.redkale.convert.bson.BsonByteBufferWriter; import org.redkale.convert.bson.BsonFactory; import org.redkale.util.Utility; import org.redkale.convert.bson.BsonConvert; -import org.redkale.convert.json.JsonFactory; import java.nio.*; import java.util.Arrays; +import org.redkale.convert.json.*; /** * @@ -59,10 +59,10 @@ public class BsonTestMain { SimpleChildEntity entry = SimpleChildEntity.create(); byte[] bytes = convert.convertTo(SimpleEntity.class, entry); Utility.println(null, bytes); - System.out.println(JsonFactory.root().getConvert().convertTo(entry)); + System.out.println(JsonConvert.root().convertTo(entry)); SimpleEntity rs = convert.convertFrom(SimpleEntity.class, bytes); System.out.println(rs.toString()); - System.out.println(JsonFactory.root().getConvert().convertTo(rs)); + System.out.println(JsonConvert.root().convertTo(rs)); ComplextEntity bean = new ComplextEntity(); byte[] bytes2 = convert.convertTo(Object.class, bean); @@ -80,7 +80,7 @@ public class BsonTestMain { convert.convertTo(out, SimpleEntity.class, entry); byte[] bytes = out.toByteArray(); Utility.println(null, bytes); - System.out.println(JsonFactory.root().getConvert().convertTo(entry)); + System.out.println(JsonConvert.root().convertTo(entry)); SimpleEntity rs = convert.convertFrom(SimpleEntity.class, new ByteArrayInputStream(bytes)); System.out.println(rs.toString()); diff --git a/test/org/redkale/test/convert/ConstructorArgsEntity.java b/test/org/redkale/test/convert/ConstructorArgsEntity.java index b942b3983..871b3a63a 100644 --- a/test/org/redkale/test/convert/ConstructorArgsEntity.java +++ b/test/org/redkale/test/convert/ConstructorArgsEntity.java @@ -29,7 +29,7 @@ public class ConstructorArgsEntity { } public static void main(String[] args) throws Exception { - final JsonConvert jsonConvert = JsonFactory.root().getConvert(); + final JsonConvert jsonConvert = JsonConvert.root(); final BsonConvert bsonConvert = BsonFactory.root().getConvert(); ConstructorArgsEntity bean = new ConstructorArgsEntity(12345678, "哈哈"); bean.setCreatetime(System.currentTimeMillis()); @@ -62,6 +62,6 @@ public class ConstructorArgsEntity { @Override public String toString() { - return JsonFactory.root().getConvert().convertTo(this); + return JsonConvert.root().convertTo(this); } } diff --git a/test/org/redkale/test/convert/GenericEntity.java b/test/org/redkale/test/convert/GenericEntity.java index 6b429d5a3..04e86fa9f 100644 --- a/test/org/redkale/test/convert/GenericEntity.java +++ b/test/org/redkale/test/convert/GenericEntity.java @@ -9,6 +9,7 @@ import org.redkale.util.TypeToken; import org.redkale.convert.json.JsonFactory; import java.lang.reflect.*; import java.util.*; +import org.redkale.convert.json.*; /** * 支持泛型的 @@ -35,10 +36,10 @@ public class GenericEntity { bean.setEntry(new Entry<>("aaaa", SimpleEntity.create())); final Type type = new TypeToken>() { }.getType(); - JsonFactory.root().setTiny(true); - String json = JsonFactory.root().getConvert().convertTo(bean); + JsonFactory.root().tiny(true); + String json = JsonConvert.root().convertTo(bean); System.out.println(json); - System.out.println(JsonFactory.root().getConvert().convertFrom(type, json).toString()); + System.out.println(JsonConvert.root().convertFrom(type, json).toString()); } @Override @@ -86,7 +87,7 @@ public class GenericEntity { @Override public String toString() { - return JsonFactory.root().getConvert().convertTo(this); + return JsonConvert.root().convertTo(this); } public K getKey() { diff --git a/test/org/redkale/test/convert/InnerCoderEntity.java b/test/org/redkale/test/convert/InnerCoderEntity.java index 9c2979399..dfe07826c 100644 --- a/test/org/redkale/test/convert/InnerCoderEntity.java +++ b/test/org/redkale/test/convert/InnerCoderEntity.java @@ -101,12 +101,12 @@ public class InnerCoderEntity { @Override public String toString() { - return JsonFactory.root().getConvert().convertTo(this); + return JsonConvert.root().convertTo(this); } public static void main(String[] args) throws Exception { InnerCoderEntity record = InnerCoderEntity.create(200, "haha"); - final JsonConvert convert = JsonFactory.root().getConvert(); + final JsonConvert convert = JsonConvert.root(); String json = convert.convertTo(record); System.out.println(json); System.out.println(convert.convertFrom(InnerCoderEntity.class, json).toString()); diff --git a/test/org/redkale/test/convert/JsonTestMain.java b/test/org/redkale/test/convert/JsonTestMain.java index a9a20be3d..960abce92 100644 --- a/test/org/redkale/test/convert/JsonTestMain.java +++ b/test/org/redkale/test/convert/JsonTestMain.java @@ -20,7 +20,7 @@ public class JsonTestMain { public static void main(String[] args) throws Exception { JsonFactory factory = JsonFactory.root().tiny(true); - final JsonConvert convert = JsonFactory.root().getConvert(); + final JsonConvert convert = JsonConvert.root(); String json = "{\"access_token\":\"vVX2bIjN5P9TMOphDkStM96eNWapAehTuWAlVDO74aFaYxLwj2b-9-T9p_W2mfr9\",\"expires_in\":7200, \"aa\":\"\"}"; Map map = convert.convertFrom(JsonConvert.TYPE_MAP_STRING_STRING, json); System.out.println(map); @@ -34,7 +34,7 @@ public class JsonTestMain { } public static void main2(String[] args) throws Exception { - final JsonConvert convert = JsonFactory.root().getConvert(); + final JsonConvert convert = JsonConvert.root(); SimpleChildEntity entry = SimpleChildEntity.create(); String json = convert.convertTo(SimpleEntity.class, entry); System.out.println("长度: " + json.length()); @@ -58,7 +58,7 @@ public class JsonTestMain { } public static void main3(String[] args) throws Exception { - final JsonConvert convert = JsonFactory.root().getConvert(); + final JsonConvert convert = JsonConvert.root(); SimpleChildEntity entry = SimpleChildEntity.create(); ByteArrayOutputStream out = new ByteArrayOutputStream(); convert.convertTo(out, SimpleEntity.class, entry); diff --git a/test/org/redkale/test/convert/SimpleEntity.java b/test/org/redkale/test/convert/SimpleEntity.java index 45714aeb3..3af940b6d 100644 --- a/test/org/redkale/test/convert/SimpleEntity.java +++ b/test/org/redkale/test/convert/SimpleEntity.java @@ -6,9 +6,9 @@ package org.redkale.test.convert; import java.net.*; -import org.redkale.convert.json.JsonFactory; import org.redkale.util.Creator; import java.util.*; +import org.redkale.convert.json.*; /** * @@ -53,7 +53,7 @@ public class SimpleEntity { } public static void main(String[] args) throws Exception { - System.out.println(JsonFactory.root().getConvert().convertTo(create())); + System.out.println(JsonConvert.root().convertTo(create())); Creator creator = Creator.create(SimpleEntity.class); //Creator.create(10, SimpleEntity.class); SimpleEntity entry = creator.create(); System.out.println(entry); @@ -67,7 +67,7 @@ public class SimpleEntity { @Override public String toString() { - return JsonFactory.root().getConvert().convertTo(this); + return JsonConvert.root().convertTo(this); } public InetSocketAddress getAddr() { diff --git a/test/org/redkale/test/sncp/SncpTestBean.java b/test/org/redkale/test/sncp/SncpTestBean.java index 158e2c1be..77684df5e 100644 --- a/test/org/redkale/test/sncp/SncpTestBean.java +++ b/test/org/redkale/test/sncp/SncpTestBean.java @@ -8,8 +8,8 @@ package org.redkale.test.sncp; import org.redkale.convert.bson.BsonFactory; import org.redkale.util.Utility; import org.redkale.source.FilterBean; -import org.redkale.convert.json.JsonFactory; import javax.persistence.*; +import org.redkale.convert.json.*; /** * @@ -23,7 +23,7 @@ public class SncpTestBean implements FilterBean { private String content; public static void main(String[] args) throws Exception { - SncpTestBean bean = JsonFactory.root().getConvert().convertFrom(SncpTestBean.class, "{\"content\":\"数据: 01\",\"id\":1}"); + SncpTestBean bean = JsonConvert.root().convertFrom(SncpTestBean.class, "{\"content\":\"数据: 01\",\"id\":1}"); System.out.println(bean); byte[] bs = BsonFactory.root().getConvert().convertTo(bean); Utility.println("---------", bs); @@ -32,7 +32,7 @@ public class SncpTestBean implements FilterBean { @Override public String toString() { - return JsonFactory.root().getConvert().convertTo(this); + return JsonConvert.root().convertTo(this); } public long getId() { diff --git a/test/org/redkale/test/source/LoginTestRecord.java b/test/org/redkale/test/source/LoginTestRecord.java index 18d9673b1..6e99d6967 100644 --- a/test/org/redkale/test/source/LoginTestRecord.java +++ b/test/org/redkale/test/source/LoginTestRecord.java @@ -5,8 +5,8 @@ */ package org.redkale.test.source; -import org.redkale.convert.json.JsonFactory; import javax.persistence.*; +import org.redkale.convert.json.*; /** * CREATE TABLE `LoginTestRecord` ( @@ -41,7 +41,7 @@ public class LoginTestRecord { @Override public String toString() { - return JsonFactory.root().getConvert().convertTo(this); + return JsonConvert.root().convertTo(this); } public String getSessionid() { diff --git a/test/org/redkale/test/source/TestSourceCache.java b/test/org/redkale/test/source/TestSourceCache.java index 7d31a449d..9321c04b1 100644 --- a/test/org/redkale/test/source/TestSourceCache.java +++ b/test/org/redkale/test/source/TestSourceCache.java @@ -13,10 +13,10 @@ import org.redkale.util.Sheet; import org.redkale.source.FilterBean; import org.redkale.source.Flipper; import org.redkale.source.EntityInfo; -import org.redkale.convert.json.JsonFactory; import org.redkale.source.FilterNode; import java.util.concurrent.*; import javax.persistence.*; +import org.redkale.convert.json.*; /** * @@ -127,7 +127,7 @@ public class TestSourceCache { @Override public String toString() { - return JsonFactory.root().getConvert().convertTo(this); + return JsonConvert.root().convertTo(this); } } } diff --git a/test/org/redkale/test/util/CreatorRecord.java b/test/org/redkale/test/util/CreatorRecord.java index 8ad37f9d1..a9d4d41f4 100644 --- a/test/org/redkale/test/util/CreatorRecord.java +++ b/test/org/redkale/test/util/CreatorRecord.java @@ -50,12 +50,12 @@ public class CreatorRecord { CreatorRecord record = Creator.create(CreatorRecord.class).create(new Object[]{null, "ss", null, true, null, (short) 45, null, 4.3f, null}); String json = record.toString(); System.out.println(json); - System.out.println(JsonFactory.root().getConvert().convertFrom(CreatorRecord.class, json).toString()); + System.out.println(JsonConvert.root().convertFrom(CreatorRecord.class, json).toString()); } @Override public String toString() { - return JsonFactory.root().getConvert().convertTo(this); + return JsonConvert.root().convertTo(this); } public int getId() {