From 07df1a7417b4e7d45d5c05f054f8b2f7377ae2e0 Mon Sep 17 00:00:00 2001 From: John Blum Date: Wed, 24 Sep 2014 15:02:59 -0700 Subject: [PATCH] SGF-328 - Additional refactoring after the cherry-pick commit in revision 283a762; Changed GemFire GatewayReceiverFactory 'setHostnameForSenders' calls to 'setHostnameForClients' based on interface differences between GemFire 7 and GemFire 8. --- .../data/gemfire/wan/GatewayReceiverFactoryBean.java | 2 +- .../gemfire/test/StubGatewayReceiverFactory.java | 3 +-- .../gemfire/wan/GatewayReceiverFactoryBeanTest.java | 5 +++-- .../config/GatewayReceiverNamespaceTest-context.xml | 3 +-- .../data/gemfire/config/gateway-v7-ns.xml | 12 ++++++++++-- 5 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/springframework/data/gemfire/wan/GatewayReceiverFactoryBean.java b/src/main/java/org/springframework/data/gemfire/wan/GatewayReceiverFactoryBean.java index a0ab9f41..b819b7cf 100644 --- a/src/main/java/org/springframework/data/gemfire/wan/GatewayReceiverFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/wan/GatewayReceiverFactoryBean.java @@ -93,7 +93,7 @@ public class GatewayReceiverFactoryBean extends AbstractWANComponentFactoryBean< } if (StringUtils.hasText(hostnameForSenders)) { - gatewayReceiverFactory.setHostnameForSenders(hostnameForSenders); + gatewayReceiverFactory.setHostnameForClients(hostnameForSenders); } int localStartPort = (startPort != null ? startPort : GatewayReceiver.DEFAULT_START_PORT); diff --git a/src/test/java/org/springframework/data/gemfire/test/StubGatewayReceiverFactory.java b/src/test/java/org/springframework/data/gemfire/test/StubGatewayReceiverFactory.java index eb0cbb1b..95466895 100644 --- a/src/test/java/org/springframework/data/gemfire/test/StubGatewayReceiverFactory.java +++ b/src/test/java/org/springframework/data/gemfire/test/StubGatewayReceiverFactory.java @@ -122,8 +122,7 @@ public class StubGatewayReceiverFactory implements GatewayReceiverFactory { when(gatewayReceiver.getBindAddress()).thenReturn(this.bindAddress); when(gatewayReceiver.getEndPort()).thenReturn(this.endPort); when(gatewayReceiver.getGatewayTransportFilters()).thenReturn(this.gatewayTransportFilters); - when(gatewayReceiver.getHost()).thenReturn(StringUtils.hasText(this.hostnameForSenders) - ? this.hostnameForSenders : this.hostnameForClients); + when(gatewayReceiver.getHost()).thenReturn(this.hostnameForClients); when(gatewayReceiver.getMaximumTimeBetweenPings()).thenReturn(this.maximumTimeBetweenPings); when(gatewayReceiver.getSocketBufferSize()).thenReturn(this.socketBufferSize); when(gatewayReceiver.getStartPort()).thenReturn(this.startPort); diff --git a/src/test/java/org/springframework/data/gemfire/wan/GatewayReceiverFactoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/wan/GatewayReceiverFactoryBeanTest.java index 208e678b..627508be 100644 --- a/src/test/java/org/springframework/data/gemfire/wan/GatewayReceiverFactoryBeanTest.java +++ b/src/test/java/org/springframework/data/gemfire/wan/GatewayReceiverFactoryBeanTest.java @@ -35,7 +35,8 @@ import com.gemstone.gemfire.cache.wan.GatewayTransportFilter; * The GatewayReceiverFactoryBeanTest class... * * @author John Blum - * @see org.springframework.data.gemfire. + * @see com.gemstone.gemfire.cache.Cache + * @see com.gemstone.gemfire.cache.wan.GatewayReceiverFactory * @since 1.5.0 */ public class GatewayReceiverFactoryBeanTest { @@ -62,7 +63,7 @@ public class GatewayReceiverFactoryBeanTest { factoryBean.afterPropertiesSet(); verify(mockGatewayReceiverFactory).setBindAddress(eq("10.224.112.77")); - verify(mockGatewayReceiverFactory).setHostnameForSenders(eq("skullbox")); + verify(mockGatewayReceiverFactory).setHostnameForClients(eq("skullbox")); verify(mockGatewayReceiverFactory).setStartPort(eq(2048)); verify(mockGatewayReceiverFactory).setEndPort(eq(4096)); verify(mockGatewayReceiverFactory).setMaximumTimeBetweenPings(eq(5000)); diff --git a/src/test/resources/org/springframework/data/gemfire/config/GatewayReceiverNamespaceTest-context.xml b/src/test/resources/org/springframework/data/gemfire/config/GatewayReceiverNamespaceTest-context.xml index 944f9edf..e520e34f 100644 --- a/src/test/resources/org/springframework/data/gemfire/config/GatewayReceiverNamespaceTest-context.xml +++ b/src/test/resources/org/springframework/data/gemfire/config/GatewayReceiverNamespaceTest-context.xml @@ -18,8 +18,7 @@ + start-port="12345" end-port="54321" maximum-time-between-pings="5000" socket-buffer-size="32768"/> diff --git a/src/test/resources/org/springframework/data/gemfire/config/gateway-v7-ns.xml b/src/test/resources/org/springframework/data/gemfire/config/gateway-v7-ns.xml index 3ed666f1..69915810 100644 --- a/src/test/resources/org/springframework/data/gemfire/config/gateway-v7-ns.xml +++ b/src/test/resources/org/springframework/data/gemfire/config/gateway-v7-ns.xml @@ -1,13 +1,21 @@ + http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd +" default-lazy-init="true"> - + + GemfireV7GatewayNamespaceTest + 0 + config + + +