From 0b3d508fe24d205e1844a98f49cbfe89585e31ee Mon Sep 17 00:00:00 2001
From: Adriano Scheffer <adriano.scheffer@traderev.com>
Date: Thu, 6 Feb 2020 18:41:23 -0500
Subject: [PATCH] Always call value serde configure method

Resolves https://github.com/spring-cloud/spring-cloud-stream-binder-kafka/issues/836

Remove redundant call to serde configure

Closes https://github.com/spring-cloud/spring-cloud-stream-binder-kafka/issues/836
---
 .../stream/binder/kafka/streams/KeyValueSerdeResolver.java  | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/KeyValueSerdeResolver.java b/spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/KeyValueSerdeResolver.java
index e72e561a3..3d24433de 100644
--- a/spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/KeyValueSerdeResolver.java
+++ b/spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/KeyValueSerdeResolver.java
@@ -125,7 +125,6 @@ public class KeyValueSerdeResolver implements ApplicationContextAware {
 			else {
 				valueSerde = Serdes.ByteArray();
 			}
-			valueSerde.configure(this.streamConfigGlobalProperties, false);
 		}
 		catch (ClassNotFoundException ex) {
 			throw new IllegalStateException("Serde class not found: ", ex);
@@ -146,7 +145,6 @@ public class KeyValueSerdeResolver implements ApplicationContextAware {
 			else {
 				valueSerde = Serdes.ByteArray();
 			}
-			valueSerde.configure(this.streamConfigGlobalProperties, false);
 		}
 		catch (ClassNotFoundException ex) {
 			throw new IllegalStateException("Serde class not found: ", ex);
@@ -186,7 +184,6 @@ public class KeyValueSerdeResolver implements ApplicationContextAware {
 			else {
 				valueSerde = Serdes.ByteArray();
 			}
-			valueSerde.configure(this.streamConfigGlobalProperties, false);
 		}
 		catch (ClassNotFoundException ex) {
 			throw new IllegalStateException("Serde class not found: ", ex);
@@ -205,7 +202,6 @@ public class KeyValueSerdeResolver implements ApplicationContextAware {
 			else {
 				valueSerde = Serdes.ByteArray();
 			}
-			valueSerde.configure(this.streamConfigGlobalProperties, false);
 		}
 		catch (ClassNotFoundException ex) {
 			throw new IllegalStateException("Serde class not found: ", ex);
@@ -393,6 +389,7 @@ public class KeyValueSerdeResolver implements ApplicationContextAware {
 		else {
 			valueSerde = getFallbackSerde("default.value.serde");
 		}
+		valueSerde.configure(this.streamConfigGlobalProperties, false);
 		return valueSerde;
 	}
 
@@ -425,6 +422,7 @@ public class KeyValueSerdeResolver implements ApplicationContextAware {
 				valueSerde = Serdes.ByteArray();
 			}
 		}
+		valueSerde.configure(streamConfigGlobalProperties, false);
 		return valueSerde;
 	}