Skip to content

Commit 2dadc64

Browse files
author
Max Klyga
committed
Add Enrichment options to flat feed classes
1 parent 8874a15 commit 2dadc64

File tree

5 files changed

+236
-46
lines changed

5 files changed

+236
-46
lines changed

‎src/main/java/io/getstream/client/FlatFeed.java‎

Lines changed: 83 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@
44
import io.getstream.core.models.Activity;
55
import io.getstream.core.models.EnrichedActivity;
66
import io.getstream.core.models.FeedID;
7-
import io.getstream.core.options.Filter;
8-
import io.getstream.core.options.Pagination;
9-
import io.getstream.core.options.Ranking;
10-
import io.getstream.core.options.RequestOption;
7+
import io.getstream.core.options.*;
118
import io.getstream.core.utils.DefaultOptions;
129

1310
import java.io.IOException;
@@ -109,37 +106,69 @@ public <T> CompletableFuture<List<T>> getCustomActivities(Class<T> type, Paginat
109106
}
110107

111108
public CompletableFuture<List<EnrichedActivity>> getEnrichedActivities() throws StreamException {
112-
return getEnrichedActivities(DefaultOptions.DEFAULT_PAGINATION, DefaultOptions.DEFAULT_FILTER, null);
109+
return getEnrichedActivities(DefaultOptions.DEFAULT_PAGINATION, DefaultOptions.DEFAULT_FILTER, DefaultOptions.DEFAULT_ENRICHMENT_FLAGS, null);
110+
}
111+
112+
public CompletableFuture<List<EnrichedActivity>> getEnrichedActivities(EnrichmentFlags flags) throws StreamException {
113+
return getEnrichedActivities(DefaultOptions.DEFAULT_PAGINATION, DefaultOptions.DEFAULT_FILTER, flags, null);
113114
}
114115

115116
public CompletableFuture<List<EnrichedActivity>> getEnrichedActivities(String ranking) throws StreamException {
116-
return getEnrichedActivities(DefaultOptions.DEFAULT_PAGINATION, DefaultOptions.DEFAULT_FILTER, ranking);
117+
return getEnrichedActivities(DefaultOptions.DEFAULT_PAGINATION, DefaultOptions.DEFAULT_FILTER, DefaultOptions.DEFAULT_ENRICHMENT_FLAGS, ranking);
118+
}
119+
120+
public CompletableFuture<List<EnrichedActivity>> getEnrichedActivities(EnrichmentFlags flags, String ranking) throws StreamException {
121+
return getEnrichedActivities(DefaultOptions.DEFAULT_PAGINATION, DefaultOptions.DEFAULT_FILTER, flags, ranking);
117122
}
118123

119124
public CompletableFuture<List<EnrichedActivity>> getEnrichedActivities(Filter filter) throws StreamException {
120-
return getEnrichedActivities(DefaultOptions.DEFAULT_PAGINATION, filter, null);
125+
return getEnrichedActivities(DefaultOptions.DEFAULT_PAGINATION, filter, DefaultOptions.DEFAULT_ENRICHMENT_FLAGS, null);
126+
}
127+
128+
public CompletableFuture<List<EnrichedActivity>> getEnrichedActivities(Filter filter, EnrichmentFlags flags) throws StreamException {
129+
return getEnrichedActivities(DefaultOptions.DEFAULT_PAGINATION, filter, flags, null);
121130
}
122131

123132
public CompletableFuture<List<EnrichedActivity>> getEnrichedActivities(Pagination pagination) throws StreamException {
124-
return getEnrichedActivities(pagination, DefaultOptions.DEFAULT_FILTER, null);
133+
return getEnrichedActivities(pagination, DefaultOptions.DEFAULT_FILTER, DefaultOptions.DEFAULT_ENRICHMENT_FLAGS, null);
134+
}
135+
136+
public CompletableFuture<List<EnrichedActivity>> getEnrichedActivities(Pagination pagination, EnrichmentFlags flags) throws StreamException {
137+
return getEnrichedActivities(pagination, DefaultOptions.DEFAULT_FILTER, flags, null);
125138
}
126139

127140
public CompletableFuture<List<EnrichedActivity>> getEnrichedActivities(Pagination pagination, Filter filter) throws StreamException {
128-
return getEnrichedActivities(pagination, filter, null);
141+
return getEnrichedActivities(pagination, filter, DefaultOptions.DEFAULT_ENRICHMENT_FLAGS, null);
142+
}
143+
144+
public CompletableFuture<List<EnrichedActivity>> getEnrichedActivities(Pagination pagination, Filter filter, EnrichmentFlags flags) throws StreamException {
145+
return getEnrichedActivities(pagination, filter, flags, null);
129146
}
130147

