move Gson and Jackson support into extra

taowen · taowen · commit dc506038e4f3 · 2017-06-03T15:13:12.000+08:00
diff --git a/src/main/java/com/jsoniter/extra/GsonAnnotationSupport.java b/src/main/java/com/jsoniter/extra/GsonAnnotationSupport.java
@@ -1,7 +1,10 @@
-package com.jsoniter.annotation;
+package com.jsoniter.extra;
 
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
+import com.jsoniter.annotation.JsonIgnore;
+import com.jsoniter.annotation.JsonProperty;
+import com.jsoniter.annotation.JsoniterAnnotationSupport;
 import com.jsoniter.spi.Decoder;
 import com.jsoniter.spi.Encoder;
 import com.jsoniter.spi.JsoniterSpi;
diff --git a/src/main/java/com/jsoniter/extra/JacksonAnnotationSupport.java b/src/main/java/com/jsoniter/extra/JacksonAnnotationSupport.java
@@ -1,7 +1,8 @@
-package com.jsoniter.annotation;
+package com.jsoniter.extra;
 
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.jsoniter.annotation.*;
 import com.jsoniter.spi.Decoder;
 import com.jsoniter.spi.Encoder;
 import com.jsoniter.spi.JsoniterSpi;
diff --git a/src/test/java/com/jsoniter/TestGson.java b/src/test/java/com/jsoniter/TestGson.java
@@ -4,8 +4,7 @@
 import com.google.gson.GsonBuilder;
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
-import com.jsoniter.annotation.GsonAnnotationSupport;
-import com.jsoniter.output.JsonStream;
+import com.jsoniter.extra.GsonAnnotationSupport;
 import junit.framework.TestCase;
 
 public class TestGson extends TestCase {
diff --git a/src/test/java/com/jsoniter/TestJackson.java b/src/test/java/com/jsoniter/TestJackson.java
@@ -3,11 +3,8 @@
 import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import com.jsoniter.annotation.JacksonAnnotationSupport;
-import com.jsoniter.output.JsonStream;
+import com.jsoniter.extra.JacksonAnnotationSupport;
 import junit.framework.TestCase;
 
 import java.io.IOException;
diff --git a/src/test/java/com/jsoniter/output/TestGson.java b/src/test/java/com/jsoniter/output/TestGson.java
@@ -4,7 +4,7 @@
 import com.google.gson.GsonBuilder;
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
-import com.jsoniter.annotation.GsonAnnotationSupport;
+import com.jsoniter.extra.GsonAnnotationSupport;
 import junit.framework.TestCase;
 
 public class TestGson extends TestCase {
diff --git a/src/test/java/com/jsoniter/output/TestJackson.java b/src/test/java/com/jsoniter/output/TestJackson.java
@@ -6,7 +6,7 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
-import com.jsoniter.annotation.JacksonAnnotationSupport;
+import com.jsoniter.extra.JacksonAnnotationSupport;
 import junit.framework.TestCase;
 
 import java.util.HashMap;
