refactor: ValueFactory

Author: boolivar

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

@@ -1,6 +1,5 @@
 package org.springframework.integration.aws.config.xml;
 
-import org.springframework.beans.factory.config.TypedStringValue;
 import org.springframework.beans.factory.xml.ParserContext;
 import org.springframework.integration.aws.outbound.S3MessageHandler;
 import org.w3c.dom.Element;
@@ -16,7 +15,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, new ExpressionBeanDefinitionFactory()::createBeanDefinition)
+            .addExclusiveConstructorArgValue("bucket", "bucket-expression", ValueFactory.typedString(), ValueFactory.expressionBean())
             .configure(def -> def.addConstructorArgValue(produceReply))
             .setPropertyOrExpressionIfAttributeDefined("key")
             .setPropertyOrExpressionIfAttributeDefined("destination-bucket")

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

@@ -16,7 +16,7 @@ protected AbstractBeanDefinition doParse(Element element, ParserContext parserCo
             .setProperty("handle-notification-status")
             .setPropertyIfAttributeDefined("send-timeout", "requestTimeout")
             .setPropertyIfAttributeDefined("error-channel", "errorChannelName")
-            .setPropertyIfAttributeDefined("payload-expression", "payloadExpression", new ExpressionBeanDefinitionFactory()::createBeanDefinition)
+            .setPropertyIfAttributeDefined("payload-expression", "payloadExpression", ValueFactory.expressionBean())
             .build();
     }
 }

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

@@ -0,0 +1,35 @@
+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.integration.config.ExpressionFactoryBean;
+
+import java.util.function.BiConsumer;
+import java.util.function.Function;
+
+public interface ValueFactory<T> extends Function<String, T> {
+
+    static ValueFactory<TypedStringValue> typedString() {
+        return TypedStringValue::new;
+    }
+
+    static ValueFactory<TypedStringValue> typedString(Class<?> type) {
+        return value -> new TypedStringValue(value, type);
+    }
+
+    static ValueFactory<AbstractBeanDefinition> expressionBean() {
+        return value -> BeanDefinitionBuilder.genericBeanDefinition(ExpressionFactoryBean.class)
+            .addConstructorArgValue(value)
+            .applyCustomizers(def -> def.setAutowireCandidate(false))
+            .getBeanDefinition();
+    }
+
+    default BiConsumer<BeanDefinitionBuilder, String> propertyValue(String name) {
+        return (builder, value) -> builder.addPropertyValue(name, apply(value));
+    }
+
+    default BiConsumer<BeanDefinitionBuilder, String> constructorValue(String name) {
+        return (builder, value) -> builder.addConstructorArgValue(apply(value));
+    }
+}

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

@@ -1,6 +1,5 @@
 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;
@@ -47,7 +46,7 @@ public XmlBeanDefinitionBuilder addConstructorArgReference(String attributeName)
     }
 
     public XmlBeanDefinitionBuilder addConstructorArgValue(String attributeName) {
-        builder.addConstructorArgValue(new TypedStringValue(element.getAttribute(attributeName)));
+        builder.addConstructorArgValue(ValueFactory.typedString().apply(element.getAttribute(attributeName)));
         return this;
     }
 
