Fix parameter name in outlook conversion methods ("msgData" -> "msgFileName")

Author: bbottema

modules/core-module/src/main/java/org/simplejavamail/internal/modules/OutlookModule.java

@@ -11,6 +11,6 @@
 
 public interface OutlookModule {
 	EmailFromOutlookMessage outlookMsgToEmailBuilder(@NotNull File msgFile, @NotNull EmailStartingBuilder emailStartingBuilder, @NotNull EmailPopulatingBuilderFactory builderFactory, @NotNull InternalEmailConverter internalEmailConverter);
-	EmailFromOutlookMessage outlookMsgToEmailBuilder(@NotNull String msgData, @NotNull EmailStartingBuilder emailStartingBuilder, @NotNull EmailPopulatingBuilderFactory builderFactory, @NotNull InternalEmailConverter internalEmailConverter);
+	EmailFromOutlookMessage outlookMsgToEmailBuilder(@NotNull String msgFileName, @NotNull EmailStartingBuilder emailStartingBuilder, @NotNull EmailPopulatingBuilderFactory builderFactory, @NotNull InternalEmailConverter internalEmailConverter);
 	EmailFromOutlookMessage outlookMsgToEmailBuilder(@NotNull InputStream msgInputStream, @NotNull EmailStartingBuilder emailStartingBuilder, @NotNull EmailPopulatingBuilderFactory builderFactory, @NotNull InternalEmailConverter internalEmailConverter);
 }

modules/outlook-module/src/main/java/org/simplejavamail/internal/outlooksupport/converter/OutlookEmailConverter.java

@@ -54,13 +54,13 @@ public EmailFromOutlookMessage outlookMsgToEmailBuilder(
 
 	@Override
 	public EmailFromOutlookMessage outlookMsgToEmailBuilder(
-			@NotNull final String msgFile,
+			@NotNull final String msgFileName,
 			@NotNull final EmailStartingBuilder emailStartingBuilder,
 			@NotNull final EmailPopulatingBuilderFactory builderFactory,
 			@NotNull final InternalEmailConverter internalEmailConverter) {
 		return buildEmailFromOutlookMessage(
 				emailStartingBuilder.ignoringDefaults().startingBlank(),
-				parseOutlookMsg(checkNonEmptyArgument(msgFile, "msgFile")),
+				parseOutlookMsg(checkNonEmptyArgument(msgFileName, "msgFile")),
 				builderFactory,
 				internalEmailConverter);
 	}
@@ -186,9 +186,9 @@ private static OutlookMessage parseOutlookMsg(@NotNull final InputStream msgInpu
 	}
 
 	@NotNull
-	private static OutlookMessage parseOutlookMsg(@NotNull final String msgFile) {
+	private static OutlookMessage parseOutlookMsg(@NotNull final String msgFileName) {
 		try {
-			return new org.simplejavamail.outlookmessageparser.OutlookMessageParser().parseMsg(msgFile);
+			return new org.simplejavamail.outlookmessageparser.OutlookMessageParser().parseMsg(msgFileName);
 		} catch (final IOException e) {
 			throw new OutlookMessageException(OutlookMessageException.ERROR_PARSING_OUTLOOK_MSG, e);
 		}

modules/simple-java-mail/src/main/java/org/simplejavamail/converter/EmailConverter.java

@@ -128,25 +128,25 @@ public static EmailPopulatingBuilder mimeMessageToEmailBuilder(@NotNull final Mi
 	/**
 	 * Delegates to {@link #outlookMsgToEmail(String, Pkcs12Config)}.
 	 *
-	 * @param msgData The content of an Outlook (.msg) message from which to create the {@link Email}.
+	 * @param msgFileName The file name of an Outlook (.msg) message from which to create the {@link Email}.
 	 */
 	@SuppressWarnings("unused")
 	@NotNull
-	public static Email outlookMsgToEmail(@NotNull final String msgData) {
-		return outlookMsgToEmail(msgData, null);
+	public static Email outlookMsgToEmail(@NotNull final String msgFileName) {
+		return outlookMsgToEmail(msgFileName, null);
 	}
 
 	/**
-	 * @param msgData The content of an Outlook (.msg) message from which to create the {@link Email}.
+	 * @param msgFileName The file name of an Outlook (.msg) message from which to create the {@link Email}.
 	 * @param pkcs12Config Private key store for decrypting S/MIME encrypted attachments
 	 *                        (only needed when the message is encrypted rather than just signed).
 	 */
 	@SuppressWarnings("deprecation")
 	@NotNull
-	public static Email outlookMsgToEmail(@NotNull final String msgData, @Nullable final Pkcs12Config pkcs12Config) {
-		checkNonEmptyArgument(msgData, "msgFile");
+	public static Email outlookMsgToEmail(@NotNull final String msgFileName, @Nullable final Pkcs12Config pkcs12Config) {
+		checkNonEmptyArgument(msgFileName, "msgFile");
 		EmailFromOutlookMessage result = ModuleLoader.loadOutlookModule()
-				.outlookMsgToEmailBuilder(msgData, new EmailStartingBuilderImpl(), new EmailPopulatingBuilderFactoryImpl(), InternalEmailConverterImpl.INSTANCE);
+				.outlookMsgToEmailBuilder(msgFileName, new EmailStartingBuilderImpl(), new EmailPopulatingBuilderFactoryImpl(), InternalEmailConverterImpl.INSTANCE);
 		return decryptAttachments(result.getEmailBuilder(), result.getOutlookMessage(), pkcs12Config)
 				.buildEmail();
 	}