Skip to content

feat: Add capabilities in batch client get enrichment activities to use Enrichment flags #126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

feat: Add capabilities in batch client get enrichment activities to use Enrichment flags #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
169174c
Add capabilities in batch client get enrichment activities to use Enr…
Jul 11, 2023
c6d8964
[ci] disable commitlint
xernobyl Jul 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Comment on lines +19 to +20
Copy link
Contributor

@JcMinarro JcMinarro Jul 12, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is it commented on?

Copy link
Contributor

@xernobyl xernobyl Jul 12, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That was me. I know it makes change logs prettier and all nice, but I get the idea that every time I there's a PR in a SDK there's a wrong commit message that needs to be fixed. I can revert if you disagree.


- name: Restore cache
uses: actions/cache@v3
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins {
}

group 'io.getstream.client'
version = '3.6.2'
version = '3.7.0'
Copy link
Contributor

@JcMinarro JcMinarro Jul 12, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Version shouldn't be manual update.
There is a CI job for that

description = 'Stream Feeds official Java SDK'

repositories {
Expand Down
8 changes: 7 additions & 1 deletion src/main/java/io/getstream/client/BatchClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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(
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/io/getstream/core/StreamBatch.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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");

Expand All @@ -163,6 +164,7 @@ public CompletableFuture<List<EnrichedActivity>> getEnrichedActivitiesByID(
url,
key,
token,
flags,
new CustomQueryParameter("ids", Joiner.on(",").join(activityIDs))))
.thenApply(
response -> {
Expand Down