Refactoring - package class move

Javen · Javen · commit ec9f76202f8a · 2014-10-16T16:28:47.000+08:00
diff --git a/src/cn/jpush/api/JPushClient.java b/src/cn/jpush/api/JPushClient.java
@@ -2,10 +2,10 @@
 
 import java.util.Map;
 
-import cn.jpush.api.common.APIConnectionException;
-import cn.jpush.api.common.APIRequestException;
-import cn.jpush.api.common.HttpProxy;
 import cn.jpush.api.common.TimeUnit;
+import cn.jpush.api.common.connection.HttpProxy;
+import cn.jpush.api.common.resp.APIConnectionException;
+import cn.jpush.api.common.resp.APIRequestException;
 import cn.jpush.api.push.PushClient;
 import cn.jpush.api.push.PushResult;
 import cn.jpush.api.push.model.Message;
diff --git a/src/cn/jpush/api/common/NormalResult.java b/src/cn/jpush/api/common/NormalResult.java
diff --git a/src/cn/jpush/api/common/connection/HttpProxy.java b/src/cn/jpush/api/common/connection/HttpProxy.java
@@ -1,11 +1,13 @@
-package cn.jpush.api.common;
+package cn.jpush.api.common.connection;
 
 import java.net.InetSocketAddress;
 import java.net.Proxy;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import cn.jpush.api.common.ServiceHelper;