131148
public CompletableFuture<List<EnrichedActivity>> getEnrichedActivities(Filter filter, String ranking) throws StreamException {
132-
return getEnrichedActivities(DefaultOptions.DEFAULT_PAGINATION, filter, ranking);
149+
return getEnrichedActivities(DefaultOptions.DEFAULT_PAGINATION, filter, DefaultOptions.DEFAULT_ENRICHMENT_FLAGS, ranking);
150+
}
151+
152+
public CompletableFuture<List<EnrichedActivity>> getEnrichedActivities(Filter filter, EnrichmentFlags flags, String ranking) throws StreamException {
153+
return getEnrichedActivities(DefaultOptions.DEFAULT_PAGINATION, filter, flags, ranking);
133154
}
134155

135156
public CompletableFuture<List<EnrichedActivity>> getEnrichedActivities(Pagination pagination, String ranking) throws StreamException {
136-
return getEnrichedActivities(pagination, DefaultOptions.DEFAULT_FILTER, ranking);
157+
return getEnrichedActivities(pagination, DefaultOptions.DEFAULT_FILTER, DefaultOptions.DEFAULT_ENRICHMENT_FLAGS, ranking);
158+
}
159+
160+
public CompletableFuture<List<EnrichedActivity>> getEnrichedActivities(Pagination pagination, EnrichmentFlags flags, String ranking) throws StreamException {
161+
return getEnrichedActivities(pagination, DefaultOptions.DEFAULT_FILTER, flags, ranking);
137162
}
138163

