Merge pull request #233 from jwfing/master

change double value for gson number deserializer, and change exceptio…

Author: jwfing

CHANGELOG.md

@@ -2,6 +2,18 @@
 
 Following is change logs for recently release versions, you can refer to [releases page](https://github.com/leancloud/java-unified-sdk/releases) for more details.
 
+## 8.2.14 release
+
+#### Break changes
+- None
+
+#### New features
+- None
+
+#### Optimization and fixed bugs
+- fixed: change number to double within gson;
+- optimized: not throw NPE for file uploading while local cache is disabled;
+
 ## 8.2.13 release
 
 #### Break changes

android-sdk/build.gradle

@@ -30,7 +30,7 @@ allprojects {
 }
 
 ext {
-    sdkVersion = "8.2.13"
+    sdkVersion = "8.2.14"
     supportLibVersion = "26.1.0"
     converterVersion = "2.1.0"
     rxandroidVersion = "2.1.1"

android-sdk/gradle.properties

@@ -15,7 +15,7 @@ org.gradle.jvmargs=-Xmx1536m
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-VERSION_NAME=8.2.13
+VERSION_NAME=8.2.14
 VERSION_CODE=2695
 GROUP=cn.leancloud
 

core/src/main/java/cn/leancloud/LCFile.java

@@ -568,7 +568,7 @@ public LCFile apply(@NonNull FileUploadToken fileUploadToken) throws Exception {
                   try {
                     PaasClient.getStorageClient().fileCallback(asAuthenticatedUser, completeResult);
                     if (null != exception) {
-                      logger.w("failed to invoke fileCallback. cause:", exception);
+                      logger.w("failed to upload file. cause: " + exception.getMessage());
                       throw exception;
                     } else {
                       return LCFile.this;
@@ -720,7 +720,7 @@ public InputStream getDataStream() throws Exception {
       filePath = localPath;
     } else if (!StringUtil.isEmpty(cachePath)) {
       filePath = cachePath;
-    } else if (!StringUtil.isEmpty(getUrl())) {
+    } else if (!FileCache.getIntance().isDisableLocalCache() && !StringUtil.isEmpty(getUrl())) {
       File cacheFile = FileCache.getIntance().getCacheFile(getUrl());
       if (null == cacheFile || !cacheFile.exists()) {
         FileDownloader downloader = new FileDownloader();

core/src/main/java/cn/leancloud/cache/FileCache.java

@@ -26,6 +26,9 @@ public String saveLocalFile(String name, File localFile) {
 
   @Override
   public File getCacheFile(String url) {
+    if (isDisableLocalCache()) {
+      return null;
+    }
     String urlMd5 = MDFive.computeMD5(url.getBytes());
     return super.getCacheFile(urlMd5);
   }

core/src/main/java/cn/leancloud/cache/LocalStorage.java

@@ -86,6 +86,9 @@ public File getCacheFile(String key) {
     return new File(this.baseDir + key);
   }
 
+  public boolean isDisableLocalCache() {
+    return disableLocalCache;
+  }
   public InputStream getInputStreamFromFile(File file) throws FileNotFoundException {
     if (disableLocalCache) {
       return null;

core/src/main/java/cn/leancloud/gson/NumberDeserializerDoubleAsIntFix.java

@@ -18,7 +18,7 @@ public static Object parsePrecisionNumber(Number num) {
     // and return any type you want
     // this solution will transform 3.0 float to long values
     if (Math.floor(num.doubleValue()) != Math.ceil(num.doubleValue())) {
-      return num;
+      return num.doubleValue();
     }
     double doubleValue = Math.ceil(num.doubleValue());
     if (doubleValue == num.intValue()) {

core/src/main/java/cn/leancloud/upload/QiniuSlicingUploader.java

@@ -54,6 +54,10 @@ public void onProgress(int progress) {
 
     try {
       is = this.avFile.getDataStream();
+      if (null == is) {
+        return new LCException(LCException.FILE_UPLOAD_FAILURE,
+                "failed to upload file to qiniu bcz current file has not data stream.");
+      }
       LOGGER.d("begin to upload qiniu. chunkSize=" + uploadChunkSize + ", blockCount=" + blockCount + ", is=" + is);
       // loop for read, upload block to qiniu.
       for (int i = 0; i< blockCount; i++) {

core/src/test/java/cn/leancloud/LCFileTest.java

@@ -1,5 +1,6 @@
 package cn.leancloud;
 
+import cn.leancloud.core.AppConfiguration;
 import cn.leancloud.core.LeanCloud;
 import cn.leancloud.types.LCNull;
 import cn.leancloud.utils.StringUtil;
@@ -172,6 +173,7 @@ public void onComplete() {
   }
 
   public void testBase64Data() throws Exception {
+    AppConfiguration.setEnableLocalCache(false);
     String contents = StringUtil.getRandomString(640);
     LCFile file = new LCFile("testfilename", contents.getBytes());
 //    Map<String, Object> metaData = new HashMap<>();
@@ -202,6 +204,7 @@ public void onComplete() {
       }
     });
     latch.await();
+    AppConfiguration.setEnableLocalCache(true);
     assertTrue(file.getObjectId().length() > 0);
   }
 

core/src/test/java/cn/leancloud/json/GsonCommonTest.java

@@ -9,6 +9,7 @@
 import cn.leancloud.sms.LCCaptchaDigest;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.google.gson.JsonElement;
 import com.google.gson.reflect.TypeToken;
 import junit.framework.TestCase;
 
@@ -149,6 +150,26 @@ public void testDoubleAndLong() {
     System.out.println(responses.toString());
   }
 
+  public void testObjectDeserialization() {
+    String input = "{\"result\":{\"objectId\":\"637233023f103a0cf936caf8\",\"billId\":\"202211142022269827\"," +
+            "\"state\":-1,\"size\":5,\"price\":10.6,\"payPrice\":0,\"isPaid\":false," +
+            "\"createdAt\":\"2022-11-14T12:22:26.122Z\",\"isCommented\":false,\"purpose\":\"用于小说配音\"," +
+            "\"user\":{\"objectId\":\"5e5462617796d9006a09c795\",\"name\":\"方冶（全天接单主页加微）\"," +
+            "\"iconUrl\":\"http://file2.i7play.com/j6ptbHjPSAaBurvOYMPRgevtTzbwXYNF/CROP_20221112164622689.jpg\"," +
+            "\"id\":2230377,\"wx\":\"ZmZxy-18\",\"qq\":\"\",\"isVip\":true,\"is18\":true},\"isBu\":false}} ";
+    Type ResponseMap = new TypeToken<Map<String, Object>>() {}.getType();
+    Map<String, Object> result = GsonWrapper.getGsonInstance().fromJson(input, ResponseMap);
+    Object data = result.get("result");
+    JsonElement jsonElement = GsonWrapper.getGsonInstance().toJsonTree(data);
+    System.out.println(jsonElement);
+    if (data instanceof Map) {
+      Map<String,Object> dataMap = (Map<String,Object>)data;
+      Object priceObj = dataMap.get("price");
+      System.out.println(priceObj);
+    }
+    System.out.println(result.toString());
+  }
+
   public void testNumberParser() {
     Number numbers[] = {3, 4.5, 5.0, -0, 0.0, 0.0002, -0.0002, -5, -6.5};
     for (Number num: numbers) {