From 057ea4c23b1cc94185d42ebb097d784b68bdf970 Mon Sep 17 00:00:00 2001 From: Alexander Fedorov Date: Sun, 3 Nov 2019 20:53:03 +0300 Subject: [PATCH] Bug 550956 - [Passage] Support mail attachment Rename LicensingMailDescriptor to EmailDescriptor Signed-off-by: Alexander Fedorov --- .../internal/mail/LicensingMailDescriptorImpl.java | 4 ++-- .../passage/lic/internal/mail/LicensingMailImpl.java | 12 ++++++------ ...nsingMailDescriptor.java => EmailDescriptor.java} | 2 +- .../org/eclipse/passage/lic/net/mail/Mailing.java | 4 ++-- .../internal/licenses/core/LicenseMailSupport.java | 4 ++-- .../lic/mail/tests/LicensingMailServiceTest.java | 6 +++--- 6 files changed, 16 insertions(+), 16 deletions(-) rename bundles/org.eclipse.passage.lic.net/src/org/eclipse/passage/lic/net/mail/{LicensingMailDescriptor.java => EmailDescriptor.java} (94%) diff --git a/bundles/org.eclipse.passage.lic.mail/src/org/eclipse/passage/lic/internal/mail/LicensingMailDescriptorImpl.java b/bundles/org.eclipse.passage.lic.mail/src/org/eclipse/passage/lic/internal/mail/LicensingMailDescriptorImpl.java index 512be3a9a..3b4c94536 100644 --- a/bundles/org.eclipse.passage.lic.mail/src/org/eclipse/passage/lic/internal/mail/LicensingMailDescriptorImpl.java +++ b/bundles/org.eclipse.passage.lic.mail/src/org/eclipse/passage/lic/internal/mail/LicensingMailDescriptorImpl.java @@ -15,7 +15,7 @@ import java.util.ArrayList; import java.util.List; -import org.eclipse.passage.lic.net.mail.LicensingMailDescriptor; +import org.eclipse.passage.lic.net.mail.EmailDescriptor; /** * The Licensing mail descriptor implementation @@ -23,7 +23,7 @@ * @since 0.1.0 * */ -public class LicensingMailDescriptorImpl implements LicensingMailDescriptor { +public class LicensingMailDescriptorImpl implements EmailDescriptor { private final String to; private final String from; diff --git a/bundles/org.eclipse.passage.lic.mail/src/org/eclipse/passage/lic/internal/mail/LicensingMailImpl.java b/bundles/org.eclipse.passage.lic.mail/src/org/eclipse/passage/lic/internal/mail/LicensingMailImpl.java index c332e60dd..ad3198550 100644 --- a/bundles/org.eclipse.passage.lic.mail/src/org/eclipse/passage/lic/internal/mail/LicensingMailImpl.java +++ b/bundles/org.eclipse.passage.lic.mail/src/org/eclipse/passage/lic/internal/mail/LicensingMailImpl.java @@ -33,7 +33,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.passage.lic.net.mail.Mailing; -import org.eclipse.passage.lic.net.mail.LicensingMailDescriptor; +import org.eclipse.passage.lic.net.mail.EmailDescriptor; import org.osgi.service.component.annotations.Component; /** @@ -48,7 +48,7 @@ public class LicensingMailImpl implements Mailing { public static final String BUNDLE_ID = "org.eclipse.passage.lic.mail"; //$NON-NLS-1$ @Override - public void writeEml(LicensingMailDescriptor descriptor, OutputStream output, + public void writeEml(EmailDescriptor descriptor, OutputStream output, Consumer consumerStatus) { try { Message message = createMessage(descriptor); @@ -60,7 +60,7 @@ public void writeEml(LicensingMailDescriptor descriptor, OutputStream output, } } - private Message createMessage(LicensingMailDescriptor descriptor) throws MessagingException, AddressException { + private Message createMessage(EmailDescriptor descriptor) throws MessagingException, AddressException { Message message = new MimeMessage(Session.getInstance(System.getProperties())); message.setFrom(new InternetAddress(descriptor.getFrom())); message.setRecipients(Message.RecipientType.TO, InternetAddress.parse(descriptor.getTo())); @@ -68,7 +68,7 @@ private Message createMessage(LicensingMailDescriptor descriptor) throws Messagi return message; } - private void fulfillMessage(LicensingMailDescriptor descriptor, Message message) throws MessagingException { + private void fulfillMessage(EmailDescriptor descriptor, Message message) throws MessagingException { Multipart multipart = createBody(descriptor.getBody()); attachFiles(descriptor, multipart); message.setContent(multipart); @@ -82,7 +82,7 @@ private Multipart createBody(String body) throws MessagingException { return multipart; } - private void attachFiles(LicensingMailDescriptor descriptor, Multipart multipart) throws MessagingException { + private void attachFiles(EmailDescriptor descriptor, Multipart multipart) throws MessagingException { Iterable attachmentPaths = descriptor.getAttachmentPaths(); for (String path : attachmentPaths) { final File attache = new File(path); @@ -95,7 +95,7 @@ private void attachFiles(LicensingMailDescriptor descriptor, Multipart multipart } @Override - public LicensingMailDescriptor createMail(String to, String from, String subject, String body, + public EmailDescriptor createMail(String to, String from, String subject, String body, Iterable attachments) { return new LicensingMailDescriptorImpl(to, from, subject, body, attachments); } diff --git a/bundles/org.eclipse.passage.lic.net/src/org/eclipse/passage/lic/net/mail/LicensingMailDescriptor.java b/bundles/org.eclipse.passage.lic.net/src/org/eclipse/passage/lic/net/mail/EmailDescriptor.java similarity index 94% rename from bundles/org.eclipse.passage.lic.net/src/org/eclipse/passage/lic/net/mail/LicensingMailDescriptor.java rename to bundles/org.eclipse.passage.lic.net/src/org/eclipse/passage/lic/net/mail/EmailDescriptor.java index 3658ce685..ff8128b26 100644 --- a/bundles/org.eclipse.passage.lic.net/src/org/eclipse/passage/lic/net/mail/LicensingMailDescriptor.java +++ b/bundles/org.eclipse.passage.lic.net/src/org/eclipse/passage/lic/net/mail/EmailDescriptor.java @@ -19,7 +19,7 @@ * @since 0.6 * */ -public interface LicensingMailDescriptor { +public interface EmailDescriptor { String getTo(); diff --git a/bundles/org.eclipse.passage.lic.net/src/org/eclipse/passage/lic/net/mail/Mailing.java b/bundles/org.eclipse.passage.lic.net/src/org/eclipse/passage/lic/net/mail/Mailing.java index ab0f92402..df8b7aae7 100644 --- a/bundles/org.eclipse.passage.lic.net/src/org/eclipse/passage/lic/net/mail/Mailing.java +++ b/bundles/org.eclipse.passage.lic.net/src/org/eclipse/passage/lic/net/mail/Mailing.java @@ -25,8 +25,8 @@ public interface Mailing { - public void writeEml(LicensingMailDescriptor descriptor, OutputStream output, Consumer statusHandler); + public void writeEml(EmailDescriptor descriptor, OutputStream output, Consumer statusHandler); - public LicensingMailDescriptor createMail(String to, String from, String subject, String body, + public EmailDescriptor createMail(String to, String from, String subject, String body, Iterable attachments); } diff --git a/bundles/org.eclipse.passage.loc.licenses.core/src/org/eclipse/passage/loc/internal/licenses/core/LicenseMailSupport.java b/bundles/org.eclipse.passage.loc.licenses.core/src/org/eclipse/passage/loc/internal/licenses/core/LicenseMailSupport.java index 72e0d914e..5ac7c9c2d 100644 --- a/bundles/org.eclipse.passage.loc.licenses.core/src/org/eclipse/passage/loc/internal/licenses/core/LicenseMailSupport.java +++ b/bundles/org.eclipse.passage.loc.licenses.core/src/org/eclipse/passage/loc/internal/licenses/core/LicenseMailSupport.java @@ -26,7 +26,7 @@ import org.eclipse.passage.lic.licenses.LicenseGrantDescriptor; import org.eclipse.passage.lic.licenses.LicensePackDescriptor; import org.eclipse.passage.lic.net.mail.Mailing; -import org.eclipse.passage.lic.net.mail.LicensingMailDescriptor; +import org.eclipse.passage.lic.net.mail.EmailDescriptor; import org.eclipse.passage.loc.internal.licenses.core.i18n.LicensesCoreMessages; public class LicenseMailSupport { @@ -110,7 +110,7 @@ public Optional createEmlFile(File attachment) { File emlFile = new File(System.getProperty("user.home") + File.separator + attachment + MAIL_EML_EXTENSION); //$NON-NLS-1$ try (FileOutputStream stream = new FileOutputStream(emlFile)) { Mailing service = mailing; - LicensingMailDescriptor descriptor = service.createMail(licensePack.getUserIdentifier(), "From", //$NON-NLS-1$ + EmailDescriptor descriptor = service.createMail(licensePack.getUserIdentifier(), "From", //$NON-NLS-1$ LicensesCoreMessages.LicenseRequest_mailto_subject_lbl, getDetails(MAILTO_SEPARATOR), Collections.singleton(attachment.getPath())); diff --git a/tests/org.eclipse.passage.lic.mail.tests/src/org/eclipse/passage/lic/mail/tests/LicensingMailServiceTest.java b/tests/org.eclipse.passage.lic.mail.tests/src/org/eclipse/passage/lic/mail/tests/LicensingMailServiceTest.java index f2d76da65..396b8740d 100644 --- a/tests/org.eclipse.passage.lic.mail.tests/src/org/eclipse/passage/lic/mail/tests/LicensingMailServiceTest.java +++ b/tests/org.eclipse.passage.lic.mail.tests/src/org/eclipse/passage/lic/mail/tests/LicensingMailServiceTest.java @@ -36,7 +36,7 @@ import org.eclipse.core.runtime.Status; import org.eclipse.passage.lic.internal.mail.LicensingMailImpl; import org.eclipse.passage.lic.net.mail.Mailing; -import org.eclipse.passage.lic.net.mail.LicensingMailDescriptor; +import org.eclipse.passage.lic.net.mail.EmailDescriptor; import org.junit.After; import org.junit.Test; @@ -56,7 +56,7 @@ public void shouldCreateEmlByParametersPositiveTest() { Mailing licensingEmlService = new LicensingMailImpl(); String attachment = createAttachment(); assertFalse(attachment.isEmpty()); - LicensingMailDescriptor mailDescriptor = licensingEmlService.createMail(MAIL_TO, MAIL_FROM, MAIL_SUBJECT, + EmailDescriptor mailDescriptor = licensingEmlService.createMail(MAIL_TO, MAIL_FROM, MAIL_SUBJECT, MAIL_BODY, Collections.singleton(attachment)); assertNotNull(mailDescriptor); try (FileOutputStream fileOutput = new FileOutputStream(MAIL_FILE_OUT)) { @@ -73,7 +73,7 @@ public void shouldCreateEmlByParametersNagativeTest() { Mailing licensingEmlService = new LicensingMailImpl(); String attachment = createAttachment(); assertFalse(attachment.isEmpty()); - LicensingMailDescriptor mailDescriptor = licensingEmlService.createMail("", "", "", "", Collections.singleton(attachment)); + EmailDescriptor mailDescriptor = licensingEmlService.createMail("", "", "", "", Collections.singleton(attachment)); assertNotNull(mailDescriptor); try (FileOutputStream fileOutput = new FileOutputStream(MAIL_FILE_OUT)) { IStatus errorStatus = new Status(IStatus.ERROR, this.getClass().getCanonicalName(), 1, "", null);