From 9c8e69c71efd7fd4a0ae75fe8347ccc1c5dd40d4 Mon Sep 17 00:00:00 2001 From: albendz Date: Tue, 12 Jun 2018 19:49:13 -0700 Subject: [PATCH 1/2] Make text message not required in constructor for slack --- .../slack/message/SlackMessage.java | 18 +++++++++++++++--- .../slack/message/SlackMessageTests.java | 10 +++++++++- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/notification/slack/message/SlackMessage.java b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/notification/slack/message/SlackMessage.java index 9f7cd36c9106a..fd5bcc9e8b9ef 100644 --- a/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/notification/slack/message/SlackMessage.java +++ b/x-pack/plugin/watcher/src/main/java/org/elasticsearch/xpack/watcher/notification/slack/message/SlackMessage.java @@ -26,8 +26,16 @@ public class SlackMessage implements MessageElement { final String from; final String[] to; final String icon; - final String text; - final Attachment[] attachments; + String text; + Attachment[] attachments; + + public SlackMessage(String from, String[] to, String icon) { + this(from, to, icon, null, null); // Empty text and empty attachments + } + + public SlackMessage(String from, String[] to, String icon, String text) { + this(from, to, icon, text, null); // Empty attachments + } public SlackMessage(String from, String[] to, String icon, String text, Attachment[] attachments) { this.from = from; @@ -57,6 +65,10 @@ public Attachment[] getAttachments() { return attachments; } + public void setText(String text) { this.text = text;} + + public void setAttachments(Attachment[] attachments) { this.attachments = attachments;} + @Override public boolean equals(Object o) { if (this == o) return true; @@ -202,7 +214,7 @@ public SlackMessage render(String watchId, String actionId, TextTemplateEngine e attachments.addAll(dynamicAttachments.render(engine, model, defaults.attachment)); } if (attachments == null) { - return new SlackMessage(from, to, icon, text, null); + return new SlackMessage(from, to, icon, text); } return new SlackMessage(from, to, icon, text, attachments.toArray(new Attachment[attachments.size()])); } diff --git a/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/notification/slack/message/SlackMessageTests.java b/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/notification/slack/message/SlackMessageTests.java index 4075bd3dadde4..0a0de3fdd479d 100644 --- a/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/notification/slack/message/SlackMessageTests.java +++ b/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/notification/slack/message/SlackMessageTests.java @@ -575,7 +575,7 @@ public void testUrlPathIsFiltered() throws Exception { HttpResponse response = new HttpResponse(500); String path = randomAlphaOfLength(20); HttpRequest request = HttpRequest.builder("localhost", 1234).path(path).build(); - SlackMessage slackMessage = new SlackMessage("from", new String[] {"to"}, "icon", "text", null); + SlackMessage slackMessage = new SlackMessage("from", new String[] {"to"}, "icon", "text"); SentMessages sentMessages = new SentMessages("foo", Arrays.asList(SentMessages.SentMessage.responded("recipient", slackMessage, request, response))); @@ -602,6 +602,14 @@ public void testUrlPathIsFiltered() throws Exception { } } + // Create template from null message or null attachment ok + // Can have message as null + + public void canHaveNullTextAndAttachment() throws Exception { + SlackMessage slackMessage = new SlackMessage("from", new String[] {"to"}, "icon"); + assertThat(slackMessage.getText(), is(null)); + assertThat(slackMessage.getAttachments(), is(null)); + } private static void writeFieldIfNotNull(XContentBuilder builder, String field, Object value) throws IOException { if (value != null) { builder.field(field, value); From b6876b4e92fa0451362ede9d122fe59e657900d9 Mon Sep 17 00:00:00 2001 From: albendz Date: Tue, 12 Jun 2018 19:54:09 -0700 Subject: [PATCH 2/2] Remove unnecessary comments in test file --- .../watcher/notification/slack/message/SlackMessageTests.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/notification/slack/message/SlackMessageTests.java b/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/notification/slack/message/SlackMessageTests.java index 0a0de3fdd479d..9f546c55d8db1 100644 --- a/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/notification/slack/message/SlackMessageTests.java +++ b/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/notification/slack/message/SlackMessageTests.java @@ -602,9 +602,6 @@ public void testUrlPathIsFiltered() throws Exception { } } - // Create template from null message or null attachment ok - // Can have message as null - public void canHaveNullTextAndAttachment() throws Exception { SlackMessage slackMessage = new SlackMessage("from", new String[] {"to"}, "icon"); assertThat(slackMessage.getText(), is(null));