From 169174c17bc5f1dfd306f3bddd2e8b2e784f655b Mon Sep 17 00:00:00 2001 From: Adi Novriansyah Date: Tue, 11 Jul 2023 17:03:32 +0700 Subject: [PATCH 1/2] Add capabilities in batch client get enrichment activities to use Enrichment flags --- build.gradle | 2 +- src/main/java/io/getstream/client/BatchClient.java | 8 +++++++- src/main/java/io/getstream/core/StreamBatch.java | 4 +++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 38ff1f94..e5d5edcd 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ plugins { } group 'io.getstream.client' -version = '3.6.2' +version = '3.7.0' description = 'Stream Feeds official Java SDK' repositories { 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> getEnrichedActivitiesByID( public CompletableFuture> getEnrichedActivitiesByID(String... activityIDs) throws StreamException { + return getEnrichedActivitiesByID(DefaultOptions.DEFAULT_ENRICHMENT_FLAGS, activityIDs); + } + + public CompletableFuture> 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> 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> getActivitiesByID(Token token, String.. } public CompletableFuture> 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> getEnrichedActivitiesByID( url, key, token, + flags, new CustomQueryParameter("ids", Joiner.on(",").join(activityIDs)))) .thenApply( response -> { From c6d8964be2f938743fbd172ce4412a7f367f26b3 Mon Sep 17 00:00:00 2001 From: Tiago Farto Date: Wed, 12 Jul 2023 08:55:36 +0100 Subject: [PATCH 2/2] [ci] disable commitlint --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8f478592..8952e0c2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,8 +16,8 @@ jobs: with: fetch-depth: 0 - - name: Commit message lint - uses: wagoid/commitlint-github-action@v4 + #- name: Commit message lint + # uses: wagoid/commitlint-github-action@v4 - name: Restore cache uses: actions/cache@v3