diff --git a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/plugin/EmailAlertPlugin.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/plugin/EmailAlertPlugin.java index 3ec6da348cbb56aefd1bed89eee775f893781042..d06e12d9419adb8e2fe521b316eb466b7c8c89fa 100644 --- a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/plugin/EmailAlertPlugin.java +++ b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/plugin/EmailAlertPlugin.java @@ -56,7 +56,7 @@ public class EmailAlertPlugin implements AlertPlugin { @Override public String getId() { - return Constants.PLUGIN_DEFAULT_EMAIL; + return Constants.PLUGIN_DEFAULT_EMAIL_ID; } @Override diff --git a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java index d3ac852b0f783d3bbba35d6ad42e3670124d95b3..122f1bf02d62412a59ca141562cbda53ecc779d3 100644 --- a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java +++ b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/runner/AlertSender.java @@ -80,7 +80,7 @@ public class AlertSender { alertInfo.addProp("receivers", receviersList); - AlertPlugin emailPlugin = pluginManager.findOne(Constants.PLUGIN_DEFAULT_EMAIL); + AlertPlugin emailPlugin = pluginManager.findOne(Constants.PLUGIN_DEFAULT_EMAIL_ID); retMaps = emailPlugin.process(alertInfo); if (retMaps == null) { diff --git a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/Constants.java b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/Constants.java index e1b127b42341a175c1c8074dcc5d7dc0312a6470..ec47a1e1536d4ea50f9819f4d53dc057f4207ce6 100644 --- a/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/Constants.java +++ b/dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/Constants.java @@ -179,7 +179,7 @@ public class Constants { */ public static final String PLUGIN_DIR = "plugin.dir"; - public static final String PLUGIN_DEFAULT_EMAIL = "email"; + public static final String PLUGIN_DEFAULT_EMAIL_ID = "email"; public static final String PLUGIN_DEFAULT_EMAIL_CH = "邮件"; diff --git a/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/plugin/EmailAlertPluginTest.java b/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/plugin/EmailAlertPluginTest.java index 52c2fc050ea132a1c6fb2acbb88ffba1fe21ace1..c2f40067527a0e4e18240b7dc7246f79ee0fcf96 100644 --- a/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/plugin/EmailAlertPluginTest.java +++ b/dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/plugin/EmailAlertPluginTest.java @@ -47,7 +47,7 @@ public class EmailAlertPluginTest { @Test public void getId() { String id = plugin.getId(); - assertEquals(Constants.PLUGIN_DEFAULT_EMAIL, id); + assertEquals(Constants.PLUGIN_DEFAULT_EMAIL_ID, id); } @Test diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/plugin/FilePluginManager.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/plugin/FilePluginManager.java index d4dd4bf28321434ed8a418019d61150400e8ffb9..cde299f9ddb101fcb6ac25c90f7ebc0320b07561 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/plugin/FilePluginManager.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/plugin/FilePluginManager.java @@ -90,8 +90,8 @@ public class FilePluginManager implements PluginManager { } @Override - public AlertPlugin findOne(String name) { - return pluginMap.get(name); + public AlertPlugin findOne(String pluginId) { + return pluginMap.get(pluginId); } @Override