Skip to content

Slack message empty text #31596

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

Merged
merged 12 commits into from
Jul 10, 2018
+23 −2
Merged

Slack message empty text #31596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
9c8e69c
Make text message not required in constructor for slack
albendz Jun 13, 2018
b6876b4
Remove unnecessary comments in test file
albendz Jun 13, 2018
226300b
Bring back final in all message attributes; change constructors to en…
albendz Jun 22, 2018
9e7a501
Merge branch 'master' of git://github.com/elastic/elasticsearch into …
albendz Jun 23, 2018
b677906
Correct test method names so that they run
albendz Jun 27, 2018
f46dd0e
Merge branch 'master' of git://github.com/elastic/elasticsearch into …
albendz Jun 27, 2018
3b3f782
Fix incorrect constructor
albendz Jul 3, 2018
b260d02
Remove additional constructors; make arguments nullable; add test for…
albendz Jul 6, 2018
c9b3e92
Merge remote-tracking branch 'upstream/master' into slack_message_emp…
albendz Jul 6, 2018
190b19c
Remove some randomness from SlackMessage tests
albendz Jul 6, 2018
c126182
Expand the statement wide ! into the individual terms
albendz Jul 7, 2018
3a68cd7
Merge remote-tracking branch 'upstream/master' into albendz/slack_mes…
hub-cap Jul 9, 2018
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
7 changes: 6 additions & 1 deletion ...rc/main/java/org/elasticsearch/xpack/watcher/notification/slack/message/SlackMessage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.xpack.watcher.common.text.TextTemplate;
import org.elasticsearch.xpack.watcher.common.text.TextTemplateEngine;
import org.elasticsearch.common.Nullable;

import java.io.IOException;
import java.util.ArrayList;
Expand All @@ -29,7 +30,11 @@ public class SlackMessage implements MessageElement {
final String text;
final Attachment[] attachments;

public SlackMessage(String from, String[] to, String icon, String text, Attachment[] attachments) {
public SlackMessage(String from, String[] to, String icon, @Nullable String text, @Nullable Attachment[] attachments) {
if(text == null && attachments == null) {
throw new IllegalArgumentException("Both text and attachments cannot be null.");
}

this.from = from;
this.to = to;
this.icon = icon;
Expand Down
18 changes: 17 additions & 1 deletion ...st/java/org/elasticsearch/xpack/watcher/notification/slack/message/SlackMessageTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public void testToXContent() throws Exception {
}
String icon = randomBoolean() ? null : randomAlphaOfLength(10);
String text = randomBoolean() ? null : randomAlphaOfLength(50);
Attachment[] attachments = randomBoolean() ? null : new Attachment[randomIntBetween(0, 2)];
Attachment[] attachments = (text != null && randomBoolean()) ? null : new Attachment[randomIntBetween(0, 2)];
if (attachments != null) {
for (int i = 0; i < attachments.length; i++) {
String fallback = randomBoolean() ? null : randomAlphaOfLength(10);
Expand Down Expand Up @@ -600,6 +600,22 @@ public void testUrlPathIsFiltered() throws Exception {
}
}

public void testCanHaveNullText() throws Exception {
SlackMessage slackMessage = new SlackMessage("from", new String[] {"to"}, "icon", null, new Attachment[1]);
assertNull(slackMessage.getText());
assertNotNull(slackMessage.getAttachments());
}

public void testCanHaveNullAttachments() throws Exception {
SlackMessage slackMessage = new SlackMessage("from", new String[] {"to"}, "icon", "text", null);
assertNotNull(slackMessage.getText());
assertNull(slackMessage.getAttachments());
}

public void testCannotHaveNullAttachmentsAndNullText() throws Exception {
expectThrows(IllegalArgumentException.class, () -> new SlackMessage("from", new String[]{"to"}, "icon", null, null));
}

private static void writeFieldIfNotNull(XContentBuilder builder, String field, Object value) throws IOException {
if (value != null) {
builder.field(field, value);
Expand Down