Merge pull request #34 from GetStream/feature/session

Added session in FeedFilter

Author: sirio7g

stream-core/src/main/java/io/getstream/client/model/filters/FeedFilter.java

@@ -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;
 
@@ -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() {
@@ -62,6 +64,10 @@ public String getRanking() {
         return ranking;
     }
 
+    public String getSession() {
+        return session;
+    }
+
     /**
      * Builder to build up a {@link FeedFilter}.
      */
@@ -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;

stream-core/src/test/java/io/getstream/client/model/FeedFilterTest.java renamed to stream-core/src/test/java/io/getstream/client/model/filters/FeedFilterTest.java

@@ -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;
@@ -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()
@@ -31,6 +32,7 @@ public void shouldBuildFeedFilter() {
             .withIdLowerThanEquals(id_lte)
             .withRanking(ranking)
             .withFeedIds(feedIds)
+            .withSession(session)
             .build();
 
         assertThat(filter.getLimit(), is(limit));
@@ -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

stream-repo-apache/src/main/java/io/getstream/client/apache/repo/utils/FeedFilterUtils.java

@@ -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;
     }
 }

stream-repo-okhttp/src/main/java/io/getstream/client/okhttp/repo/utils/FeedFilterUtils.java

@@ -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;
     }
 }