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/GemfireUtils.java

@@ -20,6 +20,7 @@ import java.util.concurrent.ConcurrentMap;
 
 import org.springframework.data.gemfire.util.DistributedSystemUtils;
 import org.springframework.util.ClassUtils;
+import org.springframework.util.StringUtils;
 
 import com.gemstone.gemfire.cache.Cache;
 import com.gemstone.gemfire.cache.CacheClosedException;
@@ -28,7 +29,6 @@ import com.gemstone.gemfire.cache.Region;
 import com.gemstone.gemfire.cache.client.ClientCache;
 import com.gemstone.gemfire.cache.client.ClientCacheFactory;
 import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.management.internal.cli.util.spring.StringUtils;
 
 /**
  * GemfireUtils is an abstract utility class encapsulating common functionality to access features and capabilities

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.

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.

src/main/java/org/springframework/data/gemfire/snapshot/event/SnapshotApplicationEvent.java

@@ -19,9 +19,9 @@ package org.springframework.data.gemfire.snapshot.event;
 import static org.springframework.data.gemfire.snapshot.SnapshotServiceFactoryBean.SnapshotMetadata;
 
 import org.springframework.context.ApplicationEvent;
+import org.springframework.util.StringUtils;
 
 import com.gemstone.gemfire.cache.Region;
-import com.gemstone.gemfire.management.internal.cli.util.spring.StringUtils;
 
 /**
  * The SnapshotApplicationEvent class is a Spring ApplicationEvent signaling a GemFire Cache or Region snapshot event,

src/main/java/org/springframework/data/gemfire/util/DistributedSystemUtils.java

@@ -19,6 +19,7 @@ package org.springframework.data.gemfire.util;
 import java.util.Properties;
 
 import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
 
 import com.gemstone.gemfire.cache.GemFireCache;
 import com.gemstone.gemfire.cache.server.CacheServer;
@@ -26,7 +27,6 @@ import com.gemstone.gemfire.distributed.DistributedSystem;
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
 import com.gemstone.gemfire.internal.DistributionLocator;
-import com.gemstone.gemfire.management.internal.cli.util.spring.StringUtils;
 
 /**
  * DistributedSystemUtils is an abstract utility class for working with the GemFire DistributedSystem.

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.

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).

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}.