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

Additional post-merge (cherry-pick) cleanup, fixing test failures and merge change conflicts.

Browse Source
This commit is contained in:
John Blum
2014-09-03 18:58:08 -07:00
parent f1a959350a
commit 08d5a4e8d6
3 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/springframework/data/gemfire/support/JSONRegionAdvice.java
View File

@@ -25,10 +25,10 @@ import org.apache.commons.logging.LogFactory;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
import org.codehaus.jackson.map.ObjectMapper;
import org.springframework.data.gemfire.GemfireTemplate;
import org.springframework.util.CollectionUtils;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.gemstone.gemfire.cache.Region;
import com.gemstone.gemfire.cache.query.SelectResults;
import com.gemstone.gemfire.cache.query.internal.ResultsBag;

2
src/test/java/org/springframework/data/gemfire/support/JSONRegionAdviceTest.java
View File

@@ -36,8 +36,8 @@ import com.gemstone.gemfire.cache.query.SelectResults;
/**
* @author David Turanski
*/
@ContextConfiguration
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration
@SuppressWarnings("unchecked")
public class JSONRegionAdviceTest {

37
src/test/resources/org/springframework/data/gemfire/support/JSONRegionAdviceTest-context.xml
View File

@@ -1,30 +1,33 @@
<?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"
xmlns:util="http://www.springframework.org/schema/util"
xmlns:gfe-data="http://www.springframework.org/schema/data/gemfire"
xsi:schemaLocation="http://www.springframework.org/schema/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
xmlns:gfe="http://www.springframework.org/schema/gemfire"
xmlns:gfe-data="http://www.springframework.org/schema/data/gemfire"
xmlns:util="http://www.springframework.org/schema/util"
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/gemfire http://www.springframework.org/schema/gemfire/spring-gemfire.xsd
http://www.springframework.org/schema/data/gemfire http://www.springframework.org/schema/data/gemfire/spring-data-gemfire.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
http://www.springframework.org/schema/data/gemfire http://www.springframework.org/schema/data/gemfire/spring-data-gemfire.xsd">
">
<util:properties id="props">
<prop key="bind-address">127.0.0.1</prop>
<util:properties id="gemfireProperties">
<prop key="name">JSONRegionAdviceTest</prop>
<prop key="mcast-port">0</prop>
<prop key="log-level">warning</prop>
</util:properties>
<gfe-data:json-region-autoproxy
pretty-print="false"
convert-returned-collections="true"
region-refs="someRegion"/>
<!-- Above replaces -->
<!-- <aop:aspectj-autoproxy /> -->
<!-- <bean class="org.springframework.data.gemfire.support.JSONRegionAdvice" /> -->
<gfe:cache properties-ref="gemfireProperties"/>
<gfe-data:json-region-autoproxy region-refs="someRegion" pretty-print="false" convert-returned-collections="true"/>
<!-- Above element replaces... -->
<!-- <aop:aspectj-autoproxy /> -->
<!-- <bean class="org.springframework.data.gemfire.support.JSONRegionAdvice" /> -->
<gfe:cache properties-ref="props"/>
<gfe:replicated-region id="someRegion"/>
<bean id="template" class="org.springframework.data.gemfire.GemfireTemplate">
<constructor-arg ref="someRegion"/>
</bean>
</beans>