Merge pull request #61 from jpush/dev

merge from dev

Author: Liuchy1

src/main/java/cn/jpush/api/push/PushClient.java

@@ -51,6 +51,9 @@ public PushClient(String masterSecret, String appKey) {
 
     /**
      * This will be removed in the future. Please use ClientConfig{@link cn.jpush.api.common.ClientConfig} instead of this constructor.
+     * @param masterSecret API access secret of the appKey.
+     * @param appKey The KEY of one application on JPush.
+     * @param maxRetryTimes The max retry times.
      */
     @Deprecated
 	public PushClient(String masterSecret, String appKey, int maxRetryTimes) {
@@ -64,6 +67,7 @@ public PushClient(String masterSecret, String appKey, int maxRetryTimes) {
 	 * @param masterSecret  API access secret of the appKey.
 	 * @param appKey The KEY of one application on JPush.
 	 * @param maxRetryTimes max retry times
+     * @param proxy The max retry times.
 	 */
     @Deprecated
 	public PushClient(String masterSecret, String appKey, int maxRetryTimes, HttpProxy proxy) {

src/main/java/cn/jpush/api/push/model/notification/IosNotification.java

@@ -8,8 +8,8 @@
 import java.util.Map;
 
 /**
- * APNs 通知类
- * <p>
+ * <p><b>APNs 通知类</b></p>
+ * <br>
  * 支持 APNs 默认的几个参数：
  * <ul>
  * <li>alert: 继承自父类 PlatformNotification 的 alert 属性；本类设置则覆盖。</li>
@@ -18,14 +18,12 @@
  * <li>content-available: 用来支持后台推送。如果该值赋值为 1，表示开启后台推送。</li>
  * <li>extras: JSON object. 支持更多的自定义字段信息。</li>
  * </ul>
- * </p>
- * <p>
+ * <br>
  * 需要特别留意的是，JPush SDK 会对以下几个值有特别的默认设置考虑：
  * <ul>
- * <li>badge: 默认为 "+1"。如果需要取消 badge 值，需要显式地调用 disableBadge().</li>
- * <li>sound: 默认为 ""，即默认的声音提示。如果需要取消 sound 值，即不要声音，需要显式地调用 disableSound(). </li>
+ * <li>badge: 默认为 "+1"。如果需要取消 badge 值，需要显式地调用 disableBadge()。</li>
+ * <li>sound: 默认为 ""，即默认的声音提示。如果需要取消 sound 值，即不要声音，需要显式地调用 disableSound()。</li>
  * </ul>
- * </p>
  */
 public class IosNotification extends PlatformNotification {
     public static final String NOTIFICATION_IOS = "ios";

src/main/java/cn/jpush/api/report/ReportClient.java

@@ -28,6 +28,9 @@ public ReportClient(String masterSecret, String appKey) {
 
     /**
      * This will be removed in the future. Please use ClientConfig{@link cn.jpush.api.common.ClientConfig#setMaxRetryTimes} instead of this constructor.
+     * @param masterSecret  API access secret of the appKey.
+     * @param appKey The KEY of one application on JPush.
+     * @param maxRetryTimes max retry times.
      *
      */
     @Deprecated
@@ -37,6 +40,10 @@ public ReportClient(String masterSecret, String appKey, int maxRetryTimes) {
 
     /**
      * This will be removed in the future. Please use ClientConfig{@link cn.jpush.api.common.ClientConfig#setMaxRetryTimes} instead of this constructor.
+     * @param masterSecret  API access secret of the appKey.
+     * @param appKey The KEY of one application on JPush.
+     * @param maxRetryTimes max retry times
+     * @param proxy The max retry times.
      *
      */
     @Deprecated

src/main/java/cn/jpush/api/schedule/ScheduleClient.java

@@ -33,6 +33,9 @@ public ScheduleClient(String masterSecret, String appkey) {
 
     /**
      * This will be removed in the future. Please use ClientConfig{@link cn.jpush.api.common.ClientConfig#setMaxRetryTimes} instead of this constructor.
+     * @param masterSecret API access secret of the appKey.
+     * @param appKey The KEY of one application on JPush.
+     * @param maxRetryTimes The mas retry times.
      *
      */
     @Deprecated
@@ -42,7 +45,10 @@ public ScheduleClient(String masterSecret, String appKey, int maxRetryTimes) {
 
     /**
      * This will be removed in the future. Please use ClientConfig{@link cn.jpush.api.common.ClientConfig#setMaxRetryTimes} instead of this constructor.
-     *
+     * @param masterSecret API access secret of the appKey.
+     * @param appKey The KEY of one application on JPush.
+     * @param maxRetryTimes The mas retry times.
+     * @param proxy The proxy, if there is no proxy, should be null.
      */
     @Deprecated
     public ScheduleClient(String masterSecret, String appKey, int maxRetryTimes, HttpProxy proxy) {

src/main/java/cn/jpush/api/utils/Preconditions.java

@@ -73,7 +73,7 @@
  *
  * <p>Projects which use {@code com.google.common} should generally avoid the use of {@link
  * java.util.Objects#requireNonNull(Object)}. Instead, use whichever of {@link
- * #checkNotNull(Object)} or {@link Verify#verifyNotNull(Object)} is appropriate to the situation.
+ * #checkNotNull(Object)} is appropriate to the situation.
  * (The same goes for the message-accepting overloads.)
  *
  * <h3>Only {@code %s} is supported</h3>