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

SGF-863 - Add unit tests asserting the addition of AsyncEventQueues (AEQ) and GatewaySenders to Regions of various types (e.g. LOCAL, PARTITION, REPLICATE as well as Templates) using objects and identifiers.

Browse Source
This commit is contained in:
John Blum
2019-07-16 20:32:31 -07:00
parent b6565c60dc
commit 33bcbf9f3f
6 changed files with 277 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/org/springframework/data/gemfire/PeerRegionFactoryBean.java
View File

@@ -57,6 +57,7 @@ import org.springframework.core.io.Resource;
import org.springframework.data.gemfire.client.ClientRegionFactoryBean;
import org.springframework.data.gemfire.eviction.EvictingRegionFactoryBean;
import org.springframework.data.gemfire.expiration.ExpiringRegionFactoryBean;
import org.springframework.data.gemfire.util.CollectionUtils;
import org.springframework.data.gemfire.util.RegionUtils;
import org.springframework.util.Assert;
import org.springframework.util.ObjectUtils;
@@ -410,9 +411,13 @@ public abstract class PeerRegionFactoryBean<K, V> extends ConfigurableRegionFact
if (regionAttributes != null) {
// NOTE: this validation may not be strictly necessary depending on how the RegionAttributes were "created",
// NOTE: this validation may not be strictly necessary depending on how the RegionAttributes were "created".
validateRegionAttributes(regionAttributes);
CollectionUtils.nullSafeSet(regionAttributes.getAsyncEventQueueIds()).stream()
.filter(StringUtils::hasText)
.forEach(regionFactory::addAsyncEventQueueId);
regionFactory.setCloningEnabled(regionAttributes.getCloningEnabled());
regionFactory.setCompressor(regionAttributes.getCompressor());
regionFactory.setConcurrencyChecksEnabled(regionAttributes.getConcurrencyChecksEnabled());
@@ -430,6 +435,10 @@ public abstract class PeerRegionFactoryBean<K, V> extends ConfigurableRegionFact
regionFactory.setEvictionAttributes(regionAttributes.getEvictionAttributes());
}
CollectionUtils.nullSafeSet(regionAttributes.getGatewaySenderIds()).stream()
.filter(StringUtils::hasText)
.forEach(regionFactory::addGatewaySenderId);
regionFactory.setIgnoreJTA(regionAttributes.getIgnoreJTA());
regionFactory.setIndexMaintenanceSynchronous(regionAttributes.getIndexMaintenanceSynchronous());
regionFactory.setInitialCapacity(regionAttributes.getInitialCapacity());

33
src/main/java/org/springframework/data/gemfire/RegionAttributesFactoryBean.java
View File

@@ -13,13 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.data.gemfire;
import java.util.Arrays;
import org.apache.geode.cache.AttributesFactory;
import org.apache.geode.cache.RegionAttributes;
import org.springframework.beans.factory.FactoryBean;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.data.gemfire.util.ArrayUtils;
import org.springframework.util.StringUtils;
/**
* Spring-friendly bean for creating {@link RegionAttributes}. Eliminates the need of using a XML 'factory-method' tag.
@@ -32,10 +36,10 @@ import org.springframework.beans.factory.InitializingBean;
* @see org.apache.geode.cache.RegionAttributes
*/
@SuppressWarnings({ "unused" })
public class RegionAttributesFactoryBean extends AttributesFactory
public class RegionAttributesFactoryBean<K, V> extends AttributesFactory<K, V>
implements FactoryBean<RegionAttributes>, InitializingBean {
private RegionAttributes regionAttributes;
private RegionAttributes<K, V> regionAttributes;
@Override
public void afterPropertiesSet() throws Exception {
@@ -43,13 +47,16 @@ public class RegionAttributesFactoryBean extends AttributesFactory
}
@Override
public RegionAttributes getObject() throws Exception {
public RegionAttributes<K, V> getObject() throws Exception {
return this.regionAttributes;
}
@Override
public Class<?> getObjectType() {
return this.regionAttributes != null ? this.regionAttributes.getClass() : RegionAttributes.class;
return this.regionAttributes != null
? this.regionAttributes.getClass()
: RegionAttributes.class;
}
@Override
@@ -57,7 +64,23 @@ public class RegionAttributesFactoryBean extends AttributesFactory
return true;
}
public void setAsyncEventQueueIds(String[] asyncEventQueueIds) {
Arrays.stream(ArrayUtils.nullSafeArray(asyncEventQueueIds, String.class))
.filter(StringUtils::hasText)
.map(String::trim)
.forEach(this::addAsyncEventQueueId);
}
public void setIndexUpdateType(IndexMaintenancePolicyType indexUpdateType) {
indexUpdateType.setIndexMaintenance(this);
}
public void setGatewaySenderIds(String[] gatewaySenderIds) {
Arrays.stream(ArrayUtils.nullSafeArray(gatewaySenderIds, String.class))
.filter(StringUtils::hasText)
.map(String::trim)
.forEach(this::addGatewaySenderId);
}
}

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

