test: SqsOutboundChannelAdapterParserTest

Author: boolivar

int-aws-support/src/main/java/org/springframework/integration/aws/config/xml/SqsOutboundChannelAdapterParser.java

@@ -1,5 +1,6 @@
 package org.springframework.integration.aws.config.xml;
 
+import org.springframework.beans.factory.config.TypedStringValue;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.integration.aws.outbound.SqsMessageHandler;
@@ -19,17 +20,18 @@ protected AbstractBeanDefinition parseConsumer(Element element, ParserContext pa
             .setExpressionValueIfAttributeDefined("message-group-id")
             .setExpressionValueIfAttributeDefined("message-deduplication-id")
             .setExpressionValueIfAttributeDefined("send-timeout")
-            .setPropertyReference("outputChannelName", "success-channel")
+            .setPropertyReferenceIfAttributeDefined("message-converter")
+            .setPropertyReferenceIfAttributeDefined("outputChannelName", "success-channel")
             ;
 
         if (element.hasAttribute("sync")) {
             var sync = element.getAttribute("sync");
             if ("true".equalsIgnoreCase(sync)) {
-                builder.getBeanDefinitionBuilder().addPropertyValue("async", "false");
+                builder.getBeanDefinitionBuilder().addPropertyValue("async", new TypedStringValue("false"));
             } else if ("false".equalsIgnoreCase(sync)) {
-                builder.getBeanDefinitionBuilder().addPropertyValue("async", "true");
+                builder.getBeanDefinitionBuilder().addPropertyValue("async", new TypedStringValue("true"));
             } else {
-                builder.error("expected boolean for sync attribute");
+                builder.error("expected boolean for 'sync' attribute");
             }
         }
 

int-aws-support/src/test/java/org/springframework/integration/aws/config/xml/SqsOutboundChannelAdapterParserTest.java

@@ -0,0 +1,46 @@
+package org.springframework.integration.aws.config.xml;
+
+import org.assertj.core.api.Condition;
+import org.assertj.core.api.InstanceOfAssertFactories;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.PropertyValue;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.config.RuntimeBeanReference;
+import org.springframework.beans.factory.config.TypedStringValue;
+import org.springframework.beans.factory.support.BeanDefinitionRegistry;
+import org.springframework.beans.factory.support.SimpleBeanDefinitionRegistry;
+import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
+import org.springframework.integration.aws.outbound.SqsMessageHandler;
+
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class SqsOutboundChannelAdapterParserTest {
+
+    private final BeanDefinitionRegistry registry = new SimpleBeanDefinitionRegistry();
+
+    private final XmlBeanDefinitionReader xmlBeanDefinitionReader = new XmlBeanDefinitionReader(registry);
+
+    @Test
+    void testReader() {
+        int beansLoaded = xmlBeanDefinitionReader.loadBeanDefinitions("classpath:/sqs-outbound-channel-adapter.xml");
+        var beans = Stream.of(registry.getBeanDefinitionNames()).collect(Collectors.toMap(k -> k, registry::getBeanDefinition));
+
+        assertThat(beans)
+            .hasSize(beansLoaded)
+            .containsKey("adapter");
+
+        var def = beans.values().stream()
+            .filter(bd -> bd.getBeanClassName().equals(SqsMessageHandler.class.getName()))
+            .findAny().orElseThrow();
+        
+        assertThat(def)
+            .matches(bd -> bd.getConstructorArgumentValues().getArgumentValue(0, null).getValue().equals(new RuntimeBeanReference("sqsClient")))
+            .extracting(BeanDefinition::getPropertyValues)
+                .matches(properties -> properties.get("async").equals(new TypedStringValue("false")), "async")
+                .matches(properties -> properties.get("messageConverter").equals(new RuntimeBeanReference("msgConv")), "message converter")
+            ;
+    }
+}

int-aws-support/src/test/resources/sqs-outbound-channel-adapter.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:int-aws="http://www.springframework.org/schema/integration/aws"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans
+        https://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/integration/aws
+        https://www.springframework.org/schema/integration/aws/spring-integration-aws.xsd">
+
+    <int-aws:sqs-outbound-channel-adapter
+        id="adapter"
+        sqs="sqsClient"
+        sync="true"
+        message-converter="msgConv"
+        error-message-strategy="emb"/>
+</beans>