fix to work with latest hapi-fhir

src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigCommon.java

@@ -14,8 +14,6 @@ import ca.uhn.fhir.rest.server.mail.IMailSvc;
 import ca.uhn.fhir.rest.server.mail.MailConfig;
 import ca.uhn.fhir.rest.server.mail.MailSvc;
 import com.google.common.base.Strings;
-import java.util.HashSet;
-import java.util.Optional;
 import org.hl7.fhir.dstu2.model.Subscription;
 import org.springframework.boot.env.YamlPropertySourceLoader;
 import org.springframework.context.annotation.Bean;
@@ -25,6 +23,9 @@ import org.springframework.context.annotation.Primary;
 import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
+import java.util.HashSet;
+import java.util.Optional;
+
 /**
  * This is the primary configuration file for the example server
  */
@@ -74,7 +75,7 @@ public class FhirServerConfigCommon {
   /**
    * Configure FHIR properties around the the JPA server via this bean
    */
-  @Bean()
+  @Bean
   public DaoConfig daoConfig(AppProperties appProperties) {
     DaoConfig retVal = new DaoConfig();
 
@@ -209,7 +210,7 @@ public class FhirServerConfigCommon {
     return binaryStorageSvc;
   }
 
-  @Bean()
+  @Bean
   public IEmailSender emailSender(AppProperties appProperties, Optional<SubscriptionDeliveryHandlerFactory> subscriptionDeliveryHandlerFactory) {
     if (appProperties.getSubscription() != null && appProperties.getSubscription().getEmail() != null) {
 		 MailConfig mailConfig = new MailConfig();