From 4c4e1bc0960b025b099a1c4410da11108b55b0ec Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Wed, 28 Aug 2019 17:08:11 -0400 Subject: [PATCH] Update Barrier for Modern Boot Versions - publisher confirms/returns now supported in app.props. --- .../integration/samples/barrier/Application.java | 7 ------- basic/barrier/src/main/resources/application.properties | 3 +++ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/basic/barrier/src/main/java/org/springframework/integration/samples/barrier/Application.java b/basic/barrier/src/main/java/org/springframework/integration/samples/barrier/Application.java index 820f3a4a..17ead8d4 100644 --- a/basic/barrier/src/main/java/org/springframework/integration/samples/barrier/Application.java +++ b/basic/barrier/src/main/java/org/springframework/integration/samples/barrier/Application.java @@ -18,7 +18,6 @@ package org.springframework.integration.samples.barrier; import java.util.Collections; -import org.springframework.amqp.rabbit.connection.CachingConnectionFactory; import org.springframework.boot.Banner.Mode; import org.springframework.boot.SpringApplication; import org.springframework.boot.WebApplicationType; @@ -38,12 +37,6 @@ public class Application { public static void main(String[] args) throws Exception { ConfigurableApplicationContext server = SpringApplication.run(Application.class, args); - // https://github.com/spring-projects/spring-boot/issues/3945 - CachingConnectionFactory connectionFactory = server.getBean(CachingConnectionFactory.class); - connectionFactory.setPublisherConfirms(true); - connectionFactory.resetConnection(); - // https://github.com/spring-projects/spring-boot/issues/3945 - SpringApplication application = new SpringApplicationBuilder() .web(WebApplicationType.NONE) .bannerMode(Mode.OFF) diff --git a/basic/barrier/src/main/resources/application.properties b/basic/barrier/src/main/resources/application.properties index 7a694787..8ef9e7d7 100644 --- a/basic/barrier/src/main/resources/application.properties +++ b/basic/barrier/src/main/resources/application.properties @@ -1 +1,4 @@ spring.output.ansi.enabled=always + +spring.rabbitmq.publisher-confirms=true +spring.rabbitmq.publisher-returns=true