diff --git a/.java-version b/.java-version new file mode 100644 index 00000000..62593409 --- /dev/null +++ b/.java-version @@ -0,0 +1 @@ +1.8 diff --git a/README.md b/README.md index 26ad3191..3e258694 100644 --- a/README.md +++ b/README.md @@ -185,6 +185,7 @@ If you're not familiar with Java 8's `CompletableFuture` API, know that you can - [@mlr46](https://github.com/mlr46) | [:computer:](https://github.com/HubSpot/slack-client/commits?author=mlr46) - [@mindspin311](https://github.com/mindspin311) | [:computer:](https://github.com/HubSpot/slack-client/commits?author=mindspin311) - [@Ulya0302](https://github.com/Ulya0302) | [:computer:](https://github.com/HubSpot/slack-client/commits?author=Ulya0302) + - [@bdros](https://github.com/bdros) | [:computer:](https://github.com/HubSpot/slack-client/commits?author=bdros) ## License diff --git a/slack-base/src/main/java/com/hubspot/slack/client/methods/interceptor/HasToken.java b/slack-base/src/main/java/com/hubspot/slack/client/methods/interceptor/HasToken.java new file mode 100644 index 00000000..627d7045 --- /dev/null +++ b/slack-base/src/main/java/com/hubspot/slack/client/methods/interceptor/HasToken.java @@ -0,0 +1,6 @@ +package com.hubspot.slack.client.methods.interceptor; + +public interface HasToken { + + String getToken(); +} diff --git a/slack-base/src/main/java/com/hubspot/slack/client/methods/params/chat/AbstractChatMessageParams.java b/slack-base/src/main/java/com/hubspot/slack/client/methods/params/chat/AbstractChatMessageParams.java index 323eb4e0..3a693fd4 100644 --- a/slack-base/src/main/java/com/hubspot/slack/client/methods/params/chat/AbstractChatMessageParams.java +++ b/slack-base/src/main/java/com/hubspot/slack/client/methods/params/chat/AbstractChatMessageParams.java @@ -15,6 +15,7 @@ public abstract class AbstractChatMessageParams implements MessageParams { @JsonProperty("channel") public abstract String getChannelId(); + public abstract String getToken(); public abstract Optional getText(); public abstract Optional getThreadTs(); public abstract Optional getUsername(); diff --git a/slack-base/src/main/java/com/hubspot/slack/client/methods/params/chat/MessageParams.java b/slack-base/src/main/java/com/hubspot/slack/client/methods/params/chat/MessageParams.java index 159bfb72..99c915ab 100644 --- a/slack-base/src/main/java/com/hubspot/slack/client/methods/params/chat/MessageParams.java +++ b/slack-base/src/main/java/com/hubspot/slack/client/methods/params/chat/MessageParams.java @@ -1,5 +1,6 @@ package com.hubspot.slack.client.methods.params.chat; +import com.hubspot.slack.client.methods.interceptor.HasToken; import java.util.Collections; import java.util.List; import java.util.Optional; @@ -10,7 +11,7 @@ import com.hubspot.slack.client.models.Attachment; import com.hubspot.slack.client.models.blocks.Block; -public interface MessageParams extends HasChannel { +public interface MessageParams extends HasChannel, HasToken { Optional getText(); List getAttachments(); diff --git a/slack-base/src/test/java/com/hubspot/slack/client/methods/params/chat/MessageParamsTest.java b/slack-base/src/test/java/com/hubspot/slack/client/methods/params/chat/MessageParamsTest.java index 2fda55a9..541bc551 100644 --- a/slack-base/src/test/java/com/hubspot/slack/client/methods/params/chat/MessageParamsTest.java +++ b/slack-base/src/test/java/com/hubspot/slack/client/methods/params/chat/MessageParamsTest.java @@ -12,17 +12,20 @@ public class MessageParamsTest { @Test public void itBuildsWithAttachmentsAndNoText() { ChatPostEphemeralMessageParams.builder() + .setToken("testToken") .setChannelId("testChannelId") .setUserToSendTo("testUserId") .addAttachments(Attachment.builder().build()) .build(); ChatPostMessageParams.builder() + .setToken("testToken") .setChannelId("testChannelId") .addAttachments(Attachment.builder().build()) .build(); ChatUpdateMessageParams.builder() + .setToken("testToken") .setTs("testTs") .setChannelId("testChannelId") .addAttachments(Attachment.builder().build()) @@ -32,17 +35,20 @@ public void itBuildsWithAttachmentsAndNoText() { @Test public void itBuildsWithTextAndNoAttachments() { ChatPostEphemeralMessageParams.builder() + .setToken("testToken") .setChannelId("testChannelId") .setUserToSendTo("testUserId") .setText("testText") .build(); ChatPostMessageParams.builder() + .setToken("testToken") .setChannelId("testChannelId") .setText("testText") .build(); ChatUpdateMessageParams.builder() + .setToken("testToken") .setTs("testTs") .setChannelId("testChannelId") .setText("testText") @@ -55,6 +61,7 @@ public void itFailsToBuildWithoutTextOrAttachments() { try { ChatPostEphemeralMessageParams.builder() + .setToken("testToken") .setChannelId("testChannelId") .setUserToSendTo("testUserId") .build(); @@ -65,6 +72,7 @@ public void itFailsToBuildWithoutTextOrAttachments() { try { ChatPostMessageParams.builder() + .setToken("testToken") .setChannelId("testChannelId") .build(); success = false; @@ -74,6 +82,7 @@ public void itFailsToBuildWithoutTextOrAttachments() { try { ChatUpdateMessageParams.builder() + .setToken("testToken") .setTs("testTs") .setChannelId("testChannelId") .build();