Release 3.4.0

Author: xuchang

SensorsAnalyticsSDK/pom.xml

@@ -15,7 +15,7 @@
     <groupId>com.sensorsdata.analytics.javasdk</groupId>
     <name>SensorsAnalyticsSDK</name>
     <artifactId>SensorsAnalyticsSDK</artifactId>
-    <version>3.3.1</version>
+    <version>3.4.0</version>
     <description>The official Java SDK of Sensors Analytics</description>
     <url>http://sensorsdata.cn</url>
 
@@ -149,11 +149,11 @@
             <distributionManagement>
                 <snapshotRepository>
                     <id>ossrh</id>
-                    <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+                    <url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
                 </snapshotRepository>
                 <repository>
                     <id>ossrh</id>
-                    <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+                    <url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
                 </repository>
             </distributionManagement>
             <build>

SensorsAnalyticsSDK/src/main/java/com/sensorsdata/analytics/javasdk/SensorsConst.java

@@ -15,7 +15,7 @@ private SensorsConst() {
     /**
      * 当前JDK版本号，注意要和pom文件里面的version保持一致
      */
-    public static final String SDK_VERSION = "3.3.1";
+    public static final String SDK_VERSION = "3.4.0";
     /**
      * 当前语言类型
      */

SensorsAnalyticsSDK/src/main/java/com/sensorsdata/analytics/javasdk/consumer/BatchConsumer.java

@@ -28,24 +28,33 @@ public BatchConsumer(final String serverUrl) {
     }
 
     public BatchConsumer(final String serverUrl, final int bulkSize) {
-        this(serverUrl, 3, bulkSize);
+        this(serverUrl, bulkSize, 3);
     }
 
-    public BatchConsumer(final String serverUrl, final int timeoutSec, final int bulkSize) {
-        this(serverUrl, bulkSize, timeoutSec, false);
+    public BatchConsumer(final String serverUrl, final int bulkSize, final int timeoutSec) {
+        this(serverUrl, bulkSize, false, timeoutSec);
     }
 
-    public BatchConsumer(final String serverUrl, final int bulkSize, final int timeoutSec,
-        final boolean throwException) {
-        this(serverUrl, bulkSize, timeoutSec, 0, throwException);
+    public BatchConsumer(final String serverUrl, final int bulkSize, final boolean throwException) {
+        this(serverUrl, bulkSize, throwException, 3);
+    }
+
+    public BatchConsumer(final String serverUrl, final int bulkSize, final boolean throwException,
+        final int timeoutSec) {
+        this(serverUrl, bulkSize, 0, throwException, timeoutSec);
     }
 
-    public BatchConsumer(final String serverUrl, final int bulkSize, final int timeoutSec, final int maxCacheSize,
+    public BatchConsumer(final String serverUrl, final int bulkSize, final int maxCacheSize,
         final boolean throwException) {
+        this(serverUrl, bulkSize, maxCacheSize, throwException, 3);
+    }
+
+    public BatchConsumer(final String serverUrl, final int bulkSize, final int maxCacheSize,
+        final boolean throwException, final int timeoutSec) {
         this.messageList = new LinkedList<>();
         this.httpConsumer = new HttpConsumer(serverUrl, Math.max(timeoutSec, 1));
         this.jsonMapper = SensorsAnalyticsUtil.getJsonObjectMapper();
-        this.bulkSize = Math.min(MAX_FLUSH_BULK_SIZE, bulkSize);
+        this.bulkSize = Math.min(MAX_FLUSH_BULK_SIZE, Math.max(1, bulkSize));
         if (maxCacheSize > MAX_CACHE_SIZE) {
             this.maxCacheSize = MAX_CACHE_SIZE;
         } else if (maxCacheSize > 0 && maxCacheSize < MIN_CACHE_SIZE) {

SensorsAnalyticsSDK/src/main/java/com/sensorsdata/analytics/javasdk/util/SensorsAnalyticsUtil.java

@@ -160,34 +160,34 @@ public static void assertFailedData(FailedData failedData) throws InvalidArgumen
     }
     for (int i = 0; i < failedData.getFailedData().size(); i++) {
       final Map<String, Object> dataMap = failedData.getFailedData().get(i);
-      if (!dataMap.containsKey("type") || dataMap.get("type") == null) {
+      if (verifyMapValueIsBlank(dataMap, "type")) {
         throw new InvalidArgumentException(
             String.format("The index [%d] of failed data list have not [type].", i));
       }
       final String type = String.valueOf(dataMap.get("type"));
       switch (type) {
         case ITEM_SET_ACTION_TYPE:
         case ITEM_DELETE_ACTION_TYPE:
-          if (!dataMap.containsKey("item_id") || dataMap.get("item_id") == null) {
+          if (verifyMapValueIsBlank(dataMap, "item_id")) {
             throw new InvalidArgumentException(
                 String.format("The index [%d] of failed data list have not [item_id].", i));
           }
           assertValue("item id", dataMap.get("item_id").toString());
-          if (!dataMap.containsKey("item_type") || dataMap.get("item_type") == null) {
+          if (verifyMapValueIsBlank(dataMap, "item_type")) {
             throw new InvalidArgumentException(
                 String.format("The index [%d] of failed data list have not [item_type].", i));
           }
           assertValue("item type", dataMap.get("item_type").toString());
           break;
         case TRACK_SIGN_UP_ACTION_TYPE:
-          if (!dataMap.containsKey("original_id") || dataMap.get("original_id") == null) {
+          if (verifyMapValueIsBlank(dataMap, "original_id")) {
             throw new InvalidArgumentException(
                 String.format("The index [%d] of failed data list have not [original_id].", i));
           }
           assertValue("Original Distinct Id", dataMap.get("original_id").toString());
         case BIND_ID_ACTION_TYPE:
         case UNBIND_ID_ACTION_TYPE:
-          if (!dataMap.containsKey("identities") || dataMap.get("identities") == null) {
+          if (!TRACK_SIGN_UP_ACTION_TYPE.equals(type) && verifyMapValueIsBlank(dataMap, "identities")) {
             throw new InvalidArgumentException(
                 String.format("The index [%d] of failed data list have not [identities].", i));
           }
@@ -198,12 +198,11 @@ public static void assertFailedData(FailedData failedData) throws InvalidArgumen
         case PROFILE_INCREMENT_ACTION_TYPE:
         case PROFILE_UNSET_ACTION_TYPE:
         case PROFILE_DELETE_ACTION_TYPE:
-          if (!dataMap.containsKey("distinct_id") || dataMap.get("distinct_id") == null) {
+          if (verifyMapValueIsBlank(dataMap, "distinct_id")) {
             throw new InvalidArgumentException(
                 String.format("The index [%d] of failed data list have not [distinct_id].", i));
           }
-          if (!dataMap.containsKey("_track_id") || dataMap.get("_track_id") == null ||
-              !(dataMap.get("_track_id") instanceof Integer)) {
+          if (verifyMapValueIsBlank(dataMap, "_track_id") || !(dataMap.get("_track_id") instanceof Integer)) {
             throw new InvalidArgumentException(String.format("The index [%d] of of failed data list is invalid.", i));
           }
           assertValue("Distinct Id", dataMap.get("distinct_id").toString());
@@ -254,4 +253,8 @@ public static List<Map<String, Object>> deepCopy(List<Map<String, Object>> sourc
     }
     return newList;
   }
+
+  private static boolean verifyMapValueIsBlank(Map<String, Object> map, String key) {
+    return map == null || !map.containsKey(key) || map.get(key) == null;
+  }
 }

SensorsAnalyticsSDK/src/main/test/java/com.sensorsdata.analytics.javasdk/BatchConsumerTest.java

@@ -29,7 +29,7 @@ public class BatchConsumerTest {
 
   @Before
   public void init() throws NoSuchFieldException, IllegalAccessException {
-    batchConsumer = new BatchConsumer("http://localhost:8016/sa", 1, 3, true);
+    batchConsumer = new BatchConsumer("http://localhost:8016/sa", 1, true, 3);
     Field field = batchConsumer.getClass().getDeclaredField("messageList");
     field.setAccessible(true);
     messageList = (List<Map<String, Object>>) field.get(batchConsumer);