From eade5d8a397a3d2370d4e018c6e293714ea8aab8 Mon Sep 17 00:00:00 2001
From: John Blum <jblum@pivotal.io>
Date: Tue, 24 Feb 2015 15:00:32 -0800
Subject: [PATCH] SGF-378 - SDG completely ignores the 'socket-read-timeout'
 attribute on the Gateway element nested in a GatewayHub.

---
 .../data/gemfire/wan/GatewayHubFactoryBean.java           | 2 +-
 .../springframework/data/gemfire/wan/GatewayProxy.java    | 4 +---
 .../data/gemfire/config/spring-gemfire-1.5.xsd            | 3 +--
 .../data/gemfire/config/GatewayHubNamespaceTest.java      | 2 +-
 .../data/gemfire/wan/GatewayHubFactoryBeanTest.java       | 8 ++++----
 .../gemfire/config/GatewayHubNamespaceTest-context.xml    | 3 ++-
 6 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/main/java/org/springframework/data/gemfire/wan/GatewayHubFactoryBean.java b/src/main/java/org/springframework/data/gemfire/wan/GatewayHubFactoryBean.java
index 76cfc534..1c0387e3 100644
--- a/src/main/java/org/springframework/data/gemfire/wan/GatewayHubFactoryBean.java
+++ b/src/main/java/org/springframework/data/gemfire/wan/GatewayHubFactoryBean.java
@@ -115,7 +115,7 @@ public class GatewayHubFactoryBean extends AbstractWANComponentFactoryBean<Gatew
 
 			gateway.setOrderPolicy(gatewayProxy.getOrderPolicy());
 			gateway.setSocketBufferSize(gatewayProxy.getSocketBufferSize());
