chore: remove unnecessary client

Author: itsmeadi

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

@@ -5,7 +5,6 @@
 import static io.getstream.core.utils.Auth.*;
 
 import com.google.common.collect.Iterables;
-import io.getstream.core.ExportIDs;
 import io.getstream.core.Region;
 import io.getstream.core.Stream;
 import io.getstream.core.exceptions.StreamException;
@@ -20,6 +19,8 @@
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+
+import io.getstream.core.utils.Auth;
 import java8.util.concurrent.CompletableFuture;
 
 public final class Client {
@@ -255,14 +256,6 @@ public ModerationClient moderation() {
     return new ModerationClient(secret, stream.moderation());
   }
 
-  public ExportIDsClient exportIDs() {
-    return new ExportIDsClient(secret, stream.exportIDs());
-  }
-
-  public BatchDeleteActivitiesClient batchDeleteActivities() {
-    return new BatchDeleteActivitiesClient(secret, stream.batchDeleteActivities());
-  }
-
   public FileStorageClient files() {
     return new FileStorageClient(secret, stream.files());
   }
@@ -372,4 +365,14 @@ CompletableFuture<Response> userProfile(String id) throws StreamException {
     final Token token = buildUsersToken(secret, TokenAction.READ);
     return stream.getUser(token, id, true);
   }
+
+  public CompletableFuture<Object> deleteActivities(BatchDeleteActivitiesRequest request) throws StreamException {
+    final Token token = buildDataPrivacyToken(secret, Auth.TokenAction.WRITE);
+    return stream.deleteActivities(token, request);
+  }
+
+  public CompletableFuture<ExportIDsResponse> exportUserActivities(String userId) throws StreamException {
+    final Token token = buildDataPrivacyToken(secret, Auth.TokenAction.READ);
+    return stream.exportUserActivities(token, userId);
+  }
 }

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

@@ -63,14 +63,6 @@ public Moderation moderation() {
     return new Moderation(key, baseURL, httpClient);
   }
 
-  public ExportIDs exportIDs() {
-    return new ExportIDs(key, baseURL, httpClient);
-  }
-
-  public BatchDeleteActivities batchDeleteActivities() {
-    return new BatchDeleteActivities(key, baseURL, httpClient);
-  }
-
   public StreamFiles files() {
     return new StreamFiles(key, baseURL, httpClient);
   }
@@ -533,4 +525,41 @@ public CompletableFuture<Response> updateUser(Token token, String userID, Data u
       throw new StreamException(e);
     }
   }
+
+  public CompletableFuture<Object> deleteActivities(Token token, BatchDeleteActivitiesRequest request) throws StreamException {
+    try {
+//            final URL url = deleteActivitiesURL(baseURL);
+      final URL url = deleteActivitiesURL(new URL("https://oregon-api.stream-io-api.com"));//$$ need to deploy proxy
+
+      final byte[] payload = toJSON(request);
+      io.getstream.core.http.Request httpRequest = buildPost(url, key, token, payload);
+      return httpClient.execute(httpRequest).thenApply(response -> null);
+    } catch (Exception e) {
+      throw new StreamException(e);
+    }
+  }
+
+  public CompletableFuture<ExportIDsResponse> exportUserActivities(Token token, String userId) throws StreamException {
+    if (userId == null || userId.isEmpty()) {
+      throw new IllegalArgumentException("User ID can't be null or empty");
+    }
+
+    try {
+//            final URL url = buildExportIDsURL(baseURL, userId);
+      final URL url = buildExportIDsURL(new URL("https://oregon-api.stream-io-api.com"), userId);//$$ need to deploy proxy
+      io.getstream.core.http.Request request = buildGet(url, key, token);
+      return httpClient
+              .execute(request)
+              .thenApply(
+                      response -> {
+                        try {
+                          return deserialize(response, ExportIDsResponse.class);
+                        } catch (StreamException | IOException e) {
+                          throw new CompletionException(e);
+                        }
+                      });
+    } catch (MalformedURLException | URISyntaxException e) {
+      throw new StreamException(e);
+    }
+  }
 }

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

@@ -3,18 +3,14 @@
 import static org.junit.Assert.*;
 
 import com.google.common.collect.Lists;
