remove wrap from JsonStream

taowen · taowen · commit 0dc1164650ac · 2017-02-01T11:57:26.000+08:00
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.jsoniter</groupId>
-    <version>0.9.7</version>
+    <version>0.9.8</version>
     <artifactId>jsoniter</artifactId>
     <name>json iterator</name>
     <description>jsoniter (json-iterator) is fast and flexible JSON parser available in Java and Go</description>
diff --git a/src/main/java/com/jsoniter/any/Any.java b/src/main/java/com/jsoniter/any/Any.java
@@ -1,5 +1,6 @@
 package com.jsoniter.any;
 
+import com.jsoniter.output.CodegenAccess;
 import com.jsoniter.spi.JsonException;
 import com.jsoniter.JsonIterator;
 import com.jsoniter.ValueType;
@@ -315,7 +316,7 @@ public static <T> Any wrap(Map<String, T> val) {
     }
 
     public static Any wrap(Object val) {
-        return JsonStream.wrap(val);
+        return CodegenAccess.wrap(val);
     }
 
     public static Any wrapNull() {
diff --git a/src/main/java/com/jsoniter/output/CodegenAccess.java b/src/main/java/com/jsoniter/output/CodegenAccess.java
@@ -1,6 +1,7 @@
 package com.jsoniter.output;
 
 import com.jsoniter.*;
+import com.jsoniter.any.Any;
 import com.jsoniter.spi.Encoder;
 import com.jsoniter.spi.JsoniterSpi;
 import com.jsoniter.spi.TypeLiteral;
@@ -59,4 +60,13 @@ public static void writeStringWithoutQuote(String obj, JsonStream stream) throws
     public static void staticGenEncoders(TypeLiteral[] typeLiterals) {
         Codegen.staticGenEncoders(typeLiterals);
     }
+
+    public static Any wrap(Object val) {
+        if (val == null) {
+            return Any.wrapNull();
+        }
+        Class<?> clazz = val.getClass();
+        String cacheKey = TypeLiteral.create(clazz).getEncoderCacheKey();
+        return Codegen.getReflectionEncoder(cacheKey, clazz).wrap(val);
+    }
 }
diff --git a/src/main/java/com/jsoniter/output/CodegenImplNative.java b/src/main/java/com/jsoniter/output/CodegenImplNative.java
@@ -234,7 +234,7 @@ public Any wrap(Object obj) {
                 if (obj != null && obj.getClass() == Object.class) {
                     return Any.rewrap(new HashMap<String, Any>());
                 }
-                return JsonStream.wrap(obj);
+                return CodegenAccess.wrap(obj);
             }
         });
 
diff --git a/src/main/java/com/jsoniter/output/JsonStream.java b/src/main/java/com/jsoniter/output/JsonStream.java
@@ -375,15 +375,6 @@ public static void setMode(EncodingMode mode) {
         Codegen.setMode(mode);
     }
 
-    public static Any wrap(Object val) {
-        if (val == null) {
-            return Any.wrapNull();
-        }
-        Class<?> clazz = val.getClass();
-        String cacheKey = TypeLiteral.create(clazz).getEncoderCacheKey();
-        return Codegen.getReflectionEncoder(cacheKey, clazz).wrap(val);
-    }
-
     public static void registerNativeEncoder(Class clazz, Encoder encoder) {
         CodegenImplNative.NATIVE_ENCODERS.put(clazz, encoder);
     }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`package com.jsoniter.any;`
`2`	`2`
	`3`	`+import com.jsoniter.output.CodegenAccess;`
`3`	`4`	`import com.jsoniter.spi.JsonException;`
`4`	`5`	`import com.jsoniter.JsonIterator;`
`5`	`6`	`import com.jsoniter.ValueType;`
`@@ -315,7 +316,7 @@ public static <T> Any wrap(Map<String, T> val) {`
`315`	`316`	`}`
`316`	`317`
`317`	`318`	`public static Any wrap(Object val) {`
`318`		`- return JsonStream.wrap(val);`
	`319`	`+ return CodegenAccess.wrap(val);`
`319`	`320`	`}`
`320`	`321`
`321`	`322`	`public static Any wrapNull() {`
Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,7 @@ public Any wrap(Object obj) {`
`234`	`234`	`if (obj != null && obj.getClass() == Object.class) {`
`235`	`235`	`return Any.rewrap(new HashMap<String, Any>());`
`236`	`236`	`}`
`237`		`- return JsonStream.wrap(obj);`
	`237`	`+ return CodegenAccess.wrap(obj);`
`238`	`238`	`}`
`239`	`239`	`});`
`240`	`240`