Use retrofutures and retrolambda to ensure compatibility with JDK 7 t…

…o run on older android devices. Add optional token expiration for frontend token generation. Add activity reference creation utility method
GetStream · Jun 5, 2019 · 9fa0645 · 9fa0645
1 parent 2dbd3b8
commit 9fa0645
Show file tree

Hide file tree

Showing 71 changed files with 1,558 additions and 1,940 deletions.
diff --git a/.java-version b/.java-version
diff --git a/README.md b/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.5</version>
+    <version>3.1.7</version>
 </dependency>
 ```
 
 or in your build.gradle:
 
 ```gradle
-compile 'io.getstream.client:stream-java:3.1.5'
+compile 'io.getstream.client:stream-java:3.1.7'
 ```
 
 In case you want to download the artifact and put it manually into your project,
@@ -29,7 +29,7 @@ Snapshots of the development version are available in [Sonatype](https://oss.son
 
 #### JDK / JVM version requirements
 
-This API Client project requires Java SE 8.
+This API Client project requires Java SE 7.
 
 ### Full documentation
 
@@ -43,7 +43,7 @@ Javadocs are available [here](https://getstream.github.io/stream-java/).
 
 ### Building & Testing
 
-Run `gradle wrapper --gradle-version 5.0` to generate gradle wrapper files
+Run `gradle wrapper --gradle-version 4.10.3` to generate gradle wrapper files
 
 Run `gradle test` to execute integration tests
 

diff --git a/build.gradle b/build.gradle
@@ -1,4 +1,5 @@
 plugins {
+    id "me.tatarka.retrolambda" version "3.7.0"
     id 'java-library'
     id 'eclipse'
     id 'idea'
@@ -9,36 +10,36 @@ plugins {
 }
 
 group 'io.getstream.client'
-version = '3.1.5'
+version = '3.1.7'
 
 dependencies {
-    testCompile 'org.junit.jupiter:junit-jupiter-api:5.3.1'
-    testCompile 'org.junit.jupiter:junit-jupiter-params:5.3.1'
-    testRuntime 'org.junit.jupiter:junit-jupiter-engine:5.3.1'
-    testRuntime 'org.junit.vintage:junit-vintage-engine:5.3.1'
+    sourceCompatibility = 1.8
+    targetCompatibility = 1.8
+
+    testCompile 'junit:junit:4.12'
     testCompile 'com.pholser:junit-quickcheck-core:0.8.1'
     testCompile 'com.pholser:junit-quickcheck-generators:0.8.1'
+    testRuntime 'org.junit.vintage:junit-vintage-engine:5.2.0'
 
-    implementation 'com.google.guava:guava:26.0-jre'
+    implementation 'com.google.guava:guava:20.0'
 
     implementation 'com.squareup.okhttp3:okhttp:3.11.0'
 
+    compile 'net.sourceforge.streamsupport:streamsupport:1.7.0'
+    compile 'net.sourceforge.streamsupport:streamsupport-cfuture:1.7.0'
+    compile 'com.fasterxml.jackson.core:jackson-core:2.9.6'
     compile 'com.fasterxml.jackson.core:jackson-core:2.9.6'
     compile 'com.fasterxml.jackson.core:jackson-annotations:2.9.6'
     compile 'com.fasterxml.jackson.core:jackson-databind:2.9.6'
 
     compile 'com.auth0:java-jwt:3.4.0'
 }
 
-compileJava {
-    sourceCompatibility = 1.8
-    targetCompatibility = 1.8
+retrolambda {
+    javaVersion JavaVersion.VERSION_1_7
 }
 
 test {
-    useJUnitPlatform {
-        includeEngines 'junit-jupiter', 'junit-vintage'
-    }
     testLogging {
         exceptionFormat = 'full'
         events 'standard_out', 'standard_error', "passed", "skipped", "failed"

diff --git a/src/main/java/io/getstream/client/AggregatedFeed.java b/src/main/java/io/getstream/client/AggregatedFeed.java
@@ -7,11 +7,11 @@
 import io.getstream.core.models.Group;
 import io.getstream.core.options.*;
 import io.getstream.core.utils.DefaultOptions;
+import java8.util.concurrent.CompletableFuture;
+import java8.util.concurrent.CompletionException;
 
 import java.io.IOException;
 import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionException;
 
 import static io.getstream.core.utils.Serialization.deserializeContainer;
 

diff --git a/src/main/java/io/getstream/client/AnalyticsClient.java b/src/main/java/io/getstream/client/AnalyticsClient.java
@@ -7,9 +7,9 @@
 import io.getstream.core.models.Engagement;
 import io.getstream.core.models.Impression;
 import io.getstream.core.utils.Auth.TokenAction;
+import java8.util.concurrent.CompletableFuture;
 
 import java.net.URL;
-import java.util.concurrent.CompletableFuture;
 
 import static io.getstream.core.utils.Auth.buildAnalyticsRedirectToken;
 import static io.getstream.core.utils.Auth.buildAnalyticsToken;

diff --git a/src/main/java/io/getstream/client/BatchClient.java b/src/main/java/io/getstream/client/BatchClient.java
@@ -9,9 +9,9 @@
 import io.getstream.core.models.FollowRelation;
 import io.getstream.core.models.ForeignIDTimePair;
 import io.getstream.core.utils.DefaultOptions;
+import java8.util.concurrent.CompletableFuture;
 
 import java.util.List;
-import java.util.concurrent.CompletableFuture;
 
 import static io.getstream.core.utils.Auth.*;
 

diff --git a/src/main/java/io/getstream/client/Client.java b/src/main/java/io/getstream/client/Client.java
@@ -10,13 +10,13 @@
 import io.getstream.core.http.Token;
 import io.getstream.core.models.*;
 import io.getstream.core.options.RequestOption;
+import java8.util.concurrent.CompletableFuture;
 
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.CompletableFuture;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
@@ -179,6 +179,10 @@ public Token frontendToken(String userID) {
         return buildFrontendToken(secret, userID);
     }
 
+    public Token frontendToken(String userID, Date expiresAt) {
+        return buildFrontendToken(secret, userID, expiresAt);
+    }
+
     public FlatFeed flatFeed(FeedID id) {
         return new FlatFeed(this, id);
     }

diff --git a/src/main/java/io/getstream/client/CollectionsClient.java b/src/main/java/io/getstream/client/CollectionsClient.java
@@ -1,17 +1,18 @@
 package io.getstream.client;
 
 import com.google.common.collect.Iterables;
-import com.google.common.collect.Streams;
 import io.getstream.core.StreamCollections;
 import io.getstream.core.exceptions.StreamException;
 import io.getstream.core.http.Token;
 import io.getstream.core.models.CollectionData;
 import io.getstream.core.utils.Auth.TokenAction;
+import io.getstream.core.utils.Streams;
+import java8.util.J8Arrays;
+import java8.util.concurrent.CompletableFuture;
+import java8.util.stream.Collectors;
+import java8.util.stream.StreamSupport;
 
-import java.util.Arrays;
 import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.stream.Collectors;
 
 import static io.getstream.core.utils.Auth.buildCollectionsToken;
 import static io.getstream.core.utils.Serialization.convert;
@@ -69,7 +70,7 @@ public <T> CompletableFuture<Void> upsertCustom(String collection, Iterable<T> i
     }
 
     public <T> CompletableFuture<Void> upsertCustom(String collection, T... items) throws StreamException {
-        final CollectionData[] custom = Arrays.stream(items)
+        final CollectionData[] custom = J8Arrays.stream(items)
                 .map(item -> CollectionData.buildFrom(item))
                 .toArray(CollectionData[]::new);
         return upsert(collection, custom);
@@ -99,7 +100,9 @@ public <T> CompletableFuture<List<T>> selectCustom(Class<T> type, String collect
 
     public <T> CompletableFuture<List<T>> selectCustom(Class<T> type, String collection, String... ids) throws StreamException {
         return select(collection, ids)
-                .thenApply(data -> data.stream().map(item -> convert(item, type)).collect(Collectors.toList()));
+                .thenApply(data -> StreamSupport.stream(data)
+                        .map(item -> convert(item, type))
+                        .collect(Collectors.toList()));
     }
 
     public CompletableFuture<List<CollectionData>> select(String collection, Iterable<String> ids) throws StreamException {

diff --git a/src/main/java/io/getstream/client/Feed.java b/src/main/java/io/getstream/client/Feed.java
@@ -1,7 +1,6 @@
 package io.getstream.client;
 
 import com.google.common.collect.Iterables;
-import com.google.common.collect.Streams;
 import io.getstream.core.exceptions.StreamException;
 import io.getstream.core.models.Activity;
 import io.getstream.core.models.FeedID;
@@ -11,13 +10,14 @@
 import io.getstream.core.options.Offset;
 import io.getstream.core.options.RequestOption;
 import io.getstream.core.utils.DefaultOptions;
+import io.getstream.core.utils.Streams;
+import java8.util.J8Arrays;
+import java8.util.concurrent.CompletableFuture;
+import java8.util.concurrent.CompletionException;
 
 import java.io.IOException;
 import java.lang.reflect.ParameterizedType;
-import java.util.Arrays;
 import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionException;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
@@ -108,7 +108,7 @@ public final CompletableFuture<List<Activity>> addActivities(Activity... activit
     }
 
     public final <T> CompletableFuture<List<T>> addCustomActivities(T... activities) throws StreamException {
-        final Activity[] custom = Arrays.stream(activities)
+        final Activity[] custom = J8Arrays.stream(activities)
                 .map(activity -> Activity.builder().fromCustomActivity(activity).build())
                 .toArray(Activity[]::new);
         return getClient()
@@ -196,7 +196,7 @@ public final CompletableFuture<List<FollowRelation>> getFollowers(Limit limit, O
     public final CompletableFuture<List<FollowRelation>> getFollowers(Limit limit, Offset offset, FeedID... feeds) throws StreamException {
         checkNotNull(feeds, "No feed ids to filter on");
 
-        final String[] feedIDs = Arrays.stream(feeds)
+        final String[] feedIDs = J8Arrays.stream(feeds)
                 .map(id -> id.toString())
                 .toArray(String[]::new);
         final RequestOption[] options = feedIDs.length == 0
@@ -244,7 +244,7 @@ public final CompletableFuture<List<FollowRelation>> getFollowed(Limit limit, Of
     public final CompletableFuture<List<FollowRelation>> getFollowed(Limit limit, Offset offset, FeedID... feeds) throws StreamException {
         checkNotNull(feeds, "No feed ids to filter on");
 
-        final String[] feedIDs = Arrays.stream(feeds)
+        final String[] feedIDs = J8Arrays.stream(feeds)
                 .map(id -> id.toString())
                 .toArray(String[]::new);
         final RequestOption[] options = feedIDs.length == 0

diff --git a/src/main/java/io/getstream/client/FileStorageClient.java b/src/main/java/io/getstream/client/FileStorageClient.java
@@ -4,10 +4,10 @@
 import io.getstream.core.exceptions.StreamException;
 import io.getstream.core.http.Token;
 import io.getstream.core.utils.Auth.TokenAction;
+import java8.util.concurrent.CompletableFuture;
 
 import java.io.File;
 import java.net.URL;
-import java.util.concurrent.CompletableFuture;
 
 import static io.getstream.core.utils.Auth.buildFilesToken;
 

diff --git a/src/main/java/io/getstream/client/FlatFeed.java b/src/main/java/io/getstream/client/FlatFeed.java
@@ -6,11 +6,11 @@
 import io.getstream.core.models.FeedID;
 import io.getstream.core.options.*;
 import io.getstream.core.utils.DefaultOptions;
+import java8.util.concurrent.CompletableFuture;
+import java8.util.concurrent.CompletionException;
 
 import java.io.IOException;
 import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionException;
 
 import static io.getstream.core.utils.Serialization.deserializeContainer;
 

diff --git a/src/main/java/io/getstream/client/ImageStorageClient.java b/src/main/java/io/getstream/client/ImageStorageClient.java
@@ -6,10 +6,10 @@
 import io.getstream.core.options.Crop;
 import io.getstream.core.options.Resize;
 import io.getstream.core.utils.Auth.TokenAction;
+import java8.util.concurrent.CompletableFuture;
 
 import java.io.File;
 import java.net.URL;
-import java.util.concurrent.CompletableFuture;
 
 import static io.getstream.core.utils.Auth.buildFilesToken;
 

diff --git a/src/main/java/io/getstream/client/NotificationFeed.java b/src/main/java/io/getstream/client/NotificationFeed.java
@@ -7,11 +7,11 @@
 import io.getstream.core.models.NotificationGroup;
 import io.getstream.core.options.*;
 import io.getstream.core.utils.DefaultOptions;
+import java8.util.concurrent.CompletableFuture;
+import java8.util.concurrent.CompletionException;
 
 import java.io.IOException;
 import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionException;
 
 import static io.getstream.core.utils.Serialization.deserializeContainer;
 

diff --git a/src/main/java/io/getstream/client/PersonalizationClient.java b/src/main/java/io/getstream/client/PersonalizationClient.java
@@ -5,9 +5,9 @@
 import io.getstream.core.exceptions.StreamException;
 import io.getstream.core.http.Token;
 import io.getstream.core.utils.Auth.TokenAction;
+import java8.util.concurrent.CompletableFuture;
 
 import java.util.Map;
-import java.util.concurrent.CompletableFuture;
 
 import static io.getstream.core.utils.Auth.buildPersonalizationToken;
 

diff --git a/src/main/java/io/getstream/client/ReactionsClient.java b/src/main/java/io/getstream/client/ReactionsClient.java
@@ -11,9 +11,9 @@
 import io.getstream.core.options.Limit;
 import io.getstream.core.utils.Auth.TokenAction;
 import io.getstream.core.utils.DefaultOptions;
+import java8.util.concurrent.CompletableFuture;
 
 import java.util.List;
-import java.util.concurrent.CompletableFuture;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;

diff --git a/src/main/java/io/getstream/client/User.java b/src/main/java/io/getstream/client/User.java
@@ -3,10 +3,10 @@
 import io.getstream.core.exceptions.StreamException;
 import io.getstream.core.models.Data;
 import io.getstream.core.models.ProfileData;
+import java8.util.concurrent.CompletableFuture;
+import java8.util.concurrent.CompletionException;
 
 import java.io.IOException;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionException;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;

diff --git a/src/main/java/io/getstream/cloud/CloudAggregatedFeed.java b/src/main/java/io/getstream/cloud/CloudAggregatedFeed.java
@@ -7,11 +7,11 @@
 import io.getstream.core.models.Group;
 import io.getstream.core.options.*;
 import io.getstream.core.utils.DefaultOptions;
+import java8.util.concurrent.CompletableFuture;
+import java8.util.concurrent.CompletionException;
 
 import java.io.IOException;
 import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionException;
 
 import static io.getstream.core.utils.Serialization.deserializeContainer;
 

diff --git a/src/main/java/io/getstream/cloud/CloudAnalyticsClient.java b/src/main/java/io/getstream/cloud/CloudAnalyticsClient.java
@@ -6,8 +6,7 @@
 import io.getstream.core.http.Token;
 import io.getstream.core.models.Engagement;
 import io.getstream.core.models.Impression;
-
-import java.util.concurrent.CompletableFuture;
+import java8.util.concurrent.CompletableFuture;
 
 public final class CloudAnalyticsClient {
     private final Token token;

diff --git a/src/main/java/io/getstream/cloud/CloudClient.java b/src/main/java/io/getstream/cloud/CloudClient.java
@@ -12,10 +12,10 @@
 import io.getstream.core.models.FeedID;
 import io.getstream.core.models.OGData;
 import io.getstream.core.options.RequestOption;
+import java8.util.concurrent.CompletableFuture;
 
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.concurrent.CompletableFuture;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;

diff --git a/src/main/java/io/getstream/cloud/CloudCollectionsClient.java b/src/main/java/io/getstream/cloud/CloudCollectionsClient.java
@@ -4,10 +4,7 @@
 import io.getstream.core.exceptions.StreamException;
 import io.getstream.core.http.Token;
 import io.getstream.core.models.CollectionData;
-
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.stream.Collectors;
+import java8.util.concurrent.CompletableFuture;
 
 import static io.getstream.core.utils.Serialization.convert;