@@ -83,7 +82,7 @@ public XmlBeanDefinitionBuilder setProperty(String attributeName) {
     }
 
     public XmlBeanDefinitionBuilder setProperty(String attributeName, String propertyName) {
-        return setProperty(attributeName, propertyName, TypedStringValue::new);
+        return setProperty(attributeName, propertyName, ValueFactory.typedString());
     }
 
     public XmlBeanDefinitionBuilder setProperty(String attributeName, String propertyName, Function<String, ?> attributeValueMapper) {
@@ -96,7 +95,7 @@ public XmlBeanDefinitionBuilder setPropertyIfAttributeDefined(String attributeNa
     }
 
     public XmlBeanDefinitionBuilder setPropertyIfAttributeDefined(String attributeName, String propertyName) {
-        return setPropertyIfAttributeDefined(attributeName, propertyName, TypedStringValue::new);
+        return setPropertyIfAttributeDefined(attributeName, propertyName, ValueFactory.typedString());
     }
 
     public XmlBeanDefinitionBuilder setPropertyIfAttributeDefined(String attributeName, String propertyName, Function<String, ?> attributeValueMapper) {
@@ -120,15 +119,15 @@ public XmlBeanDefinitionBuilder setPropertyOrExpressionIfAttributeDefined(String
     }
 
     public XmlBeanDefinitionBuilder setPropertyOrExpressionIfAttributeDefined(String attribute, String expressionAttribute, String property, String expressionProperty) {
-        return setIfExclusiveAttributeDefined(attribute, expressionAttribute, (b, v) -> b.addPropertyValue(property, new TypedStringValue(v)), (b, v) -> b.addPropertyValue(expressionProperty, new ExpressionBeanDefinitionFactory().createBeanDefinition(v)));
+        return setIfExclusiveAttributeDefined(attribute, expressionAttribute, ValueFactory.typedString().propertyValue(property), ValueFactory.expressionBean().propertyValue(expressionProperty));
     }
 
     public XmlBeanDefinitionBuilder setPropertyIfExclusiveAttributeDefined(String attribute1, String attribute2) {
         return setPropertyIfExclusiveAttributeDefined(attribute1, attribute2, attributeNameToPropertyName(attribute1), attributeNameToPropertyName(attribute2));
     }
 
     public XmlBeanDefinitionBuilder setPropertyIfExclusiveAttributeDefined(String attribute1, String attribute2, String property1, String property2) {
-        return setIfExclusiveAttributeDefined(attribute1, attribute2, (b, v) -> b.addPropertyValue(property1, new TypedStringValue(v)), (b, v) -> b.addPropertyValue(property2, new TypedStringValue(v)));
+        return setIfExclusiveAttributeDefined(attribute1, attribute2, ValueFactory.typedString().propertyValue(property1), ValueFactory.typedString().propertyValue(property2));
     }
 
     public XmlBeanDefinitionBuilder setExclusiveAttribute(String attribute1, String attribute2, BiConsumer<BeanDefinitionBuilder, String> arg1, BiConsumer<BeanDefinitionBuilder, String> arg2) {

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

@@ -0,0 +1,35 @@
+package org.springframework.integration.aws.config.xml;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.config.ConstructorArgumentValues.ValueHolder;
+import org.springframework.beans.factory.config.TypedStringValue;
+import org.springframework.integration.config.ExpressionFactoryBean;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.springframework.integration.aws.config.xml.ValueFactory.*;
+
+class ValueFactoryTest {
+
+    @Test
+    void testTypedString() {
+        assertThat(typedString().apply("val"))
+            .isEqualTo(new TypedStringValue("val"));
+    }
+
+    @Test
+    void testTypedTargetString() {
+        assertThat(typedString(ValueFactoryTest.class).apply("test"))
+            .isEqualTo(new TypedStringValue("test", ValueFactoryTest.class));
+    }
+
+    @Test
+    void testExpressionBean() {
+        var bean = expressionBean().apply("exp");
+
+        assertThat(bean.getBeanClass())
+            .isSameAs(ExpressionFactoryBean.class);
+        assertThat(bean.getConstructorArgumentValues().getIndexedArgumentValues().values())
+            .extracting(ValueHolder::getValue)
+            .containsOnly("exp");
+    }
+}

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

@@ -112,7 +112,7 @@ void testExclusiveProperties() {
                 new PropertyValue("aExpectedProperty", new TypedStringValue("a")),
                 new PropertyValue("bExpectedProperty", new TypedStringValue("b")),
                 new PropertyValue("testProperty", new TypedStringValue("c")),
-                new PropertyValue("testExpression", new ExpressionBeanDefinitionFactory().createBeanDefinition("d"))
+                new PropertyValue("testExpression", ValueFactory.expressionBean().apply("d"))
             );
     }