-			//gateway.setSocketReadTimeout(gatewayProxy.getSocketReadTimeout());
+			gateway.setSocketReadTimeout(gatewayProxy.getSocketReadTimeout());
 
 			if (gatewayProxy.getQueue() != null) {
 				GatewayQueue queue = gatewayProxy.getQueue();
diff --git a/src/main/java/org/springframework/data/gemfire/wan/GatewayProxy.java b/src/main/java/org/springframework/data/gemfire/wan/GatewayProxy.java
index dd948db0..f2a68ad0 100644
--- a/src/main/java/org/springframework/data/gemfire/wan/GatewayProxy.java
+++ b/src/main/java/org/springframework/data/gemfire/wan/GatewayProxy.java
@@ -38,7 +38,7 @@ public class GatewayProxy {
 
 	private Integer concurrencyLevel = Gateway.DEFAULT_CONCURRENCY_LEVEL;
 	private Integer socketBufferSize = Gateway.DEFAULT_SOCKET_BUFFER_SIZE;
-	//private Integer socketReadTimeout = Gateway.DEFAULT_SOCKET_READ_TIMEOUT;
+	private Integer socketReadTimeout = Gateway.DEFAULT_SOCKET_READ_TIMEOUT;
 
 	private List<GatewayEndpoint> endpoints;
 	private List<GatewayEventListener> listeners;
@@ -101,7 +101,6 @@ public class GatewayProxy {
 		return (socketBufferSize != null ? socketBufferSize : Gateway.DEFAULT_SOCKET_BUFFER_SIZE);
 	}
 
-	/*
 	public void setSocketReadTimeout(final Integer socketReadTimeout) {
 		this.socketReadTimeout = socketReadTimeout;
 	}
@@ -109,7 +108,6 @@ public class GatewayProxy {
 	public Integer getSocketReadTimeout() {
 		return (socketReadTimeout != null ? socketReadTimeout : Gateway.DEFAULT_SOCKET_READ_TIMEOUT);
 	}
-	*/
 
 	public static class GatewayEndpoint {
 
diff --git a/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.5.xsd b/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.5.xsd
index 481bdfe0..a3356163 100644
--- a/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.5.xsd
+++ b/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.5.xsd
@@ -2997,8 +2997,7 @@ Deprecated as of Gemfire 7
 ]]></xsd:documentation>
 		</xsd:annotation>
 		<xsd:sequence>
-			<xsd:element name="gateway" type="gatewayType" minOccurs="0"
-						 maxOccurs="unbounded">
+			<xsd:element name="gateway" type="gatewayType" minOccurs="0" maxOccurs="unbounded">
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
 Deprecated as of Gemfire 7
diff --git a/src/test/java/org/springframework/data/gemfire/config/GatewayHubNamespaceTest.java b/src/test/java/org/springframework/data/gemfire/config/GatewayHubNamespaceTest.java
index 4b071361..08ff968a 100644
--- a/src/test/java/org/springframework/data/gemfire/config/GatewayHubNamespaceTest.java
+++ b/src/test/java/org/springframework/data/gemfire/config/GatewayHubNamespaceTest.java
@@ -100,7 +100,7 @@ public class GatewayHubNamespaceTest {
 		assertEquals(8, gatewayOne.getConcurrencyLevel());
 		assertEquals(Gateway.OrderPolicy.THREAD, gatewayOne.getOrderPolicy());
 		assertEquals(65536, gatewayOne.getSocketBufferSize());
-		//assertEquals(120, gatewayOne.getSocketReadTimeout());
+		assertEquals(15000, gatewayOne.getSocketReadTimeout());
 		assertNotNull(gatewayOne.getListeners());
 		assertFalse(gatewayOne.getListeners().isEmpty());
 		assertEquals(1, gatewayOne.getListeners().size());
diff --git a/src/test/java/org/springframework/data/gemfire/wan/GatewayHubFactoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/wan/GatewayHubFactoryBeanTest.java
index 920bd277..ab9eb30a 100644
--- a/src/test/java/org/springframework/data/gemfire/wan/GatewayHubFactoryBeanTest.java
+++ b/src/test/java/org/springframework/data/gemfire/wan/GatewayHubFactoryBeanTest.java
@@ -206,7 +206,7 @@ public class GatewayHubFactoryBeanTest {
 		gatewayProxy.setOrderPolicy(Gateway.OrderPolicy.THREAD);
 		gatewayProxy.setQueue(gatewayQueue);
 		gatewayProxy.setSocketBufferSize(16384);
-		//gatewayProxy.setSocketReadTimeout(300);
+		gatewayProxy.setSocketReadTimeout(300);
 
 		GatewayHub mockGatewayHub = mock(GatewayHub.class, "testDoInit.MockGatewayHub");
 
@@ -248,7 +248,7 @@ public class GatewayHubFactoryBeanTest {
 		verify(mockGateway, times(1)).addListener(same(mockGatewayListener));
 		verify(mockGateway, times(1)).setOrderPolicy(eq(gatewayProxy.getOrderPolicy()));
 		verify(mockGateway, times(1)).setSocketBufferSize(eq(gatewayProxy.getSocketBufferSize()));
-		//verify(mockGateway, times(1)).setSocketReadTimeout(eq(gatewayProxy.getSocketReadTimeout()));
+		verify(mockGateway, times(1)).setSocketReadTimeout(eq(gatewayProxy.getSocketReadTimeout()));
 		verify(mockGateway, times(1)).getQueueAttributes();
 		verify(mockGatewayQueueAttributes, times(1)).setAlertThreshold(eq(gatewayQueue.getAlertThreshold()));
 		verify(mockGatewayQueueAttributes, times(1)).setBatchConflation(eq(gatewayQueue.getEnableBatchConflation()));
@@ -282,7 +282,7 @@ public class GatewayHubFactoryBeanTest {
 		gatewayProxy.setOrderPolicy(Gateway.OrderPolicy.THREAD);
 		gatewayProxy.setQueue(gatewayQueue);
 		gatewayProxy.setSocketBufferSize(4096);
-		//gatewayProxy.setSocketReadTimeout(60);
+		gatewayProxy.setSocketReadTimeout(60);
 
 		GatewayHub mockGatewayHub = mock(GatewayHub.class, "testGatewayQueueWithOverflowNoPersistence.MockGatewayHub");
 
@@ -312,7 +312,7 @@ public class GatewayHubFactoryBeanTest {
 		verify(mockGatewayHub, times(1)).addGateway(eq(gatewayProxy.getId()), eq(gatewayProxy.getConcurrencyLevel()));
 		verify(mockGateway, times(1)).setOrderPolicy(eq(gatewayProxy.getOrderPolicy()));
 		verify(mockGateway, times(1)).setSocketBufferSize(eq(gatewayProxy.getSocketBufferSize()));
-		//verify(mockGateway, times(1)).setSocketReadTimeout(eq(gatewayProxy.getSocketReadTimeout()));
+		verify(mockGateway, times(1)).setSocketReadTimeout(eq(gatewayProxy.getSocketReadTimeout()));
 		verify(mockGatewayQueueAttributes, times(1)).setAlertThreshold(gatewayQueue.getAlertThreshold());
 		verify(mockGatewayQueueAttributes, times(1)).setBatchConflation(gatewayQueue.getEnableBatchConflation());
 		verify(mockGatewayQueueAttributes, times(1)).setBatchSize(gatewayQueue.getBatchSize());
diff --git a/src/test/resources/org/springframework/data/gemfire/config/GatewayHubNamespaceTest-context.xml b/src/test/resources/org/springframework/data/gemfire/config/GatewayHubNamespaceTest-context.xml
index 0a94f250..4117bdee 100644
--- a/src/test/resources/org/springframework/data/gemfire/config/GatewayHubNamespaceTest-context.xml
+++ b/src/test/resources/org/springframework/data/gemfire/config/GatewayHubNamespaceTest-context.xml
@@ -25,7 +25,8 @@
 
 	<gfe:gateway-hub id="testGatewayHub" bind-address="localhost" manual-start="true" max-time-between-pings="5000"
 					 port="45123" socket-buffer-size="16384" startup-policy="primary">
-		<gfe:gateway gateway-id="gateway1" concurrency-level="8" order-policy="thread" socket-buffer-size="65536">
+		<gfe:gateway gateway-id="gateway1" concurrency-level="8" order-policy="thread" socket-buffer-size="65536"
+					 socket-read-timeout="15000">
 			<gfe:gateway-listener>
 				<bean class="org.springframework.data.gemfire.config.GatewayHubNamespaceTest.TestGatewayListener"/>
 			</gfe:gateway-listener>