+
 import com.google.common.base.Preconditions;
 
 public class HttpProxy {
diff --git a/src/cn/jpush/api/common/connection/IHttpClient.java b/src/cn/jpush/api/common/connection/IHttpClient.java
@@ -1,4 +1,8 @@
-package cn.jpush.api.common;
+package cn.jpush.api.common.connection;
+
+import cn.jpush.api.common.resp.APIConnectionException;
+import cn.jpush.api.common.resp.APIRequestException;
+import cn.jpush.api.common.resp.ResponseWrapper;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
diff --git a/src/cn/jpush/api/common/connection/NativeHttpClient.java b/src/cn/jpush/api/common/connection/NativeHttpClient.java
@@ -1,4 +1,4 @@
-package cn.jpush.api.common;
+package cn.jpush.api.common.connection;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -22,6 +22,10 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import cn.jpush.api.common.resp.APIConnectionException;
+import cn.jpush.api.common.resp.APIRequestException;
+import cn.jpush.api.common.resp.ResponseWrapper;
+
 public class NativeHttpClient implements IHttpClient {
     private static final Logger LOG = LoggerFactory.getLogger(NativeHttpClient.class);
     private static final String KEYWORDS_CONNECT_TIMED_OUT = "connect timed out";
diff --git a/src/cn/jpush/api/common/resp/APIConnectionException.java b/src/cn/jpush/api/common/resp/APIConnectionException.java
@@ -1,4 +1,4 @@
-package cn.jpush.api.common;
+package cn.jpush.api.common.resp;
 
 /**
  * Should retry for encountering this exception basically. 
diff --git a/src/cn/jpush/api/common/resp/APIRequestException.java b/src/cn/jpush/api/common/resp/APIRequestException.java
@@ -1,6 +1,6 @@
-package cn.jpush.api.common;
+package cn.jpush.api.common.resp;
 
-import cn.jpush.api.common.ResponseWrapper.ErrorObject;
+import cn.jpush.api.common.resp.ResponseWrapper.ErrorObject;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
diff --git a/src/cn/jpush/api/common/resp/BaseResult.java b/src/cn/jpush/api/common/resp/BaseResult.java
@@ -1,4 +1,4 @@
-package cn.jpush.api.common;
+package cn.jpush.api.common.resp;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
diff --git a/src/cn/jpush/api/common/resp/BooleanResult.java b/src/cn/jpush/api/common/resp/BooleanResult.java
@@ -0,0 +1,9 @@
+package cn.jpush.api.common.resp;
+
+import com.google.gson.annotations.Expose;
+
+public class BooleanResult extends DefaultResult {
+
+	@Expose public boolean result;
+	
+}
diff --git a/src/cn/jpush/api/common/resp/DefaultResult.java b/src/cn/jpush/api/common/resp/DefaultResult.java
@@ -0,0 +1,6 @@
+package cn.jpush.api.common.resp;
+
+public class DefaultResult extends BaseResult {
+    
+
+}
diff --git a/src/cn/jpush/api/common/resp/IRateLimiting.java b/src/cn/jpush/api/common/resp/IRateLimiting.java
@@ -1,4 +1,4 @@
-package cn.jpush.api.common;
+package cn.jpush.api.common.resp;
 
 public interface IRateLimiting {
 
diff --git a/src/cn/jpush/api/common/resp/ResponseWrapper.java b/src/cn/jpush/api/common/resp/ResponseWrapper.java
@@ -1,4 +1,4 @@
-package cn.jpush.api.common;
+package cn.jpush.api.common.resp;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/cn/jpush/api/device/AliasDeviceListResult.java b/src/cn/jpush/api/device/AliasDeviceListResult.java
@@ -1,9 +1,9 @@
-package cn.jpush.api.tags;
+package cn.jpush.api.device;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import cn.jpush.api.common.BaseResult;
+import cn.jpush.api.common.resp.BaseResult;
 
 import com.google.gson.annotations.Expose;
 
diff --git a/src/cn/jpush/api/device/DeviceClient.java b/src/cn/jpush/api/device/DeviceClient.java
@@ -1,39 +1,39 @@
-package cn.jpush.api.tags;
+package cn.jpush.api.device;
 
 import java.util.Set;
 
-import cn.jpush.api.common.APIConnectionException;
-import cn.jpush.api.common.APIRequestException;
-import cn.jpush.api.common.BaseResult;
-import cn.jpush.api.common.HttpProxy;
-import cn.jpush.api.common.IHttpClient;
-import cn.jpush.api.common.NativeHttpClient;
-import cn.jpush.api.common.NormalResult;
-import cn.jpush.api.common.ResponseWrapper;
 import cn.jpush.api.common.ServiceHelper;
+import cn.jpush.api.common.connection.HttpProxy;
+import cn.jpush.api.common.connection.IHttpClient;
+import cn.jpush.api.common.connection.NativeHttpClient;
+import cn.jpush.api.common.resp.APIConnectionException;
+import cn.jpush.api.common.resp.APIRequestException;
+import cn.jpush.api.common.resp.BaseResult;
+import cn.jpush.api.common.resp.DefaultResult;
+import cn.jpush.api.common.resp.ResponseWrapper;
 import cn.jpush.api.utils.StringUtils;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
 
-public class TagsClient {
+public class DeviceClient {
     public static final String HOST_NAME_SSL = "https://devices.jpush.cn";
     public static final String DEVICE_PATH = "/v3/device";
     public static final String TAG_PATH = "/v3/tag";
     public static final String ALIAS_PATH = "/v3/alias";
     
     private final NativeHttpClient _httpClient;
 
-    public TagsClient(String masterSecret, String appKey) {
+    public DeviceClient(String masterSecret, String appKey) {
         this(masterSecret, appKey, IHttpClient.DEFAULT_MAX_RETRY_TIMES);
     }
     
-    public TagsClient(String masterSecret, String appKey, int maxRetryTimes) {
+    public DeviceClient(String masterSecret, String appKey, int maxRetryTimes) {
         this(masterSecret, appKey, maxRetryTimes, null);
     }
     
-    public TagsClient(String masterSecret, String appKey, int maxRetryTimes, HttpProxy proxy) {
+    public DeviceClient(String masterSecret, String appKey, int maxRetryTimes, HttpProxy proxy) {
         ServiceHelper.checkBasic(appKey, masterSecret);
         
         String authCode = ServiceHelper.getBasicAuthorization(appKey, masterSecret);
@@ -51,7 +51,7 @@ public TagAliasResult getDeviceTagAlias(String registrationId) throws APIConnect
         return BaseResult.fromResponse(response, TagAliasResult.class);
     }
     
-    public NormalResult updateDeviceTagAlias(String registrationId, String alias, boolean clearTag, 
+    public DefaultResult updateDeviceTagAlias(String registrationId, String alias, boolean clearTag, 
             Set<String> tagsToAdd, Set<String> tagsToRemove) throws APIConnectionException, APIRequestException {
         String url = HOST_NAME_SSL + DEVICE_PATH + "/" + registrationId;
         
@@ -80,7 +80,7 @@ public NormalResult updateDeviceTagAlias(String registrationId, String alias, bo
         
         ResponseWrapper response = _httpClient.sendPost(url, top.toString());
         
-        return BaseResult.fromResponse(response, NormalResult.class);
+        return BaseResult.fromResponse(response, DefaultResult.class);
     }
     
     
@@ -97,7 +97,15 @@ public TagListResult getTagList(String platform) throws APIConnectionException,
         return BaseResult.fromResponse(response, TagListResult.class);
     }
     
-    public NormalResult addRemoveDevicesFromTag(String theTag, Set<String> toAddUsers, Set<String> toRemoveUsers) throws APIConnectionException, APIRequestException {
+    public DefaultResult isDeviceInTag(String theTag, String registrationID) throws APIConnectionException, APIRequestException {
+        String url = HOST_NAME_SSL + TAG_PATH + "/" + theTag + "/exist";
+        
+        ResponseWrapper response = _httpClient.sendGet(url);
+        
+        return BaseResult.fromResponse(response, DefaultResult.class);        
+    }
+    
+    public DefaultResult addRemoveDevicesFromTag(String theTag, Set<String> toAddUsers, Set<String> toRemoveUsers) throws APIConnectionException, APIRequestException {
         String url = HOST_NAME_SSL + TAG_PATH + "/" + theTag;
         
         JsonObject top = new JsonObject();
@@ -122,23 +130,15 @@ public NormalResult addRemoveDevicesFromTag(String theTag, Set<String> toAddUser
         
         ResponseWrapper response = _httpClient.sendPost(url, top.toString());
         
-        return BaseResult.fromResponse(response, NormalResult.class);
+        return BaseResult.fromResponse(response, DefaultResult.class);
     }
     
-    public NormalResult deleteTag(String theTag) throws APIConnectionException, APIRequestException {
+    public DefaultResult deleteTag(String theTag) throws APIConnectionException, APIRequestException {
         String url = HOST_NAME_SSL + TAG_PATH + "/" + theTag;
         
         ResponseWrapper response = _httpClient.sendDelete(url);
         
-        return BaseResult.fromResponse(response, NormalResult.class);        
-    }
-    
-    public NormalResult isDeviceInTag(String theTag, String registrationID) throws APIConnectionException, APIRequestException {
-        String url = HOST_NAME_SSL + TAG_PATH + "/" + theTag + "/exist";
-        
-        ResponseWrapper response = _httpClient.sendGet(url);
-        
-        return BaseResult.fromResponse(response, NormalResult.class);        
+        return BaseResult.fromResponse(response, DefaultResult.class);        
     }
     
     
@@ -152,12 +152,12 @@ public AliasDeviceListResult getAliasDeviceList(String alias) throws APIConnecti
         return BaseResult.fromResponse(response, AliasDeviceListResult.class);
     }
     
-    public NormalResult deleteAlias(String alias) throws APIConnectionException, APIRequestException {
+    public DefaultResult deleteAlias(String alias) throws APIConnectionException, APIRequestException {
         String url = HOST_NAME_SSL + ALIAS_PATH + "/" + alias;
         
         ResponseWrapper response = _httpClient.sendDelete(url);
         
-        return BaseResult.fromResponse(response, NormalResult.class);
+        return BaseResult.fromResponse(response, DefaultResult.class);
     }
         
 }
diff --git a/src/cn/jpush/api/device/TagAliasResult.java b/src/cn/jpush/api/device/TagAliasResult.java
@@ -1,8 +1,8 @@
-package cn.jpush.api.tags;
+package cn.jpush.api.device;
 
 import java.util.List;
 
-import cn.jpush.api.common.BaseResult;
+import cn.jpush.api.common.resp.BaseResult;
 
 import com.google.gson.annotations.Expose;
 
diff --git a/src/cn/jpush/api/device/TagListResult.java b/src/cn/jpush/api/device/TagListResult.java
@@ -0,0 +1,19 @@
+package cn.jpush.api.device;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import cn.jpush.api.common.resp.BaseResult;
+
+import com.google.gson.annotations.Expose;
+
+public class TagListResult extends BaseResult {
+    
+    @Expose public List<Tag> tags = new ArrayList<Tag>();
+    
+    public static class Tag {
+        @Expose public String tag;
+    }
+        
+}
+
diff --git a/src/cn/jpush/api/examples/PushExample.java b/src/cn/jpush/api/examples/PushExample.java
@@ -4,8 +4,8 @@
 import org.slf4j.LoggerFactory;
 
 import cn.jpush.api.JPushClient;
-import cn.jpush.api.common.APIConnectionException;
-import cn.jpush.api.common.APIRequestException;
+import cn.jpush.api.common.resp.APIConnectionException;
+import cn.jpush.api.common.resp.APIRequestException;
 import cn.jpush.api.push.PushResult;
 import cn.jpush.api.push.model.Message;
 import cn.jpush.api.push.model.Options;
diff --git a/src/cn/jpush/api/examples/ReportsExample.java b/src/cn/jpush/api/examples/ReportsExample.java
@@ -4,9 +4,9 @@
 import org.slf4j.LoggerFactory;
 
 import cn.jpush.api.JPushClient;
-import cn.jpush.api.common.APIConnectionException;
-import cn.jpush.api.common.APIRequestException;
 import cn.jpush.api.common.TimeUnit;
+import cn.jpush.api.common.resp.APIConnectionException;
+import cn.jpush.api.common.resp.APIRequestException;
 import cn.jpush.api.report.MessagesResult;
 import cn.jpush.api.report.ReceivedsResult;
 import cn.jpush.api.report.UsersResult;
diff --git a/src/cn/jpush/api/push/PushClient.java b/src/cn/jpush/api/push/PushClient.java
@@ -1,13 +1,13 @@
 package cn.jpush.api.push;
 
-import cn.jpush.api.common.APIConnectionException;
-import cn.jpush.api.common.APIRequestException;
-import cn.jpush.api.common.BaseResult;
-import cn.jpush.api.common.HttpProxy;
-import cn.jpush.api.common.IHttpClient;
-import cn.jpush.api.common.NativeHttpClient;
-import cn.jpush.api.common.ResponseWrapper;
 import cn.jpush.api.common.ServiceHelper;
+import cn.jpush.api.common.connection.HttpProxy;
+import cn.jpush.api.common.connection.IHttpClient;
+import cn.jpush.api.common.connection.NativeHttpClient;
+import cn.jpush.api.common.resp.APIConnectionException;
+import cn.jpush.api.common.resp.APIRequestException;
+import cn.jpush.api.common.resp.BaseResult;
+import cn.jpush.api.common.resp.ResponseWrapper;
 import cn.jpush.api.push.model.PushPayload;
 import cn.jpush.api.utils.StringUtils;
 
diff --git a/src/cn/jpush/api/push/PushResult.java b/src/cn/jpush/api/push/PushResult.java
@@ -1,6 +1,6 @@
 package cn.jpush.api.push;
 
-import cn.jpush.api.common.BaseResult;
+import cn.jpush.api.common.resp.BaseResult;
 
 import com.google.gson.annotations.Expose;
 
diff --git a/src/cn/jpush/api/report/MessagesResult.java b/src/cn/jpush/api/report/MessagesResult.java
@@ -4,8 +4,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import cn.jpush.api.common.BaseResult;
-import cn.jpush.api.common.ResponseWrapper;
+import cn.jpush.api.common.resp.BaseResult;
+import cn.jpush.api.common.resp.ResponseWrapper;
 
 import com.google.gson.annotations.Expose;
 import com.google.gson.reflect.TypeToken;
diff --git a/src/cn/jpush/api/report/ReceivedsResult.java b/src/cn/jpush/api/report/ReceivedsResult.java
@@ -4,8 +4,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import cn.jpush.api.common.BaseResult;
-import cn.jpush.api.common.ResponseWrapper;
+import cn.jpush.api.common.resp.BaseResult;
+import cn.jpush.api.common.resp.ResponseWrapper;
 
 import com.google.gson.annotations.Expose;
 import com.google.gson.reflect.TypeToken;
diff --git a/src/cn/jpush/api/report/ReportClient.java b/src/cn/jpush/api/report/ReportClient.java
@@ -3,15 +3,15 @@
 import java.net.URLEncoder;
 import java.util.regex.Pattern;
 
-import cn.jpush.api.common.APIConnectionException;
-import cn.jpush.api.common.APIRequestException;
-import cn.jpush.api.common.BaseResult;
-import cn.jpush.api.common.HttpProxy;
-import cn.jpush.api.common.IHttpClient;
-import cn.jpush.api.common.NativeHttpClient;
-import cn.jpush.api.common.ResponseWrapper;
 import cn.jpush.api.common.ServiceHelper;
 import cn.jpush.api.common.TimeUnit;
+import cn.jpush.api.common.connection.HttpProxy;
+import cn.jpush.api.common.connection.IHttpClient;
+import cn.jpush.api.common.connection.NativeHttpClient;
+import cn.jpush.api.common.resp.APIConnectionException;
+import cn.jpush.api.common.resp.APIRequestException;
+import cn.jpush.api.common.resp.BaseResult;
+import cn.jpush.api.common.resp.ResponseWrapper;
 import cn.jpush.api.utils.StringUtils;
 
 public class ReportClient {    
diff --git a/src/cn/jpush/api/report/UsersResult.java b/src/cn/jpush/api/report/UsersResult.java
@@ -3,8 +3,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import cn.jpush.api.common.BaseResult;
 import cn.jpush.api.common.TimeUnit;
+import cn.jpush.api.common.resp.BaseResult;
 
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
diff --git a/src/cn/jpush/api/tags/TagListResult.java b/src/cn/jpush/api/tags/TagListResult.java
diff --git a/test/cn/jpush/api/push/mock/BaseMockTest.java b/test/cn/jpush/api/push/mock/BaseMockTest.java
diff --git a/test/cn/jpush/api/push/mock/ConnectionExceptionTest.java b/test/cn/jpush/api/push/mock/ConnectionExceptionTest.java
diff --git a/test/cn/jpush/api/push/remote/AudienceTest.java b/test/cn/jpush/api/push/remote/AudienceTest.java
diff --git a/test/cn/jpush/api/push/remote/ExceptionTest.java b/test/cn/jpush/api/push/remote/ExceptionTest.java
diff --git a/test/cn/jpush/api/push/remote/SpecialCharacterTest.java b/test/cn/jpush/api/push/remote/SpecialCharacterTest.java
diff --git a/test/cn/jpush/api/report/ReportFunctionTests.java b/test/cn/jpush/api/report/ReportFunctionTests.java

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package cn.jpush.api.common;`
	`1`	`+package cn.jpush.api.common.resp;`
`2`	`2`
`3`	`3`	`/**`
`4`	`4`	`* Should retry for encountering this exception basically.`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,6 @@ @@
 +package cn.jpush.api.common.resp;
++
 +public class DefaultResult extends BaseResult {
++
++
 +}