Revision 82da5e6c
Added by Andreas Kohlbecker over 2 years ago
| cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/config/SendEmailConfigurer.java | ||
|---|---|---|
| 56 | 56 |
|
| 57 | 57 |
@Bean |
| 58 | 58 |
public JavaMailSenderImpl mailSender() {
|
| 59 |
|
|
| 59 | 60 |
boolean disabled = false; |
| 60 | 61 |
try {
|
| 61 | 62 |
disabled = Boolean.valueOf(env.getProperty(DISABLED)); |
| cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/EmailSendTest.java | ||
|---|---|---|
| 44 | 44 |
@Test |
| 45 | 45 |
public void sendEmailTest() {
|
| 46 | 46 |
|
| 47 |
boolean disabled = false; |
|
| 48 |
try {
|
|
| 49 |
disabled = Boolean.valueOf(env.getProperty(SendEmailConfigurer.DISABLED)); |
|
| 50 |
} catch (Exception e) {
|
|
| 51 |
// ignore all |
|
| 52 |
} |
|
| 53 |
|
|
| 54 |
if(disabled) {
|
|
| 55 |
logger.warn("sendEmailTest is disabled");
|
|
| 56 |
return; |
|
| 57 |
} |
|
| 58 |
|
|
| 47 | 59 |
String from = env.getProperty(SendEmailConfigurer.FROM_ADDRESS); |
| 48 | 60 |
|
| 49 | 61 |
boolean useWiser = Objects.equals(env.getProperty(SendEmailConfigurer.INT_TEST_SERVER), "wiser"); |
| ... | ... | |
| 55 | 67 |
wiser.start(); |
| 56 | 68 |
} |
| 57 | 69 |
|
| 58 |
boolean disabled = false; |
|
| 59 |
try {
|
|
| 60 |
disabled = Boolean.valueOf(env.getProperty(SendEmailConfigurer.DISABLED)); |
|
| 61 |
} catch (Exception e) {
|
|
| 62 |
// ignore all |
|
| 63 |
} |
|
| 64 | 70 |
if(!disabled) {
|
| 65 | 71 |
|
| 66 | 72 |
SimpleMailMessage message = new SimpleMailMessage(); |
| cdmlib-services/src/test/resources/application.properties | ||
|---|---|---|
| 12 | 12 |
#mail.smtp.auth: true |
| 13 | 13 |
#mail.smtp.starttls.enable: true |
| 14 | 14 |
# this properties allows for disabling the mail agent |
| 15 |
mail.disabled: false |
|
| 15 |
mail.disabled: false |
|
| 16 |
# needed to enable wiser in the integration test |
|
| 17 |
mail.int-test-server: wiser |
|
Also available in: Unified diff
ref #9758 configuration for sending emails with smtp properties