Skip to content

Commit 7a44de3

Browse files
authored
Merge pull request #50 from GetStream/feature/cha-2563-retention-policy-endpoints
[CHA-2563] Add retention policy integration tests
2 parents b67492a + 841e0cb commit 7a44de3

File tree

83 files changed

+1616
-41
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+1616
-41
lines changed

src/main/java/io/getstream/Webhook.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@
9898
import io.getstream.models.CommentReactionAddedEvent;
9999
import io.getstream.models.CommentReactionDeletedEvent;
100100
import io.getstream.models.CommentReactionUpdatedEvent;
101+
import io.getstream.models.CommentRestoredEvent;
101102
import io.getstream.models.CommentUpdatedEvent;
102103
import io.getstream.models.CustomEvent;
103104
import io.getstream.models.CustomVideoEvent;
@@ -291,6 +292,7 @@ public static class EventType {
291292
public static final String FEEDS_COMMENT_REACTION_ADDED = "feeds.comment.reaction.added";
292293
public static final String FEEDS_COMMENT_REACTION_DELETED = "feeds.comment.reaction.deleted";
293294
public static final String FEEDS_COMMENT_REACTION_UPDATED = "feeds.comment.reaction.updated";
295+
public static final String FEEDS_COMMENT_RESTORED = "feeds.comment.restored";
294296
public static final String FEEDS_COMMENT_UPDATED = "feeds.comment.updated";
295297
public static final String FEEDS_FEED_CREATED = "feeds.feed.created";
296298
public static final String FEEDS_FEED_DELETED = "feeds.feed.deleted";
@@ -632,6 +634,8 @@ private static Class<?> getEventClass(String eventType) throws WebhookException
632634
return CommentReactionDeletedEvent.class;
633635
case "feeds.comment.reaction.updated":
634636
return CommentReactionUpdatedEvent.class;
637+
case "feeds.comment.restored":
638+
return CommentRestoredEvent.class;
635639
case "feeds.comment.updated":
636640
return CommentUpdatedEvent.class;
637641
case "feeds.feed.created":

src/main/java/io/getstream/models/ActivityRequest.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ public class ActivityRequest {
2929
@JsonProperty("feeds")
3030
private List<String> feeds;
3131

32+
/**
33+
* @deprecated
34+
*/
35+
@Deprecated
3236
@Nullable
3337
@JsonProperty("copy_custom_to_notification")
3438
private Boolean copyCustomToNotification;

src/main/java/io/getstream/models/ActivityResponse.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,4 +183,8 @@ public class ActivityResponse {
183183
@Nullable
184184
@JsonProperty("poll")
185185
private PollResponseData poll;
186+
187+
@Nullable
188+
@JsonProperty("score_vars")
189+
private Map<String, Object> scoreVars;
186190
}

src/main/java/io/getstream/models/AddActivityReactionRequest.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ public class AddActivityReactionRequest {
2626
@JsonProperty("type")
2727
private String type;
2828

29+
/**
30+
* @deprecated
31+
*/
32+
@Deprecated
2933
@Nullable
3034
@JsonProperty("copy_custom_to_notification")
3135
private Boolean copyCustomToNotification;

src/main/java/io/getstream/models/AddActivityRequest.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ public class AddActivityRequest {
3030
@JsonProperty("feeds")
3131
private List<String> feeds;
3232

33+
/**
34+
* @deprecated
35+
*/
36+
@Deprecated
3337
@Nullable
3438
@JsonProperty("copy_custom_to_notification")
3539
private Boolean copyCustomToNotification;

src/main/java/io/getstream/models/AddCommentReactionRequest.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ public class AddCommentReactionRequest {
2626
@JsonProperty("type")
2727
private String type;
2828

29+
/**
30+
* @deprecated
31+
*/
32+
@Deprecated
2933
@Nullable
3034
@JsonProperty("copy_custom_to_notification")
3135
private Boolean copyCustomToNotification;

src/main/java/io/getstream/models/AddCommentRequest.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ public class AddCommentRequest {
3131
@JsonProperty("comment")
3232
private String comment;
3333

34+
/**
35+
* @deprecated
36+
*/
37+
@Deprecated
3438
@Nullable
3539
@JsonProperty("copy_custom_to_notification")
3640
private Boolean copyCustomToNotification;

src/main/java/io/getstream/models/AddReactionRequest.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ public class AddReactionRequest {
2525
@JsonProperty("type")
2626
private String type;
2727

28+
/**
29+
* @deprecated
30+
*/
31+
@Deprecated
2832
@Nullable
2933
@JsonProperty("copy_custom_to_notification")
3034
private Boolean copyCustomToNotification;

src/main/java/io/getstream/models/AddUserGroupMembersRequest.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ public class AddUserGroupMembersRequest {
2929
@JsonProperty("member_ids")
3030
private List<String> memberIds;
3131

32+
@Nullable
33+
@JsonProperty("as_admin")
34+
private Boolean asAdmin;
35+
3236
@Nullable
3337
@JsonProperty("team_id")
3438
private String teamID;

src/main/java/io/getstream/models/AggregationConfig.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,8 @@ public class AggregationConfig {
2424
@Nullable
2525
@JsonProperty("format")
2626
private String format;
27+
28+
@Nullable
29+
@JsonProperty("score_strategy")
30+
private String scoreStrategy;
2731
}

0 commit comments

Comments
 (0)