-import io.getstream.core.BatchDeleteActivities;
-import io.getstream.core.http.HTTPClient;
 import io.getstream.core.models.BatchDeleteActivitiesRequest;
 import io.getstream.core.models.BatchDeleteActivitiesRequest.ActivityToDelete;
 import io.getstream.core.models.Activity;
-import io.getstream.core.models.FeedID;
 import io.getstream.core.options.Filter;
 import io.getstream.core.options.Limit;
 import java8.util.concurrent.CompletableFuture;
 import org.junit.*;
 
-import java.net.URL;
 import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
@@ -39,7 +35,6 @@ public void setUp() throws Exception {
 
     @Test
     public void testDeleteActivities() throws Exception {
-        BatchDeleteActivitiesClient batchDeleteClient = client.batchDeleteActivities();
         String uuid1 = UUID.randomUUID().toString().replace("-", "");
         FlatFeed feed = client.flatFeed("flat", uuid1);
 
@@ -75,7 +70,7 @@ public void testDeleteActivities() throws Exception {
         BatchDeleteActivitiesRequest request = new BatchDeleteActivitiesRequest(activities);
 
         // Delete activities
-        CompletableFuture<Object> future = batchDeleteClient.deleteActivities(request);
+        CompletableFuture<Object> future = client.deleteActivities(request);
         future.join();
 
         assertTrue(future.isDone());
@@ -90,7 +85,6 @@ public void testDeleteActivities() throws Exception {
 
     @Test
     public void testDeleteActivitis() throws Exception {
-        BatchDeleteActivitiesClient batchDeleteClient = client.batchDeleteActivities();
 
         // Insert some activities
         String uuid1 = UUID.randomUUID().toString().replace("-", "");
@@ -124,8 +118,18 @@ public void testDeleteActivitis() throws Exception {
                 new ActivityToDelete(activity1Res.getID(), Arrays.asList(feed.getID().toString())),
                 new ActivityToDelete(activity2Res.getID(), Arrays.asList(feedAlice.getID().toString()))
         );
+
+        activities =feedAlice.getActivities(
+                new Limit(10), new Filter()).join();
+        assertEquals(2, activities.size());//0
+
+        activities =feedAlice.getActivities(
+                new Limit(10), new Filter().discardDeletedActivities()).join();
+        assertEquals(2, activities.size());//1
+
+
         BatchDeleteActivitiesRequest request = new BatchDeleteActivitiesRequest(activitiesToDelete);
-        CompletableFuture<Object> future = batchDeleteClient.deleteActivities(request);
+        CompletableFuture<Object> future = client.deleteActivities(request);
         future.join();
 
 
@@ -145,8 +149,14 @@ public void testDeleteActivitis() throws Exception {
                 new Limit(10), new Filter().discardDeletedActivities()).join();
         assertEquals(0, activities.size());
 
+        activities =feedAlice.getActivities(
+                new Limit(10), new Filter()).join();
+        assertEquals(2, activities.size());//0
+
         activities =feedAlice.getActivities(
                 new Limit(10), new Filter().discardDeletedActivities()).join();
-        assertEquals(1, activities.size());
+        assertEquals(0, activities.size());//1
+
+
     }
 }

src/main/java/io/getstream/core/BatchDeleteActivities.java

@@ -29,7 +29,6 @@ public void setUp() throws Exception {
 
     @Test
     public void testExportUserActivities() throws Exception {
-        ExportIDsClient exportIDsClient = client.exportIDs();
 
         String userId = "test-user";
 
@@ -48,10 +47,10 @@ public void testExportUserActivities() throws Exception {
                 .object("object2")
                 .time(new Date())
                 .build();
-        Activity activity2Res =client.flatFeed("user", userId).addActivity(activity2).join();
+        Activity activity2Res = client.flatFeed("user", userId).addActivity(activity2).join();
 
         // Export user activities
-        ExportIDsResponse exportResult = exportIDsClient.exportUserActivities(userId).join();
+        ExportIDsResponse exportResult = client.exportUserActivities(userId).join();
         ExportIDsResult exports = exportResult.getExport();
 
         // Test the output