From 68efb9472e1e8d586b1f7eb98cf2b0d935c6a413 Mon Sep 17 00:00:00 2001
From: Chris Bono <chris.bono@gmail.com>
Date: Wed, 15 May 2024 21:57:55 -0500
Subject: [PATCH] Enhance cloud-stream-rabbit/kafka tests

- Add multi-binder with complex property for rabbit
- Add complex property for kafka

See https://github.com/spring-cloud/spring-cloud-stream/issues/2690
---
 .../src/main/resources/application.yml        |  6 +++
 .../src/main/resources/application.yml        | 45 ++++++++++++++-----
 2 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/cloud/cloud-stream-kafka/src/main/resources/application.yml b/cloud/cloud-stream-kafka/src/main/resources/application.yml
index 97657cca..aa1a0ac8 100644
--- a/cloud/cloud-stream-kafka/src/main/resources/application.yml
+++ b/cloud/cloud-stream-kafka/src/main/resources/application.yml
@@ -11,3 +11,9 @@ spring.cloud:
         destination: graalUppercaseFunction-in-0
       graalLoggingConsumer-in-0:
         destination: graalUppercaseFunction-out-0
+    kafka:
+      bindings:
+        graalSupplier-out-0:
+          producer:
+            # ensures conversion service set on child context
+            send-timeout-expression: '''5m'''
diff --git a/cloud/cloud-stream-rabbit/src/main/resources/application.yml b/cloud/cloud-stream-rabbit/src/main/resources/application.yml
index 3996c555..7f3f3e3e 100644
--- a/cloud/cloud-stream-rabbit/src/main/resources/application.yml
+++ b/cloud/cloud-stream-rabbit/src/main/resources/application.yml
@@ -1,13 +1,34 @@
 spring.main.web-application-type: none
-spring.rabbitmq:
-  host: "${RABBITMQ_HOST:localhost}"
-  port: "${RABBITMQ_PORT_5672:5672}"
-spring.cloud:
-  function:
-    definition: graalSupplier;graalUppercaseFunction;graalLoggingConsumer
-  stream:
-    bindings:
-      graalSupplier-out-0:
-        destination: graalUppercaseFunction-in-0
-      graalLoggingConsumer-in-0:
-        destination: graalUppercaseFunction-out-0
+
+spring:
+  cloud:
+    function:
+      definition: graalSupplier;graalUppercaseFunction;graalLoggingConsumer
+    stream:
+      binders:
+        binder1:
+          type: rabbit
+          environment:
+            spring.rabbitmq:
+              host: "${RABBITMQ_HOST:localhost}"
+              port: "${RABBITMQ_PORT_5672:5672}"
+        binder2:
+          type: rabbit
+          environment:
+            spring.rabbitmq:
+              host: "${RABBITMQ_HOST:localhost}"
+              port: "${RABBITMQ_PORT_5672:5672}"
+      default-binder: binder1
+      bindings:
+        graalSupplier-out-0:
+          destination: graalUppercaseFunction-in-0
+          binder: binder1
+        graalLoggingConsumer-in-0:
+          destination: graalUppercaseFunction-out-0
+          binder: binder2
+      rabbit:
+        bindings:
+          graalSupplier-out-0:
+            producer:
+              # ensures conversion service set on child context
+              routing-key-expression: '''events.in'''