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

SGF-447 - Fix Spring Data GemFire due to recent changes to Apache Geode that removed various internal utility classes in favor of external Spring classes.

Browse Source 
(cherry picked from commit 042af996e69c87e936f34003e02c826470ef41ab)
This commit is contained in:
Jens Deppe
2015-12-30 16:57:38 -08:00
parent 8590f2c222
commit 693a2e89c3
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/springframework/data/gemfire/ScopeType.java
View File

@@ -16,9 +16,10 @@
package org.springframework.data.gemfire;
import com.gemstone.gemfire.cache.Scope;
import org.springframework.util.StringUtils;
import com.gemstone.gemfire.cache.Scope;
/**
* The ScopeType enum is an enumeration of GemFire Scopes.
*

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

@@ -159,7 +159,7 @@ public class LookupRegionMutationIntegrationTest {
assertGatewaySenders(example, Arrays.asList("GWS"));
}
protected static interface Nameable extends BeanNameAware {
protected interface Nameable extends BeanNameAware {
String getName();
void setName(String name);
}

4
src/test/java/org/springframework/data/gemfire/client/ClientCacheFactoryBeanTest.java
View File

@@ -46,6 +46,7 @@ import org.springframework.context.event.ContextRefreshedEvent;
import org.springframework.data.gemfire.TestUtils;
import org.springframework.data.gemfire.config.GemfireConstants;
import org.springframework.data.gemfire.util.DistributedSystemUtils;
import org.springframework.util.ObjectUtils;
import com.gemstone.gemfire.cache.CacheClosedException;
import com.gemstone.gemfire.cache.GemFireCache;
@@ -53,7 +54,6 @@ import com.gemstone.gemfire.cache.client.ClientCache;
import com.gemstone.gemfire.cache.client.ClientCacheFactory;
import com.gemstone.gemfire.cache.client.Pool;
import com.gemstone.gemfire.distributed.DistributedSystem;
import com.gemstone.gemfire.internal.lang.ClassUtils;
import com.gemstone.gemfire.pdx.PdxSerializer;
/**
@@ -456,7 +456,7 @@ public class ClientCacheFactoryBeanTest {
assertTrue(expected.getMessage(), expected.getMessage().startsWith(String.format(
"no bean of type '%1$s' having name '%2$s' was found; a ClientCache requires a Pool",
Pool.class.getName(), GemfireConstants.DEFAULT_GEMFIRE_POOL_NAME)));
assertTrue(String.format("Cause was: %1$s!", ClassUtils.getClassName(expected.getCause())),
assertTrue(String.format("Cause was: %1$s!", ObjectUtils.nullSafeClassName(expected.getCause())),
expected.getCause() instanceof IllegalArgumentException);
assertEquals("TEST", expected.getCause().getMessage());
throw expected;

1
src/test/java/org/springframework/data/gemfire/test/support/FileUtils.java
View File

@@ -26,7 +26,6 @@ import java.io.IOException;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
/**
* The FileUtils class is a utility class for processing files, working with java.io.File objects.
*