Merge pull request spring-projects#3589 from izeye/patch-36

snicoll · snicoll · commit aa3393f18c0e · 2015-07-24T05:56:49.000+02:00
* pr/3589:
  Remove an unused parameter
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfiguration.java
@@ -97,7 +97,7 @@ public AmqpAdmin amqpAdmin(ConnectionFactory connectionFactory) {
 
 	@Bean
 	@ConditionalOnMissingBean(RabbitTemplate.class)
-	public RabbitTemplate rabbitTemplate(RabbitProperties config) {
+	public RabbitTemplate rabbitTemplate() {
 		return new RabbitTemplate(this.connectionFactory);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ public AmqpAdmin amqpAdmin(ConnectionFactory connectionFactory) {`
`97`	`97`
`98`	`98`	`@Bean`
`99`	`99`	`@ConditionalOnMissingBean(RabbitTemplate.class)`
`100`		`- public RabbitTemplate rabbitTemplate(RabbitProperties config) {`
	`100`	`+ public RabbitTemplate rabbitTemplate() {`
`101`	`101`	`return new RabbitTemplate(this.connectionFactory);`
`102`	`102`	`}`
`103`	`103`