@@ -111,7 +111,9 @@ abstract class AbstractRegionParser extends AbstractSingleBeanDefinitionParser {
String resolvedCacheReference = ParsingUtils.resolveCacheReference(element.getAttribute("cache-ref"));
if (!subRegion) {
regionBuilder.addPropertyReference("cache", resolvedCacheReference);
ParsingUtils.setPropertyValue(element, regionBuilder, "close");
ParsingUtils.setPropertyValue(element, regionBuilder, "destroy");
}

19
src/main/java/org/springframework/data/gemfire/config/xml/TemplateRegionParser.java
View File

@@ -13,24 +13,28 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.data.gemfire.config.xml;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.ParserContext;
import org.springframework.data.gemfire.RegionAttributesFactoryBean;
import org.springframework.data.gemfire.PeerRegionFactoryBean;
import org.springframework.data.gemfire.RegionAttributesFactoryBean;
import org.w3c.dom.Element;
/**
* Bean definition parser for &lt;gfe:*-region-template&gt; SDG XML namespace (XSD) elements.
*
* @author John Blum
* @see PeerRegionFactoryBean
* @see AbstractRegionParser
* @see org.springframework.beans.factory.support.BeanDefinitionBuilder
* @see org.springframework.beans.factory.xml.ParserContext
* @see org.springframework.data.gemfire.PeerRegionFactoryBean
* @see org.springframework.data.gemfire.RegionAttributesFactoryBean
* @see org.springframework.data.gemfire.config.xml.AbstractRegionParser
* @see org.w3c.dom.Element
* @since 1.5.0
*/
class TemplateRegionParser extends AbstractRegionParser {
class TemplateRegionParser extends AbstractPeerRegionParser {
/**
* {@inheritDoc}
@@ -46,8 +50,9 @@ class TemplateRegionParser extends AbstractRegionParser {
@Override
protected void doParseRegion(Element element, ParserContext parserContext, BeanDefinitionBuilder builder,
boolean subRegion) {
BeanDefinitionBuilder regionAttributesBuilder = BeanDefinitionBuilder.genericBeanDefinition(
RegionAttributesFactoryBean.class);
BeanDefinitionBuilder regionAttributesBuilder =
BeanDefinitionBuilder.genericBeanDefinition(RegionAttributesFactoryBean.class);
doParseRegionConfiguration(element, parserContext, builder, regionAttributesBuilder, subRegion);

135
src/test/java/org/springframework/data/gemfire/wan/RegionsWithAsyncEventQueuesAndGatewaySendersUnitTests.java Normal file
View File

@@ -0,0 +1,135 @@
/*
* Copyright 2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.data.gemfire.wan;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import javax.annotation.Resource;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.cache.asyncqueue.AsyncEventListener;
import org.springframework.data.gemfire.support.AbstractFactoryBeanSupport;
import org.springframework.lang.Nullable;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringRunner;
/**
* The RegionsWithAsyncEventQueuesAndGatewaySendersUnitTests class...
*
* @author John Blum
* @since 1.0.0
*/
@RunWith(SpringRunner.class)
@ContextConfiguration
@SuppressWarnings("unused")
public class RegionsWithAsyncEventQueuesAndGatewaySendersUnitTests {
@Resource(name = "TemplateBasedLocalRegion")
private Region<?, ?> templateBasedLocalRegion;
@Resource(name = "LocalRegion")
private Region<?, ?> localRegion;
@Resource(name = "PartitionRegion")
private Region<?, ?> partitionRegion;
@Resource(name = "ReplicateRegion")
private Region<?, ?> replicateRegion;
private void assertRegion(Region<?, ?> region, String name, DataPolicy dataPolicy) {
assertThat(region).isNotNull();
assertThat(region.getName()).isEqualTo(name);
RegionAttributes<?, ?> regionAttributes = region.getAttributes();
assertThat(regionAttributes).isNotNull();
assertThat(regionAttributes.getDataPolicy()).isEqualTo(dataPolicy);
}
@Test
public void templateBasedlocalRegionConfigurationIsCorrect() {
assertRegion(this.templateBasedLocalRegion, "TemplateBasedLocalRegion", DataPolicy.NORMAL);
assertThat(this.templateBasedLocalRegion.getAttributes().getAsyncEventQueueIds())
.containsExactlyInAnyOrder("X", "Y", "Z");
assertThat(this.templateBasedLocalRegion.getAttributes().getGatewaySenderIds())
.containsExactlyInAnyOrder("99", "100", "101");
}
@Test
public void localRegionConfigurationIsCorrect() {
assertRegion(this.localRegion, "LocalRegion", DataPolicy.NORMAL);
assertThat(this.localRegion.getAttributes().getAsyncEventQueueIds())
.containsExactlyInAnyOrder("A", "B", "C", "D", "E");
assertThat(this.localRegion.getAttributes().getGatewaySenderIds())
.containsExactlyInAnyOrder("1", "2", "3", "4", "5");
}
@Test
public void partitionRegionConfigurationIsCorrect() {
assertRegion(this.partitionRegion, "PartitionRegion", DataPolicy.PARTITION);
assertThat(this.partitionRegion.getAttributes().getAsyncEventQueueIds())
.containsExactlyInAnyOrder("E", "F", "G", "H", "I");
assertThat(this.partitionRegion.getAttributes().getGatewaySenderIds())
.containsExactlyInAnyOrder("5", "6", "7", "8", "9");
}
@Test
public void sreplicateRegionConfigurationIsCorrect() {
assertRegion(this.replicateRegion, "ReplicateRegion", DataPolicy.REPLICATE);
assertThat(this.replicateRegion.getAttributes().getAsyncEventQueueIds())
.containsExactlyInAnyOrder("E", "J", "K", "L", "M");
assertThat(this.replicateRegion.getAttributes().getGatewaySenderIds())
.containsExactlyInAnyOrder("5", "10", "11", "12", "13");
}
public static final class AsyncEventListenerFactoryBean extends AbstractFactoryBeanSupport<AsyncEventListener> {
private final AsyncEventListener mockAsyncEventListener = mock(AsyncEventListener.class);
@Nullable @Override
public AsyncEventListener getObject() {
return this.mockAsyncEventListener;
}
@Nullable @Override
public Class<?> getObjectType() {
return this.mockAsyncEventListener != null
? this.mockAsyncEventListener.getClass()
: AsyncEventListener.class;
}
}
}

90
src/test/resources/org/springframework/data/gemfire/wan/RegionsWithAsyncEventQueuesAndGatewaySendersUnitTests-context.xml Normal file
View File

@@ -0,0 +1,90 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:gfe="http://www.springframework.org/schema/geode"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/geode http://www.springframework.org/schema/geode/spring-geode.xsd
">
<bean class="org.springframework.data.gemfire.test.mock.config.GemFireMockObjectsBeanPostProcessor"/>
<gfe:cache/>
<bean id="MockAsyncEventListener"
class="org.springframework.data.gemfire.wan.RegionsWithAsyncEventQueuesAndGatewaySendersUnitTests$AsyncEventListenerFactoryBean"/>
<gfe:async-event-queue id="E">
<gfe:async-event-listener ref="MockAsyncEventListener"/>
</gfe:async-event-queue>
<gfe:gateway-sender id="5" manual-start="true" remote-distributed-system-id="1"/>
<gfe:region-template id="BaseRegionTemplate" async-event-queue-ids="X, Y" gateway-sender-ids="99, 100">
<gfe:gateway-sender name="101" manual-start="true" remote-distributed-system-id="1"/>
<gfe:async-event-queue name="Z">
<gfe:async-event-listener ref="MockAsyncEventListener"/>
</gfe:async-event-queue>
</gfe:region-template>
<!-- Template Region AsyncEventQueues (AEQ) & GatewaySenders are used -->
<gfe:local-region id="TemplateBasedLocalRegion" template="BaseRegionTemplate"/>
<!-- Template Region AsyncEventQueues (AEQ) & GatewaySenders are overridden -->
<gfe:local-region id="LocalRegion"
async-event-queue-ids="A, B, C"
gateway-sender-ids="1, 2, 3"
template="BaseRegionTemplate">
<gfe:gateway-sender name="4" manual-start="true" remote-distributed-system-id="1"/>
<gfe:gateway-sender-ref bean="5"/>
<gfe:async-event-queue name="D">
<gfe:async-event-listener ref="MockAsyncEventListener"/>
</gfe:async-event-queue>
<gfe:async-event-queue-ref bean="E"/>
</gfe:local-region>
<!-- Template Region AsyncEventQueues (AEQ) & GatewaySenders are overridden -->
<gfe:partitioned-region id="PartitionRegion"
async-event-queue-ids="F, G, H"
gateway-sender-ids="6, 7, 8"
template="BaseRegionTemplate">
<gfe:gateway-sender name="9" manual-start="true" remote-distributed-system-id="1"/>
<gfe:gateway-sender-ref bean="5"/>
<gfe:async-event-queue name="I">
<gfe:async-event-listener ref="MockAsyncEventListener"/>
</gfe:async-event-queue>
<gfe:async-event-queue-ref bean="E"/>
</gfe:partitioned-region>
<!-- Template Region AsyncEventQueues (AEQ) & GatewaySenders are overridden -->
<gfe:replicated-region id="ReplicateRegion"
async-event-queue-ids="J, K, L"
gateway-sender-ids="10, 11, 12"
template="BaseRegionTemplate">
<gfe:gateway-sender name="13" manual-start="true" remote-distributed-system-id="1"/>
<gfe:gateway-sender-ref bean="5"/>
<gfe:async-event-queue name="M">
<gfe:async-event-listener ref="MockAsyncEventListener"/>
</gfe:async-event-queue>
<gfe:async-event-queue-ref bean="E"/>
</gfe:replicated-region>
</beans>