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

SGF-163 - made repository.findAll() consistent with count() for client regions

Browse Source
This commit is contained in:
David Turanski
2013-03-07 16:45:58 -05:00
parent 4a6021fbc3
commit 0163b43dd3
7 changed files with 164 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/java/org/springframework/data/gemfire/config/GemfireDataSourceParser.java
View File

@@ -32,27 +32,35 @@ public class GemfireDataSourceParser extends AbstractBeanDefinitionParser {
*/
@Override
protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) {
AbstractBeanDefinition poolDefinition = (AbstractBeanDefinition) new PoolParser().parse(element, parserContext);
MutablePropertyValues poolProps = poolDefinition.getPropertyValues();
MutablePropertyValues poolProps = poolDefinition.getPropertyValues();
poolProps.add("name", GemfireConstants.DEFAULT_GEMFIRE_POOL_NAME);
if (!element.hasAttribute("subscription-enabled")) {
poolProps.add("subscriptionEnabled", true);
}
parserContext.getRegistry().registerBeanDefinition(GemfireConstants.DEFAULT_GEMFIRE_POOL_NAME,poolDefinition);
AbstractBeanDefinition clientCacheDefinition = (AbstractBeanDefinition)new ClientCacheParser().parse(element, parserContext);
parserContext.getRegistry().registerBeanDefinition(GemfireConstants.DEFAULT_GEMFIRE_POOL_NAME, poolDefinition);
AbstractBeanDefinition clientCacheDefinition = (AbstractBeanDefinition) new ClientCacheParser().parse(element,
parserContext);
MutablePropertyValues props = clientCacheDefinition.getPropertyValues();
props.add("pool", poolDefinition);
clientCacheDefinition.setPropertyValues(props);
parserContext.getRegistry().registerBeanDefinition(GemfireConstants.DEFAULT_GEMFIRE_CACHE_NAME,clientCacheDefinition);
System.out.println("registered " + GemfireConstants.DEFAULT_GEMFIRE_CACHE_NAME+ ":" + clientCacheDefinition.getBeanClassName());
BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(GemfireDataSourcePostProcessor.class);
parserContext.getRegistry().registerBeanDefinition(GemfireConstants.DEFAULT_GEMFIRE_CACHE_NAME,
clientCacheDefinition);
System.out.println("registered " + GemfireConstants.DEFAULT_GEMFIRE_CACHE_NAME + ":"
+ clientCacheDefinition.getBeanClassName());
BeanDefinitionBuilder builder = BeanDefinitionBuilder
.genericBeanDefinition(GemfireDataSourcePostProcessor.class);
builder.addConstructorArgReference(GemfireConstants.DEFAULT_GEMFIRE_CACHE_NAME);
BeanDefinitionReaderUtils.registerWithGeneratedName(builder.getBeanDefinition(), parserContext.getRegistry());
return null;

9
src/main/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepository.java
View File

@@ -100,13 +100,8 @@ public class SimpleGemfireRepository<T, ID extends Serializable> implements Gemf
*/
@Override
public Collection<T> findAll() {
return template.execute(new GemfireCallback<Collection<T>>() {
@Override
@SuppressWarnings({ "rawtypes", "unchecked" })
public Collection<T> doInGemfire(Region region) {
return region.values();
}
});
SelectResults<T> results = template.find("select * from " + template.getRegion().getFullPath());
return (Collection<T>)results.asList();
}
/*

29
src/test/java/org/springframework/data/gemfire/client/GemFireDataSourceTest.java
View File

@@ -43,40 +43,41 @@ import com.gemstone.gemfire.cache.client.Pool;
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration("/org/springframework/data/gemfire/client/datasource-client.xml")
public class GemFireDataSourceTest {
@Autowired
@Autowired
ApplicationContext ctx;
@BeforeClass
public static void startUp() throws Exception {
ForkUtil.startCacheServer(SpringCacheServerProcess.class.getName() + " "
ForkUtil.startCacheServer(SpringCacheServerProcess.class.getName() + " "
+ "/org/springframework/data/gemfire/client/datasource-server.xml");
}
@SuppressWarnings("unused")
@Test
public void testServerDataSource() {
Cache cache = ctx.getBean("gemfireCache",Cache.class);
Pool pool = ctx.getBean("gemfirePool",Pool.class);
Cache cache = ctx.getBean("gemfireCache", Cache.class);
Pool pool = ctx.getBean("gemfirePool", Pool.class);
assertEquals(true, pool.getSubscriptionEnabled());
String regions[] = ctx.getBeanNamesForType(Region.class);
List<String> regionList = Arrays.asList(regions);
assertTrue(regionList.contains("r1"));
assertTrue(regionList.contains("r2"));
assertTrue(regionList.contains("simple"));
Region<?,?> simple = ctx.getBean("simple", Region.class);
Region<?, ?> simple = ctx.getBean("simple", Region.class);
assertEquals(DataPolicy.EMPTY, simple.getAttributes().getDataPolicy());
}
@Test
public void testRepositoryCreated() {
PersonRepository repo = ctx.getBean(PersonRepository.class);
Person dave = new Person(1L,"Dave","Mathhews");
Person dave = new Person(1L, "Dave", "Mathhews");
repo.save(dave);
Person saved = repo.findOne(1L);
assertEquals("Dave",saved.getFirstname());
Person saved = repo.findOne(1L);
assertEquals("Dave", saved.getFirstname());
}
@AfterClass
public static void cleanUp() {
ForkUtil.sendSignal();

57
src/test/java/org/springframework/data/gemfire/repository/config/RepositoryClientRegionTests.java Normal file
View File

@@ -0,0 +1,57 @@
/*
* Copyright 2002-2013 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
*
* http://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.repository.config;
import static org.junit.Assert.assertEquals;
import java.util.Collection;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.gemfire.ForkUtil;
import org.springframework.data.gemfire.fork.SpringCacheServerProcess;
import org.springframework.data.gemfire.repository.sample.Person;
import org.springframework.data.gemfire.repository.sample.PersonRepository;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
/**
* @author David Turanski
*
*/
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration
public class RepositoryClientRegionTests {
@Autowired
PersonRepository repository;
@BeforeClass
public static void startUp() throws Exception {
ForkUtil.startCacheServer(SpringCacheServerProcess.class.getName() + " "
+ "/org/springframework/data/gemfire/repository/config/RepositoryClientRegionTests-server-context.xml");
}
@Test
public void testFindAllAndCount() {
assertEquals(2, repository.count());
assertEquals(2, ((Collection<Person>) repository.findAll()).size());
}
@AfterClass
public static void cleanUp() {
ForkUtil.sendSignal();
}
}

43
src/test/java/org/springframework/data/gemfire/repository/sample/RegionPopulator.java Normal file
View File

@@ -0,0 +1,43 @@
/*
* Copyright 2002-2013 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
*
* http://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.repository.sample;
import javax.annotation.Resource;
import org.springframework.beans.factory.InitializingBean;
import com.gemstone.gemfire.cache.Region;
/**
* @author David Turanski
*
*/
public class RegionPopulator implements InitializingBean {
@Resource(name="region")
Region<Object,Object> region;
/* (non-Javadoc)
* @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
*/
@Override
public void afterPropertiesSet() throws Exception {
region.put(1L,new Person(1L,"first1", "last1"));
region.put(2L,new Person(2L,"first2", "last2"));
}
public void setRegion(Region<Object,Object> region) {
this.region=region;
}
}

12
src/test/resources/org/springframework/data/gemfire/repository/config/RepositoryClientRegionTests-context.xml Normal file
View File

@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:gfe-data="http://www.springframework.org/schema/data/gemfire"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/data/gemfire http://www.springframework.org/schema/data/gemfire/spring-data-gemfire.xsd">
<gfe-data:datasource>
<gfe-data:server host="localhost" port="40404"/>
</gfe-data:datasource>
<gfe-data:repositories base-package="org.springframework.data.gemfire.repository.sample"/>
</beans>

14
src/test/resources/org/springframework/data/gemfire/repository/config/RepositoryClientRegionTests-server-context.xml Normal file
View File

@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:gfe="http://www.springframework.org/schema/gemfire"
xsi:schemaLocation="http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<gfe:cache/>
<gfe:cache-server/>
<gfe:replicated-region id="region" name="simple"/>
<bean class="org.springframework.data.gemfire.repository.sample.RegionPopulator">
<property name="region" ref="region"/>
</bean>
</beans>