(streampipes) branch 2461-400-error-with-using-email-notification updated: fix(#2461): Check for available placeholders when sending email

[riemer]

This is an automated email from the ASF dual-hosted git repository.

riemer pushed a commit to branch 2461-400-error-with-using-email-notification
in repository https://gitbox.apache.org/repos/asf/streampipes.git


The following commit(s) were added to 
refs/heads/2461-400-error-with-using-email-notification by this push:
     new 7137163291 fix(#2461): Check for available placeholders when sending 
email
7137163291 is described below

commit 71371632918d9445e6e4736736905860b13fdbb8
Author: Dominik Riemer <dominik.rie...@gmail.com>
AuthorDate: Wed Feb 7 22:57:05 2024 +0100

    fix(#2461): Check for available placeholders when sending email
---
 .../streampipes/mail/template/generation/MailTemplateBuilder.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git 
a/streampipes-mail/src/main/java/org/apache/streampipes/mail/template/generation/MailTemplateBuilder.java
 
b/streampipes-mail/src/main/java/org/apache/streampipes/mail/template/generation/MailTemplateBuilder.java
index c16cc8b261..2ebd7f0f63 100644
--- 
a/streampipes-mail/src/main/java/org/apache/streampipes/mail/template/generation/MailTemplateBuilder.java
+++ 
b/streampipes-mail/src/main/java/org/apache/streampipes/mail/template/generation/MailTemplateBuilder.java
@@ -22,6 +22,7 @@ import 
org.apache.streampipes.mail.template.part.MailTemplatePart;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 
 public class MailTemplateBuilder {
 
@@ -73,7 +74,12 @@ public class MailTemplateBuilder {
 
     for (String key : placeholders.keySet()) {
       String placeholder = makeKey(key);
-      fullTemplate = fullTemplate.replaceAll(placeholder, 
placeholders.get(key));
+      if (placeholders.containsKey(placeholder)) {
+        var value = placeholders.get(key);
+        if (Objects.nonNull(value)) {
+          fullTemplate = fullTemplate.replaceAll(placeholder, value);
+        }
+      }
     }
 
     return fullTemplate;