drop MailTemplate interface

seam · Mar 8, 2011 · 96bb722 · 96bb722
1 parent 0fd9d44
commit 96bb722
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 268 deletions.
diff --git a/core/api/src/main/java/org/jboss/seam/mail/templating/MailTemplate.java b/core/api/src/main/java/org/jboss/seam/mail/templating/MailTemplate.java
diff --git a/core/impl/src/main/java/org/jboss/seam/mail/templating/FileTemplate.java b/core/impl/src/main/java/org/jboss/seam/mail/templating/FileTemplate.java
diff --git a/core/impl/src/main/java/org/jboss/seam/mail/templating/InputStreamTemplate.java b/core/impl/src/main/java/org/jboss/seam/mail/templating/InputStreamTemplate.java
diff --git a/core/impl/src/main/java/org/jboss/seam/mail/templating/StringTemplate.java b/core/impl/src/main/java/org/jboss/seam/mail/templating/StringTemplate.java
diff --git a/examples/sendmail/src/test/java/org/jboss/seam/mail/FreeMarkerMailMessageTest.java b/examples/sendmail/src/test/java/org/jboss/seam/mail/FreeMarkerMailMessageTest.java
@@ -18,6 +18,7 @@
 package org.jboss.seam.mail;
 
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 
 import javax.enterprise.inject.Instance;
@@ -356,7 +357,7 @@ public void testSMTPSessionAuthentication() throws MessagingException, Malformed
    }
 
    @Test(expected=SendFailedException.class)
-   public void testFreeMarkerTextMailMessageSendFailed()
+   public void testFreeMarkerTextMailMessageSendFailed() throws UnsupportedEncodingException
    {
       String uuid = java.util.UUID.randomUUID().toString();
       String subject = "Text Message from $version Mail - " + uuid;

diff --git a/examples/sendmail/src/test/java/org/jboss/seam/mail/VelocityMailMessageTest.java b/examples/sendmail/src/test/java/org/jboss/seam/mail/VelocityMailMessageTest.java
@@ -18,6 +18,7 @@
 package org.jboss.seam.mail;
 
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 
 import javax.enterprise.inject.Instance;
@@ -357,7 +358,7 @@ public void testSMTPSessionAuthentication() throws MessagingException, Malformed
    }
 
    @Test(expected=SendFailedException.class)
-   public void testVelocityTextMailMessageSendFailed()
+   public void testVelocityTextMailMessageSendFailed() throws UnsupportedEncodingException
    {
       String uuid = java.util.UUID.randomUUID().toString();
       String subject = "Text Message from $version Mail - " + uuid;

diff --git a/...rker/impl/src/main/java/org/jboss/seam/mail/templating/freemarker/FreeMarkerTemplate.java b/...rker/impl/src/main/java/org/jboss/seam/mail/templating/freemarker/FreeMarkerTemplate.java
@@ -17,18 +17,18 @@
 
 package org.jboss.seam.mail.templating.freemarker;
 
+import java.io.ByteArrayInputStream;
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.StringWriter;
+import java.io.UnsupportedEncodingException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.jboss.seam.mail.templating.FileTemplate;
-import org.jboss.seam.mail.templating.InputStreamTemplate;
-import org.jboss.seam.mail.templating.MailTemplate;
-import org.jboss.seam.mail.templating.StringTemplate;
 import org.jboss.seam.mail.templating.TemplateProvider;
 import org.jboss.seam.mail.templating.TemplatingException;
 
@@ -46,28 +46,23 @@ public class FreeMarkerTemplate implements TemplateProvider
 {
    private Configuration configuration;
    private Map<String, Object> rootMap = new HashMap<String, Object>();
-   private MailTemplate mailTemplate;
+   private InputStream inputStream;
 
-   public FreeMarkerTemplate(MailTemplate mailTemplate)
+   public FreeMarkerTemplate(InputStream inputStream)
    {
-      this.mailTemplate = mailTemplate;
+      this.inputStream = inputStream;
       configuration = new Configuration();
       configuration.setObjectWrapper(new DefaultObjectWrapper());
    }
 
-   public FreeMarkerTemplate(String string)
-   {
-      this(new StringTemplate(string));
-   }
-
-   public FreeMarkerTemplate(InputStream inputStream)
+   public FreeMarkerTemplate(String string) throws UnsupportedEncodingException
    {
-      this(new InputStreamTemplate(inputStream));
+      this(new ByteArrayInputStream(string.getBytes("UTF-8")));
    }
 
-   public FreeMarkerTemplate(File file)
+   public FreeMarkerTemplate(File file) throws FileNotFoundException
    {
-      this(new FileTemplate(file));
+      this(new FileInputStream(file));
    }
 
    public String merge(Map<String, Object> context)
@@ -78,7 +73,7 @@ public String merge(Map<String, Object> context)
 
       try
       {
-         Template template = new Template(mailTemplate.getTemplateName(), new InputStreamReader(mailTemplate.getInputStream()), configuration);
+         Template template = new Template("mailGenerated", new InputStreamReader(inputStream), configuration);
          template.process(rootMap, writer);
       }
       catch (IOException e)