Spring/spring-data-gemfire
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SGF-328 - Additional refactoring after the cherry-pick commit in revision b9808e4; Changed GemFire GatewayReceiverFactory 'setHostnameForSenders' calls to 'setHostnameForClients' based on interface differences between GemFire 7 and GemFire 8.

Browse Source
This commit is contained in:
John Blum
2014-09-24 15:02:59 -07:00
parent 06ce3ea909
commit 71e24cfe9a
5 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/springframework/data/gemfire/wan/GatewayReceiverFactoryBean.java
View File

@@ -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);

3
src/test/java/org/springframework/data/gemfire/test/StubGatewayReceiverFactory.java
View File

@@ -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);

5
src/test/java/org/springframework/data/gemfire/wan/GatewayReceiverFactoryBeanTest.java
View File

@@ -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));

3
src/test/resources/org/springframework/data/gemfire/config/GatewayReceiverNamespaceTest-context.xml
View File

@@ -18,8 +18,7 @@
<gfe:cache properties-ref="gemfireProperties"/>
<gfe:gateway-receiver id="Default" bind-address="192.168.0.1" hostname-for-senders="skullbox"
start-port="12345" end-port="54321" manual-start="true"
maximum-time-between-pings="5000" socket-buffer-size="32768"/>
start-port="12345" end-port="54321" maximum-time-between-pings="5000" socket-buffer-size="32768"/>
<gfe:gateway-receiver id="Auto" manual-start="false"/>

5
src/test/resources/org/springframework/data/gemfire/config/gateway-v7-ns.xml
View File

@@ -10,9 +10,12 @@
" default-lazy-init="true">
<util:properties id="gemfireProperties">
<prop key="name">GemfireV7GatewayNamespaceTest</prop>
<prop key="mcast-port">0</prop>
<prop key="log-level">config</prop>
</util:properties>
<gfe:cache/>
<gfe:cache properties-ref="gemfireProperties"/>
<gfe:partitioned-region id="region-inner-gateway-sender" >
<gfe:gateway-sender remote-distributed-system-id="1"