Merge pull request #156 from premacck/develop

Exposing forced argument from BatchController
flipkart-incubator · Jul 5, 2023 · 69cfd22 · 69cfd22
2 parents 03f5762 + 0c3e1b3
commit 69cfd22
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 10 deletions.
diff --git a/batching-core/build.gradle b/batching-core/build.gradle
@@ -14,7 +14,7 @@ android {
         minSdkVersion 14
         targetSdkVersion 28
         versionCode 1
-        versionName "1.3.11"
+        versionName "1.3.12"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -39,4 +39,4 @@ buildscript {
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath "net.ltgt.gradle:gradle-errorprone-plugin:0.0.12"
     }
-}
+}
diff --git a/batching-gson/build.gradle b/batching-gson/build.gradle
@@ -32,7 +32,7 @@ android {
         minSdkVersion 14
         targetSdkVersion 28
         versionCode 1
-        versionName "1.3.11"
+        versionName "1.3.12"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -43,4 +43,4 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-}
+}
diff --git a/batching/build.gradle b/batching/build.gradle
@@ -38,7 +38,7 @@ android {
         minSdkVersion 14
         targetSdkVersion 28
         versionCode 1
-        versionName "1.3.11"
+        versionName "1.3.12"
     }
 
     buildTypes {
@@ -78,4 +78,4 @@ buildscript {
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath "net.ltgt.gradle:gradle-errorprone-plugin:0.0.12"
     }
-}
+}
diff --git a/batching/src/main/java/com/flipkart/batching/BatchController.java b/batching/src/main/java/com/flipkart/batching/BatchController.java
@@ -44,9 +44,17 @@ public interface BatchController<E extends Data, T extends Batch<E>> {
      *
      * @param dataCollection collection of {@link Data}
      */
-
     void addToBatch(Collection<E> dataCollection);
 
+    /**
+     * This method takes {@link Data} type {@link Collection} and a boolean as parameter and notifies the provided
+     * {@link BatchingStrategy} about the added data.
+     *
+     * @param dataCollection collection of {@link Data}
+     * @param forced whether to forcefully trigger the event call
+     */
+    void addToBatch(Collection<E> dataCollection, boolean forced);
+
     /**
      * This method returns the initialized {@link Handler}.
      *

diff --git a/batching/src/main/java/com/flipkart/batching/BatchManager.java b/batching/src/main/java/com/flipkart/batching/BatchManager.java
@@ -80,13 +80,18 @@ public void run() {
 
     @Override
     public void addToBatch(final Collection<E> dataCollection) {
+        addToBatch(dataCollection, false);
+    }
+
+    @Override
+    public void addToBatch(final Collection<E> dataCollection, final boolean forced) {
         handler.post(new Runnable() {
             @Override
             public void run() {
                 assignEventIds(dataCollection);
                 if (batchingStrategy.isInitialized()) {
                     batchingStrategy.onDataPushed(dataCollection);
-                    batchingStrategy.flush(false);
+                    batchingStrategy.flush(forced);
                 } else {
                     throw new IllegalAccessError("BatchingStrategy is not initialized");
                 }
@@ -202,4 +207,4 @@ public BatchManager<E, T> build(Context context) {
         }
 
     }
-}
+}
diff --git a/batching/src/main/java/com/flipkart/batching/TagBatchManager.java b/batching/src/main/java/com/flipkart/batching/TagBatchManager.java
@@ -87,13 +87,18 @@ void initialize(TagBatchManager<E, T> tagBatchManager, Context context, OnBatchR
 
     @Override
     public void addToBatch(final Collection<E> dataCollection) {
+        addToBatch(dataCollection, false);
+    }
+
+    @Override
+    public void addToBatch(final Collection<E> dataCollection, final boolean forced) {
         handler.post(new Runnable() {
             @Override
             public void run() {
                 assignEventIds(dataCollection);
                 if (tagBatchingStrategy.isInitialized()) {
                     tagBatchingStrategy.onDataPushed((Collection<TagData>) dataCollection);
-                    tagBatchingStrategy.flush(false);
+                    tagBatchingStrategy.flush(forced);
                 } else {
                     throw new IllegalAccessError("BatchingStrategy is not initialized");
                 }