use jiguang-common-0.1.6

KenChoi1992 · KenChoi1992 · commit c5684cd33ee4 · 2016-10-25T17:45:37.000+08:00
diff --git a/example/main/java/cn/jpush/api/examples/ClientExample.java b/example/main/java/cn/jpush/api/examples/ClientExample.java
@@ -3,7 +3,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import cn.jiguang.commom.ClientConfig;
+import cn.jiguang.common.ClientConfig;
 import cn.jpush.api.JPushClient;
 
 public class ClientExample {
diff --git a/example/main/java/cn/jpush/api/examples/PushExample.java b/example/main/java/cn/jpush/api/examples/PushExample.java
@@ -9,7 +9,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import cn.jiguang.commom.ClientConfig;
+import cn.jiguang.common.ClientConfig;
 import cn.jiguang.common.resp.APIConnectionException;
 import cn.jiguang.common.resp.APIRequestException;
 import cn.jpush.api.JPushClient;
diff --git a/example/main/java/cn/jpush/api/examples/ReportsExample.java b/example/main/java/cn/jpush/api/examples/ReportsExample.java
@@ -3,7 +3,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import cn.jiguang.commom.TimeUnit;
+import cn.jiguang.common.TimeUnit;
 import cn.jiguang.common.resp.APIConnectionException;
 import cn.jiguang.common.resp.APIRequestException;
 import cn.jpush.api.JPushClient;
diff --git a/example/main/java/cn/jpush/api/examples/ScheduleExample.java b/example/main/java/cn/jpush/api/examples/ScheduleExample.java
@@ -3,8 +3,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import cn.jiguang.commom.TimeUnit;
-import cn.jiguang.commom.Week;
+import cn.jiguang.common.TimeUnit;
+import cn.jiguang.common.Week;
 import cn.jiguang.common.resp.APIConnectionException;
 import cn.jiguang.common.resp.APIRequestException;
 import cn.jpush.api.JPushClient;
diff --git a/libs/jiguang-common-0.1.6.jar b/libs/jiguang-common-0.1.6.jar
diff --git a/pom.xml b/pom.xml
@@ -39,11 +39,11 @@
 	</scm>
 
 	<dependencies>
-		<dependency>
-			<groupId>cn.jpush.api</groupId>
-			<artifactId>jiguang-common</artifactId>
-			<version>0.1.3</version>
-		</dependency>
+		<!--<dependency>-->
+			<!--<groupId>cn.jpush.api</groupId>-->
+			<!--<artifactId>jiguang-common</artifactId>-->
+			<!--<version>0.1.3</version>-->
+		<!--</dependency>-->
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
diff --git a/src/main/java/cn/jpush/api/JPushClient.java b/src/main/java/cn/jpush/api/JPushClient.java
@@ -5,10 +5,10 @@
 
 import com.google.gson.JsonObject;
 
-import cn.jiguang.commom.ClientConfig;
-import cn.jiguang.commom.TimeUnit;
-import cn.jiguang.commom.Week;
-import cn.jiguang.commom.utils.Preconditions;
+import cn.jiguang.common.ClientConfig;
+import cn.jiguang.common.TimeUnit;
+import cn.jiguang.common.Week;
+import cn.jiguang.common.utils.Preconditions;
 import cn.jiguang.common.connection.HttpProxy;
 import cn.jiguang.common.resp.APIConnectionException;
 import cn.jiguang.common.resp.APIRequestException;
diff --git a/src/main/java/cn/jpush/api/device/DeviceClient.java b/src/main/java/cn/jpush/api/device/DeviceClient.java
@@ -10,10 +10,10 @@
 import com.google.gson.JsonPrimitive;
 import com.google.gson.reflect.TypeToken;
 
-import cn.jiguang.commom.ClientConfig;
-import cn.jiguang.commom.ServiceHelper;
-import cn.jiguang.commom.utils.Preconditions;
-import cn.jiguang.commom.utils.StringUtils;
+import cn.jiguang.common.ClientConfig;
+import cn.jiguang.common.ServiceHelper;
+import cn.jiguang.common.utils.Preconditions;
+import cn.jiguang.common.utils.StringUtils;
 import cn.jiguang.common.connection.HttpProxy;
 import cn.jiguang.common.connection.NativeHttpClient;
 import cn.jiguang.common.resp.APIConnectionException;
diff --git a/src/main/java/cn/jpush/api/push/PushClient.java b/src/main/java/cn/jpush/api/push/PushClient.java
@@ -3,10 +3,10 @@
 import com.google.gson.JsonParseException;
 import com.google.gson.JsonParser;
 
-import cn.jiguang.commom.ClientConfig;
-import cn.jiguang.commom.ServiceHelper;
-import cn.jiguang.commom.utils.Preconditions;
-import cn.jiguang.commom.utils.StringUtils;
+import cn.jiguang.common.ClientConfig;
+import cn.jiguang.common.ServiceHelper;
+import cn.jiguang.common.utils.Preconditions;
+import cn.jiguang.common.utils.StringUtils;
 import cn.jiguang.common.connection.HttpProxy;
 import cn.jiguang.common.connection.NativeHttpClient;
 import cn.jiguang.common.resp.APIConnectionException;
diff --git a/src/main/java/cn/jpush/api/push/model/Message.java b/src/main/java/cn/jpush/api/push/model/Message.java
@@ -7,7 +7,7 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
 
-import cn.jiguang.commom.utils.Preconditions;
+import cn.jiguang.common.utils.Preconditions;
 
 public class Message implements PushModel {    
     private static final String TITLE = "title";
diff --git a/src/main/java/cn/jpush/api/push/model/Options.java b/src/main/java/cn/jpush/api/push/model/Options.java
@@ -5,8 +5,8 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
 
-import cn.jiguang.commom.ServiceHelper;
-import cn.jiguang.commom.utils.Preconditions;
+import cn.jiguang.common.ServiceHelper;
+import cn.jiguang.common.utils.Preconditions;
 
 public class Options implements PushModel {
     private static final String SENDNO = "sendno";
diff --git a/src/main/java/cn/jpush/api/push/model/Platform.java b/src/main/java/cn/jpush/api/push/model/Platform.java
@@ -3,11 +3,11 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import cn.jiguang.commom.DeviceType;
+import cn.jiguang.common.DeviceType;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonPrimitive;
-import cn.jiguang.commom.utils.Preconditions;
+import cn.jiguang.common.utils.Preconditions;
 
 public class Platform implements PushModel {    
     private static final String ALL = "all";
diff --git a/src/main/java/cn/jpush/api/push/model/PushPayload.java b/src/main/java/cn/jpush/api/push/model/PushPayload.java
@@ -5,7 +5,7 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
 
-import cn.jiguang.commom.utils.Preconditions;
+import cn.jiguang.common.utils.Preconditions;
 import cn.jpush.api.push.model.audience.Audience;
 import cn.jpush.api.push.model.notification.AndroidNotification;
 import cn.jpush.api.push.model.notification.IosNotification;
diff --git a/src/main/java/cn/jpush/api/push/model/SMS.java b/src/main/java/cn/jpush/api/push/model/SMS.java
@@ -3,8 +3,8 @@
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 
-import cn.jiguang.commom.utils.Preconditions;
-import cn.jiguang.commom.utils.StringUtils;
+import cn.jiguang.common.utils.Preconditions;
+import cn.jiguang.common.utils.StringUtils;
 
 public class SMS implements PushModel {
 
diff --git a/src/main/java/cn/jpush/api/push/model/audience/Audience.java b/src/main/java/cn/jpush/api/push/model/audience/Audience.java
@@ -9,7 +9,7 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
 
-import cn.jiguang.commom.utils.Preconditions;
+import cn.jiguang.common.utils.Preconditions;
 import cn.jpush.api.push.model.PushModel;
 
 public class Audience implements PushModel {
diff --git a/src/main/java/cn/jpush/api/push/model/audience/AudienceTarget.java b/src/main/java/cn/jpush/api/push/model/audience/AudienceTarget.java
@@ -8,7 +8,7 @@
 import com.google.gson.JsonElement;
 import com.google.gson.JsonPrimitive;
 
-import cn.jiguang.commom.utils.Preconditions;
+import cn.jiguang.common.utils.Preconditions;
 import cn.jpush.api.push.model.PushModel;
 
 public class AudienceTarget implements PushModel {
diff --git a/src/main/java/cn/jpush/api/push/model/notification/IosAlert.java b/src/main/java/cn/jpush/api/push/model/notification/IosAlert.java
@@ -5,7 +5,7 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
 
-import cn.jiguang.commom.utils.StringUtils;
+import cn.jiguang.common.utils.StringUtils;
 import cn.jpush.api.push.model.PushModel;
 
 public class IosAlert implements PushModel {
diff --git a/src/main/java/cn/jpush/api/push/model/notification/IosNotification.java b/src/main/java/cn/jpush/api/push/model/notification/IosNotification.java
@@ -6,7 +6,7 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
 
-import cn.jiguang.commom.ServiceHelper;
+import cn.jiguang.common.ServiceHelper;
 
 /**
  * <p><b>APNs 通知类</b></p>
diff --git a/src/main/java/cn/jpush/api/push/model/notification/Notification.java b/src/main/java/cn/jpush/api/push/model/notification/Notification.java
@@ -8,7 +8,7 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
 
-import cn.jiguang.commom.utils.Preconditions;
+import cn.jiguang.common.utils.Preconditions;
 import cn.jpush.api.push.model.PushModel;
 
 public class Notification implements PushModel {    
diff --git a/src/main/java/cn/jpush/api/push/model/notification/PlatformNotification.java b/src/main/java/cn/jpush/api/push/model/notification/PlatformNotification.java
@@ -10,7 +10,7 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
 
-import cn.jiguang.commom.utils.Preconditions;
+import cn.jiguang.common.utils.Preconditions;
 import cn.jpush.api.push.model.PushModel;
 
 public abstract class PlatformNotification implements PushModel {
diff --git a/src/main/java/cn/jpush/api/report/ReportClient.java b/src/main/java/cn/jpush/api/report/ReportClient.java
@@ -4,10 +4,10 @@
 import java.net.URLEncoder;
 import java.util.regex.Pattern;
 
-import cn.jiguang.commom.ClientConfig;
-import cn.jiguang.commom.ServiceHelper;
-import cn.jiguang.commom.TimeUnit;
-import cn.jiguang.commom.utils.StringUtils;
+import cn.jiguang.common.ClientConfig;
+import cn.jiguang.common.ServiceHelper;
+import cn.jiguang.common.TimeUnit;
+import cn.jiguang.common.utils.StringUtils;
 import cn.jiguang.common.connection.HttpProxy;
 import cn.jiguang.common.connection.NativeHttpClient;
 import cn.jiguang.common.resp.APIConnectionException;
diff --git a/src/main/java/cn/jpush/api/report/UsersResult.java b/src/main/java/cn/jpush/api/report/UsersResult.java
@@ -6,7 +6,7 @@
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 
-import cn.jiguang.commom.TimeUnit;
+import cn.jiguang.common.TimeUnit;
 import cn.jiguang.common.resp.BaseResult;
 
 public class UsersResult extends BaseResult {
diff --git a/src/main/java/cn/jpush/api/schedule/ScheduleClient.java b/src/main/java/cn/jpush/api/schedule/ScheduleClient.java
@@ -3,10 +3,10 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import cn.jiguang.commom.ClientConfig;
-import cn.jiguang.commom.ServiceHelper;
-import cn.jiguang.commom.utils.Preconditions;
-import cn.jiguang.commom.utils.StringUtils;
+import cn.jiguang.common.ClientConfig;
+import cn.jiguang.common.ServiceHelper;
+import cn.jiguang.common.utils.Preconditions;
+import cn.jiguang.common.utils.StringUtils;
 import cn.jiguang.common.connection.HttpProxy;
 import cn.jiguang.common.connection.NativeHttpClient;
 import cn.jiguang.common.resp.APIConnectionException;
diff --git a/src/main/java/cn/jpush/api/schedule/model/SchedulePayload.java b/src/main/java/cn/jpush/api/schedule/model/SchedulePayload.java
@@ -4,7 +4,7 @@
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 
-import cn.jiguang.commom.utils.StringUtils;
+import cn.jiguang.common.utils.StringUtils;
 import cn.jpush.api.push.model.PushPayload;
 
 public class SchedulePayload implements IModel {
diff --git a/src/main/java/cn/jpush/api/schedule/model/TriggerPayload.java b/src/main/java/cn/jpush/api/schedule/model/TriggerPayload.java
@@ -6,10 +6,10 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
 
-import cn.jiguang.commom.TimeUnit;
-import cn.jiguang.commom.utils.Preconditions;
-import cn.jiguang.commom.utils.StringUtils;
-import cn.jiguang.commom.utils.TimeUtils;
+import cn.jiguang.common.TimeUnit;
+import cn.jiguang.common.utils.Preconditions;
+import cn.jiguang.common.utils.StringUtils;
+import cn.jiguang.common.utils.TimeUtils;
 
 
 public class TriggerPayload implements IModel {
diff --git a/src/test/java/cn/jpush/api/push/PushClientTest.java b/src/test/java/cn/jpush/api/push/PushClientTest.java
@@ -3,7 +3,7 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import cn.jiguang.commom.ClientConfig;
+import cn.jiguang.common.ClientConfig;
 import cn.jpush.api.JPushClient;
 import cn.jpush.api.push.model.Message;
 import cn.jpush.api.push.model.Options;
diff --git a/src/test/java/cn/jpush/api/push/model/OptionsTest.java b/src/test/java/cn/jpush/api/push/model/OptionsTest.java
@@ -10,7 +10,7 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
 
-import cn.jiguang.commom.ServiceHelper;
+import cn.jiguang.common.ServiceHelper;
 import cn.jpush.api.FastTests;
 
 @Category(FastTests.class)
diff --git a/src/test/java/cn/jpush/api/push/model/PlatformTesst.java b/src/test/java/cn/jpush/api/push/model/PlatformTesst.java
@@ -3,7 +3,7 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 
-import cn.jiguang.commom.DeviceType;
+import cn.jiguang.common.DeviceType;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
diff --git a/src/test/java/cn/jpush/api/push/model/PushPayloadTest.java b/src/test/java/cn/jpush/api/push/model/PushPayloadTest.java
@@ -7,7 +7,7 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
 
-import cn.jiguang.commom.ServiceHelper;
+import cn.jiguang.common.ServiceHelper;
 import cn.jpush.api.FastTests;
 import cn.jpush.api.push.model.audience.Audience;
 import cn.jpush.api.push.model.notification.IosNotification;
diff --git a/src/test/java/cn/jpush/api/push/remote/BasicFunctionsTest.java b/src/test/java/cn/jpush/api/push/remote/BasicFunctionsTest.java
@@ -5,7 +5,7 @@
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import cn.jiguang.commom.DeviceType;
+import cn.jiguang.common.DeviceType;
 import cn.jpush.api.SlowTests;
 import cn.jpush.api.push.PushResult;
 import cn.jpush.api.push.model.Message;
diff --git a/src/test/java/cn/jpush/api/report/ReportFunctionTests.java b/src/test/java/cn/jpush/api/report/ReportFunctionTests.java
@@ -5,7 +5,7 @@
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import cn.jiguang.commom.TimeUnit;
+import cn.jiguang.common.TimeUnit;
 import cn.jpush.api.BaseTest;
 import cn.jpush.api.SlowTests;
 
diff --git a/src/test/java/cn/jpush/api/schedule/model/TriggerPayloadTest.java b/src/test/java/cn/jpush/api/schedule/model/TriggerPayloadTest.java
@@ -8,7 +8,7 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
 
-import cn.jiguang.commom.TimeUnit;
+import cn.jiguang.common.TimeUnit;
 import cn.jpush.api.FastTests;
 
 /**
