Watcher: Remove unused hipchat render method (#32211)
The HipChatMessage#render is no longer used, and instead the HipChatAccount#render is used in the ExecutableHipChatAction. Only a test that validated the HttpProxy used this render method still. This commit cleans it up.
This commit is contained in:
parent
e1206a6272
commit
6fde9e5c2f
|
@ -13,14 +13,12 @@ import org.elasticsearch.common.xcontent.ToXContentObject;
|
|||
import org.elasticsearch.common.xcontent.XContentBuilder;
|
||||
import org.elasticsearch.common.xcontent.XContentParser;
|
||||
import org.elasticsearch.xpack.watcher.common.text.TextTemplate;
|
||||
import org.elasticsearch.xpack.watcher.common.text.TextTemplateEngine;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
|
||||
public class HipChatMessage implements ToXContentObject {
|
||||
|
@ -181,26 +179,6 @@ public class HipChatMessage implements ToXContentObject {
|
|||
return Objects.hash(body, rooms, users, from, format, color, notify);
|
||||
}
|
||||
|
||||
public HipChatMessage render(TextTemplateEngine engine, Map<String, Object> model) {
|
||||
String body = engine.render(this.body, model);
|
||||
String[] rooms = null;
|
||||
if (this.rooms != null) {
|
||||
rooms = new String[this.rooms.length];
|
||||
for (int i = 0; i < this.rooms.length; i++) {
|
||||
rooms[i] = engine.render(this.rooms[i], model);
|
||||
}
|
||||
}
|
||||
String[] users = null;
|
||||
if (this.users != null) {
|
||||
users = new String[this.users.length];
|
||||
for (int i = 0; i < this.users.length; i++) {
|
||||
users[i] = engine.render(this.users[i], model);
|
||||
}
|
||||
}
|
||||
Color color = this.color == null ? null : Color.resolve(engine.render(this.color, model), null);
|
||||
return new HipChatMessage(body, rooms, users, from, format, color, notify);
|
||||
}
|
||||
|
||||
@Override
|
||||
public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
|
||||
builder.startObject();
|
||||
|
|
|
@ -12,12 +12,9 @@ import org.elasticsearch.xpack.watcher.common.http.HttpClient;
|
|||
import org.elasticsearch.xpack.watcher.common.http.HttpProxy;
|
||||
import org.elasticsearch.xpack.watcher.common.http.HttpRequest;
|
||||
import org.elasticsearch.xpack.watcher.common.http.HttpResponse;
|
||||
import org.elasticsearch.xpack.watcher.common.text.TextTemplate;
|
||||
import org.elasticsearch.xpack.watcher.test.MockTextTemplateEngine;
|
||||
import org.junit.Before;
|
||||
import org.mockito.ArgumentCaptor;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
|
||||
import static org.hamcrest.Matchers.is;
|
||||
|
@ -40,11 +37,7 @@ public class HipChatAccountsTests extends ESTestCase {
|
|||
new HashSet<>(HipChatService.getSettings())));
|
||||
HipChatAccount account = service.getAccount("account1");
|
||||
|
||||
HipChatMessage.Template template = new HipChatMessage.Template.Builder(new TextTemplate("foo"))
|
||||
.addRooms(new TextTemplate("room"))
|
||||
.setFrom("from")
|
||||
.build();
|
||||
HipChatMessage hipChatMessage = template.render(new MockTextTemplateEngine(), new HashMap<>());
|
||||
HipChatMessage hipChatMessage = new HipChatMessage("body", new String[]{"rooms"}, null, "from", null, null, null);
|
||||
|
||||
ArgumentCaptor<HttpRequest> argumentCaptor = ArgumentCaptor.forClass(HttpRequest.class);
|
||||
when(httpClient.execute(argumentCaptor.capture())).thenReturn(new HttpResponse(200));
|
||||
|
|
Loading…
Reference in New Issue