Fix crash on startup with prod profile

Author: Brutus5000

.travis.yml

@@ -25,7 +25,7 @@ before_install:
 install:
   - git clone https://github.com/FAForever/faf-stack.git faf-stack
     && pushd faf-stack
-    && git checkout 9f01fbe
+    && git checkout b9fc74d
     && cp -r config.template config
     && cp .env.template .env
     && ./scripts/init-db.sh

src/inttest/resources/config/application.yml

@@ -18,6 +18,8 @@ spring:
   h2:
     console:
       enabled: true
+  mail:
+    host: false
 
 
 faf-api:

src/main/java/com/faforever/api/email/NoopEmailSender.java

@@ -1,36 +1,22 @@
 package com.faforever.api.email;
 
-import com.faforever.api.email.NoopEmailSender.MailSenderCondition;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.InitializingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.autoconfigure.condition.NoneNestedConditions;
-import org.springframework.context.annotation.Conditional;
 import org.springframework.stereotype.Component;
 
 @Component
 @Slf4j
-@Conditional(MailSenderCondition.class)
-public class NoopEmailSender implements EmailSender {
+@ConditionalOnProperty(value = "spring.mail.host", havingValue = "false")
+public class NoopEmailSender implements EmailSender, InitializingBean {
+  @Override
+  public void afterPropertiesSet() {
+    log.warn("No email sender defined, using fallback NoopEmailSender instead!");
+  }
+
   @Override
   public void sendMail(String fromEmail, String fromName, String toEmail, String subject, String content) {
     log.debug("Would send email from '{} <{}>' to '{}' with subject '{}' and text: {}",
       fromName, fromEmail, toEmail, subject, content);
   }
-
-  static class MailSenderCondition extends NoneNestedConditions {
-
-    MailSenderCondition() {
-      super(ConfigurationPhase.PARSE_CONFIGURATION);
-    }
-
-    @ConditionalOnProperty("faf-api.mail.mandrill-api-key")
-    static class HostProperty {
-
-    }
-
-    @ConditionalOnProperty("spring.mail.host")
-    static class JndiNameProperty {
-
-    }
-  }
 }

src/main/resources/config/application-prod.yml

@@ -36,7 +36,6 @@ faf-api:
   clan:
     website-url-format: ${CLAN_WEBSITE_URL_FORMAT}
   mail:
-    mandrill-api-key: ${MANDRILL_API_KEY}
     from-email-name: ${EMAIL_FROM_NAME}
     from-email-address: ${EMAIL_FROM_ADDRESS}
   registration: