#378: solve split package problem bij renaming package that occurred in two modules

Author: bbottema

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

@@ -24,7 +24,7 @@
 import org.simplejavamail.email.internal.EmailPopulatingBuilderFactoryImpl;
 import org.simplejavamail.email.internal.EmailStartingBuilderImpl;
 import org.simplejavamail.email.internal.InternalEmailPopulatingBuilder;
-import org.simplejavamail.internal.modules.ModuleLoader;
+import org.simplejavamail.internal.moduleloader.ModuleLoader;
 import org.simplejavamail.internal.smimesupport.model.OriginalSmimeDetailsImpl;
 
 import java.io.ByteArrayInputStream;
@@ -42,7 +42,7 @@
 import static java.lang.String.format;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.simplejavamail.api.email.OriginalSmimeDetails.SmimeMode.PLAIN;
-import static org.simplejavamail.internal.modules.ModuleLoader.loadSmimeModule;
+import static org.simplejavamail.internal.moduleloader.ModuleLoader.loadSmimeModule;
 import static org.simplejavamail.internal.util.MiscUtil.extractCID;
 import static org.simplejavamail.internal.util.MiscUtil.readInputStreamToString;
 import static org.simplejavamail.internal.util.Preconditions.checkNonEmptyArgument;

Diff for: modules/simple-java-mail/src/main/java/org/simplejavamail/converter/internal/mimemessage/MimeMessageProducer.java

@@ -7,7 +7,7 @@
 import org.jetbrains.annotations.Nullable;
 import org.simplejavamail.api.email.Email;
 import org.simplejavamail.api.mailer.config.Pkcs12Config;
-import org.simplejavamail.internal.modules.ModuleLoader;
+import org.simplejavamail.internal.moduleloader.ModuleLoader;
 
 import java.io.UnsupportedEncodingException;
 import java.util.Date;

Diff for: modules/simple-java-mail/src/main/java/org/simplejavamail/internal/modules/ModuleLoader.java renamed to modules/simple-java-mail/src/main/java/org/simplejavamail/internal/moduleloader/ModuleLoader.java

@@ -1,5 +1,10 @@
-package org.simplejavamail.internal.modules;
+package org.simplejavamail.internal.moduleloader;
 
+import org.simplejavamail.internal.modules.AuthenticatedSocksModule;
+import org.simplejavamail.internal.modules.BatchModule;
+import org.simplejavamail.internal.modules.DKIMModule;
+import org.simplejavamail.internal.modules.OutlookModule;
+import org.simplejavamail.internal.modules.SMIMEModule;
 import org.simplejavamail.internal.util.MiscUtil;
 
 import java.util.ArrayList;

Diff for: modules/simple-java-mail/src/main/java/org/simplejavamail/internal/modules/ModuleLoaderException.java renamed to modules/simple-java-mail/src/main/java/org/simplejavamail/internal/moduleloader/ModuleLoaderException.java

@@ -1,4 +1,4 @@
-package org.simplejavamail.internal.modules;
+package org.simplejavamail.internal.moduleloader;
 
 import org.simplejavamail.MailException;
 

Diff for: modules/simple-java-mail/src/main/java/org/simplejavamail/mailer/MailerHelper.java

@@ -11,7 +11,7 @@
 import org.simplejavamail.api.email.Email;
 import org.simplejavamail.api.email.Recipient;
 import org.simplejavamail.api.mailer.config.Pkcs12Config;
-import org.simplejavamail.internal.modules.ModuleLoader;
+import org.simplejavamail.internal.moduleloader.ModuleLoader;
 import org.slf4j.Logger;
 
 import java.util.Collection;

Diff for: modules/simple-java-mail/src/main/java/org/simplejavamail/mailer/internal/MailerGenericBuilderImpl.java

@@ -13,7 +13,7 @@
 import org.simplejavamail.api.mailer.config.Pkcs12Config;
 import org.simplejavamail.api.mailer.config.ProxyConfig;
 import org.simplejavamail.config.ConfigLoader.Property;
-import org.simplejavamail.internal.modules.ModuleLoader;
+import org.simplejavamail.internal.moduleloader.ModuleLoader;
 
 import java.io.File;
 import java.io.FileInputStream;

Diff for: modules/simple-java-mail/src/main/java/org/simplejavamail/mailer/internal/MailerImpl.java

@@ -14,7 +14,7 @@
 import org.simplejavamail.api.mailer.config.ServerConfig;
 import org.simplejavamail.api.mailer.config.TransportStrategy;
 import org.simplejavamail.config.ConfigLoader;
-import org.simplejavamail.internal.modules.ModuleLoader;
+import org.simplejavamail.internal.moduleloader.ModuleLoader;
 import org.simplejavamail.internal.util.concurrent.AsyncOperationHelper;
 import org.simplejavamail.mailer.MailerHelper;
 import org.simplejavamail.mailer.internal.util.SmtpAuthenticator;

Diff for: modules/simple-java-mail/src/main/java/org/simplejavamail/mailer/internal/util/TransportRunner.java

@@ -8,7 +8,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.simplejavamail.api.internal.batchsupport.LifecycleDelegatingTransport;
 import org.simplejavamail.internal.modules.BatchModule;
-import org.simplejavamail.internal.modules.ModuleLoader;
+import org.simplejavamail.internal.moduleloader.ModuleLoader;
 import org.slf4j.Logger;
 
 import java.util.UUID;

Diff for: modules/simple-java-mail/src/test/java/org/simplejavamail/converter/internal/mimemessage/MimeMessageHelper2Test.java

@@ -10,7 +10,7 @@
 import org.powermock.modules.junit4.PowerMockRunner;
 import org.simplejavamail.api.email.Email;
 import org.simplejavamail.converter.EmailConverter;
-import org.simplejavamail.internal.modules.ModuleLoader;
+import org.simplejavamail.internal.moduleloader.ModuleLoader;
 import org.simplejavamail.internal.util.MiscUtil;
 import testutil.ConfigLoaderTestHelper;
 import testutil.EmailHelper;

Diff for: modules/simple-java-mail/src/test/java/org/simplejavamail/converter/internal/mimemessage/MimeMessageHelperTest.java

@@ -12,7 +12,7 @@
 import org.simplejavamail.api.email.AttachmentResource;
 import org.simplejavamail.api.email.Email;
 import org.simplejavamail.converter.EmailConverter;
-import org.simplejavamail.internal.modules.ModuleLoader;
+import org.simplejavamail.internal.moduleloader.ModuleLoader;
 import testutil.ConfigLoaderTestHelper;
 import testutil.EmailHelper;