From 4398721b18aa65f4fa87b965e84fd7401d25a793 Mon Sep 17 00:00:00 2001 From: John Blum Date: Wed, 24 Sep 2014 14:47:07 -0700 Subject: [PATCH] SGF-330 - Add missing 'disk-synchronous' attribute to the element in the SDG XML namespace (XSD). --- .../gemfire/config/spring-gemfire-1.4.xsd | 8 +++++ .../gemfire/config/spring-gemfire-1.5.xsd | 8 +++++ .../config/GatewayReceiverNamespaceTest.java | 2 +- .../config/GemfireV7GatewayNamespaceTest.java | 11 ++++--- .../test/StubGatewaySenderFactory.java | 32 +++++++++---------- .../data/gemfire/config/gateway-v7-ns.xml | 3 +- 6 files changed, 41 insertions(+), 23 deletions(-) diff --git a/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.4.xsd b/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.4.xsd index 200e8b6f..4aafb735 100644 --- a/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.4.xsd +++ b/src/main/resources/org/springframework/data/gemfire/config/spring-gemfire-1.4.xsd @@ -2477,6 +2477,14 @@ The maximum time interval that can elapse before a partial batch is sent from a ]]> + + + + + + + + + + eventFilters = TestUtils.readField("eventFilters", gatewaySenderFactoryBean); @@ -131,8 +131,8 @@ public class GemfireV7GatewayNamespaceTest extends RecreatingContextTest { assertTrue(transportFilters.get(0) instanceof TestTransportFilter); } - @SuppressWarnings("rawtypes") @Test + @SuppressWarnings("rawtypes") public void testInnerGatewaySender() throws Exception { Region region = ctx.getBean("region-inner-gateway-sender", Region.class); @@ -151,12 +151,13 @@ public class GemfireV7GatewayNamespaceTest extends RecreatingContextTest { assertNotNull(gatewaySender); assertEquals(1, gatewaySender.getRemoteDSId()); assertEquals(false, gatewaySender.isManualStart()); - assertEquals(true,gatewaySender.isRunning()); + assertEquals(true, gatewaySender.isRunning()); assertEquals(10, gatewaySender.getAlertThreshold()); assertEquals(11, gatewaySender.getBatchSize()); assertEquals(3000, gatewaySender.getBatchTimeInterval()); assertEquals(2, gatewaySender.getDispatcherThreads()); assertEquals("diskstore", gatewaySender.getDiskStoreName()); + assertEquals(true, gatewaySender.isDiskSynchronous()); assertTrue(gatewaySender.isBatchConflationEnabled()); assertEquals(50, gatewaySender.getMaximumQueueMemory()); assertEquals(OrderPolicy.THREAD, gatewaySender.getOrderPolicy()); diff --git a/src/test/java/org/springframework/data/gemfire/test/StubGatewaySenderFactory.java b/src/test/java/org/springframework/data/gemfire/test/StubGatewaySenderFactory.java index 060ead1a..4c354adc 100644 --- a/src/test/java/org/springframework/data/gemfire/test/StubGatewaySenderFactory.java +++ b/src/test/java/org/springframework/data/gemfire/test/StubGatewaySenderFactory.java @@ -85,33 +85,33 @@ public class StubGatewaySenderFactory implements GatewaySenderFactory { when(gatewaySender.getId()).thenReturn(this.name); when(gatewaySender.getRemoteDSId()).thenReturn(this.remoteSystemId); when(gatewaySender.getAlertThreshold()).thenReturn(this.alertThreshold); + when(gatewaySender.getGatewayEventFilters()).thenReturn(this.eventFilters); + when(gatewaySender.getGatewayTransportFilters()).thenReturn(this.transportFilters); + when(gatewaySender.isManualStart()).thenReturn(this.manualStart); + when(gatewaySender.getSocketBufferSize()).thenReturn(this.socketBufferSize); + when(gatewaySender.getSocketReadTimeout()).thenReturn(this.socketReadTimeout); + when(gatewaySender.isBatchConflationEnabled()).thenReturn(this.batchConflationEnabled); when(gatewaySender.getBatchSize()).thenReturn(this.batchSize); when(gatewaySender.getBatchTimeInterval()).thenReturn(this.batchTimeInterval); when(gatewaySender.getDiskStoreName()).thenReturn(this.diskStoreName); - when(gatewaySender.getDispatcherThreads()).thenReturn(this.dispatcherThreads); - when(gatewaySender.getGatewayEventFilters()).thenReturn(this.eventFilters); - when(gatewaySender.getGatewayTransportFilters()).thenReturn(this.transportFilters); - when(gatewaySender.getMaximumQueueMemory()).thenReturn(this.maxQueueMemory); - when(gatewaySender.getOrderPolicy()).thenReturn(this.orderPolicy); - when(gatewaySender.getSocketBufferSize()).thenReturn(this.socketBufferSize); - when(gatewaySender.getSocketReadTimeout()).thenReturn(this.socketReadTimeout); - when(gatewaySender.isManualStart()).thenReturn(this.manualStart); - when(gatewaySender.isBatchConflationEnabled()).thenReturn(this.batchConflationEnabled); when(gatewaySender.isDiskSynchronous()).thenReturn(this.diskSynchronous); + when(gatewaySender.getDispatcherThreads()).thenReturn(this.dispatcherThreads); + when(gatewaySender.getMaximumQueueMemory()).thenReturn(this.maxQueueMemory); when(gatewaySender.isParallel()).thenReturn(this.parallel); when(gatewaySender.isPersistenceEnabled()).thenReturn(this.persistenceEnabled); - doAnswer(new Answer() { + when(gatewaySender.getOrderPolicy()).thenReturn(this.orderPolicy); + when(gatewaySender.isRunning()).thenAnswer(new Answer() { + @Override + public Boolean answer(InvocationOnMock invocation) throws Throwable { + return running; + } + }); + doAnswer(new Answer() { public Void answer(InvocationOnMock invocation) { running = true; return null; } }).when(gatewaySender).start(); - when(gatewaySender.isRunning()).thenAnswer(new Answer(){ - @Override - public Boolean answer(InvocationOnMock invocation) throws Throwable { - return running; - } - }); return gatewaySender; } 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 69915810..45200a85 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 @@ -25,6 +25,7 @@ batch-time-interval="3000" dispatcher-threads="2" disk-store-ref="diskstore" + disk-synchronous="true" enable-batch-conflation="true" maximum-queue-memory="50" order-policy="THREAD" @@ -69,7 +70,7 @@ + dispatcher-threads="12" disk-synchronous="false" manual-start="true">