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

SGF-749 - Polish.

Browse Source
This commit is contained in:
John Blum
2018-06-09 22:52:12 -07:00
parent aa4b2a70af
commit b387cfdad2
4 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/springframework/data/gemfire/config/xml/ClientRegionParser.java
View File

@@ -74,7 +74,7 @@ class ClientRegionParser extends AbstractRegionParser {
}
ParsingUtils.setPropertyValue(element, regionBuilder, "name");
ParsingUtils.setPropertyValue(element, regionBuilder, "data-policy", "dataPolicyName");
ParsingUtils.setPropertyValue(element, regionBuilder, "data-policy");
ParsingUtils.setPropertyValue(element, regionBuilder, "ignore-if-exists", "lookupEnabled");
ParsingUtils.setPropertyValue(element, regionBuilder, "persistent");
ParsingUtils.setPropertyValue(element, regionBuilder, "pool-name");

4
src/main/java/org/springframework/data/gemfire/wan/GatewaySenderFactoryBean.java
View File

@@ -156,8 +156,8 @@ public class GatewaySenderFactoryBean extends AbstractWANComponentFactoryBean<Ga
gatewaySenderFactory.addGatewayTransportFilter(transportFilter);
}
GatewaySenderWrapper wrapper = new GatewaySenderWrapper(gatewaySenderFactory.create(getName(),
remoteDistributedSystemId));
GatewaySenderWrapper wrapper =
new GatewaySenderWrapper(gatewaySenderFactory.create(getName(), remoteDistributedSystemId));
wrapper.setManualStart(manualStart);
gatewaySender = wrapper;

2
src/test/java/org/springframework/data/gemfire/config/xml/ClientRegionNamespaceTest.java
View File

@@ -72,7 +72,7 @@ import org.springframework.util.ObjectUtils;
* @see org.springframework.data.gemfire.config.xml.ClientRegionParser
*/
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations="client-ns.xml", initializers = GemFireMockObjectsApplicationContextInitializer.class)
@ContextConfiguration(locations = "client-ns.xml", initializers = GemFireMockObjectsApplicationContextInitializer.class)
@SuppressWarnings("unused")
public class ClientRegionNamespaceTest {

26
src/test/java/org/springframework/data/gemfire/wan/GatewaySenderFactoryBeanTest.java
View File

@@ -46,15 +46,19 @@ import org.springframework.data.gemfire.TestUtils;
*/
public class GatewaySenderFactoryBeanTest {
private Cache mockCacheWithGatewayInfrastructure(final GatewaySenderFactory gatewaySenderFactory) {
private Cache mockCacheWithGatewayInfrastructure(GatewaySenderFactory gatewaySenderFactory) {
Cache mockCache = mock(Cache.class);
when(mockCache.createGatewaySenderFactory()).thenReturn(gatewaySenderFactory);
return mockCache;
}
private GatewaySenderFactory mockGatewaySenderFactory(final String gatewaySenderName,
final int remoteDistributedSystemId) {
private GatewaySenderFactory mockGatewaySenderFactory(String gatewaySenderName, int remoteDistributedSystemId) {
GatewaySenderFactory mockGatewaySenderFactory = mock(GatewaySenderFactory.class);
GatewaySender mockGatewaySender = mock(GatewaySender.class);
when(mockGatewaySender.getId()).thenReturn(gatewaySenderName);
@@ -206,11 +210,11 @@ public class GatewaySenderFactoryBeanTest {
GatewaySenderFactory mockGatewaySenderFactory =
mockGatewaySenderFactory("g7", 51);
GatewaySenderFactoryBean factoryBean = new GatewaySenderFactoryBean(
mockCacheWithGatewayInfrastructure(mockGatewaySenderFactory));
GatewaySenderFactoryBean factoryBean =
new GatewaySenderFactoryBean(mockCacheWithGatewayInfrastructure(mockGatewaySenderFactory));
factoryBean.setName("g4");
factoryBean.setRemoteDistributedSystemId(21);
factoryBean.setName("g7");
factoryBean.setRemoteDistributedSystemId(51);
factoryBean.setParallel(false);
factoryBean.setDispatcherThreads(1);
factoryBean.doInit();
@@ -220,8 +224,8 @@ public class GatewaySenderFactoryBeanTest {
GatewaySender gatewaySender = factoryBean.getObject();
assertNotNull(gatewaySender);
assertEquals("g4", gatewaySender.getId());
assertEquals(21, gatewaySender.getRemoteDSId());
assertEquals("g7", gatewaySender.getId());
assertEquals(51, gatewaySender.getRemoteDSId());
}
@Test
@@ -257,8 +261,8 @@ public class GatewaySenderFactoryBeanTest {
GatewaySenderFactoryBean factoryBean = new GatewaySenderFactoryBean(
mockCacheWithGatewayInfrastructure(mockGatewaySenderFactory));
factoryBean.setName("g7");
factoryBean.setRemoteDistributedSystemId(51);
factoryBean.setName("g5");
factoryBean.setRemoteDistributedSystemId(42);
factoryBean.setDiskSynchronous(true);
factoryBean.doInit();