From 0019f794d856954a79597ce5c2e016d41a412118 Mon Sep 17 00:00:00 2001 From: ferhat elmas Date: Tue, 29 Sep 2020 22:00:56 +0200 Subject: [PATCH 1/2] Fix lambda warnings --- build.gradle | 2 +- .../getstream/cloud/CloudAggregatedFeed.java | 9 +++++---- .../java/io/getstream/cloud/CloudFeed.java | 19 ++++++++++--------- .../io/getstream/cloud/CloudFlatFeed.java | 9 +++++---- .../cloud/CloudNotificationFeed.java | 9 +++++---- 5 files changed, 26 insertions(+), 22 deletions(-) diff --git a/build.gradle b/build.gradle index e1272817..844535ff 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ plugins { } group 'io.getstream.client' -version = '3.2.3' +version = '3.2.4' dependencies { sourceCompatibility = 1.8 diff --git a/src/main/java/io/getstream/cloud/CloudAggregatedFeed.java b/src/main/java/io/getstream/cloud/CloudAggregatedFeed.java index 85146ffb..66044da4 100644 --- a/src/main/java/io/getstream/cloud/CloudAggregatedFeed.java +++ b/src/main/java/io/getstream/cloud/CloudAggregatedFeed.java @@ -3,6 +3,7 @@ import static io.getstream.core.utils.Serialization.deserializeContainer; import io.getstream.core.exceptions.StreamException; +import io.getstream.core.http.Response; import io.getstream.core.models.Activity; import io.getstream.core.models.EnrichedActivity; import io.getstream.core.models.FeedID; @@ -109,7 +110,7 @@ CompletableFuture>> getActivities( return getClient() .getActivities(getID(), limit, offset, filter, marker) .thenApply( - response -> { + (Response response) -> { try { return deserializeContainer(response, Group.class, Activity.class); } catch (StreamException | IOException e) { @@ -214,7 +215,7 @@ CompletableFuture>> getCustomActivities( return getClient() .getActivities(getID(), limit, offset, filter, marker) .thenApply( - response -> { + (Response response) -> { try { return deserializeContainer(response, Group.class, type); } catch (StreamException | IOException e) { @@ -441,7 +442,7 @@ CompletableFuture>> getEnriched return getClient() .getEnrichedActivities(getID(), limit, offset, filter, marker, flags) .thenApply( - response -> { + (Response response) -> { try { return deserializeContainer(response, Group.class, EnrichedActivity.class); } catch (StreamException | IOException e) { @@ -695,7 +696,7 @@ CompletableFuture>> getEnrichedCustomActiv return getClient() .getEnrichedActivities(getID(), limit, offset, filter, marker, flags) .thenApply( - response -> { + (Response response) -> { try { return deserializeContainer(response, Group.class, type); } catch (StreamException | IOException e) { diff --git a/src/main/java/io/getstream/cloud/CloudFeed.java b/src/main/java/io/getstream/cloud/CloudFeed.java index c44d79ab..d45537d0 100644 --- a/src/main/java/io/getstream/cloud/CloudFeed.java +++ b/src/main/java/io/getstream/cloud/CloudFeed.java @@ -6,6 +6,7 @@ import com.google.common.collect.Iterables; import io.getstream.core.exceptions.StreamException; +import io.getstream.core.http.Response; import io.getstream.core.models.Activity; import io.getstream.core.models.FeedID; import io.getstream.core.models.FollowRelation; @@ -90,7 +91,7 @@ public final CompletableFuture> addCustomActivities(Iterable acti return getClient() .addActivities(id, custom) .thenApply( - response -> { + (Response response) -> { try { Class element = (Class) @@ -108,7 +109,7 @@ public final CompletableFuture> addActivities(Activity... activit return getClient() .addActivities(id, activities) .thenApply( - response -> { + (Response response) -> { try { return deserializeContainer(response, "activities", Activity.class); } catch (StreamException | IOException e) { @@ -126,7 +127,7 @@ public final CompletableFuture> addCustomActivities(T... activities) return getClient() .addActivities(id, custom) .thenApply( - response -> { + (Response response) -> { try { Class element = (Class) activities.getClass().getComponentType(); return deserializeContainer(response, "activities", element); @@ -140,7 +141,7 @@ public final CompletableFuture removeActivityByID(String id) throws Stream return client .removeActivityByID(this.id, id) .thenApply( - response -> { + (Response response) -> { try { return deserializeError(response); } catch (StreamException | IOException e) { @@ -154,7 +155,7 @@ public final CompletableFuture removeActivityByForeignID(String foreignID) return client .removeActivityByForeignID(id, foreignID) .thenApply( - response -> { + (Response response) -> { try { return deserializeError(response); } catch (StreamException | IOException e) { @@ -177,7 +178,7 @@ public final CompletableFuture follow(CloudFlatFeed feed, int activityCopy return client .follow(id, feed.getID(), activityCopyLimit) .thenApply( - response -> { + (Response response) -> { try { return deserializeError(response); } catch (StreamException | IOException e) { @@ -240,7 +241,7 @@ limit, offset, new CustomQueryParameter("filter", String.join(",", feedIDs)) return client .getFollowers(id, options) .thenApply( - response -> { + (Response response) -> { try { return deserializeContainer(response, FollowRelation.class); } catch (StreamException | IOException e) { @@ -303,7 +304,7 @@ limit, offset, new CustomQueryParameter("filter", String.join(",", feedIDs)) return client .getFollowed(id, options) .thenApply( - response -> { + (Response response) -> { try { return deserializeContainer(response, FollowRelation.class); } catch (StreamException | IOException e) { @@ -321,7 +322,7 @@ public final CompletableFuture unfollow( return client .unfollow(id, feed.getID(), new io.getstream.core.options.KeepHistory(keepHistory)) .thenApply( - response -> { + (Response response) -> { try { return deserializeError(response); } catch (StreamException | IOException e) { diff --git a/src/main/java/io/getstream/cloud/CloudFlatFeed.java b/src/main/java/io/getstream/cloud/CloudFlatFeed.java index cf90c896..2b6987f8 100644 --- a/src/main/java/io/getstream/cloud/CloudFlatFeed.java +++ b/src/main/java/io/getstream/cloud/CloudFlatFeed.java @@ -3,6 +3,7 @@ import static io.getstream.core.utils.Serialization.deserializeContainer; import io.getstream.core.exceptions.StreamException; +import io.getstream.core.http.Response; import io.getstream.core.models.Activity; import io.getstream.core.models.EnrichedActivity; import io.getstream.core.models.FeedID; @@ -95,7 +96,7 @@ limit, offset, filter, DefaultOptions.DEFAULT_MARKER, new Ranking(ranking) return getClient() .getActivities(getID(), options) .thenApply( - response -> { + (Response response) -> { try { return deserializeContainer(response, Activity.class); } catch (StreamException | IOException e) { @@ -191,7 +192,7 @@ limit, offset, filter, DefaultOptions.DEFAULT_MARKER, new Ranking(ranking) return getClient() .getActivities(getID(), options) .thenApply( - response -> { + (Response response) -> { try { return deserializeContainer(response, type); } catch (StreamException | IOException e) { @@ -407,7 +408,7 @@ limit, offset, filter, flags, DefaultOptions.DEFAULT_MARKER, new Ranking(ranking return getClient() .getEnrichedActivities(getID(), options) .thenApply( - response -> { + (Response response) -> { try { return deserializeContainer(response, EnrichedActivity.class); } catch (StreamException | IOException e) { @@ -649,7 +650,7 @@ limit, offset, filter, flags, DefaultOptions.DEFAULT_MARKER, new Ranking(ranking return getClient() .getActivities(getID(), options) .thenApply( - response -> { + (Response response) -> { try { return deserializeContainer(response, type); } catch (StreamException | IOException e) { diff --git a/src/main/java/io/getstream/cloud/CloudNotificationFeed.java b/src/main/java/io/getstream/cloud/CloudNotificationFeed.java index f8a9e55e..9834d9e2 100644 --- a/src/main/java/io/getstream/cloud/CloudNotificationFeed.java +++ b/src/main/java/io/getstream/cloud/CloudNotificationFeed.java @@ -3,6 +3,7 @@ import static io.getstream.core.utils.Serialization.deserializeContainer; import io.getstream.core.exceptions.StreamException; +import io.getstream.core.http.Response; import io.getstream.core.models.Activity; import io.getstream.core.models.EnrichedActivity; import io.getstream.core.models.FeedID; @@ -122,7 +123,7 @@ CompletableFuture>> getActivities( return getClient() .getActivities(getID(), limit, offset, filter, marker) .thenApply( - response -> { + (Response response) -> { try { return deserializeContainer(response, NotificationGroup.class, Activity.class); } catch (StreamException | IOException e) { @@ -240,7 +241,7 @@ CompletableFuture>> getCustomActivities( return getClient() .getActivities(getID(), limit, offset, filter, marker) .thenApply( - response -> { + (Response response) -> { try { return deserializeContainer(response, NotificationGroup.class, type); } catch (StreamException | IOException e) { @@ -492,7 +493,7 @@ CompletableFuture>> getEnrichedActiviti return getClient() .getEnrichedActivities(getID(), limit, offset, filter, marker, flags) .thenApply( - response -> { + (Response response) -> { try { return deserializeContainer( response, NotificationGroup.class, EnrichedActivity.class); @@ -772,7 +773,7 @@ CompletableFuture>> getEnrichedCustomActivities( return getClient() .getEnrichedActivities(getID(), limit, offset, filter, marker, flags) .thenApply( - response -> { + (Response response) -> { try { return deserializeContainer(response, NotificationGroup.class, type); } catch (StreamException | IOException e) { From 2b6a0c0dca5bd081100bf58de73f4e198ad7f72b Mon Sep 17 00:00:00 2001 From: ferhat elmas Date: Tue, 29 Sep 2020 22:02:03 +0200 Subject: [PATCH 2/2] Revert version bump yet --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 844535ff..e1272817 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ plugins { } group 'io.getstream.client' -version = '3.2.4' +version = '3.2.3' dependencies { sourceCompatibility = 1.8