From ed01af8012b8cb88df8b0d5e083101080483750d Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 30 Nov 2015 12:35:43 -0800 Subject: [PATCH] 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. --- src/main/java/org/springframework/data/gemfire/ScopeType.java | 3 ++- .../springframework/data/gemfire/WiringDeclarableSupport.java | 2 +- .../data/gemfire/wan/AbstractWANComponentFactoryBean.java | 2 +- .../data/gemfire/wan/GatewayHubFactoryBean.java | 2 +- .../data/gemfire/wan/GatewayReceiverFactoryBean.java | 2 +- ...zyWiringDeclarableSupportFunctionBasedIntegrationTest.java | 2 +- .../data/gemfire/client/ClientCacheFactoryBeanTest.java | 4 ++-- .../data/gemfire/test/StubGatewayReceiverFactory.java | 2 +- .../springframework/data/gemfire/test/support/FileUtils.java | 3 +-- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/springframework/data/gemfire/ScopeType.java b/src/main/java/org/springframework/data/gemfire/ScopeType.java index df35e636..e618ae57 100644 --- a/src/main/java/org/springframework/data/gemfire/ScopeType.java +++ b/src/main/java/org/springframework/data/gemfire/ScopeType.java @@ -16,8 +16,9 @@ package org.springframework.data.gemfire; +import org.springframework.util.StringUtils; + import com.gemstone.gemfire.cache.Scope; -import com.gemstone.gemfire.management.internal.cli.util.spring.StringUtils; /** * The ScopeType enum is an enumeration of GemFire Scopes. diff --git a/src/main/java/org/springframework/data/gemfire/WiringDeclarableSupport.java b/src/main/java/org/springframework/data/gemfire/WiringDeclarableSupport.java index baf18c42..44c406a0 100644 --- a/src/main/java/org/springframework/data/gemfire/WiringDeclarableSupport.java +++ b/src/main/java/org/springframework/data/gemfire/WiringDeclarableSupport.java @@ -22,9 +22,9 @@ import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.wiring.BeanConfigurerSupport; import org.springframework.beans.factory.wiring.BeanWiringInfo; import org.springframework.beans.factory.wiring.BeanWiringInfoResolver; +import org.springframework.util.StringUtils; import com.gemstone.gemfire.cache.Declarable; -import com.gemstone.gemfire.management.internal.cli.util.spring.StringUtils; /** * Dedicated {@link Declarable} support class for wiring the declaring instance through the Spring container. diff --git a/src/main/java/org/springframework/data/gemfire/wan/AbstractWANComponentFactoryBean.java b/src/main/java/org/springframework/data/gemfire/wan/AbstractWANComponentFactoryBean.java index bb1d3b16..edfab517 100644 --- a/src/main/java/org/springframework/data/gemfire/wan/AbstractWANComponentFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/wan/AbstractWANComponentFactoryBean.java @@ -25,9 +25,9 @@ import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.InitializingBean; import org.springframework.util.Assert; +import org.springframework.util.StringUtils; import com.gemstone.gemfire.cache.Cache; -import com.gemstone.gemfire.management.internal.cli.util.spring.StringUtils; /** * Base class for GemFire WAN Gateway component factory beans. diff --git a/src/main/java/org/springframework/data/gemfire/wan/GatewayHubFactoryBean.java b/src/main/java/org/springframework/data/gemfire/wan/GatewayHubFactoryBean.java index 1c0387e3..a41c77f0 100644 --- a/src/main/java/org/springframework/data/gemfire/wan/GatewayHubFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/wan/GatewayHubFactoryBean.java @@ -21,13 +21,13 @@ import java.util.List; import org.springframework.data.gemfire.wan.GatewayProxy.GatewayQueue; import org.springframework.util.Assert; +import org.springframework.util.StringUtils; import com.gemstone.gemfire.cache.Cache; import com.gemstone.gemfire.cache.util.Gateway; import com.gemstone.gemfire.cache.util.GatewayEventListener; import com.gemstone.gemfire.cache.util.GatewayHub; import com.gemstone.gemfire.cache.util.GatewayQueueAttributes; -import com.gemstone.gemfire.management.internal.cli.util.spring.StringUtils; /** * FactoryBean for creating a GemFire {@link GatewayHub} (deprecated in Gemfire 7). diff --git a/src/main/java/org/springframework/data/gemfire/wan/GatewayReceiverFactoryBean.java b/src/main/java/org/springframework/data/gemfire/wan/GatewayReceiverFactoryBean.java index a0ab9f41..7e1df8eb 100644 --- a/src/main/java/org/springframework/data/gemfire/wan/GatewayReceiverFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/wan/GatewayReceiverFactoryBean.java @@ -21,12 +21,12 @@ import java.util.List; import org.springframework.context.SmartLifecycle; import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import com.gemstone.gemfire.cache.Cache; import com.gemstone.gemfire.cache.wan.GatewayReceiver; import com.gemstone.gemfire.cache.wan.GatewayReceiverFactory; import com.gemstone.gemfire.cache.wan.GatewayTransportFilter; -import com.gemstone.gemfire.management.internal.cli.util.spring.StringUtils; /** * Spring FactoryBean for creating a GemFire {@link GatewayReceiver}. diff --git a/src/test/java/org/springframework/data/gemfire/LazyWiringDeclarableSupportFunctionBasedIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/LazyWiringDeclarableSupportFunctionBasedIntegrationTest.java index d9a5dee1..6c0d4281 100644 --- a/src/test/java/org/springframework/data/gemfire/LazyWiringDeclarableSupportFunctionBasedIntegrationTest.java +++ b/src/test/java/org/springframework/data/gemfire/LazyWiringDeclarableSupportFunctionBasedIntegrationTest.java @@ -30,10 +30,10 @@ import org.springframework.data.gemfire.function.sample.HelloFunctionExecution; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.util.Assert; +import org.springframework.util.StringUtils; import com.gemstone.gemfire.cache.execute.Function; import com.gemstone.gemfire.cache.execute.FunctionContext; -import com.gemstone.gemfire.management.internal.cli.util.spring.StringUtils; /** * The LazyWiringDeclarableSupportFunctionBasedIntegrationTest class is a test suite of test cases testing the contract diff --git a/src/test/java/org/springframework/data/gemfire/client/ClientCacheFactoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/client/ClientCacheFactoryBeanTest.java index 44d19f13..fdd1ba55 100644 --- a/src/test/java/org/springframework/data/gemfire/client/ClientCacheFactoryBeanTest.java +++ b/src/test/java/org/springframework/data/gemfire/client/ClientCacheFactoryBeanTest.java @@ -42,6 +42,7 @@ import org.springframework.beans.factory.BeanInitializationException; import org.springframework.context.event.ContextRefreshedEvent; import org.springframework.data.gemfire.TestUtils; import org.springframework.data.gemfire.config.GemfireConstants; +import org.springframework.util.ObjectUtils; import com.gemstone.gemfire.cache.CacheClosedException; import com.gemstone.gemfire.cache.GemFireCache; @@ -49,7 +50,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; /** @@ -404,7 +404,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; diff --git a/src/test/java/org/springframework/data/gemfire/test/StubGatewayReceiverFactory.java b/src/test/java/org/springframework/data/gemfire/test/StubGatewayReceiverFactory.java index 7e1eb5ac..c6d1cc3d 100644 --- a/src/test/java/org/springframework/data/gemfire/test/StubGatewayReceiverFactory.java +++ b/src/test/java/org/springframework/data/gemfire/test/StubGatewayReceiverFactory.java @@ -22,11 +22,11 @@ import java.util.List; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; +import org.springframework.util.StringUtils; import com.gemstone.gemfire.cache.wan.GatewayReceiver; import com.gemstone.gemfire.cache.wan.GatewayReceiverFactory; import com.gemstone.gemfire.cache.wan.GatewayTransportFilter; -import com.gemstone.gemfire.management.internal.cli.util.spring.StringUtils; /** * @author David Turanski diff --git a/src/test/java/org/springframework/data/gemfire/test/support/FileUtils.java b/src/test/java/org/springframework/data/gemfire/test/support/FileUtils.java index de1c970f..91b74fff 100644 --- a/src/test/java/org/springframework/data/gemfire/test/support/FileUtils.java +++ b/src/test/java/org/springframework/data/gemfire/test/support/FileUtils.java @@ -24,8 +24,7 @@ import java.io.FileWriter; import java.io.IOException; import org.springframework.util.Assert; - -import com.gemstone.gemfire.management.internal.cli.util.spring.StringUtils; +import org.springframework.util.StringUtils; /** * The FileUtils class is a utility class for processing files, working with java.io.File objects.