From 7147a1f901c0f50f601f5c3e2fb9775cd64951f4 Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@pivotal.io>
Date: Mon, 3 Sep 2018 14:37:14 -0400
Subject: [PATCH] KBGH-435: Use transactional producer config

See https://github.com/spring-cloud/spring-cloud-stream-binder-kafka/issues/435

Allow binder implementations to override the `useNativeEncoding` producer property.

Resolves #1464
---
 .../binder/AbstractMessageChannelBinder.java   | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/AbstractMessageChannelBinder.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/AbstractMessageChannelBinder.java
index 810c139a7..9dab62f24 100644
--- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/AbstractMessageChannelBinder.java
+++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/AbstractMessageChannelBinder.java
@@ -177,7 +177,7 @@ public abstract class AbstractMessageChannelBinder<C extends ConsumerProperties,
 		((SubscribableChannel) outputChannel).subscribe(
 				new SendingHandler(producerMessageHandler, HeaderMode.embeddedHeaders
 						.equals(producerProperties.getHeaderMode()), this.headersToEmbed,
-						producerProperties.isUseNativeEncoding()));
+						useNativeEncoding(producerProperties)));
 
 		Binding<MessageChannel> binding = new DefaultBinding<MessageChannel>(destination, outputChannel,
 				producerMessageHandler instanceof Lifecycle ? (Lifecycle) producerMessageHandler : null) {
@@ -207,6 +207,18 @@ public abstract class AbstractMessageChannelBinder<C extends ConsumerProperties,
 		return binding;
 	}
 
+	/**
+	 * Whether the producer for the destination being created should be configured to use
+	 * native encoding which may, or may not, be determined from the properties. For
+	 * example, a transactional kafka binder uses a common producer for all destinations.
+	 * The default implementation returns {@link P#isUseNativeEncoding()}.
+	 * @param producerProperties the properties.
+	 * @return true to use native encoding.
+	 */
+	protected boolean useNativeEncoding(P producerProperties) {
+		return producerProperties.isUseNativeEncoding();
+	}
+
 	/**
 	 * Allows subclasses to perform post processing on the channel - for example to
 	 * add more interceptors.
@@ -749,6 +761,8 @@ public abstract class AbstractMessageChannelBinder<C extends ConsumerProperties,
 
 		private final MessageHandler delegate;
 
+		private final boolean useNativeEncoding;
+
 
 		private SendingHandler(MessageHandler delegate, boolean embedHeaders,
 				String[] headersToEmbed, boolean useNativeEncoding) {
@@ -759,8 +773,6 @@ public abstract class AbstractMessageChannelBinder<C extends ConsumerProperties,
 			this.useNativeEncoding = useNativeEncoding;
 		}
 
-		private final boolean useNativeEncoding;
-
 		@Override
 		protected void handleMessageInternal(Message<?> message) throws Exception {
 			Message<?> messageToSend = (this.useNativeEncoding) ? message