feat: SnsInboundChannelAdapterParser implementation

Author: boolivar

int-aws-support/build.gradle

@@ -10,7 +10,9 @@ dependencies {
     implementation "org.springframework:spring-beans"
     implementation "org.springframework.integration:spring-integration-aws"
 
-    compileOnly "io.awspring.cloud:spring-cloud-aws-sqs"
     compileOnly "io.awspring.cloud:spring-cloud-aws-s3"
+    compileOnly "io.awspring.cloud:spring-cloud-aws-sns"
+    compileOnly "io.awspring.cloud:spring-cloud-aws-sqs"
     compileOnly "org.springframework.integration:spring-integration-file"
+    compileOnly "org.springframework.integration:spring-integration-http"
 }

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

@@ -0,0 +1,15 @@
+package org.springframework.integration.aws.config.xml;
+
+import org.springframework.beans.factory.support.AbstractBeanDefinition;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.integration.config.ExpressionFactoryBean;
+
+public class ExpressionBeanDefinitionFactory {
+
+    public AbstractBeanDefinition createBeanDefinition(String value) {
+        return BeanDefinitionBuilder.genericBeanDefinition(ExpressionFactoryBean.class)
+            .addConstructorArgValue(value)
+            .applyCustomizers(def -> def.setAutowireCandidate(false))
+            .getBeanDefinition();
+    }
+}

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

@@ -1,11 +1,8 @@
 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.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.integration.aws.outbound.S3MessageHandler;
-import org.springframework.integration.config.ExpressionFactoryBean;
 import org.w3c.dom.Element;
 
 public class S3MessageHandlerParser {
@@ -19,7 +16,7 @@ public S3MessageHandlerParser(boolean produceReply) {
     public XmlBeanDefinitionBuilder parse(Element element, ParserContext parserContext) {
         return XmlBeanDefinitionBuilder.newInstance(element, parserContext, S3MessageHandler.class)
             .addExclusiveConstructorArgReference("s3", "transfer-manager")
-            .addExclusiveConstructorArgValue("bucket", "bucket-expression", TypedStringValue::new, this::expression)
+            .addExclusiveConstructorArgValue("bucket", "bucket-expression", TypedStringValue::new, new ExpressionBeanDefinitionFactory()::createBeanDefinition)
             .configure(def -> def.addConstructorArgValue(produceReply))
             .setPropertyValueIfAttributeDefined("key-expression")
             .setPropertyValueIfAttributeDefined("destination-bucket-expression")
@@ -28,11 +25,4 @@ public XmlBeanDefinitionBuilder parse(Element element, ParserContext parserConte
             .setPropertyReferenceIfAttributeDefined("upload-metadata-provider")
             ;
     }
-
-    private AbstractBeanDefinition expression(String value) {
-        return BeanDefinitionBuilder.genericBeanDefinition(ExpressionFactoryBean.class)
-            .addConstructorArgValue(value)
-            .applyCustomizers(def -> def.setAutowireCandidate(false))
-            .getBeanDefinition();
-    }
 }

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

@@ -0,0 +1,22 @@
+package org.springframework.integration.aws.config.xml;
+
+import org.springframework.beans.factory.support.AbstractBeanDefinition;
+import org.springframework.beans.factory.xml.ParserContext;
+import org.springframework.integration.aws.inbound.SnsInboundChannelAdapter;
+import org.springframework.integration.config.xml.AbstractChannelAdapterParser;
+import org.w3c.dom.Element;
+
+public class SnsInboundChannelAdapterParser extends AbstractChannelAdapterParser {
+
+    @Override
+    protected AbstractBeanDefinition doParse(Element element, ParserContext parserContext, String channelName) {
+        return XmlBeanDefinitionBuilder.newInstance(element, parserContext, SnsInboundChannelAdapter.class)
+            .addConstructorArgReference("sns")
+            .addConstructorArgValue("path")
+            .setPropertyValue("handle-notification-status")
+            .setPropertyValueIfAttributeDefined("requestTimeout", "send-timeout")
+            .setPropertyValueIfAttributeDefined("errorChannelName", "error-channel")
+            .setPropertyValueIfAttributeDefined("payloadExpression", "payload-expression", new ExpressionBeanDefinitionFactory()::createBeanDefinition)
+            .build();
+    }
+}

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

@@ -113,6 +113,14 @@ public XmlBeanDefinitionBuilder setPropertyValueIfAttributeDefined(String proper
         return this;
     }
 
+    public XmlBeanDefinitionBuilder setPropertyValueIfAttributeDefined(String propertyName, String attributeName, Function<String, ?> attributeValueMapper) {
+        var value = element.getAttribute(attributeName);
+        if (StringUtils.hasText(value)) {
+            builder.addPropertyValue(propertyName, attributeValueMapper.apply(value));
+        }
+        return this;
+    }
+
     public XmlBeanDefinitionBuilder setExpressionValueIfAttributeDefined(String attribute) {
         return setPropertyValueIfExclusiveAttributeDefined(attribute, attribute + "-expression", attributeNameToPropertyName(attribute), attributeNameToPropertyName(attribute + "-expression-string"));
     }

int-aws-support/src/main/resources/org/springframework/integration/aws/config/xml/element-parser.mapping

@@ -3,4 +3,5 @@ s3-inbound-streaming-channel-adapter: org.springframework.integration.aws.config
 s3-outbound-channel-adapter: org.springframework.integration.aws.config.xml.S3OutboundChannelAdapterParser
 s3-outbound-gateway: org.springframework.integration.aws.config.xml.S3OutboundGatewayParser
 sqs-outbound-channel-adapter: org.springframework.integration.aws.config.xml.SqsOutboundChannelAdapterParser
-sqs-message-driven-channel-adapter: org.springframework.integration.aws.config.xml.SqsMessageDrivenChannelAdapterParser
+sqs-message-driven-channel-adapter: org.springframework.integration.aws.config.xml.SqsMessageDrivenChannelAdapterParser
+sns-inbound-channel-adapter: org.springframework.integration.aws.config.xml.SnsInboundChannelAdapterParser

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

@@ -21,6 +21,7 @@ void test() {
             .hasEntrySatisfying("s3-inbound-streaming-channel-adapter", instanceOf(S3InboundStreamingChannelAdapterParser.class))
             .hasEntrySatisfying("s3-outbound-channel-adapter", instanceOf(S3OutboundChannelAdapterParser.class))
             .hasEntrySatisfying("s3-outbound-gateway", instanceOf(S3OutboundGatewayParser.class))
+            .hasEntrySatisfying("sns-inbound-channel-adapter", instanceOf(SnsInboundChannelAdapterParser.class))
             ;
     }