Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ public class FeedFilter {
public final static String PARAM_ID_LOWER_THAN_EQUALS = "id_lte";
public final static String PARAM_FEED_IDS = "filter";
public final static String PARAM_RANKING = "ranking";
public final static String PARAM_SESSION = "session";

private static final int DEFAULT_LIMIT = 25;

Expand All @@ -25,6 +26,7 @@ public class FeedFilter {
private String idLowerThanEquals = null;
private String idLowerThan = null;
private String ranking = null;
private String session = null;
private List<String> feedIds = null;

protected FeedFilter() {
Expand Down Expand Up @@ -62,6 +64,10 @@ public String getRanking() {
return ranking;
}

public String getSession() {
return session;
}

/**
* Builder to build up a {@link FeedFilter}.
*/
Expand Down Expand Up @@ -116,6 +122,11 @@ public Builder withRanking(String ranking) {
return this;
}

public Builder withSession(String session) {
feedFilter.session = session;
return this;
}

public Builder withFeedIds(List<String> feeds) {
feedFilter.feedIds = feeds;
return this;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package io.getstream.client.model.filters;

import org.junit.Test;

import java.util.Arrays;
import java.util.List;

import org.junit.Test;

import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
Expand All @@ -20,6 +20,7 @@ public void shouldBuildFeedFilter() {
String id_lt = "ghi";
String id_lte = "jkl";
String ranking = "ranking-method";
String session = "session";
List<String> feedIds = Arrays.asList("user:123", "user:456");

FeedFilter filter = new FeedFilter.Builder()
Expand All @@ -31,6 +32,7 @@ public void shouldBuildFeedFilter() {
.withIdLowerThanEquals(id_lte)
.withRanking(ranking)
.withFeedIds(feedIds)
.withSession(session)
.build();

assertThat(filter.getLimit(), is(limit));
Expand All @@ -41,6 +43,7 @@ public void shouldBuildFeedFilter() {
assertThat(filter.getIdLowerThanEquals(), is(id_lte));
assertThat(filter.getRanking(), is(ranking));
assertThat(filter.getFeedIds(), is(feedIds));
assertThat(filter.getSession(), is(session));
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ public static UriBuilder apply(final UriBuilder uriBuilder, final FeedFilter fil
if (null != filter.getRanking()) {
uriBuilder.queryParam(FeedFilter.PARAM_RANKING, filter.getRanking());
}
if (null != filter.getSession()) {
uriBuilder.queryParam(FeedFilter.PARAM_SESSION, filter.getSession());
}
return uriBuilder;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,12 @@ public static UriBuilder apply(final UriBuilder uriBuilder, final FeedFilter fil
if (null != filter.getFeedIds()) {
uriBuilder.queryParam(FeedFilter.PARAM_FEED_IDS, Joiner.on(",").join(filter.getFeedIds()));
}
if (null != filter.getRanking()) {
uriBuilder.queryParam(FeedFilter.PARAM_RANKING, filter.getRanking());
}
if (null != filter.getSession()) {
uriBuilder.queryParam(FeedFilter.PARAM_SESSION, filter.getSession());
}
return uriBuilder;
}
}