139164
public CompletableFuture<List<EnrichedActivity>> getEnrichedActivities(Pagination pagination, Filter filter, String ranking) throws StreamException {
165+
return getEnrichedActivities(pagination, filter, DefaultOptions.DEFAULT_ENRICHMENT_FLAGS, ranking);
166+
}
167+
168+
public CompletableFuture<List<EnrichedActivity>> getEnrichedActivities(Pagination pagination, Filter filter, EnrichmentFlags flags, String ranking) throws StreamException {
140169
final RequestOption[] options = ranking == null
141-
? new RequestOption[] { pagination, filter, DefaultOptions.DEFAULT_MARKER }
142-
: new RequestOption[] { pagination, filter, DefaultOptions.DEFAULT_MARKER, new Ranking(ranking) };
170+
? new RequestOption[] { pagination, filter, flags, DefaultOptions.DEFAULT_MARKER }
171+
: new RequestOption[] { pagination, filter, flags, DefaultOptions.DEFAULT_MARKER, new Ranking(ranking) };
143172
return getClient()
144173
.getEnrichedActivities(getID(), options)
145174
.thenApply(response -> {
@@ -152,37 +181,69 @@ public CompletableFuture<List<EnrichedActivity>> getEnrichedActivities(Paginatio
152181
}
153182

154183
public <T> CompletableFuture<List<T>> getEnrichedCustomActivities(Class<T> type) throws StreamException {
155-
return getEnrichedCustomActivities(type, DefaultOptions.DEFAULT_PAGINATION, DefaultOptions.DEFAULT_FILTER, null);
184+
return getEnrichedCustomActivities(type, DefaultOptions.DEFAULT_PAGINATION, DefaultOptions.DEFAULT_FILTER, DefaultOptions.DEFAULT_ENRICHMENT_FLAGS, null);
185+
}
186+
187+
public <T> CompletableFuture<List<T>> getEnrichedCustomActivities(Class<T> type, EnrichmentFlags flags) throws StreamException {
188+
return getEnrichedCustomActivities(type, DefaultOptions.DEFAULT_PAGINATION, DefaultOptions.DEFAULT_FILTER, flags, null);
156189
}
157190

158191
public <T> CompletableFuture<List<T>> getEnrichedCustomActivities(Class<T> type, String ranking) throws StreamException {
159-
return getEnrichedCustomActivities(type, DefaultOptions.DEFAULT_PAGINATION, DefaultOptions.DEFAULT_FILTER, ranking);
192+
return getEnrichedCustomActivities(type, DefaultOptions.DEFAULT_PAGINATION, DefaultOptions.DEFAULT_FILTER, DefaultOptions.DEFAULT_ENRICHMENT_FLAGS, ranking);
193+
}
194+
195+
public <T> CompletableFuture<List<T>> getEnrichedCustomActivities(Class<T> type, EnrichmentFlags flags, String ranking) throws StreamException {
196+
return getEnrichedCustomActivities(type, DefaultOptions.DEFAULT_PAGINATION, DefaultOptions.DEFAULT_FILTER, flags, ranking);
160197
}
161198

162199
public <T> CompletableFuture<List<T>> getEnrichedCustomActivities(Class<T> type, Filter filter) throws StreamException {
163-
return getEnrichedCustomActivities(type, DefaultOptions.DEFAULT_PAGINATION, filter, null);
200+
return getEnrichedCustomActivities(type, DefaultOptions.DEFAULT_PAGINATION, filter, DefaultOptions.DEFAULT_ENRICHMENT_FLAGS, null);
201+
}
202+
203+
public <T> CompletableFuture<List<T>> getEnrichedCustomActivities(Class<T> type, Filter filter, EnrichmentFlags flags) throws StreamException {
204+
return getEnrichedCustomActivities(type, DefaultOptions.DEFAULT_PAGINATION, filter, flags, null);
164205
}
165206

166207
public <T> CompletableFuture<List<T>> getEnrichedCustomActivities(Class<T> type, Pagination pagination) throws StreamException {
167-
return getEnrichedCustomActivities(type, pagination, DefaultOptions.DEFAULT_FILTER, null);
208+
return getEnrichedCustomActivities(type, pagination, DefaultOptions.DEFAULT_FILTER, DefaultOptions.DEFAULT_ENRICHMENT_FLAGS, null);
209+
}
210+
211+
public <T> CompletableFuture<List<T>> getEnrichedCustomActivities(Class<T> type, Pagination pagination, EnrichmentFlags flags) throws StreamException {
212+
return getEnrichedCustomActivities(type, pagination, DefaultOptions.DEFAULT_FILTER, flags, null);
168213
}
169214

170215
public <T> CompletableFuture<List<T>> getEnrichedCustomActivities(Class<T> type, Pagination pagination, String ranking) throws StreamException {
171-
return getEnrichedCustomActivities(type, pagination, DefaultOptions.DEFAULT_FILTER, ranking);
216+
return getEnrichedCustomActivities(type, pagination, DefaultOptions.DEFAULT_FILTER, DefaultOptions.DEFAULT_ENRICHMENT_FLAGS, ranking);
217+
}
218+
219+
public <T> CompletableFuture<List<T>> getEnrichedCustomActivities(Class<T> type, Pagination pagination, EnrichmentFlags flags, String ranking) throws StreamException {
220+
return getEnrichedCustomActivities(type, pagination, DefaultOptions.DEFAULT_FILTER, flags, ranking);
172221
}
173222

174223
public <T> CompletableFuture<List<T>> getEnrichedCustomActivities(Class<T> type, Pagination pagination, Filter filter) throws StreamException {
175-
return getEnrichedCustomActivities(type, pagination, filter, null);
224+
return getEnrichedCustomActivities(type, pagination, filter, DefaultOptions.DEFAULT_ENRICHMENT_FLAGS, null);
225+
}
226+
227+
public <T> CompletableFuture<List<T>> getEnrichedCustomActivities(Class<T> type, Pagination pagination, Filter filter, EnrichmentFlags flags) throws StreamException {
228+
return getEnrichedCustomActivities(type, pagination, filter, flags, null);
176229
}
177230

178231
public <T> CompletableFuture<List<T>> getEnrichedCustomActivities(Class<T> type, Filter filter, String ranking) throws StreamException {
179-
return getEnrichedCustomActivities(type, DefaultOptions.DEFAULT_PAGINATION, filter, ranking);
232+
return getEnrichedCustomActivities(type, DefaultOptions.DEFAULT_PAGINATION, filter, DefaultOptions.DEFAULT_ENRICHMENT_FLAGS, ranking);
233+
}
234+
235+
public <T> CompletableFuture<List<T>> getEnrichedCustomActivities(Class<T> type, Filter filter, EnrichmentFlags flags, String ranking) throws StreamException {
236+
return getEnrichedCustomActivities(type, DefaultOptions.DEFAULT_PAGINATION, filter, flags, ranking);
180237
}
181238

182239
public <T> CompletableFuture<List<T>> getEnrichedCustomActivities(Class<T> type, Pagination pagination, Filter filter, String ranking) throws StreamException {
240+
return getEnrichedCustomActivities(type, pagination, filter, DefaultOptions.DEFAULT_ENRICHMENT_FLAGS, ranking);
241+
}
242+
243+
public <T> CompletableFuture<List<T>> getEnrichedCustomActivities(Class<T> type, Pagination pagination, Filter filter, EnrichmentFlags flags, String ranking) throws StreamException {
183244
final RequestOption[] options = ranking == null
184-
? new RequestOption[] { pagination, filter, DefaultOptions.DEFAULT_MARKER }
185-
: new RequestOption[] { pagination, filter, DefaultOptions.DEFAULT_MARKER, new Ranking(ranking) };
245+
? new RequestOption[] { pagination, filter, flags, DefaultOptions.DEFAULT_MARKER }
246+
: new RequestOption[] { pagination, filter, flags, DefaultOptions.DEFAULT_MARKER, new Ranking(ranking) };
186247
return getClient()
187248
.getActivities(getID(), options)
188249
.thenApply(response -> {

0 commit comments

Comments
 (0)