Run SesAutoConfiguration before SimpleEmailAutoConfiguration

Author: eddumelendez

spring-cloud-aws-autoconfigure/src/main/java/org/springframework/cloud/aws/autoconfigure/mail/SesAutoConfiguration.java

@@ -24,6 +24,7 @@
 
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -53,8 +54,8 @@
  */
 @Configuration(proxyBeanMethods = false)
 @AutoConfigureAfter(MailSenderAutoConfiguration.class)
+@AutoConfigureBefore(SimpleEmailAutoConfiguration.class)
 @ConditionalOnClass({ AmazonSimpleEmailService.class, MailSender.class })
-@ConditionalOnMissingClass("org.springframework.cloud.aws.mail.simplemail.SimpleEmailServiceJavaMailSender")
 @ConditionalOnMissingBean(MailSender.class)
 @Import(ContextCredentialsAutoConfiguration.class)
 @EnableConfigurationProperties(SesProperties.class)

spring-cloud-aws-autoconfigure/src/test/java/org/springframework/cloud/aws/autoconfigure/mail/SesAutoConfigurationTest.java

@@ -88,12 +88,23 @@ void mailSenderWithCustomRegion() {
 	}
 
 	@Test
-	void mailIsDisabled() {
+	void sesAutoConfigurationIsDisabled() {
 		this.contextRunner.withPropertyValues("spring.cloud.aws.ses.enabled:false")
 				.run(context -> {
 					assertThat(context).doesNotHaveBean(MailSender.class);
 					assertThat(context).doesNotHaveBean(JavaMailSender.class);
 				});
 	}
 
+	@Test
+	void sesAutoConfigurationIsDisabledButSimpleEmailAutoConfigurationIsEnabled() {
+		new ApplicationContextRunner()
+				.withConfiguration(AutoConfigurations.of(SesAutoConfiguration.class,
+						SimpleEmailAutoConfiguration.class))
+				.withPropertyValues("spring.cloud.aws.ses.enabled:false").run(context -> {
+					assertThat(context).hasSingleBean(MailSender.class);
+					assertThat(context).hasSingleBean(JavaMailSender.class);
+				});
+	}
+
 }