DATAGEODE-197 - Add unit tests asserting the addition of AsyncEventQueues (AEQ) and GatewaySenders to Regions of various types (e.g. LOCAL, PARTITION, REPLICATE as well as Templates) using objects and identifiers.

src/main/java/org/springframework/data/gemfire/PeerRegionFactoryBean.java

@@ -57,6 +57,7 @@ import org.springframework.core.io.Resource;
 import org.springframework.data.gemfire.client.ClientRegionFactoryBean;
 import org.springframework.data.gemfire.eviction.EvictingRegionFactoryBean;
 import org.springframework.data.gemfire.expiration.ExpiringRegionFactoryBean;
+import org.springframework.data.gemfire.util.CollectionUtils;
 import org.springframework.data.gemfire.util.RegionUtils;
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
@@ -410,9 +411,13 @@ public abstract class PeerRegionFactoryBean<K, V> extends ConfigurableRegionFact
 
 		if (regionAttributes != null) {
 
-			// NOTE: this validation may not be strictly necessary depending on how the RegionAttributes were "created",
+			// NOTE: this validation may not be strictly necessary depending on how the RegionAttributes were "created".
 			validateRegionAttributes(regionAttributes);
 
+			CollectionUtils.nullSafeSet(regionAttributes.getAsyncEventQueueIds()).stream()
+				.filter(StringUtils::hasText)
+				.forEach(regionFactory::addAsyncEventQueueId);
+
 			regionFactory.setCloningEnabled(regionAttributes.getCloningEnabled());
 			regionFactory.setCompressor(regionAttributes.getCompressor());
 			regionFactory.setConcurrencyChecksEnabled(regionAttributes.getConcurrencyChecksEnabled());
@@ -430,6 +435,10 @@ public abstract class PeerRegionFactoryBean<K, V> extends ConfigurableRegionFact
 				regionFactory.setEvictionAttributes(regionAttributes.getEvictionAttributes());
 			}
 
+			CollectionUtils.nullSafeSet(regionAttributes.getGatewaySenderIds()).stream()
+				.filter(StringUtils::hasText)
+				.forEach(regionFactory::addGatewaySenderId);
+
 			regionFactory.setIgnoreJTA(regionAttributes.getIgnoreJTA());
 			regionFactory.setIndexMaintenanceSynchronous(regionAttributes.getIndexMaintenanceSynchronous());
 			regionFactory.setInitialCapacity(regionAttributes.getInitialCapacity());

src/main/java/org/springframework/data/gemfire/RegionAttributesFactoryBean.java

@@ -13,13 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.data.gemfire;
 
+import java.util.Arrays;
+
 import org.apache.geode.cache.AttributesFactory;
 import org.apache.geode.cache.RegionAttributes;
+
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.InitializingBean;
+import org.springframework.data.gemfire.util.ArrayUtils;
+import org.springframework.util.StringUtils;
 
 /**
  * Spring-friendly bean for creating {@link RegionAttributes}. Eliminates the need of using a XML 'factory-method' tag.
@@ -32,10 +36,10 @@ import org.springframework.beans.factory.InitializingBean;
  * @see org.apache.geode.cache.RegionAttributes
  */
 @SuppressWarnings({ "unused" })
