This commit is contained in:
Phillip Webb
2015-07-06 13:04:59 -07:00
parent afd357f45a
commit 0cf6efca4f
10 changed files with 21 additions and 17 deletions

View File

@@ -131,4 +131,5 @@ public class MailProperties {
public void setTestConnection(boolean testConnection) {
this.testConnection = testConnection;
}
}

View File

@@ -18,6 +18,7 @@ package org.springframework.boot.autoconfigure.mail;
import java.util.Map;
import java.util.Properties;
import javax.activation.MimeType;
import javax.annotation.PostConstruct;
import javax.mail.MessagingException;
@@ -120,8 +121,8 @@ public class MailSenderAutoConfiguration {
}
/**
* Condition to trigger the creation of a {@link JavaMailSenderImpl}. This kicks in if
* either the host or jndi name property is set.
* Condition to trigger the creation of a {@link JavaMailSenderImpl}. This kicks
* in if either the host or jndi name property is set.
*/
static class MailSenderCondition extends AnyNestedCondition {
@@ -161,6 +162,7 @@ public class MailSenderAutoConfiguration {
}
}
}
}
}

View File

@@ -17,6 +17,7 @@
package org.springframework.boot.autoconfigure.mail;
import java.util.Properties;
import javax.mail.MessagingException;
import javax.mail.Session;
import javax.naming.Context;
@@ -237,5 +238,4 @@ public class MailSenderAutoConfigurationTests {
}
}

View File

@@ -100,7 +100,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
* @author Greg Turnquist
* @author Dave Syer
*/
public class SpringSecurityOAuth2AutoConfigurationTests {
public class OAuth2AutoConfigurationTests {
private static final Class<?> RESOURCE_SERVER_CONFIG = OAuth2ResourceServerConfiguration.class;