refactor: KclMessageDrivenChannelAdapterParser reference classes for KclMessageDrivenChannelAdapter constructor

Author: boolivar

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

@@ -9,21 +9,19 @@
 import org.springframework.integration.config.xml.AbstractChannelAdapterParser;
 import org.springframework.util.StringUtils;
 import org.w3c.dom.Element;
-
-import java.util.stream.Stream;
+import software.amazon.awssdk.services.cloudwatch.CloudWatchAsyncClient;
+import software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient;
+import software.amazon.awssdk.services.kinesis.KinesisAsyncClient;
 
 public class KclMessageDrivenChannelAdapterParser extends AbstractChannelAdapterParser {
 
-    private final String[][] constructorAttrs = {
-        { "kinesis-client", "software.amazon.awssdk.services.kinesis.KinesisAsyncClient" },
-        { "cloud-watch-client", "software.amazon.awssdk.services.cloudwatch.CloudWatchAsyncClient" },
-        { "dynamo-db-client", "software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient" }
-    };
-
     @Override
     protected AbstractBeanDefinition doParse(Element element, ParserContext parserContext, String channelName) {
         return XmlBeanDefinitionBuilder.newInstance(element, parserContext, KclMessageDrivenChannelAdapter.class)
-            .configure(builder -> addConstructorArgs(builder, element))
+            .configure(builder -> builder
+                .addConstructorArgValue(arg(element, "kinesis-client", KinesisAsyncClient.class))
+                .addConstructorArgValue(arg(element, "cloud-watch-client", CloudWatchAsyncClient.class))
+                .addConstructorArgValue(arg(element, "dynamo-db-client", DynamoDbAsyncClient.class)))
             .addConstructorArgValue("streams")
             .setPropertyIfAttributeDefined("error-channel", "errorChannelName")
             .setPropertyIfAttributeDefined("worker-id")
@@ -50,15 +48,8 @@ protected AbstractBeanDefinition doParse(Element element, ParserContext parserCo
             .getBeanDefinition();
     }
 
-    private void addConstructorArgs(BeanDefinitionBuilder builder, Element element) {
-        if (Stream.of(constructorAttrs).map(a -> element.getAttribute(a[0])).anyMatch(StringUtils::hasText)) {
-            for (var a : constructorAttrs) {
-                builder.addConstructorArgValue(arg(element.getAttribute(a[0]), a[1]));
-            }
-        }
-    }
-
-    private Object arg(String ref, String beanClass) {
+    private Object arg(Element element, String attr, Class<?> beanClass) {
+        var ref = element.getAttribute(attr);
         return StringUtils.hasText(ref)
             ? new RuntimeBeanReference(ref)
             : BeanDefinitionBuilder.genericBeanDefinition(beanClass)

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

@@ -25,6 +25,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+@StaticMock({KinesisAsyncClient.class, CloudWatchAsyncClient.class, DynamoDbAsyncClient.class})
 @ConstructionMock(KclMessageDrivenChannelAdapter.class)
 class KclMessageDrivenChannelAdapterParserTest extends ParserTestBase {
 
@@ -53,7 +54,15 @@ class KclMessageDrivenChannelAdapterParserTest extends ParserTestBase {
     private InitialPositionInStreamExtended streamInitialSequence;
 
     @Test
-    void testDefaults(MockedConstruction<KclMessageDrivenChannelAdapter> mocked) {
+    void testDefaults(MockedConstruction<KclMessageDrivenChannelAdapter> mocked,
+            MockedStatic<KinesisAsyncClient> kinesisClientMock,
+            MockedStatic<CloudWatchAsyncClient> cloudWatchMock,
+            MockedStatic<DynamoDbAsyncClient> dynamoDbMock) {
+
+        kinesisClientMock.when(KinesisAsyncClient::create).thenReturn(kinesisClient);
+        dynamoDbMock.when(DynamoDbAsyncClient::create).thenReturn(dynamoDbClient);
+        cloudWatchMock.when(CloudWatchAsyncClient::create).thenReturn(cloudWatchClient);
+
         parse("""
                 <int-aws:kcl-message-driven-channel-adapter streams="s"
                         channel="c"/>
@@ -66,14 +75,13 @@ void testDefaults(MockedConstruction<KclMessageDrivenChannelAdapter> mocked) {
     }
 
     void testDefaults(KclMessageDrivenChannelAdapter mock, Context context) {
-        assertThat(context.arguments()).singleElement()
-            .isEqualTo(new String[] {"s"});
+        verifyConstructorArgs(mock, context);
     }
 
-    @StaticMock({CloudWatchAsyncClient.class, DynamoDbAsyncClient.class})
     @Test
     void testKinesisClientConfig(MockedConstruction<KclMessageDrivenChannelAdapter> mocked,
-            MockedStatic<CloudWatchAsyncClient> cloudWatchMock, MockedStatic<DynamoDbAsyncClient> dynamoDbMock) {
+            MockedStatic<CloudWatchAsyncClient> cloudWatchMock,
+            MockedStatic<DynamoDbAsyncClient> dynamoDbMock) {
         registerBean("kc", KinesisAsyncClient.class, kinesisClient);
 
         dynamoDbMock.when(DynamoDbAsyncClient::create).thenReturn(dynamoDbClient);
@@ -92,8 +100,7 @@ void testKinesisClientConfig(MockedConstruction<KclMessageDrivenChannelAdapter>
     }
 
     void testKinesisClientConfig(KclMessageDrivenChannelAdapter mock, Context context) {
-        assertThat(context.arguments()).asInstanceOf(InstanceOfAssertFactories.LIST)
-            .contains(kinesisClient, cloudWatchClient, dynamoDbClient);
+        verifyConstructorArgs(mock, context);
     }
 
     @Test
@@ -160,8 +167,12 @@ void testAdapter() {
         verify(adapter).setWorkerId("wid");
     }
 
-    void testParser(KclMessageDrivenChannelAdapter mock, Context context) {
+    void testAdapter(KclMessageDrivenChannelAdapter mock, Context context) {
+        verifyConstructorArgs(mock, context);
+    }
+
+    void verifyConstructorArgs(KclMessageDrivenChannelAdapter mock, Context context) {
         assertThat(context.arguments()).asInstanceOf(InstanceOfAssertFactories.LIST)
-            .contains(new String[] {"s"}, kinesisClient, cloudWatchClient, dynamoDbClient);
+            .containsExactly(kinesisClient, cloudWatchClient, dynamoDbClient, new String[] {"s"});
     }
 }