feat: S3OutboundGatewayParser

Author: boolivar

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

@@ -0,0 +1,38 @@
+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 {
+
+    private final boolean produceReply;
+
+    public S3MessageHandlerParser(boolean produceReply) {
+        this.produceReply = 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)
+            .configure(def -> def.addConstructorArgValue(produceReply))
+            .setPropertyValueIfAttributeDefined("key-expression")
+            .setPropertyValueIfAttributeDefined("destination-bucket-expression")
+            .setPropertyValueIfAttributeDefined("destination-key-expression")
+            .setPropertyValueIfExclusiveAttributeDefined("command", "command-expression")
+            .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/S3OutboundChannelAdapterParser.java

@@ -1,33 +1,14 @@
 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.springframework.integration.config.xml.AbstractOutboundChannelAdapterParser;
 import org.w3c.dom.Element;
 
 public class S3OutboundChannelAdapterParser extends AbstractOutboundChannelAdapterParser {
 
     @Override
     protected AbstractBeanDefinition parseConsumer(Element element, ParserContext parserContext) {
-        return XmlBeanDefinitionBuilder.newInstance(element, parserContext, S3MessageHandler.class)
-            .addExclusiveConstructorArgReference("s3", "transfer-manager")
-            .addExclusiveConstructorArgValue("bucket", "bucket-expression", TypedStringValue::new, this::expression)
-            .setPropertyValueIfAttributeDefined("key-expression")
-            .setPropertyValueIfAttributeDefined("destination-bucket-expression")
-            .setPropertyValueIfAttributeDefined("destination-key-expression")
-            .setPropertyValueIfExclusiveAttributeDefined("command", "command-expression")
-            .setPropertyReferenceIfAttributeDefined("upload-metadata-provider")
-            .build();
+        return new S3MessageHandlerParser(false).parse(element, parserContext).build();
     }
-
-    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/S3OutboundGatewayParser.java

@@ -0,0 +1,24 @@
+package org.springframework.integration.aws.config.xml;
+
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.xml.ParserContext;
+import org.springframework.integration.config.xml.AbstractConsumerEndpointParser;
+import org.w3c.dom.Element;
+
+public class S3OutboundGatewayParser extends AbstractConsumerEndpointParser {
+
+    @Override
+    protected String getInputChannelAttributeName() {
+        return "request-channel";
+    }
+
+    @Override
+    protected BeanDefinitionBuilder parseHandler(Element element, ParserContext parserContext) {
+        return new S3MessageHandlerParser(true)
+            .parse(element, parserContext)
+            .setPropertyValue("outputChannelName", "reply-channel")
+            .setPropertyValue("sendTimeout", "reply-timeout")
+            .getBeanDefinitionBuilder()
+            ;
+    }
+}

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

@@ -1,5 +1,6 @@
 s3-inbound-channel-adapter: org.springframework.integration.aws.config.xml.S3InboundChannelAdapterParser
 s3-inbound-streaming-channel-adapter: org.springframework.integration.aws.config.xml.S3InboundStreamingChannelAdapterParser
 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

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

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