#50 finalized on renameable datasource

Author: bbottema

src/main/java/org/simplejavamail/mailer/internal/datasource/NamedDataSource.java

@@ -7,7 +7,6 @@
 import org.simplejavamail.email.AttachmentResource;
 import org.simplejavamail.email.Email;
 import org.simplejavamail.email.Recipient;
-import org.simplejavamail.mailer.internal.datasource.NamedDataSource;
 
 import javax.activation.DataHandler;
 import javax.activation.DataSource;

src/main/java/org/simplejavamail/mailer/internal/mailsender/MimeMessageHelper.java

@@ -0,0 +1,74 @@
+package org.simplejavamail.mailer.internal.mailsender;
+
+import javax.activation.DataSource;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import static org.simplejavamail.internal.util.MiscUtil.valueNullOrEmpty;
+
+/**
+ * Allows given datasource to be renamed (from {@link javax.activation.DataHandler} perspective).
+ *
+ * @author Lukas Kosina
+ */
+class NamedDataSource implements DataSource {
+
+	/**
+	 * Original data source used for attachment.
+	 */
+	private final DataSource dataSource;
+
+	/**
+	 * The new name (optional), which will be applied as email attachment.
+	 */
+	private final String name;
+
+	/**
+	 * Used for wrapping data source in parameter. Method {@link NamedDataSource#getName()} will
+	 * not use the original name, but it will use the name in the parameter instead (if provided).
+	 *
+	 * @param dataSource wrapped data source
+	 * @param name       new name of data source
+	 */
+	public NamedDataSource(String name, DataSource dataSource) {
+		this.dataSource = dataSource;
+		this.name = name;
+	}
+
+	/**
+	 * @return {@link DataSource#getInputStream()}
+	 */
+	@Override
+	public InputStream getInputStream()
+			throws IOException {
+		return dataSource.getInputStream();
+	}
+
+	/**
+	 * @return {@link DataSource#getOutputStream()}
+	 */
+	@Override
+	public OutputStream getOutputStream()
+			throws IOException {
+		return dataSource.getOutputStream();
+	}
+
+	/**
+	 * @return {@link DataSource#getContentType()}
+	 */
+	@Override
+	public String getContentType() {
+		return dataSource.getContentType();
+	}
+
+	/**
+	 * {@link #name} if provided, {@link DataSource#getName()} of the original datasource otherwise.
+	 *
+	 * @return name of data source
+	 */
+	@Override
+	public String getName() {
+		return !valueNullOrEmpty(name) ? name : dataSource.getName();
+	}
+}

src/main/java/org/simplejavamail/mailer/internal/mailsender/NamedDataSource.java

@@ -1,4 +1,4 @@
-package org.simplejavamail.mailer.internal.datasource;
+package org.simplejavamail.mailer.internal.mailsender;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -29,53 +29,24 @@ public void renameWillWork() throws Exception {
         verifyZeroInteractions(dataSource);
     }
 
-    @Test
-    public void originalNameWillWork() throws Exception {
-        DataSource testDataSource = new NamedDataSource(dataSource);
-        assertThat(testDataSource.getName()).isEqualTo("testName");
-        verify(dataSource).getName();
-    }
-
     @Test
     public void inputStreamWillBeTheSame1() throws Exception {
         DataSource testDataSource = new NamedDataSource("newName", dataSource);
         testDataSource.getInputStream();
         verify(dataSource).getInputStream();
     }
 
-    @Test
-    public void inputStreamWillBeTheSame2() throws Exception {
-        DataSource testDataSource = new NamedDataSource(dataSource);
-        testDataSource.getInputStream();
-        verify(dataSource).getInputStream();
-    }
-
     @Test
     public void outputStreamWillBeTheSame1() throws Exception {
         DataSource testDataSource = new NamedDataSource("newName", dataSource);
         testDataSource.getOutputStream();
         verify(dataSource).getOutputStream();
     }
 
-    @Test
-    public void outputStreamWillBeTheSame2() throws Exception {
-        DataSource testDataSource = new NamedDataSource(dataSource);
-        testDataSource.getOutputStream();
-        verify(dataSource).getOutputStream();
-    }
-
     @Test
     public void contentTypeStreamWillBeTheSame1() throws Exception {
         DataSource testDataSource = new NamedDataSource("newName", dataSource);
         testDataSource.getContentType();
         verify(dataSource).getContentType();
     }
-
-    @Test
-    public void contentTypeStreamWillBeTheSame2() throws Exception {
-        DataSource testDataSource = new NamedDataSource(dataSource);
-        testDataSource.getContentType();
-        verify(dataSource).getContentType();
-    }
-
 }