From 7e579c9a91f61e66e0ad2626fc106bc337ed9d4b Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Fri, 27 Feb 2015 12:38:39 +0000 Subject: [PATCH] Use method accessor not field --- .../amqp/HystrixStreamAutoConfiguration.java | 4 ++-- .../turbine/amqp/TurbineAmqpAutoConfiguration.java | 13 ------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/spring-cloud-netflix-hystrix-amqp/src/main/java/org/springframework/cloud/netflix/hystrix/amqp/HystrixStreamAutoConfiguration.java b/spring-cloud-netflix-hystrix-amqp/src/main/java/org/springframework/cloud/netflix/hystrix/amqp/HystrixStreamAutoConfiguration.java index 43bea4f5..46126e92 100644 --- a/spring-cloud-netflix-hystrix-amqp/src/main/java/org/springframework/cloud/netflix/hystrix/amqp/HystrixStreamAutoConfiguration.java +++ b/spring-cloud-netflix-hystrix-amqp/src/main/java/org/springframework/cloud/netflix/hystrix/amqp/HystrixStreamAutoConfiguration.java @@ -111,11 +111,11 @@ public class HystrixStreamAutoConfiguration { // TODO: set content type /* * .enrichHeaders(new ComponentConfigurer() { - * + * * @Override public void configure(HeaderEnricherSpec spec) { * spec.header("content-type", "application/json", true); } }) */ - .handle(Amqp.outboundAdapter(this.amqpTemplate).exchangeName( + .handle(Amqp.outboundAdapter(amqpTemplate()).exchangeName( HystrixConstants.HYSTRIX_STREAM_NAME)).get(); } diff --git a/spring-cloud-netflix-turbine-amqp/src/main/java/org/springframework/cloud/netflix/turbine/amqp/TurbineAmqpAutoConfiguration.java b/spring-cloud-netflix-turbine-amqp/src/main/java/org/springframework/cloud/netflix/turbine/amqp/TurbineAmqpAutoConfiguration.java index b3c3576b..32757554 100644 --- a/spring-cloud-netflix-turbine-amqp/src/main/java/org/springframework/cloud/netflix/turbine/amqp/TurbineAmqpAutoConfiguration.java +++ b/spring-cloud-netflix-turbine-amqp/src/main/java/org/springframework/cloud/netflix/turbine/amqp/TurbineAmqpAutoConfiguration.java @@ -25,7 +25,6 @@ import org.springframework.amqp.core.BindingBuilder; import org.springframework.amqp.core.DirectExchange; import org.springframework.amqp.core.Queue; import org.springframework.amqp.rabbit.connection.ConnectionFactory; -import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; @@ -70,18 +69,6 @@ public class TurbineAmqpAutoConfiguration { @Autowired(required = false) private ObjectMapper objectMapper; - private RabbitTemplate amqpTemplate; - - public RabbitTemplate amqpTemplate() { - if (this.amqpTemplate == null) { - RabbitTemplate amqpTemplate = new RabbitTemplate(connectionFactory()); - Jackson2JsonMessageConverter converter = messageConverter(); - amqpTemplate.setMessageConverter(converter); - this.amqpTemplate = amqpTemplate; - } - return this.amqpTemplate; - } - @Bean public DirectExchange hystrixStreamExchange() { DirectExchange exchange = new DirectExchange(HystrixConstants.HYSTRIX_STREAM_NAME);