From b357e18501b22224adc108ae8d1496cc25b534d5 Mon Sep 17 00:00:00 2001 From: Ali Momen Sani Date: Thu, 2 Oct 2025 13:59:11 +0200 Subject: [PATCH 1/4] add getters and equals and hashCode to most request classes for better testablity also fixed getter missing in javadoc --- build.gradle | 13 +-- .../io/getstream/chat/java/models/App.java | 80 ++++++++----------- .../getstream/chat/java/models/Blocklist.java | 8 ++ .../chat/java/models/SharedLocation.java | 14 +++- .../io/getstream/chat/java/models/User.java | 43 +++++++++- .../services/framework/DefaultClient.java | 4 + .../java/io/getstream/chat/java/AppTest.java | 18 +++-- 7 files changed, 119 insertions(+), 61 deletions(-) diff --git a/build.gradle b/build.gradle index 8ad87d489..a4da87f7a 100644 --- a/build.gradle +++ b/build.gradle @@ -4,6 +4,7 @@ plugins { id 'com.diffplug.spotless' version '6.25.0' id 'org.barfuin.gradle.jacocolog' version '3.1.0' id 'com.github.johnrengelman.shadow' version '8.1.1' + id 'io.freefair.lombok' version '8.4' } group = 'io.getstream' @@ -39,12 +40,7 @@ dependencies { runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.12.5' testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.8.2' testImplementation 'org.apache.commons:commons-lang3:3.12.0' - compileOnly 'org.projectlombok:lombok:1.18.32' - annotationProcessor 'org.projectlombok:lombok:1.18.32' compileOnly 'org.jetbrains:annotations:24.1.0' - - testCompileOnly 'org.projectlombok:lombok:1.18.32' - testAnnotationProcessor 'org.projectlombok:lombok:1.18.32' } def localProperties = new Properties() @@ -110,4 +106,11 @@ shadowJar { mergeServiceFiles() } +// Configure javadoc to use delomboked sources +javadoc { + dependsOn delombok + source = delombok.target + options.addStringOption('Xdoclint:none', '-quiet') +} + apply from: "publish.gradle" diff --git a/src/main/java/io/getstream/chat/java/models/App.java b/src/main/java/io/getstream/chat/java/models/App.java index c2e463b2f..c9c3f3839 100644 --- a/src/main/java/io/getstream/chat/java/models/App.java +++ b/src/main/java/io/getstream/chat/java/models/App.java @@ -27,7 +27,6 @@ import java.security.InvalidKeyException; import java.security.Key; import java.security.NoSuchAlgorithmException; -import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; @@ -586,7 +585,8 @@ public static class DeviceError { } @Builder - @Setter + @Getter + @EqualsAndHashCode public static class AsyncModerationCallback { @Nullable @JsonProperty("mode") @@ -598,7 +598,8 @@ public static class AsyncModerationCallback { } @Builder - @Setter + @Getter + @EqualsAndHashCode public static class AsyncModerationConfigRequestObject { @Nullable @JsonProperty("callback") @@ -610,7 +611,8 @@ public static class AsyncModerationConfigRequestObject { } @Builder - @Setter + @Getter + @EqualsAndHashCode public static class FileUploadConfigRequestObject { @Nullable @@ -641,7 +643,8 @@ public static FileUploadConfigRequestObject buildFrom( } @Builder - @Setter + @Getter + @EqualsAndHashCode public static class APNConfigRequestObject { @Nullable @JsonProperty("development") @@ -686,9 +689,9 @@ public static APNConfigRequestObject buildFrom(@Nullable APNConfig aPNConfig) { } @Builder - @Setter + @Getter + @EqualsAndHashCode public static class FirebaseConfigRequestObject { - @Nullable @JsonProperty("server_key") private String serverKey; @@ -716,7 +719,8 @@ public static FirebaseConfigRequestObject buildFrom(@Nullable FirebaseConfig fir } @Builder - @Setter + @Getter + @EqualsAndHashCode public static class HuaweiConfigRequestObject { @Nullable @JsonProperty("id") @@ -728,7 +732,8 @@ public static class HuaweiConfigRequestObject { } @Builder - @Setter + @Getter + @EqualsAndHashCode public static class PushConfigRequestObject { @Nullable @JsonProperty("version") @@ -758,6 +763,8 @@ protected Call generateCall(Client client) { } } + @Getter + @EqualsAndHashCode(callSuper = true) public static class DeletePushProviderRequest extends StreamRequest { private String providerType; private String name; @@ -777,6 +784,8 @@ protected Call generateCall(Client client) { builderClassName = "AppUpdateRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class AppUpdateRequestData { @Nullable @JsonProperty("disable_auth_checks") @@ -965,6 +974,11 @@ public boolean equals(Object o) { } } + @Builder + @Getter + @EqualsAndHashCode(callSuper = true) + @NoArgsConstructor + @AllArgsConstructor public static class AppGetRateLimitsRequest extends StreamRequest { @Nullable private Boolean serverSide; @@ -974,43 +988,7 @@ public static class AppGetRateLimitsRequest extends StreamRequest endpoints = new ArrayList<>(); - - @NotNull - public AppGetRateLimitsRequest serverSide(@NotNull Boolean serverSide) { - this.serverSide = serverSide; - return this; - } - - @NotNull - public AppGetRateLimitsRequest android(@NotNull Boolean android) { - this.android = android; - return this; - } - - @NotNull - public AppGetRateLimitsRequest ios(@NotNull Boolean ios) { - this.ios = ios; - return this; - } - - @NotNull - public AppGetRateLimitsRequest web(@NotNull Boolean web) { - this.web = web; - return this; - } - - @NotNull - public AppGetRateLimitsRequest endpoints(@NotNull List endpoints) { - this.endpoints = endpoints; - return this; - } - - @NotNull - public AppGetRateLimitsRequest endpoint(@NotNull String endpoint) { - this.endpoints.add(endpoint); - return this; - } + @Singular @Nullable private List endpoints; @Override protected Call generateCall(Client client) { @@ -1029,6 +1007,8 @@ protected Call generateCall(Client client) { builderClassName = "AppCheckSqsRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class AppCheckSqsRequestData { @Nullable @JsonProperty("sqs_url") @@ -1054,6 +1034,8 @@ protected Call generateCall(Client client) { builderClassName = "AppCheckSnsRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class AppCheckSnsRequestData { @Nullable @JsonProperty("sns_topic_arn") @@ -1079,6 +1061,8 @@ protected Call generateCall(Client client) { builderClassName = "AppCheckPushRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class AppCheckPushRequestData { @Nullable @JsonProperty("message_id") @@ -1125,6 +1109,8 @@ protected Call generateCall(Client client) { } @AllArgsConstructor + @Getter + @EqualsAndHashCode(callSuper = true) public static class AppRevokeTokensRequest extends StreamRequest { @Nullable private Date revokeTokensIssuedBefore; @@ -1212,6 +1198,8 @@ public static class PushProvider { builderClassName = "PushProviderRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class PushProviderRequestData { @JsonProperty("push_provider") private PushProvider pushProvider; diff --git a/src/main/java/io/getstream/chat/java/models/Blocklist.java b/src/main/java/io/getstream/chat/java/models/Blocklist.java index 72774d759..1ba22277d 100644 --- a/src/main/java/io/getstream/chat/java/models/Blocklist.java +++ b/src/main/java/io/getstream/chat/java/models/Blocklist.java @@ -37,6 +37,8 @@ public class Blocklist { builderClassName = "BlocklistCreateRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class BlocklistCreateRequestData { @Nullable @JsonProperty("name") @@ -55,6 +57,8 @@ protected Call generateCall(Client client) { } @RequiredArgsConstructor + @Getter + @EqualsAndHashCode(callSuper = true) public static class BlocklistGetRequest extends StreamRequest { @NotNull private String name; @@ -68,6 +72,8 @@ protected Call generateCall(Client client) { builderClassName = "BlocklistUpdateRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class BlocklistUpdateRequestData { @Nullable @JsonProperty("words") @@ -88,6 +94,8 @@ protected Call generateCall(Client client) { } @RequiredArgsConstructor + @Getter + @EqualsAndHashCode(callSuper = true) public static class BlocklistDeleteRequest extends StreamRequest { @NotNull private String name; diff --git a/src/main/java/io/getstream/chat/java/models/SharedLocation.java b/src/main/java/io/getstream/chat/java/models/SharedLocation.java index 32ce19938..bc54b1811 100644 --- a/src/main/java/io/getstream/chat/java/models/SharedLocation.java +++ b/src/main/java/io/getstream/chat/java/models/SharedLocation.java @@ -27,7 +27,10 @@ public class SharedLocation { @JsonProperty("end_at") private Date endAt; + @JsonProperty("latitude") private Double latitude; + + @JsonProperty("longitude") private Double longitude; @JsonProperty("message_id") @@ -52,9 +55,13 @@ public static class SharedLocationRequest { @JsonProperty("end_at") private String endAt; - @Nullable private Double latitude; + @Nullable + @JsonProperty("latitude") + private Double latitude; - @Nullable private Double longitude; + @Nullable + @JsonProperty("longitude") + private Double longitude; @JsonProperty("user_id") private String userId; @@ -70,7 +77,10 @@ public static class SharedLocationResponse extends StreamResponseObject { @JsonProperty("end_at") private String endAt; + @JsonProperty("latitude") private Double latitude; + + @JsonProperty("longitude") private Double longitude; } diff --git a/src/main/java/io/getstream/chat/java/models/User.java b/src/main/java/io/getstream/chat/java/models/User.java index 6919cf832..3d9e711e4 100644 --- a/src/main/java/io/getstream/chat/java/models/User.java +++ b/src/main/java/io/getstream/chat/java/models/User.java @@ -346,10 +346,11 @@ public static class UserMute { @Builder @Setter + @Getter + @EqualsAndHashCode public static class UserRequestObject { @NotNull @JsonProperty("id") - @Getter private String id; @Nullable @@ -399,6 +400,8 @@ public static UserRequestObject buildFrom(@Nullable User user) { } @Builder + @Getter + @EqualsAndHashCode public static class UserPartialUpdateRequestObject { @Nullable @JsonProperty("id") @@ -417,6 +420,8 @@ public static class UserPartialUpdateRequestObject { @Builder @Setter + @Getter + @EqualsAndHashCode public static class OwnUserRequestObject { @Nullable @JsonProperty("id") @@ -521,6 +526,8 @@ public static OwnUserRequestObject buildFrom(@Nullable OwnUser ownUser) { @Builder @Setter + @Getter + @EqualsAndHashCode public static class UserMuteRequestObject { @Nullable @JsonProperty("user") @@ -550,6 +557,8 @@ public static UserMuteRequestObject buildFrom(@Nullable UserMute userMute) { @Builder @Setter + @Getter + @EqualsAndHashCode public static class ChannelMuteRequestObject { @Nullable @JsonProperty("user") @@ -581,6 +590,8 @@ public static ChannelMuteRequestObject buildFrom(@Nullable ChannelMute channelMu builderClassName = "UserUpsertRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class UserUpsertRequestData { @Nullable @JsonProperty("users") @@ -610,6 +621,8 @@ protected Call generateCall(Client client) { builderClassName = "UserListRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class UserListRequestData { // Singular is required because cannot be null @Singular @@ -662,6 +675,8 @@ protected Call generateCall(Client client) { builderClassName = "UserPartialUpdateRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class UserPartialUpdateRequestData { @Singular @Nullable @@ -680,6 +695,8 @@ protected Call generateCall(Client client) { builderClassName = "UserQueryBannedRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class UserQueryBannedRequestData { // Singular is required because cannot be null @Singular @@ -736,6 +753,8 @@ protected Call generateCall(Client client) { builderClassName = "UserBanRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class UserBanRequestData { @Nullable @JsonProperty("target_user_id") @@ -793,6 +812,8 @@ protected Call generateCall(Client client) { builderClassName = "UserDeactivateRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class UserDeactivateRequestData { @NotNull @JsonProperty("user_id") @@ -807,7 +828,6 @@ public static class UserDeactivateRequestData { private String createdById; public static class UserDeactivateRequest extends StreamRequest { - private UserDeactivateRequest(@NotNull String userId) { this.userId = userId; } @@ -820,6 +840,8 @@ protected Call generateCall(Client client) { } @RequiredArgsConstructor + @Getter + @EqualsAndHashCode(callSuper = true) public static class UserDeleteRequest extends StreamRequest { @NotNull private String userId; @@ -860,6 +882,8 @@ protected Call generateCall(Client client) { builderClassName = "UserDeleteManyRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class UserDeleteManyRequestData { @NotNull @JsonProperty("user_ids") @@ -901,7 +925,6 @@ protected Call generateCall(Client client) throws Stream @EqualsAndHashCode(callSuper = true) public static class UserDeleteManyResponse extends StreamResponseObject { @JsonProperty("task_id") - @Getter private String taskId; } @@ -909,6 +932,8 @@ public static class UserDeleteManyResponse extends StreamResponseObject { builderClassName = "UserReactivateRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class UserReactivateRequestData { @Nullable @JsonProperty("user_id") @@ -943,6 +968,8 @@ protected Call generateCall(Client client) { builderClassName = "UserMuteRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class UserMuteRequestData { @Nullable @JsonProperty("target_id") @@ -977,6 +1004,8 @@ protected Call generateCall(Client client) { builderClassName = "UserUnmuteRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class UserUnmuteRequestData { @Nullable @JsonProperty("target_id") @@ -1011,6 +1040,8 @@ protected Call generateCall(Client client) { builderClassName = "UserCreateGuestRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class UserCreateGuestRequestData { @Nullable @JsonProperty("user") @@ -1025,6 +1056,8 @@ protected Call generateCall(Client client) { } @RequiredArgsConstructor + @Getter + @EqualsAndHashCode(callSuper = true) public static class UserExportRequest extends StreamRequest { @NotNull private String userId; @@ -1035,6 +1068,8 @@ protected Call generateCall(Client client) { } @RequiredArgsConstructor + @Getter + @EqualsAndHashCode(callSuper = true) public static class UserUnbanRequest extends StreamRequest { @NotNull private String targetUserId; @@ -1069,6 +1104,8 @@ protected Call generateCall(Client client) { } @AllArgsConstructor + @Getter + @EqualsAndHashCode(callSuper = true) public static class UserRevokeTokensRequest extends StreamRequest { @NotNull private List userIds = new ArrayList<>(); diff --git a/src/main/java/io/getstream/chat/java/services/framework/DefaultClient.java b/src/main/java/io/getstream/chat/java/services/framework/DefaultClient.java index a7cde7510..a975e7d2a 100644 --- a/src/main/java/io/getstream/chat/java/services/framework/DefaultClient.java +++ b/src/main/java/io/getstream/chat/java/services/framework/DefaultClient.java @@ -1,5 +1,7 @@ package io.getstream.chat.java.services.framework; +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.PropertyAccessor; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.util.StdDateFormat; @@ -102,6 +104,8 @@ private Retrofit buildRetrofitClient() { return chain.proceed(request); }); final ObjectMapper mapper = new ObjectMapper(); + // do not encode getter methods in json + mapper.setVisibility(PropertyAccessor.GETTER, JsonAutoDetect.Visibility.NONE); mapper.configure( DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, hasFailOnUnknownProperties(extendedProperties)); diff --git a/src/test/java/io/getstream/chat/java/AppTest.java b/src/test/java/io/getstream/chat/java/AppTest.java index 19d812611..458753a57 100644 --- a/src/test/java/io/getstream/chat/java/AppTest.java +++ b/src/test/java/io/getstream/chat/java/AppTest.java @@ -1,5 +1,7 @@ package io.getstream.chat.java; +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.PropertyAccessor; import com.fasterxml.jackson.databind.ObjectMapper; import io.getstream.chat.java.exceptions.StreamException; import io.getstream.chat.java.models.App; @@ -26,9 +28,6 @@ import org.junit.jupiter.api.Test; public class AppTest extends BasicTest { - private AppCheckSnsResponse.Status SnsStatus; - private AppCheckSqsResponse.Status SqsStatus; - @DisplayName("App Get does not throw Exception") @Test void whenCallingGetApp_thenNoException() { @@ -82,6 +81,14 @@ void givenBadSecret_whenEnableAuthAndGettingApp_thenException() { @Test void whenCallingGetRateLimits_thenNoException() { Assertions.assertDoesNotThrow(() -> App.getRateLimits().request()); + Assertions.assertDoesNotThrow( + () -> + App.AppGetRateLimitsRequest.builder() + .android(true) + .ios(true) + .endpoint("QueryChannels") + .build() + .request()); } @DisplayName("Can check sqs") @@ -95,7 +102,7 @@ void whenCheckingBadSqs_thenError() { .sqsSecret("secret") .sqsUrl("https://foo.com/bar") .request()); - Assertions.assertEquals(SqsStatus.ERROR, response.getStatus()); + Assertions.assertEquals(AppCheckSqsResponse.Status.ERROR, response.getStatus()); } @DisplayName("Can check sns") @@ -109,7 +116,7 @@ void whenCheckingBadSns_thenError() { .snsSecret("secret") .snsTopicArn("arn:aws:sns:us-east-1:123456789012:sns-topic") .request()); - Assertions.assertEquals(SnsStatus.ERROR, response.getStatus()); + Assertions.assertEquals(AppCheckSnsResponse.Status.ERROR, response.getStatus()); } @DisplayName("Can check push templates") @@ -272,6 +279,7 @@ void whenUpdatingAppSettingsWithPendingMessageEventHook_thenNoException() throws void whenEncodingAppConfig_thenNoNullFields() { var appConfig = App.update().internalBuild(); final ObjectMapper mapper = new ObjectMapper(); + mapper.setVisibility(PropertyAccessor.GETTER, JsonAutoDetect.Visibility.NONE); String json = Assertions.assertDoesNotThrow(() -> mapper.writeValueAsString(appConfig)); From b8bdf2e0be6dc15aa5cd0eb96438ebe14b6c5954 Mon Sep 17 00:00:00 2001 From: Ali Momen Sani Date: Thu, 2 Oct 2025 16:40:29 +0200 Subject: [PATCH 2/4] update deprecated code --- .../io/getstream/chat/java/models/User.java | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/main/java/io/getstream/chat/java/models/User.java b/src/main/java/io/getstream/chat/java/models/User.java index 3d9e711e4..cd9643c5c 100644 --- a/src/main/java/io/getstream/chat/java/models/User.java +++ b/src/main/java/io/getstream/chat/java/models/User.java @@ -24,13 +24,12 @@ import io.getstream.chat.java.services.UserService; import io.getstream.chat.java.services.framework.Client; import io.jsonwebtoken.Jwts; -import io.jsonwebtoken.SignatureAlgorithm; +import io.jsonwebtoken.security.Keys; import java.nio.charset.StandardCharsets; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; -import javax.crypto.spec.SecretKeySpec; import lombok.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -1473,9 +1472,7 @@ public static String createToken( @NotNull String userId, @Nullable Date expiresAt, @Nullable Date issuedAt) { - var signingKey = - new SecretKeySpec( - apiSecret.getBytes(StandardCharsets.UTF_8), SignatureAlgorithm.HS256.getJcaName()); + var signingKey = Keys.hmacShaKeyFor(apiSecret.getBytes(StandardCharsets.UTF_8)); if (issuedAt == null) { GregorianCalendar calendar = new GregorianCalendar(); @@ -1485,11 +1482,11 @@ public static String createToken( return Jwts.builder() .claim("user_id", userId) - .setExpiration(expiresAt) - .setIssuedAt(issuedAt) - .setIssuer("Stream Chat Java SDK") - .setSubject("Stream Chat Java SDK") - .signWith(signingKey, SignatureAlgorithm.HS256) + .expiration(expiresAt) + .issuedAt(issuedAt) + .issuer("Stream Chat Java SDK") + .subject("Stream Chat Java SDK") + .signWith(signingKey, Jwts.SIG.HS256) .compact(); } } From 83ae1a0b88717aba6c32b5f6e64541eb58a0aa17 Mon Sep 17 00:00:00 2001 From: Ali Momen Sani Date: Wed, 8 Oct 2025 11:01:42 +0200 Subject: [PATCH 3/4] add @Getter and @EqualsAndHashCode to request classes --- .../getstream/chat/java/models/BlockUser.java | 8 +++- .../getstream/chat/java/models/Channel.java | 42 ++++++++++++++++++ .../chat/java/models/ChannelType.java | 13 ++++++ .../getstream/chat/java/models/Command.java | 8 ++++ .../io/getstream/chat/java/models/Device.java | 8 ++++ .../io/getstream/chat/java/models/Draft.java | 8 ++++ .../io/getstream/chat/java/models/Event.java | 8 ++++ .../chat/java/models/ExportUsers.java | 3 ++ .../io/getstream/chat/java/models/Flag.java | 10 +++++ .../io/getstream/chat/java/models/Import.java | 7 +++ .../getstream/chat/java/models/Message.java | 44 +++++++++++++++++++ .../chat/java/models/MessageHistory.java | 2 + .../models/MessagePaginationParameters.java | 4 ++ .../chat/java/models/Moderation.java | 10 +++++ .../java/models/PaginationParameters.java | 4 ++ .../chat/java/models/Permission.java | 8 ++++ .../getstream/chat/java/models/Reaction.java | 8 ++++ .../getstream/chat/java/models/Reminder.java | 9 ++++ .../io/getstream/chat/java/models/Role.java | 4 ++ .../chat/java/models/SharedLocation.java | 5 +++ .../io/getstream/chat/java/models/Sort.java | 4 ++ .../io/getstream/chat/java/models/Thread.java | 2 + .../chat/java/models/UnreadCounts.java | 4 ++ 23 files changed, 221 insertions(+), 2 deletions(-) diff --git a/src/main/java/io/getstream/chat/java/models/BlockUser.java b/src/main/java/io/getstream/chat/java/models/BlockUser.java index d0f1f7430..ee362df8b 100644 --- a/src/main/java/io/getstream/chat/java/models/BlockUser.java +++ b/src/main/java/io/getstream/chat/java/models/BlockUser.java @@ -19,6 +19,8 @@ public class BlockUser { builderClassName = "BlockUserRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class BlockUserRequestData { @NotNull @JsonProperty("blocked_user_id") @@ -41,6 +43,8 @@ protected Call generateCall(Client client) { builderClassName = "UnblockUserRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class UnblockUserRequestData { @NotNull @JsonProperty("blocked_user_id") @@ -119,14 +123,14 @@ public static class BlockedUserResponse { builderClassName = "GetBlockedUsersRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class GetBlockedUsersRequestData { @NotNull @JsonProperty("user_id") private String blockedByUserID; public static class GetBlockedUsersRequest extends StreamRequest { - private String blockedByUserID; - public GetBlockedUsersRequest(String blockedByUserID) { this.blockedByUserID = blockedByUserID; } diff --git a/src/main/java/io/getstream/chat/java/models/Channel.java b/src/main/java/io/getstream/chat/java/models/Channel.java index f24e27087..7e7bb4d5f 100644 --- a/src/main/java/io/getstream/chat/java/models/Channel.java +++ b/src/main/java/io/getstream/chat/java/models/Channel.java @@ -252,6 +252,8 @@ public static class RoleAssignment { @Builder @Setter + @Getter + @EqualsAndHashCode public static class ChannelRequestObject { @Nullable @JsonProperty("created_by") @@ -328,6 +330,8 @@ private ChannelRequestObject( @Builder @Setter + @Getter + @EqualsAndHashCode public static class ChannelMemberRequestObject { @Nullable @JsonProperty("user_id") @@ -400,6 +404,8 @@ public static ChannelMemberRequestObject buildFrom(@Nullable ChannelMember chann } @Builder + @Getter + @EqualsAndHashCode public static class ConfigOverridesRequestObject { @Nullable @JsonProperty("typing_events") @@ -451,6 +457,8 @@ public static class ConfigOverridesRequestObject { } @Builder + @Getter + @EqualsAndHashCode public static class ChannelExportRequestObject { @Nullable @JsonProperty("type") @@ -473,6 +481,8 @@ public static class ChannelExportRequestObject { builderClassName = "ChannelGetRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class ChannelGetRequestData { @Nullable @JsonProperty("connection_id") @@ -534,6 +544,8 @@ protected Call generateCall(Client client) { builderClassName = "ChannelUpdateRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class ChannelUpdateRequestData { // Singular is required because cannot be null @Singular @@ -624,6 +636,8 @@ protected Call generateCall(Client client) { builderClassName = "AssignRoleRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class AssignRoleRequestData { @Singular @Nullable @@ -653,6 +667,8 @@ protected Call generateCall(Client client) { } } + @Getter + @EqualsAndHashCode(callSuper = true) @RequiredArgsConstructor public static class ChannelDeleteRequest extends StreamRequest { @NotNull private String channelType; @@ -665,6 +681,8 @@ protected Call generateCall(Client client) { } } + @Getter + @EqualsAndHashCode(callSuper = true) @RequiredArgsConstructor public static class ChannelDeleteManyRequest extends StreamRequest { @JsonProperty("cids") @@ -692,6 +710,8 @@ protected Call generateCall(Client svcFactory) builderClassName = "ChannelListRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class ChannelListRequestData { @Singular @Nullable @@ -755,6 +775,8 @@ protected Call generateCall(Client client) { builderClassName = "ChannelTruncateRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class ChannelTruncateRequestData { @Nullable @JsonProperty("hard_delete") @@ -803,6 +825,8 @@ protected Call generateCall(Client client) { builderClassName = "ChannelQueryMembersRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class ChannelQueryMembersRequestData { @Nullable @JsonProperty("type") @@ -888,6 +912,8 @@ protected Call generateCall(Client client) { builderClassName = "ChannelExportRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class ChannelExportRequestData { @Singular @Nullable @@ -918,6 +944,8 @@ protected Call generateCall(Client client) { } } + @Getter + @EqualsAndHashCode(callSuper = true) @RequiredArgsConstructor public static class ChannelExportStatusRequest extends StreamRequest { @@ -933,6 +961,8 @@ protected Call generateCall(Client client) { builderClassName = "ChannelHideRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class ChannelHideRequestData { @Nullable @JsonProperty("clear_history") @@ -969,6 +999,8 @@ protected Call generateCall(Client client) { builderClassName = "ChannelMarkAllReadRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class ChannelMarkAllReadRequestData { @Nullable @JsonProperty("user_id") @@ -990,6 +1022,8 @@ protected Call generateCall(Client client) { builderClassName = "ChannelMarkReadRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class ChannelMarkReadRequestData { @Nullable @JsonProperty("message_id") @@ -1026,6 +1060,8 @@ protected Call generateCall(Client client) { builderClassName = "ChannelMuteRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class ChannelMuteRequestData { @Nullable @JsonProperty("channel_cid") @@ -1059,6 +1095,8 @@ protected Call generateCall(Client client) { builderClassName = "ChannelShowRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class ChannelShowRequestData { @Nullable @@ -1125,6 +1163,8 @@ protected Call generateCall(Client client) { builderClassName = "ChannelPartialUpdateRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class ChannelPartialUpdateRequestData { @Nullable @JsonProperty("user_id") @@ -1168,6 +1208,8 @@ protected Call generateCall(Client client) { builderClassName = "ChannelMemberPartialUpdateRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class ChannelMemberPartialUpdateRequestData { @Singular @Nullable diff --git a/src/main/java/io/getstream/chat/java/models/ChannelType.java b/src/main/java/io/getstream/chat/java/models/ChannelType.java index e09a592c0..b7e159303 100644 --- a/src/main/java/io/getstream/chat/java/models/ChannelType.java +++ b/src/main/java/io/getstream/chat/java/models/ChannelType.java @@ -17,6 +17,7 @@ import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.Getter; import lombok.NoArgsConstructor; import lombok.RequiredArgsConstructor; import lombok.Setter; @@ -258,6 +259,8 @@ public static class ChannelTypeWithCommands extends ChannelType { @Builder @Setter + @Getter + @EqualsAndHashCode public static class ThresholdRequestObject { @Nullable @JsonProperty("flag") @@ -275,6 +278,8 @@ public static ThresholdRequestObject buildFrom(@Nullable Threshold threshold) { @Builder @Setter + @Getter + @EqualsAndHashCode public static class PermissionRequestObject { @Nullable @JsonProperty("name") @@ -310,6 +315,8 @@ public static PermissionRequestObject buildFrom(@Nullable Policy policy) { builderClassName = "ChannelTypeCreateRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class ChannelTypeCreateRequestData { @Nullable @JsonProperty("typing_events") @@ -439,6 +446,8 @@ protected Call generateCall(Client client) { } } + @Getter + @EqualsAndHashCode(callSuper = true) @RequiredArgsConstructor public static class ChannelTypeGetRequest extends StreamRequest { @NotNull private String name; @@ -453,6 +462,8 @@ protected Call generateCall(Client client) { builderClassName = "ChannelTypeUpdateRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class ChannelTypeUpdateRequestData { @Nullable @JsonProperty("typing_events") @@ -570,6 +581,8 @@ protected Call generateCall(Client client) { } } + @Getter + @EqualsAndHashCode(callSuper = true) @RequiredArgsConstructor public static class ChannelTypeDeleteRequest extends StreamRequest { @NotNull private String name; diff --git a/src/main/java/io/getstream/chat/java/models/Command.java b/src/main/java/io/getstream/chat/java/models/Command.java index fd17b192c..4b6ab18bc 100644 --- a/src/main/java/io/getstream/chat/java/models/Command.java +++ b/src/main/java/io/getstream/chat/java/models/Command.java @@ -46,6 +46,8 @@ public class Command { builderClassName = "CommandCreateRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class CommandCreateRequestData { @Nullable @JsonProperty("name") @@ -71,6 +73,8 @@ protected Call generateCall(Client client) { } } + @Getter + @EqualsAndHashCode(callSuper = true) @RequiredArgsConstructor public static class CommandGetRequest extends StreamRequest { @NotNull private String name; @@ -85,6 +89,8 @@ protected Call generateCall(Client client) { builderClassName = "CommandUpdateRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class CommandUpdateRequestData { @Nullable @JsonProperty("description") @@ -112,6 +118,8 @@ protected Call generateCall(Client client) { } } + @Getter + @EqualsAndHashCode(callSuper = true) @RequiredArgsConstructor public static class CommandDeleteRequest extends StreamRequest { @NotNull private String name; diff --git a/src/main/java/io/getstream/chat/java/models/Device.java b/src/main/java/io/getstream/chat/java/models/Device.java index 530e63790..742ea6c7b 100644 --- a/src/main/java/io/getstream/chat/java/models/Device.java +++ b/src/main/java/io/getstream/chat/java/models/Device.java @@ -49,6 +49,8 @@ public class Device { @Builder @Setter + @Getter + @EqualsAndHashCode public static class DeviceRequestObject { @Nullable @JsonProperty("push_provider") @@ -88,6 +90,8 @@ public static DeviceRequestObject buildFrom(@Nullable Device device) { builderClassName = "DeviceCreateRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class DeviceCreateRequestData { @Nullable @JsonProperty("push_provider") @@ -117,6 +121,8 @@ protected Call generateCall(Client client) { } } + @Getter + @EqualsAndHashCode(callSuper = true) @RequiredArgsConstructor public static class DeviceDeleteRequest extends StreamRequest { @NotNull private String id; @@ -141,6 +147,8 @@ protected Call generateCall(Client client) { } } + @Getter + @EqualsAndHashCode(callSuper = true) @RequiredArgsConstructor public static class DeviceListRequest extends StreamRequest { @NotNull private String userId; diff --git a/src/main/java/io/getstream/chat/java/models/Draft.java b/src/main/java/io/getstream/chat/java/models/Draft.java index 4d80c117f..084c4c232 100644 --- a/src/main/java/io/getstream/chat/java/models/Draft.java +++ b/src/main/java/io/getstream/chat/java/models/Draft.java @@ -149,6 +149,8 @@ public static class QueryDraftsResponse extends StreamResponseObject { builderClassName = "CreateDraftRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class CreateDraftRequestData { @NotNull @JsonProperty("message") @@ -181,6 +183,8 @@ protected Call generateCall(Client client) throws StreamExc } /** Request for deleting a draft. */ + @Getter + @EqualsAndHashCode(callSuper = true) public static class DeleteDraftRequest extends StreamRequest { @NotNull private String channelType; @NotNull private String channelId; @@ -213,6 +217,8 @@ protected Call generateCall(Client client) throws StreamEx } /** Request for getting a draft. */ + @Getter + @EqualsAndHashCode(callSuper = true) public static class GetDraftRequest extends StreamRequest { @NotNull private String channelType; @NotNull private String channelId; @@ -249,6 +255,8 @@ protected Call generateCall(Client client) throws StreamExcept builderClassName = "QueryDraftsRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class QueryDraftsRequestData { @Nullable @JsonProperty("filter") diff --git a/src/main/java/io/getstream/chat/java/models/Event.java b/src/main/java/io/getstream/chat/java/models/Event.java index 9fbdc2c08..8307a2a15 100644 --- a/src/main/java/io/getstream/chat/java/models/Event.java +++ b/src/main/java/io/getstream/chat/java/models/Event.java @@ -126,6 +126,8 @@ public void setAdditionalField(String name, Object value) { @Builder @Setter + @Getter + @EqualsAndHashCode public static class EventRequestObject { @Nullable @JsonProperty("type") @@ -226,6 +228,8 @@ public static EventRequestObject buildFrom(@Nullable Event event) { } @Builder + @Getter + @EqualsAndHashCode public static class EventUserCustomRequestObject { @Nullable @JsonProperty("type") @@ -252,6 +256,8 @@ public void setAdditionalField(String name, Object value) { builderClassName = "EventSendRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class EventSendRequestData { @Nullable @JsonProperty("event") @@ -278,6 +284,8 @@ protected Call generateCall(Client client) { builderClassName = "EventSendUserCustomRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class EventSendUserCustomRequestData { @Nullable @JsonProperty("event") diff --git a/src/main/java/io/getstream/chat/java/models/ExportUsers.java b/src/main/java/io/getstream/chat/java/models/ExportUsers.java index a20d509b7..accf1b51f 100644 --- a/src/main/java/io/getstream/chat/java/models/ExportUsers.java +++ b/src/main/java/io/getstream/chat/java/models/ExportUsers.java @@ -9,6 +9,7 @@ import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.Getter; import lombok.NoArgsConstructor; import org.jetbrains.annotations.NotNull; import retrofit2.Call; @@ -21,6 +22,8 @@ public class ExportUsers { builderClassName = "ExportUsersRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class ExportUsersRequestData { @JsonProperty("user_ids") private List userIds; diff --git a/src/main/java/io/getstream/chat/java/models/Flag.java b/src/main/java/io/getstream/chat/java/models/Flag.java index 14b9cf5bb..d6976ab0c 100644 --- a/src/main/java/io/getstream/chat/java/models/Flag.java +++ b/src/main/java/io/getstream/chat/java/models/Flag.java @@ -211,6 +211,8 @@ public static class Thresholds { builderClassName = "FlagCreateRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class FlagCreateRequestData { @Nullable @JsonProperty("target_message_id") @@ -240,6 +242,8 @@ protected Call generateCall(Client client) { builderClassName = "FlagDeleteRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class FlagDeleteRequestData { @Nullable @JsonProperty("target_message_id") @@ -269,6 +273,8 @@ protected Call generateCall(Client client) { builderClassName = "FlagMessageQueryRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class FlagMessageQueryRequestData { @Nullable @JsonProperty("filter_conditions") @@ -303,6 +309,8 @@ protected Call generateCall(Client client) { builderClassName = "QueryFlagReportsRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class QueryFlagReportsRequestData { @Nullable @JsonProperty("filter_conditions") @@ -337,6 +345,8 @@ protected Call generateCall(Client client) { builderClassName = "ReviewFlagReportRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class ReviewFlagReportRequestData { @NotNull @JsonProperty("review_result") diff --git a/src/main/java/io/getstream/chat/java/models/Import.java b/src/main/java/io/getstream/chat/java/models/Import.java index b6750021e..c559ff538 100644 --- a/src/main/java/io/getstream/chat/java/models/Import.java +++ b/src/main/java/io/getstream/chat/java/models/Import.java @@ -11,6 +11,7 @@ import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.Getter; import lombok.NoArgsConstructor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -81,6 +82,8 @@ public enum ImportState { builderClassName = "CreateImportUrlRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class CreateImportUrlRequestData { @Nullable @JsonProperty("filename") @@ -112,6 +115,8 @@ public static class CreateImportUrlResponse extends StreamResponseObject { builderClassName = "CreateImportRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class CreateImportRequestData { @NotNull @JsonProperty("path") @@ -151,6 +156,8 @@ protected Call generateCall(Client client) { } } + @Getter + @EqualsAndHashCode(callSuper = true) public static class ListImportsRequest extends StreamRequest { private final Integer limit; private final Integer offset; diff --git a/src/main/java/io/getstream/chat/java/models/Message.java b/src/main/java/io/getstream/chat/java/models/Message.java index 3dbadd3fe..4bf5b4c60 100644 --- a/src/main/java/io/getstream/chat/java/models/Message.java +++ b/src/main/java/io/getstream/chat/java/models/Message.java @@ -417,6 +417,8 @@ public static class Moderation { @Builder @Setter + @Getter + @EqualsAndHashCode public static class MessageRequestObject { @Nullable @JsonProperty("id") @@ -530,6 +532,8 @@ public static MessageRequestObject buildFrom(@Nullable Message message) { @Builder @Setter + @Getter + @EqualsAndHashCode public static class AttachmentRequestObject { @Nullable @JsonProperty("type") @@ -625,6 +629,8 @@ public static AttachmentRequestObject buildFrom(@Nullable Attachment attachment) @Builder @Setter + @Getter + @EqualsAndHashCode public static class ActionRequestObject { @Nullable @JsonProperty("name") @@ -654,6 +660,8 @@ public static ActionRequestObject buildFrom(@Nullable Action action) { @Builder @Setter + @Getter + @EqualsAndHashCode public static class FieldRequestObject { @Nullable @JsonProperty("type") @@ -675,6 +683,8 @@ public static FieldRequestObject buildFrom(@Nullable Field field) { @Builder @Setter + @Getter + @EqualsAndHashCode public static class ImageSizeRequestObject { @Nullable @JsonProperty("crop") @@ -700,6 +710,8 @@ public static ImageSizeRequestObject buildFrom(@Nullable ImageSize imageSize) { @Builder @Setter + @Getter + @EqualsAndHashCode public static class ModerationRequestObject { @Nullable @JsonProperty("toxic") @@ -723,6 +735,8 @@ public static ModerationRequestObject buildFrom(@Nullable Moderation moderation) builderClassName = "MessageSendRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class MessageSendRequestData { @Nullable @JsonProperty("message") @@ -767,6 +781,8 @@ protected Call generateCall(Client client) { } } + @Getter + @EqualsAndHashCode(callSuper = true) @RequiredArgsConstructor public static class MessageGetRequest extends StreamRequest { @NotNull private String id; @@ -788,6 +804,8 @@ protected Call generateCall(Client client) { builderClassName = "MessageUpdateRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class MessageUpdateRequestData { @Nullable @JsonProperty("message") @@ -807,6 +825,8 @@ protected Call generateCall(Client client) { } } + @Getter + @EqualsAndHashCode(callSuper = true) @RequiredArgsConstructor public static class MessageDeleteRequest extends StreamRequest { @NotNull private String id; @@ -848,6 +868,8 @@ protected Call generateCall(Client client) { builderClassName = "MessageSearchRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class MessageSearchRequestData { @Nullable @JsonProperty("query") @@ -964,6 +986,8 @@ protected FileHandler getFileHandler() throws StreamException { } } + @Getter + @EqualsAndHashCode(callSuper = true) // We do not use @RequiredArgsConstructor here for uniformity with MessageUploadImageRequest public static class MessageUploadFileRequest extends FileRequest { @NotNull private String channelType; @@ -999,6 +1023,8 @@ public MessageUploadFileResponse request() throws StreamException { } } + @Getter + @EqualsAndHashCode(callSuper = true) @RequiredArgsConstructor public static class MessageUploadImageRequest extends FileRequest { @Nullable private File file; @@ -1033,6 +1059,8 @@ public MessageUploadImageResponse request() throws StreamException { } } + @Getter + @EqualsAndHashCode(callSuper = true) @RequiredArgsConstructor public static class MessageDeleteFileRequest extends FileRequest { @NotNull private String channelType; @@ -1047,6 +1075,8 @@ public StreamResponseObject request() throws StreamException { } } + @Getter + @EqualsAndHashCode(callSuper = true) @RequiredArgsConstructor public static class MessageDeleteImageRequest extends FileRequest { @NotNull private String channelType; @@ -1061,6 +1091,8 @@ public StreamResponseObject request() throws StreamException { } } + @Getter + @EqualsAndHashCode(callSuper = true) @RequiredArgsConstructor public static class MessageGetManyRequest extends StreamRequest { @NotNull private String channelType; @@ -1077,6 +1109,8 @@ protected Call generateCall(Client client) { } } + @Getter + @EqualsAndHashCode(callSuper = true) @RequiredArgsConstructor public static class MessageGetRepliesRequest extends StreamRequest { @NotNull private String parentId; @@ -1182,6 +1216,8 @@ protected Call generateCall(Client client) { builderClassName = "MessageRunCommandActionRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class MessageRunCommandActionRequestData { @Nullable @JsonProperty("form_data") @@ -1216,6 +1252,8 @@ protected Call generateCall(Client client) { builderClassName = "MessageTranslateRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class MessageTranslateRequestData { @Nullable @JsonProperty("language") @@ -1239,6 +1277,8 @@ protected Call generateCall(Client client) { builderClassName = "MessageCommitRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class MessageCommitRequestData { public static class MessageCommitRequest extends StreamRequest { @NotNull private String messageId; @@ -1258,6 +1298,8 @@ protected Call generateCall(Client client) { builderClassName = "MessagePartialUpdateRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class MessagePartialUpdateRequestData { @Nullable @JsonProperty("user_id") @@ -1296,6 +1338,8 @@ protected Call generateCall(Client client) { builderClassName = "MessageUnblockRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class MessageUnblockRequestData { @NotNull @JsonProperty("target_message_id") diff --git a/src/main/java/io/getstream/chat/java/models/MessageHistory.java b/src/main/java/io/getstream/chat/java/models/MessageHistory.java index 2f92eb7e0..8a20b3721 100644 --- a/src/main/java/io/getstream/chat/java/models/MessageHistory.java +++ b/src/main/java/io/getstream/chat/java/models/MessageHistory.java @@ -23,6 +23,8 @@ public class MessageHistory { builderClassName = "MessageHistoryQueryRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class MessageHistoryQueryRequestData { @Nullable @JsonProperty("filter") diff --git a/src/main/java/io/getstream/chat/java/models/MessagePaginationParameters.java b/src/main/java/io/getstream/chat/java/models/MessagePaginationParameters.java index a19935484..aef0c8eef 100644 --- a/src/main/java/io/getstream/chat/java/models/MessagePaginationParameters.java +++ b/src/main/java/io/getstream/chat/java/models/MessagePaginationParameters.java @@ -3,9 +3,13 @@ import com.fasterxml.jackson.annotation.JsonProperty; import java.util.Date; import lombok.Builder; +import lombok.EqualsAndHashCode; +import lombok.Getter; import org.jetbrains.annotations.Nullable; @Builder +@Getter +@EqualsAndHashCode public class MessagePaginationParameters { @Nullable @JsonProperty("limit") diff --git a/src/main/java/io/getstream/chat/java/models/Moderation.java b/src/main/java/io/getstream/chat/java/models/Moderation.java index 5f0b224c7..2cd49fa5b 100644 --- a/src/main/java/io/getstream/chat/java/models/Moderation.java +++ b/src/main/java/io/getstream/chat/java/models/Moderation.java @@ -21,6 +21,8 @@ public class Moderation { builderClassName = "ConfigGetRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class ConfigGetRequestData { public static class ConfigGetRequest extends StreamRequest { @NotNull private String key; @@ -117,6 +119,8 @@ public static class BlockListRule { } @Builder + @Getter + @EqualsAndHashCode public static class BlockListConfigRequestObject { @Nullable @JsonProperty("async") @@ -131,6 +135,8 @@ public static class BlockListConfigRequestObject { builderClassName = "UpsertConfigRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class UpsertConfigRequestData { @Nullable @JsonProperty("key") @@ -169,6 +175,8 @@ public static class UpsertConfigResponse extends StreamResponseObject { private Config config; } + @Getter + @EqualsAndHashCode(callSuper = true) @RequiredArgsConstructor public static class DeleteConfigRequest extends StreamRequest { @NotNull private String key; @@ -179,6 +187,8 @@ protected Call generateCall(Client client) { } } + @Getter + @EqualsAndHashCode(callSuper = true) @RequiredArgsConstructor public static class ConfigGetRequest extends StreamRequest { @NotNull private String key; diff --git a/src/main/java/io/getstream/chat/java/models/PaginationParameters.java b/src/main/java/io/getstream/chat/java/models/PaginationParameters.java index afd3bd596..2525f62df 100644 --- a/src/main/java/io/getstream/chat/java/models/PaginationParameters.java +++ b/src/main/java/io/getstream/chat/java/models/PaginationParameters.java @@ -2,9 +2,13 @@ import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Builder; +import lombok.EqualsAndHashCode; +import lombok.Getter; import org.jetbrains.annotations.Nullable; @Builder +@Getter +@EqualsAndHashCode public class PaginationParameters { @Nullable @JsonProperty("limit") diff --git a/src/main/java/io/getstream/chat/java/models/Permission.java b/src/main/java/io/getstream/chat/java/models/Permission.java index 50a5ba18a..7d63dae6f 100644 --- a/src/main/java/io/getstream/chat/java/models/Permission.java +++ b/src/main/java/io/getstream/chat/java/models/Permission.java @@ -55,6 +55,8 @@ public static class Condition { builderClassName = "PermissionCreateRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class PermissionCreateRequestData { @NotNull @JsonProperty("id") @@ -88,6 +90,8 @@ protected Call generateCall(Client client) { } } + @Getter + @EqualsAndHashCode(callSuper = true) @RequiredArgsConstructor public static class PermissionGetRequest extends StreamRequest { @NotNull private String id; @@ -102,6 +106,8 @@ protected Call generateCall(Client client) { builderClassName = "PermissionUpdateRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class PermissionUpdateRequestData { @Nullable @JsonProperty("id") @@ -145,6 +151,8 @@ protected Call generateCall(Client client) { } } + @Getter + @EqualsAndHashCode(callSuper = true) @RequiredArgsConstructor public static class PermissionDeleteRequest extends StreamRequest { @NotNull private String id; diff --git a/src/main/java/io/getstream/chat/java/models/Reaction.java b/src/main/java/io/getstream/chat/java/models/Reaction.java index 3c9a6b3be..374ef8cac 100644 --- a/src/main/java/io/getstream/chat/java/models/Reaction.java +++ b/src/main/java/io/getstream/chat/java/models/Reaction.java @@ -61,6 +61,8 @@ public void setAdditionalField(String name, Object value) { @Builder @Setter + @Getter + @EqualsAndHashCode public static class ReactionRequestObject { @Nullable @JsonProperty("message_id") @@ -104,6 +106,8 @@ public static ReactionRequestObject buildFrom(@Nullable Reaction reaction) { builderClassName = "ReactionSendRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class ReactionSendRequestData { @Nullable @JsonProperty("reaction") @@ -131,6 +135,8 @@ protected Call generateCall(Client client) { } } + @Getter + @EqualsAndHashCode @RequiredArgsConstructor public static class ReactionDeleteRequest extends StreamRequest { @NotNull private String messageId; @@ -150,6 +156,8 @@ protected Call generateCall(Client client) { } } + @Getter + @EqualsAndHashCode(callSuper = true) @RequiredArgsConstructor public static class ReactionListRequest extends StreamRequest { @NotNull private String messageId; diff --git a/src/main/java/io/getstream/chat/java/models/Reminder.java b/src/main/java/io/getstream/chat/java/models/Reminder.java index 759fc0b6d..2205f0417 100644 --- a/src/main/java/io/getstream/chat/java/models/Reminder.java +++ b/src/main/java/io/getstream/chat/java/models/Reminder.java @@ -18,6 +18,7 @@ import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.Getter; import lombok.NoArgsConstructor; import lombok.RequiredArgsConstructor; import lombok.Singular; @@ -80,6 +81,8 @@ public void setAdditionalField(String name, Object value) { builderClassName = "ReminderCreateRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class ReminderCreateRequestData { @NotNull @JsonProperty("user_id") @@ -107,6 +110,8 @@ protected Call generateCall(Client client) { builderClassName = "ReminderUpdateRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class ReminderUpdateRequestData { @NotNull @JsonProperty("user_id") @@ -130,6 +135,8 @@ protected Call generateCall(Client client) { } } + @Getter + @EqualsAndHashCode @RequiredArgsConstructor public static class ReminderDeleteRequest extends StreamRequest { @NotNull private String messageId; @@ -145,6 +152,8 @@ protected Call generateCall(Client client) { builderClassName = "ReminderQueryRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class ReminderQueryRequestData { @NotNull @JsonProperty("user_id") diff --git a/src/main/java/io/getstream/chat/java/models/Role.java b/src/main/java/io/getstream/chat/java/models/Role.java index 1527e3210..3755aa2ea 100644 --- a/src/main/java/io/getstream/chat/java/models/Role.java +++ b/src/main/java/io/getstream/chat/java/models/Role.java @@ -36,6 +36,8 @@ public class Role { builderClassName = "RoleCreateRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class RoleCreateRequestData { @Nullable @JsonProperty("name") @@ -49,6 +51,8 @@ protected Call generateCall(Client client) { } } + @Getter + @EqualsAndHashCode(callSuper = true) @RequiredArgsConstructor public static class RoleDeleteRequest extends StreamRequest { @NotNull private String name; diff --git a/src/main/java/io/getstream/chat/java/models/SharedLocation.java b/src/main/java/io/getstream/chat/java/models/SharedLocation.java index bc54b1811..88259e077 100644 --- a/src/main/java/io/getstream/chat/java/models/SharedLocation.java +++ b/src/main/java/io/getstream/chat/java/models/SharedLocation.java @@ -92,6 +92,7 @@ public static class ActiveLiveLocationsResponse extends StreamResponseObject { private List activeLiveLocations; } + @EqualsAndHashCode public static class UpdateLocationRequestData { @NotNull @JsonProperty("request") @@ -111,6 +112,8 @@ public void setRequest(SharedLocationRequest request) { this.request = request; } + @Getter + @EqualsAndHashCode(callSuper = true) public static class UpdateLocationRequest extends StreamRequest { private SharedLocationRequest request; private String userId; @@ -138,6 +141,8 @@ protected Call generateCall(Client client) { } } + @Getter + @EqualsAndHashCode public static class GetLocationsRequestData { public static class GetLocationsRequest extends StreamRequest { private String userId; diff --git a/src/main/java/io/getstream/chat/java/models/Sort.java b/src/main/java/io/getstream/chat/java/models/Sort.java index 0ffd5d8d7..41fcbefe0 100644 --- a/src/main/java/io/getstream/chat/java/models/Sort.java +++ b/src/main/java/io/getstream/chat/java/models/Sort.java @@ -4,9 +4,13 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonValue; import lombok.Builder; +import lombok.EqualsAndHashCode; +import lombok.Getter; import org.jetbrains.annotations.NotNull; @Builder +@Getter +@EqualsAndHashCode public class Sort { @NotNull @JsonProperty("field") diff --git a/src/main/java/io/getstream/chat/java/models/Thread.java b/src/main/java/io/getstream/chat/java/models/Thread.java index fd40bedce..a2c653403 100644 --- a/src/main/java/io/getstream/chat/java/models/Thread.java +++ b/src/main/java/io/getstream/chat/java/models/Thread.java @@ -170,6 +170,8 @@ public static class QueryThreadsResponse extends StreamResponseObject { builderClassName = "QueryThreadsRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class QueryThreadsRequestData { @Nullable @JsonProperty("filter") diff --git a/src/main/java/io/getstream/chat/java/models/UnreadCounts.java b/src/main/java/io/getstream/chat/java/models/UnreadCounts.java index a3c529b80..d2edd670a 100644 --- a/src/main/java/io/getstream/chat/java/models/UnreadCounts.java +++ b/src/main/java/io/getstream/chat/java/models/UnreadCounts.java @@ -97,6 +97,8 @@ public static class UnreadCountsResponse extends StreamResponseObject { builderClassName = "UnreadCountsGetRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class UnreadCountsGetRequestData { @Nullable @JsonProperty("user_id") @@ -127,6 +129,8 @@ public static class UnreadCountsBatchResponse extends StreamResponseObject { builderClassName = "UnreadCountsBatchRequest", builderMethodName = "", buildMethodName = "internalBuild") + @Getter + @EqualsAndHashCode public static class UnreadCountsBatchRequestData { @NotNull @JsonProperty("user_ids") From f59d58184bbd6b909806f0d9f314be150b856a61 Mon Sep 17 00:00:00 2001 From: Ali Momen Sani Date: Wed, 8 Oct 2025 16:33:13 +0200 Subject: [PATCH 4/4] remove callSuper from request objects --- .../java/io/getstream/chat/java/models/App.java | 6 +++--- .../io/getstream/chat/java/models/Blocklist.java | 4 ++-- .../io/getstream/chat/java/models/Channel.java | 6 +++--- .../getstream/chat/java/models/ChannelType.java | 4 ++-- .../io/getstream/chat/java/models/Command.java | 4 ++-- .../io/getstream/chat/java/models/Device.java | 4 ++-- .../io/getstream/chat/java/models/Draft.java | 4 ++-- .../io/getstream/chat/java/models/Import.java | 2 +- .../io/getstream/chat/java/models/Message.java | 16 ++++++++-------- .../getstream/chat/java/models/Moderation.java | 4 ++-- .../getstream/chat/java/models/Permission.java | 4 ++-- .../io/getstream/chat/java/models/Reaction.java | 2 +- .../java/io/getstream/chat/java/models/Role.java | 2 +- .../chat/java/models/SharedLocation.java | 2 +- .../java/io/getstream/chat/java/models/User.java | 8 ++++---- 15 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/main/java/io/getstream/chat/java/models/App.java b/src/main/java/io/getstream/chat/java/models/App.java index c9c3f3839..91462dd9b 100644 --- a/src/main/java/io/getstream/chat/java/models/App.java +++ b/src/main/java/io/getstream/chat/java/models/App.java @@ -764,7 +764,7 @@ protected Call generateCall(Client client) { } @Getter - @EqualsAndHashCode(callSuper = true) + @EqualsAndHashCode public static class DeletePushProviderRequest extends StreamRequest { private String providerType; private String name; @@ -976,7 +976,7 @@ public boolean equals(Object o) { @Builder @Getter - @EqualsAndHashCode(callSuper = true) + @EqualsAndHashCode @NoArgsConstructor @AllArgsConstructor public static class AppGetRateLimitsRequest extends StreamRequest { @@ -1110,7 +1110,7 @@ protected Call generateCall(Client client) { @AllArgsConstructor @Getter - @EqualsAndHashCode(callSuper = true) + @EqualsAndHashCode public static class AppRevokeTokensRequest extends StreamRequest { @Nullable private Date revokeTokensIssuedBefore; diff --git a/src/main/java/io/getstream/chat/java/models/Blocklist.java b/src/main/java/io/getstream/chat/java/models/Blocklist.java index 1ba22277d..d9695ee8c 100644 --- a/src/main/java/io/getstream/chat/java/models/Blocklist.java +++ b/src/main/java/io/getstream/chat/java/models/Blocklist.java @@ -58,7 +58,7 @@ protected Call generateCall(Client client) { @RequiredArgsConstructor @Getter - @EqualsAndHashCode(callSuper = true) + @EqualsAndHashCode public static class BlocklistGetRequest extends StreamRequest { @NotNull private String name; @@ -95,7 +95,7 @@ protected Call generateCall(Client client) { @RequiredArgsConstructor @Getter - @EqualsAndHashCode(callSuper = true) + @EqualsAndHashCode public static class BlocklistDeleteRequest extends StreamRequest { @NotNull private String name; diff --git a/src/main/java/io/getstream/chat/java/models/Channel.java b/src/main/java/io/getstream/chat/java/models/Channel.java index 7e7bb4d5f..ea31bc30b 100644 --- a/src/main/java/io/getstream/chat/java/models/Channel.java +++ b/src/main/java/io/getstream/chat/java/models/Channel.java @@ -668,7 +668,7 @@ protected Call generateCall(Client client) { } @Getter - @EqualsAndHashCode(callSuper = true) + @EqualsAndHashCode @RequiredArgsConstructor public static class ChannelDeleteRequest extends StreamRequest { @NotNull private String channelType; @@ -682,7 +682,7 @@ protected Call generateCall(Client client) { } @Getter - @EqualsAndHashCode(callSuper = true) + @EqualsAndHashCode @RequiredArgsConstructor public static class ChannelDeleteManyRequest extends StreamRequest { @JsonProperty("cids") @@ -945,7 +945,7 @@ protected Call generateCall(Client client) { } @Getter - @EqualsAndHashCode(callSuper = true) + @EqualsAndHashCode @RequiredArgsConstructor public static class ChannelExportStatusRequest extends StreamRequest { diff --git a/src/main/java/io/getstream/chat/java/models/ChannelType.java b/src/main/java/io/getstream/chat/java/models/ChannelType.java index b7e159303..627cb6ef3 100644 --- a/src/main/java/io/getstream/chat/java/models/ChannelType.java +++ b/src/main/java/io/getstream/chat/java/models/ChannelType.java @@ -447,7 +447,7 @@ protected Call generateCall(Client client) { } @Getter - @EqualsAndHashCode(callSuper = true) + @EqualsAndHashCode @RequiredArgsConstructor public static class ChannelTypeGetRequest extends StreamRequest { @NotNull private String name; @@ -582,7 +582,7 @@ protected Call generateCall(Client client) { } @Getter - @EqualsAndHashCode(callSuper = true) + @EqualsAndHashCode @RequiredArgsConstructor public static class ChannelTypeDeleteRequest extends StreamRequest { @NotNull private String name; diff --git a/src/main/java/io/getstream/chat/java/models/Command.java b/src/main/java/io/getstream/chat/java/models/Command.java index 4b6ab18bc..d9ae35479 100644 --- a/src/main/java/io/getstream/chat/java/models/Command.java +++ b/src/main/java/io/getstream/chat/java/models/Command.java @@ -74,7 +74,7 @@ protected Call generateCall(Client client) { } @Getter - @EqualsAndHashCode(callSuper = true) + @EqualsAndHashCode @RequiredArgsConstructor public static class CommandGetRequest extends StreamRequest { @NotNull private String name; @@ -119,7 +119,7 @@ protected Call generateCall(Client client) { } @Getter - @EqualsAndHashCode(callSuper = true) + @EqualsAndHashCode @RequiredArgsConstructor public static class CommandDeleteRequest extends StreamRequest { @NotNull private String name; diff --git a/src/main/java/io/getstream/chat/java/models/Device.java b/src/main/java/io/getstream/chat/java/models/Device.java index 742ea6c7b..f4457862f 100644 --- a/src/main/java/io/getstream/chat/java/models/Device.java +++ b/src/main/java/io/getstream/chat/java/models/Device.java @@ -122,7 +122,7 @@ protected Call generateCall(Client client) { } @Getter - @EqualsAndHashCode(callSuper = true) + @EqualsAndHashCode @RequiredArgsConstructor public static class DeviceDeleteRequest extends StreamRequest { @NotNull private String id; @@ -148,7 +148,7 @@ protected Call generateCall(Client client) { } @Getter - @EqualsAndHashCode(callSuper = true) + @EqualsAndHashCode @RequiredArgsConstructor public static class DeviceListRequest extends StreamRequest { @NotNull private String userId; diff --git a/src/main/java/io/getstream/chat/java/models/Draft.java b/src/main/java/io/getstream/chat/java/models/Draft.java index 084c4c232..850629100 100644 --- a/src/main/java/io/getstream/chat/java/models/Draft.java +++ b/src/main/java/io/getstream/chat/java/models/Draft.java @@ -184,7 +184,7 @@ protected Call generateCall(Client client) throws StreamExc /** Request for deleting a draft. */ @Getter - @EqualsAndHashCode(callSuper = true) + @EqualsAndHashCode public static class DeleteDraftRequest extends StreamRequest { @NotNull private String channelType; @NotNull private String channelId; @@ -218,7 +218,7 @@ protected Call generateCall(Client client) throws StreamEx /** Request for getting a draft. */ @Getter - @EqualsAndHashCode(callSuper = true) + @EqualsAndHashCode public static class GetDraftRequest extends StreamRequest { @NotNull private String channelType; @NotNull private String channelId; diff --git a/src/main/java/io/getstream/chat/java/models/Import.java b/src/main/java/io/getstream/chat/java/models/Import.java index c559ff538..e14ce4888 100644 --- a/src/main/java/io/getstream/chat/java/models/Import.java +++ b/src/main/java/io/getstream/chat/java/models/Import.java @@ -157,7 +157,7 @@ protected Call generateCall(Client client) { } @Getter - @EqualsAndHashCode(callSuper = true) + @EqualsAndHashCode public static class ListImportsRequest extends StreamRequest { private final Integer limit; private final Integer offset; diff --git a/src/main/java/io/getstream/chat/java/models/Message.java b/src/main/java/io/getstream/chat/java/models/Message.java index 4bf5b4c60..91e653224 100644 --- a/src/main/java/io/getstream/chat/java/models/Message.java +++ b/src/main/java/io/getstream/chat/java/models/Message.java @@ -782,7 +782,7 @@ protected Call generateCall(Client client) { } @Getter - @EqualsAndHashCode(callSuper = true) + @EqualsAndHashCode @RequiredArgsConstructor public static class MessageGetRequest extends StreamRequest { @NotNull private String id; @@ -826,7 +826,7 @@ protected Call generateCall(Client client) { } @Getter - @EqualsAndHashCode(callSuper = true) + @EqualsAndHashCode @RequiredArgsConstructor public static class MessageDeleteRequest extends StreamRequest { @NotNull private String id; @@ -987,7 +987,7 @@ protected FileHandler getFileHandler() throws StreamException { } @Getter - @EqualsAndHashCode(callSuper = true) + @EqualsAndHashCode // We do not use @RequiredArgsConstructor here for uniformity with MessageUploadImageRequest public static class MessageUploadFileRequest extends FileRequest { @NotNull private String channelType; @@ -1024,7 +1024,7 @@ public MessageUploadFileResponse request() throws StreamException { } @Getter - @EqualsAndHashCode(callSuper = true) + @EqualsAndHashCode @RequiredArgsConstructor public static class MessageUploadImageRequest extends FileRequest { @Nullable private File file; @@ -1060,7 +1060,7 @@ public MessageUploadImageResponse request() throws StreamException { } @Getter - @EqualsAndHashCode(callSuper = true) + @EqualsAndHashCode @RequiredArgsConstructor public static class MessageDeleteFileRequest extends FileRequest { @NotNull private String channelType; @@ -1076,7 +1076,7 @@ public StreamResponseObject request() throws StreamException { } @Getter - @EqualsAndHashCode(callSuper = true) + @EqualsAndHashCode @RequiredArgsConstructor public static class MessageDeleteImageRequest extends FileRequest { @NotNull private String channelType; @@ -1092,7 +1092,7 @@ public StreamResponseObject request() throws StreamException { } @Getter - @EqualsAndHashCode(callSuper = true) + @EqualsAndHashCode @RequiredArgsConstructor public static class MessageGetManyRequest extends StreamRequest { @NotNull private String channelType; @@ -1110,7 +1110,7 @@ protected Call generateCall(Client client) { } @Getter - @EqualsAndHashCode(callSuper = true) + @EqualsAndHashCode @RequiredArgsConstructor public static class MessageGetRepliesRequest extends StreamRequest { @NotNull private String parentId; diff --git a/src/main/java/io/getstream/chat/java/models/Moderation.java b/src/main/java/io/getstream/chat/java/models/Moderation.java index 2cd49fa5b..4678285cd 100644 --- a/src/main/java/io/getstream/chat/java/models/Moderation.java +++ b/src/main/java/io/getstream/chat/java/models/Moderation.java @@ -176,7 +176,7 @@ public static class UpsertConfigResponse extends StreamResponseObject { } @Getter - @EqualsAndHashCode(callSuper = true) + @EqualsAndHashCode @RequiredArgsConstructor public static class DeleteConfigRequest extends StreamRequest { @NotNull private String key; @@ -188,7 +188,7 @@ protected Call generateCall(Client client) { } @Getter - @EqualsAndHashCode(callSuper = true) + @EqualsAndHashCode @RequiredArgsConstructor public static class ConfigGetRequest extends StreamRequest { @NotNull private String key; diff --git a/src/main/java/io/getstream/chat/java/models/Permission.java b/src/main/java/io/getstream/chat/java/models/Permission.java index 7d63dae6f..b9ab33ee7 100644 --- a/src/main/java/io/getstream/chat/java/models/Permission.java +++ b/src/main/java/io/getstream/chat/java/models/Permission.java @@ -91,7 +91,7 @@ protected Call generateCall(Client client) { } @Getter - @EqualsAndHashCode(callSuper = true) + @EqualsAndHashCode @RequiredArgsConstructor public static class PermissionGetRequest extends StreamRequest { @NotNull private String id; @@ -152,7 +152,7 @@ protected Call generateCall(Client client) { } @Getter - @EqualsAndHashCode(callSuper = true) + @EqualsAndHashCode @RequiredArgsConstructor public static class PermissionDeleteRequest extends StreamRequest { @NotNull private String id; diff --git a/src/main/java/io/getstream/chat/java/models/Reaction.java b/src/main/java/io/getstream/chat/java/models/Reaction.java index 374ef8cac..3452214a0 100644 --- a/src/main/java/io/getstream/chat/java/models/Reaction.java +++ b/src/main/java/io/getstream/chat/java/models/Reaction.java @@ -157,7 +157,7 @@ protected Call generateCall(Client client) { } @Getter - @EqualsAndHashCode(callSuper = true) + @EqualsAndHashCode @RequiredArgsConstructor public static class ReactionListRequest extends StreamRequest { @NotNull private String messageId; diff --git a/src/main/java/io/getstream/chat/java/models/Role.java b/src/main/java/io/getstream/chat/java/models/Role.java index 3755aa2ea..58d6fbe45 100644 --- a/src/main/java/io/getstream/chat/java/models/Role.java +++ b/src/main/java/io/getstream/chat/java/models/Role.java @@ -52,7 +52,7 @@ protected Call generateCall(Client client) { } @Getter - @EqualsAndHashCode(callSuper = true) + @EqualsAndHashCode @RequiredArgsConstructor public static class RoleDeleteRequest extends StreamRequest { @NotNull private String name; diff --git a/src/main/java/io/getstream/chat/java/models/SharedLocation.java b/src/main/java/io/getstream/chat/java/models/SharedLocation.java index 88259e077..d7b60a879 100644 --- a/src/main/java/io/getstream/chat/java/models/SharedLocation.java +++ b/src/main/java/io/getstream/chat/java/models/SharedLocation.java @@ -113,7 +113,7 @@ public void setRequest(SharedLocationRequest request) { } @Getter - @EqualsAndHashCode(callSuper = true) + @EqualsAndHashCode public static class UpdateLocationRequest extends StreamRequest { private SharedLocationRequest request; private String userId; diff --git a/src/main/java/io/getstream/chat/java/models/User.java b/src/main/java/io/getstream/chat/java/models/User.java index cd9643c5c..622db2c48 100644 --- a/src/main/java/io/getstream/chat/java/models/User.java +++ b/src/main/java/io/getstream/chat/java/models/User.java @@ -840,7 +840,7 @@ protected Call generateCall(Client client) { @RequiredArgsConstructor @Getter - @EqualsAndHashCode(callSuper = true) + @EqualsAndHashCode public static class UserDeleteRequest extends StreamRequest { @NotNull private String userId; @@ -1056,7 +1056,7 @@ protected Call generateCall(Client client) { @RequiredArgsConstructor @Getter - @EqualsAndHashCode(callSuper = true) + @EqualsAndHashCode public static class UserExportRequest extends StreamRequest { @NotNull private String userId; @@ -1068,7 +1068,7 @@ protected Call generateCall(Client client) { @RequiredArgsConstructor @Getter - @EqualsAndHashCode(callSuper = true) + @EqualsAndHashCode public static class UserUnbanRequest extends StreamRequest { @NotNull private String targetUserId; @@ -1104,7 +1104,7 @@ protected Call generateCall(Client client) { @AllArgsConstructor @Getter - @EqualsAndHashCode(callSuper = true) + @EqualsAndHashCode public static class UserRevokeTokensRequest extends StreamRequest { @NotNull private List userIds = new ArrayList<>();