Merge pull request #126 from jwfing/master

jwfing · web-flow · commit 3759b2f77733 · 2020-06-23T13:32:25.000+08:00
support disable Hook
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,17 @@
 
 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.
 
+## 6.5.8 release
+
+#### Break changes
+- None
+
+#### New features
+- support disable hook for leanengine.
+
+#### Optimization and fixed bugs
+- fixed: AddUniqueOperation#apply error for AbstractList.
+
 ## 6.5.7 release
 
 #### Break changes
diff --git a/android-sdk/build.gradle b/android-sdk/build.gradle
@@ -30,7 +30,7 @@ allprojects {
 }
 
 ext {
-    sdkVersion = "6.5.7"
+    sdkVersion = "6.5.8"
     supportLibVersion = "26.1.0"
     converterVersion = "2.1.0"
     rxandroidVersion = "2.1.1"
diff --git a/android-sdk/gradle.properties b/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=6.5.7
+VERSION_NAME=6.5.8
 VERSION_CODE=2695
 GROUP=cn.leancloud
 
diff --git a/core/src/main/java/cn/leancloud/AVObject.java b/core/src/main/java/cn/leancloud/AVObject.java
@@ -40,6 +40,8 @@ public class AVObject {
 
   public static final String KEY_CLASSNAME = "className";
 
+  public static final String KEY_IGNORE_HOOKS = "__ignore_hooks";
+
   private static final String INTERNAL_PATTERN = "^[\\da-z][\\d-a-z]*$";
   private static final Set<String> RESERVED_ATTRS = new HashSet<String>(
           Arrays.asList(KEY_CREATED_AT, KEY_UPDATED_AT, KEY_OBJECT_ID, KEY_ACL));
@@ -60,6 +62,13 @@ public class AVObject {
   private volatile boolean fetchWhenSave = false;
   protected volatile boolean totallyOverwrite = false;
 
+  public enum Hook {
+    beforeSave, afterSave, beforeUpdate, afterUpdate, beforeDelete, afterDelete,
+  }
+
+  @JSONField(serialize = false)
+  private Set<Hook> ignoreHooks = new TreeSet<Hook>();
+
   /**
    * Default constructor.
    */
@@ -712,6 +721,9 @@ protected JSONObject generateChangedParam() {
       tmp.remove(KEY_CREATED_AT);
       tmp.remove(KEY_UPDATED_AT);
       tmp.remove(KEY_OBJECT_ID);
+      if (ignoreHooks.size() > 0) {
+        tmp.put(KEY_IGNORE_HOOKS, ignoreHooks);
+      }
       return new JSONObject(tmp);
     }
 
@@ -732,6 +744,10 @@ protected JSONObject generateChangedParam() {
       }
     }
 
+    if (ignoreHooks.size() > 0) {
+      params.put(KEY_IGNORE_HOOKS, ignoreHooks);
+    }
+
     if (!needBatchMode()) {
       return new JSONObject(params);
     }
@@ -1150,10 +1166,14 @@ public void onComplete() {
    * @return observable instance.
    */
   public Observable<AVNull> deleteInBackground() {
+    Map<String, Object> ignoreParam = new HashMap<>();
+    if (ignoreHooks.size() > 0) {
+      ignoreParam.put(KEY_IGNORE_HOOKS, ignoreHooks);
+    }
     if (totallyOverwrite) {
-      return PaasClient.getStorageClient().deleteWholeObject(this.endpointClassName, getObjectId());
+      return PaasClient.getStorageClient().deleteWholeObject(this.endpointClassName, getObjectId(), ignoreParam);
     }
-    return PaasClient.getStorageClient().deleteObject(this.className, getObjectId());
+    return PaasClient.getStorageClient().deleteObject(this.className, getObjectId(), ignoreParam);
   }
 
   /**
@@ -1182,6 +1202,7 @@ public static Observable<AVNull> deleteAllInBackground(Collection<? extends AVOb
       return Observable.just(AVNull.getINSTANCE());
     }
     String className = null;
+    Map<String, Object> ignoreParams = new HashMap<>();
     StringBuilder sb = new StringBuilder();
     for (AVObject o : objects) {
       if (StringUtil.isEmpty(o.getObjectId()) || StringUtil.isEmpty(o.getClassName())) {
@@ -1196,7 +1217,7 @@ public static Observable<AVNull> deleteAllInBackground(Collection<? extends AVOb
         return Observable.error(new IllegalArgumentException("The objects class name must be the same."));
       }
     }
-    return PaasClient.getStorageClient().deleteObject(className, sb.toString());
+    return PaasClient.getStorageClient().deleteObject(className, sb.toString(), ignoreParams);
   }
 
   /**
@@ -1536,6 +1557,28 @@ public static <T extends AVObject> T createWithoutData(Class<T> clazz, String ob
     }
   }
 
+  /**
+   * disable beforeXXX Hooks
+   */
+  public void disableBeforeHook() {
+    Collections.addAll(ignoreHooks, Hook.beforeSave, Hook.beforeUpdate, Hook.beforeDelete);
+  }
+
+  /**
+   * disable afterXXX Hooks
+   */
+  public void disableAfterHook() {
+    Collections.addAll(ignoreHooks, Hook.afterSave, Hook.afterUpdate, Hook.afterDelete);
+  }
+
+  /**
+   * ignore specified Hook
+   * @param hook target Hook.
+   */
+  public void ignoreHook(Hook hook) {
+    ignoreHooks.add(hook);
+  }
+
   protected static <T extends AVObject> T cast(AVObject object, Class<T> clazz) throws Exception {
     if (clazz.getClass().isAssignableFrom(object.getClass())) {
       return (T) object;
@@ -1570,7 +1613,6 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-
     return Objects.hash(getClassName(), getServerData(), operations, acl, isFetchWhenSave());
   }
 }
diff --git a/core/src/main/java/cn/leancloud/core/AVOSCloud.java b/core/src/main/java/cn/leancloud/core/AVOSCloud.java
@@ -183,9 +183,16 @@ public static String getApplicationKey() {
     return applicationKey;
   }
 
+  public static String getHookKey() {
+    return hookKey;
+  }
+  public static void setHookKey(String key) {
+    hookKey = key;
+  }
   private static REGION defaultRegion = REGION.NorthChina;
   private static String applicationId = "";
   private static String applicationKey = "";
+  private static String hookKey = "";
   private static volatile AVLogger.Level logLevel = AVLogger.Level.INFO;
   static boolean printAllHeaders = false;
   private static boolean enableCircularReferenceDetect = false;
diff --git a/core/src/main/java/cn/leancloud/core/RequestPaddingInterceptor.java b/core/src/main/java/cn/leancloud/core/RequestPaddingInterceptor.java
@@ -2,6 +2,7 @@
 
 import cn.leancloud.AVCloud;
 import cn.leancloud.AVUser;
+import cn.leancloud.utils.StringUtil;
 import okhttp3.Interceptor;
 import okhttp3.Request;
 import okhttp3.Response;
@@ -12,6 +13,7 @@ public class RequestPaddingInterceptor implements Interceptor {
   public static final String HEADER_KEY_LC_SESSIONTOKEN = "X-LC-Session";
   public static final String HEADER_KEY_LC_APPID = "X-LC-Id";
   public static final String HEADER_KEY_LC_APPKEY = "X-LC-Key";
+  public static final String HEADER_KEY_LC_HOOKKEY = "X-LC-Hook-Key";
   private static final String HEADER_KEY_LC_PROD_MODE = "X-LC-Prod";
   public static final String HEADER_KEY_LC_SIGN = "X-LC-Sign";
   private static final String HEADER_KEY_ACCEPT = "Accept";
@@ -28,15 +30,20 @@ public static void changeRequestSignature(RequestSignature signature) {
   public Response intercept(Interceptor.Chain chain) throws IOException {
     Request originalRequest = chain.request();
     String sessionToken = null == AVUser.getCurrentUser()? "" : AVUser.getCurrentUser().getSessionToken();
-    Request newRequest = originalRequest.newBuilder()
+
+    okhttp3.Request.Builder builder = originalRequest.newBuilder()
             .header(HEADER_KEY_LC_PROD_MODE, AVCloud.isProductionMode()?"1":"0")
             .header(HEADER_KEY_LC_APPID, AVOSCloud.getApplicationId())
             .header(HEADER_KEY_LC_SIGN, requestSignature.generateSign())
             .header(HEADER_KEY_ACCEPT, DEFAULT_CONTENT_TYPE)
             .header(HEADER_KEY_CONTENT_TYPE, DEFAULT_CONTENT_TYPE)
             .header(HEADER_KEY_USER_AGENT, AppConfiguration.getUserAgent())
-            .header(HEADER_KEY_LC_SESSIONTOKEN, null == sessionToken ? "":sessionToken)
-            .build();
+            .header(HEADER_KEY_LC_SESSIONTOKEN, null == sessionToken ? "":sessionToken);
+    if (!StringUtil.isEmpty(AVOSCloud.getHookKey())) {
+      builder = builder.header(HEADER_KEY_LC_HOOKKEY, AVOSCloud.getHookKey());
+    }
+
+    Request newRequest = builder.build();
     return chain.proceed(newRequest);
   }
 }
diff --git a/core/src/main/java/cn/leancloud/core/StorageClient.java b/core/src/main/java/cn/leancloud/core/StorageClient.java
@@ -216,8 +216,8 @@ public Integer apply(AVQueryResult o) throws Exception {
     });
   }
 
-  public Observable<AVNull> deleteObject(final String className, String objectId) {
-    return wrapObservable(apiService.deleteObject(className, objectId));
+  public Observable<AVNull> deleteObject(final String className, String objectId, Map<String, Object> param) {
+    return wrapObservable(apiService.deleteObject(className, objectId, param));
   }
 
   public Observable<? extends AVObject> createObject(final String className, JSONObject data, boolean fetchFlag,
@@ -273,8 +273,8 @@ public Observable<AVObject> getWholeObject(final String endpointClass, String ob
     return wrapObservable(apiService.getWholeObject(endpointClass, objectId, includeKeys));
   }
 
-  public Observable<AVNull> deleteWholeObject(final String endpointClass, String objectId) {
-    return wrapObservable(apiService.deleteWholeObject(endpointClass, objectId));
+  public Observable<AVNull> deleteWholeObject(final String endpointClass, String objectId, Map<String, Object> param) {
+    return wrapObservable(apiService.deleteWholeObject(endpointClass, objectId, param));
   }
 
   public Observable<AVFile> fetchFile(String objectId) {
diff --git a/core/src/main/java/cn/leancloud/ops/AddUniqueOperation.java b/core/src/main/java/cn/leancloud/ops/AddUniqueOperation.java
@@ -2,6 +2,7 @@
 
 import com.alibaba.fastjson.JSONArray;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -16,25 +17,29 @@ public AddUniqueOperation(String key, Object value) {
   @Override
   public Object apply(Object obj) {
     Object result = super.apply(obj);
+    List<Object> listResult = null;
     if (null != result && (result instanceof List || result instanceof JSONArray)) {
       if (result instanceof List) {
         Object[] objects = ((List)result).toArray();
-        ((List)result).clear();
+        listResult = new ArrayList<>();
         for (Object o : objects) {
-          if (!((List)result).contains(o)) {
-            ((List)result).add(o);
+          if (listResult.contains(o)) {
+            continue;
           }
+          listResult.add(o);
         }
       } else {
         Object[] objects = ((JSONArray)result).toArray();
         ((JSONArray)result).clear();
+        listResult = new ArrayList<>();
         for (Object o : objects) {
-          if (!((JSONArray)result).contains(o)) {
-            ((JSONArray)result).add(o);
+          if (listResult.contains(o)) {
+            continue;
           }
+          listResult.add(o);
         }
       }
     }
-    return result;
+    return listResult;
   }
 }
diff --git a/core/src/main/java/cn/leancloud/service/APIService.java b/core/src/main/java/cn/leancloud/service/APIService.java
@@ -48,8 +48,10 @@ Observable<AVObject> updateObject(@Path("className") String className, @Path("ob
                                     @Body JSONObject object, @Query("fetchWhenSave") boolean fetchFlag,
                                     @Query("where") JSONObject where);
 
-  @DELETE("/1.1/classes/{className}/{objectId}")
-  Observable<AVNull> deleteObject(@Path("className") String className, @Path("objectId") String objectId);
+//  @DELETEWITHBODY("/1.1/classes/{className}/{objectId}")
+  @HTTP(method = "DELETE", path = "/1.1/classes/{className}/{objectId}", hasBody = true)
+  Observable<AVNull> deleteObject(@Path("className") String className, @Path("objectId") String objectId,
+                                  @Body Map<String, Object> param);
 
   @POST("/1.1/batch")
   Observable<JSONArray> batchCreate(@Body JSONObject param);
@@ -69,8 +71,10 @@ Observable<AVObject> saveWholeObject(@Path("endpointClass") String endpointClass
   @GET("/1.1/{endpointClass}/{objectId}")
   Observable<AVObject> getWholeObject(@Path("endpointClass") String endpointClass, @Path("objectId") String objectId,
                                       @Query("include") String includeKeys);
-  @DELETE("/1.1/{endpointClass}/{objectId}")
-  Observable<AVNull> deleteWholeObject(@Path("endpointClass") String endpointClass, @Path("objectId") String objectId);
+//  @DELETE("/1.1/{endpointClass}/{objectId}")
+  @HTTP(method = "DELETE", path = "/1.1/{endpointClass}/{objectId}", hasBody = true)
+  Observable<AVNull> deleteWholeObject(@Path("endpointClass") String endpointClass, @Path("objectId") String objectId,
+                                       @Body Map<String, Object> param);
 
   /**
    * request format:
diff --git a/core/src/test/java/cn/leancloud/AVCloudFunctionTest.java b/core/src/test/java/cn/leancloud/AVCloudFunctionTest.java
@@ -1,6 +1,5 @@
 package cn.leancloud;
 
-import com.alibaba.fastjson.JSONObject;
 import io.reactivex.Observable;
 import io.reactivex.Observer;
 import io.reactivex.disposables.Disposable;
diff --git a/core/src/test/java/cn/leancloud/AVObjectHookTest.java b/core/src/test/java/cn/leancloud/AVObjectHookTest.java
diff --git a/leanengine/src/main/java/cn/leancloud/LeanEngine.java b/leanengine/src/main/java/cn/leancloud/LeanEngine.java

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ allprojects {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`ext {`
`33`		`- sdkVersion = "6.5.7"`
	`33`	`+ sdkVersion = "6.5.8"`
`34`	`34`	`supportLibVersion = "26.1.0"`
`35`	`35`	`converterVersion = "2.1.0"`
`36`	`36`	`rxandroidVersion = "2.1.1"`
Original file line number	Diff line number	Diff line change
`@@ -216,8 +216,8 @@ public Integer apply(AVQueryResult o) throws Exception {`
`216`	`216`	`});`
`217`	`217`	`}`
`218`	`218`
`219`		`- public Observable<AVNull> deleteObject(final String className, String objectId) {`
`220`		`- return wrapObservable(apiService.deleteObject(className, objectId));`
	`219`	`+ public Observable<AVNull> deleteObject(final String className, String objectId, Map<String, Object> param) {`
	`220`	`+ return wrapObservable(apiService.deleteObject(className, objectId, param));`
`221`	`221`	`}`
`222`	`222`
`223`	`223`	`public Observable<? extends AVObject> createObject(final String className, JSONObject data, boolean fetchFlag,`
`@@ -273,8 +273,8 @@ public Observable<AVObject> getWholeObject(final String endpointClass, String ob`
`273`	`273`	`return wrapObservable(apiService.getWholeObject(endpointClass, objectId, includeKeys));`
`274`	`274`	`}`
`275`	`275`
`276`		`- public Observable<AVNull> deleteWholeObject(final String endpointClass, String objectId) {`
`277`		`- return wrapObservable(apiService.deleteWholeObject(endpointClass, objectId));`
	`276`	`+ public Observable<AVNull> deleteWholeObject(final String endpointClass, String objectId, Map<String, Object> param) {`
	`277`	`+ return wrapObservable(apiService.deleteWholeObject(endpointClass, objectId, param));`
`278`	`278`	`}`
`279`	`279`
`280`	`280`	`public Observable<AVFile> fetchFile(String objectId) {`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`import com.alibaba.fastjson.JSONArray;`
`4`	`4`
	`5`	`+import java.util.ArrayList;`
`5`	`6`	`import java.util.List;`
`6`	`7`
`7`	`8`	`/**`
`@@ -16,25 +17,29 @@ public AddUniqueOperation(String key, Object value) {`
`16`	`17`	`@Override`
`17`	`18`	`public Object apply(Object obj) {`
`18`	`19`	`Object result = super.apply(obj);`
	`20`	`+ List<Object> listResult = null;`
`19`	`21`	`if (null != result && (result instanceof List \|\| result instanceof JSONArray)) {`
`20`	`22`	`if (result instanceof List) {`
`21`	`23`	`Object[] objects = ((List)result).toArray();`
`22`		`- ((List)result).clear();`
	`24`	`+ listResult = new ArrayList<>();`
`23`	`25`	`for (Object o : objects) {`
`24`		`- if (!((List)result).contains(o)) {`
`25`		`- ((List)result).add(o);`
	`26`	`+ if (listResult.contains(o)) {`
	`27`	`+ continue;`
`26`	`28`	`}`
	`29`	`+ listResult.add(o);`
`27`	`30`	`}`
`28`	`31`	`} else {`
`29`	`32`	`Object[] objects = ((JSONArray)result).toArray();`
`30`	`33`	`((JSONArray)result).clear();`
	`34`	`+ listResult = new ArrayList<>();`
`31`	`35`	`for (Object o : objects) {`
`32`		`- if (!((JSONArray)result).contains(o)) {`
`33`		`- ((JSONArray)result).add(o);`
	`36`	`+ if (listResult.contains(o)) {`
	`37`	`+ continue;`
`34`	`38`	`}`
	`39`	`+ listResult.add(o);`
`35`	`40`	`}`
`36`	`41`	`}`
`37`	`42`	`}`
`38`		`- return result;`
	`43`	`+ return listResult;`
`39`	`44`	`}`
`40`	`45`	`}`