feat: S3OutboundGatewayParser

Author: boolivar

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

@@ -20,8 +20,8 @@ public XmlBeanDefinitionBuilder parse(Element element, ParserContext parserConte
             .addExclusiveConstructorArgValue("bucket", "bucket-expression", ValueFactory.typedString(), ValueFactory.expressionBean())
             .configure(def -> def.addConstructorArgValue(produceReply))
             .setPropertyIfAttributeDefined("async")
-            .setPropertyIfAttributeDefined("send-timeout")
-            .setPropertyIfAttributeDefined("output-channel", "outputChannelName")
+            .setPropertyIfAttributeDefined("reply-channel", "outputChannelName")
+            .setPropertyIfAttributeDefined("reply-timeout", "sendTimeout")
             .setPropertyOrExpressionIfAttributeDefined("key")
             .setPropertyOrExpressionIfAttributeDefined("destination-bucket")
             .setPropertyOrExpressionIfAttributeDefined("destination-key")

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

@@ -0,0 +1,22 @@
+package org.springframework.integration.aws.config.xml.parsers;
+
+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)
+            .getBeanDefinitionBuilder()
+            ;
+    }
+}

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

@@ -1,7 +1,7 @@
 s3-inbound-channel-adapter: org.springframework.integration.aws.config.xml.parsers.S3InboundChannelAdapterParser
 s3-inbound-streaming-channel-adapter: org.springframework.integration.aws.config.xml.parsers.S3InboundStreamingChannelAdapterParser
 s3-outbound-channel-adapter: org.springframework.integration.aws.config.xml.parsers.S3OutboundChannelAdapterParser
-s3-outbound-gateway: org.springframework.integration.aws.support.config.xml.parsers.S3OutboundGatewayParser
+s3-outbound-gateway: org.springframework.integration.aws.config.xml.parsers.S3OutboundGatewayParser
 kcl-message-driven-channel-adapter: org.springframework.integration.aws.config.xml.parsers.KclMessageDrivenChannelAdapterParser
 kinesis-message-driven-channel-adapter: org.springframework.integration.aws.config.xml.parsers.KinesisMessageDrivenChannelAdapterParser
 kinesis-outbound-channel-adapter: org.springframework.integration.aws.config.xml.parsers.KinesisOutboundChannelAdapterParser

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

@@ -10,9 +10,9 @@
 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.S3OutboundChannelAdapterParser;
+import org.springframework.integration.aws.config.xml.parsers.S3OutboundGatewayParser;
 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.S3OutboundGatewayParser;
 import org.springframework.integration.aws.support.config.xml.parsers.SnsInboundChannelAdapterParser;
 import org.springframework.integration.aws.support.config.xml.parsers.SnsOutboundChannelAdapterParser;
 

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

@@ -0,0 +1,67 @@
+package org.springframework.integration.aws.config.xml.parsers;
+
+import org.bool.junit.mockito.inline.ConstructionMock;
+
+import org.assertj.core.api.InstanceOfAssertFactories;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mock;
+import org.mockito.MockedConstruction.Context;
+import org.springframework.integration.aws.outbound.S3MessageHandler;
+import org.springframework.integration.aws.outbound.S3MessageHandler.Command;
+import org.springframework.integration.channel.DirectChannel;
+import org.springframework.messaging.Message;
+import software.amazon.awssdk.services.s3.S3AsyncClient;
+import software.amazon.awssdk.services.s3.model.PutObjectRequest;
+
+import java.util.function.BiConsumer;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class S3OutboundGatewayParserTest extends ParserTestBase {
+
+    @Mock
+    private S3AsyncClient s3Client;
+
+    @Mock
+    private BiConsumer<PutObjectRequest.Builder, Message<?>> uploadMetadataProvider;
+
+    @ConstructionMock(S3MessageHandler.class)
+    @Test
+    void testMessageHandler() {
+        registerBean("sss", S3AsyncClient.class, s3Client);
+        registerBean("ump", BiConsumer.class, uploadMetadataProvider);
+        registerBean("rq", DirectChannel.class, new DirectChannel());
+
+        var handler = loadBean(S3MessageHandler.class, """
+            <int-aws:s3-outbound-gateway
+                    id="s3gw"
+                    s3="sss"
+                    async="#{true}"
+                    bucket="#{'bkt'}"
+                    command="#{'COPY'}"
+                    key-expression="key.exp"
+                    destination-key-expression="dest.key.exp"
+                    destination-bucket-expression="dest.bkt.exp"
+                    order="#{5}"
+                    request-channel="rq"
+                    reply-channel="rpl"
+                    reply-timeout="#{50}"
+                    upload-metadata-provider="ump"/>
+            """);
+
+        verify(handler).setAsync(true);
+        verify(handler).setCommand(Command.COPY);
+        verify(handler).setKeyExpression(argThat(e -> e.getExpressionString().equals("key.exp")));
+        verify(handler).setDestinationKeyExpression(argThat(e -> e.getExpressionString().equals("dest.key.exp")));
+        verify(handler).setDestinationBucketExpression(argThat(e -> e.getExpressionString().equals("dest.bkt.exp")));
+        verify(handler).setOrder(5);
+        verify(handler).setSendTimeout(50L);
+        verify(handler).setOutputChannelName("rpl");
+        verify(handler).setUploadMetadataProvider(uploadMetadataProvider);
+    }
+
+    void testMessageHandler(S3MessageHandler mock, Context context) {
+        assertThat(context.arguments()).asInstanceOf(InstanceOfAssertFactories.LIST)
+            .contains(s3Client, "bkt", true);
+    }
+}