Skip to content

[CHA-0] Add getter methods, equals and hashCode to most request classes for better testability #205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

[CHA-0] Add getter methods, equals and hashCode to most request classes for better testability #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ac0478
add getters and equals and hashCode to most request classes for
shaljam Oct 2, 2025
e44dc6d
update deprecated code
shaljam Oct 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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"
80 changes: 34 additions & 46 deletions src/main/java/io/getstream/chat/java/models/App.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -586,7 +585,8 @@ public static class DeviceError {
}

@Builder
@Setter
@Getter
@EqualsAndHashCode
public static class AsyncModerationCallback {
@Nullable
@JsonProperty("mode")
Expand All @@ -598,7 +598,8 @@ public static class AsyncModerationCallback {
}

@Builder
@Setter
@Getter
@EqualsAndHashCode
public static class AsyncModerationConfigRequestObject {
@Nullable
@JsonProperty("callback")
Expand All @@ -610,7 +611,8 @@ public static class AsyncModerationConfigRequestObject {
}

@Builder
@Setter
@Getter
@EqualsAndHashCode
public static class FileUploadConfigRequestObject {

@Nullable
Expand Down Expand Up @@ -641,7 +643,8 @@ public static FileUploadConfigRequestObject buildFrom(
}

@Builder
@Setter
@Getter
@EqualsAndHashCode
public static class APNConfigRequestObject {
@Nullable
@JsonProperty("development")
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -716,7 +719,8 @@ public static FirebaseConfigRequestObject buildFrom(@Nullable FirebaseConfig fir
}

@Builder
@Setter
@Getter
@EqualsAndHashCode
public static class HuaweiConfigRequestObject {
@Nullable
@JsonProperty("id")
Expand All @@ -728,7 +732,8 @@ public static class HuaweiConfigRequestObject {
}

@Builder
@Setter
@Getter
@EqualsAndHashCode
public static class PushConfigRequestObject {
@Nullable
@JsonProperty("version")
Expand Down Expand Up @@ -758,6 +763,8 @@ protected Call<ListPushProviderResponse> generateCall(Client client) {
}
}

@Getter
@EqualsAndHashCode(callSuper = true)
public static class DeletePushProviderRequest extends StreamRequest<StreamResponseObject> {
private String providerType;
private String name;
Expand All @@ -777,6 +784,8 @@ protected Call<StreamResponseObject> generateCall(Client client) {
builderClassName = "AppUpdateRequest",
builderMethodName = "",
buildMethodName = "internalBuild")
@Getter
@EqualsAndHashCode
public static class AppUpdateRequestData {
@Nullable
@JsonProperty("disable_auth_checks")
Expand Down Expand Up @@ -965,6 +974,11 @@ public boolean equals(Object o) {
}
}

@Builder
@Getter
@EqualsAndHashCode(callSuper = true)
@NoArgsConstructor
@AllArgsConstructor
public static class AppGetRateLimitsRequest extends StreamRequest<AppGetRateLimitsResponse> {
@Nullable private Boolean serverSide;

Expand All @@ -974,43 +988,7 @@ public static class AppGetRateLimitsRequest extends StreamRequest<AppGetRateLimi

@Nullable private Boolean web;

@Nullable private List<String> 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<String> endpoints) {
this.endpoints = endpoints;
return this;
}

@NotNull
public AppGetRateLimitsRequest endpoint(@NotNull String endpoint) {
this.endpoints.add(endpoint);
return this;
}
@Singular @Nullable private List<String> endpoints;

@Override
protected Call<AppGetRateLimitsResponse> generateCall(Client client) {
Expand All @@ -1029,6 +1007,8 @@ protected Call<AppGetRateLimitsResponse> generateCall(Client client) {
builderClassName = "AppCheckSqsRequest",
builderMethodName = "",
buildMethodName = "internalBuild")
@Getter
@EqualsAndHashCode
public static class AppCheckSqsRequestData {
@Nullable
@JsonProperty("sqs_url")
Expand All @@ -1054,6 +1034,8 @@ protected Call<AppCheckSqsResponse> generateCall(Client client) {
builderClassName = "AppCheckSnsRequest",
builderMethodName = "",
buildMethodName = "internalBuild")
@Getter
@EqualsAndHashCode
public static class AppCheckSnsRequestData {
@Nullable
@JsonProperty("sns_topic_arn")
Expand All @@ -1079,6 +1061,8 @@ protected Call<AppCheckSnsResponse> generateCall(Client client) {
builderClassName = "AppCheckPushRequest",
builderMethodName = "",
buildMethodName = "internalBuild")
@Getter
@EqualsAndHashCode
public static class AppCheckPushRequestData {
@Nullable
@JsonProperty("message_id")
Expand Down Expand Up @@ -1125,6 +1109,8 @@ protected Call<AppCheckPushResponse> generateCall(Client client) {
}

@AllArgsConstructor
@Getter
@EqualsAndHashCode(callSuper = true)
public static class AppRevokeTokensRequest extends StreamRequest<StreamResponseObject> {
@Nullable private Date revokeTokensIssuedBefore;

Expand Down Expand Up @@ -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;
Expand Down
8 changes: 8 additions & 0 deletions src/main/java/io/getstream/chat/java/models/Blocklist.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ public class Blocklist {
builderClassName = "BlocklistCreateRequest",
builderMethodName = "",
buildMethodName = "internalBuild")
@Getter
@EqualsAndHashCode
public static class BlocklistCreateRequestData {
@Nullable
@JsonProperty("name")
Expand All @@ -55,6 +57,8 @@ protected Call<StreamResponseObject> generateCall(Client client) {
}

@RequiredArgsConstructor
@Getter
@EqualsAndHashCode(callSuper = true)
public static class BlocklistGetRequest extends StreamRequest<BlocklistGetResponse> {
@NotNull private String name;

Expand All @@ -68,6 +72,8 @@ protected Call<BlocklistGetResponse> generateCall(Client client) {
builderClassName = "BlocklistUpdateRequest",
builderMethodName = "",
buildMethodName = "internalBuild")
@Getter
@EqualsAndHashCode
public static class BlocklistUpdateRequestData {
@Nullable
@JsonProperty("words")
Expand All @@ -88,6 +94,8 @@ protected Call<StreamResponseObject> generateCall(Client client) {
}

@RequiredArgsConstructor
@Getter
@EqualsAndHashCode(callSuper = true)
public static class BlocklistDeleteRequest extends StreamRequest<StreamResponseObject> {
@NotNull private String name;

Expand Down
14 changes: 12 additions & 2 deletions src/main/java/io/getstream/chat/java/models/SharedLocation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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;
Expand All @@ -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;
}

Expand Down
Loading