From b4e24d6f8eb904ea3ee7be61f51d9f893d5014d5 Mon Sep 17 00:00:00 2001
From: John Blum <jblum@pivotal.io>
Date: Mon, 1 Jun 2015 19:42:20 -0700
Subject: [PATCH] SGF-398 - Provide early support of Apache Geode (Pivotal
 GemFire OSS).

Fixed the AsyncEventQueueWithListenerIntegrationTest class test case method failures involving GemFire 7.0.1 AEQ configuration attributes, like dispatcher-threads.
---
 .../gemfire/config/AsyncEventQueueParser.java  | 18 +++++++-----------
 .../data/gemfire/config/spring-gemfire-1.7.xsd |  3 +--
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/main/java/org/springframework/data/gemfire/config/AsyncEventQueueParser.java b/src/main/java/org/springframework/data/gemfire/config/AsyncEventQueueParser.java
index 795496da..1bd4213e 100644
--- a/src/main/java/org/springframework/data/gemfire/config/AsyncEventQueueParser.java
+++ b/src/main/java/org/springframework/data/gemfire/config/AsyncEventQueueParser.java
@@ -19,7 +19,6 @@ import org.springframework.beans.factory.config.RuntimeBeanReference;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.data.gemfire.GemfireUtils;
 import org.springframework.data.gemfire.wan.AsyncEventQueueFactoryBean;
 import org.springframework.util.StringUtils;
 import org.springframework.util.xml.DomUtils;
@@ -49,20 +48,17 @@ class AsyncEventQueueParser extends AbstractSingleBeanDefinitionParser {
 		parseCache(element, builder);
 		parseDiskStore(element, builder);
 
+		ParsingUtils.setPropertyValue(element, builder, "enable-batch-conflation", "batchConflationEnabled");
+		ParsingUtils.setPropertyValue(element, builder, "batch-conflation-enabled");
 		ParsingUtils.setPropertyValue(element, builder, "batch-size");
+		ParsingUtils.setPropertyValue(element, builder, "batch-time-interval");
+		ParsingUtils.setPropertyValue(element, builder, "disk-synchronous");
+		ParsingUtils.setPropertyValue(element, builder, "dispatcher-threads");
 		ParsingUtils.setPropertyValue(element, builder, "maximum-queue-memory");
+		ParsingUtils.setPropertyValue(element, builder, "order-policy");
 		ParsingUtils.setPropertyValue(element, builder, "parallel");
 		ParsingUtils.setPropertyValue(element, builder, "persistent");
 
-		if (GemfireUtils.GEMFIRE_VERSION.compareTo("7.0.1") >= 0) {
-			ParsingUtils.setPropertyValue(element, builder, "enable-batch-conflation", "batchConflationEnabled");
-			ParsingUtils.setPropertyValue(element, builder, "batch-conflation-enabled");
-			ParsingUtils.setPropertyValue(element, builder, "batch-time-interval");
-			ParsingUtils.setPropertyValue(element, builder, "disk-synchronous");
-			ParsingUtils.setPropertyValue(element, builder, "dispatcher-threads");
-			ParsingUtils.setPropertyValue(element, builder, "order-policy");
-		}
-
 		ParsingUtils.setPropertyValue(element, builder, NAME_ATTRIBUTE);
 
 		if (!StringUtils.hasText(element.getAttribute(NAME_ATTRIBUTE))) {
@@ -86,7 +82,7 @@ class AsyncEventQueueParser extends AbstractSingleBeanDefinitionParser {
 	}
 
 	private void parseAsyncEventListener(final Element element, final ParserContext parserContext,
-			final BeanDefinitionBuilder builder) {
+		final BeanDefinitionBuilder builder) {
 
 		Element asyncEventListenerElement = DomUtils.getChildElementByTagName(element, "async-event-listener");
 
diff --git a/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.7.xsd b/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.7.xsd
index 574bbd3a..3b61b3b2 100644
--- a/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.7.xsd
+++ b/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.7.xsd
@@ -2886,8 +2886,7 @@ An AsyncEventListener bean definition for this AsyncEventQueue. (requires Gemfir
 				</xsd:annotation>
 				<xsd:complexType>
 					<xsd:sequence>
-						<xsd:any namespace="##other" processContents="skip"
-								 minOccurs="0" maxOccurs="unbounded">
+						<xsd:any namespace="##other" processContents="skip" minOccurs="0" maxOccurs="unbounded">
 							<xsd:annotation>
 								<xsd:documentation><![CDATA[
 Inner bean definition of the async event listener