diff --git a/src/main/java/org/springframework/data/gemfire/config/GatewayHubParser.java b/src/main/java/org/springframework/data/gemfire/config/GatewayHubParser.java index d3829a7a..f04189c0 100644 --- a/src/main/java/org/springframework/data/gemfire/config/GatewayHubParser.java +++ b/src/main/java/org/springframework/data/gemfire/config/GatewayHubParser.java @@ -48,22 +48,6 @@ class GatewayHubParser extends AbstractSimpleBeanDefinitionParser { return GatewayHubFactoryBean.class; } - /* - - - - - - - - - - - */ @Override @SuppressWarnings({ "rawtypes", "unchecked" }) protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) { @@ -72,7 +56,7 @@ Sets the maximum amount of time between client pings. ParsingUtils.setPropertyValue(element, builder, "bind-address"); ParsingUtils.setPropertyValue(element, builder, "manual-start"); - //ParsingUtils.setPropertyValue(element, builder, "max-connections"); + ParsingUtils.setPropertyValue(element, builder, "max-connections"); ParsingUtils.setPropertyValue(element, builder, "max-time-between-pings", "maximumTimeBetweenPings"); ParsingUtils.setPropertyValue(element, builder, "port"); ParsingUtils.setPropertyValue(element, builder, "socket-buffer-size"); 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 1c0387e3..111faae4 100644 --- a/src/main/java/org/springframework/data/gemfire/wan/GatewayHubFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/wan/GatewayHubFactoryBean.java @@ -48,7 +48,7 @@ public class GatewayHubFactoryBean extends AbstractWANComponentFactoryBean + + + + + + + + + + - - - - - - + + + @@ -3097,8 +3108,7 @@ An gateway event listener definition for the gateway - + () { @Override public Void answer(final InvocationOnMock invocation) throws Throwable { maximumConnections = invocation.getArgumentAt(0, Integer.class); return null; } - }).when(mockGatewayHub).setMaximumConnections(anyInt()); + }).when(mockGatewayHub).setMaxConnections(anyInt()); - when(mockGatewayHub.getMaximumConnections()).thenAnswer(new Answer() { + when(mockGatewayHub.getMaxConnections()).thenAnswer(new Answer() { @Override public Integer answer(final InvocationOnMock invocation) throws Throwable { return maximumConnections; } }); - */ doAnswer(new Answer() { @Override public Void answer(final InvocationOnMock invocation) throws Throwable { 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 ab9eb30a..e83724db 100644 --- a/src/test/java/org/springframework/data/gemfire/wan/GatewayHubFactoryBeanTest.java +++ b/src/test/java/org/springframework/data/gemfire/wan/GatewayHubFactoryBeanTest.java @@ -97,7 +97,6 @@ public class GatewayHubFactoryBeanTest { assertEquals(GatewayHub.DEFAULT_MANUAL_START, factoryBean.isManualStart(GatewayHub.DEFAULT_MANUAL_START)); } - /* @Test public void testSetAndGetMaxConnections() { assertEquals(GatewayHub.DEFAULT_MAX_CONNECTIONS, factoryBean.getMaxConnections().intValue()); @@ -106,7 +105,6 @@ public class GatewayHubFactoryBeanTest { factoryBean.setMaxConnections(null); assertEquals(GatewayHub.DEFAULT_MAX_CONNECTIONS, factoryBean.getMaxConnections().intValue()); } - */ @Test public void testSetAndGetMaximumTimeBetweenPings() { @@ -225,7 +223,7 @@ public class GatewayHubFactoryBeanTest { factoryBean.setBindAddress("10.124.210.42"); factoryBean.setGateways(Arrays.asList(gatewayProxy)); factoryBean.setManualStart(false); - //factoryBean.setMaxConnections(50); + factoryBean.setMaxConnections(50); factoryBean.setMaximumTimeBetweenPings(20480); factoryBean.setName(gatewayHubName); factoryBean.setPort(8484); @@ -235,7 +233,7 @@ public class GatewayHubFactoryBeanTest { verify(mockGatewayHub, times(1)).setBindAddress(eq("10.124.210.42")); verify(mockGatewayHub, times(1)).setManualStart(eq(false)); - //verify(mockGatewayHub, times(1)).setMaxConnections(eq(50)); + verify(mockGatewayHub, times(1)).setMaxConnections(eq(50)); verify(mockGatewayHub, times(1)).setMaximumTimeBetweenPings(eq(20480)); verify(mockGatewayHub, times(1)).setSocketBufferSize(eq(4096)); verify(mockGatewayHub, times(1)).setStartupPolicy(eq(StartupPolicyType.PRIMARY.getName())); @@ -305,6 +303,7 @@ public class GatewayHubFactoryBeanTest { verify(mockGatewayHub, times(1)).setBindAddress(eq(GatewayHub.DEFAULT_BIND_ADDRESS)); verify(mockGatewayHub, times(1)).setManualStart(eq(GatewayHub.DEFAULT_MANUAL_START)); + verify(mockGatewayHub, times(1)).setMaxConnections(GatewayHub.DEFAULT_MAX_CONNECTIONS); verify(mockGatewayHub, times(1)).setMaximumTimeBetweenPings(eq(GatewayHub.DEFAULT_MAXIMUM_TIME_BETWEEN_PINGS)); verify(mockGatewayHub, times(1)).setSocketBufferSize(eq(GatewayHub.DEFAULT_SOCKET_BUFFER_SIZE)); verify(mockGatewayHub, times(1)).setStartupPolicy(eq(GatewayHub.DEFAULT_STARTUP_POLICY)); 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 25a3c21e..5e2424c0 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 @@ -26,8 +26,8 @@ - +