Version 3.1.5:

* Remove `items` method from collection clients
* Add limit to `getActivities` methods for all cloud feed classes
* Allow null values in user and collection data objects
* Add tests for cloud feed classes

Author: Max Klyga

README.md

@@ -12,14 +12,14 @@ Add the following dependency to your pom.xml:
 <dependency>
     <groupId>io.getstream.client</groupId>
     <artifactId>stream-java</artifactId>
-    <version>3.1.4</version>
+    <version>3.1.5</version>
 </dependency>
 ```
 
 or in your build.gradle:
 
 ```gradle
-compile 'io.getstream.client:stream-java:3.1.4'
+compile 'io.getstream.client:stream-java:3.1.5'
 ```
 
 In case you want to download the artifact and put it manually into your project,

build.gradle

@@ -9,7 +9,7 @@ plugins {
 }
 
 group 'io.getstream.client'
-version = '3.1.4'
+version = '3.1.5'
 
 dependencies {
     testCompile 'org.junit.jupiter:junit-jupiter-api:5.3.1'

src/main/java/io/getstream/client/CollectionsClient.java

@@ -84,18 +84,6 @@ public CompletableFuture<Void> upsert(String collection, CollectionData... items
         return collections.upsert(token, collection, items);
     }
 
-    public <T> CompletableFuture<List<T>> customItems(Class<T> type, String collection) throws StreamException {
-        return items(collection)
-                .thenApply(result -> result.stream()
-                        .map(item -> convert(item, type))
-                        .collect(Collectors.toList()));
-    }
-
-    public CompletableFuture<List<CollectionData>> items(String collection) throws StreamException {
-        final Token token = buildCollectionsToken(secret, TokenAction.READ);
-        return collections.items(token, collection);
-    }
-
     public <T> CompletableFuture<T> getCustom(Class<T> type, String collection, String id) throws StreamException {
         return get(collection, id).thenApply(data -> convert(data, type));
     }

src/main/java/io/getstream/cloud/CloudAggregatedFeed.java

@@ -130,7 +130,7 @@ public <T> CompletableFuture<? extends List<? extends Group<T>>> getCustomActivi
 
     <T> CompletableFuture<? extends List<? extends Group<T>>> getCustomActivities(Class<T> type, Limit limit, Offset offset, Filter filter, ActivityMarker marker) throws StreamException {
         return getClient()
-                .getActivities(getID(), offset, filter, marker)
+                .getActivities(getID(), limit, offset, filter, marker)
                 .thenApply(response -> {
                     try {
                         return deserializeContainer(response, Group.class, type);
@@ -188,10 +188,6 @@ public CompletableFuture<? extends List<? extends Group<EnrichedActivity>>> getE
         return getEnrichedActivities(DefaultOptions.DEFAULT_LIMIT, DefaultOptions.DEFAULT_OFFSET, filter, DefaultOptions.DEFAULT_MARKER, flags);
     }
 
-    public CompletableFuture<? extends List<? extends Group<EnrichedActivity>>> getEnrichedActivities(ActivityMarker marker, EnrichmentFlags flags) throws StreamException {
-        return getEnrichedActivities(DefaultOptions.DEFAULT_LIMIT, DefaultOptions.DEFAULT_OFFSET, DefaultOptions.DEFAULT_FILTER, marker, flags);
-    }
-
     public CompletableFuture<? extends List<? extends Group<EnrichedActivity>>> getEnrichedActivities(Filter filter, ActivityMarker marker) throws StreamException {
         return getEnrichedActivities(DefaultOptions.DEFAULT_LIMIT, DefaultOptions.DEFAULT_OFFSET, filter, marker, DefaultOptions.DEFAULT_ENRICHMENT_FLAGS);
     }
@@ -200,6 +196,10 @@ public CompletableFuture<? extends List<? extends Group<EnrichedActivity>>> getE
         return getEnrichedActivities(DefaultOptions.DEFAULT_LIMIT, offset, DefaultOptions.DEFAULT_FILTER, marker, DefaultOptions.DEFAULT_ENRICHMENT_FLAGS);
     }
 
+    public CompletableFuture<? extends List<? extends Group<EnrichedActivity>>> getEnrichedActivities(ActivityMarker marker, EnrichmentFlags flags) throws StreamException {
+        return getEnrichedActivities(DefaultOptions.DEFAULT_LIMIT, DefaultOptions.DEFAULT_OFFSET, DefaultOptions.DEFAULT_FILTER, marker, flags);
+    }
+
     public CompletableFuture<? extends List<? extends Group<EnrichedActivity>>> getEnrichedActivities(Limit limit, Offset offset, EnrichmentFlags flags) throws StreamException {
         return getEnrichedActivities(limit, offset, DefaultOptions.DEFAULT_FILTER, DefaultOptions.DEFAULT_MARKER, flags);
     }
@@ -208,10 +208,6 @@ public CompletableFuture<? extends List<? extends Group<EnrichedActivity>>> getE
         return getEnrichedActivities(limit, DefaultOptions.DEFAULT_OFFSET, filter, DefaultOptions.DEFAULT_MARKER, flags);
     }
 
-    public CompletableFuture<? extends List<? extends Group<EnrichedActivity>>> getEnrichedActivities(Limit limit, ActivityMarker marker, EnrichmentFlags flags) throws StreamException {
-        return getEnrichedActivities(limit, DefaultOptions.DEFAULT_OFFSET, DefaultOptions.DEFAULT_FILTER, marker, flags);
-    }
-
     public CompletableFuture<? extends List<? extends Group<EnrichedActivity>>> getEnrichedActivities(Limit limit, Filter filter, ActivityMarker marker) throws StreamException {
         return getEnrichedActivities(limit, DefaultOptions.DEFAULT_OFFSET, filter, marker, DefaultOptions.DEFAULT_ENRICHMENT_FLAGS);
     }
@@ -220,6 +216,10 @@ public CompletableFuture<? extends List<? extends Group<EnrichedActivity>>> getE
         return getEnrichedActivities(limit, offset, DefaultOptions.DEFAULT_FILTER, marker, DefaultOptions.DEFAULT_ENRICHMENT_FLAGS);
     }
 
+    public CompletableFuture<? extends List<? extends Group<EnrichedActivity>>> getEnrichedActivities(Limit limit, ActivityMarker marker, EnrichmentFlags flags) throws StreamException {
+        return getEnrichedActivities(limit, DefaultOptions.DEFAULT_OFFSET, DefaultOptions.DEFAULT_FILTER, marker, flags);
+    }
+
     public CompletableFuture<? extends List<? extends Group<EnrichedActivity>>> getEnrichedActivities(Filter filter, ActivityMarker marker, EnrichmentFlags flags) throws StreamException {
         return getEnrichedActivities(DefaultOptions.DEFAULT_LIMIT, DefaultOptions.DEFAULT_OFFSET, filter, marker, flags);
     }

src/main/java/io/getstream/cloud/CloudCollectionsClient.java

@@ -56,17 +56,6 @@ public CompletableFuture<CollectionData> update(String userID, String collection
         return collections.update(token, userID, collection, item);
     }
 
-    public <T> CompletableFuture<List<T>> customItems(Class<T> type, String collection) throws StreamException {
-        return items(collection)
-                .thenApply(result -> result.stream()
-                        .map(item -> convert(item, type))
-                        .collect(Collectors.toList()));
-    }
-
-    public CompletableFuture<List<CollectionData>> items(String collection) throws StreamException {
-        return collections.items(token, collection);
-    }
-
     public <T> CompletableFuture<T> getCustom(Class<T> type, String collection, String id) throws StreamException {
         return get(collection, id).thenApply(data -> convert(data, type));
     }