-public class RegionAttributesFactoryBean extends AttributesFactory
+public class RegionAttributesFactoryBean<K, V> extends AttributesFactory<K, V>
 		implements FactoryBean<RegionAttributes>, InitializingBean {
 
-	private RegionAttributes regionAttributes;
+	private RegionAttributes<K, V> regionAttributes;
 
 	@Override
 	public void afterPropertiesSet() throws Exception {
@@ -43,13 +47,16 @@ public class RegionAttributesFactoryBean extends AttributesFactory
 	}
 
 	@Override
-	public RegionAttributes getObject() throws Exception {
+	public RegionAttributes<K, V> getObject() throws Exception {
 		return this.regionAttributes;
 	}
 
 	@Override
 	public Class<?> getObjectType() {
-		return this.regionAttributes != null ? this.regionAttributes.getClass() : RegionAttributes.class;
+
+		return this.regionAttributes != null
+			? this.regionAttributes.getClass()
+			: RegionAttributes.class;
 	}
 
 	@Override
@@ -57,7 +64,23 @@ public class RegionAttributesFactoryBean extends AttributesFactory
 		return true;
 	}
 
+	public void setAsyncEventQueueIds(String[] asyncEventQueueIds) {
+
+		Arrays.stream(ArrayUtils.nullSafeArray(asyncEventQueueIds, String.class))
+			.filter(StringUtils::hasText)
+			.map(String::trim)
+			.forEach(this::addAsyncEventQueueId);
+	}
+
 	public void setIndexUpdateType(IndexMaintenancePolicyType indexUpdateType) {
 		indexUpdateType.setIndexMaintenance(this);
 	}
+
+	public void setGatewaySenderIds(String[] gatewaySenderIds) {
+
+		Arrays.stream(ArrayUtils.nullSafeArray(gatewaySenderIds, String.class))
+			.filter(StringUtils::hasText)
+			.map(String::trim)
+			.forEach(this::addGatewaySenderId);
+	}
 }

src/main/java/org/springframework/data/gemfire/config/xml/AbstractRegionParser.java

@@ -111,7 +111,9 @@ abstract class AbstractRegionParser extends AbstractSingleBeanDefinitionParser {
 		String resolvedCacheReference = ParsingUtils.resolveCacheReference(element.getAttribute("cache-ref"));
 
 		if (!subRegion) {
+
 			regionBuilder.addPropertyReference("cache", resolvedCacheReference);
+
 			ParsingUtils.setPropertyValue(element, regionBuilder, "close");
 			ParsingUtils.setPropertyValue(element, regionBuilder, "destroy");
 		}

src/main/java/org/springframework/data/gemfire/config/xml/TemplateRegionParser.java

@@ -13,24 +13,28 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.data.gemfire.config.xml;
 
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.data.gemfire.RegionAttributesFactoryBean;
 import org.springframework.data.gemfire.PeerRegionFactoryBean;
+import org.springframework.data.gemfire.RegionAttributesFactoryBean;
+
 import org.w3c.dom.Element;
 
 /**
  * Bean definition parser for <gfe:*-region-template> SDG XML namespace (XSD) elements.
  *
  * @author John Blum
- * @see PeerRegionFactoryBean
- * @see AbstractRegionParser
+ * @see org.springframework.beans.factory.support.BeanDefinitionBuilder
+ * @see org.springframework.beans.factory.xml.ParserContext
+ * @see org.springframework.data.gemfire.PeerRegionFactoryBean
+ * @see org.springframework.data.gemfire.RegionAttributesFactoryBean
+ * @see org.springframework.data.gemfire.config.xml.AbstractRegionParser
+ * @see org.w3c.dom.Element
  * @since 1.5.0
  */
-class TemplateRegionParser extends AbstractRegionParser {
+class TemplateRegionParser extends AbstractPeerRegionParser {
 
 	/**
 	 * {@inheritDoc}
@@ -46,8 +50,9 @@ class TemplateRegionParser extends AbstractRegionParser {
 	@Override
 	protected void doParseRegion(Element element, ParserContext parserContext, BeanDefinitionBuilder builder,
 			boolean subRegion) {
-		BeanDefinitionBuilder regionAttributesBuilder = BeanDefinitionBuilder.genericBeanDefinition(
-			RegionAttributesFactoryBean.class);
+
+		BeanDefinitionBuilder regionAttributesBuilder =
+			BeanDefinitionBuilder.genericBeanDefinition(RegionAttributesFactoryBean.class);
 
 		doParseRegionConfiguration(element, parserContext, builder, regionAttributesBuilder, subRegion);