Revert "Merge branch 'master' into suntech-fixes"

This reverts commit f03b999d6d17e53c1c1e1aa2f9271d03f12f2264, reversing
changes made to 3a528ddc88f72f39ff9566cf5e0f54938b1584ef.

1 files changed, 13 insertions, 2 deletions

diff --git a/src/main/java/org/traccar/notification/TextTemplateFormatter.java b/src/main/java/org/traccar/notification/TextTemplateFormatter.java
index b7058c824..c7cac2d4d 100644
--- a/src/main/java/org/traccar/notification/TextTemplateFormatter.java
+++ b/src/main/java/org/traccar/notification/TextTemplateFormatter.java
@@ -71,10 +71,21 @@ public final class TextTemplateFormatter {
         return template;
     }
 
-    public static NotificationMessage formatMessage(VelocityContext velocityContext, String name, String templatePath) {
+    public static FullMessage formatFullMessage(VelocityContext velocityContext, String name) {
+        String formattedMessage = formatMessage(velocityContext, name, "full");
+        return new FullMessage((String) velocityContext.get("subject"), formattedMessage);
+    }
+
+    public static String formatShortMessage(VelocityContext velocityContext, String name) {
+        return formatMessage(velocityContext, name, "short");
+    }
+
+    private static String formatMessage(
+            VelocityContext velocityContext, String name, String templatePath) {
+
         StringWriter writer = new StringWriter();
         getTemplate(name, templatePath).merge(velocityContext, writer);
-        return new NotificationMessage((String) velocityContext.get("subject"), writer.toString());
+        return writer.toString();
     }
 
 }