diff --git a/bolt/src/main/java/com/slack/api/bolt/context/builtin/ActionContext.java b/bolt/src/main/java/com/slack/api/bolt/context/builtin/ActionContext.java index 158e08146..224743c29 100644 --- a/bolt/src/main/java/com/slack/api/bolt/context/builtin/ActionContext.java +++ b/bolt/src/main/java/com/slack/api/bolt/context/builtin/ActionContext.java @@ -14,7 +14,7 @@ @NoArgsConstructor @AllArgsConstructor @ToString(callSuper = true) -@EqualsAndHashCode +@EqualsAndHashCode(callSuper = false) public class ActionContext extends Context implements ActionRespondUtility { private String triggerId; diff --git a/bolt/src/main/java/com/slack/api/bolt/context/builtin/AttachmentActionContext.java b/bolt/src/main/java/com/slack/api/bolt/context/builtin/AttachmentActionContext.java index b80208f90..297c246fe 100644 --- a/bolt/src/main/java/com/slack/api/bolt/context/builtin/AttachmentActionContext.java +++ b/bolt/src/main/java/com/slack/api/bolt/context/builtin/AttachmentActionContext.java @@ -15,7 +15,7 @@ @NoArgsConstructor @AllArgsConstructor @ToString(callSuper = true) -@EqualsAndHashCode +@EqualsAndHashCode(callSuper = false) public class AttachmentActionContext extends Context implements SayUtility, ActionRespondUtility { private String triggerId; diff --git a/bolt/src/main/java/com/slack/api/bolt/context/builtin/BlockSuggestionContext.java b/bolt/src/main/java/com/slack/api/bolt/context/builtin/BlockSuggestionContext.java index 14b221ea1..20749164a 100644 --- a/bolt/src/main/java/com/slack/api/bolt/context/builtin/BlockSuggestionContext.java +++ b/bolt/src/main/java/com/slack/api/bolt/context/builtin/BlockSuggestionContext.java @@ -10,7 +10,7 @@ @Setter @Builder @ToString(callSuper = true) -@EqualsAndHashCode +@EqualsAndHashCode(callSuper = false) public class BlockSuggestionContext extends Context { public BlockSuggestionContext() { diff --git a/bolt/src/main/java/com/slack/api/bolt/context/builtin/DefaultContext.java b/bolt/src/main/java/com/slack/api/bolt/context/builtin/DefaultContext.java index e9214637c..a02395041 100644 --- a/bolt/src/main/java/com/slack/api/bolt/context/builtin/DefaultContext.java +++ b/bolt/src/main/java/com/slack/api/bolt/context/builtin/DefaultContext.java @@ -7,7 +7,7 @@ @Setter @Builder @ToString(callSuper = true) -@EqualsAndHashCode +@EqualsAndHashCode(callSuper = false) public class DefaultContext extends Context { public DefaultContext() { diff --git a/bolt/src/main/java/com/slack/api/bolt/context/builtin/DialogCancellationContext.java b/bolt/src/main/java/com/slack/api/bolt/context/builtin/DialogCancellationContext.java index a2de4bb91..bd046ac17 100644 --- a/bolt/src/main/java/com/slack/api/bolt/context/builtin/DialogCancellationContext.java +++ b/bolt/src/main/java/com/slack/api/bolt/context/builtin/DialogCancellationContext.java @@ -12,7 +12,7 @@ @NoArgsConstructor @AllArgsConstructor @ToString(callSuper = true) -@EqualsAndHashCode +@EqualsAndHashCode(callSuper = false) public class DialogCancellationContext extends Context implements SayUtility, ActionRespondUtility { private String responseUrl; diff --git a/bolt/src/main/java/com/slack/api/bolt/context/builtin/DialogSubmissionContext.java b/bolt/src/main/java/com/slack/api/bolt/context/builtin/DialogSubmissionContext.java index 287b8d496..896dcdeb0 100644 --- a/bolt/src/main/java/com/slack/api/bolt/context/builtin/DialogSubmissionContext.java +++ b/bolt/src/main/java/com/slack/api/bolt/context/builtin/DialogSubmissionContext.java @@ -18,7 +18,7 @@ @NoArgsConstructor @AllArgsConstructor @ToString(callSuper = true) -@EqualsAndHashCode +@EqualsAndHashCode(callSuper = false) public class DialogSubmissionContext extends Context implements SayUtility, ActionRespondUtility { private String responseUrl; diff --git a/bolt/src/main/java/com/slack/api/bolt/context/builtin/DialogSuggestionContext.java b/bolt/src/main/java/com/slack/api/bolt/context/builtin/DialogSuggestionContext.java index ba0535e13..20165cdd0 100644 --- a/bolt/src/main/java/com/slack/api/bolt/context/builtin/DialogSuggestionContext.java +++ b/bolt/src/main/java/com/slack/api/bolt/context/builtin/DialogSuggestionContext.java @@ -10,7 +10,7 @@ @Setter @Builder @ToString(callSuper = true) -@EqualsAndHashCode +@EqualsAndHashCode(callSuper = false) public class DialogSuggestionContext extends Context { public DialogSuggestionContext() { diff --git a/bolt/src/main/java/com/slack/api/bolt/context/builtin/EventContext.java b/bolt/src/main/java/com/slack/api/bolt/context/builtin/EventContext.java index 51947a5ac..510831d6a 100644 --- a/bolt/src/main/java/com/slack/api/bolt/context/builtin/EventContext.java +++ b/bolt/src/main/java/com/slack/api/bolt/context/builtin/EventContext.java @@ -8,7 +8,7 @@ @Setter @Builder @ToString(callSuper = true) -@EqualsAndHashCode +@EqualsAndHashCode(callSuper = false) @NoArgsConstructor @AllArgsConstructor public class EventContext extends Context implements SayUtility { diff --git a/bolt/src/main/java/com/slack/api/bolt/context/builtin/GlobalShortcutContext.java b/bolt/src/main/java/com/slack/api/bolt/context/builtin/GlobalShortcutContext.java index 3e31d9970..2600d3150 100644 --- a/bolt/src/main/java/com/slack/api/bolt/context/builtin/GlobalShortcutContext.java +++ b/bolt/src/main/java/com/slack/api/bolt/context/builtin/GlobalShortcutContext.java @@ -12,7 +12,7 @@ @NoArgsConstructor @AllArgsConstructor @ToString(callSuper = true) -@EqualsAndHashCode +@EqualsAndHashCode(callSuper = false) public class GlobalShortcutContext extends Context { private String triggerId; } diff --git a/bolt/src/main/java/com/slack/api/bolt/context/builtin/MessageShortcutContext.java b/bolt/src/main/java/com/slack/api/bolt/context/builtin/MessageShortcutContext.java index 821890e5a..f55dd4263 100644 --- a/bolt/src/main/java/com/slack/api/bolt/context/builtin/MessageShortcutContext.java +++ b/bolt/src/main/java/com/slack/api/bolt/context/builtin/MessageShortcutContext.java @@ -15,7 +15,7 @@ @NoArgsConstructor @AllArgsConstructor @ToString(callSuper = true) -@EqualsAndHashCode +@EqualsAndHashCode(callSuper = false) public class MessageShortcutContext extends Context implements SayUtility, ActionRespondUtility { private String triggerId; diff --git a/bolt/src/main/java/com/slack/api/bolt/context/builtin/OAuthCallbackContext.java b/bolt/src/main/java/com/slack/api/bolt/context/builtin/OAuthCallbackContext.java index a1fb5cb34..da2542bb5 100644 --- a/bolt/src/main/java/com/slack/api/bolt/context/builtin/OAuthCallbackContext.java +++ b/bolt/src/main/java/com/slack/api/bolt/context/builtin/OAuthCallbackContext.java @@ -9,7 +9,7 @@ @NoArgsConstructor @AllArgsConstructor @ToString(callSuper = true) -@EqualsAndHashCode +@EqualsAndHashCode(callSuper = false) public class OAuthCallbackContext extends Context { private String oauthCompletionUrl; diff --git a/bolt/src/main/java/com/slack/api/bolt/context/builtin/SlashCommandContext.java b/bolt/src/main/java/com/slack/api/bolt/context/builtin/SlashCommandContext.java index c11261469..1b80fd38b 100644 --- a/bolt/src/main/java/com/slack/api/bolt/context/builtin/SlashCommandContext.java +++ b/bolt/src/main/java/com/slack/api/bolt/context/builtin/SlashCommandContext.java @@ -20,7 +20,7 @@ @NoArgsConstructor @AllArgsConstructor @ToString(callSuper = true) -@EqualsAndHashCode +@EqualsAndHashCode(callSuper = false) public class SlashCommandContext extends Context implements SayUtility, RespondUtility { private String triggerId; diff --git a/bolt/src/main/java/com/slack/api/bolt/context/builtin/ViewSubmissionContext.java b/bolt/src/main/java/com/slack/api/bolt/context/builtin/ViewSubmissionContext.java index 0e2fa2be6..0d3198c06 100644 --- a/bolt/src/main/java/com/slack/api/bolt/context/builtin/ViewSubmissionContext.java +++ b/bolt/src/main/java/com/slack/api/bolt/context/builtin/ViewSubmissionContext.java @@ -19,7 +19,7 @@ @Builder @AllArgsConstructor @ToString(callSuper = true) -@EqualsAndHashCode +@EqualsAndHashCode(callSuper = false) public class ViewSubmissionContext extends Context implements InputBlockRespondUtility { private List responseUrls; diff --git a/bolt/src/test/java/test_locally/context/EqualityTest.java b/bolt/src/test/java/test_locally/context/EqualityTest.java new file mode 100644 index 000000000..7ce1ba6f0 --- /dev/null +++ b/bolt/src/test/java/test_locally/context/EqualityTest.java @@ -0,0 +1,26 @@ +package test_locally.context; + +import com.slack.api.bolt.context.builtin.*; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; + +public class EqualityTest { + + @Test + public void test() { + assertEquals(new ActionContext(), new ActionContext()); + assertEquals(new AttachmentActionContext(), new AttachmentActionContext()); + assertEquals(new BlockSuggestionContext(), new BlockSuggestionContext()); + assertEquals(new DefaultContext(), new DefaultContext()); + assertEquals(new DialogCancellationContext(), new DialogCancellationContext()); + assertEquals(new DialogSubmissionContext(), new DialogSubmissionContext()); + assertEquals(new DialogSuggestionContext(), new DialogSuggestionContext()); + assertEquals(new EventContext(), new EventContext()); + assertEquals(new GlobalShortcutContext(), new GlobalShortcutContext()); + assertEquals(new MessageShortcutContext(), new MessageShortcutContext()); + assertEquals(new OAuthCallbackContext(), new OAuthCallbackContext()); + assertEquals(new SlashCommandContext(), new SlashCommandContext()); + assertEquals(new ViewSubmissionContext(), new ViewSubmissionContext()); + } +} diff --git a/slack-api-client/src/main/java/com/slack/api/audit/AuditApiErrorResponse.java b/slack-api-client/src/main/java/com/slack/api/audit/AuditApiErrorResponse.java index a0f2d1b4b..6e31f6de5 100644 --- a/slack-api-client/src/main/java/com/slack/api/audit/AuditApiErrorResponse.java +++ b/slack-api-client/src/main/java/com/slack/api/audit/AuditApiErrorResponse.java @@ -1,8 +1,10 @@ package com.slack.api.audit; import lombok.Data; +import lombok.EqualsAndHashCode; @Data +@EqualsAndHashCode(callSuper = false) public class AuditApiErrorResponse implements AuditApiResponse { private boolean ok; diff --git a/slack-api-client/src/main/java/com/slack/api/audit/AuditApiException.java b/slack-api-client/src/main/java/com/slack/api/audit/AuditApiException.java index ebfe28ded..bcfb9a0a2 100644 --- a/slack-api-client/src/main/java/com/slack/api/audit/AuditApiException.java +++ b/slack-api-client/src/main/java/com/slack/api/audit/AuditApiException.java @@ -3,11 +3,13 @@ import com.slack.api.SlackConfig; import com.slack.api.util.json.GsonFactory; import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; import okhttp3.Response; @Data @Slf4j +@EqualsAndHashCode(callSuper = false) public class AuditApiException extends Exception { private final Response response; diff --git a/slack-api-client/src/main/java/com/slack/api/audit/response/ActionsResponse.java b/slack-api-client/src/main/java/com/slack/api/audit/response/ActionsResponse.java index b6ec2c843..29cc601e3 100644 --- a/slack-api-client/src/main/java/com/slack/api/audit/response/ActionsResponse.java +++ b/slack-api-client/src/main/java/com/slack/api/audit/response/ActionsResponse.java @@ -2,10 +2,12 @@ import com.slack.api.audit.AuditApiResponse; import lombok.Data; +import lombok.EqualsAndHashCode; import java.util.List; @Data +@EqualsAndHashCode(callSuper = false) public class ActionsResponse implements AuditApiResponse { private boolean ok; private String warning; diff --git a/slack-api-client/src/main/java/com/slack/api/audit/response/LogsResponse.java b/slack-api-client/src/main/java/com/slack/api/audit/response/LogsResponse.java index 97ce66a5a..cea83eb77 100644 --- a/slack-api-client/src/main/java/com/slack/api/audit/response/LogsResponse.java +++ b/slack-api-client/src/main/java/com/slack/api/audit/response/LogsResponse.java @@ -4,10 +4,12 @@ import com.slack.api.audit.AuditApiResponse; import com.slack.api.model.ResponseMetadata; import lombok.Data; +import lombok.EqualsAndHashCode; import java.util.List; @Data +@EqualsAndHashCode(callSuper = false) public class LogsResponse implements AuditApiResponse { private boolean ok; private String warning; diff --git a/slack-api-client/src/main/java/com/slack/api/audit/response/SchemasResponse.java b/slack-api-client/src/main/java/com/slack/api/audit/response/SchemasResponse.java index e62db0976..183535459 100644 --- a/slack-api-client/src/main/java/com/slack/api/audit/response/SchemasResponse.java +++ b/slack-api-client/src/main/java/com/slack/api/audit/response/SchemasResponse.java @@ -2,10 +2,12 @@ import com.slack.api.audit.AuditApiResponse; import lombok.Data; +import lombok.EqualsAndHashCode; import java.util.List; @Data +@EqualsAndHashCode(callSuper = false) public class SchemasResponse implements AuditApiResponse { private boolean ok; private String warning; diff --git a/slack-api-client/src/main/java/com/slack/api/methods/MethodsCompletionException.java b/slack-api-client/src/main/java/com/slack/api/methods/MethodsCompletionException.java index 8de0fe8ed..24b68ff0f 100644 --- a/slack-api-client/src/main/java/com/slack/api/methods/MethodsCompletionException.java +++ b/slack-api-client/src/main/java/com/slack/api/methods/MethodsCompletionException.java @@ -1,12 +1,14 @@ package com.slack.api.methods; import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; import java.io.IOException; @Data @Slf4j +@EqualsAndHashCode(callSuper = false) public class MethodsCompletionException extends RuntimeException { private final IOException ioException; diff --git a/slack-api-client/src/main/java/com/slack/api/methods/SlackApiException.java b/slack-api-client/src/main/java/com/slack/api/methods/SlackApiException.java index e54be612c..8a0024069 100644 --- a/slack-api-client/src/main/java/com/slack/api/methods/SlackApiException.java +++ b/slack-api-client/src/main/java/com/slack/api/methods/SlackApiException.java @@ -3,11 +3,13 @@ import com.slack.api.SlackConfig; import com.slack.api.util.json.GsonFactory; import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; import okhttp3.Response; @Data @Slf4j +@EqualsAndHashCode(callSuper = false) public class SlackApiException extends Exception { private final Response response; diff --git a/slack-api-client/src/main/java/com/slack/api/scim/SCIMApiErrorResponse.java b/slack-api-client/src/main/java/com/slack/api/scim/SCIMApiErrorResponse.java index f5e4deecd..e7a8024eb 100644 --- a/slack-api-client/src/main/java/com/slack/api/scim/SCIMApiErrorResponse.java +++ b/slack-api-client/src/main/java/com/slack/api/scim/SCIMApiErrorResponse.java @@ -2,8 +2,10 @@ import com.google.gson.annotations.SerializedName; import lombok.Data; +import lombok.EqualsAndHashCode; @Data +@EqualsAndHashCode(callSuper = false) public class SCIMApiErrorResponse implements SCIMApiResponse { @SerializedName("Errors") @@ -15,4 +17,4 @@ public static class Errors { private Integer code; } -} +} \ No newline at end of file diff --git a/slack-api-client/src/main/java/com/slack/api/scim/SCIMApiException.java b/slack-api-client/src/main/java/com/slack/api/scim/SCIMApiException.java index 1694ab244..97db7f01d 100644 --- a/slack-api-client/src/main/java/com/slack/api/scim/SCIMApiException.java +++ b/slack-api-client/src/main/java/com/slack/api/scim/SCIMApiException.java @@ -3,11 +3,13 @@ import com.slack.api.SlackConfig; import com.slack.api.util.json.GsonFactory; import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; import okhttp3.Response; @Data @Slf4j +@EqualsAndHashCode(callSuper = false) public class SCIMApiException extends Exception { private final Response response; diff --git a/slack-api-client/src/main/java/com/slack/api/scim/response/GroupsCreateResponse.java b/slack-api-client/src/main/java/com/slack/api/scim/response/GroupsCreateResponse.java index f1e7dfff3..b18fd4e81 100644 --- a/slack-api-client/src/main/java/com/slack/api/scim/response/GroupsCreateResponse.java +++ b/slack-api-client/src/main/java/com/slack/api/scim/response/GroupsCreateResponse.java @@ -3,7 +3,9 @@ import com.slack.api.scim.SCIMApiResponse; import com.slack.api.scim.model.Group; import lombok.Data; +import lombok.EqualsAndHashCode; @Data +@EqualsAndHashCode(callSuper = false) public class GroupsCreateResponse extends Group implements SCIMApiResponse { } diff --git a/slack-api-client/src/main/java/com/slack/api/scim/response/GroupsDeleteResponse.java b/slack-api-client/src/main/java/com/slack/api/scim/response/GroupsDeleteResponse.java index ffc92d892..1d7af46e2 100644 --- a/slack-api-client/src/main/java/com/slack/api/scim/response/GroupsDeleteResponse.java +++ b/slack-api-client/src/main/java/com/slack/api/scim/response/GroupsDeleteResponse.java @@ -2,7 +2,9 @@ import com.slack.api.scim.SCIMApiResponse; import lombok.Data; +import lombok.EqualsAndHashCode; @Data +@EqualsAndHashCode(callSuper = false) public class GroupsDeleteResponse implements SCIMApiResponse { } diff --git a/slack-api-client/src/main/java/com/slack/api/scim/response/GroupsPatchResponse.java b/slack-api-client/src/main/java/com/slack/api/scim/response/GroupsPatchResponse.java index 56de8b3b6..7c5a7dfa7 100644 --- a/slack-api-client/src/main/java/com/slack/api/scim/response/GroupsPatchResponse.java +++ b/slack-api-client/src/main/java/com/slack/api/scim/response/GroupsPatchResponse.java @@ -3,7 +3,9 @@ import com.slack.api.scim.SCIMApiResponse; import com.slack.api.scim.model.Group; import lombok.Data; +import lombok.EqualsAndHashCode; @Data +@EqualsAndHashCode(callSuper = false) public class GroupsPatchResponse extends Group implements SCIMApiResponse { } diff --git a/slack-api-client/src/main/java/com/slack/api/scim/response/GroupsReadResponse.java b/slack-api-client/src/main/java/com/slack/api/scim/response/GroupsReadResponse.java index 5a35ca31e..33dfe1eb6 100644 --- a/slack-api-client/src/main/java/com/slack/api/scim/response/GroupsReadResponse.java +++ b/slack-api-client/src/main/java/com/slack/api/scim/response/GroupsReadResponse.java @@ -3,7 +3,9 @@ import com.slack.api.scim.SCIMApiResponse; import com.slack.api.scim.model.Group; import lombok.Data; +import lombok.EqualsAndHashCode; @Data +@EqualsAndHashCode(callSuper = false) public class GroupsReadResponse extends Group implements SCIMApiResponse { -} +} \ No newline at end of file diff --git a/slack-api-client/src/main/java/com/slack/api/scim/response/GroupsSearchResponse.java b/slack-api-client/src/main/java/com/slack/api/scim/response/GroupsSearchResponse.java index 13a7ca9b0..954267c18 100644 --- a/slack-api-client/src/main/java/com/slack/api/scim/response/GroupsSearchResponse.java +++ b/slack-api-client/src/main/java/com/slack/api/scim/response/GroupsSearchResponse.java @@ -4,10 +4,12 @@ import com.slack.api.scim.SCIMApiResponse; import com.slack.api.scim.model.Group; import lombok.Data; +import lombok.EqualsAndHashCode; import java.util.List; @Data +@EqualsAndHashCode(callSuper = false) public class GroupsSearchResponse implements SCIMApiResponse { private Integer totalResults; private Integer itemsPerPage; diff --git a/slack-api-client/src/main/java/com/slack/api/scim/response/GroupsUpdateResponse.java b/slack-api-client/src/main/java/com/slack/api/scim/response/GroupsUpdateResponse.java index 8cf9b7659..57c9fb778 100644 --- a/slack-api-client/src/main/java/com/slack/api/scim/response/GroupsUpdateResponse.java +++ b/slack-api-client/src/main/java/com/slack/api/scim/response/GroupsUpdateResponse.java @@ -3,7 +3,9 @@ import com.slack.api.scim.SCIMApiResponse; import com.slack.api.scim.model.Group; import lombok.Data; +import lombok.EqualsAndHashCode; @Data +@EqualsAndHashCode(callSuper = false) public class GroupsUpdateResponse extends Group implements SCIMApiResponse { } diff --git a/slack-api-client/src/main/java/com/slack/api/scim/response/ServiceProviderConfigsGetResponse.java b/slack-api-client/src/main/java/com/slack/api/scim/response/ServiceProviderConfigsGetResponse.java index ce4b9ded5..228963f60 100644 --- a/slack-api-client/src/main/java/com/slack/api/scim/response/ServiceProviderConfigsGetResponse.java +++ b/slack-api-client/src/main/java/com/slack/api/scim/response/ServiceProviderConfigsGetResponse.java @@ -2,10 +2,12 @@ import com.slack.api.scim.SCIMApiResponse; import lombok.Data; +import lombok.EqualsAndHashCode; import java.util.List; @Data +@EqualsAndHashCode(callSuper = false) public class ServiceProviderConfigsGetResponse implements SCIMApiResponse { private List authenticationSchemes; diff --git a/slack-api-client/src/main/java/com/slack/api/scim/response/UsersCreateResponse.java b/slack-api-client/src/main/java/com/slack/api/scim/response/UsersCreateResponse.java index 92ff869b5..e5bb461fb 100644 --- a/slack-api-client/src/main/java/com/slack/api/scim/response/UsersCreateResponse.java +++ b/slack-api-client/src/main/java/com/slack/api/scim/response/UsersCreateResponse.java @@ -3,7 +3,9 @@ import com.slack.api.scim.SCIMApiResponse; import com.slack.api.scim.model.User; import lombok.Data; +import lombok.EqualsAndHashCode; @Data +@EqualsAndHashCode(callSuper = false) public class UsersCreateResponse extends User implements SCIMApiResponse { } diff --git a/slack-api-client/src/main/java/com/slack/api/scim/response/UsersDeleteResponse.java b/slack-api-client/src/main/java/com/slack/api/scim/response/UsersDeleteResponse.java index 3664e5b7f..74061ef94 100644 --- a/slack-api-client/src/main/java/com/slack/api/scim/response/UsersDeleteResponse.java +++ b/slack-api-client/src/main/java/com/slack/api/scim/response/UsersDeleteResponse.java @@ -2,7 +2,9 @@ import com.slack.api.scim.SCIMApiResponse; import lombok.Data; +import lombok.EqualsAndHashCode; @Data +@EqualsAndHashCode(callSuper = false) public class UsersDeleteResponse implements SCIMApiResponse { } diff --git a/slack-api-client/src/main/java/com/slack/api/scim/response/UsersPatchResponse.java b/slack-api-client/src/main/java/com/slack/api/scim/response/UsersPatchResponse.java index 9da0ff1a6..36e881cd8 100644 --- a/slack-api-client/src/main/java/com/slack/api/scim/response/UsersPatchResponse.java +++ b/slack-api-client/src/main/java/com/slack/api/scim/response/UsersPatchResponse.java @@ -3,7 +3,9 @@ import com.slack.api.scim.SCIMApiResponse; import com.slack.api.scim.model.User; import lombok.Data; +import lombok.EqualsAndHashCode; @Data +@EqualsAndHashCode(callSuper = false) public class UsersPatchResponse extends User implements SCIMApiResponse { } diff --git a/slack-api-client/src/main/java/com/slack/api/scim/response/UsersReadResponse.java b/slack-api-client/src/main/java/com/slack/api/scim/response/UsersReadResponse.java index c88854506..524d85214 100644 --- a/slack-api-client/src/main/java/com/slack/api/scim/response/UsersReadResponse.java +++ b/slack-api-client/src/main/java/com/slack/api/scim/response/UsersReadResponse.java @@ -3,7 +3,9 @@ import com.slack.api.scim.SCIMApiResponse; import com.slack.api.scim.model.User; import lombok.Data; +import lombok.EqualsAndHashCode; @Data +@EqualsAndHashCode(callSuper = false) public class UsersReadResponse extends User implements SCIMApiResponse { } diff --git a/slack-api-client/src/main/java/com/slack/api/scim/response/UsersSearchResponse.java b/slack-api-client/src/main/java/com/slack/api/scim/response/UsersSearchResponse.java index 6b3409efe..f39d25c93 100644 --- a/slack-api-client/src/main/java/com/slack/api/scim/response/UsersSearchResponse.java +++ b/slack-api-client/src/main/java/com/slack/api/scim/response/UsersSearchResponse.java @@ -4,10 +4,12 @@ import com.slack.api.scim.SCIMApiResponse; import com.slack.api.scim.model.User; import lombok.Data; +import lombok.EqualsAndHashCode; import java.util.List; @Data +@EqualsAndHashCode(callSuper = false) public class UsersSearchResponse implements SCIMApiResponse { private Integer totalResults; private Integer itemsPerPage; diff --git a/slack-api-client/src/main/java/com/slack/api/scim/response/UsersUpdateResponse.java b/slack-api-client/src/main/java/com/slack/api/scim/response/UsersUpdateResponse.java index 757b52945..13f19fc94 100644 --- a/slack-api-client/src/main/java/com/slack/api/scim/response/UsersUpdateResponse.java +++ b/slack-api-client/src/main/java/com/slack/api/scim/response/UsersUpdateResponse.java @@ -3,7 +3,9 @@ import com.slack.api.scim.SCIMApiResponse; import com.slack.api.scim.model.User; import lombok.Data; +import lombok.EqualsAndHashCode; @Data +@EqualsAndHashCode(callSuper = false) public class UsersUpdateResponse extends User implements SCIMApiResponse { } diff --git a/slack-api-client/src/main/java/com/slack/api/status/v1/LegacyStatusApiException.java b/slack-api-client/src/main/java/com/slack/api/status/v1/LegacyStatusApiException.java index 5113cff52..c79b7dc3d 100644 --- a/slack-api-client/src/main/java/com/slack/api/status/v1/LegacyStatusApiException.java +++ b/slack-api-client/src/main/java/com/slack/api/status/v1/LegacyStatusApiException.java @@ -1,11 +1,13 @@ package com.slack.api.status.v1; import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; import okhttp3.Response; @Data @Slf4j +@EqualsAndHashCode(callSuper = false) public class LegacyStatusApiException extends Exception { private final Response response; diff --git a/slack-api-client/src/main/java/com/slack/api/status/v2/StatusApiException.java b/slack-api-client/src/main/java/com/slack/api/status/v2/StatusApiException.java index 56dfa74da..ab769844e 100644 --- a/slack-api-client/src/main/java/com/slack/api/status/v2/StatusApiException.java +++ b/slack-api-client/src/main/java/com/slack/api/status/v2/StatusApiException.java @@ -1,11 +1,13 @@ package com.slack.api.status.v2; import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; import okhttp3.Response; @Data @Slf4j +@EqualsAndHashCode(callSuper = false) public class StatusApiException extends Exception { private final Response response; diff --git a/slack-api-client/src/test/java/test_locally/api/audit/EqualityTest.java b/slack-api-client/src/test/java/test_locally/api/audit/EqualityTest.java new file mode 100644 index 000000000..e7119aeed --- /dev/null +++ b/slack-api-client/src/test/java/test_locally/api/audit/EqualityTest.java @@ -0,0 +1,35 @@ +package test_locally.api.audit; + +import com.slack.api.audit.AuditApiErrorResponse; +import com.slack.api.audit.AuditApiException; +import com.slack.api.audit.response.ActionsResponse; +import com.slack.api.audit.response.LogsResponse; +import com.slack.api.audit.response.SchemasResponse; +import okhttp3.Protocol; +import okhttp3.Request; +import okhttp3.Response; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; + +public class EqualityTest { + + @Test + public void test() { + Request request = new Request.Builder() + .url("https://www.example.com/") + .build(); + Response response = new Response.Builder() + .request(request) + .code(200) + .protocol(Protocol.HTTP_1_1) + .message("") + .build(); + + assertEquals(new AuditApiErrorResponse(), new AuditApiErrorResponse()); + assertEquals(new AuditApiException(response, "test"), new AuditApiException(response, "test")); + assertEquals(new ActionsResponse(), new ActionsResponse()); + assertEquals(new LogsResponse(), new LogsResponse()); + assertEquals(new SchemasResponse(), new SchemasResponse()); + } +} diff --git a/slack-api-client/src/test/java/test_locally/api/methods/EqualityTest.java b/slack-api-client/src/test/java/test_locally/api/methods/EqualityTest.java new file mode 100644 index 000000000..89e134ba0 --- /dev/null +++ b/slack-api-client/src/test/java/test_locally/api/methods/EqualityTest.java @@ -0,0 +1,29 @@ +package test_locally.api.methods; + +import com.slack.api.methods.MethodsCompletionException; +import com.slack.api.methods.SlackApiException; +import okhttp3.Protocol; +import okhttp3.Request; +import okhttp3.Response; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; + +public class EqualityTest { + + @Test + public void test() { + Request request = new Request.Builder() + .url("https://www.example.com/") + .build(); + Response response = new Response.Builder() + .request(request) + .code(200) + .protocol(Protocol.HTTP_1_1) + .message("") + .build(); + + assertEquals(new MethodsCompletionException(null, null, null), new MethodsCompletionException(null, null, null)); + assertEquals(new SlackApiException(response, ""), new SlackApiException(response, "")); + } +} diff --git a/slack-api-client/src/test/java/test_locally/api/scim/EqualityTest.java b/slack-api-client/src/test/java/test_locally/api/scim/EqualityTest.java new file mode 100644 index 000000000..1036c4ef4 --- /dev/null +++ b/slack-api-client/src/test/java/test_locally/api/scim/EqualityTest.java @@ -0,0 +1,46 @@ +package test_locally.api.scim; + +import com.slack.api.scim.SCIMApiErrorResponse; +import com.slack.api.scim.SCIMApiException; +import com.slack.api.scim.response.*; +import okhttp3.Protocol; +import okhttp3.Request; +import okhttp3.Response; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; + +public class EqualityTest { + + @Test + public void test() { + Request request = new Request.Builder() + .url("https://www.example.com/") + .build(); + Response response = new Response.Builder() + .request(request) + .code(200) + .protocol(Protocol.HTTP_1_1) + .message("") + .build(); + + assertEquals(new SCIMApiErrorResponse(), new SCIMApiErrorResponse()); + assertEquals(new SCIMApiException(response, ""), new SCIMApiException(response, "")); + + assertEquals(new GroupsCreateResponse(), new GroupsCreateResponse()); + assertEquals(new GroupsDeleteResponse(), new GroupsDeleteResponse()); + assertEquals(new GroupsPatchResponse(), new GroupsPatchResponse()); + assertEquals(new GroupsReadResponse(), new GroupsReadResponse()); + assertEquals(new GroupsSearchResponse(), new GroupsSearchResponse()); + assertEquals(new GroupsUpdateResponse(), new GroupsUpdateResponse()); + + assertEquals(new ServiceProviderConfigsGetResponse(), new ServiceProviderConfigsGetResponse()); + + assertEquals(new UsersCreateResponse(), new UsersCreateResponse()); + assertEquals(new UsersDeleteResponse(), new UsersDeleteResponse()); + assertEquals(new UsersPatchResponse(), new UsersPatchResponse()); + assertEquals(new UsersReadResponse(), new UsersReadResponse()); + assertEquals(new UsersSearchResponse(), new UsersSearchResponse()); + assertEquals(new UsersUpdateResponse(), new UsersUpdateResponse()); + } +} diff --git a/slack-api-client/src/test/java/test_locally/api/status/EqualityTest.java b/slack-api-client/src/test/java/test_locally/api/status/EqualityTest.java new file mode 100644 index 000000000..f84239a23 --- /dev/null +++ b/slack-api-client/src/test/java/test_locally/api/status/EqualityTest.java @@ -0,0 +1,29 @@ +package test_locally.api.status; + +import com.slack.api.status.v1.LegacyStatusApiException; +import com.slack.api.status.v2.StatusApiException; +import okhttp3.Protocol; +import okhttp3.Request; +import okhttp3.Response; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; + +public class EqualityTest { + + @Test + public void test() { + Request request = new Request.Builder() + .url("https://www.example.com/") + .build(); + Response response = new Response.Builder() + .request(request) + .code(200) + .protocol(Protocol.HTTP_1_1) + .message("") + .build(); + + assertEquals(new LegacyStatusApiException(response, ""), new LegacyStatusApiException(response, "")); + assertEquals(new StatusApiException(response, ""), new StatusApiException(response, "")); + } +} diff --git a/slack-api-model/src/main/java/com/slack/api/model/block/UnknownBlockElement.java b/slack-api-model/src/main/java/com/slack/api/model/block/UnknownBlockElement.java index 4cf19c0cd..87178c519 100644 --- a/slack-api-model/src/main/java/com/slack/api/model/block/UnknownBlockElement.java +++ b/slack-api-model/src/main/java/com/slack/api/model/block/UnknownBlockElement.java @@ -1,15 +1,13 @@ package com.slack.api.model.block; import com.slack.api.model.block.element.BlockElement; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; +import lombok.*; @Data @Builder @NoArgsConstructor @AllArgsConstructor +@EqualsAndHashCode(callSuper = false) public class UnknownBlockElement extends BlockElement { private String type; } diff --git a/slack-api-model/src/main/java/com/slack/api/model/block/composition/MarkdownTextObject.java b/slack-api-model/src/main/java/com/slack/api/model/block/composition/MarkdownTextObject.java index 990dfe003..6c7fc6d54 100644 --- a/slack-api-model/src/main/java/com/slack/api/model/block/composition/MarkdownTextObject.java +++ b/slack-api-model/src/main/java/com/slack/api/model/block/composition/MarkdownTextObject.java @@ -1,9 +1,6 @@ package com.slack.api.model.block.composition; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; +import lombok.*; /** * https://api.slack.com/reference/messaging/composition-objects#text @@ -12,6 +9,7 @@ @Builder @NoArgsConstructor @AllArgsConstructor +@EqualsAndHashCode(callSuper = false) public class MarkdownTextObject extends TextObject { public static final String TYPE = "mrkdwn"; private final String type = TYPE; diff --git a/slack-api-model/src/main/java/com/slack/api/model/block/composition/PlainTextObject.java b/slack-api-model/src/main/java/com/slack/api/model/block/composition/PlainTextObject.java index f6d8116dd..d57858905 100644 --- a/slack-api-model/src/main/java/com/slack/api/model/block/composition/PlainTextObject.java +++ b/slack-api-model/src/main/java/com/slack/api/model/block/composition/PlainTextObject.java @@ -1,9 +1,6 @@ package com.slack.api.model.block.composition; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; +import lombok.*; /** * https://api.slack.com/reference/messaging/composition-objects#text @@ -12,6 +9,7 @@ @Builder(toBuilder = true) @NoArgsConstructor @AllArgsConstructor +@EqualsAndHashCode(callSuper = false) public class PlainTextObject extends TextObject { public static final String TYPE = "plain_text"; diff --git a/slack-api-model/src/main/java/com/slack/api/model/block/composition/UnknownTextObject.java b/slack-api-model/src/main/java/com/slack/api/model/block/composition/UnknownTextObject.java index 41d7ec79f..8c6efe2e1 100644 --- a/slack-api-model/src/main/java/com/slack/api/model/block/composition/UnknownTextObject.java +++ b/slack-api-model/src/main/java/com/slack/api/model/block/composition/UnknownTextObject.java @@ -1,9 +1,6 @@ package com.slack.api.model.block.composition; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; +import lombok.*; /** * https://api.slack.com/reference/messaging/composition-objects#text @@ -12,6 +9,7 @@ @Builder(toBuilder = true) @NoArgsConstructor @AllArgsConstructor +@EqualsAndHashCode(callSuper = false) public class UnknownTextObject extends TextObject { private String type; private String text; diff --git a/slack-api-model/src/main/java/com/slack/api/model/block/element/ButtonElement.java b/slack-api-model/src/main/java/com/slack/api/model/block/element/ButtonElement.java index 03b2a74b8..49e5b325f 100644 --- a/slack-api-model/src/main/java/com/slack/api/model/block/element/ButtonElement.java +++ b/slack-api-model/src/main/java/com/slack/api/model/block/element/ButtonElement.java @@ -2,10 +2,7 @@ import com.slack.api.model.block.composition.ConfirmationDialogObject; import com.slack.api.model.block.composition.PlainTextObject; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; +import lombok.*; /** * https://api.slack.com/reference/block-kit/block-elements#button @@ -14,6 +11,7 @@ @Builder @NoArgsConstructor @AllArgsConstructor +@EqualsAndHashCode(callSuper = false) public class ButtonElement extends BlockElement { public static final String TYPE = "button"; private final String type = TYPE; diff --git a/slack-api-model/src/main/java/com/slack/api/model/block/element/ChannelsSelectElement.java b/slack-api-model/src/main/java/com/slack/api/model/block/element/ChannelsSelectElement.java index 6fb6fb9ad..92743f536 100644 --- a/slack-api-model/src/main/java/com/slack/api/model/block/element/ChannelsSelectElement.java +++ b/slack-api-model/src/main/java/com/slack/api/model/block/element/ChannelsSelectElement.java @@ -2,10 +2,7 @@ import com.slack.api.model.block.composition.ConfirmationDialogObject; import com.slack.api.model.block.composition.PlainTextObject; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; +import lombok.*; /** * https://api.slack.com/reference/block-kit/block-elements#channel_select @@ -14,6 +11,7 @@ @Builder @NoArgsConstructor @AllArgsConstructor +@EqualsAndHashCode(callSuper = false) public class ChannelsSelectElement extends BlockElement { public static final String TYPE = "channels_select"; private final String type = TYPE; diff --git a/slack-api-model/src/main/java/com/slack/api/model/block/element/CheckboxesElement.java b/slack-api-model/src/main/java/com/slack/api/model/block/element/CheckboxesElement.java index b4e6053e5..3b76254d1 100644 --- a/slack-api-model/src/main/java/com/slack/api/model/block/element/CheckboxesElement.java +++ b/slack-api-model/src/main/java/com/slack/api/model/block/element/CheckboxesElement.java @@ -2,10 +2,7 @@ import com.slack.api.model.block.composition.ConfirmationDialogObject; import com.slack.api.model.block.composition.OptionObject; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; +import lombok.*; import java.util.List; @@ -16,6 +13,7 @@ @Builder @NoArgsConstructor @AllArgsConstructor +@EqualsAndHashCode(callSuper = false) public class CheckboxesElement extends BlockElement { public static final String TYPE = "checkboxes"; private final String type = TYPE; diff --git a/slack-api-model/src/main/java/com/slack/api/model/block/element/ConversationsSelectElement.java b/slack-api-model/src/main/java/com/slack/api/model/block/element/ConversationsSelectElement.java index 3beec085b..0ec096c9b 100644 --- a/slack-api-model/src/main/java/com/slack/api/model/block/element/ConversationsSelectElement.java +++ b/slack-api-model/src/main/java/com/slack/api/model/block/element/ConversationsSelectElement.java @@ -2,10 +2,7 @@ import com.slack.api.model.block.composition.ConfirmationDialogObject; import com.slack.api.model.block.composition.PlainTextObject; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; +import lombok.*; /** * https://api.slack.com/reference/block-kit/block-elements#conversation_select @@ -14,6 +11,7 @@ @Builder @NoArgsConstructor @AllArgsConstructor +@EqualsAndHashCode(callSuper = false) public class ConversationsSelectElement extends BlockElement { public static final String TYPE = "conversations_select"; private final String type = TYPE; diff --git a/slack-api-model/src/main/java/com/slack/api/model/block/element/DatePickerElement.java b/slack-api-model/src/main/java/com/slack/api/model/block/element/DatePickerElement.java index 02e1d5c0c..0c8cf3ffa 100644 --- a/slack-api-model/src/main/java/com/slack/api/model/block/element/DatePickerElement.java +++ b/slack-api-model/src/main/java/com/slack/api/model/block/element/DatePickerElement.java @@ -2,10 +2,7 @@ import com.slack.api.model.block.composition.ConfirmationDialogObject; import com.slack.api.model.block.composition.PlainTextObject; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; +import lombok.*; /** * https://api.slack.com/reference/block-kit/block-elements#datepicker @@ -14,6 +11,7 @@ @Builder @NoArgsConstructor @AllArgsConstructor +@EqualsAndHashCode(callSuper = false) public class DatePickerElement extends BlockElement { public static final String TYPE = "datepicker"; private final String type = TYPE; diff --git a/slack-api-model/src/main/java/com/slack/api/model/block/element/ExternalSelectElement.java b/slack-api-model/src/main/java/com/slack/api/model/block/element/ExternalSelectElement.java index 8f3f92d46..02761207a 100644 --- a/slack-api-model/src/main/java/com/slack/api/model/block/element/ExternalSelectElement.java +++ b/slack-api-model/src/main/java/com/slack/api/model/block/element/ExternalSelectElement.java @@ -3,10 +3,7 @@ import com.slack.api.model.block.composition.ConfirmationDialogObject; import com.slack.api.model.block.composition.OptionObject; import com.slack.api.model.block.composition.PlainTextObject; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; +import lombok.*; /** * https://api.slack.com/reference/block-kit/block-elements#external_select @@ -15,6 +12,7 @@ @Builder @NoArgsConstructor @AllArgsConstructor +@EqualsAndHashCode(callSuper = false) public class ExternalSelectElement extends BlockElement { public static final String TYPE = "external_select"; private final String type = TYPE; diff --git a/slack-api-model/src/main/java/com/slack/api/model/block/element/ImageElement.java b/slack-api-model/src/main/java/com/slack/api/model/block/element/ImageElement.java index 1d01b7c39..1de89e270 100644 --- a/slack-api-model/src/main/java/com/slack/api/model/block/element/ImageElement.java +++ b/slack-api-model/src/main/java/com/slack/api/model/block/element/ImageElement.java @@ -1,10 +1,7 @@ package com.slack.api.model.block.element; import com.slack.api.model.block.ContextBlockElement; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; +import lombok.*; /** * https://api.slack.com/reference/block-kit/block-elements#image @@ -13,6 +10,7 @@ @Builder @NoArgsConstructor @AllArgsConstructor +@EqualsAndHashCode(callSuper = false) public class ImageElement extends BlockElement implements ContextBlockElement { public static final String TYPE = "image"; private final String type = TYPE; diff --git a/slack-api-model/src/main/java/com/slack/api/model/block/element/MultiChannelsSelectElement.java b/slack-api-model/src/main/java/com/slack/api/model/block/element/MultiChannelsSelectElement.java index 71b2da90b..f7e25a203 100644 --- a/slack-api-model/src/main/java/com/slack/api/model/block/element/MultiChannelsSelectElement.java +++ b/slack-api-model/src/main/java/com/slack/api/model/block/element/MultiChannelsSelectElement.java @@ -2,10 +2,7 @@ import com.slack.api.model.block.composition.ConfirmationDialogObject; import com.slack.api.model.block.composition.PlainTextObject; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; +import lombok.*; import java.util.List; @@ -16,6 +13,7 @@ @Builder @NoArgsConstructor @AllArgsConstructor +@EqualsAndHashCode(callSuper = false) public class MultiChannelsSelectElement extends BlockElement { public static final String TYPE = "multi_channels_select"; private final String type = TYPE; diff --git a/slack-api-model/src/main/java/com/slack/api/model/block/element/MultiConversationsSelectElement.java b/slack-api-model/src/main/java/com/slack/api/model/block/element/MultiConversationsSelectElement.java index b97bde4cd..8ce72eec4 100644 --- a/slack-api-model/src/main/java/com/slack/api/model/block/element/MultiConversationsSelectElement.java +++ b/slack-api-model/src/main/java/com/slack/api/model/block/element/MultiConversationsSelectElement.java @@ -2,10 +2,7 @@ import com.slack.api.model.block.composition.ConfirmationDialogObject; import com.slack.api.model.block.composition.PlainTextObject; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; +import lombok.*; import java.util.List; @@ -16,6 +13,7 @@ @Builder @NoArgsConstructor @AllArgsConstructor +@EqualsAndHashCode(callSuper = false) public class MultiConversationsSelectElement extends BlockElement { public static final String TYPE = "multi_conversations_select"; private final String type = TYPE; diff --git a/slack-api-model/src/main/java/com/slack/api/model/block/element/MultiExternalSelectElement.java b/slack-api-model/src/main/java/com/slack/api/model/block/element/MultiExternalSelectElement.java index 80335a6a4..2f07c73ba 100644 --- a/slack-api-model/src/main/java/com/slack/api/model/block/element/MultiExternalSelectElement.java +++ b/slack-api-model/src/main/java/com/slack/api/model/block/element/MultiExternalSelectElement.java @@ -3,10 +3,7 @@ import com.slack.api.model.block.composition.ConfirmationDialogObject; import com.slack.api.model.block.composition.OptionObject; import com.slack.api.model.block.composition.PlainTextObject; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; +import lombok.*; import java.util.List; @@ -17,6 +14,7 @@ @Builder @NoArgsConstructor @AllArgsConstructor +@EqualsAndHashCode(callSuper = false) public class MultiExternalSelectElement extends BlockElement { public static final String TYPE = "multi_external_select"; private final String type = TYPE; diff --git a/slack-api-model/src/main/java/com/slack/api/model/block/element/MultiStaticSelectElement.java b/slack-api-model/src/main/java/com/slack/api/model/block/element/MultiStaticSelectElement.java index a23e1a801..5ddb61a3d 100644 --- a/slack-api-model/src/main/java/com/slack/api/model/block/element/MultiStaticSelectElement.java +++ b/slack-api-model/src/main/java/com/slack/api/model/block/element/MultiStaticSelectElement.java @@ -4,10 +4,7 @@ import com.slack.api.model.block.composition.OptionGroupObject; import com.slack.api.model.block.composition.OptionObject; import com.slack.api.model.block.composition.PlainTextObject; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; +import lombok.*; import java.util.List; @@ -18,6 +15,7 @@ @Builder @NoArgsConstructor @AllArgsConstructor +@EqualsAndHashCode(callSuper = false) public class MultiStaticSelectElement extends BlockElement { public static final String TYPE = "multi_static_select"; private final String type = TYPE; diff --git a/slack-api-model/src/main/java/com/slack/api/model/block/element/MultiUsersSelectElement.java b/slack-api-model/src/main/java/com/slack/api/model/block/element/MultiUsersSelectElement.java index c38a4da6e..f0b97b2d6 100644 --- a/slack-api-model/src/main/java/com/slack/api/model/block/element/MultiUsersSelectElement.java +++ b/slack-api-model/src/main/java/com/slack/api/model/block/element/MultiUsersSelectElement.java @@ -2,10 +2,7 @@ import com.slack.api.model.block.composition.ConfirmationDialogObject; import com.slack.api.model.block.composition.PlainTextObject; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; +import lombok.*; import java.util.List; @@ -16,6 +13,7 @@ @Builder @NoArgsConstructor @AllArgsConstructor +@EqualsAndHashCode(callSuper = false) public class MultiUsersSelectElement extends BlockElement { public static final String TYPE = "multi_users_select"; private final String type = TYPE; diff --git a/slack-api-model/src/main/java/com/slack/api/model/block/element/OverflowMenuElement.java b/slack-api-model/src/main/java/com/slack/api/model/block/element/OverflowMenuElement.java index a55724fc7..e0f12897c 100644 --- a/slack-api-model/src/main/java/com/slack/api/model/block/element/OverflowMenuElement.java +++ b/slack-api-model/src/main/java/com/slack/api/model/block/element/OverflowMenuElement.java @@ -2,10 +2,7 @@ import com.slack.api.model.block.composition.ConfirmationDialogObject; import com.slack.api.model.block.composition.OptionObject; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; +import lombok.*; import java.util.List; @@ -16,6 +13,7 @@ @Builder @NoArgsConstructor @AllArgsConstructor +@EqualsAndHashCode(callSuper = false) public class OverflowMenuElement extends BlockElement { public static final String TYPE = "overflow"; private final String type = TYPE; diff --git a/slack-api-model/src/main/java/com/slack/api/model/block/element/PlainTextInputElement.java b/slack-api-model/src/main/java/com/slack/api/model/block/element/PlainTextInputElement.java index 3cdd7a991..367dd170a 100644 --- a/slack-api-model/src/main/java/com/slack/api/model/block/element/PlainTextInputElement.java +++ b/slack-api-model/src/main/java/com/slack/api/model/block/element/PlainTextInputElement.java @@ -1,10 +1,7 @@ package com.slack.api.model.block.element; import com.slack.api.model.block.composition.PlainTextObject; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; +import lombok.*; /** * https://api.slack.com/reference/block-kit/block-elements#input @@ -13,6 +10,7 @@ @Builder @NoArgsConstructor @AllArgsConstructor +@EqualsAndHashCode(callSuper = false) public class PlainTextInputElement extends BlockElement { public static final String TYPE = "plain_text_input"; private final String type = TYPE; diff --git a/slack-api-model/src/main/java/com/slack/api/model/block/element/RadioButtonsElement.java b/slack-api-model/src/main/java/com/slack/api/model/block/element/RadioButtonsElement.java index 37306ddcf..02a97cffd 100644 --- a/slack-api-model/src/main/java/com/slack/api/model/block/element/RadioButtonsElement.java +++ b/slack-api-model/src/main/java/com/slack/api/model/block/element/RadioButtonsElement.java @@ -2,10 +2,7 @@ import com.slack.api.model.block.composition.ConfirmationDialogObject; import com.slack.api.model.block.composition.OptionObject; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; +import lombok.*; import java.util.List; @@ -16,6 +13,7 @@ @Builder @NoArgsConstructor @AllArgsConstructor +@EqualsAndHashCode(callSuper = false) public class RadioButtonsElement extends BlockElement { public static final String TYPE = "radio_buttons"; private final String type = TYPE; diff --git a/slack-api-model/src/main/java/com/slack/api/model/block/element/RichTextListElement.java b/slack-api-model/src/main/java/com/slack/api/model/block/element/RichTextListElement.java index b468d5dd9..01fbec71c 100644 --- a/slack-api-model/src/main/java/com/slack/api/model/block/element/RichTextListElement.java +++ b/slack-api-model/src/main/java/com/slack/api/model/block/element/RichTextListElement.java @@ -1,9 +1,6 @@ package com.slack.api.model.block.element; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; +import lombok.*; import java.util.ArrayList; import java.util.List; @@ -15,6 +12,7 @@ @Builder @NoArgsConstructor @AllArgsConstructor +@EqualsAndHashCode(callSuper = false) public class RichTextListElement extends BlockElement implements RichTextElement { public static final String TYPE = "rich_text_list"; diff --git a/slack-api-model/src/main/java/com/slack/api/model/block/element/RichTextPreformattedElement.java b/slack-api-model/src/main/java/com/slack/api/model/block/element/RichTextPreformattedElement.java index 54ba344a7..7c2722270 100644 --- a/slack-api-model/src/main/java/com/slack/api/model/block/element/RichTextPreformattedElement.java +++ b/slack-api-model/src/main/java/com/slack/api/model/block/element/RichTextPreformattedElement.java @@ -1,9 +1,6 @@ package com.slack.api.model.block.element; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; +import lombok.*; import java.util.ArrayList; import java.util.List; @@ -15,6 +12,7 @@ @Builder @NoArgsConstructor @AllArgsConstructor +@EqualsAndHashCode(callSuper = false) public class RichTextPreformattedElement extends BlockElement implements RichTextElement { public static final String TYPE = "rich_text_preformatted"; diff --git a/slack-api-model/src/main/java/com/slack/api/model/block/element/RichTextQuoteElement.java b/slack-api-model/src/main/java/com/slack/api/model/block/element/RichTextQuoteElement.java index 03a5cc47c..bf58135bf 100644 --- a/slack-api-model/src/main/java/com/slack/api/model/block/element/RichTextQuoteElement.java +++ b/slack-api-model/src/main/java/com/slack/api/model/block/element/RichTextQuoteElement.java @@ -1,9 +1,6 @@ package com.slack.api.model.block.element; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; +import lombok.*; import java.util.ArrayList; import java.util.List; @@ -15,6 +12,7 @@ @Builder @NoArgsConstructor @AllArgsConstructor +@EqualsAndHashCode(callSuper = false) public class RichTextQuoteElement extends BlockElement implements RichTextElement { public static final String TYPE = "rich_text_quote"; diff --git a/slack-api-model/src/main/java/com/slack/api/model/block/element/RichTextSectionElement.java b/slack-api-model/src/main/java/com/slack/api/model/block/element/RichTextSectionElement.java index 2b1e49ed9..c7ed6627d 100644 --- a/slack-api-model/src/main/java/com/slack/api/model/block/element/RichTextSectionElement.java +++ b/slack-api-model/src/main/java/com/slack/api/model/block/element/RichTextSectionElement.java @@ -1,9 +1,6 @@ package com.slack.api.model.block.element; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; +import lombok.*; import java.util.ArrayList; import java.util.List; @@ -15,6 +12,7 @@ @Builder @NoArgsConstructor @AllArgsConstructor +@EqualsAndHashCode(callSuper = false) public class RichTextSectionElement extends BlockElement implements RichTextElement { public static final String TYPE = "rich_text_section"; private final String type = TYPE; diff --git a/slack-api-model/src/main/java/com/slack/api/model/block/element/RichTextUnknownElement.java b/slack-api-model/src/main/java/com/slack/api/model/block/element/RichTextUnknownElement.java index 2e8869b40..ff3612c94 100644 --- a/slack-api-model/src/main/java/com/slack/api/model/block/element/RichTextUnknownElement.java +++ b/slack-api-model/src/main/java/com/slack/api/model/block/element/RichTextUnknownElement.java @@ -1,14 +1,12 @@ package com.slack.api.model.block.element; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; +import lombok.*; @Data @Builder @NoArgsConstructor @AllArgsConstructor +@EqualsAndHashCode(callSuper = false) public class RichTextUnknownElement extends BlockElement implements RichTextElement { private String type; } diff --git a/slack-api-model/src/main/java/com/slack/api/model/block/element/StaticSelectElement.java b/slack-api-model/src/main/java/com/slack/api/model/block/element/StaticSelectElement.java index 37c488e22..67bdf96a2 100644 --- a/slack-api-model/src/main/java/com/slack/api/model/block/element/StaticSelectElement.java +++ b/slack-api-model/src/main/java/com/slack/api/model/block/element/StaticSelectElement.java @@ -4,10 +4,7 @@ import com.slack.api.model.block.composition.OptionGroupObject; import com.slack.api.model.block.composition.OptionObject; import com.slack.api.model.block.composition.PlainTextObject; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; +import lombok.*; import java.util.List; @@ -18,6 +15,7 @@ @Builder @NoArgsConstructor @AllArgsConstructor +@EqualsAndHashCode(callSuper = false) public class StaticSelectElement extends BlockElement { public static final String TYPE = "static_select"; private final String type = TYPE; diff --git a/slack-api-model/src/main/java/com/slack/api/model/block/element/UsersSelectElement.java b/slack-api-model/src/main/java/com/slack/api/model/block/element/UsersSelectElement.java index a3bd5aacf..34ab40b35 100644 --- a/slack-api-model/src/main/java/com/slack/api/model/block/element/UsersSelectElement.java +++ b/slack-api-model/src/main/java/com/slack/api/model/block/element/UsersSelectElement.java @@ -2,10 +2,7 @@ import com.slack.api.model.block.composition.ConfirmationDialogObject; import com.slack.api.model.block.composition.PlainTextObject; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; +import lombok.*; /** * https://api.slack.com/reference/block-kit/block-elements#users_select @@ -14,6 +11,7 @@ @Builder @NoArgsConstructor @AllArgsConstructor +@EqualsAndHashCode(callSuper = false) public class UsersSelectElement extends BlockElement { public static final String TYPE = "users_select"; private final String type = TYPE; diff --git a/slack-api-model/src/test/java/test_locally/api/model/ModelsTest.java b/slack-api-model/src/test/java/test_locally/api/model/ModelsTest.java index 2968e73d5..086d6d6fb 100644 --- a/slack-api-model/src/test/java/test_locally/api/model/ModelsTest.java +++ b/slack-api-model/src/test/java/test_locally/api/model/ModelsTest.java @@ -247,33 +247,4 @@ public void blockCompositions_radio_buttons_checkboxes() { assertNotNull(checkboxes); } - @Test - public void equality() { - assertEquals(new MarkdownTextObject(), new MarkdownTextObject()); - assertEquals(new PlainTextObject(), new PlainTextObject()); - assertEquals(new UnknownTextObject(), new UnknownTextObject()); - assertEquals(new ButtonElement(), new ButtonElement()); - assertEquals(new ChannelsSelectElement(), new ChannelsSelectElement()); - assertEquals(new CheckboxesElement(), new CheckboxesElement()); - assertEquals(new ConversationsSelectElement(), new ConversationsSelectElement()); - assertEquals(new DatePickerElement(), new DatePickerElement()); - assertEquals(new ExternalSelectElement(), new ExternalSelectElement()); - assertEquals(new ImageElement(), new ImageElement()); - assertEquals(new MultiChannelsSelectElement(), new MultiChannelsSelectElement()); - assertEquals(new MultiConversationsSelectElement(), new MultiConversationsSelectElement()); - assertEquals(new MultiExternalSelectElement(), new MultiExternalSelectElement()); - assertEquals(new MultiStaticSelectElement(), new MultiStaticSelectElement()); - assertEquals(new MultiUsersSelectElement(), new MultiUsersSelectElement()); - assertEquals(new OverflowMenuElement(), new OverflowMenuElement()); - assertEquals(new PlainTextInputElement(), new PlainTextInputElement()); - assertEquals(new RadioButtonsElement(), new RadioButtonsElement()); - assertEquals(new RichTextListElement(), new RichTextListElement()); - assertEquals(new RichTextPreformattedElement(), new RichTextPreformattedElement()); - assertEquals(new RichTextQuoteElement(), new RichTextQuoteElement()); - assertEquals(new RichTextSectionElement(), new RichTextSectionElement()); - assertEquals(new RichTextUnknownElement(), new RichTextUnknownElement()); - assertEquals(new StaticSelectElement(), new StaticSelectElement()); - assertEquals(new UsersSelectElement(), new UsersSelectElement()); - } - } diff --git a/slack-api-model/src/test/java/test_locally/api/model/block/EqualityTest.java b/slack-api-model/src/test/java/test_locally/api/model/block/EqualityTest.java new file mode 100644 index 000000000..cb30d6fd9 --- /dev/null +++ b/slack-api-model/src/test/java/test_locally/api/model/block/EqualityTest.java @@ -0,0 +1,44 @@ +package test_locally.api.model.block; + +import com.slack.api.model.block.UnknownBlockElement; +import com.slack.api.model.block.composition.MarkdownTextObject; +import com.slack.api.model.block.composition.PlainTextObject; +import com.slack.api.model.block.composition.UnknownTextObject; +import com.slack.api.model.block.element.*; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; + +public class EqualityTest { + + @Test + public void equality() { + assertEquals(new UnknownTextObject(), new UnknownTextObject()); + assertEquals(new MarkdownTextObject(), new MarkdownTextObject()); + assertEquals(new PlainTextObject(), new PlainTextObject()); + + assertEquals(new UnknownBlockElement(), new UnknownBlockElement()); + assertEquals(new ButtonElement(), new ButtonElement()); + assertEquals(new ChannelsSelectElement(), new ChannelsSelectElement()); + assertEquals(new CheckboxesElement(), new CheckboxesElement()); + assertEquals(new ConversationsSelectElement(), new ConversationsSelectElement()); + assertEquals(new DatePickerElement(), new DatePickerElement()); + assertEquals(new ExternalSelectElement(), new ExternalSelectElement()); + assertEquals(new ImageElement(), new ImageElement()); + assertEquals(new MultiChannelsSelectElement(), new MultiChannelsSelectElement()); + assertEquals(new MultiConversationsSelectElement(), new MultiConversationsSelectElement()); + assertEquals(new MultiExternalSelectElement(), new MultiExternalSelectElement()); + assertEquals(new MultiStaticSelectElement(), new MultiStaticSelectElement()); + assertEquals(new MultiUsersSelectElement(), new MultiUsersSelectElement()); + assertEquals(new OverflowMenuElement(), new OverflowMenuElement()); + assertEquals(new PlainTextInputElement(), new PlainTextInputElement()); + assertEquals(new RadioButtonsElement(), new RadioButtonsElement()); + assertEquals(new RichTextListElement(), new RichTextListElement()); + assertEquals(new RichTextPreformattedElement(), new RichTextPreformattedElement()); + assertEquals(new RichTextQuoteElement(), new RichTextQuoteElement()); + assertEquals(new RichTextSectionElement(), new RichTextSectionElement()); + assertEquals(new RichTextUnknownElement(), new RichTextUnknownElement()); + assertEquals(new StaticSelectElement(), new StaticSelectElement()); + assertEquals(new UsersSelectElement(), new UsersSelectElement()); + } +} diff --git a/slack-app-backend/src/main/java/com/slack/api/app_backend/views/response/ViewSubmissionResponse.java b/slack-app-backend/src/main/java/com/slack/api/app_backend/views/response/ViewSubmissionResponse.java index 613ef4472..bf8ff844b 100644 --- a/slack-app-backend/src/main/java/com/slack/api/app_backend/views/response/ViewSubmissionResponse.java +++ b/slack-app-backend/src/main/java/com/slack/api/app_backend/views/response/ViewSubmissionResponse.java @@ -2,10 +2,7 @@ import com.slack.api.model.view.View; import com.slack.api.util.json.GsonFactory; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; +import lombok.*; import java.util.Map; @@ -13,6 +10,7 @@ @Builder @NoArgsConstructor @AllArgsConstructor +@EqualsAndHashCode(callSuper = false) public class ViewSubmissionResponse { private String responseAction; // push, update, errors, (no value to close)