From b259cb380f49001d042e5cfcb72a93b1e10b167f Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@pivotal.io>
Date: Fri, 17 Feb 2017 21:07:06 -0500
Subject: [PATCH] Fix RabbitExchangeQueueProvisioner Inner Classes

- make destination inner classes `static` since they have no dependence on the outer class
- make ctors package-protected - private ctors for inner classes cause the compiler to
  generate a synthetic ctor with an additional synthetic parameter
---
 .../provisioning/RabbitExchangeQueueProvisioner.java  | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/spring-cloud-stream-binder-rabbit-core/src/main/java/org/springframework/cloud/stream/binder/rabbit/provisioning/RabbitExchangeQueueProvisioner.java b/spring-cloud-stream-binder-rabbit-core/src/main/java/org/springframework/cloud/stream/binder/rabbit/provisioning/RabbitExchangeQueueProvisioner.java
index b196bf331..d0e66d9d5 100644
--- a/spring-cloud-stream-binder-rabbit-core/src/main/java/org/springframework/cloud/stream/binder/rabbit/provisioning/RabbitExchangeQueueProvisioner.java
+++ b/spring-cloud-stream-binder-rabbit-core/src/main/java/org/springframework/cloud/stream/binder/rabbit/provisioning/RabbitExchangeQueueProvisioner.java
@@ -53,6 +53,7 @@ import org.springframework.util.StringUtils;
  * AMQP implementation for {@link ProvisioningProvider}
  *
  * @author Soby Chacko
+ * @author Gary Russell
  */
 public class RabbitExchangeQueueProvisioner implements ProvisioningProvider<ExtendedConsumerProperties<RabbitConsumerProperties>,
 		ExtendedProducerProperties<RabbitProducerProperties>> {
@@ -453,12 +454,13 @@ public class RabbitExchangeQueueProvisioner implements ProvisioningProvider<Exte
 		}
 	}
 
-	private final class RabbitProducerDestination implements ProducerDestination {
+	private static final class RabbitProducerDestination implements ProducerDestination {
 
 		private final Exchange exchange;
+
 		private final Binding binding;
 
-		private RabbitProducerDestination(Exchange exchange, Binding binding) {
+		RabbitProducerDestination(Exchange exchange, Binding binding) {
 			Assert.notNull(exchange, "exchange must not be null");
 			this.exchange = exchange;
 			this.binding = binding;
@@ -483,12 +485,12 @@ public class RabbitExchangeQueueProvisioner implements ProvisioningProvider<Exte
 		}
 	}
 
-	private final class RabbitConsumerDestination implements ConsumerDestination {
+	private static final class RabbitConsumerDestination implements ConsumerDestination {
 
 		private final Queue queue;
 		private final Binding binding;
 
-		private RabbitConsumerDestination(Queue queue, Binding binding) {
+		RabbitConsumerDestination(Queue queue, Binding binding) {
 			Assert.notNull(queue, "queue must not be null");
 			this.queue = queue;
 			this.binding = binding;
@@ -507,4 +509,5 @@ public class RabbitExchangeQueueProvisioner implements ProvisioningProvider<Exte
 			return this.queue.getName();
 		}
 	}
+
 }