From c832baed7057d715c3960af8d4880d00ca0e1ae1 Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 10 Jan 2022 15:14:38 -0800 Subject: [PATCH] Remove use of Apache Geode internal o.a.g.internal.AbstractRegion API in the GemFireUtilsTests class. --- .../data/gemfire/support/GemFireUtilsTests.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/spring-session-data-geode/src/test/java/org/springframework/session/data/gemfire/support/GemFireUtilsTests.java b/spring-session-data-geode/src/test/java/org/springframework/session/data/gemfire/support/GemFireUtilsTests.java index e7a69e1..cb6a82e 100644 --- a/spring-session-data-geode/src/test/java/org/springframework/session/data/gemfire/support/GemFireUtilsTests.java +++ b/spring-session-data-geode/src/test/java/org/springframework/session/data/gemfire/support/GemFireUtilsTests.java @@ -38,7 +38,6 @@ import org.apache.geode.cache.RegionAttributes; import org.apache.geode.cache.RegionShortcut; import org.apache.geode.cache.client.ClientCache; import org.apache.geode.cache.client.ClientRegionShortcut; -import org.apache.geode.internal.cache.AbstractRegion; /** * Unit Tests for {@link GemFireUtils}. @@ -175,12 +174,11 @@ public class GemFireUtilsTests { @Test @SuppressWarnings("rawtypes") - // TODO: Remove use of Apache Geode internal API (AbstractRegion). public void clientRegionWithServerProxyIsNonLocalClientRegion() { ClientCache mockClientCache = mock(ClientCache.class); - AbstractRegion mockRegion = mock(AbstractRegion.class); + ServerProxyCapableRegion mockRegion = mock(ServerProxyCapableRegion.class); RegionAttributes mockRegionAttributes = mock(RegionAttributes.class); @@ -199,12 +197,11 @@ public class GemFireUtilsTests { @Test @SuppressWarnings("rawtypes") - // TODO: Remove use of Apache Geode internal API (AbstractRegion). public void clientRegionWithNoPoolAndNoServerProxyIsNotNonLocalClientRegion() { ClientCache mockClientCache = mock(ClientCache.class); - AbstractRegion mockRegion = mock(AbstractRegion.class); + ServerProxyCapableRegion mockRegion = mock(ServerProxyCapableRegion.class); RegionAttributes mockRegionAttributes = mock(RegionAttributes.class); @@ -244,12 +241,11 @@ public class GemFireUtilsTests { @Test @SuppressWarnings("rawtypes") - // TODO: Remove use of Apache Geode internal API (AbstractRegion). public void peerRegionWithServerProxyIsNotNonLocalClientRegion() { Cache mockPeerCache = mock(Cache.class); - AbstractRegion mockRegion = mock(AbstractRegion.class); + ServerProxyCapableRegion mockRegion = mock(ServerProxyCapableRegion.class); RegionAttributes mockRegionAttributes = mock(RegionAttributes.class); @@ -436,4 +432,10 @@ public class GemFireUtilsTests { .filter(it -> !it.name().toLowerCase().contains("proxy")) .forEach(it -> assertThat(GemFireUtils.isProxy(it)).isFalse()); } + + interface ServerProxyCapableRegion extends Region { + + boolean hasServerProxy(); + + } }