feat: XmlBeanDefinitionBuilder setPropertyReferenceIfAttributeDefined()

Author: boolivar

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

@@ -10,6 +10,7 @@
 import java.util.function.Consumer;
 
 import static org.springframework.core.Conventions.attributeNameToPropertyName;
+import static org.springframework.integration.config.xml.IntegrationNamespaceUtils.setReferenceIfAttributeDefined;
 import static org.springframework.integration.config.xml.IntegrationNamespaceUtils.setValueIfAttributeDefined;
 
 public class XmlBeanDefinitionBuilder {
@@ -49,23 +50,33 @@ public XmlBeanDefinitionBuilder addConstructorArgValue(String attributeName) {
         return this;
     }
 
-    public XmlBeanDefinitionBuilder setPropertyValue(String attributeName) {
-        builder.addPropertyValue(attributeNameToPropertyName(attributeName), new TypedStringValue(element.getAttribute(attributeName)));
+    public XmlBeanDefinitionBuilder setPropertyReference(String attributeName) {
+        builder.addPropertyReference(attributeNameToPropertyName(attributeName), element.getAttribute(attributeName));
         return this;
     }
 
-    public XmlBeanDefinitionBuilder setPropertyValue(String propertyName, String attributeName) {
-        builder.addPropertyValue(propertyName, new TypedStringValue(element.getAttribute(attributeName)));
+    public XmlBeanDefinitionBuilder setPropertyReference(String propertyName, String attributeName) {
+        builder.addPropertyReference(propertyName, element.getAttribute(attributeName));
         return this;
     }
 
-    public XmlBeanDefinitionBuilder setPropertyReference(String attributeName) {
-        builder.addPropertyReference(attributeNameToPropertyName(attributeName), element.getAttribute(attributeName));
+    public XmlBeanDefinitionBuilder setPropertyReferenceIfAttributeDefined(String attributeName) {
+        setReferenceIfAttributeDefined(builder, element, attributeName);
         return this;
     }
 
-    public XmlBeanDefinitionBuilder setPropertyReference(String propertyName, String attributeName) {
-        builder.addPropertyReference(propertyName, element.getAttribute(attributeName));
+    public XmlBeanDefinitionBuilder setPropertyReferenceIfAttributeDefined(String propertyName, String attributeName) {
+        setReferenceIfAttributeDefined(builder, element, attributeName, propertyName);
+        return this;
+    }
+
+    public XmlBeanDefinitionBuilder setPropertyValue(String attributeName) {
+        builder.addPropertyValue(attributeNameToPropertyName(attributeName), new TypedStringValue(element.getAttribute(attributeName)));
+        return this;
+    }
+
+    public XmlBeanDefinitionBuilder setPropertyValue(String propertyName, String attributeName) {
+        builder.addPropertyValue(propertyName, new TypedStringValue(element.getAttribute(attributeName)));
         return this;
     }
 

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

@@ -45,10 +45,13 @@ void testProperties() {
         var def = builder
             .addConstructorArgValue("value-property")
             .addConstructorArgReference("ref-property")
-            .setPropertyValue("value-property")
-            .setPropertyValue("property", "value-property")
             .setPropertyReference("ref-property")
             .setPropertyReference("ref", "ref-property")
+            .setPropertyReferenceIfAttributeDefined("undefinedRef")
+            .setPropertyReferenceIfAttributeDefined("definedRef", "ref-property")
+            .setPropertyReferenceIfAttributeDefined("undefinedRef", "undefined-ref")
+            .setPropertyValue("value-property")
+            .setPropertyValue("property", "value-property")
             .setPropertyValueIfAttributeDefined("defined-property")
             .setPropertyValueIfAttributeDefined("undefined-property")
             .setPropertyValueIfAttributeDefined("expected", "defined-property")
@@ -63,10 +66,11 @@ void testProperties() {
 
         assertThat(def.getPropertyValues())
             .containsOnly(
-                new PropertyValue("valueProperty", new TypedStringValue("value")),
-                new PropertyValue("property", new TypedStringValue("value")),
                 new PropertyValue("refProperty", new RuntimeBeanReference("bean")),
                 new PropertyValue("ref", new RuntimeBeanReference("bean")),
+                new PropertyValue("definedRef", new RuntimeBeanReference("bean")),
+                new PropertyValue("valueProperty", new TypedStringValue("value")),
+                new PropertyValue("property", new TypedStringValue("value")),
                 new PropertyValue("definedProperty", new TypedStringValue("test")),
                 new PropertyValue("expected", new TypedStringValue("test"))
             );