feat(int-aws): SnsInboundChannelAdapterParser, SnsOutboundChannelAdapterParser

Author: boolivar

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

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

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

@@ -6,9 +6,9 @@
 import org.springframework.integration.aws.config.xml.SpringIntegrationAwsNamespaceHandler;
 import org.springframework.integration.aws.config.xml.parsers.S3InboundChannelAdapterParser;
 import org.springframework.integration.aws.config.xml.parsers.S3InboundStreamingChannelAdapterParser;
+import org.springframework.integration.aws.config.xml.parsers.SnsInboundChannelAdapterParser;
 import org.springframework.integration.aws.support.config.xml.parsers.S3OutboundChannelAdapterParser;
 import org.springframework.integration.aws.support.config.xml.parsers.S3OutboundGatewayParser;
-import org.springframework.integration.aws.support.config.xml.parsers.SnsInboundChannelAdapterParser;
 import org.springframework.integration.aws.support.config.xml.parsers.SnsOutboundChannelAdapterParser;
 import org.springframework.integration.aws.support.config.xml.parsers.SqsMessageDrivenChannelAdapterParser;
 import org.springframework.integration.aws.support.config.xml.parsers.SqsOutboundChannelAdapterParser;

int-aws/build.gradle

@@ -2,20 +2,6 @@ plugins {
     id "java-conventions"
 }
 
-sourceSets {
-    main {
-        java {
-            source objects.sourceDirectorySet("aws-support", "aws support classes").tap {
-                srcDir "$rootDir/int-aws-support/src/main/java"
-                setIncludes([
-                    "**/SnsInboundChannelAdapterParser.java",
-                    "**/SnsOutboundChannelAdapterParser.java"
-                ])
-            }
-        }
-    }
-}
-
 dependencies {
     api "org.springframework.integration:spring-integration-aws"
 

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

@@ -1,4 +1,4 @@
-package org.springframework.integration.aws.support.config.xml.parsers;
+package org.springframework.integration.aws.config.xml.parsers;
 
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.xml.ParserContext;

int-aws/src/main/java/org/springframework/integration/aws/config/xml/parsers/SnsOutboundChannelAdapterParser.java

@@ -0,0 +1,26 @@
+package org.springframework.integration.aws.config.xml.parsers;
+
+import org.springframework.beans.factory.support.AbstractBeanDefinition;
+import org.springframework.beans.factory.xml.ParserContext;
+import org.springframework.integration.aws.config.xml.XmlBeanDefinitionBuilder;
+import org.springframework.integration.aws.outbound.SnsMessageHandler;
+import org.springframework.integration.config.xml.AbstractOutboundChannelAdapterParser;
+import org.w3c.dom.Element;
+
+public class SnsOutboundChannelAdapterParser extends AbstractOutboundChannelAdapterParser {
+
+    @Override
+    protected AbstractBeanDefinition parseConsumer(Element element, ParserContext parserContext) {
+        return XmlBeanDefinitionBuilder.newInstance(element, parserContext, SnsMessageHandler.class)
+            .addConstructorArgReference("sns")
+            .setPropertyIfAttributeDefined("async")
+            .setPropertyIfAttributeDefined("output-channel", "outputChannelName")
+            .setPropertyOrExpressionIfAttributeDefined("topic-arn")
+            .setPropertyOrExpressionIfAttributeDefined("subject")
+            .setPropertyOrExpressionIfAttributeDefined("message-group-id")
+            .setPropertyOrExpressionIfAttributeDefined("message-deduplication-id")
+            .setPropertyOrExpressionIfAttributeDefined("body")
+            .setPropertyOrExpressionIfAttributeDefined("send-timeout")
+            .build();
+    }
+}

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

@@ -8,5 +8,5 @@ kinesis-outbound-channel-adapter: org.springframework.integration.aws.config.xml
 kpl-outbound-channel-adapter: org.springframework.integration.aws.config.xml.parsers.KplOutboundChannelAdapterParser
 sqs-outbound-channel-adapter: org.springframework.integration.aws.config.xml.parsers.SqsOutboundChannelAdapterParser
 sqs-message-driven-channel-adapter: org.springframework.integration.aws.config.xml.parsers.SqsMessageDrivenChannelAdapterParser
-sns-inbound-channel-adapter: org.springframework.integration.aws.support.config.xml.parsers.SnsInboundChannelAdapterParser
-sns-outbound-channel-adapter: org.springframework.integration.aws.support.config.xml.parsers.SnsOutboundChannelAdapterParser
+sns-inbound-channel-adapter: org.springframework.integration.aws.config.xml.parsers.SnsInboundChannelAdapterParser
+sns-outbound-channel-adapter: org.springframework.integration.aws.config.xml.parsers.SnsOutboundChannelAdapterParser

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

@@ -11,10 +11,10 @@
 import org.springframework.integration.aws.config.xml.parsers.S3InboundStreamingChannelAdapterParser;
 import org.springframework.integration.aws.config.xml.parsers.S3OutboundChannelAdapterParser;
 import org.springframework.integration.aws.config.xml.parsers.S3OutboundGatewayParser;
+import org.springframework.integration.aws.config.xml.parsers.SnsInboundChannelAdapterParser;
+import org.springframework.integration.aws.config.xml.parsers.SnsOutboundChannelAdapterParser;
 import org.springframework.integration.aws.config.xml.parsers.SqsMessageDrivenChannelAdapterParser;
 import org.springframework.integration.aws.config.xml.parsers.SqsOutboundChannelAdapterParser;
-import org.springframework.integration.aws.support.config.xml.parsers.SnsInboundChannelAdapterParser;
-import org.springframework.integration.aws.support.config.xml.parsers.SnsOutboundChannelAdapterParser;
 
 import static org.assertj.core.api.Assertions.assertThat;