diff --git a/examples/spring-mail-integration-demo/pom.xml b/examples/spring-mail-integration-demo/pom.xml index aabb04bf..16b81968 100644 --- a/examples/spring-mail-integration-demo/pom.xml +++ b/examples/spring-mail-integration-demo/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 2.5.2 + 2.5.5 diff --git a/examples/spring-mail-integration-demo/src/main/java/ru/otus/example/springmail_integration_demo/integration/IntegrationConfig.java b/examples/spring-mail-integration-demo/src/main/java/ru/otus/example/springmail_integration_demo/integration/IntegrationConfig.java index f039a8c8..99f87031 100644 --- a/examples/spring-mail-integration-demo/src/main/java/ru/otus/example/springmail_integration_demo/integration/IntegrationConfig.java +++ b/examples/spring-mail-integration-demo/src/main/java/ru/otus/example/springmail_integration_demo/integration/IntegrationConfig.java @@ -9,6 +9,7 @@ import org.springframework.integration.dsl.IntegrationFlowDefinition; import org.springframework.integration.dsl.MessageChannels; import org.springframework.integration.dsl.Pollers; import org.springframework.integration.scheduling.PollerMetadata; +import org.springframework.mail.SimpleMailMessage; import org.springframework.mail.javamail.JavaMailSender; import org.springframework.messaging.Message; import org.springframework.messaging.PollableChannel; @@ -16,6 +17,8 @@ import ru.otus.example.springmail_integration_demo.repositories.ActivityReposito import ru.otus.example.springmail_integration_demo.repositories.ActivityStatRepository; import ru.otus.example.springmail_integration_demo.services.UserActivityToEmailTransformer; +import java.util.concurrent.atomic.AtomicBoolean; + @Configuration @IntegrationComponentScan @@ -42,6 +45,8 @@ public class IntegrationConfig { @Autowired private JavaMailSender mailSender; + private AtomicBoolean messageWasSandedOnceFlag = new AtomicBoolean(false); + @Bean public PollableChannel appUserActivityInChanel() { return MessageChannels.queue("appUserActivityInChanel", DEFAULT_QUEUE_CAPACITY).get(); @@ -66,7 +71,12 @@ public class IntegrationConfig { .transform(messageTransformer, TRANSFORM_METHOD_NAME) .handle(m -> { System.out.println("Как будто посылаем письмо: " + m.getPayload()); - //mailSender.send((SimpleMailMessage) m.getPayload()); +/* + if (!messageWasSandedOnceFlag.get()) { + mailSender.send((SimpleMailMessage) m.getPayload()); + messageWasSandedOnceFlag.set(true); + } +*/ }) ) .subFlowMapping(false, IntegrationFlowDefinition::nullChannel) diff --git a/examples/spring-mail-rabbitmq-demo/user-activity-emitter-microservice/pom.xml b/examples/spring-mail-rabbitmq-demo/user-activity-emitter-microservice/pom.xml index 5c832513..ac61d2b3 100644 --- a/examples/spring-mail-rabbitmq-demo/user-activity-emitter-microservice/pom.xml +++ b/examples/spring-mail-rabbitmq-demo/user-activity-emitter-microservice/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 2.5.2 + 2.5.5 diff --git a/examples/spring-mail-rabbitmq-demo/user-activity-models/pom.xml b/examples/spring-mail-rabbitmq-demo/user-activity-models/pom.xml index 125b378f..9dee29bd 100644 --- a/examples/spring-mail-rabbitmq-demo/user-activity-models/pom.xml +++ b/examples/spring-mail-rabbitmq-demo/user-activity-models/pom.xml @@ -19,7 +19,7 @@ com.fasterxml.jackson.core jackson-annotations - 2.10.1 + 2.13.0 @@ -32,7 +32,7 @@ org.projectlombok lombok - 1.18.20 + 1.18.22 true diff --git a/examples/spring-mail-rabbitmq-demo/user-activity-processor-microservice/pom.xml b/examples/spring-mail-rabbitmq-demo/user-activity-processor-microservice/pom.xml index bcedb2e1..7115ddc6 100644 --- a/examples/spring-mail-rabbitmq-demo/user-activity-processor-microservice/pom.xml +++ b/examples/spring-mail-rabbitmq-demo/user-activity-processor-microservice/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 2.5.2 + 2.5.5