Merge pull request #2 from YoussefSell/Development

Renamed Message and MessageComposer

Author: YoussefSell

samples/Email.Net.Samples.ASPCore/Pages/Index.cshtml.cs

@@ -14,7 +14,7 @@ public IndexModel(ILogger<IndexModel> logger, IEmailService emailService)
     public void OnGet()
     {
         /* compose the email message */
-        var message = Message.Compose()
+        var message = EmailMessage.Compose()
             .To("[email protected]")
             .WithPlainTextContent("this is a test email")
             .WithHtmlContent("<p>this is a test email</p>")

samples/Email.Net.Samples.Console/Program.cs

@@ -31,7 +31,7 @@
     .Create();
 
 /* compose the email message */
-var message = Message.Compose()
+var message = EmailMessage.Compose()
     .To("[email protected]")
     .WithPlainTextContent("this is a test email")
     .WithHtmlContent("<p>this is a test email</p>")

src/Core/Email.Net/EmailDeliveryProvider/IEmailDeliveryProvider.cs

@@ -16,12 +16,12 @@ public interface IEmailDeliveryProvider
         /// Sends the specified email message.
         /// </summary>
         /// <param name="message">the email message to be send</param>
-        EmailSendingResult Send(Message message);
+        EmailSendingResult Send(EmailMessage message);
 
         /// <summary>
         /// Sends the specified email message.
         /// </summary>
         /// <param name="message">the email message to be send</param>
-        Task<EmailSendingResult> SendAsync(Message message);
+        Task<EmailSendingResult> SendAsync(EmailMessage message);
     }
 }

src/Core/Email.Net/EmailDeliveryProvider/SmtpProvider/Extensions/SmtpProviderMessageComposerExtensions.cs

@@ -4,7 +4,7 @@
     using Email.Net.Factories;
 
     /// <summary>
-    /// the extensions methods over the <see cref="MessageComposer"/> factory.
+    /// the extensions methods over the <see cref="EmailMessageComposer"/> factory.
     /// </summary>
     public static class SmtpProviderMessageComposerExtensions
     {
@@ -13,8 +13,8 @@ public static class SmtpProviderMessageComposerExtensions
         /// </summary>
         /// <param name="messageComposer">the message composer instance</param>
         /// <param name="smtpOptions">the smtp options instance</param>
-        /// <returns>Instance of <see cref="MessageComposer"/> to enable fluent chaining</returns>
-        public static MessageComposer UseCustomSmtpOptions(this MessageComposer messageComposer, EDP.Smtp.SmtpOptions smtpOptions)
+        /// <returns>Instance of <see cref="EmailMessageComposer"/> to enable fluent chaining</returns>
+        public static EmailMessageComposer UseCustomSmtpOptions(this EmailMessageComposer messageComposer, EDP.Smtp.SmtpOptions smtpOptions)
             => messageComposer.PassEdpData(EdpData.Keys.SmtpOptions, smtpOptions);
     }
 }

src/Core/Email.Net/EmailDeliveryProvider/SmtpProvider/SmtpEmailDeliveryProvider.cs

@@ -14,7 +14,7 @@
     public partial class SmtpEmailDeliveryProvider : ISmtpEmailDeliveryProvider
     {
         /// <inheritdoc/>
-        public EmailSendingResult Send(Message message)
+        public EmailSendingResult Send(EmailMessage message)
         {
             try
             {
@@ -33,7 +33,7 @@ public EmailSendingResult Send(Message message)
         }
 
         /// <inheritdoc/>
-        public async Task<EmailSendingResult> SendAsync(Message message)
+        public async Task<EmailSendingResult> SendAsync(EmailMessage message)
         {
             try
             {
@@ -129,12 +129,12 @@ public SmtpClient CreateClient(SmtpOptions options)
         }
 
         /// <summary>
-        /// create a <see cref="MailMessage"/> instance from the <see cref="Message"/> instance
+        /// create a <see cref="MailMessage"/> instance from the <see cref="EmailMessage"/> instance
         /// </summary>
-        /// <param name="message">the <see cref="Message"/> instance</param>
+        /// <param name="message">the <see cref="EmailMessage"/> instance</param>
         /// <returns>an instance of <see cref="MailMessage"/></returns>
         /// <exception cref="ArgumentNullException">if the <paramref name="message"/>is null</exception>
-        public MailMessage CreateMessage(Message message)
+        public MailMessage CreateMessage(EmailMessage message)
         {
             var mailMessage = new MailMessage
             {

src/Core/Email.Net/EmailService.cs

@@ -13,15 +13,15 @@
     public partial class EmailService
     {
         /// <inheritdoc/>
-        public EmailSendingResult Send(Message message)
+        public EmailSendingResult Send(EmailMessage message)
             => Send(message, _defaultProvider);
 
         /// <inheritdoc/>
-        public Task<EmailSendingResult> SendAsync(Message message)
+        public Task<EmailSendingResult> SendAsync(EmailMessage message)
             => SendAsync(message, _defaultProvider);
 
         /// <inheritdoc/>
-        public EmailSendingResult Send(Message message, string edp_name)
+        public EmailSendingResult Send(EmailMessage message, string edp_name)
         {
             // check if the provider name is valid
             if (edp_name is null)
@@ -36,7 +36,7 @@ public EmailSendingResult Send(Message message, string edp_name)
         }
 
         /// <inheritdoc/>
-        public Task<EmailSendingResult> SendAsync(Message message, string edp_name)
+        public Task<EmailSendingResult> SendAsync(EmailMessage message, string edp_name)
         {
             // check if the provider name is valid
             if (edp_name is null)
@@ -51,7 +51,7 @@ public Task<EmailSendingResult> SendAsync(Message message, string edp_name)
         }
 
         /// <inheritdoc/>
-        public EmailSendingResult Send(Message message, IEmailDeliveryProvider edp)
+        public EmailSendingResult Send(EmailMessage message, IEmailDeliveryProvider edp)
         {
             // check if given params are not null.
             if (message is null)
@@ -75,7 +75,7 @@ public EmailSendingResult Send(Message message, IEmailDeliveryProvider edp)
         }
 
         /// <inheritdoc/>
-        public Task<EmailSendingResult> SendAsync(Message message, IEmailDeliveryProvider edp)
+        public Task<EmailSendingResult> SendAsync(EmailMessage message, IEmailDeliveryProvider edp)
         {
             // check if given params are not null.
             if (message is null)
@@ -161,12 +161,12 @@ public EmailService(IEnumerable<IEmailDeliveryProvider> emailDeliveryProviders,
         /// check if the message from value is supplied
         /// </summary>
         /// <param name="message">the message instance</param>
-        private void CheckMessageFromValue(Message message)
+        private void CheckMessageFromValue(EmailMessage message)
         {
             if (message.From is null)
             {
                 if (Options.DefaultFrom is null)
-                    throw new ArgumentException($"the {typeof(Message).FullName} [From] value is null, either supply a from value in the message, or set a default [From] value in {typeof(EmailServiceOptions).FullName}");
+                    throw new ArgumentException($"the {typeof(EmailMessage).FullName} [From] value is null, either supply a from value in the message, or set a default [From] value in {typeof(EmailServiceOptions).FullName}");
 
                 message.SetFrom(Options.DefaultFrom);
             }