From 1a5916665c8f595056853c0aea8ca4bac1d721e4 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 27 Nov 2014 14:49:35 +0100 Subject: [PATCH] Remove unused RabbitMQ dynamic property flag Fixes gh-1999 --- .../boot/autoconfigure/amqp/RabbitProperties.java | 10 ---------- .../additional-spring-configuration-metadata.json | 6 ++++++ 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java index a23bd30c55..72b2e58552 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitProperties.java @@ -61,8 +61,6 @@ public class RabbitProperties { */ private String addresses; - private boolean dynamic = true; - public String getHost() { if (this.addresses == null) { return this.host; @@ -149,14 +147,6 @@ public class RabbitProperties { this.password = password; } - public boolean isDynamic() { - return this.dynamic; - } - - public void setDynamic(boolean dynamic) { - this.dynamic = dynamic; - } - public String getVirtualHost() { return this.virtualHost; } diff --git a/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 06fcbf0b79..3747a07ba3 100644 --- a/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -89,6 +89,12 @@ "description": "Enable SitePreferenceHandler.", "defaultValue": true }, + { + "name": "spring.rabbitmq.dynamic", + "type": "java.lang.Boolean", + "description": "Create an AmqpAdmin bean.", + "defaultValue": true + }, { "name": "spring.social.auto-connection-views", "type": "java.lang.Boolean",