From cfcc86ae3b62fd16cbf733912e7b484a91bb7d8b Mon Sep 17 00:00:00 2001
From: Adi Novriansyah <adi.novriansyah@nanovest.io>
Date: Wed, 12 Jul 2023 15:44:28 +0700
Subject: [PATCH 1/2] feat: add capability in batch client to get enrichment
 activities to use enrichment flags

---
 src/main/java/io/getstream/client/BatchClient.java | 8 +++++++-
 src/main/java/io/getstream/core/StreamBatch.java   | 4 +++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/getstream/client/BatchClient.java b/src/main/java/io/getstream/client/BatchClient.java
index 62a6def0..28524089 100644
--- a/src/main/java/io/getstream/client/BatchClient.java
+++ b/src/main/java/io/getstream/client/BatchClient.java
@@ -8,6 +8,7 @@
 import io.getstream.core.exceptions.StreamException;
 import io.getstream.core.http.Token;
 import io.getstream.core.models.*;
+import io.getstream.core.options.EnrichmentFlags;
 import io.getstream.core.utils.DefaultOptions;
 import java.util.List;
 import java8.util.J8Arrays;
@@ -91,8 +92,13 @@ public CompletableFuture<List<EnrichedActivity>> getEnrichedActivitiesByID(
 
   public CompletableFuture<List<EnrichedActivity>> getEnrichedActivitiesByID(String... activityIDs)
       throws StreamException {
+    return getEnrichedActivitiesByID(DefaultOptions.DEFAULT_ENRICHMENT_FLAGS, activityIDs);
+  }
+
+  public CompletableFuture<List<EnrichedActivity>> getEnrichedActivitiesByID(
+          EnrichmentFlags flags, String... activityIDs) throws StreamException {
     final Token token = buildActivityToken(secret, TokenAction.READ);
-    return batch.getEnrichedActivitiesByID(token, activityIDs);
+    return batch.getEnrichedActivitiesByID(token, flags, activityIDs);
   }
 
   public CompletableFuture<List<Activity>> getActivitiesByForeignID(
diff --git a/src/main/java/io/getstream/core/StreamBatch.java b/src/main/java/io/getstream/core/StreamBatch.java
index 1abf5535..da8c5aaf 100644
--- a/src/main/java/io/getstream/core/StreamBatch.java
+++ b/src/main/java/io/getstream/core/StreamBatch.java
@@ -14,6 +14,7 @@
 import io.getstream.core.http.Token;
 import io.getstream.core.models.*;
 import io.getstream.core.options.CustomQueryParameter;
+import io.getstream.core.options.EnrichmentFlags;
 import io.getstream.core.options.RequestOption;
 import java.io.IOException;
 import java.net.MalformedURLException;
@@ -151,7 +152,7 @@ public CompletableFuture<List<Activity>> getActivitiesByID(Token token, String..
   }
 
   public CompletableFuture<List<EnrichedActivity>> getEnrichedActivitiesByID(
-      Token token, String... activityIDs) throws StreamException {
+          Token token, EnrichmentFlags flags, String... activityIDs) throws StreamException {
     checkNotNull(activityIDs, "No activities to get");
     checkArgument(activityIDs.length > 0, "No activities to get");
 
@@ -163,6 +164,7 @@ public CompletableFuture<List<EnrichedActivity>> getEnrichedActivitiesByID(
                   url,
                   key,
                   token,
+                  flags,
                   new CustomQueryParameter("ids", Joiner.on(",").join(activityIDs))))
           .thenApply(
               response -> {

From dad14c7abedd6ca6d9cef7ea4c1a0133cb648e72 Mon Sep 17 00:00:00 2001
From: Adi Novriansyah <adi.novriansyah@nanovest.io>
Date: Wed, 12 Jul 2023 17:49:56 +0700
Subject: [PATCH 2/2] fix: spotless

---
 src/main/java/io/getstream/client/BatchClient.java | 2 +-
 src/main/java/io/getstream/core/StreamBatch.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/getstream/client/BatchClient.java b/src/main/java/io/getstream/client/BatchClient.java
index 28524089..e9cd30be 100644
--- a/src/main/java/io/getstream/client/BatchClient.java
+++ b/src/main/java/io/getstream/client/BatchClient.java
@@ -96,7 +96,7 @@ public CompletableFuture<List<EnrichedActivity>> getEnrichedActivitiesByID(Strin
   }
 
   public CompletableFuture<List<EnrichedActivity>> getEnrichedActivitiesByID(
-          EnrichmentFlags flags, String... activityIDs) throws StreamException {
+      EnrichmentFlags flags, String... activityIDs) throws StreamException {
     final Token token = buildActivityToken(secret, TokenAction.READ);
     return batch.getEnrichedActivitiesByID(token, flags, activityIDs);
   }
diff --git a/src/main/java/io/getstream/core/StreamBatch.java b/src/main/java/io/getstream/core/StreamBatch.java
index da8c5aaf..e171b572 100644
--- a/src/main/java/io/getstream/core/StreamBatch.java
+++ b/src/main/java/io/getstream/core/StreamBatch.java
@@ -152,7 +152,7 @@ public CompletableFuture<List<Activity>> getActivitiesByID(Token token, String..
   }
 
   public CompletableFuture<List<EnrichedActivity>> getEnrichedActivitiesByID(
-          Token token, EnrichmentFlags flags, String... activityIDs) throws StreamException {
+      Token token, EnrichmentFlags flags, String... activityIDs) throws StreamException {
     checkNotNull(activityIDs, "No activities to get");
     checkArgument(activityIDs.length > 0, "No activities to get");