| 1 | package fr.sii.ogham.spring.v2.email; | |
| 2 | ||
| 3 | import org.springframework.beans.factory.annotation.Autowired; | |
| 4 | import org.springframework.boot.autoconfigure.AutoConfigureAfter; | |
| 5 | import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; | |
| 6 | import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; | |
| 7 | import org.springframework.boot.autoconfigure.sendgrid.SendGridAutoConfiguration; | |
| 8 | import org.springframework.boot.autoconfigure.sendgrid.SendGridProperties; | |
| 9 | import org.springframework.boot.context.properties.EnableConfigurationProperties; | |
| 10 | import org.springframework.context.annotation.Bean; | |
| 11 | import org.springframework.context.annotation.Configuration; | |
| 12 | ||
| 13 | import com.sendgrid.SendGrid; | |
| 14 | ||
| 15 | import fr.sii.ogham.email.sendgrid.v4.sender.impl.SendGridV4Sender; | |
| 16 | import fr.sii.ogham.spring.email.AbstractSpringSendGridConfigurer; | |
| 17 | import fr.sii.ogham.spring.email.OghamSendGridProperties; | |
| 18 | ||
| 19 | @Configuration | |
| 20 | @ConditionalOnClass({SendGridV4Sender.class}) | |
| 21 | @EnableConfigurationProperties(OghamSendGridProperties.class) | |
| 22 | @AutoConfigureAfter(SendGridAutoConfiguration.class) | |
| 23 | public class OghamSendGridV4Configuration { | |
| 24 | | |
| 25 | @Bean | |
| 26 | @ConditionalOnMissingBean(AbstractSpringSendGridConfigurer.class) | |
| 27 | public AbstractSpringSendGridConfigurer springSendGridConfigurer( | |
| 28 | @Autowired(required=false) OghamSendGridProperties properties, | |
| 29 | @Autowired(required=false) SendGridProperties springProperties, | |
| 30 | @Autowired(required=false) SendGrid sendGrid) { | |
| 31 |
1
1. springSendGridConfigurer : replaced return value with null for fr/sii/ogham/spring/v2/email/OghamSendGridV4Configuration::springSendGridConfigurer → TIMED_OUT |
return new SpringSendGridV4Configurer(properties, springProperties, sendGrid); |
| 32 | } | |
| 33 | } | |
Mutations | ||
| 31 |
1.1 |