From 919d86093d7d287d005b384e673269014b112c0a Mon Sep 17 00:00:00 2001 From: John Blum Date: Wed, 28 Oct 2015 11:04:34 -0700 Subject: [PATCH] SGF-443 - Fix Spring Data GemFire apache-geode build due to recent changes to Apache Geode that removed the HDFS support. --- .../data/gemfire/DataPolicyConverter.java | 7 +---- .../support/RegionShortcutWrapper.java | 4 --- .../data/gemfire/DataPolicyConverterTest.java | 2 -- .../support/RegionShortcutWrapperTest.java | 28 ------------------- .../data/gemfire/test/StubCache.java | 12 -------- 5 files changed, 1 insertion(+), 52 deletions(-) diff --git a/src/main/java/org/springframework/data/gemfire/DataPolicyConverter.java b/src/main/java/org/springframework/data/gemfire/DataPolicyConverter.java index 125e9348..3e56159c 100644 --- a/src/main/java/org/springframework/data/gemfire/DataPolicyConverter.java +++ b/src/main/java/org/springframework/data/gemfire/DataPolicyConverter.java @@ -31,8 +31,7 @@ import com.gemstone.gemfire.cache.DataPolicy; public class DataPolicyConverter implements Converter { static enum Policy { - DEFAULT, EMPTY, NORMAL, PRELOADED, PARTITION, PERSISTENT_PARTITION, HDFS_PARTITION, HDFS_PERSISTENT_PARTITION, - REPLICATE, PERSISTENT_REPLICATE; + DEFAULT, EMPTY, NORMAL, PRELOADED, PARTITION, PERSISTENT_PARTITION, REPLICATE, PERSISTENT_REPLICATE; private static String toUpperCase(String value) { return (value == null ? null : value.toUpperCase()); @@ -59,10 +58,6 @@ public class DataPolicyConverter implements Converter { return DataPolicy.PARTITION; case PERSISTENT_PARTITION: return DataPolicy.PERSISTENT_PARTITION; - case HDFS_PARTITION: - return DataPolicy.HDFS_PARTITION; - case HDFS_PERSISTENT_PARTITION: - return DataPolicy.HDFS_PERSISTENT_PARTITION; case REPLICATE: return DataPolicy.REPLICATE; case PERSISTENT_REPLICATE: diff --git a/src/main/java/org/springframework/data/gemfire/support/RegionShortcutWrapper.java b/src/main/java/org/springframework/data/gemfire/support/RegionShortcutWrapper.java index 83e29d24..66a99294 100644 --- a/src/main/java/org/springframework/data/gemfire/support/RegionShortcutWrapper.java +++ b/src/main/java/org/springframework/data/gemfire/support/RegionShortcutWrapper.java @@ -36,7 +36,6 @@ public enum RegionShortcutWrapper { LOCAL_PERSISTENT(RegionShortcut.LOCAL_PERSISTENT), LOCAL_PERSISTENT_OVERFLOW(RegionShortcut.LOCAL_PERSISTENT_OVERFLOW), PARTITION(RegionShortcut.PARTITION), - PARTITION_HDFS(RegionShortcut.PARTITION_HDFS), PARTITION_HEAP_LRU(RegionShortcut.PARTITION_HEAP_LRU), PARTITION_OVERFLOW(RegionShortcut.PARTITION_OVERFLOW), PARTITION_PERSISTENT(RegionShortcut.PARTITION_PERSISTENT), @@ -45,12 +44,9 @@ public enum RegionShortcutWrapper { PARTITION_PROXY_REDUNDANT(RegionShortcut.PARTITION_PROXY_REDUNDANT), PARTITION_REDUNDANT(RegionShortcut.PARTITION_REDUNDANT), PARTITION_REDUNDANT_HEAP_LRU(RegionShortcut.PARTITION_REDUNDANT_HEAP_LRU), - PARTITION_REDUNDANT_HDFS(RegionShortcut.PARTITION_REDUNDANT_HDFS), PARTITION_REDUNDANT_OVERFLOW(RegionShortcut.PARTITION_REDUNDANT_OVERFLOW), PARTITION_REDUNDANT_PERSISTENT(RegionShortcut.PARTITION_REDUNDANT_PERSISTENT), PARTITION_REDUNDANT_PERSISTENT_OVERFLOW(RegionShortcut.PARTITION_REDUNDANT_PERSISTENT_OVERFLOW), - PARTITION_REDUNDANT_WRITEONLY_HDFS_STORE(RegionShortcut.PARTITION_REDUNDANT_WRITEONLY_HDFS_STORE), - PARTITION_WRITEONLY_HDFS_STORE(RegionShortcut.PARTITION_WRITEONLY_HDFS_STORE), REPLICATE(RegionShortcut.REPLICATE), REPLICATE_HEAP_LRU(RegionShortcut.REPLICATE_HEAP_LRU), REPLICATE_OVERFLOW(RegionShortcut.REPLICATE_OVERFLOW), diff --git a/src/test/java/org/springframework/data/gemfire/DataPolicyConverterTest.java b/src/test/java/org/springframework/data/gemfire/DataPolicyConverterTest.java index 2ed3df02..8df56026 100644 --- a/src/test/java/org/springframework/data/gemfire/DataPolicyConverterTest.java +++ b/src/test/java/org/springframework/data/gemfire/DataPolicyConverterTest.java @@ -57,8 +57,6 @@ public class DataPolicyConverterTest { assertEquals(DataPolicy.PRELOADED, DataPolicyConverter.Policy.PRELOADED.toDataPolicy()); assertEquals(DataPolicy.PARTITION, DataPolicyConverter.Policy.PARTITION.toDataPolicy()); assertEquals(DataPolicy.PERSISTENT_PARTITION, DataPolicyConverter.Policy.PERSISTENT_PARTITION.toDataPolicy()); - assertEquals(DataPolicy.HDFS_PARTITION, DataPolicyConverter.Policy.HDFS_PARTITION.toDataPolicy()); - assertEquals(DataPolicy.HDFS_PERSISTENT_PARTITION, DataPolicyConverter.Policy.HDFS_PERSISTENT_PARTITION.toDataPolicy()); assertEquals(DataPolicy.REPLICATE, DataPolicyConverter.Policy.REPLICATE.toDataPolicy()); assertEquals(DataPolicy.PERSISTENT_REPLICATE, DataPolicyConverter.Policy.PERSISTENT_REPLICATE.toDataPolicy()); assertEquals(DataPolicy.DEFAULT, DataPolicyConverter.Policy.DEFAULT.toDataPolicy()); diff --git a/src/test/java/org/springframework/data/gemfire/support/RegionShortcutWrapperTest.java b/src/test/java/org/springframework/data/gemfire/support/RegionShortcutWrapperTest.java index bfd0dedd..307b23bb 100644 --- a/src/test/java/org/springframework/data/gemfire/support/RegionShortcutWrapperTest.java +++ b/src/test/java/org/springframework/data/gemfire/support/RegionShortcutWrapperTest.java @@ -88,7 +88,6 @@ public class RegionShortcutWrapperTest { assertTrue(RegionShortcutWrapper.LOCAL_PERSISTENT.isLocal()); assertTrue(RegionShortcutWrapper.LOCAL_PERSISTENT_OVERFLOW.isLocal()); assertFalse(RegionShortcutWrapper.PARTITION.isLocal()); - assertFalse(RegionShortcutWrapper.PARTITION_HDFS.isLocal()); assertFalse(RegionShortcutWrapper.PARTITION_HEAP_LRU.isLocal()); assertFalse(RegionShortcutWrapper.PARTITION_OVERFLOW.isLocal()); assertFalse(RegionShortcutWrapper.PARTITION_PERSISTENT.isLocal()); @@ -96,13 +95,10 @@ public class RegionShortcutWrapperTest { assertFalse(RegionShortcutWrapper.PARTITION_PROXY.isLocal()); assertFalse(RegionShortcutWrapper.PARTITION_PROXY_REDUNDANT.isLocal()); assertFalse(RegionShortcutWrapper.PARTITION_REDUNDANT.isLocal()); - assertFalse(RegionShortcutWrapper.PARTITION_REDUNDANT_HDFS.isLocal()); assertFalse(RegionShortcutWrapper.PARTITION_REDUNDANT_HEAP_LRU.isLocal()); assertFalse(RegionShortcutWrapper.PARTITION_REDUNDANT_OVERFLOW.isLocal()); assertFalse(RegionShortcutWrapper.PARTITION_REDUNDANT_PERSISTENT.isLocal()); assertFalse(RegionShortcutWrapper.PARTITION_REDUNDANT_PERSISTENT_OVERFLOW.isLocal()); - assertFalse(RegionShortcutWrapper.PARTITION_REDUNDANT_WRITEONLY_HDFS_STORE.isLocal()); - assertFalse(RegionShortcutWrapper.PARTITION_WRITEONLY_HDFS_STORE.isLocal()); assertFalse(RegionShortcutWrapper.REPLICATE.isLocal()); assertFalse(RegionShortcutWrapper.REPLICATE_HEAP_LRU.isLocal()); assertFalse(RegionShortcutWrapper.REPLICATE_OVERFLOW.isLocal()); @@ -120,7 +116,6 @@ public class RegionShortcutWrapperTest { assertFalse(RegionShortcutWrapper.LOCAL_PERSISTENT.isOverflow()); assertTrue(RegionShortcutWrapper.LOCAL_PERSISTENT_OVERFLOW.isOverflow()); assertFalse(RegionShortcutWrapper.PARTITION.isOverflow()); - assertFalse(RegionShortcutWrapper.PARTITION_HDFS.isOverflow()); assertFalse(RegionShortcutWrapper.PARTITION_HEAP_LRU.isOverflow()); assertTrue(RegionShortcutWrapper.PARTITION_OVERFLOW.isOverflow()); assertFalse(RegionShortcutWrapper.PARTITION_PERSISTENT.isOverflow()); @@ -128,13 +123,10 @@ public class RegionShortcutWrapperTest { assertFalse(RegionShortcutWrapper.PARTITION_PROXY.isOverflow()); assertFalse(RegionShortcutWrapper.PARTITION_PROXY_REDUNDANT.isOverflow()); assertFalse(RegionShortcutWrapper.PARTITION_REDUNDANT.isOverflow()); - assertFalse(RegionShortcutWrapper.PARTITION_REDUNDANT_HDFS.isOverflow()); assertFalse(RegionShortcutWrapper.PARTITION_REDUNDANT_HEAP_LRU.isOverflow()); assertTrue(RegionShortcutWrapper.PARTITION_REDUNDANT_OVERFLOW.isOverflow()); assertFalse(RegionShortcutWrapper.PARTITION_REDUNDANT_PERSISTENT.isOverflow()); assertTrue(RegionShortcutWrapper.PARTITION_REDUNDANT_PERSISTENT_OVERFLOW.isOverflow()); - assertFalse(RegionShortcutWrapper.PARTITION_REDUNDANT_WRITEONLY_HDFS_STORE.isOverflow()); - assertFalse(RegionShortcutWrapper.PARTITION_WRITEONLY_HDFS_STORE.isOverflow()); assertFalse(RegionShortcutWrapper.REPLICATE.isOverflow()); assertFalse(RegionShortcutWrapper.REPLICATE_HEAP_LRU.isOverflow()); assertTrue(RegionShortcutWrapper.REPLICATE_OVERFLOW.isOverflow()); @@ -152,7 +144,6 @@ public class RegionShortcutWrapperTest { assertFalse(RegionShortcutWrapper.LOCAL_PERSISTENT.isPartition()); assertFalse(RegionShortcutWrapper.LOCAL_PERSISTENT_OVERFLOW.isPartition()); assertTrue(RegionShortcutWrapper.PARTITION.isPartition()); - assertTrue(RegionShortcutWrapper.PARTITION_HDFS.isPartition()); assertTrue(RegionShortcutWrapper.PARTITION_HEAP_LRU.isPartition()); assertTrue(RegionShortcutWrapper.PARTITION_OVERFLOW.isPartition()); assertTrue(RegionShortcutWrapper.PARTITION_PERSISTENT.isPartition()); @@ -160,13 +151,10 @@ public class RegionShortcutWrapperTest { assertTrue(RegionShortcutWrapper.PARTITION_PROXY.isPartition()); assertTrue(RegionShortcutWrapper.PARTITION_PROXY_REDUNDANT.isPartition()); assertTrue(RegionShortcutWrapper.PARTITION_REDUNDANT.isPartition()); - assertTrue(RegionShortcutWrapper.PARTITION_REDUNDANT_HDFS.isPartition()); assertTrue(RegionShortcutWrapper.PARTITION_REDUNDANT_HEAP_LRU.isPartition()); assertTrue(RegionShortcutWrapper.PARTITION_REDUNDANT_OVERFLOW.isPartition()); assertTrue(RegionShortcutWrapper.PARTITION_REDUNDANT_PERSISTENT.isPartition()); assertTrue(RegionShortcutWrapper.PARTITION_REDUNDANT_PERSISTENT_OVERFLOW.isPartition()); - assertTrue(RegionShortcutWrapper.PARTITION_REDUNDANT_WRITEONLY_HDFS_STORE.isPartition()); - assertTrue(RegionShortcutWrapper.PARTITION_WRITEONLY_HDFS_STORE.isPartition()); assertFalse(RegionShortcutWrapper.REPLICATE.isPartition()); assertFalse(RegionShortcutWrapper.REPLICATE_HEAP_LRU.isPartition()); assertFalse(RegionShortcutWrapper.REPLICATE_OVERFLOW.isPartition()); @@ -184,7 +172,6 @@ public class RegionShortcutWrapperTest { assertTrue(RegionShortcutWrapper.LOCAL_PERSISTENT.isPersistent()); assertTrue(RegionShortcutWrapper.LOCAL_PERSISTENT_OVERFLOW.isPersistent()); assertFalse(RegionShortcutWrapper.PARTITION.isPersistent()); - assertFalse(RegionShortcutWrapper.PARTITION_HDFS.isPersistent()); assertFalse(RegionShortcutWrapper.PARTITION_HEAP_LRU.isPersistent()); assertFalse(RegionShortcutWrapper.PARTITION_OVERFLOW.isPersistent()); assertTrue(RegionShortcutWrapper.PARTITION_PERSISTENT.isPersistent()); @@ -192,13 +179,10 @@ public class RegionShortcutWrapperTest { assertFalse(RegionShortcutWrapper.PARTITION_PROXY.isPersistent()); assertFalse(RegionShortcutWrapper.PARTITION_PROXY_REDUNDANT.isPersistent()); assertFalse(RegionShortcutWrapper.PARTITION_REDUNDANT.isPersistent()); - assertFalse(RegionShortcutWrapper.PARTITION_REDUNDANT_HDFS.isPersistent()); assertFalse(RegionShortcutWrapper.PARTITION_REDUNDANT_HEAP_LRU.isPersistent()); assertFalse(RegionShortcutWrapper.PARTITION_REDUNDANT_OVERFLOW.isPersistent()); assertTrue(RegionShortcutWrapper.PARTITION_REDUNDANT_PERSISTENT.isPersistent()); assertTrue(RegionShortcutWrapper.PARTITION_REDUNDANT_PERSISTENT_OVERFLOW.isPersistent()); - assertFalse(RegionShortcutWrapper.PARTITION_REDUNDANT_WRITEONLY_HDFS_STORE.isPersistent()); - assertFalse(RegionShortcutWrapper.PARTITION_WRITEONLY_HDFS_STORE.isPersistent()); assertFalse(RegionShortcutWrapper.REPLICATE.isPersistent()); assertFalse(RegionShortcutWrapper.REPLICATE_HEAP_LRU.isPersistent()); assertFalse(RegionShortcutWrapper.REPLICATE_OVERFLOW.isPersistent()); @@ -216,7 +200,6 @@ public class RegionShortcutWrapperTest { assertFalse(RegionShortcutWrapper.LOCAL_PERSISTENT.isPersistentOverflow()); assertTrue(RegionShortcutWrapper.LOCAL_PERSISTENT_OVERFLOW.isPersistentOverflow()); assertFalse(RegionShortcutWrapper.PARTITION.isPersistentOverflow()); - assertFalse(RegionShortcutWrapper.PARTITION_HDFS.isPersistentOverflow()); assertFalse(RegionShortcutWrapper.PARTITION_HEAP_LRU.isPersistentOverflow()); assertFalse(RegionShortcutWrapper.PARTITION_OVERFLOW.isPersistentOverflow()); assertFalse(RegionShortcutWrapper.PARTITION_PERSISTENT.isPersistentOverflow()); @@ -224,13 +207,10 @@ public class RegionShortcutWrapperTest { assertFalse(RegionShortcutWrapper.PARTITION_PROXY.isPersistentOverflow()); assertFalse(RegionShortcutWrapper.PARTITION_PROXY_REDUNDANT.isPersistentOverflow()); assertFalse(RegionShortcutWrapper.PARTITION_REDUNDANT.isPersistentOverflow()); - assertFalse(RegionShortcutWrapper.PARTITION_REDUNDANT_HDFS.isPersistentOverflow()); assertFalse(RegionShortcutWrapper.PARTITION_REDUNDANT_HEAP_LRU.isPersistentOverflow()); assertFalse(RegionShortcutWrapper.PARTITION_REDUNDANT_OVERFLOW.isPersistentOverflow()); assertFalse(RegionShortcutWrapper.PARTITION_REDUNDANT_PERSISTENT.isPersistentOverflow()); assertTrue(RegionShortcutWrapper.PARTITION_REDUNDANT_PERSISTENT_OVERFLOW.isPersistentOverflow()); - assertFalse(RegionShortcutWrapper.PARTITION_REDUNDANT_WRITEONLY_HDFS_STORE.isPersistentOverflow()); - assertFalse(RegionShortcutWrapper.PARTITION_WRITEONLY_HDFS_STORE.isPersistentOverflow()); assertFalse(RegionShortcutWrapper.REPLICATE.isPersistentOverflow()); assertFalse(RegionShortcutWrapper.REPLICATE_HEAP_LRU.isPersistentOverflow()); assertFalse(RegionShortcutWrapper.REPLICATE_OVERFLOW.isPersistentOverflow()); @@ -247,7 +227,6 @@ public class RegionShortcutWrapperTest { assertFalse(RegionShortcutWrapper.LOCAL_PERSISTENT.isProxy()); assertFalse(RegionShortcutWrapper.LOCAL_PERSISTENT_OVERFLOW.isProxy()); assertFalse(RegionShortcutWrapper.PARTITION.isProxy()); - assertFalse(RegionShortcutWrapper.PARTITION_HDFS.isProxy()); assertFalse(RegionShortcutWrapper.PARTITION_HEAP_LRU.isProxy()); assertFalse(RegionShortcutWrapper.PARTITION_OVERFLOW.isProxy()); assertFalse(RegionShortcutWrapper.PARTITION_PERSISTENT.isProxy()); @@ -255,13 +234,10 @@ public class RegionShortcutWrapperTest { assertTrue(RegionShortcutWrapper.PARTITION_PROXY.isProxy()); assertTrue(RegionShortcutWrapper.PARTITION_PROXY_REDUNDANT.isProxy()); assertFalse(RegionShortcutWrapper.PARTITION_REDUNDANT.isProxy()); - assertFalse(RegionShortcutWrapper.PARTITION_REDUNDANT_HDFS.isProxy()); assertFalse(RegionShortcutWrapper.PARTITION_REDUNDANT_HEAP_LRU.isProxy()); assertFalse(RegionShortcutWrapper.PARTITION_REDUNDANT_OVERFLOW.isProxy()); assertFalse(RegionShortcutWrapper.PARTITION_REDUNDANT_PERSISTENT.isProxy()); assertFalse(RegionShortcutWrapper.PARTITION_REDUNDANT_PERSISTENT_OVERFLOW.isProxy()); - assertFalse(RegionShortcutWrapper.PARTITION_REDUNDANT_WRITEONLY_HDFS_STORE.isProxy()); - assertFalse(RegionShortcutWrapper.PARTITION_WRITEONLY_HDFS_STORE.isProxy()); assertFalse(RegionShortcutWrapper.REPLICATE.isProxy()); assertFalse(RegionShortcutWrapper.REPLICATE_HEAP_LRU.isProxy()); assertFalse(RegionShortcutWrapper.REPLICATE_OVERFLOW.isProxy()); @@ -278,7 +254,6 @@ public class RegionShortcutWrapperTest { assertFalse(RegionShortcutWrapper.LOCAL_PERSISTENT.isRedundant()); assertFalse(RegionShortcutWrapper.LOCAL_PERSISTENT_OVERFLOW.isRedundant()); assertFalse(RegionShortcutWrapper.PARTITION.isRedundant()); - assertFalse(RegionShortcutWrapper.PARTITION_HDFS.isRedundant()); assertFalse(RegionShortcutWrapper.PARTITION_HEAP_LRU.isRedundant()); assertFalse(RegionShortcutWrapper.PARTITION_OVERFLOW.isRedundant()); assertFalse(RegionShortcutWrapper.PARTITION_PERSISTENT.isRedundant()); @@ -286,13 +261,10 @@ public class RegionShortcutWrapperTest { assertFalse(RegionShortcutWrapper.PARTITION_PROXY.isRedundant()); assertTrue(RegionShortcutWrapper.PARTITION_PROXY_REDUNDANT.isRedundant()); assertTrue(RegionShortcutWrapper.PARTITION_REDUNDANT.isRedundant()); - assertTrue(RegionShortcutWrapper.PARTITION_REDUNDANT_HDFS.isRedundant()); assertTrue(RegionShortcutWrapper.PARTITION_REDUNDANT_HEAP_LRU.isRedundant()); assertTrue(RegionShortcutWrapper.PARTITION_REDUNDANT_OVERFLOW.isRedundant()); assertTrue(RegionShortcutWrapper.PARTITION_REDUNDANT_PERSISTENT.isRedundant()); assertTrue(RegionShortcutWrapper.PARTITION_REDUNDANT_PERSISTENT_OVERFLOW.isRedundant()); - assertTrue(RegionShortcutWrapper.PARTITION_REDUNDANT_WRITEONLY_HDFS_STORE.isRedundant()); - assertFalse(RegionShortcutWrapper.PARTITION_WRITEONLY_HDFS_STORE.isRedundant()); assertFalse(RegionShortcutWrapper.REPLICATE.isRedundant()); assertFalse(RegionShortcutWrapper.REPLICATE_HEAP_LRU.isRedundant()); assertFalse(RegionShortcutWrapper.REPLICATE_OVERFLOW.isRedundant()); diff --git a/src/test/java/org/springframework/data/gemfire/test/StubCache.java b/src/test/java/org/springframework/data/gemfire/test/StubCache.java index 52840bc4..a931f258 100644 --- a/src/test/java/org/springframework/data/gemfire/test/StubCache.java +++ b/src/test/java/org/springframework/data/gemfire/test/StubCache.java @@ -45,8 +45,6 @@ import com.gemstone.gemfire.cache.client.ClientRegionFactory; import com.gemstone.gemfire.cache.client.ClientRegionShortcut; import com.gemstone.gemfire.cache.client.Pool; import com.gemstone.gemfire.cache.control.ResourceManager; -import com.gemstone.gemfire.cache.hdfs.HDFSStore; -import com.gemstone.gemfire.cache.hdfs.HDFSStoreFactory; import com.gemstone.gemfire.cache.lucene.LuceneService; import com.gemstone.gemfire.cache.query.Index; import com.gemstone.gemfire.cache.query.IndexExistsException; @@ -843,16 +841,6 @@ public class StubCache implements Cache, ClientCache { return false; } - @Override - public HDFSStoreFactory createHDFSStoreFactory() { - throw new UnsupportedOperationException("Not Implemented!"); - } - - @Override - public HDFSStore findHDFSStore(final String s) { - throw new UnsupportedOperationException("Not Implemented!"); - } - public RegionService createAuthenticatedView(final Properties userSecurityProperties) { return this; }