Skip to content
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

Jump to bottom

[fix-10961][alert server]Change the content of alert to an array #11033

Merged
merged 17 commits into from
Aug 12, 2022
Merged

[fix-10961][alert server]Change the content of alert to an array #11033

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
252a8ef
Change the content of alert to an array
jackfanwan Jul 18, 2022
7fe5741
Increase unit test coverage
jackfanwan Jul 19, 2022
975b13c
Modify the code format
jackfanwan Jul 19, 2022
6785a92
Modify the code format
jackfanwan Jul 19, 2022
3f9ca8c
Modify judgment statement
jackfanwan Jul 19, 2022
d7f3150
Deleting invalid References
jackfanwan Jul 20, 2022
6fea276
Modify the previous code implementation and improve the test data
jackfanwan Jul 20, 2022
ece676a
Modify the code format
jackfanwan Jul 22, 2022
918d0e5
merge upstream dev
jackfanwan Jul 28, 2022
c497ee0
Move the location of the Content conversion
Jul 30, 2022
7f1c8fd
Remove useless code
jackfanwan Jul 30, 2022
ac5caa6
Change the code format
jackfanwan Jul 30, 2022
f50d077
Modify unit tests
jackfanwan Jul 30, 2022
f494b4f
Modify unit tests
jackfanwan Jul 30, 2022
7fe8cab
Modify unit tests
jackfanwan Jul 30, 2022
02d4a7a
Changing the location of the code
jackfanwan Aug 7, 2022
02852e8
Modify the code
jackfanwan Aug 7, 2022
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
16 changes: 16 additions & 0 deletions ...ain/java/org/apache/dolphinscheduler/plugin/alert/email/template/DefaultHTMLTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import org.apache.dolphinscheduler.spi.utils.JSONUtils;
import org.apache.dolphinscheduler.spi.utils.StringUtils;

import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
Expand All @@ -35,6 +36,11 @@

import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;

import org.springframework.boot.configurationprocessor.json.JSONArray;
import org.springframework.boot.configurationprocessor.json.JSONException;
import org.springframework.boot.configurationprocessor.json.JSONTokener;

public class DefaultHTMLTemplate implements AlertTemplate {

Expand Down Expand Up @@ -113,6 +119,16 @@ private String getTableTypeMessage(String content, boolean showAll) {
private String getTextTypeMessage(String content) {

if (StringUtils.isNotEmpty(content)) {
// Converts an object type to an array type to prevent subsequent conversions from reporting errors
try {
Object contentObject = new JSONTokener(content).nextValue();
if (!(contentObject instanceof JSONArray)) {
ObjectNode jsonNodes = JSONUtils.parseObject(content);
content = JSONUtils.toJsonString(Collections.singletonList(jsonNodes));
}
} catch (JSONException e) {
logger.error("alert content is null");
}
ArrayNode list = JSONUtils.parseArray(content);
StringBuilder contents = new StringBuilder(100);
for (JsonNode jsonNode : list) {
Expand Down
8 changes: 8 additions & 0 deletions ...java/org/apache/dolphinscheduler/plugin/alert/email/template/DefaultHTMLTemplateTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,14 @@ public void testGetMessageFromTemplate() {
String textTypeMessage = template.getMessageFromTemplate(list2String(), ShowType.TEXT, true);

assertEquals(textTypeMessage, generateMockTextTypeResultByHand());

String mapjson = "{\"taskInstanceId\":94,\"taskName\":\"000\",\"taskType\":\"DATA_QUALITY\","
+ "\"processDefinitionId\":0,\"processInstanceId\":58,\"state\":\"RUNNING_EXECUTION\","
+ "\"startTime\":\"2022-07-17 16:00:32\",\"host\":\"192.168.18.182:1234\","
+ "\"logPath\":\"/Users/mac/学习/dolphinscheduler/dolphinscheduler/logs/20220717/6222644042400_1-58-94.log\"}";
textTypeMessage = template.getMessageFromTemplate(mapjson, ShowType.TEXT, true);
String result = textTypeMessage;
assertEquals(textTypeMessage, result);
}

private String list2String() {
Expand Down