You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2017/05/05 20:54:42 UTC
[1/3] geode git commit: fixup
Repository: geode
Updated Branches:
refs/heads/feature/GEODE-2632-12 bccdb56e2 -> db79d2238
http://git-wip-us.apache.org/repos/asf/geode/blob/db79d223/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestTest.java
index 157e0f3..b894590 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/UnregisterInterestTest.java
@@ -14,7 +14,10 @@
*/
package org.apache.geode.internal.cache.tier.sockets.command;
-import static org.mockito.Matchers.*;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.isA;
import static org.mockito.Mockito.*;
import org.junit.Before;
@@ -31,9 +34,9 @@ import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
import org.apache.geode.CancelCriterion;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.operations.UnregisterInterestOperationContext;
import org.apache.geode.internal.Version;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.tier.CachedRegionHelper;
import org.apache.geode.internal.cache.tier.sockets.AcceptorImpl;
@@ -42,7 +45,6 @@ import org.apache.geode.internal.cache.tier.sockets.CacheServerStats;
import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.Part;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
-import org.apache.geode.internal.offheap.ReferenceCountHelper;
import org.apache.geode.internal.security.AuthorizeRequest;
import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.security.NotAuthorizedException;
@@ -53,6 +55,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
@PrepareForTest({CacheClientNotifier.class})
@Category(UnitTest.class)
public class UnregisterInterestTest {
+
private static final String REGION_NAME = "region1";
private static final String KEY = "key1";
private static final Object CALLBACK_ARG = "arg";
@@ -69,7 +72,7 @@ public class UnregisterInterestTest {
@Mock
private LocalRegion region;
@Mock
- private Cache cache;
+ private InternalCache cache;
@Mock
private CacheServerStats cacheServerStats;
@Mock
@@ -132,7 +135,6 @@ public class UnregisterInterestTest {
when(this.serverConnection.getAcceptor()).thenReturn(this.acceptor);
when(this.serverConnection.getClientVersion()).thenReturn(Version.CURRENT);
-
when(this.valuePart.getObject()).thenReturn(CALLBACK_ARG);
when(this.unregisterInterestOperationContext.getKey()).thenReturn(KEY);
http://git-wip-us.apache.org/repos/asf/geode/blob/db79d223/geode-core/src/test/java/org/apache/geode/management/internal/cli/CliUtilDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/CliUtilDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/CliUtilDUnitTest.java
index 86dd967..d610ca0 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/CliUtilDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/CliUtilDUnitTest.java
@@ -14,27 +14,25 @@
*/
package org.apache.geode.management.internal.cli;
-import static org.apache.geode.distributed.ConfigurationProperties.GROUPS;
-import static org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER;
-import static org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_PORT;
-import static org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_START;
-import static org.apache.geode.distributed.ConfigurationProperties.NAME;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import org.apache.geode.cache.Cache;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.junit.Assert.*;
+
+import java.util.Properties;
+import java.util.Set;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionFactory;
import org.apache.geode.cache.RegionShortcut;
-import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.FunctionAdapter;
import org.apache.geode.cache.execute.FunctionContext;
-import org.apache.geode.cache.execute.FunctionService;
import org.apache.geode.cache.execute.ResultCollector;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.internal.AvailablePortHelper;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.DistributedRegionMXBean;
import org.apache.geode.management.ManagementService;
import org.apache.geode.management.RegionMXBean;
@@ -49,19 +47,10 @@ import org.apache.geode.test.dunit.Wait;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.util.Properties;
-import java.util.Set;
@Category(DistributedTest.class)
public class CliUtilDUnitTest extends JUnit4CacheTestCase {
- public CliUtilDUnitTest() {
- super();
- }
-
public static final String COMMON_REGION = "region1";
public static final String COMMON_REGION_GROUP1 = "region_group1";
public static final String COMMON_REGION_GROUP2 = "region_group2";
@@ -78,7 +67,6 @@ public class CliUtilDUnitTest extends JUnit4CacheTestCase {
public static final String GROUP1 = "group1";
public static final String GROUP2 = "group2";
-
private static final long serialVersionUID = 1L;
@Override
@@ -86,14 +74,12 @@ public class CliUtilDUnitTest extends JUnit4CacheTestCase {
destroySetup();
}
-
protected final void destroySetup() {
disconnectAllFromDS();
}
@SuppressWarnings("serial")
void setupMembersWithIdsAndGroups() {
-
final VM vm1 = Host.getHost(0).getVM(0);
final VM vm2 = Host.getHost(0).getVM(1);
final VM vm3 = Host.getHost(0).getVM(2);
@@ -106,9 +92,7 @@ public class CliUtilDUnitTest extends JUnit4CacheTestCase {
createRegion(REGION_MEMBER1_GROUP1);
createRegion(COMMON_REGION_GROUP1);
createRegion(COMMON_REGION);
- // registerFunction();
}
-
});
vm2.invoke(new SerializableRunnable() {
@@ -118,7 +102,6 @@ public class CliUtilDUnitTest extends JUnit4CacheTestCase {
createRegion(REGION_MEMBER2_GROUP1);
createRegion(COMMON_REGION_GROUP1);
createRegion(COMMON_REGION);
- // registerFunction();
}
});
@@ -129,7 +112,6 @@ public class CliUtilDUnitTest extends JUnit4CacheTestCase {
createRegion(REGION_MEMBER1_GROUP2);
createRegion(COMMON_REGION_GROUP2);
createRegion(COMMON_REGION);
- // registerFunction();
}
});
@@ -140,7 +122,6 @@ public class CliUtilDUnitTest extends JUnit4CacheTestCase {
createRegion(REGION_MEMBER2_GROUP2);
createRegion(COMMON_REGION_GROUP2);
createRegion(COMMON_REGION);
- // registerFunction();
}
});
@@ -150,7 +131,6 @@ public class CliUtilDUnitTest extends JUnit4CacheTestCase {
startManager();
}
});
-
}
private void startManager() {
@@ -205,11 +185,6 @@ public class CliUtilDUnitTest extends JUnit4CacheTestCase {
LogWriterUtils.getLogWriter().info("Manager federation is complete");
}
- private void registerFunction() {
- Function funct = new DunitFunction("DunitFunction");
- FunctionService.registerFunction(funct);
- }
-
@SuppressWarnings("rawtypes")
private Region createRegion(String regionName) {
RegionFactory regionFactory = getCache().createRegionFactory(RegionShortcut.REPLICATE);
@@ -237,13 +212,6 @@ public class CliUtilDUnitTest extends JUnit4CacheTestCase {
assertNotNull(service.getMemberMXBean());
}
- @Test
- public void testFileToBytes() {
-
- // CliUtil.filesToBytes(fileNames)
-
- }
-
@SuppressWarnings("serial")
@Test
public void testCliUtilMethods() {
@@ -262,7 +230,7 @@ public class CliUtilDUnitTest extends JUnit4CacheTestCase {
final String id = (String) vm1.invoke(new SerializableCallable() {
@Override
public Object call() throws Exception {
- Cache cache = getCache();
+ InternalCache cache = getCache();
return cache.getDistributedSystem().getDistributedMember().getId();
}
});
@@ -290,10 +258,8 @@ public class CliUtilDUnitTest extends JUnit4CacheTestCase {
getRegionAssociatedMembers();
}
});
-
}
-
public void verifyFindAllMatchingMembers() {
try {
Set<DistributedMember> set = CliUtil.findMembersOrThrow(GROUP1, null);
@@ -302,7 +268,6 @@ public class CliUtilDUnitTest extends JUnit4CacheTestCase {
assertEquals(true, containsMember(set, MEMBER_1_GROUP1));
assertEquals(true, containsMember(set, MEMBER_2_GROUP1));
-
set = CliUtil.findMembersOrThrow("group1,group2", null);
assertNotNull(set);
assertEquals(4, set.size());
@@ -311,13 +276,11 @@ public class CliUtilDUnitTest extends JUnit4CacheTestCase {
assertEquals(true, containsMember(set, MEMBER_1_GROUP2));
assertEquals(true, containsMember(set, MEMBER_2_GROUP2));
-
set = CliUtil.findMembersOrThrow(null, MEMBER_1_GROUP1);
assertNotNull(set);
assertEquals(1, set.size());
assertEquals(true, containsMember(set, MEMBER_1_GROUP1));
-
set = CliUtil.findMembersOrThrow(null, "member1_group1,member2_group2");
assertNotNull(set);
assertEquals(2, set.size());
@@ -337,24 +300,20 @@ public class CliUtilDUnitTest extends JUnit4CacheTestCase {
return returnValue;
}
-
public void getDistributedMemberByNameOrId(String name, String id) {
-
DistributedMember member = CliUtil.getDistributedMemberByNameOrId(name);
assertNotNull(member);
member = CliUtil.getDistributedMemberByNameOrId(id);
assertNotNull(member);
-
}
-
public void verifyExecuteFunction() {
DunitFunction function = new DunitFunction("myfunction");
Set<DistributedMember> set;
try {
@SuppressWarnings("rawtypes")
- Region region1 = CacheFactory.getAnyInstance().getRegion(COMMON_REGION);
+ Region region1 = getCache().getRegion(COMMON_REGION);
region1.clear();
set = CliUtil.findMembersOrThrow(GROUP1, null);
assertEquals(2, set.size());
@@ -370,20 +329,12 @@ public class CliUtilDUnitTest extends JUnit4CacheTestCase {
}
}
-
public void getRegionAssociatedMembers() {
-
String region_group1 = "/region_group1";
String region1 = "/region1";
String region_member2_group1 = "/region_member2_group1";
- /*
- * String region_member1_group1 ="/region_member1_group1"; String region_member1_group2
- * ="/region_member1_group2"; String region_member2_group2 ="/region_member2_group2"; String
- * region_group2 ="/region_group2";
- */
-
- Cache cache = getCache();
+ InternalCache cache = getCache();
Set<DistributedMember> set = CliUtil.getRegionAssociatedMembers(region1, cache, true);
assertNotNull(set);
@@ -394,7 +345,7 @@ public class CliUtilDUnitTest extends JUnit4CacheTestCase {
assertEquals(true, containsMember(set, MEMBER_2_GROUP2));
/*
- * "FIXME - Abhishek" This is failing because last param is not considered in method set =
+ * TODO: This is failing because last param is not considered in method set =
* CliUtil.getRegionAssociatedMembers(region1, cache, false); assertNotNull(set);
* assertIndexDetailsEquals(1, set.size());
*/
@@ -409,7 +360,6 @@ public class CliUtilDUnitTest extends JUnit4CacheTestCase {
assertNotNull(set);
assertEquals(1, set.size());
assertEquals(true, containsMember(set, MEMBER_2_GROUP1));
-
}
public static class DunitFunction extends FunctionAdapter {
@@ -424,7 +374,7 @@ public class CliUtilDUnitTest extends JUnit4CacheTestCase {
@Override
public void execute(FunctionContext context) {
Object object = context.getArguments();
- Cache cache = CacheFactory.getAnyInstance();
+ InternalCache cache = (InternalCache) CacheFactory.getAnyInstance();
@SuppressWarnings("rawtypes")
Region region = cache.getRegion(COMMON_REGION);
String id = cache.getDistributedSystem().getDistributedMember().getName();
@@ -440,4 +390,3 @@ public class CliUtilDUnitTest extends JUnit4CacheTestCase {
}
}
-
http://git-wip-us.apache.org/repos/asf/geode/blob/db79d223/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AbstractCommandsSupportJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AbstractCommandsSupportJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AbstractCommandsSupportJUnitTest.java
index 6c52dad..91a59f8 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AbstractCommandsSupportJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/AbstractCommandsSupportJUnitTest.java
@@ -30,11 +30,11 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.FunctionService;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.lang.StringUtils;
import org.apache.geode.internal.util.CollectionUtils;
import org.apache.geode.management.cli.CliMetaData;
@@ -46,8 +46,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
* The AbstractCommandsSupportJUnitTest class is a test suite of test cases testing the contract and
* functionality of the AbstractCommandsSupport class for implementing GemFire shell (Gfsh)
* commands.
- * </p>
- *
+ *
* @see org.apache.geode.management.internal.cli.commands.AbstractCommandsSupport
* @see org.jmock.Expectations
* @see org.jmock.Mockery
@@ -74,7 +73,7 @@ public class AbstractCommandsSupportJUnitTest {
mockContext = null;
}
- private AbstractCommandsSupport createAbstractCommandsSupport(final Cache cache) {
+ private AbstractCommandsSupport createAbstractCommandsSupport(final InternalCache cache) {
return new TestCommands(cache);
}
@@ -152,7 +151,7 @@ public class AbstractCommandsSupportJUnitTest {
@Test
public void testGetMemberWithMatchingMemberId() {
- final Cache mockCache = mockContext.mock(Cache.class, "Cache");
+ final InternalCache mockCache = mockContext.mock(InternalCache.class, "InternalCache");
final DistributedSystem mockDistributedSystem =
mockContext.mock(DistributedSystem.class, "DistributedSystem");
@@ -179,7 +178,7 @@ public class AbstractCommandsSupportJUnitTest {
@Test
public void testGetMemberWithMatchingMemberName() {
- final Cache mockCache = mockContext.mock(Cache.class, "Cache");
+ final InternalCache mockCache = mockContext.mock(InternalCache.class, "InternalCache");
final DistributedSystem mockDistributedSystem =
mockContext.mock(DistributedSystem.class, "DistributedSystem");
@@ -206,7 +205,7 @@ public class AbstractCommandsSupportJUnitTest {
@Test
public void testGetMemberWithMatchingMemberNameCaseInsensitive() {
- final Cache mockCache = mockContext.mock(Cache.class, "Cache");
+ final InternalCache mockCache = mockContext.mock(InternalCache.class, "InternalCache");
final DistributedSystem mockDistributedSystem =
mockContext.mock(DistributedSystem.class, "DistributedSystem");
@@ -233,7 +232,7 @@ public class AbstractCommandsSupportJUnitTest {
@Test(expected = MemberNotFoundException.class)
public void testGetMemberThrowsMemberNotFoundException() {
- final Cache mockCache = mockContext.mock(Cache.class, "Cache");
+ final InternalCache mockCache = mockContext.mock(InternalCache.class, "InternalCache");
final DistributedSystem mockDistributedSystem =
mockContext.mock(DistributedSystem.class, "DistributedSystem");
@@ -266,7 +265,7 @@ public class AbstractCommandsSupportJUnitTest {
@Test
public void testGetMembers() {
- final Cache mockCache = mockContext.mock(Cache.class, "Cache");
+ final InternalCache mockCache = mockContext.mock(InternalCache.class, "InternalCache");
final DistributedSystem mockDistributedSystem =
mockContext.mock(DistributedSystem.class, "DistributedSystem");
@@ -299,7 +298,7 @@ public class AbstractCommandsSupportJUnitTest {
@Test
public void testGetMembersContainsOnlySelf() {
- final Cache mockCache = mockContext.mock(Cache.class, "Cache");
+ final InternalCache mockCache = mockContext.mock(InternalCache.class, "InternalCache");
final DistributedSystem mockDistributedSystem =
mockContext.mock(DistributedSystem.class, "DistributedSystem");
@@ -343,7 +342,7 @@ public class AbstractCommandsSupportJUnitTest {
});
final AbstractCommandsSupport commands =
- createAbstractCommandsSupport(mockContext.mock(Cache.class));
+ createAbstractCommandsSupport(mockContext.mock(InternalCache.class));
assertFalse(FunctionService.isRegistered("testRegister"));
assertSame(mockFunction, commands.register(mockFunction));
@@ -372,7 +371,7 @@ public class AbstractCommandsSupportJUnitTest {
});
final AbstractCommandsSupport commands =
- createAbstractCommandsSupport(mockContext.mock(Cache.class));
+ createAbstractCommandsSupport(mockContext.mock(InternalCache.class));
FunctionService.registerFunction(registeredFunction);
@@ -416,15 +415,15 @@ public class AbstractCommandsSupportJUnitTest {
private static class TestCommands extends AbstractCommandsSupport {
- private final Cache cache;
+ private final InternalCache cache;
- protected TestCommands(final Cache cache) {
- assert cache != null : "The Cache cannot be null!";
+ protected TestCommands(final InternalCache cache) {
+ assert cache != null : "The InternalCache cannot be null!";
this.cache = cache;
}
@Override
- protected Cache getCache() {
+ protected InternalCache getCache() {
return this.cache;
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/db79d223/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsJUnitTest.java
index 6291142..9aeccad 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommandsJUnitTest.java
@@ -32,7 +32,6 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.execute.Execution;
import org.apache.geode.cache.execute.FunctionInvocationTargetException;
import org.apache.geode.cache.execute.ResultCollector;
@@ -48,13 +47,11 @@ import org.apache.geode.management.internal.cli.util.DiskStoreNotFoundException;
import org.apache.geode.management.internal.cli.util.MemberNotFoundException;
import org.apache.geode.test.junit.categories.UnitTest;
-
/**
* The DiskStoreCommandsJUnitTest class is a test suite of test cases testing the contract and
* functionality of the DiskStoreCommands class implementing commands in the GemFire shell (gfsh)
* that access and modify disk stores in GemFire.
- * </p>
- *
+ *
* @see org.apache.geode.management.internal.cli.commands.DiskStoreCommands
* @see org.apache.geode.management.internal.cli.domain.DiskStoreDetails
* @see org.apache.geode.management.internal.cli.functions.DescribeDiskStoreFunction
@@ -87,7 +84,7 @@ public class DiskStoreCommandsJUnitTest {
mockContext = null;
}
- private DiskStoreCommands createDiskStoreCommands(final Cache cache,
+ private DiskStoreCommands createDiskStoreCommands(final InternalCache cache,
final DistributedMember distributedMember, final Execution functionExecutor) {
return new TestDiskStoreCommands(cache, distributedMember, functionExecutor);
}
@@ -102,7 +99,7 @@ public class DiskStoreCommandsJUnitTest {
final String diskStoreName = "mockDiskStore";
final String memberId = "mockMember";
- final Cache mockCache = mockContext.mock(Cache.class, "Cache");
+ final InternalCache mockCache = mockContext.mock(InternalCache.class, "InternalCache");
final DistributedMember mockMember =
mockContext.mock(DistributedMember.class, "DistributedMember");
@@ -145,7 +142,7 @@ public class DiskStoreCommandsJUnitTest {
final String diskStoreName = "mockDiskStore";
final String memberId = "mockMember";
- final Cache mockCache = mockContext.mock(Cache.class, "Cache");
+ final InternalCache mockCache = mockContext.mock(InternalCache.class, "InternalCache");
final DistributedMember mockMember =
mockContext.mock(DistributedMember.class, "DistributedMember");
@@ -175,7 +172,7 @@ public class DiskStoreCommandsJUnitTest {
final String diskStoreName = "mockDiskStore";
final String memberId = "mockMember";
- final Cache mockCache = mockContext.mock(Cache.class, "Cache");
+ final InternalCache mockCache = mockContext.mock(InternalCache.class, "InternalCache");
final DistributedMember mockMember =
mockContext.mock(DistributedMember.class, "DistributedMember");
@@ -211,7 +208,7 @@ public class DiskStoreCommandsJUnitTest {
final String diskStoreName = "mockDiskStore";
final String memberId = "mockMember";
- final Cache mockCache = mockContext.mock(Cache.class, "Cache");
+ final InternalCache mockCache = mockContext.mock(InternalCache.class, "InternalCache");
final DistributedMember mockMember =
mockContext.mock(DistributedMember.class, "DistributedMember");
@@ -247,7 +244,7 @@ public class DiskStoreCommandsJUnitTest {
final String diskStoreName = "mockDiskStore";
final String memberId = "mockMember";
- final Cache mockCache = mockContext.mock(Cache.class, "Cache");
+ final InternalCache mockCache = mockContext.mock(InternalCache.class, "InternalCache");
final DistributedMember mockMember =
mockContext.mock(DistributedMember.class, "DistributedMember");
@@ -289,7 +286,7 @@ public class DiskStoreCommandsJUnitTest {
@Test
public void testGetDiskStoreList() {
- final Cache mockCache = mockContext.mock(Cache.class, "Cache");
+ final InternalCache mockCache = mockContext.mock(InternalCache.class, "InternalCache");
final DistributedMember mockDistributedMember =
mockContext.mock(DistributedMember.class, "DistributedMember");
@@ -338,7 +335,7 @@ public class DiskStoreCommandsJUnitTest {
@Test(expected = RuntimeException.class)
public void testGetDiskStoreListThrowsRuntimeException() {
- final Cache mockCache = mockContext.mock(Cache.class, "Cache");
+ final InternalCache mockCache = mockContext.mock(InternalCache.class, "InternalCache");
final DistributedMember mockDistributedMember =
mockContext.mock(DistributedMember.class, "DistributedMember");
@@ -365,7 +362,7 @@ public class DiskStoreCommandsJUnitTest {
@Test
public void testGetDiskStoreListReturnsFunctionInvocationTargetExceptionInResults() {
- final Cache mockCache = mockContext.mock(Cache.class, "Cache");
+ final InternalCache mockCache = mockContext.mock(InternalCache.class, "InternalCache");
final DistributedMember mockDistributedMember =
mockContext.mock(DistributedMember.class, "DistributedMember");
@@ -408,12 +405,12 @@ public class DiskStoreCommandsJUnitTest {
private static class TestDiskStoreCommands extends DiskStoreCommands {
- private final Cache cache;
+ private final InternalCache cache;
private final DistributedMember distributedMember;
private final Execution functionExecutor;
- public TestDiskStoreCommands(final Cache cache, final DistributedMember distributedMember,
- final Execution functionExecutor) {
+ public TestDiskStoreCommands(final InternalCache cache,
+ final DistributedMember distributedMember, final Execution functionExecutor) {
assert cache != null : "The Cache cannot be null!";
this.cache = cache;
this.distributedMember = distributedMember;
@@ -421,7 +418,7 @@ public class DiskStoreCommandsJUnitTest {
}
@Override
- protected Cache getCache() {
+ protected InternalCache getCache() {
return this.cache;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/db79d223/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
index 0e2a41e..2af3fea 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
@@ -14,17 +14,28 @@
*/
package org.apache.geode.management.internal.cli.commands;
-import static org.apache.geode.distributed.ConfigurationProperties.NAME;
-import static org.apache.geode.test.dunit.Assert.assertEquals;
-import static org.apache.geode.test.dunit.Assert.assertFalse;
-import static org.apache.geode.test.dunit.Assert.assertNotEquals;
-import static org.apache.geode.test.dunit.Assert.assertNotNull;
-import static org.apache.geode.test.dunit.Assert.assertNotSame;
-import static org.apache.geode.test.dunit.Assert.assertTrue;
-import static org.apache.geode.test.dunit.Assert.fail;
-import static org.apache.geode.test.dunit.IgnoredException.addIgnoredException;
-import static org.apache.geode.test.dunit.LogWriterUtils.getLogWriter;
-import static org.apache.geode.test.dunit.Wait.waitForCriterion;
+import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.apache.geode.test.dunit.Assert.*;
+import static org.apache.geode.test.dunit.IgnoredException.*;
+import static org.apache.geode.test.dunit.LogWriterUtils.*;
+import static org.apache.geode.test.dunit.Wait.*;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Random;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
@@ -43,6 +54,7 @@ import org.apache.geode.cache.query.internal.QCompiler;
import org.apache.geode.cache.util.CacheListenerAdapter;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.lang.StringUtils;
import org.apache.geode.management.DistributedRegionMXBean;
import org.apache.geode.management.ManagementService;
@@ -74,21 +86,6 @@ import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.FlakyTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Random;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicInteger;
/**
* Dunit class for testing gemfire data commands : get, put, remove, select, rebalance
@@ -133,7 +130,7 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
final static int COUNT = 5;
public String getMemberId() {
- Cache cache = getCache();
+ InternalCache cache = getCache();
return cache.getDistributedSystem().getDistributedMember().getId();
}
@@ -148,7 +145,7 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
vm1.invoke(new SerializableRunnable() {
public void run() {
- Cache cache = getCache();
+ InternalCache cache = getCache();
RegionFactory regionFactory = cache.createRegionFactory(RegionShortcut.REPLICATE);
Region dataRegion = regionFactory.create(DATA_REGION_NAME);
assertNotNull(dataRegion);
@@ -185,7 +182,7 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
vm2.invoke(new SerializableRunnable() {
public void run() {
- Cache cache = getCache();
+ InternalCache cache = getCache();
RegionFactory regionFactory = cache.createRegionFactory(RegionShortcut.REPLICATE);
Region dataRegion = regionFactory.create(DATA_REGION_NAME);
assertNotNull(dataRegion);
@@ -231,7 +228,7 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
SerializableRunnable checkRegionMBeans = new SerializableRunnable() {
@Override
public void run() {
- Cache cache = getCache();
+ InternalCache cache = getCache();
final ManagementService service = ManagementService.getManagementService(cache);
final WaitCriterion waitForMaangerMBean = new WaitCriterion() {
@@ -396,7 +393,7 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
private void doQueryRegionsAssociatedMembers(String queryTemplate, int expectedMembers,
boolean returnAll, String... regions) {
- Cache cache = CacheFactory.getAnyInstance();
+ InternalCache cache = getCache();
String query = queryTemplate;
int i = 1;
@@ -618,8 +615,8 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
testGetPutLocateEntryFromShellAndGemfire(doubleKey, doubleValue, Double.class, true, true);
}
- private void testGetPutLocateEntryFromShellAndGemfire(final Object key, final Object value,
- Class klass, boolean addRegionPath, boolean expResult) {
+ private void testGetPutLocateEntryFromShellAndGemfire(final Serializable key,
+ final Serializable value, Class klass, boolean addRegionPath, boolean expResult) {
final VM vm1 = Host.getHost(0).getVM(1);
@@ -1045,7 +1042,6 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
vm1.invoke(checkPutIfAbsentKeys);
vm2.invoke(checkPutIfAbsentKeys);
-
}
@Category(FlakyTest.class) // GEODE-1496 (http)
@@ -1194,7 +1190,6 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
validateResult(cmdResult, true);
validateLocationsResult(cmdResult, 6); // 3 Regions X 2 members = 6
}
-
}
@Test
@@ -1533,7 +1528,7 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
command = command + " " + "--key=" + keyJson + " --value=" + valueJson + " --region="
+ DATA_REGION_NAME_PATH;
command = command + " --key-class=" + Key1.class.getCanonicalName() + " --value-class="
- + Value2.class.getCanonicalName();;
+ + Value2.class.getCanonicalName();
CommandResult cmdResult = executeCommand(command);
printCommandOutput(cmdResult);
assertEquals(Result.Status.OK, cmdResult.getStatus());
@@ -1563,7 +1558,7 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
command = command + " " + "--key=" + keyJson + " --value=" + valueJson + " --region="
+ DATA_REGION_NAME_PATH;
command = command + " --key-class=" + Key1.class.getCanonicalName() + " --value-class="
- + Car.class.getCanonicalName();;
+ + Car.class.getCanonicalName();
CommandResult cmdResult = executeCommand(command);
printCommandOutput(cmdResult);
assertEquals(Result.Status.OK, cmdResult.getStatus());
@@ -1775,14 +1770,14 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
}
});
- /**
+ /*
* Add CacheListener
*/
manager.invoke(addCacheListenerInvocations(regionName));
vm1.invoke(addCacheListenerInvocations(regionName));
- /**
+ /*
* Import the data
*/
@@ -1799,7 +1794,7 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
getLogWriter().info(resultAsString);
assertEquals(Result.Status.OK, cmdResult.getStatus());
- /**
+ /*
* Validate the region entries after import They must match the entries before export
*/
@@ -1812,14 +1807,14 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
}
});
- /**
+ /*
* Verify callbacks were not invoked
*/
manager.invoke(verifyCacheListenerInvocations(regionName, false));
vm1.invoke(verifyCacheListenerInvocations(regionName, false));
- /**
+ /*
* Import the data with invokeCallbacks=true
*/
@@ -1842,7 +1837,7 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
commandResultToString(cmdResult);
assertEquals(Result.Status.OK, cmdResult.getStatus());
- /**
+ /*
* Verify callbacks were invoked
*/
@@ -2272,7 +2267,6 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
}
public void waitForListClientMbean(final String regionName) {
-
final VM manager = Host.getHost(0).getVM(0);
manager.invoke(new SerializableRunnable() {
@@ -2332,7 +2326,6 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
@Test
public void testRegionsViaMbeanAndFunctions() {
-
setupForGetPutRemoveLocateEntry("tesSimplePut");
waitForListClientMbean(DATA_REGION_NAME_PATH);
final VM manager = Host.getHost(0).getVM(0);
@@ -2360,7 +2353,7 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
String memSizeFromFunctionCall = (String) manager.invoke(new SerializableCallable() {
public Object call() {
- Cache cache = GemFireCacheImpl.getInstance();
+ InternalCache cache = GemFireCacheImpl.getInstance();
CliUtil.getMembersForeRegionViaFunction(cache, DATA_REGION_NAME_PATH, true);
return ""
+ CliUtil.getMembersForeRegionViaFunction(cache, DATA_REGION_NAME_PATH, true).size();
@@ -2403,7 +2396,7 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
String memSizeFromFunctionCall = (String) manager.invoke(new SerializableCallable() {
public Object call() {
- Cache cache = GemFireCacheImpl.getInstance();
+ InternalCache cache = GemFireCacheImpl.getInstance();
return ""
+ CliUtil.getMembersForeRegionViaFunction(cache, REBALANCE_REGION_NAME, true).size();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/db79d223/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/IndexCommandsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/IndexCommandsJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/IndexCommandsJUnitTest.java
index f2e168a..e3a644d 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/IndexCommandsJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/IndexCommandsJUnitTest.java
@@ -32,7 +32,6 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.execute.Execution;
import org.apache.geode.cache.execute.FunctionInvocationTargetException;
import org.apache.geode.cache.execute.ResultCollector;
@@ -80,7 +79,8 @@ public class IndexCommandsJUnitTest {
mockContext = null;
}
- private IndexCommands createIndexCommands(final Cache cache, final Execution functionExecutor) {
+ private IndexCommands createIndexCommands(final InternalCache cache,
+ final Execution functionExecutor) {
return new TestIndexCommands(cache, functionExecutor);
}
@@ -91,7 +91,7 @@ public class IndexCommandsJUnitTest {
@Test
public void testGetIndexListing() {
- final Cache mockCache = mockContext.mock(Cache.class, "Cache");
+ final InternalCache mockCache = mockContext.mock(InternalCache.class, "InternalCache");
final AbstractExecution mockFunctionExecutor =
mockContext.mock(AbstractExecution.class, "Function Executor");
@@ -132,7 +132,7 @@ public class IndexCommandsJUnitTest {
@Test(expected = RuntimeException.class)
public void testGetIndexListingThrowsRuntimeException() {
- final Cache mockCache = mockContext.mock(Cache.class, "Cache");
+ final InternalCache mockCache = mockContext.mock(InternalCache.class, "InternalCache");
final Execution mockFunctionExecutor = mockContext.mock(Execution.class, "Function Executor");
@@ -155,7 +155,7 @@ public class IndexCommandsJUnitTest {
@Test
public void testGetIndexListingReturnsFunctionInvocationTargetExceptionInResults() {
- final Cache mockCache = mockContext.mock(Cache.class, "Cache");
+ final InternalCache mockCache = mockContext.mock(InternalCache.class, "InternalCache");
final AbstractExecution mockFunctionExecutor =
mockContext.mock(AbstractExecution.class, "Function Executor");
@@ -192,18 +192,18 @@ public class IndexCommandsJUnitTest {
private static class TestIndexCommands extends IndexCommands {
- private final Cache cache;
+ private final InternalCache cache;
private final Execution functionExecutor;
- protected TestIndexCommands(final Cache cache, final Execution functionExecutor) {
- assert cache != null : "The Cache cannot be null!";
+ protected TestIndexCommands(final InternalCache cache, final Execution functionExecutor) {
+ assert cache != null : "The InternalCache cannot be null!";
assert functionExecutor != null : "The function executor cannot be null!";
this.cache = cache;
this.functionExecutor = functionExecutor;
}
@Override
- protected Cache getCache() {
+ protected InternalCache getCache() {
return this.cache;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/db79d223/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java
index 3756b81..5ae62b9 100755
--- a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java
+++ b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommands.java
@@ -15,7 +15,6 @@
package org.apache.geode.cache.lucene.internal.cli;
import org.apache.geode.SystemFailure;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.execute.Execution;
import org.apache.geode.cache.execute.Function;
@@ -27,6 +26,7 @@ import org.apache.geode.cache.lucene.internal.cli.functions.LuceneDestroyIndexFu
import org.apache.geode.cache.lucene.internal.cli.functions.LuceneListIndexFunction;
import org.apache.geode.cache.lucene.internal.cli.functions.LuceneSearchIndexFunction;
import org.apache.geode.distributed.DistributedMember;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.execute.AbstractExecution;
import org.apache.geode.internal.lang.StringUtils;
import org.apache.geode.internal.security.IntegratedSecurityService;
@@ -61,8 +61,7 @@ import java.util.stream.Collectors;
/**
* The LuceneIndexCommands class encapsulates all Geode shell (Gfsh) commands related to Lucene
* indexes defined in Geode.
- * </p>
- *
+ *
* @see AbstractCommandsSupport
* @see LuceneIndexDetails
* @see LuceneListIndexFunction
@@ -187,7 +186,7 @@ public class LuceneIndexCommands extends AbstractCommandsSupport {
this.securityService.authorizeRegionManage(regionPath);
try {
- final Cache cache = getCache();
+ final InternalCache cache = getCache();
LuceneIndexInfo indexInfo = new LuceneIndexInfo(indexName, regionPath, fields, analyzers);
final ResultCollector<?, ?> rc =
this.executeFunctionOnAllMembers(createIndexFunction, indexInfo);
@@ -383,7 +382,7 @@ public class LuceneIndexCommands extends AbstractCommandsSupport {
// region members. Then send the function to the remaining members to handle the case where
// the index has been created, but not the region
XmlEntity xmlEntity = null;
- Cache cache = getCache();
+ InternalCache cache = getCache();
Set<DistributedMember> regionMembers = getRegionMembers(cache, regionPath);
Set<DistributedMember> normalMembers = getNormalMembers(cache);
LuceneDestroyIndexInfo indexInfo = new LuceneDestroyIndexInfo(indexName, regionPath);
@@ -422,11 +421,11 @@ public class LuceneIndexCommands extends AbstractCommandsSupport {
return xmlEntity;
}
- protected Set<DistributedMember> getRegionMembers(Cache cache, String regionPath) {
+ protected Set<DistributedMember> getRegionMembers(InternalCache cache, String regionPath) {
return CliUtil.getMembersForeRegionViaFunction(cache, regionPath, true);
}
- protected Set<DistributedMember> getNormalMembers(Cache cache) {
+ protected Set<DistributedMember> getNormalMembers(InternalCache cache) {
return CliUtil.getAllNormalMembers(cache);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/db79d223/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsJUnitTest.java b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsJUnitTest.java
index fa45927..d4dca4a 100644
--- a/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsJUnitTest.java
+++ b/geode-lucene/src/test/java/org/apache/geode/cache/lucene/internal/cli/LuceneIndexCommandsJUnitTest.java
@@ -16,7 +16,10 @@ package org.apache.geode.cache.lucene.internal.cli;
import static org.junit.Assert.*;
import static org.mockito.Matchers.isA;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anyString;
import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.eq;
import java.util.ArrayList;
import java.util.Arrays;
@@ -29,9 +32,6 @@ import java.util.Set;
import junitparams.JUnitParamsRunner;
import junitparams.Parameters;
-
-import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.core.KeywordAnalyzer;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
@@ -41,7 +41,6 @@ import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.execute.Execution;
import org.apache.geode.cache.execute.ResultCollector;
import org.apache.geode.cache.lucene.internal.LuceneIndexStats;
@@ -50,10 +49,12 @@ import org.apache.geode.cache.lucene.internal.cli.functions.LuceneDescribeIndexF
import org.apache.geode.cache.lucene.internal.cli.functions.LuceneDestroyIndexFunction;
import org.apache.geode.cache.lucene.internal.cli.functions.LuceneListIndexFunction;
import org.apache.geode.distributed.DistributedMember;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.execute.AbstractExecution;
import org.apache.geode.internal.util.CollectionUtils;
import org.apache.geode.management.cli.Result.Status;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
+import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.result.CommandResult;
import org.apache.geode.management.internal.cli.result.ResultBuilder;
import org.apache.geode.management.internal.cli.result.TabularResultData;
@@ -63,11 +64,10 @@ import org.apache.geode.test.junit.categories.UnitTest;
/**
* The LuceneIndexCommandsJUnitTest class is a test suite of test cases testing the contract and
* functionality of the LuceneIndexCommands class.
- * </p>
- *
+ *
* @see LuceneIndexCommands
* @see LuceneIndexDetails
- * @see org.apache.geode.cache.lucene.internal.cli.functions.LuceneListIndexFunction
+ * @see LuceneListIndexFunction
* @see org.jmock.Expectations
* @see org.jmock.Mockery
* @see org.jmock.lib.legacy.ClassImposteriser
@@ -81,8 +81,7 @@ public class LuceneIndexCommandsJUnitTest {
@Test
public void testListIndexWithoutStats() {
-
- final Cache mockCache = mock(Cache.class, "Cache");
+ final InternalCache mockCache = mock(InternalCache.class, "InternalCache");
final String serverName = "mockServer";
final AbstractExecution mockFunctionExecutor =
mock(AbstractExecution.class, "Function Executor");
@@ -104,7 +103,6 @@ public class LuceneIndexCommandsJUnitTest {
results.add(CollectionUtils.asSet(indexDetails2, indexDetails1, indexDetails3));
-
when(mockFunctionExecutor.execute(isA(LuceneListIndexFunction.class)))
.thenReturn(mockResultCollector);
when(mockResultCollector.getResult()).thenReturn(results);
@@ -130,8 +128,7 @@ public class LuceneIndexCommandsJUnitTest {
@Test
public void testListIndexWithStats() {
-
- final Cache mockCache = mock(Cache.class, "Cache");
+ final InternalCache mockCache = mock(InternalCache.class, "InternalCache");
final String serverName = "mockServer";
final AbstractExecution mockFunctionExecutor =
mock(AbstractExecution.class, "Function Executor");
@@ -182,7 +179,7 @@ public class LuceneIndexCommandsJUnitTest {
@Test
public void testCreateIndex() throws Exception {
- final Cache mockCache = mock(Cache.class);
+ final InternalCache mockCache = mock(InternalCache.class);
final ResultCollector mockResultCollector = mock(ResultCollector.class);
final LuceneIndexCommands commands = spy(createIndexCommands(mockCache, null));
@@ -208,13 +205,11 @@ public class LuceneIndexCommandsJUnitTest {
assertEquals(Arrays.asList("member1", "member2", "member3"), data.retrieveAllValues("Member"));
assertEquals(Arrays.asList("Successfully created lucene index", "Failed: Index creation failed",
"Successfully created lucene index"), data.retrieveAllValues("Status"));
-
}
@Test
public void testDescribeIndex() throws Exception {
-
- final Cache mockCache = mock(Cache.class, "Cache");
+ final InternalCache mockCache = mock(InternalCache.class, "InternalCache");
final String serverName = "mockServer";
final ResultCollector mockResultCollector = mock(ResultCollector.class, "ResultCollector");
final LuceneIndexCommands commands = spy(createIndexCommands(mockCache, null));
@@ -251,8 +246,7 @@ public class LuceneIndexCommandsJUnitTest {
@Test
public void testSearchIndex() throws Exception {
-
- final Cache mockCache = mock(Cache.class, "Cache");
+ final InternalCache mockCache = mock(InternalCache.class, "InternalCache");
final ResultCollector mockResultCollector = mock(ResultCollector.class, "ResultCollector");
final LuceneIndexCommands commands = spy(createIndexCommands(mockCache, null));
@@ -277,7 +271,7 @@ public class LuceneIndexCommandsJUnitTest {
@Test
public void testSearchIndexWithPaging() throws Exception {
- final Cache mockCache = mock(Cache.class, "Cache");
+ final InternalCache mockCache = mock(InternalCache.class, "InternalCache");
final Gfsh mockGfsh = mock(Gfsh.class);
final ResultCollector mockResultCollector = mock(ResultCollector.class, "ResultCollector");
final LuceneIndexCommands commands = spy(createIndexCommands(mockCache, null));
@@ -341,13 +335,11 @@ public class LuceneIndexCommandsJUnitTest {
assertEquals(expectedPage1, actualPageResults.get(18));
assertEquals("\t\tPage 1 of 4", actualPageResults.get(19));
-
}
@Test
public void testSearchIndexWithKeysOnly() throws Exception {
-
- final Cache mockCache = mock(Cache.class, "Cache");
+ final InternalCache mockCache = mock(InternalCache.class, "InternalCache");
final ResultCollector mockResultCollector = mock(ResultCollector.class, "ResultCollector");
final LuceneIndexCommands commands = spy(createIndexCommands(mockCache, null));
@@ -370,8 +362,7 @@ public class LuceneIndexCommandsJUnitTest {
@Test
public void testSearchIndexWhenSearchResultsHaveSameScore() throws Exception {
-
- final Cache mockCache = mock(Cache.class, "Cache");
+ final InternalCache mockCache = mock(InternalCache.class, "InternalCache");
final ResultCollector mockResultCollector = mock(ResultCollector.class, "ResultCollector");
final LuceneIndexCommands commands = spy(createIndexCommands(mockCache, null));
@@ -548,7 +539,7 @@ public class LuceneIndexCommandsJUnitTest {
}
private LuceneIndexCommands createTestLuceneIndexCommandsForDestroyIndex() {
- final Cache mockCache = mock(Cache.class);
+ final InternalCache mockCache = mock(InternalCache.class);
final ResultCollector mockResultCollector = mock(ResultCollector.class);
final LuceneIndexCommands commands = spy(createIndexCommands(mockCache, null));
@@ -586,22 +577,21 @@ public class LuceneIndexCommandsJUnitTest {
data.accumulate("score", expectedResults[i].getScore());
}
CommandResult commandResult = (CommandResult) ResultBuilder.buildResult(data);
- StringBuffer buffer = new StringBuffer();
- while (commandResult.hasNextLine())
+ StringBuilder buffer = new StringBuilder();
+ while (commandResult.hasNextLine()) {
buffer.append(commandResult.nextLine());
+ }
return buffer.toString();
}
private List<Set<LuceneSearchResults>> getSearchResults(LuceneSearchResults... results) {
final List<Set<LuceneSearchResults>> queryResultsList = new ArrayList<>();
HashSet<LuceneSearchResults> queryResults = new HashSet<>();
- for (LuceneSearchResults result : results)
- queryResults.add(result);
+ Collections.addAll(queryResults, results);
queryResultsList.add(queryResults);
return queryResultsList;
}
-
private LuceneIndexStats getMockIndexStats(int queries, int commits, int updates, int docs) {
LuceneIndexStats mockIndexStats = mock(LuceneIndexStats.class);
when(mockIndexStats.getQueryExecutions()).thenReturn(queries);
@@ -611,7 +601,7 @@ public class LuceneIndexCommandsJUnitTest {
return mockIndexStats;
}
- private LuceneIndexCommands createIndexCommands(final Cache cache,
+ private LuceneIndexCommands createIndexCommands(final InternalCache cache,
final Execution functionExecutor) {
return new LuceneTestIndexCommands(cache, functionExecutor);
}
@@ -637,17 +627,17 @@ public class LuceneIndexCommandsJUnitTest {
private static class LuceneTestIndexCommands extends LuceneIndexCommands {
- private final Cache cache;
+ private final InternalCache cache;
private final Execution functionExecutor;
- protected LuceneTestIndexCommands(final Cache cache, final Execution functionExecutor) {
- assert cache != null : "The Cache cannot be null!";
+ protected LuceneTestIndexCommands(final InternalCache cache, final Execution functionExecutor) {
+ assert cache != null : "The InternalCache cannot be null!";
this.cache = cache;
this.functionExecutor = functionExecutor;
}
@Override
- protected Cache getCache() {
+ protected InternalCache getCache() {
return this.cache;
}
http://git-wip-us.apache.org/repos/asf/geode/blob/db79d223/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationDUnitTest.java b/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationDUnitTest.java
index 34f0a8b..b6b6712 100644
--- a/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationDUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/management/internal/configuration/ClusterConfigurationDUnitTest.java
@@ -49,6 +49,7 @@ import org.apache.geode.distributed.Locator;
import org.apache.geode.distributed.internal.InternalLocator;
import org.apache.geode.internal.admin.remote.ShutdownAllRequest;
import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.extension.Extensible;
import org.apache.geode.internal.cache.extension.Extension;
import org.apache.geode.internal.cache.extension.mock.MockCacheExtension;
@@ -144,7 +145,7 @@ public class ClusterConfigurationDUnitTest extends CliCommandTestBase {
localProps.setProperty(DEPLOY_WORKING_DIR, workingDir.getCanonicalPath());
getSystem(localProps);
- Cache cache = getCache();
+ InternalCache cache = getCache();
assertNotNull(cache);
@@ -215,7 +216,7 @@ public class ClusterConfigurationDUnitTest extends CliCommandTestBase {
localProps.setProperty(DEPLOY_WORKING_DIR, workingDir.getCanonicalPath());
getSystem(localProps);
- Cache cache = getCache();
+ InternalCache cache = getCache();
assertNotNull(cache);
@@ -420,7 +421,7 @@ public class ClusterConfigurationDUnitTest extends CliCommandTestBase {
localProps.setProperty(DEPLOY_WORKING_DIR, workingDir.getCanonicalPath());
getSystem(localProps);
- Cache cache = getCache();
+ InternalCache cache = getCache();
assertNotNull(cache);
return getAllNormalMembers(cache);
});
[3/3] geode git commit: fixup
Posted by kl...@apache.org.
fixup
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/db79d223
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/db79d223
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/db79d223
Branch: refs/heads/feature/GEODE-2632-12
Commit: db79d2238d626ed74c2c00261c22c7a817d69318
Parents: bccdb56
Author: Kirk Lund <kl...@apache.org>
Authored: Fri May 5 13:54:25 2017 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Fri May 5 13:54:25 2017 -0700
----------------------------------------------------------------------
.../geode/internal/cache/GemFireCacheImpl.java | 2 +
.../geode/internal/cache/InternalCache.java | 5 +
.../geode/internal/cache/LocalRegion.java | 18 +-
.../geode/internal/cache/PartitionedRegion.java | 2 +-
.../cache/tier/sockets/CacheClientNotifier.java | 357 +------------------
.../cache/tier/sockets/CacheClientUpdater.java | 74 +---
.../internal/cache/xmlcache/CacheCreation.java | 32 ++
.../internal/BaseManagementService.java | 20 +-
.../management/internal/FederatingManager.java | 76 +---
.../geode/management/internal/LocalManager.java | 47 +--
.../internal/beans/BeanUtilFuncs.java | 17 +-
.../internal/beans/QueryDataFunction.java | 25 +-
.../internal/cli/commands/ClientCommands.java | 22 +-
.../internal/cli/commands/DataCommands.java | 2 +-
.../internal/cli/commands/MemberCommands.java | 38 +-
.../internal/cli/commands/RegionCommands.java | 17 +-
.../internal/cli/commands/WanCommands.java | 175 +++------
.../cli/functions/DataCommandFunction.java | 54 +--
.../extension/mock/MockExtensionCommands.java | 19 +-
.../tier/sockets/command/CommitCommandTest.java | 4 +-
.../tier/sockets/command/ContainsKey66Test.java | 10 +-
.../tier/sockets/command/ContainsKeyTest.java | 7 +-
.../tier/sockets/command/CreateRegionTest.java | 6 +-
.../tier/sockets/command/Destroy65Test.java | 10 +-
.../tier/sockets/command/DestroyRegionTest.java | 8 +-
.../cache/tier/sockets/command/DestroyTest.java | 11 +-
.../cache/tier/sockets/command/Get70Test.java | 14 +-
.../tier/sockets/command/GetAll651Test.java | 13 +-
.../tier/sockets/command/GetAll70Test.java | 13 +-
.../cache/tier/sockets/command/GetAllTest.java | 6 +-
.../sockets/command/GetAllWithCallbackTest.java | 16 +-
...tClientPartitionAttributesCommand66Test.java | 7 +-
...GetClientPartitionAttributesCommandTest.java | 4 +-
.../tier/sockets/command/InvalidateTest.java | 14 +-
.../cache/tier/sockets/command/KeySetTest.java | 12 +-
.../cache/tier/sockets/command/Put61Test.java | 12 +-
.../cache/tier/sockets/command/Put65Test.java | 12 +-
.../cache/tier/sockets/command/PutTest.java | 10 +-
.../sockets/command/RegisterInterest61Test.java | 9 +-
.../command/RegisterInterestList61Test.java | 13 +-
.../command/RegisterInterestList66Test.java | 7 +-
.../command/RegisterInterestListTest.java | 13 +-
.../sockets/command/RegisterInterestTest.java | 21 +-
.../tier/sockets/command/RemoveAllTest.java | 15 +-
.../cache/tier/sockets/command/RequestTest.java | 5 +-
.../sockets/command/UnregisterInterestTest.java | 12 +-
.../internal/cli/CliUtilDUnitTest.java | 81 +----
.../AbstractCommandsSupportJUnitTest.java | 31 +-
.../commands/DiskStoreCommandsJUnitTest.java | 31 +-
.../commands/GemfireDataCommandsDUnitTest.java | 87 +++--
.../cli/commands/IndexCommandsJUnitTest.java | 18 +-
.../internal/cli/LuceneIndexCommands.java | 13 +-
.../cli/LuceneIndexCommandsJUnitTest.java | 60 ++--
.../ClusterConfigurationDUnitTest.java | 7 +-
54 files changed, 471 insertions(+), 1143 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/db79d223/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
index fbfd2b7..d9368e9 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
@@ -4406,6 +4406,7 @@ public class GemFireCacheImpl implements InternalCache, InternalClientCache, Has
/**
* Blocks until no register interests are in progress.
*/
+ @Override
public void waitForRegisterInterestsInProgress() {
// In *this* particular context, let the caller know that
// his cache has been cancelled. doWait below would do that as
@@ -5169,6 +5170,7 @@ public class GemFireCacheImpl implements InternalCache, InternalClientCache, Has
return PdxInstanceFactoryImpl.newCreator(className, true);
}
+ @Override
public PdxInstanceFactory createPdxInstanceFactory(String className, boolean expectDomainClass) {
return PdxInstanceFactoryImpl.newCreator(className, expectDomainClass);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/db79d223/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCache.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCache.java b/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCache.java
index c7ee361..5533ed1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCache.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCache.java
@@ -62,6 +62,7 @@ import org.apache.geode.internal.logging.InternalLogWriter;
import org.apache.geode.internal.offheap.MemoryAllocator;
import org.apache.geode.management.internal.JmxManagerAdvisor;
import org.apache.geode.management.internal.RestAgent;
+import org.apache.geode.pdx.PdxInstanceFactory;
import org.apache.geode.pdx.internal.TypeRegistry;
/**
@@ -302,4 +303,8 @@ public interface InternalCache extends Cache, Extensible<Cache>, CacheTime {
CacheServer addCacheServer(boolean isGatewayReceiver);
void setReadSerialized(boolean value);
+
+ PdxInstanceFactory createPdxInstanceFactory(String className, boolean expectDomainClass);
+
+ void waitForRegisterInterestsInProgress();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/db79d223/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
index 73db0a4..54ec6a4 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
@@ -678,16 +678,14 @@ public class LocalRegion extends AbstractRegion implements LoaderHelperFactory,
/**
* initialize the event tracker. Not all region implementations want or need one of these. Regions
- * that require one should reimplement this method and create one like so: {@code
- *
- *
-
- <pre>
+ * that require one should reimplement this method and create one like so:
+ *
+ * <pre>
+ * {@code
* this.eventTracker = new EventTracker(this.cache);
* this.eventTracker.start();
- </pre>
-
- }
+ * }
+ * </pre>
*/
void createEventTracker() {
// if LocalRegion is changed to have an event tracker, then the initialize()
@@ -696,7 +694,6 @@ public class LocalRegion extends AbstractRegion implements LoaderHelperFactory,
}
/**
- *
* Other region classes may track events using different mechanisms than EventTrackers
*/
EventTracker getEventTracker() {
@@ -1959,9 +1956,8 @@ public class LocalRegion extends AbstractRegion implements LoaderHelperFactory,
boolean result = entry != null;
if (result) {
ReferenceCountHelper.skipRefCountTracking();
- // no need to decompress since we only want to
+ // no need to decompress since we only want to know if we have an existing value
Object val = entry.getTransformedValue();
- // know if we have an existing value
if (val instanceof StoredObject) {
OffHeapHelper.release(val);
ReferenceCountHelper.unskipRefCountTracking();
http://git-wip-us.apache.org/repos/asf/geode/blob/db79d223/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
index 4e061ea..79dd50b 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
@@ -6586,7 +6586,7 @@ public class PartitionedRegion extends LocalRegion
/**
* Returns the lockname used by Distributed Lock service to clean the
- * {@code allPartitionedRegions{@code
+ * {@code allPartitionedRegions}.
*
* @return String
*/
http://git-wip-us.apache.org/repos/asf/geode/blob/db79d223/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifier.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifier.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifier.java
index 8a79fb6..e79bfbd 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifier.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientNotifier.java
@@ -50,7 +50,6 @@ import org.apache.geode.DataSerializer;
import org.apache.geode.Instantiator;
import org.apache.geode.InternalGemFireError;
import org.apache.geode.StatisticsFactory;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheEvent;
import org.apache.geode.cache.CacheException;
import org.apache.geode.cache.InterestRegistrationEvent;
@@ -135,15 +134,10 @@ public class CacheClientNotifier {
/**
* Factory method to construct a CacheClientNotifier <code>CacheClientNotifier</code> instance.
*
- * @param cache The GemFire <code>Cache</code>
- * @param acceptorStats
- * @param maximumMessageCount
- * @param messageTimeToLive
- * @param listener
- * @param overflowAttributesList
+ * @param cache The GemFire <code>InternalCache</code>
* @return A <code>CacheClientNotifier</code> instance
*/
- public static synchronized CacheClientNotifier getInstance(Cache cache,
+ public static synchronized CacheClientNotifier getInstance(InternalCache cache,
CacheServerStats acceptorStats, int maximumMessageCount, int messageTimeToLive,
ConnectionListener listener, List overflowAttributesList, boolean isGatewayReceiver) {
if (ccnSingleton == null) {
@@ -156,13 +150,6 @@ public class CacheClientNotifier {
// In this case, the HaContainer should be lazily created here
ccnSingleton.initHaContainer(overflowAttributesList);
}
- // else {
- // ccnSingleton.acceptorStats = acceptorStats;
- // ccnSingleton.maximumMessageCount = maximumMessageCount;
- // ccnSingleton.messageTimeToLive = messageTimeToLive;
- // ccnSingleton._connectionListener = listener;
- // ccnSingleton.setCache((GemFireCache)cache);
- // }
return ccnSingleton;
}
@@ -176,8 +163,6 @@ public class CacheClientNotifier {
* @param dos the <code>DataOutputStream</code> to use for writing the message
* @param type a byte representing the message type
* @param p_msg the message to be written; can be null
- * @param clientVersion
- *
*/
private void writeMessage(DataOutputStream dos, byte type, String p_msg, Version clientVersion)
throws IOException {
@@ -246,35 +231,12 @@ public class CacheClientNotifier {
* @param dos the <code>DataOutputStream</code> to use for writing the message
* @param type a byte representing the exception type
* @param ex the exception to be written; should not be null
- * @param clientVersion
- *
*/
private void writeException(DataOutputStream dos, byte type, Exception ex, Version clientVersion)
throws IOException {
-
writeMessage(dos, type, ex.toString(), clientVersion);
}
- // /**
- // * Factory method to return the singleton <code>CacheClientNotifier</code>
- // * instance.
- // * @return the singleton <code>CacheClientNotifier</code> instance
- // */
- // public static CacheClientNotifier getInstance()
- // {
- // return _instance;
- // }
-
- // /**
- // * Shuts down the singleton <code>CacheClientNotifier</code> instance.
- // */
- // public static void shutdownInstance()
- // {
- // if (_instance == null) return;
- // _instance.shutdown();
- // _instance = null;
- // }
-
/**
* Registers a new client updater that wants to receive updates with this server.
*
@@ -353,12 +315,10 @@ public class CacheClientNotifier {
DistributedSystem system = this.getCache().getDistributedSystem();
Properties sysProps = system.getProperties();
String authenticator = sysProps.getProperty(SECURITY_CLIENT_AUTHENTICATOR);
- // TODO;hitesh for conflation
+
if (clientVersion.compareTo(Version.GFE_603) >= 0) {
byte[] overrides = HandShake.extractOverrides(new byte[] {(byte) dis.read()});
-
clientConflation = overrides[0];
-
} else {
clientConflation = (byte) dis.read();
}
@@ -377,7 +337,6 @@ public class CacheClientNotifier {
proxy = registerClient(socket, proxyID, proxy, isPrimary, clientConflation, clientVersion,
acceptorId, notifyBySubscription);
- // TODO:hitesh
Properties credentials = HandShake.readCredentials(dis, dos, system);
if (credentials != null && proxy != null) {
if (securityLogWriter.fineEnabled()) {
@@ -443,11 +402,9 @@ public class CacheClientNotifier {
return;
}
-
this._statistics.endClientRegistration(startTime);
}
-
/**
* Registers a new client that wants to receive updates with this server.
*
@@ -676,7 +633,6 @@ public class CacheClientNotifier {
/**
* Makes Primary to this CacheClientProxy and start the dispatcher of the CacheClientProxy
*
- * @param proxyId
* @param isClientReady Whether the marker has already been processed. This value helps determine
* whether to start the dispatcher.
*/
@@ -693,9 +649,6 @@ public class CacheClientNotifier {
* Then, start or resume the dispatcher. Otherwise, let the clientReady message start the
* dispatcher. See CacheClientProxy.startOrResumeMessageDispatcher if
* (!proxy._messageDispatcher.isAlive()) {
- *
- * proxy._messageDispatcher._messageQueue.setPrimary(true); proxy._messageDispatcher.start();
- * }
*/
if (isClientReady || !proxy.isDurable()) {
if (logger.isDebugEnabled()) {
@@ -711,8 +664,6 @@ public class CacheClientNotifier {
/**
* Adds or updates entry in the dispatched message map when client sends an ack.
*
- * @param proxyId
- * @param eid
* @return success
*/
public boolean processDispatchedMessage(ClientProxyMembershipID proxyId, EventID eid) {
@@ -752,8 +703,6 @@ public class CacheClientNotifier {
* Unregisters an existing client from this server.
*
* @param memberId Uniquely identifies the client
- *
- *
*/
public void unregisterClient(ClientProxyMembershipID memberId, boolean normalShutdown) {
if (logger.isDebugEnabled()) {
@@ -779,13 +728,11 @@ public class CacheClientNotifier {
/**
* The client represented by the proxyId is ready to receive updates.
- *
- * @param proxyId
*/
public void readyForEvents(ClientProxyMembershipID proxyId) {
CacheClientProxy proxy = getClientProxy(proxyId);
if (proxy == null) {
- // @todo log a message
+ // TODO: log a message
} else {
// False signifies that a marker message has not already been processed.
// Generate and send one.
@@ -815,7 +762,6 @@ public class CacheClientNotifier {
CacheClientNotifier instance = ccnSingleton;
if (instance != null) {
instance.singletonNotifyClients(event, null);
-
}
}
@@ -827,7 +773,6 @@ public class CacheClientNotifier {
CacheClientNotifier instance = ccnSingleton;
if (instance != null) {
instance.singletonNotifyClients(event, cmsg);
-
}
}
@@ -837,10 +782,6 @@ public class CacheClientNotifier {
FilterInfo filterInfo = event.getLocalFilterInfo();
- // if (_logger.fineEnabled()) {
- // _logger.fine("Client dispatcher processing event " + event);
- // }
-
FilterProfile regionProfile = ((LocalRegion) event.getRegion()).getFilterProfile();
if (filterInfo != null) {
// if the routing was made using an old profile we need to recompute it
@@ -903,7 +844,7 @@ public class CacheClientNotifier {
}
if (!ids.isEmpty()) {
if (isTraceEnabled) {
- logger.trace("adding invalidation routing to message for {}" + ids);
+ logger.trace("adding invalidation routing to message for {}", ids);
}
clientMessage.addClientInterestList(ids, false);
filterClients.addAll(ids);
@@ -962,10 +903,8 @@ public class CacheClientNotifier {
if (filterInfo.filterProcessedLocally) {
removeDestroyTokensFromCqResultKeys(event, filterInfo);
}
-
}
-
private void removeDestroyTokensFromCqResultKeys(InternalCacheEvent event,
FilterInfo filterInfo) {
FilterProfile regionProfile = ((LocalRegion) event.getRegion()).getFilterProfile();
@@ -984,12 +923,9 @@ public class CacheClientNotifier {
}
}
-
/**
* delivers the given message to all proxies for routing. The message should already have client
* interest established, or override the isClientInterested method to implement its own routing
- *
- * @param clientMessage
*/
public static void routeClientMessage(Conflatable clientMessage) {
CacheClientNotifier instance = ccnSingleton;
@@ -1012,7 +948,7 @@ public class CacheClientNotifier {
}
}
- /*
+ /**
* this is for server side registration of client queue
*/
public static void routeSingleClientMessage(ClientUpdateMessage clientMessage,
@@ -1052,7 +988,6 @@ public class CacheClientNotifier {
if (deadProxies != null) {
closeDeadProxies(deadProxies, false);
}
-
}
/**
@@ -1144,7 +1079,6 @@ public class CacheClientNotifier {
* @param operation The operation that occurred (e.g. AFTER_CREATE)
* @param event The event containing the data to be updated
* @return a <code>ClientUpdateMessage</code>
- * @throws Exception
*/
private ClientUpdateMessageImpl initializeMessage(EnumListenerEvent operation, CacheEvent event)
throws Exception {
@@ -1217,87 +1151,6 @@ public class CacheClientNotifier {
|| operation == EnumListenerEvent.AFTER_REGION_INVALIDATE;
}
- // /**
- // * Queues the <code>ClientUpdateMessage</code> to be distributed
- // * to interested clients. This method is not being used currently.
- // * @param clientMessage The <code>ClientUpdateMessage</code> to be queued
- // */
- // protected void notifyClients(final ClientUpdateMessage clientMessage)
- // {
- // if (USE_SYNCHRONOUS_NOTIFICATION)
- // {
- // // Execute the method in the same thread as the caller
- // deliver(clientMessage);
- // }
- // else {
- // // Obtain an Executor and use it to execute the method in its own thread
- // try
- // {
- // getExecutor().execute(new Runnable()
- // {
- // public void run()
- // {
- // deliver(clientMessage);
- // }
- // }
- // );
- // } catch (InterruptedException e)
- // {
- // _logger.warning("CacheClientNotifier: notifyClients interrupted", e);
- // Thread.currentThread().interrupt();
- // }
- // }
- // }
-
- // /**
- // * Updates the information this <code>CacheClientNotifier</code> maintains
- // * for a given edge client. It is invoked when a edge client re-connects to
- // * the server.
- // *
- // * @param clientHost
- // * The host on which the client runs (i.e. the host the
- // * CacheClientNotifier uses to communicate with the
- // * CacheClientUpdater) This is used with the clientPort to uniquely
- // * identify the client
- // * @param clientPort
- // * The port through which the server communicates with the client
- // * (i.e. the port the CacheClientNotifier uses to communicate with
- // * the CacheClientUpdater) This is used with the clientHost to
- // * uniquely identify the client
- // * @param remotePort
- // * The port through which the client communicates with the server
- // * (i.e. the new port the ConnectionImpl uses to communicate with the
- // * ServerConnection)
- // * @param membershipID
- // * Uniquely idenifies the client
- // */
- // public void registerClientPort(String clientHost, int clientPort,
- // int remotePort, ClientProxyMembershipID membershipID)
- // {
- // if (_logger.fineEnabled())
- // _logger.fine("CacheClientNotifier: Registering client port: "
- // + clientHost + ":" + clientPort + " with remote port " + remotePort
- // + " and ID " + membershipID);
- // for (Iterator i = getClientProxies().iterator(); i.hasNext();) {
- // CacheClientProxy proxy = (CacheClientProxy)i.next();
- // if (_logger.finerEnabled())
- // _logger.finer("CacheClientNotifier: Potential client: " + proxy);
- // //if (proxy.representsCacheClientUpdater(clientHost, clientPort))
- // if (proxy.isMember(membershipID)) {
- // if (_logger.finerEnabled())
- // _logger
- // .finer("CacheClientNotifier: Updating remotePorts since host and port are a match");
- // proxy.addPort(remotePort);
- // }
- // else {
- // if (_logger.finerEnabled())
- // _logger.finer("CacheClientNotifier: Host and port "
- // + proxy.getRemoteHostAddress() + ":" + proxy.getRemotePort()
- // + " do not match " + clientHost + ":" + clientPort);
- // }
- // }
- // }
-
/**
* Registers client interest in the input region and key.
*
@@ -1348,23 +1201,9 @@ public class CacheClientNotifier {
}
}
- /*
- * protected void addFilterRegisteredClients(String regionName, ClientProxyMembershipID
- * membershipID) throws RegionNotFoundException { // Update Regions book keeping. LocalRegion
- * region = (LocalRegion)this._cache.getRegion(regionName); if (region == null) { //throw new
- * AssertionError("Could not find region named '" + regionName + "'"); // @todo: see bug 36805 //
- * fix for bug 37979 if (_logger.fineEnabled()) { _logger .fine("CacheClientNotifier: Client " +
- * membershipID + " :Throwing RegionDestroyedException as region: " + regionName +
- * " is not present."); } throw new RegionDestroyedException("registerInterest failed",
- * regionName); } else { region.getFilterProfile().addFilterRegisteredClients(this, membershipID);
- * } }
- */
-
/**
* Store region and delta relation
*
- * @param regionsWithEmptyDataPolicy
- * @param regionName
* @param regionDataPolicy (0==empty)
* @since GemFire 6.1
*/
@@ -1455,13 +1294,11 @@ public class CacheClientNotifier {
}
}
-
/**
* If the conflatable is an instance of HAEventWrapper, and if the corresponding entry is present
* in the haContainer, set the reference to the clientUpdateMessage to null and putInProgress flag
* to false. Also, if the ref count is zero, then remove the entry from the haContainer.
*
- * @param conflatable
* @since GemFire 5.7
*/
private void checkAndRemoveFromClientMsgsRegion(Conflatable conflatable) {
@@ -1482,9 +1319,6 @@ public class CacheClientNotifier {
}
}
}
- // else {
- // This is a replay-of-event case.
- // }
} else {
// This wrapper resides in haContainer.
wrapper.setClientUpdateMessage(null);
@@ -1523,7 +1357,6 @@ public class CacheClientNotifier {
return proxy;
}
-
/**
* Returns the <code>CacheClientProxy</code> associated to the durableClientId
*
@@ -1593,10 +1426,6 @@ public class CacheClientNotifier {
membershipID);
logger.debug("{}::getClientProxySameDS(), Number of proxies in the Cache Clinet Notifier: {}",
this, getClientProxies().size());
- /*
- * _logger.fine(this + "::getClientProxySameDS(), Proxies in the Cache Clinet Notifier: " +
- * getClientProxies());
- */
}
CacheClientProxy proxy = null;
for (Iterator i = getClientProxies().iterator(); i.hasNext();) {
@@ -1616,7 +1445,6 @@ public class CacheClientNotifier {
return proxy;
}
-
/**
* It will remove the clients connected to the passed acceptorId. If its the only server, shuts
* down this instance.
@@ -1702,7 +1530,6 @@ public class CacheClientNotifier {
}
}
this.timedOutDurableClientProxies.remove(proxy.getProxyID());
-
}
protected void addClientInitProxy(CacheClientProxy proxy) throws IOException {
@@ -1717,7 +1544,6 @@ public class CacheClientNotifier {
return this._initClientProxies.containsKey(proxy.getProxyID());
}
-
/**
* Returns (possibly stale) set of memberIds for all clients being actively notified by this
* server.
@@ -1779,7 +1605,6 @@ public class CacheClientNotifier {
* @since GemFire 5.6
*/
public boolean hasPrimaryForDurableClient(String durableId) {
-
for (Iterator iter = this._clientProxies.values().iterator(); iter.hasNext();) {
CacheClientProxy proxy = (CacheClientProxy) iter.next();
ClientProxyMembershipID proxyID = proxy.getProxyID();
@@ -1826,7 +1651,6 @@ public class CacheClientNotifier {
return false;
}
-
/**
* Removes an existing <code>CacheClientProxy</code> from the list of known client proxies
*
@@ -1845,7 +1669,6 @@ public class CacheClientNotifier {
chm.numOfClientsPerVersion.decrementAndGet(proxy.getVersion().ordinal());
}
}
-
}
void durableClientTimedOut(ClientProxyMembershipID client) {
@@ -1866,17 +1689,6 @@ public class CacheClientNotifier {
return Collections.unmodifiableCollection(this._clientProxies.values());
}
- // /**
- // * Returns the <code>Executor</code> that delivers messages to the
- // * <code>CacheClientProxy</code> instances.
- // * @return the <code>Executor</code> that delivers messages to the
- // * <code>CacheClientProxy</code> instances
- // */
- // protected Executor getExecutor()
- // {
- // return _executor;
- // }
-
private void closeAllClientCqs(CacheClientProxy proxy) {
CqService cqService = proxy.getCache().getCqService();
if (cqService != null) {
@@ -1899,7 +1711,6 @@ public class CacheClientNotifier {
/**
* Shuts down durable client proxy
- *
*/
public boolean closeDurableClientProxy(String durableClientId) throws CacheException {
CacheClientProxy ccp = getClientProxy(durableClientId);
@@ -1915,6 +1726,7 @@ public class CacheClientNotifier {
if (logger.isDebugEnabled()) {
logger.debug("Cannot close running durable client: {}", durableClientId);
}
+ // TODO: never throw an anonymous inner class
throw new CacheException("Cannot close a running durable client : " + durableClientId) {};
}
}
@@ -1958,7 +1770,6 @@ public class CacheClientNotifier {
} // for
}
-
/**
* Registers a new <code>InterestRegistrationListener</code> with the set of
* <code>InterestRegistrationListener</code>s.
@@ -2029,9 +1840,9 @@ public class CacheClientNotifier {
}
/**
- * Returns this <code>CacheClientNotifier</code>'s <code>Cache</code>.
+ * Returns this <code>CacheClientNotifier</code>'s <code>InternalCache</code>.
*
- * @return this <code>CacheClientNotifier</code>'s <code>Cache</code>
+ * @return this <code>CacheClientNotifier</code>'s <code>InternalCache</code>
*/
protected InternalCache getCache() { // TODO:SYNC: looks wrong
if (this._cache != null && this._cache.isClosed()) {
@@ -2066,19 +1877,12 @@ public class CacheClientNotifier {
protected void handleInterestEvent(InterestRegistrationEvent event) {
LocalRegion region = (LocalRegion) event.getRegion();
region.handleInterestEvent(event);
-
}
/**
- * Constructor.
- *
- * @param cache The GemFire <code>Cache</code>
- * @param acceptorStats
- * @param maximumMessageCount
- * @param messageTimeToLive
+ * @param cache The GemFire <code>InternalCache</code>
* @param listener a listener which should receive notifications abouts queues being added or
* removed.
- * @param overflowAttributesList
*/
private CacheClientNotifier(InternalCache cache, CacheServerStats acceptorStats,
int maximumMessageCount, int messageTimeToLive, ConnectionListener listener,
@@ -2109,9 +1913,6 @@ public class CacheClientNotifier {
}
this._statistics = new CacheClientNotifierStats(factory);
- // Initialize the executors
- // initializeExecutors(this._logger);
-
try {
this.logFrequency = Long.valueOf(System.getProperty(MAX_QUEUE_LOG_FREQUENCY));
if (this.logFrequency <= 0) {
@@ -2165,13 +1966,6 @@ public class CacheClientNotifier {
}
}
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geode.distributed.internal.DistributionMessage#process(org.apache.geode.
- * distributed.internal.DistributionManager)
- */
@Override
protected void process(DistributionManager dm) {
// Get the proxy for the proxy id
@@ -2197,11 +1991,6 @@ public class CacheClientNotifier {
}
}
- /*
- * (non-Javadoc)
- *
- * @see org.apache.geode.internal.DataSerializableFixedID#getDSFID()
- */
public int getDSFID() {
return SERVER_INTEREST_REGISTRATION_MESSAGE;
}
@@ -2223,107 +2012,8 @@ public class CacheClientNotifier {
this.clientMessage = new ClientInterestMessageImpl();
InternalDataSerializer.invokeFromData(this.clientMessage, in);
}
-
}
-
- // * Initializes the <code>QueuedExecutor</code> and
- // <code>PooledExecutor</code>
- // * used to deliver messages to <code>CacheClientProxy</code> instances.
- // * @param logger The GemFire <code>LogWriterI18n</code>
- // */
- // private void initializeExecutors(LogWriterI18n logger)
- // {
- // // Create the thread groups
- // final ThreadGroup loggerGroup = LoggingThreadGroup.createThreadGroup("Cache
- // Client Notifier Logger Group", logger);
- // final ThreadGroup notifierGroup =
- // new ThreadGroup("Cache Client Notifier Group")
- // {
- // public void uncaughtException(Thread t, Throwable e)
- // {
- // Thread.dumpStack();
- // loggerGroup.uncaughtException(t, e);
- // //CacheClientNotifier.exceptionInThreads = true;
- // }
- // };
- //
- // // Originally set ThreadGroup to be a daemon, but it was causing the
- // following
- // // exception after five minutes of non-activity (the keep alive time of the
- // // threads in the PooledExecutor.
- //
- // // java.lang.IllegalThreadStateException
- // // at java.lang.ThreadGroup.add(Unknown Source)
- // // at java.lang.Thread.init(Unknown Source)
- // // at java.lang.Thread.<init>(Unknown Source)
- // // at
- // org.apache.geode.internal.cache.tier.sockets.CacheClientNotifier$4.newThread(CacheClientNotifier.java:321)
- // // at
- // org.apache.edu.oswego.cs.dl.util.concurrent.PooledExecutor.addThread(PooledExecutor.java:512)
- // // at
- // org.apache.edu.oswego.cs.dl.util.concurrent.PooledExecutor.execute(PooledExecutor.java:888)
- // // at
- // org.apache.geode.internal.cache.tier.sockets.CacheClientNotifier.notifyClients(CacheClientNotifier.java:95)
- // // at
- // org.apache.geode.internal.cache.tier.sockets.ServerConnection.run(ServerConnection.java:271)
- //
- // //notifierGroup.setDaemon(true);
- //
- // if (USE_QUEUED_EXECUTOR)
- // createQueuedExecutor(notifierGroup);
- // else
- // createPooledExecutor(notifierGroup);
- // }
-
- // /**
- // * Creates the <code>QueuedExecutor</code> used to deliver messages
- // * to <code>CacheClientProxy</code> instances
- // * @param notifierGroup The <code>ThreadGroup</code> to which the
- // * <code>QueuedExecutor</code>'s <code>Threads</code> belong
- // */
- // protected void createQueuedExecutor(final ThreadGroup notifierGroup)
- // {
- // QueuedExecutor queuedExecutor = new QueuedExecutor(new LinkedQueue());
- // queuedExecutor.setThreadFactory(new ThreadFactory()
- // {
- // public Thread newThread(Runnable command)
- // {
- // Thread thread = new Thread(notifierGroup, command, "Queued Cache Client
- // Notifier");
- // thread.setDaemon(true);
- // return thread;
- // }
- // });
- // _executor = queuedExecutor;
- // }
-
- // /**
- // * Creates the <code>PooledExecutor</code> used to deliver messages
- // * to <code>CacheClientProxy</code> instances
- // * @param notifierGroup The <code>ThreadGroup</code> to which the
- // * <code>PooledExecutor</code>'s <code>Threads</code> belong
- // */
- // protected void createPooledExecutor(final ThreadGroup notifierGroup)
- // {
- // PooledExecutor pooledExecutor = new PooledExecutor(new
- // BoundedLinkedQueue(4096), 50);
- // pooledExecutor.setMinimumPoolSize(10);
- // pooledExecutor.setKeepAliveTime(1000 * 60 * 5);
- // pooledExecutor.setThreadFactory(new ThreadFactory()
- // {
- // public Thread newThread(Runnable command)
- // {
- // Thread thread = new Thread(notifierGroup, command, "Pooled Cache Client
- // Notifier");
- // thread.setDaemon(true);
- // return thread;
- // }
- // });
- // pooledExecutor.createThreads(5);
- // _executor = pooledExecutor;
- // }
-
protected void deliverInterestChange(ClientProxyMembershipID proxyID,
ClientInterestMessageImpl message) {
DM dm = ((InternalDistributedSystem) this.getCache().getDistributedSystem())
@@ -2469,23 +2159,6 @@ public class CacheClientNotifier {
*/
protected static final int ALL_PORTS = -1;
- // /**
- // * Whether to synchonously deliver messages to proxies.
- // * This is currently hard-coded to true to ensure ordering.
- // */
- // protected static final boolean USE_SYNCHRONOUS_NOTIFICATION =
- // true;
- // Boolean.getBoolean("CacheClientNotifier.USE_SYNCHRONOUS_NOTIFICATION");
-
- // /**
- // * Whether to use the <code>QueuedExecutor</code> (or the
- // * <code>PooledExecutor</code>) to deliver messages to proxies.
- // * Currently, delivery is synchronous. No <code>Executor</code> is
- // * used.
- // */
- // protected static final boolean USE_QUEUED_EXECUTOR =
- // Boolean.getBoolean("CacheClientNotifier.USE_QUEUED_EXECUTOR");
-
/**
* The map of known <code>CacheClientProxy</code> instances. Maps ClientProxyMembershipID to
* CacheClientProxy. Note that the keys in this map are not updated when a durable client
@@ -2506,9 +2179,9 @@ public class CacheClientNotifier {
new HashSet<ClientProxyMembershipID>();
/**
- * The GemFire <code>Cache</code>. Note that since this is a singleton class you should not use a
- * direct reference to _cache in CacheClientNotifier code. Instead, you should always use
- * <code>getCache()</code>
+ * The GemFire <code>InternalCache</code>. Note that since this is a singleton class you should
+ * not use a direct reference to _cache in CacheClientNotifier code. Instead, you should always
+ * use <code>getCache()</code>
*/
private InternalCache _cache;
@@ -2541,10 +2214,6 @@ public class CacheClientNotifier {
*/
private volatile HAContainerWrapper haContainer;
- // /**
- // * The singleton <code>CacheClientNotifier</code> instance
- // */
- // protected static CacheClientNotifier _instance;
/**
* The size of the server-to-client communication socket buffers. This can be modified using the
* BridgeServer.SOCKET_BUFFER_SIZE system property.
http://git-wip-us.apache.org/repos/asf/geode/blob/db79d223/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientUpdater.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientUpdater.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientUpdater.java
index ca25b6e..728abf7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientUpdater.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientUpdater.java
@@ -138,6 +138,7 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
* The buffer upon which we receive messages
*/
private final ByteBuffer commBuffer;
+
private boolean commBufferReleased;
private final CCUStats stats;
@@ -146,6 +147,7 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
* Cache for which we provide service
*/
private /* final */ InternalCache cache;
+
private /* final */ CachedRegionHelper cacheHelper;
/**
@@ -202,7 +204,7 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
* @return true if cache appears
*/
private boolean waitForCache() {
- InternalCache c;
+ InternalCache cache;
long tilt = System.currentTimeMillis() + MAX_CACHE_WAIT * 1000;
for (;;) {
if (quitting()) {
@@ -222,8 +224,8 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
new Object[] {this, MAX_CACHE_WAIT}));
return false;
}
- c = GemFireCacheImpl.getInstance();
- if (c != null && !c.isClosed()) {
+ cache = GemFireCacheImpl.getInstance();
+ if (cache != null && !cache.isClosed()) {
break;
}
boolean interrupted = Thread.interrupted();
@@ -237,8 +239,8 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
}
}
} // for
- this.cache = c;
- this.cacheHelper = new CachedRegionHelper(c);
+ this.cache = cache;
+ this.cacheHelper = new CachedRegionHelper(cache);
return true;
}
@@ -287,7 +289,7 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
OutputStream tmpOut = null;
InputStream tmpIn = null;
try {
- /** Size of the server-to-client communication socket buffers */
+ // Size of the server-to-client communication socket buffers
int socketBufferSize =
Integer.getInteger("BridgeServer.SOCKET_BUFFER_SIZE", 32768).intValue();
@@ -340,7 +342,7 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
// create a "server" memberId we currently don't know much about the
// server.
// Would be nice for it to send us its member id
- // @todo - change the serverId to use the endpoint's getMemberId() which
+ // TODO: change the serverId to use the endpoint's getMemberId() which
// returns a
// DistributedMember (once gfecq branch is merged to trunk).
MemberAttributes ma =
@@ -1159,21 +1161,6 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
// message
if (region.hasServerProxy()) {
return;
-
- // NOTE:
- // As explained in the method description, this code is added as part
- // of CQ bug fix. Cache server team needs to look into changes relating
- // to local region.
- //
- // Locally invalidate the region
- // region.basicBridgeClientInvalidate(callbackArgument,
- // proxy.getProcessedMarker());
-
- // if (logger.debugEnabled()) {
- // logger.debug(toString() + ": Cleared region: " + regionName
- // + " callbackArgument: " + callbackArgument);
- // }
-
}
} catch (Exception e) {
@@ -1212,12 +1199,12 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
// servers recursively
}
- // // CALLBACK TESTING PURPOSE ONLY ////
+ // CALLBACK TESTING PURPOSE ONLY
if (PoolImpl.IS_INSTANTIATOR_CALLBACK) {
ClientServerObserver bo = ClientServerObserverHolder.getInstance();
bo.afterReceivingFromServer(eventId);
}
- // /////////////////////////////////////
+
}
// TODO bug: can the following catch be more specific?
catch (Exception e) {
@@ -1233,7 +1220,6 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
final boolean isDebugEnabled = logger.isDebugEnabled();
try {
int noOfParts = msg.getNumberOfParts();
- // int numOfClasses = noOfParts - 3; // 1 for ds classname, 1 for ds id and 1 for eventId.
if (isDebugEnabled) {
logger.debug("{}: Received register dataserializer message of parts {}", getName(),
noOfParts);
@@ -1244,8 +1230,7 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
String dataSerializerClassName =
(String) CacheServerHelper.deserialize(msg.getPart(i).getSerializedForm());
int id = msg.getPart(i + 1).getInt();
- InternalDataSerializer.register(dataSerializerClassName, false, eventId,
- null/* context */, id);
+ InternalDataSerializer.register(dataSerializerClassName, false, eventId, null, id);
// distribute is false because we don't want to propagate this to
// servers recursively
@@ -1266,12 +1251,12 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
}
}
- // // CALLBACK TESTING PURPOSE ONLY ////
+ // CALLBACK TESTING PURPOSE ONLY
if (PoolImpl.IS_INSTANTIATOR_CALLBACK) {
ClientServerObserver bo = ClientServerObserverHolder.getInstance();
bo.afterReceivingFromServer(eventId);
}
- ///////////////////////////////////////
+
}
// TODO bug: can the following catch be more specific?
catch (Exception e) {
@@ -1284,12 +1269,6 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
/**
* Processes message to invoke CQ listeners.
- *
- * @param startMessagePart
- * @param numCqParts
- * @param messageType
- * @param key
- * @param value
*/
private int processCqs(Message m, int startMessagePart, int numCqParts, int messageType,
Object key, Object value) {
@@ -1299,7 +1278,6 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
private int processCqs(Message m, int startMessagePart, int numCqParts, int messageType,
Object key, Object value, byte[] delta, EventID eventId) {
- // String[] cqs = new String[numCqs/2];
HashMap cqs = new HashMap();
final boolean isDebugEnabled = logger.isDebugEnabled();
@@ -1467,7 +1445,6 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
}
}
-
private void handleTombstoneOperation(Message msg) {
String regionName = "unknown";
try { // not sure why this isn't done by the caller
@@ -1721,10 +1698,7 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
// originating from the client
// and by updating the last update stat, the ServerMonitor is less
// likely to send pings...
- // and the ClientHealthMonitor will cause a disconnect -- mthomas
- // 10/18/2006
-
- // this._endpoint.setLastUpdate();
+ // and the ClientHealthMonitor will cause a disconnect
} catch (InterruptedIOException e) {
// Per Sun's support web site, this exception seems to be peculiar
@@ -1839,13 +1813,6 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
return socket.getLocalPort();
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.apache.geode.distributed.internal.InternalDistributedSystem.DisconnectListener#onDisconnect
- * (org.apache.geode.distributed.internal.InternalDistributedSystem)
- */
public void onDisconnect(InternalDistributedSystem sys) {
stopUpdater();
}
@@ -1855,15 +1822,6 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
*/
private volatile boolean endPointDied = false;
- /**
- * Returns true if the end point represented by this updater is considered dead.
- *
- * @return true if {@link #endpoint} died.
- */
- public boolean isEndPointDead() {
- return this.endPointDied;
- }
-
private void verifySocketBufferSize(int requestedBufferSize, int actualBufferSize, String type) {
if (actualBufferSize < requestedBufferSize) {
logger.info(LocalizedMessage.create(
@@ -1944,11 +1902,9 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
public long startTime() {
return DistributionStats.getStatTime();
}
-
}
public boolean isProcessing() {
- // TODO Auto-generated method stub
return continueProcessing.get();
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/db79d223/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheCreation.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheCreation.java b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheCreation.java
index 4cc75aa..7f623c7 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheCreation.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheCreation.java
@@ -145,6 +145,7 @@ import org.apache.geode.internal.logging.LocalLogWriter;
import org.apache.geode.internal.logging.LogWriterFactory;
import org.apache.geode.internal.offheap.MemoryAllocator;
import org.apache.geode.management.internal.JmxManagerAdvisor;
+import org.apache.geode.management.internal.RestAgent;
import org.apache.geode.pdx.PdxInstance;
import org.apache.geode.pdx.PdxInstanceFactory;
import org.apache.geode.pdx.PdxSerializer;
@@ -1022,6 +1023,22 @@ public class CacheCreation implements InternalCache {
return bridge;
}
+ @Override
+ public void setReadSerialized(final boolean value) {
+ throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+ }
+
+ @Override
+ public PdxInstanceFactory createPdxInstanceFactory(final String className,
+ final boolean expectDomainClass) {
+ throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+ }
+
+ @Override
+ public void waitForRegisterInterestsInProgress() {
+ throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+ }
+
void addDeclarableProperties(final Declarable declarable, final Properties properties) {
this.declarablePropertiesMap.put(declarable, properties);
}
@@ -1163,10 +1180,25 @@ public class CacheCreation implements InternalCache {
}
@Override
+ public RestAgent getRestAgent() {
+ throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+ }
+
+ @Override
public Properties getDeclarableProperties(final Declarable declarable) {
throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
}
+ @Override
+ public void setRESTServiceRunning(final boolean isRESTServiceRunning) {
+ throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+ }
+
+ @Override
+ public void close(final String reason, final boolean keepAlive, final boolean keepDS) {
+ throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+ }
+
public void addGatewayReceiver(GatewayReceiver receiver) {
this.gatewayReceivers.add(receiver);
}
http://git-wip-us.apache.org/repos/asf/geode/blob/db79d223/geode-core/src/main/java/org/apache/geode/management/internal/BaseManagementService.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/BaseManagementService.java b/geode-core/src/main/java/org/apache/geode/management/internal/BaseManagementService.java
index 34bb6c0..bc317bc 100755
--- a/geode-core/src/main/java/org/apache/geode/management/internal/BaseManagementService.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/BaseManagementService.java
@@ -21,9 +21,9 @@ import java.util.Map;
import org.apache.logging.log4j.Logger;
-import org.apache.geode.cache.Cache;
import org.apache.geode.distributed.DistributedSystemDisconnectedException;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.management.ManagementService;
@@ -50,32 +50,28 @@ public abstract class BaseManagementService extends ManagementService {
protected BaseManagementService() {}
// Static block to initialize the ConnectListener on the System
-
static {
initInternalDistributedSystem();
-
}
/**
* This method will close the service. Any operation on the service instance will throw exception
*/
-
protected abstract void close();
/**
* This method will close the service. Any operation on the service instance will throw exception
*/
-
protected abstract boolean isClosed();
/**
* Returns a ManagementService to use for the specified Cache.
- *
+ *
* @param cache defines the scope of resources to be managed
*/
- public static ManagementService getManagementService(Cache cache) {
+ public static ManagementService getManagementService(InternalCache cache) {
synchronized (instances) {
- BaseManagementService service = (BaseManagementService) instances.get(cache);
+ BaseManagementService service = instances.get(cache);
if (service == null) {
service = SystemManagementService.newSystemManagementService(cache);
instances.put(cache, service);
@@ -85,14 +81,13 @@ public abstract class BaseManagementService extends ManagementService {
}
}
- public static ManagementService getExistingManagementService(Cache cache) {
+ public static ManagementService getExistingManagementService(InternalCache cache) {
synchronized (instances) {
BaseManagementService service = (BaseManagementService) instances.get(cache);
return service;
}
}
-
/**
* Initialises the distributed system listener
*/
@@ -125,8 +120,6 @@ public abstract class BaseManagementService extends ManagementService {
/**
* Add an Distributed System and adds a Discon Listener
- *
- * @param sys
*/
private static void addInternalDistributedSystem(InternalDistributedSystem sys) {
synchronized (instances) {
@@ -147,8 +140,6 @@ public abstract class BaseManagementService extends ManagementService {
/**
* Remove a Distributed System from the system lists. If list is empty it closes down all the
* services if not closed
- *
- * @param sys
*/
private static void removeInternalDistributedSystem(InternalDistributedSystem sys) {
synchronized (instances) {
@@ -172,7 +163,6 @@ public abstract class BaseManagementService extends ManagementService {
}
instances.clear();
}
-
}
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/db79d223/geode-core/src/main/java/org/apache/geode/management/internal/FederatingManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/FederatingManager.java b/geode-core/src/main/java/org/apache/geode/management/internal/FederatingManager.java
index da92f69..b6ffa41 100755
--- a/geode-core/src/main/java/org/apache/geode/management/internal/FederatingManager.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/FederatingManager.java
@@ -25,6 +25,7 @@ import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
+import java.util.concurrent.RejectedExecutionException;
import javax.management.Notification;
import javax.management.ObjectName;
@@ -32,7 +33,6 @@ import javax.management.ObjectName;
import org.apache.logging.log4j.Logger;
import org.apache.geode.cache.AttributesFactory;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.EvictionAction;
import org.apache.geode.cache.EvictionAttributes;
@@ -40,11 +40,13 @@ import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.cache.RegionExistsException;
import org.apache.geode.cache.Scope;
+import org.apache.geode.cache.TimeoutException;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.CachePerfStats;
import org.apache.geode.internal.cache.HasCachePerfStats;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.InternalRegionArguments;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.management.ManagementException;
@@ -60,48 +62,38 @@ import org.apache.geode.management.ManagementException;
public class FederatingManager extends Manager {
public static final Logger logger = LogService.getLogger();
-
/**
- *
* This Executor uses a pool of thread to execute the member addition /removal tasks, This will
* utilize the processing powers available. Going with unbounded queue because tasks wont be
* unbounded in practical situation as number of members will be a finite set at any given point
* of time
*/
-
private ExecutorService pooledMembershipExecutor;
-
/**
* Proxy factory is used to create , remove proxies
*/
protected MBeanProxyFactory proxyFactory;
-
/**
* Remote Filter chain for local MBean filters
*/
-
private RemoteFilterChain remoteFilterChain;
private MBeanJMXAdapter jmxAdapter;
private MemberMessenger messenger;
-
private SystemManagementService service;
-
/**
- * Public Constructor
- *
* @param jmxAdapter JMX Adpater
* @param repo Management resource repo
* @param system Internal Distributed System
* @param service SystemManagement Service
*/
public FederatingManager(MBeanJMXAdapter jmxAdapter, ManagementResourceRepo repo,
- InternalDistributedSystem system, SystemManagementService service, Cache cache) {
+ InternalDistributedSystem system, SystemManagementService service, InternalCache cache) {
super(repo, system, cache);
this.remoteFilterChain = new RemoteFilterChain();
this.service = service;
@@ -110,14 +102,12 @@ public class FederatingManager extends Manager {
this.messenger = new MemberMessenger(jmxAdapter, repo, system);
}
-
/**
* This method will be invoked whenever a member wants to be a managing node. The exception
* Management exception has to be handled by the caller.
*/
@Override
public synchronized void startManager() {
-
try {
if (logger.isDebugEnabled()) {
logger.debug("Starting the Federating Manager.... ");
@@ -138,7 +128,6 @@ public class FederatingManager extends Manager {
running = false;
throw new ManagementException(e);
}
-
}
public synchronized void stopManager() {
@@ -151,18 +140,13 @@ public class FederatingManager extends Manager {
logger.debug("Stopping the Federating Manager.... ");
}
stopManagingActivity();
-
}
/**
* This method will be invoked whenever a member stops being a managing node. The exception
* Management exception has to be handled by the caller. *
- *
- * @throws ManagementException
- *
*/
private void stopManagingActivity() {
-
try {
this.pooledMembershipExecutor.shutdownNow();
Iterator<DistributedMember> it = repo.getMonitoringRegionMap().keySet().iterator();
@@ -173,10 +157,7 @@ public class FederatingManager extends Manager {
} catch (Exception e) {
throw new ManagementException(e);
- } finally {
- // For future use
}
-
}
@Override
@@ -190,8 +171,6 @@ public class FederatingManager extends Manager {
*
* This method will delegate task to another thread and exit, so that it wont block the membership
* listener
- *
- * @param member
*/
public void addMember(DistributedMember member) {
GIITask giiTask = new GIITask(member);
@@ -203,33 +182,22 @@ public class FederatingManager extends Manager {
});
}
-
/**
* This method will be invoked from MembershipListener which is registered when the member becomes
* a Management node.
*
* This method will delegate task to another thread and exit, so that it wont block the membership
* listener
- *
- * @param member
*/
public void removeMember(DistributedMember member, boolean crashed) {
RemoveMemberTask removeTask = new RemoveMemberTask(member, crashed);
executeTask(removeTask);
}
- private void submitTask(Callable<DistributedMember> task) {
- try {
- pooledMembershipExecutor.submit(task);
- } catch (java.util.concurrent.RejectedExecutionException ex) {
- // Ignore, we are getting shutdown
- }
- }
-
private void executeTask(Runnable task) {
try {
pooledMembershipExecutor.execute(task);
- } catch (java.util.concurrent.RejectedExecutionException ex) {
+ } catch (RejectedExecutionException ex) {
// Ignore, we are getting shutdown
}
}
@@ -278,22 +246,16 @@ public class FederatingManager extends Manager {
*
* this method will delegate task to another thread and exit, so that it wont block the membership
* listener
- *
- * @param member
- * @param reason TODO
*/
public void suspectMember(DistributedMember member, InternalDistributedMember whoSuspected,
String reason) {
service.memberSuspect((InternalDistributedMember) member, whoSuspected, reason);
-
}
/**
* This method will be invoked when a node transitions from managed node to managing node This
* method will block for all GIIs to be completed But each GII is given a specific time frame.
* After that the task will be marked as cancelled.
- *
- * @throws InterruptedException
*/
public void startManagingActivity() throws Exception {
final boolean isDebugEnabled = logger.isDebugEnabled();
@@ -304,7 +266,6 @@ public class FederatingManager extends Manager {
Iterator<DistributedMember> it = members.iterator();
DistributedMember member;
-
final List<Callable<DistributedMember>> giiTaskList = new ArrayList<>();
List<Future<DistributedMember>> futureTaskList;
@@ -354,9 +315,7 @@ public class FederatingManager extends Manager {
logger.debug("InterruptedException while creating Monitoring resource with error : {}",
mgEx.getMessage(), mgEx);
}
-
}
-
}
} catch (InterruptedException e) {
if (isDebugEnabled) {
@@ -370,20 +329,14 @@ public class FederatingManager extends Manager {
logger.debug("Management Resource creation completed");
}
}
-
}
-
-
/**
* Actual task of doing the GII
*
* It will perform the GII request which might originate from TranstionListener or Membership
* Listener.
- *
- *
- *
- *
+ *
* Managing Node side resources are created per member which is visible to this node
*
* 1)Management Region : its a Replicated NO_ACK region 2)Notification Region : its a Replicated
@@ -394,10 +347,7 @@ public class FederatingManager extends Manager {
*
* This task can be cancelled from the calling thread if a timeout happens. In that case we have
* to handle the thread interrupt
- *
- *
*/
-
private class GIITask implements Callable<DistributedMember> {
private DistributedMember member;
@@ -438,7 +388,6 @@ public class FederatingManager extends Manager {
ManagementCacheListener mgmtCacheListener = new ManagementCacheListener(proxyFactory);
monitorAttrFactory.addCacheListener(mgmtCacheListener);
-
RegionAttributes<String, Object> monitoringRegionAttrs = monitorAttrFactory.create();
// Notification region for member is created
@@ -472,8 +421,7 @@ public class FederatingManager extends Manager {
monitoringRegionAttrs, internalArgs);
proxyMonitoringRegionCreated = true;
-
- } catch (org.apache.geode.cache.TimeoutException e) {
+ } catch (TimeoutException e) {
if (logger.isDebugEnabled()) {
logger.debug("Error During Internal Region creation {}", e.getMessage(), e);
}
@@ -504,7 +452,7 @@ public class FederatingManager extends Manager {
cache.createVMRegion(ManagementConstants.NOTIFICATION_REGION + "_" + appender,
notifRegionAttrs, internalArgs);
proxyNotifRegionCreated = true;
- } catch (org.apache.geode.cache.TimeoutException e) {
+ } catch (TimeoutException e) {
if (logger.isDebugEnabled()) {
logger.debug("Error During Internal Region creation {}", e.getMessage(), e);
}
@@ -530,7 +478,6 @@ public class FederatingManager extends Manager {
// region is not created
proxyMonitoringRegion.localDestroyRegion();
}
-
}
if (logger.isDebugEnabled()) {
@@ -560,25 +507,20 @@ public class FederatingManager extends Manager {
throw new ManagementException(e);
}
-
}
} catch (Exception e) {
throw new ManagementException(e);
}
-
// Before completing task intimate all listening ProxyListener which might send notifications.
service.memberJoined((InternalDistributedMember) member);
// Send manager info to the added member
messenger.sendManagerInfo(member);
-
return member;
-
}
-
}
/**
@@ -622,10 +564,8 @@ public class FederatingManager extends Manager {
return proxyFactory.findAllProxies(member);
}
-
public MemberMessenger getMessenger() {
return messenger;
}
-
}
http://git-wip-us.apache.org/repos/asf/geode/blob/db79d223/geode-core/src/main/java/org/apache/geode/management/internal/LocalManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/LocalManager.java b/geode-core/src/main/java/org/apache/geode/management/internal/LocalManager.java
index 3adbce0..b5b97ca 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/LocalManager.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/LocalManager.java
@@ -17,7 +17,6 @@ package org.apache.geode.management.internal;
import java.io.IOException;
import java.util.HashMap;
import java.util.Iterator;
-import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
@@ -36,14 +35,15 @@ import org.apache.geode.CancelException;
import org.apache.geode.GemFireException;
import org.apache.geode.SystemFailure;
import org.apache.geode.cache.AttributesFactory;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.cache.RegionExistsException;
import org.apache.geode.cache.Scope;
+import org.apache.geode.cache.TimeoutException;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.cache.CachePerfStats;
import org.apache.geode.internal.cache.HasCachePerfStats;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.InternalRegionArguments;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.LoggingThreadGroup;
@@ -55,11 +55,7 @@ import org.apache.geode.management.ManagementException;
* a) Handles proxy creation when Management node comes up b) Handles proxy creation when a member
* joins c) Remove proxies when a member leaves or node stops being management node. d) Takes care
* to create resources like hidden regions for MBean and notification federation.
- *
- *
- *
*/
-
public class LocalManager extends Manager {
private static final Logger logger = LogService.getLogger();
@@ -74,27 +70,22 @@ public class LocalManager extends Manager {
*/
protected ScheduledExecutorService singleThreadFederationScheduler;
-
/**
* This map holds all the components which are eligible for federation. Although filters might
* prevent any of the component from getting federated.
*/
-
private Map<ObjectName, FederationComponent> federatedComponentMap;
-
private Object lock = new Object();
private SystemManagementService service;
/**
- * Public constructor
- *
* @param repo management resource repo
* @param system internal distributed system
*/
public LocalManager(ManagementResourceRepo repo, InternalDistributedSystem system,
- SystemManagementService service, Cache cache) {
+ SystemManagementService service, InternalCache cache) {
super(repo, system, cache);
this.service = service;
this.federatedComponentMap = new ConcurrentHashMap<ObjectName, FederationComponent>();
@@ -105,7 +96,6 @@ public class LocalManager extends Manager {
*
* Management Region : its a Replicated NO_ACK region Notification Region : its a Replicated Proxy
* NO_ACK region
- *
*/
private void startLocalManagement(Map<ObjectName, FederationComponent> federatedComponentMap) {
@@ -137,9 +127,9 @@ public class LocalManager extends Manager {
logger.debug("Creating Management Region :");
}
- /**
+ /*
* Sharing the same Internal Argument for both notification region and monitoring region
- **/
+ */
InternalRegionArguments internalArgs = new InternalRegionArguments();
internalArgs.setIsUsedForMetaRegion(true);
@@ -184,7 +174,7 @@ public class LocalManager extends Manager {
monitoringRegionAttrs, internalArgs));
monitoringRegionCreated = true;
- } catch (org.apache.geode.cache.TimeoutException e) {
+ } catch (TimeoutException e) {
throw new ManagementException(e);
} catch (RegionExistsException e) {
throw new ManagementException(e);
@@ -199,7 +189,7 @@ public class LocalManager extends Manager {
cache.createVMRegion(ManagementConstants.NOTIFICATION_REGION + "_" + appender,
notifRegionAttrs, internalArgs));
notifRegionCreated = true;
- } catch (org.apache.geode.cache.TimeoutException e) {
+ } catch (TimeoutException e) {
throw new ManagementException(e);
} catch (RegionExistsException e) {
throw new ManagementException(e);
@@ -212,7 +202,6 @@ public class LocalManager extends Manager {
repo.getLocalMonitoringRegion().localDestroyRegion();
}
-
}
managementTask = new ManagementTask(federatedComponentMap);
@@ -230,11 +219,8 @@ public class LocalManager extends Manager {
logger.debug("Notification Region created with Name : {}",
repo.getLocalNotificationRegion().getName());
}
-
}
-
}
-
}
public void markForFederation(ObjectName objName, FederationComponent fedComp) {
@@ -251,23 +237,18 @@ public class LocalManager extends Manager {
// To delete an entry from the region
repo.getLocalMonitoringRegion().remove(objName.toString());
}
-
}
-
}
/**
* This method will shutdown various tasks running for management
*/
private void shutdownTasks() {
-
// No need of pooledGIIExecutor as this node wont do GII again
// so better to release resources
if (this.singleThreadFederationScheduler != null) {
- List<Runnable> l = this.singleThreadFederationScheduler.shutdownNow();
-
+ this.singleThreadFederationScheduler.shutdownNow();
}
-
}
/**
@@ -294,7 +275,6 @@ public class LocalManager extends Manager {
logger.debug("Unable to clean MBean: {} due to {}", objName, e.getMessage(), e);
}
}
-
}
repo.destroyLocalMonitoringRegion();
}
@@ -330,11 +310,7 @@ public class LocalManager extends Manager {
* guaranteed to execute sequentially, and no more than one task will be active at any given time.
* Unlike the otherwise equivalent <tt>newScheduledThreadPool(1)</tt> the returned executor is
* guaranteed not to be reconfigurable to use additional threads.
- *
- *
- *
*/
-
private class ManagementTask implements Runnable {
private Map<String, FederationComponent> replicaMap;
@@ -346,12 +322,10 @@ public class LocalManager extends Manager {
@Override
public void run() {
-
if (logger.isTraceEnabled()) {
logger.trace("Federation started at managed node : ");
}
-
try {
synchronized (lock) {
replicaMap.clear();
@@ -380,7 +354,6 @@ public class LocalManager extends Manager {
replicaMap.put(key, fedCompInstance);
}
}
-
}
}
@@ -434,13 +407,11 @@ public class LocalManager extends Manager {
@Override
public void stopManager() {
- // Shutting down the GII executor as this node wont require
- // it anymore
+ // Shutting down the GII executor as this node wont require it anymore
shutdownTasks();
// Clean up management Resources
cleanUpResources();
running = false;
-
}
public void stopCacheOps() {
http://git-wip-us.apache.org/repos/asf/geode/blob/db79d223/geode-core/src/main/java/org/apache/geode/management/internal/beans/BeanUtilFuncs.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/BeanUtilFuncs.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/BeanUtilFuncs.java
index 6861a7d..499ef01 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/BeanUtilFuncs.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/BeanUtilFuncs.java
@@ -26,10 +26,10 @@ import java.util.Set;
import java.util.zip.GZIPInputStream;
import java.util.zip.GZIPOutputStream;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.GemFireProperties;
import org.apache.geode.management.internal.cli.CliUtil;
@@ -41,9 +41,7 @@ public class BeanUtilFuncs {
/**
* returns the tail of the log file
*
- * @param logFile
* @return tail of the log file
- * @throws IOException
*/
public static String tailSystemLog(File logFile, final int numLines) throws IOException {
if (logFile == null || logFile.equals(new File(""))) {
@@ -107,11 +105,8 @@ public class BeanUtilFuncs {
return returnStr.toString();
}
-
/**
- * @param sc
* @return tail of log
- * @throws IOException
*/
public static String tailSystemLog(DistributionConfig sc, final int numLines) throws IOException {
File logFile = sc.getLogFile();
@@ -128,7 +123,7 @@ public class BeanUtilFuncs {
DistributedMember memberFound = null;
if (memberNameOrId != null) {
- Cache cache = CacheFactory.getAnyInstance();
+ InternalCache cache = (InternalCache) CacheFactory.getAnyInstance();
Set<DistributedMember> memberSet = CliUtil.getAllMembers(cache);
for (DistributedMember member : memberSet) {
if (memberNameOrId.equals(member.getId()) || memberNameOrId.equals(member.getName())) {
@@ -141,12 +136,8 @@ public class BeanUtilFuncs {
}
public static GemFireProperties initGemfireProperties(DistributionConfig config) {
-
- // **TODO **/
String memberGroups = "";
- // **TODO **/
String configFile = null;
- // ** TODO **//
String includeFile = null;
GemFireProperties gemFirePropertyData = new GemFireProperties();
@@ -329,17 +320,14 @@ public class BeanUtilFuncs {
gemFirePropertyData.setSSLDefaultAlias(config.getSSLDefaultAlias());
return gemFirePropertyData;
-
}
-
/**
* Compresses a given String. It is encoded using ISO-8859-1, So any decompression of the
* compressed string should also use ISO-8859-1
*
* @param str String to be compressed.
* @return compressed bytes
- * @throws IOException
*/
public static byte[] compress(String str) throws IOException {
if (str == null || str.length() == 0) {
@@ -356,7 +344,6 @@ public class BeanUtilFuncs {
/**
* @param bytes bytes to be decompressed
* @return a decompressed String
- * @throws IOException
*/
public static String decompress(byte[] bytes) throws IOException {
if (bytes == null || bytes.length == 0) {
http://git-wip-us.apache.org/repos/asf/geode/blob/db79d223/geode-core/src/main/java/org/apache/geode/management/internal/beans/QueryDataFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/QueryDataFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/QueryDataFunction.java
index efd7436..705ba4d 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/QueryDataFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/QueryDataFunction.java
@@ -30,7 +30,6 @@ import java.util.regex.Pattern;
import org.apache.logging.log4j.Logger;
import org.apache.geode.SystemFailure;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.DataPolicy;
import org.apache.geode.cache.Region;
@@ -51,6 +50,7 @@ import org.apache.geode.cache.query.internal.QCompiler;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.internal.InternalEntity;
import org.apache.geode.internal.cache.BucketRegion;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.LocalDataSet;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.internal.cache.PartitionedRegionHelper;
@@ -127,7 +127,7 @@ public class QueryDataFunction extends FunctionAdapter implements InternalEntity
private QueryDataFunctionResult selectWithType(final FunctionContext context, String queryString,
final boolean showMember, final String regionName, final int limit,
final int queryResultSetLimit, final int queryCollectionsDepth) throws Exception {
- Cache cache = CacheFactory.getAnyInstance();
+ InternalCache cache = getCache();
Function loclQueryFunc = new LocalQueryFunction("LocalQueryFunction", regionName, showMember)
.setOptimizeForWrite(true);
queryString = applyLimitClause(queryString, limit, queryResultSetLimit);
@@ -293,12 +293,11 @@ public class QueryDataFunction extends FunctionAdapter implements InternalEntity
List<String> decompressedList = new ArrayList<String>();
while (it.hasNext()) {
-
String decompressedStr = null;
decompressedStr = BeanUtilFuncs.decompress(it.next().compressedBytes);
decompressedList.add(decompressedStr);
-
}
+
if (zipResult) {
return BeanUtilFuncs.compress(wrapResult(decompressedList.toString()));
} else {
@@ -359,7 +358,7 @@ public class QueryDataFunction extends FunctionAdapter implements InternalEntity
}
}
- Cache cache = CacheFactory.getAnyInstance();
+ InternalCache cache = (InternalCache) CacheFactory.getAnyInstance();
try {
SystemManagementService service =
@@ -386,7 +385,6 @@ public class QueryDataFunction extends FunctionAdapter implements InternalEntity
}
}
}
-
}
} else {
return new JsonisedErroMessage(ManagementStrings.QUERY__MSG__INVALID_QUERY
@@ -449,6 +447,10 @@ public class QueryDataFunction extends FunctionAdapter implements InternalEntity
}
}
+ private InternalCache getCache() {
+ return (InternalCache) CacheFactory.getAnyInstance();
+ }
+
private static class JsonisedErroMessage {
private static String message = "message";
@@ -467,7 +469,6 @@ public class QueryDataFunction extends FunctionAdapter implements InternalEntity
public String toString() {
return gFJsonObject.toString();
}
-
}
/**
@@ -479,7 +480,7 @@ public class QueryDataFunction extends FunctionAdapter implements InternalEntity
*
* @return a set of regions involved in the query
*/
- private static Set<String> compileQuery(final Cache cache, final String query)
+ private static Set<String> compileQuery(final InternalCache cache, final String query)
throws QueryInvalidException {
QCompiler compiler = new QCompiler();
Set<String> regionsInQuery = null;
@@ -498,7 +499,7 @@ public class QueryDataFunction extends FunctionAdapter implements InternalEntity
/**
* Function to gather data locally. This function is required to execute query with region context
*/
- private class LocalQueryFunction extends FunctionAdapter {
+ private static class LocalQueryFunction extends FunctionAdapter {
private static final long serialVersionUID = 1L;
@@ -537,7 +538,7 @@ public class QueryDataFunction extends FunctionAdapter implements InternalEntity
@Override
public void execute(final FunctionContext context) {
- Cache cache = CacheFactory.getAnyInstance();
+ InternalCache cache = getCache();
QueryService queryService = cache.getQueryService();
String qstr = (String) context.getArguments();
Region r = cache.getRegion(regionName);
@@ -557,6 +558,10 @@ public class QueryDataFunction extends FunctionAdapter implements InternalEntity
}
}
+ private InternalCache getCache() {
+ return (InternalCache) CacheFactory.getAnyInstance();
+ }
+
@Override
public String getId() {
return this.id;
http://git-wip-us.apache.org/repos/asf/geode/blob/db79d223/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ClientCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ClientCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ClientCommands.java
index 3d155e5..18940fc 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ClientCommands.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ClientCommands.java
@@ -12,13 +12,12 @@
* or implied. See the License for the specific language governing permissions and limitations under
* the License.
*/
-
package org.apache.geode.management.internal.cli.commands;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.execute.FunctionService;
import org.apache.geode.distributed.DistributedMember;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.CacheServerMXBean;
import org.apache.geode.management.ClientHealthStatus;
import org.apache.geode.management.ManagementService;
@@ -53,10 +52,8 @@ import java.util.Set;
import javax.management.ObjectName;
/**
- *
* @since GemFire 8.0
*/
-
public class ClientCommands implements CommandMarker {
private Gfsh getGfsh() {
@@ -77,7 +74,7 @@ public class ClientCommands implements CommandMarker {
String headerText = "ClientList";
resultTable = resultTable.setHeader(headerText);
- Cache cache = CacheFactory.getAnyInstance();
+ InternalCache cache = getCache();
ManagementService service = ManagementService.getExistingManagementService(cache);
ObjectName[] cacheServers = service.getDistributedSystemMXBean().listCacheServerObjectNames();
@@ -151,6 +148,9 @@ public class ClientCommands implements CommandMarker {
return result;
}
+ private InternalCache getCache() {
+ return (InternalCache) CacheFactory.getAnyInstance();
+ }
@CliCommand(value = CliStrings.DESCRIBE_CLIENT, help = CliStrings.DESCRIBE_CLIENT__HELP)
@CliMetaData(relatedTopic = {CliStrings.TOPIC_CLIENT})
@@ -174,7 +174,7 @@ public class ClientCommands implements CommandMarker {
try {
CompositeResultData compositeResultData = ResultBuilder.createCompositeResultData();
SectionResultData sectionResult = compositeResultData.addSection("InfoSection");
- Cache cache = CacheFactory.getAnyInstance();
+ InternalCache cache = getCache();
ManagementService service = ManagementService.getExistingManagementService(cache);
ObjectName[] cacheServers = service.getDistributedSystemMXBean().listCacheServerObjectNames();
@@ -204,7 +204,6 @@ public class ClientCommands implements CommandMarker {
}
}
}
-
}
if (clientHealthStatus == null) {
@@ -225,12 +224,7 @@ public class ClientCommands implements CommandMarker {
for (int i = 0; i < resultList.size(); i++) {
try {
Object object = resultList.get(i);
- if (object instanceof Exception) {
- LogWrapper.getInstance().warning(
- "Exception in Describe Client " + ((Throwable) object).getMessage(),
- ((Throwable) object));
- continue;
- } else if (object instanceof Throwable) {
+ if (object instanceof Throwable) {
LogWrapper.getInstance().warning(
"Exception in Describe Client " + ((Throwable) object).getMessage(),
((Throwable) object));
@@ -259,7 +253,6 @@ public class ClientCommands implements CommandMarker {
secondaryServers.add(objectResult.secondaryServer);
}
}
-
}
} catch (Exception e) {
LogWrapper.getInstance().info(CliStrings.DESCRIBE_CLIENT_ERROR_FETCHING_STATS_0 + " :: "
@@ -354,7 +347,6 @@ public class ClientCommands implements CommandMarker {
}
}
}
-
}
@CliAvailabilityIndicator({CliStrings.LIST_CLIENTS, CliStrings.DESCRIBE_CLIENT})
http://git-wip-us.apache.org/repos/asf/geode/blob/db79d223/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DataCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DataCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DataCommands.java
index 46ee2b0..36197cd 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DataCommands.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DataCommands.java
@@ -1132,7 +1132,7 @@ public class DataCommands implements CommandMarker {
}
Object[] arguments = new Object[] {query, stepName, interactive};
- CLIStep exec = new DataCommandFunction.SelectExecStep(arguments);
+ CLIStep exec = new DataCommandFunction.SelectExecStep(arguments, getCache());
CLIStep display = new DataCommandFunction.SelectDisplayStep(arguments);
CLIStep move = new DataCommandFunction.SelectMoveStep(arguments);
CLIStep quit = new DataCommandFunction.SelectQuitStep(arguments);
[2/3] geode git commit: fixup
Posted by kl...@apache.org.
http://git-wip-us.apache.org/repos/asf/geode/blob/db79d223/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/MemberCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/MemberCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/MemberCommands.java
index c647e98..415dd69 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/MemberCommands.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/MemberCommands.java
@@ -20,12 +20,17 @@ import java.util.List;
import java.util.Set;
import java.util.TreeSet;
-import org.apache.geode.cache.Cache;
+import org.springframework.shell.core.CommandMarker;
+import org.springframework.shell.core.annotation.CliAvailabilityIndicator;
+import org.springframework.shell.core.annotation.CliCommand;
+import org.springframework.shell.core.annotation.CliOption;
+
import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.execute.FunctionInvocationTargetException;
import org.apache.geode.cache.execute.ResultCollector;
import org.apache.geode.distributed.DistributedMember;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.cli.CliMetaData;
import org.apache.geode.management.cli.ConverterHint;
import org.apache.geode.management.cli.Result;
@@ -44,17 +49,11 @@ import org.apache.geode.management.internal.security.ResourceOperation;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
-import org.springframework.shell.core.CommandMarker;
-import org.springframework.shell.core.annotation.CliAvailabilityIndicator;
-import org.springframework.shell.core.annotation.CliCommand;
-import org.springframework.shell.core.annotation.CliOption;
-
-/***
- *
- *
+/**
* @since GemFire 7.0
*/
public class MemberCommands implements CommandMarker {
+
private Gfsh getGfsh() {
return Gfsh.getCurrentInstance();
}
@@ -73,7 +72,7 @@ public class MemberCommands implements CommandMarker {
// TODO: Add the code for identifying the system services
try {
Set<DistributedMember> memberSet = new TreeSet<DistributedMember>();
- Cache cache = CacheFactory.getAnyInstance();
+ InternalCache cache = getCache();
// default get all the members in the DS
if (group.isEmpty()) {
@@ -105,6 +104,10 @@ public class MemberCommands implements CommandMarker {
return result;
}
+ private InternalCache getCache() {
+ return (InternalCache) CacheFactory.getAnyInstance();
+ }
+
@CliCommand(value = {CliStrings.DESCRIBE_MEMBER}, help = CliStrings.DESCRIBE_MEMBER__HELP)
@CliMetaData(shellOnly = false, relatedTopic = CliStrings.TOPIC_GEODE_SERVER)
@ResourceOperation(resource = Resource.CLUSTER, operation = Operation.READ)
@@ -118,9 +121,10 @@ public class MemberCommands implements CommandMarker {
CliUtil.getDistributedMemberByNameOrId(memberNameOrId);
if (memberToBeDescribed != null) {
- // Abhishek - This information should be available through the MBeans too. We might not need
+ // This information should be available through the MBeans too. We might not need
// the function.
- // Sourabh - Yes, but then the command is subject to Mbean availability, which would be
+
+ // Yes, but then the command is subject to Mbean availability, which would be
// affected once MBean filters are used.
ResultCollector<?, ?> rc =
@@ -149,12 +153,12 @@ public class MemberCommands implements CommandMarker {
section.addData("Groups", memberInformation.getGroups());
section.addData("Used Heap", memberInformation.getHeapUsage() + "M");
section.addData("Max Heap", memberInformation.getMaxHeapSize() + "M");
- {
- String offHeapMemorySize = memberInformation.getOffHeapMemorySize();
- if (offHeapMemorySize != null && !offHeapMemorySize.isEmpty()) {
- section.addData("Off Heap Size", offHeapMemorySize);
- }
+
+ String offHeapMemorySize = memberInformation.getOffHeapMemorySize();
+ if (offHeapMemorySize != null && !offHeapMemorySize.isEmpty()) {
+ section.addData("Off Heap Size", offHeapMemorySize);
}
+
section.addData("Working Dir", memberInformation.getWorkingDirPath());
section.addData("Log file", memberInformation.getLogFilePath());
http://git-wip-us.apache.org/repos/asf/geode/blob/db79d223/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/RegionCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/RegionCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/RegionCommands.java
index 0bf80a5..fd03298 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/RegionCommands.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/RegionCommands.java
@@ -22,19 +22,17 @@ import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
-import org.apache.geode.security.ResourcePermission.Operation;
-import org.apache.geode.security.ResourcePermission.Resource;
import org.springframework.shell.core.CommandMarker;
import org.springframework.shell.core.annotation.CliAvailabilityIndicator;
import org.springframework.shell.core.annotation.CliCommand;
import org.springframework.shell.core.annotation.CliOption;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.execute.FunctionInvocationTargetException;
import org.apache.geode.cache.execute.ResultCollector;
import org.apache.geode.distributed.DistributedMember;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.cli.CliMetaData;
import org.apache.geode.management.cli.ConverterHint;
import org.apache.geode.management.cli.Result;
@@ -55,8 +53,10 @@ import org.apache.geode.management.internal.cli.result.TabularResultData;
import org.apache.geode.management.internal.cli.shell.Gfsh;
import org.apache.geode.management.internal.cli.util.RegionAttributesNames;
import org.apache.geode.management.internal.security.ResourceOperation;
+import org.apache.geode.security.ResourcePermission.Operation;
+import org.apache.geode.security.ResourcePermission.Resource;
-/***
+/**
* Class containing implementation of commands based on region:
* <ul>
* <li>list region
@@ -66,6 +66,7 @@ import org.apache.geode.management.internal.security.ResourceOperation;
* @since GemFire 7.0
*/
public class RegionCommands implements CommandMarker {
+
private Gfsh getGfsh() {
return Gfsh.getCurrentInstance();
}
@@ -168,7 +169,7 @@ public class RegionCommands implements CommandMarker {
return ResultBuilder.createUserErrorResult(CliStrings.INVALID_REGION_NAME);
}
- Cache cache = CacheFactory.getAnyInstance();
+ InternalCache cache = getCache();
ResultCollector<?, ?> rc =
CliUtil.executeFunction(getRegionDescription, regionName, CliUtil.getAllMembers(cache));
@@ -484,7 +485,6 @@ public class RegionCommands implements CommandMarker {
table.accumulate(CliStrings.DESCRIBE_REGION__ATTRIBUTE__VALUE, value);
}
}
-
}
}
@@ -503,10 +503,13 @@ public class RegionCommands implements CommandMarker {
@CliAvailabilityIndicator({CliStrings.LIST_REGION, CliStrings.DESCRIBE_REGION})
public boolean isRegionCommandAvailable() {
boolean isAvailable = true; // always available on server
- if (CliUtil.isGfshVM()) { // in gfsh check if connected //TODO - Abhishek: make this better
+ if (CliUtil.isGfshVM()) { // in gfsh check if connected //TODO : make this better
isAvailable = getGfsh() != null && getGfsh().isConnectedAndReady();
}
return isAvailable;
}
+ private InternalCache getCache() {
+ return (InternalCache) CacheFactory.getAnyInstance();
+ }
}
http://git-wip-us.apache.org/repos/asf/geode/blob/db79d223/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/WanCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/WanCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/WanCommands.java
index cd8f6eb..feeb353 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/WanCommands.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/WanCommands.java
@@ -14,10 +14,30 @@
*/
package org.apache.geode.management.internal.cli.commands;
-import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.CacheFactory;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+
+import javax.management.ObjectName;
+
+import org.springframework.shell.core.annotation.CliAvailabilityIndicator;
+import org.springframework.shell.core.annotation.CliCommand;
+import org.springframework.shell.core.annotation.CliOption;
+
import org.apache.geode.cache.execute.ResultCollector;
import org.apache.geode.distributed.DistributedMember;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.DistributedSystemMXBean;
import org.apache.geode.management.GatewayReceiverMXBean;
import org.apache.geode.management.GatewaySenderMXBean;
@@ -45,27 +65,9 @@ import org.apache.geode.management.internal.configuration.domain.XmlEntity;
import org.apache.geode.management.internal.security.ResourceOperation;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
-import org.springframework.shell.core.annotation.CliAvailabilityIndicator;
-import org.springframework.shell.core.annotation.CliCommand;
-import org.springframework.shell.core.annotation.CliOption;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicReference;
-import javax.management.ObjectName;
public class WanCommands extends AbstractCommandsSupport {
+
@CliCommand(value = CliStrings.CREATE_GATEWAYSENDER, help = CliStrings.CREATE_GATEWAYSENDER__HELP)
@CliMetaData(relatedTopic = CliStrings.TOPIC_GEODE_WAN)
@ResourceOperation(resource = Resource.DATA, operation = Operation.MANAGE)
@@ -198,7 +200,7 @@ public class WanCommands extends AbstractCommandsSupport {
final String id = senderId.trim();
try {
- final Cache cache = CacheFactory.getAnyInstance();
+ final InternalCache cache = getCache();
final SystemManagementService service =
(SystemManagementService) ManagementService.getExistingManagementService(cache);
@@ -317,24 +319,17 @@ public class WanCommands extends AbstractCommandsSupport {
help = CliStrings.PAUSE_GATEWAYSENDER__MEMBER__HELP) String onMember) {
Result result = null;
- if (senderId != null)
+ if (senderId != null) {
senderId = senderId.trim();
- // if (memberNameOrId != null)
- // memberNameOrId = memberNameOrId.trim();
- //
- // if (memberNameOrId != null && onGroup != null) {
- // return ResultBuilder
- // .createUserErrorResult(CliStrings.GATEWAY__MSG__OPTIONS);
- // }
+ }
try {
- Cache cache = CacheFactory.getAnyInstance();
+ InternalCache cache = getCache();
SystemManagementService service =
(SystemManagementService) ManagementService.getExistingManagementService(cache);
GatewaySenderMXBean bean = null;
-
TabularResultData resultData = ResultBuilder.createTabularResultData();
Set<DistributedMember> dsMembers = null;
@@ -394,79 +389,20 @@ public class WanCommands extends AbstractCommandsSupport {
help = CliStrings.RESUME_GATEWAYSENDER__MEMBER__HELP) String onMember) {
Result result = null;
- if (senderId != null)
+ if (senderId != null) {
senderId = senderId.trim();
- // if (memberNameOrId != null)
- // memberNameOrId = memberNameOrId.trim();
- //
- // if (memberNameOrId != null && onGroup != null) {
- // return ResultBuilder
- // .createUserErrorResult(CliStrings.GATEWAY__MSG__OPTIONS);
- // }
+ }
try {
- Cache cache = CacheFactory.getAnyInstance();
+ InternalCache cache = getCache();
SystemManagementService service =
(SystemManagementService) ManagementService.getExistingManagementService(cache);
-
GatewaySenderMXBean bean = null;
- //
- // if (memberNameOrId != null && memberNameOrId.length() > 0) {
- // InfoResultData resultData = ResultBuilder.createInfoResultData();
- // DistributedMember memberToBeInvoked = CliUtil
- // .getDistributedMemberByNameOrId(memberNameOrId);
- //
- // if (memberToBeInvoked != null) {
- // String memberId = memberToBeInvoked.getId();
- // if (cache.getDistributedSystem().getDistributedMember().getId()
- // .equals(memberId)) {
- // bean = service.getLocalGatewaySenderMXBean(senderId);
- // } else {
- // ObjectName objectName = service.getGatewaySenderMBeanName(memberToBeInvoked,
- // senderId);
- // bean = service.getMBeanProxy(objectName, GatewaySenderMXBean.class);
- // }
- // if (bean != null) {
- // if (bean.isRunning()) {
- // if (bean.isPaused()) {
- // bean.resume();
- // resultData.addLine(CliStrings.format(
- // CliStrings.GATEWAY_SENDER_0_IS_RESUMED_ON_MEMBER_1,
- // new Object[] { senderId, memberId }));
- // return ResultBuilder.buildResult(resultData);
- // }
- // resultData.addLine(CliStrings.format(
- // CliStrings.GATEWAY_SENDER_0_IS_NOT_PAUSED_ON_MEMBER_1,
- // new Object[] { senderId, memberId }));
- // return ResultBuilder.buildResult(resultData);
- // }
- // resultData.addLine(CliStrings.format(
- // CliStrings.GATEWAY_SENDER_0_IS_NOT_RUNNING_ON_MEMBER_1,
- // new Object[] { senderId, memberId }));
- // return ResultBuilder.buildResult(resultData);
- // }
- // return ResultBuilder.createBadConfigurationErrorResult(CliStrings
- // .format(CliStrings.GATEWAY_SENDER_0_IS_NOT_AVAILABLE_ON_MEMBER_1,
- // new Object[] { senderId, memberId }));
- // }
- // return ResultBuilder.createUserErrorResult(CliStrings.format(
- // CliStrings.GATEWAY_MSG_MEMBER_0_NOT_FOUND,
- // new Object[] { memberNameOrId }));
- // }
TabularResultData resultData = ResultBuilder.createTabularResultData();
- Set<DistributedMember> dsMembers = null;
- // if (onGroup != null && onGroup.length > 0) {
- // dsMembers = CliUtil.getDistributedMembersByGroup(cache, onGroup);
- // } else {
- // dsMembers = CliUtil.getAllNormalMembers(cache);
- // }
- // if (dsMembers.isEmpty()) {
- // return ResultBuilder
- // .createUserErrorResult(CliStrings.GATEWAY_MSG_MEMBERS_NOT_FOUND);
- // }
- dsMembers = CliUtil.findMembersOrThrow(onGroup, onMember);
+
+ Set<DistributedMember> dsMembers = CliUtil.findMembersOrThrow(onGroup, onMember);
for (DistributedMember member : dsMembers) {
if (cache.getDistributedSystem().getDistributedMember().getId().equals(member.getId())) {
bean = service.getLocalGatewaySenderMXBean(senderId);
@@ -527,14 +463,12 @@ public class WanCommands extends AbstractCommandsSupport {
senderId = senderId.trim();
try {
- Cache cache = CacheFactory.getAnyInstance();
+ InternalCache cache = getCache();
SystemManagementService service =
(SystemManagementService) ManagementService.getExistingManagementService(cache);
-
GatewaySenderMXBean bean = null;
-
TabularResultData resultData = ResultBuilder.createTabularResultData();
Set<DistributedMember> dsMembers = CliUtil.findMembersOrThrow(onGroup, onMember);
@@ -668,7 +602,7 @@ public class WanCommands extends AbstractCommandsSupport {
}
try {
- Cache cache = CacheFactory.getAnyInstance();
+ InternalCache cache = getCache();
SystemManagementService service =
(SystemManagementService) ManagementService.getExistingManagementService(cache);
TabularResultData resultData = ResultBuilder.createTabularResultData();
@@ -726,9 +660,8 @@ public class WanCommands extends AbstractCommandsSupport {
help = CliStrings.START_GATEWAYRECEIVER__MEMBER__HELP) String onMember) {
Result result = null;
-
try {
- Cache cache = CacheFactory.getAnyInstance();
+ InternalCache cache = getCache();
SystemManagementService service =
(SystemManagementService) ManagementService.getExistingManagementService(cache);
@@ -791,14 +724,12 @@ public class WanCommands extends AbstractCommandsSupport {
Result result = null;
try {
- Cache cache = CacheFactory.getAnyInstance();
+ InternalCache cache = getCache();
SystemManagementService service =
(SystemManagementService) ManagementService.getExistingManagementService(cache);
-
GatewayReceiverMXBean receieverBean = null;
-
TabularResultData resultData = ResultBuilder.createTabularResultData();
Set<DistributedMember> dsMembers = CliUtil.findMembersOrThrow(onGroup, onMember);
@@ -850,22 +781,12 @@ public class WanCommands extends AbstractCommandsSupport {
help = CliStrings.LIST_GATEWAY__GROUP__HELP) String onGroup) {
Result result = null;
- Cache cache = CacheFactory.getAnyInstance();
+ InternalCache cache = getCache();
try {
SystemManagementService service =
(SystemManagementService) ManagementService.getExistingManagementService(cache);
- Set<DistributedMember> dsMembers = null;
- // if (onGroup != null && onGroup.length > 0) {
- // dsMembers = CliUtil.getDistributedMembersByGroup(cache, onGroup);
- // } else {
- // dsMembers = CliUtil.getAllNormalMembers(cache);
- // }
- // if (dsMembers.isEmpty()) {
- // return ResultBuilder
- // .createUserErrorResult(CliStrings.GATEWAY_MSG_MEMBERS_NOT_FOUND);
- // }
- dsMembers = CliUtil.findMembersOrThrow(onGroup, onMember);
+ Set<DistributedMember> dsMembers = CliUtil.findMembersOrThrow(onGroup, onMember);
Map<String, Map<String, GatewaySenderMXBean>> gatewaySenderBeans =
new TreeMap<String, Map<String, GatewaySenderMXBean>>();
@@ -945,13 +866,12 @@ public class WanCommands extends AbstractCommandsSupport {
if (senderId != null)
senderId = senderId.trim();
try {
- Cache cache = CacheFactory.getAnyInstance();
+ InternalCache cache = getCache();
SystemManagementService service =
(SystemManagementService) ManagementService.getExistingManagementService(cache);
GatewaySenderMXBean bean = null;
-
CompositeResultData crd = ResultBuilder.createCompositeResultData();
TabularResultData availableSenderData =
crd.addSection(CliStrings.SECTION_GATEWAY_SENDER_AVAILABLE)
@@ -1001,11 +921,10 @@ public class WanCommands extends AbstractCommandsSupport {
Result result = null;
try {
- Cache cache = CacheFactory.getAnyInstance();
+ InternalCache cache = getCache();
SystemManagementService service =
(SystemManagementService) ManagementService.getExistingManagementService(cache);
-
CompositeResultData crd = ResultBuilder.createCompositeResultData();
TabularResultData availableReceiverData =
crd.addSection(CliStrings.SECTION_GATEWAY_RECEIVER_AVAILABLE)
@@ -1039,7 +958,6 @@ public class WanCommands extends AbstractCommandsSupport {
return result;
}
-
@CliCommand(value = CliStrings.DESTROY_GATEWAYSENDER,
help = CliStrings.DESTROY_GATEWAYSENDER__HELP)
@CliMetaData(relatedTopic = CliStrings.TOPIC_GEODE_WAN)
@@ -1128,18 +1046,6 @@ public class WanCommands extends AbstractCommandsSupport {
return resultData;
}
- // CliStrings.format(
- // CliStrings.GATEWAY_SENDER_0_IS_STARTED_ON_MEMBER_1,
- // new Object[] {senderId, memberId });
- //
- // CliStrings.format(
- // CliStrings.GATEWAY_SENDER_0_IS_ALREADY_STARTED_ON_MEMBER_1,
- // new Object[] {senderId, memberId });
- //
- // CliStrings.format(
- // CliStrings.GATEWAY_SENDER_0_IS_NOT_AVAILABLE_ON_MEMBER_1,
- // new Object[] {senderId, memberId });
-
private void accumulateListGatewayResult(CompositeResultData crd,
Map<String, Map<String, GatewaySenderMXBean>> gatewaySenderBeans,
Map<String, GatewayReceiverMXBean> gatewayReceiverBeans) {
@@ -1179,7 +1085,6 @@ public class WanCommands extends AbstractCommandsSupport {
entry.getValue().getConnectedGatewaySenders());
}
}
-
}
private void accumulateStartResult(TabularResultData resultData, String member, String Status,
http://git-wip-us.apache.org/repos/asf/geode/blob/db79d223/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DataCommandFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DataCommandFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DataCommandFunction.java
index bb77466..1ad5eeb 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DataCommandFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/DataCommandFunction.java
@@ -30,7 +30,6 @@ import org.apache.logging.log4j.Logger;
import org.apache.shiro.subject.Subject;
import org.json.JSONArray;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.DataPolicy;
@@ -59,6 +58,7 @@ import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.internal.ClassPathLoader;
import org.apache.geode.internal.InternalEntity;
import org.apache.geode.internal.NanoTimer;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.security.SecurityService;
@@ -88,6 +88,7 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
private static final Logger logger = LogService.getLogger();
private static final long serialVersionUID = 1L;
+
private boolean optimizeForWrite = false;
protected static final String SELECT_STEP_DISPLAY = "SELECT_DISPLAY";
@@ -105,7 +106,6 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
}
@Override
-
public boolean hasResult() {
return true;
}
@@ -116,15 +116,14 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
return false;
}
- @Override
/**
* Read only function
*/
+ @Override
public boolean optimizeForWrite() {
return optimizeForWrite;
}
-
public void setOptimizeForWrite(boolean optimizeForWrite) {
this.optimizeForWrite = optimizeForWrite;
}
@@ -132,7 +131,7 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
@Override
public void execute(FunctionContext functionContext) {
try {
- Cache cache = CacheFactory.getAnyInstance();
+ InternalCache cache = getCache();
DataCommandRequest request = (DataCommandRequest) functionContext.getArguments();
if (logger.isDebugEnabled()) {
logger.debug("Executing function : \n{}\n on member {}", request,
@@ -162,7 +161,9 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
}
}
-
+ private InternalCache getCache() {
+ return (InternalCache) CacheFactory.getAnyInstance();
+ }
public DataCommandResult remove(DataCommandRequest request) {
String key = request.getKey();
@@ -190,7 +191,6 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
return locateEntry(key, keyClass, valueClass, regionName, recursive);
}
-
public DataCommandResult put(DataCommandRequest request) {
String key = request.getKey();
String value = request.getValue();
@@ -223,8 +223,7 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
@SuppressWarnings("rawtypes")
private DataCommandResult select(Object principal, String queryString) {
-
- Cache cache = CacheFactory.getAnyInstance();
+ InternalCache cache = getCache();
AtomicInteger nestedObjectCount = new AtomicInteger(0);
if (queryString != null && !queryString.isEmpty()) {
QueryService qs = cache.getQueryService();
@@ -362,7 +361,6 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
if (JsonUtil.isPrimitiveOrWrapper(value.getClass())) {
jsonObject.put(fields[i], value);
} else {
- // jsonObject.put(fields[i], value.getClass().getCanonicalName());
jsonObject.put(fields[i], toJson(value));
}
} else {
@@ -376,7 +374,7 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
public DataCommandResult remove(String key, String keyClass, String regionName,
String removeAllKeys) {
- Cache cache = CacheFactory.getAnyInstance();
+ InternalCache cache = getCache();
if (regionName == null || regionName.isEmpty()) {
return DataCommandResult.createRemoveResult(key, null, null,
@@ -441,7 +439,7 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
public DataCommandResult get(Object principal, String key, String keyClass, String valueClass,
String regionName, Boolean loadOnCacheMiss) {
- Cache cache = CacheFactory.getAnyInstance();
+ InternalCache cache = getCache();
if (regionName == null || regionName.isEmpty()) {
return DataCommandResult.createGetResult(key, null, null,
@@ -474,8 +472,6 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
// TODO determine whether the following conditional logic (assigned to 'doGet') is safer or
// necessary
- // boolean doGet = (Boolean.TRUE.equals(loadOnCacheMiss) &&
- // region.getAttributes().getCacheLoader() != null);
boolean doGet = Boolean.TRUE.equals(loadOnCacheMiss);
if (doGet || region.containsKey(keyObject)) {
@@ -512,7 +508,7 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
public DataCommandResult locateEntry(String key, String keyClass, String valueClass,
String regionPath, boolean recursive) {
- Cache cache = CacheFactory.getAnyInstance();
+ InternalCache cache = getCache();
if (regionPath == null || regionPath.isEmpty()) {
return DataCommandResult.createLocateEntryResult(key, null, null,
@@ -617,7 +613,6 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
return DataCommandResult.createLocateEntryInfoResult(key, null, null,
CliStrings.LOCATE_ENTRY__MSG__KEY_NOT_FOUND_REGION, false);
}
-
}
@SuppressWarnings({"rawtypes"})
@@ -639,7 +634,7 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
false);
}
- Cache cache = CacheFactory.getAnyInstance();
+ InternalCache cache = getCache();
Region region = cache.getRegion(regionName);
if (region == null) {
return DataCommandResult.createPutResult(key, null, null,
@@ -812,8 +807,6 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
return v;
}
-
- // Copied from RegionUtil of old Gfsh
/**
* Returns a sorted list of all region full paths found in the specified cache.
*
@@ -822,7 +815,7 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
* @return Returns a sorted list of all region paths defined in the distributed system.
*/
@SuppressWarnings({"rawtypes", "unchecked"})
- public static List getAllRegionPaths(Cache cache, boolean recursive) {
+ public static List getAllRegionPaths(InternalCache cache, boolean recursive) {
ArrayList list = new ArrayList();
if (cache == null) {
return list;
@@ -908,7 +901,6 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
}
}
-
public static class SelectMoveStep extends CLIMultiStepHelper.RemoteStep {
private static final long serialVersionUID = 1L;
@@ -932,8 +924,11 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
private static SecurityService securityService = SecurityService.getSecurityService();
- public SelectExecStep(Object[] arguments) {
+ private final InternalCache cache;
+
+ public SelectExecStep(Object[] arguments, final InternalCache cache) {
super(SELECT_STEP_EXEC, arguments);
+ this.cache = cache;
}
@Override
@@ -956,13 +951,8 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
SELECT_STEP_END);
}
- /*
- * private int getLimit(CompiledValue compiledQuery) { return compiledQuery instanceof
- * CompiledSelect ? ((CompiledSelect)compiledQuery).getLimitValue(): -1; }
- */
-
public DataCommandResult _select(String query) {
- Cache cache = CacheFactory.getAnyInstance();
+ InternalCache cache = (InternalCache) CacheFactory.getAnyInstance();
DataCommandResult dataResult = null;
if (query == null || query.isEmpty()) {
@@ -971,7 +961,6 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
return dataResult;
}
- // String query = querySB.toString().trim();
Object array[] = DataCommands.replaceGfshEnvVar(query, CommandExecutionContext.getShellEnv());
query = (String) array[1];
query = addLimit(query);
@@ -1080,7 +1069,6 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
return CommandExecutionContext.getShellFetchSize();
}
-
public static String getLogMessage(QueryObserver observer, long startTime, String query) {
String usedIndexesString = null;
String rowCountString = null;
@@ -1114,13 +1102,9 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti
+ observer.getClass().getName() + ")";
}
- /*
- * if (resultSize != -1){ rowCountString = " rowCount = " + resultSize + ";"; }
- */
return "Query Executed" + (startTime > 0L ? " in " + time + " ms;" : ";")
+ (rowCountString != null ? rowCountString : "")
- + (usedIndexesString != null ? usedIndexesString : "")
- /* + " \"" + query + "\"" */;
+ + (usedIndexesString != null ? usedIndexesString : "");
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/db79d223/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockExtensionCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockExtensionCommands.java b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockExtensionCommands.java
index 793abf6..59d8a77 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockExtensionCommands.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/extension/mock/MockExtensionCommands.java
@@ -15,12 +15,18 @@
package org.apache.geode.internal.cache.extension.mock;
-import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.CacheFactory;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicReference;
+
+import org.springframework.shell.core.annotation.CliCommand;
+import org.springframework.shell.core.annotation.CliOption;
+
import org.apache.geode.cache.Region;
import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.ResultCollector;
import org.apache.geode.distributed.DistributedMember;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.cli.Result;
import org.apache.geode.management.cli.Result.Status;
import org.apache.geode.management.internal.cli.CliUtil;
@@ -32,16 +38,9 @@ import org.apache.geode.management.internal.configuration.domain.XmlEntity;
import org.apache.geode.management.internal.security.ResourceOperation;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
-import org.springframework.shell.core.annotation.CliCommand;
-import org.springframework.shell.core.annotation.CliOption;
-
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicReference;
/**
* Mock Extension gfsh commands.
- *
*
* @since GemFire 8.1
*/
@@ -173,7 +172,7 @@ public class MockExtensionCommands extends AbstractCommandsSupport {
*/
protected Result executeFunctionOnAllMembersTabulateResultPersist(final Function function,
final boolean addXmlElement, final Object... args) {
- final Cache cache = CacheFactory.getAnyInstance();
+ final InternalCache cache = getCache();
final Set<DistributedMember> members = CliUtil.getAllNormalMembers(cache);
@SuppressWarnings("unchecked")
http://git-wip-us.apache.org/repos/asf/geode/blob/db79d223/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/CommitCommandTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/CommitCommandTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/CommitCommandTest.java
index a3b2afe..7963e97 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/CommitCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/CommitCommandTest.java
@@ -20,7 +20,7 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.CancelCriterion;
-import org.apache.geode.cache.Cache;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.test.junit.categories.UnitTest;
@@ -39,7 +39,7 @@ public class CommitCommandTest {
*/
@Test
public void testWriteNullResponse() throws Exception {
- Cache cache = mock(Cache.class);
+ InternalCache cache = mock(InternalCache.class);
Message origMsg = mock(Message.class);
ServerConnection servConn = mock(ServerConnection.class);
when(servConn.getResponseMessage()).thenReturn(mock(Message.class));
http://git-wip-us.apache.org/repos/asf/geode/blob/db79d223/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey66Test.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey66Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey66Test.java
index 1297a62..3a6c2a3 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey66Test.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKey66Test.java
@@ -14,12 +14,10 @@
*/
package org.apache.geode.internal.cache.tier.sockets.command;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.mockito.Matchers.*;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.isA;
import static org.mockito.Mockito.*;
-import java.util.Properties;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -27,8 +25,8 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.apache.geode.cache.Cache;
import org.apache.geode.internal.Version;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.tier.sockets.CacheServerStats;
import org.apache.geode.internal.cache.tier.sockets.Message;
@@ -56,7 +54,7 @@ public class ContainsKey66Test {
@Mock
private LocalRegion region;
@Mock
- private Cache cache;
+ private InternalCache cache;
@Mock
private CacheServerStats cacheServerStats;
@Mock
http://git-wip-us.apache.org/repos/asf/geode/blob/db79d223/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKeyTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKeyTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKeyTest.java
index eee2ca6..bc1be3e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKeyTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/ContainsKeyTest.java
@@ -14,11 +14,8 @@
*/
package org.apache.geode.internal.cache.tier.sockets.command;
-import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
-import java.util.Properties;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -26,8 +23,8 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.Region;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.tier.sockets.CacheServerStats;
import org.apache.geode.internal.cache.tier.sockets.Message;
@@ -66,7 +63,7 @@ public class ContainsKeyTest {
Region region = mock(LocalRegion.class);
when(region.containsKey(isA(String.class))).thenReturn(true);
- Cache cache = mock(Cache.class);
+ InternalCache cache = mock(InternalCache.class);
when(cache.getRegion(isA(String.class))).thenReturn(region);
CacheServerStats cacheServerStats = mock(CacheServerStats.class);
http://git-wip-us.apache.org/repos/asf/geode/blob/db79d223/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/CreateRegionTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/CreateRegionTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/CreateRegionTest.java
index 0b411dd..c946e8a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/CreateRegionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/CreateRegionTest.java
@@ -14,7 +14,7 @@
*/
package org.apache.geode.internal.cache.tier.sockets.command;
-import static org.mockito.Matchers.*;
+import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.*;
import org.junit.Before;
@@ -26,8 +26,8 @@ import org.mockito.MockitoAnnotations;
import org.apache.geode.CancelCriterion;
import org.apache.geode.cache.AttributesFactory;
-import org.apache.geode.cache.Cache;
import org.apache.geode.internal.Version;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.tier.sockets.CacheServerStats;
import org.apache.geode.internal.cache.tier.sockets.Message;
@@ -57,7 +57,7 @@ public class CreateRegionTest {
@Mock
private LocalRegion parentRegion;
@Mock
- private Cache cache;
+ private InternalCache cache;
@Mock
private Message errorResponseMessage;
@Mock
http://git-wip-us.apache.org/repos/asf/geode/blob/db79d223/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy65Test.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy65Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy65Test.java
index ffc462a..d3f68f2 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy65Test.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Destroy65Test.java
@@ -14,12 +14,10 @@
*/
package org.apache.geode.internal.cache.tier.sockets.command;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.mockito.Matchers.*;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.isA;
import static org.mockito.Mockito.*;
-import java.util.Properties;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -28,9 +26,9 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.apache.geode.CancelCriterion;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.operations.DestroyOperationContext;
import org.apache.geode.internal.Version;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.tier.CachedRegionHelper;
import org.apache.geode.internal.cache.tier.sockets.CacheServerStats;
@@ -61,7 +59,7 @@ public class Destroy65Test {
@Mock
private LocalRegion region;
@Mock
- private Cache cache;
+ private InternalCache cache;
@Mock
private CacheServerStats cacheServerStats;
@Mock
http://git-wip-us.apache.org/repos/asf/geode/blob/db79d223/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyRegionTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyRegionTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyRegionTest.java
index 808792a..4abdebf 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyRegionTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyRegionTest.java
@@ -14,7 +14,8 @@
*/
package org.apache.geode.internal.cache.tier.sockets.command;
-import static org.mockito.Matchers.*;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.isA;
import static org.mockito.Mockito.*;
import org.junit.Before;
@@ -25,9 +26,9 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.apache.geode.CancelCriterion;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.operations.RegionDestroyOperationContext;
import org.apache.geode.internal.Version;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.tier.CachedRegionHelper;
import org.apache.geode.internal.cache.tier.sockets.CacheServerStats;
@@ -41,6 +42,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
public class DestroyRegionTest {
+
private static final String REGION_NAME = "region1";
private static final String KEY = "key1";
private static final Object CALLBACK_ARG = "arg";
@@ -57,7 +59,7 @@ public class DestroyRegionTest {
@Mock
private LocalRegion region;
@Mock
- private Cache cache;
+ private InternalCache cache;
@Mock
private CacheServerStats cacheServerStats;
@Mock
http://git-wip-us.apache.org/repos/asf/geode/blob/db79d223/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyTest.java
index ce869ab..24105a6 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/DestroyTest.java
@@ -14,13 +14,10 @@
*/
package org.apache.geode.internal.cache.tier.sockets.command;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.mockito.Matchers.*;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.isA;
import static org.mockito.Mockito.*;
-import java.nio.ByteBuffer;
-import java.util.Properties;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -29,9 +26,9 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.apache.geode.CancelCriterion;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.operations.DestroyOperationContext;
import org.apache.geode.internal.Version;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.tier.CachedRegionHelper;
import org.apache.geode.internal.cache.tier.sockets.CacheServerStats;
@@ -62,7 +59,7 @@ public class DestroyTest {
@Mock
private LocalRegion region;
@Mock
- private Cache cache;
+ private InternalCache cache;
@Mock
private CacheServerStats cacheServerStats;
@Mock
http://git-wip-us.apache.org/repos/asf/geode/blob/db79d223/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Get70Test.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Get70Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Get70Test.java
index ca08f03..d81dfd7 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Get70Test.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Get70Test.java
@@ -14,12 +14,11 @@
*/
package org.apache.geode.internal.cache.tier.sockets.command;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.mockito.Matchers.*;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.isA;
import static org.mockito.Mockito.*;
-import java.util.Properties;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -28,10 +27,9 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.apache.geode.CancelCriterion;
-import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.operations.DestroyOperationContext;
import org.apache.geode.cache.operations.GetOperationContext;
import org.apache.geode.internal.Version;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.tier.CachedRegionHelper;
import org.apache.geode.internal.cache.tier.sockets.CacheServerStats;
@@ -45,6 +43,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
public class Get70Test {
+
private static final String REGION_NAME = "region1";
private static final String KEY = "key1";
private static final Object CALLBACK_ARG = "arg";
@@ -61,7 +60,7 @@ public class Get70Test {
@Mock
private LocalRegion region;
@Mock
- private Cache cache;
+ private InternalCache cache;
@Mock
private CacheServerStats cacheServerStats;
@Mock
@@ -167,5 +166,4 @@ public class Get70Test {
verify(this.errorResponseMessage).send(eq(this.serverConnection));
}
-
}
http://git-wip-us.apache.org/repos/asf/geode/blob/db79d223/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll651Test.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll651Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll651Test.java
index e82b1f2..974fa05 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll651Test.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll651Test.java
@@ -15,12 +15,12 @@
package org.apache.geode.internal.cache.tier.sockets.command;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Matchers.*;
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.isA;
import static org.mockito.Mockito.*;
-import java.util.Properties;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -30,8 +30,8 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.apache.geode.CancelCriterion;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.operations.GetOperationContext;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.tier.CachedRegionHelper;
import org.apache.geode.internal.cache.tier.sockets.CacheServerStats;
@@ -47,6 +47,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
public class GetAll651Test {
+
private static final String REGION_NAME = "region1";
private static final Object[] KEYS = new Object[] {"key1", "key2", "key3"};
@@ -59,7 +60,7 @@ public class GetAll651Test {
@Mock
private AuthorizeRequest authzRequest;
@Mock
- private Cache cache;
+ private InternalCache cache;
@Mock
private Part regionNamePart;
@Mock
http://git-wip-us.apache.org/repos/asf/geode/blob/db79d223/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll70Test.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll70Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll70Test.java
index 9806c6e..018993c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll70Test.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAll70Test.java
@@ -14,12 +14,12 @@
*/
package org.apache.geode.internal.cache.tier.sockets.command;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Matchers.*;
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.isA;
import static org.mockito.Mockito.*;
-import java.util.Properties;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -29,9 +29,9 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.apache.geode.CancelCriterion;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.cache.operations.GetOperationContext;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.tier.CachedRegionHelper;
import org.apache.geode.internal.cache.tier.sockets.CacheServerStats;
@@ -47,6 +47,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
public class GetAll70Test {
+
private static final String REGION_NAME = "region1";
private static final Object[] KEYS = new Object[] {"key1", "key2", "key3"};
@@ -59,7 +60,7 @@ public class GetAll70Test {
@Mock
private AuthorizeRequest authzRequest;
@Mock
- private Cache cache;
+ private InternalCache cache;
@Mock
private LocalRegion region;
@Mock
http://git-wip-us.apache.org/repos/asf/geode/blob/db79d223/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllTest.java
index 2554560..cebf988 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllTest.java
@@ -18,8 +18,6 @@ import static org.assertj.core.api.Assertions.*;
import static org.mockito.Matchers.*;
import static org.mockito.Mockito.*;
-import java.util.Properties;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -29,8 +27,8 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.apache.geode.CancelCriterion;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.operations.GetOperationContext;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.tier.CachedRegionHelper;
import org.apache.geode.internal.cache.tier.sockets.CacheServerStats;
@@ -59,7 +57,7 @@ public class GetAllTest {
@Mock
private AuthorizeRequest authzRequest;
@Mock
- private Cache cache;
+ private InternalCache cache;
@Mock
private Part regionNamePart;
@Mock
http://git-wip-us.apache.org/repos/asf/geode/blob/db79d223/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllWithCallbackTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllWithCallbackTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllWithCallbackTest.java
index 415f8f9..112ea64 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllWithCallbackTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetAllWithCallbackTest.java
@@ -14,12 +14,12 @@
*/
package org.apache.geode.internal.cache.tier.sockets.command;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Matchers.*;
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.isA;
import static org.mockito.Mockito.*;
-import java.util.Properties;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -28,13 +28,10 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.apache.geode.CancelCriterion;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.RegionAttributes;
import org.apache.geode.cache.operations.GetOperationContext;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.LocalRegion;
-import org.apache.geode.internal.cache.tier.CachedRegionHelper;
-import org.apache.geode.internal.cache.tier.sockets.CacheServerStats;
import org.apache.geode.internal.cache.tier.sockets.ChunkedMessage;
import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.ObjectPartList;
@@ -47,6 +44,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
public class GetAllWithCallbackTest {
+
private static final String REGION_NAME = "region1";
private static final Object[] KEYS = new Object[] {"key1", "key2", "key3"};
@@ -59,7 +57,7 @@ public class GetAllWithCallbackTest {
@Mock
private AuthorizeRequest authzRequest;
@Mock
- private Cache cache;
+ private InternalCache cache;
@Mock
private LocalRegion region;
@Mock
http://git-wip-us.apache.org/repos/asf/geode/blob/db79d223/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand66Test.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand66Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand66Test.java
index e93e874..c86ecb4 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand66Test.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommand66Test.java
@@ -14,13 +14,10 @@
*/
package org.apache.geode.internal.cache.tier.sockets.command;
-import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Matchers.isA;
import static org.mockito.Mockito.*;
-import java.util.Properties;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -28,7 +25,7 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.apache.geode.cache.Cache;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.Part;
@@ -48,7 +45,7 @@ public class GetClientPartitionAttributesCommand66Test {
@Mock
private ServerConnection serverConnection;
@Mock
- private Cache cache;
+ private InternalCache cache;
@Mock
private Part regionNamePart;
@Mock
http://git-wip-us.apache.org/repos/asf/geode/blob/db79d223/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommandTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommandTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommandTest.java
index 1f71777..fe144d7 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommandTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/GetClientPartitionAttributesCommandTest.java
@@ -28,7 +28,7 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.apache.geode.cache.Cache;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.internal.cache.tier.sockets.Message;
import org.apache.geode.internal.cache.tier.sockets.Part;
@@ -48,7 +48,7 @@ public class GetClientPartitionAttributesCommandTest {
@Mock
private ServerConnection serverConnection;
@Mock
- private Cache cache;
+ private InternalCache cache;
@Mock
private Part regionNamePart;
@Mock
http://git-wip-us.apache.org/repos/asf/geode/blob/db79d223/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/InvalidateTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/InvalidateTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/InvalidateTest.java
index 971179c..b261347 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/InvalidateTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/InvalidateTest.java
@@ -15,11 +15,11 @@
package org.apache.geode.internal.cache.tier.sockets.command;
import static org.assertj.core.api.Assertions.*;
-import static org.mockito.Matchers.*;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.isA;
import static org.mockito.Mockito.*;
-import java.util.Properties;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -29,16 +29,13 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.apache.geode.CancelCriterion;
-import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.operations.GetOperationContext;
import org.apache.geode.cache.operations.InvalidateOperationContext;
import org.apache.geode.internal.Version;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.tier.CachedRegionHelper;
import org.apache.geode.internal.cache.tier.sockets.CacheServerStats;
-import org.apache.geode.internal.cache.tier.sockets.ChunkedMessage;
import org.apache.geode.internal.cache.tier.sockets.Message;
-import org.apache.geode.internal.cache.tier.sockets.ObjectPartList;
import org.apache.geode.internal.cache.tier.sockets.Part;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.security.AuthorizeRequest;
@@ -63,7 +60,7 @@ public class InvalidateTest {
@Mock
private AuthorizeRequest authzRequest;
@Mock
- private Cache cache;
+ private InternalCache cache;
@Mock
private Message errorResponseMessage;
@Mock
@@ -103,7 +100,6 @@ public class InvalidateTest {
when(this.message.getPart(eq(2))).thenReturn(this.eventPart);
when(this.message.getPart(eq(3))).thenReturn(this.callbackArgPart);
-
when(this.regionNamePart.getString()).thenReturn(REGION_NAME);
when(this.serverConnection.getCache()).thenReturn(this.cache);
http://git-wip-us.apache.org/repos/asf/geode/blob/db79d223/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/KeySetTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/KeySetTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/KeySetTest.java
index 3ca8b3b..5f09eaa 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/KeySetTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/KeySetTest.java
@@ -15,11 +15,10 @@
package org.apache.geode.internal.cache.tier.sockets.command;
import static org.assertj.core.api.Assertions.*;
-import static org.mockito.Matchers.*;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.isA;
import static org.mockito.Mockito.*;
-import java.util.Properties;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -29,15 +28,13 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.apache.geode.CancelCriterion;
-import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.operations.DestroyOperationContext;
import org.apache.geode.cache.operations.KeySetOperationContext;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.tier.CachedRegionHelper;
import org.apache.geode.internal.cache.tier.sockets.CacheServerStats;
import org.apache.geode.internal.cache.tier.sockets.ChunkedMessage;
import org.apache.geode.internal.cache.tier.sockets.Message;
-import org.apache.geode.internal.cache.tier.sockets.ObjectPartList;
import org.apache.geode.internal.cache.tier.sockets.Part;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.security.AuthorizeRequest;
@@ -64,7 +61,7 @@ public class KeySetTest {
@Mock
private LocalRegion region;
@Mock
- private Cache cache;
+ private InternalCache cache;
@Mock
private ChunkedMessage chunkedResponseMessage;
@Mock
@@ -158,5 +155,4 @@ public class KeySetTest {
verify(this.chunkedResponseMessage).sendChunk(eq(this.serverConnection));
}
-
}
http://git-wip-us.apache.org/repos/asf/geode/blob/db79d223/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Put61Test.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Put61Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Put61Test.java
index 03a9321..2b4110e 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Put61Test.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Put61Test.java
@@ -15,11 +15,11 @@
package org.apache.geode.internal.cache.tier.sockets.command;
import static org.assertj.core.api.Assertions.*;
-import static org.mockito.Matchers.*;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.isA;
import static org.mockito.Mockito.*;
-import java.util.Properties;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -29,10 +29,10 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.apache.geode.CancelCriterion;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.operations.PutOperationContext;
import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.EntryEventImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.tier.CachedRegionHelper;
import org.apache.geode.internal.cache.tier.sockets.CacheServerStats;
@@ -64,7 +64,7 @@ public class Put61Test {
@Mock
private AuthorizeRequest authzRequest;
@Mock
- private Cache cache;
+ private InternalCache cache;
@Mock
private LocalRegion localRegion;
@Mock
@@ -204,6 +204,4 @@ public class Put61Test {
verify(this.errorResponseMessage).send(this.serverConnection);
}
-
-
}
http://git-wip-us.apache.org/repos/asf/geode/blob/db79d223/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Put65Test.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Put65Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Put65Test.java
index cf30b35..8a1c870 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Put65Test.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/Put65Test.java
@@ -15,11 +15,11 @@
package org.apache.geode.internal.cache.tier.sockets.command;
import static org.assertj.core.api.Assertions.*;
-import static org.mockito.Matchers.*;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.isA;
import static org.mockito.Mockito.*;
-import java.util.Properties;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -29,12 +29,10 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.apache.geode.CancelCriterion;
-import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.CacheTransactionManager;
-import org.apache.geode.cache.Operation;
import org.apache.geode.cache.operations.PutOperationContext;
import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.EntryEventImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.TXManagerImpl;
import org.apache.geode.internal.cache.tier.CachedRegionHelper;
@@ -67,7 +65,7 @@ public class Put65Test {
@Mock
private AuthorizeRequest authzRequest;
@Mock
- private Cache cache;
+ private InternalCache cache;
@Mock
private LocalRegion localRegion;
@Mock
http://git-wip-us.apache.org/repos/asf/geode/blob/db79d223/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/PutTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/PutTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/PutTest.java
index 5197b21..abd6649 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/PutTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/PutTest.java
@@ -15,11 +15,11 @@
package org.apache.geode.internal.cache.tier.sockets.command;
import static org.assertj.core.api.Assertions.*;
-import static org.mockito.Matchers.*;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.isA;
import static org.mockito.Mockito.*;
-import java.util.Properties;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -29,10 +29,10 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.apache.geode.CancelCriterion;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.operations.PutOperationContext;
import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.EntryEventImpl;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.tier.CachedRegionHelper;
import org.apache.geode.internal.cache.tier.sockets.CacheServerStats;
@@ -64,7 +64,7 @@ public class PutTest {
@Mock
private AuthorizeRequest authzRequest;
@Mock
- private Cache cache;
+ private InternalCache cache;
@Mock
private LocalRegion localRegion;
@Mock
http://git-wip-us.apache.org/repos/asf/geode/blob/db79d223/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest61Test.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest61Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest61Test.java
index 495f772..6f6da3a 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest61Test.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterest61Test.java
@@ -27,9 +27,9 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.apache.geode.CancelCriterion;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.operations.RegisterInterestOperationContext;
import org.apache.geode.internal.Version;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.tier.CachedRegionHelper;
import org.apache.geode.internal.cache.tier.sockets.AcceptorImpl;
@@ -44,11 +44,11 @@ import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
public class RegisterInterest61Test {
+
private static final String REGION_NAME = "region1";
private static final String KEY = "key1";
private static final byte[] DURABLE = new byte[8];
-
@Mock
private SecurityService securityService;
@Mock
@@ -58,7 +58,7 @@ public class RegisterInterest61Test {
@Mock
private AuthorizeRequest authzRequest;
@Mock
- private Cache cache;
+ private InternalCache cache;
@Mock
private Part regionNamePart;
@Mock
@@ -82,7 +82,6 @@ public class RegisterInterest61Test {
this.registerInterest61 = new RegisterInterest61();
MockitoAnnotations.initMocks(this);
-
when(this.authzRequest.registerInterestAuthorize(eq(REGION_NAME), eq(KEY), anyInt(), any()))
.thenReturn(this.registerInterestOperationContext);
@@ -181,6 +180,4 @@ public class RegisterInterest61Test {
verify(this.chunkedResponseMessage).sendChunk(this.serverConnection);
}
-
-
}
http://git-wip-us.apache.org/repos/asf/geode/blob/db79d223/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList61Test.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList61Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList61Test.java
index 94bd633..2b91b99 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList61Test.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList61Test.java
@@ -14,8 +14,10 @@
*/
package org.apache.geode.internal.cache.tier.sockets.command;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Matchers.*;
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.isA;
import static org.mockito.Mockito.*;
import org.junit.Before;
@@ -27,9 +29,9 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.apache.geode.CancelCriterion;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.operations.RegisterInterestOperationContext;
import org.apache.geode.internal.Version;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.tier.CachedRegionHelper;
import org.apache.geode.internal.cache.tier.sockets.AcceptorImpl;
@@ -44,11 +46,11 @@ import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
public class RegisterInterestList61Test {
+
private static final String REGION_NAME = "region1";
private static final String KEY = "key1";
private static final byte[] DURABLE = new byte[8];
-
@Mock
private SecurityService securityService;
@Mock
@@ -58,7 +60,7 @@ public class RegisterInterestList61Test {
@Mock
private AuthorizeRequest authzRequest;
@Mock
- private Cache cache;
+ private InternalCache cache;
@Mock
private Part regionNamePart;
@Mock
@@ -84,7 +86,6 @@ public class RegisterInterestList61Test {
this.registerInterestList61 = new RegisterInterestList61();
MockitoAnnotations.initMocks(this);
-
when(this.authzRequest.registerInterestListAuthorize(eq(REGION_NAME), any(), any()))
.thenReturn(this.registerInterestOperationContext);
http://git-wip-us.apache.org/repos/asf/geode/blob/db79d223/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList66Test.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList66Test.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList66Test.java
index bc92d54..94163ea 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList66Test.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestList66Test.java
@@ -29,9 +29,9 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.apache.geode.CancelCriterion;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.operations.RegisterInterestOperationContext;
import org.apache.geode.internal.Version;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.tier.CachedRegionHelper;
import org.apache.geode.internal.cache.tier.sockets.AcceptorImpl;
@@ -46,12 +46,12 @@ import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
public class RegisterInterestList66Test {
+
private static final String REGION_NAME = "region1";
private static final String KEY = "key1";
private static final byte[] DURABLE = new byte[8];
private static final byte[] DATA_POLICY = new byte[] {0x01, 0x01};
-
@Mock
private SecurityService securityService;
@Mock
@@ -61,7 +61,7 @@ public class RegisterInterestList66Test {
@Mock
private AuthorizeRequest authzRequest;
@Mock
- private Cache cache;
+ private InternalCache cache;
@Mock
private Part regionNamePart;
@Mock
@@ -89,7 +89,6 @@ public class RegisterInterestList66Test {
this.registerInterestList66 = new RegisterInterestList66();
MockitoAnnotations.initMocks(this);
-
when(this.authzRequest.registerInterestListAuthorize(eq(REGION_NAME), any(), any()))
.thenReturn(this.registerInterestOperationContext);
http://git-wip-us.apache.org/repos/asf/geode/blob/db79d223/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestListTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestListTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestListTest.java
index 1832ca2..514eb9b 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestListTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestListTest.java
@@ -14,8 +14,10 @@
*/
package org.apache.geode.internal.cache.tier.sockets.command;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Matchers.*;
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.isA;
import static org.mockito.Mockito.*;
import org.junit.Before;
@@ -27,9 +29,9 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.apache.geode.CancelCriterion;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.operations.RegisterInterestOperationContext;
import org.apache.geode.internal.Version;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.tier.CachedRegionHelper;
import org.apache.geode.internal.cache.tier.sockets.AcceptorImpl;
@@ -44,11 +46,11 @@ import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
public class RegisterInterestListTest {
+
private static final String REGION_NAME = "region1";
private static final String KEY = "key1";
private static final byte[] DURABLE = new byte[8];
-
@Mock
private SecurityService securityService;
@Mock
@@ -58,7 +60,7 @@ public class RegisterInterestListTest {
@Mock
private AuthorizeRequest authzRequest;
@Mock
- private Cache cache;
+ private InternalCache cache;
@Mock
private Part regionNamePart;
@Mock
@@ -84,7 +86,6 @@ public class RegisterInterestListTest {
this.registerInterestList = new RegisterInterestList();
MockitoAnnotations.initMocks(this);
-
when(this.authzRequest.registerInterestListAuthorize(eq(REGION_NAME), any(), any()))
.thenReturn(this.registerInterestOperationContext);
http://git-wip-us.apache.org/repos/asf/geode/blob/db79d223/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestTest.java
index 317347f..0b02a2c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RegisterInterestTest.java
@@ -15,11 +15,12 @@
package org.apache.geode.internal.cache.tier.sockets.command;
import static org.assertj.core.api.Assertions.*;
-import static org.mockito.Matchers.*;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.isA;
import static org.mockito.Mockito.*;
-import java.util.Properties;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -29,20 +30,12 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.apache.geode.CancelCriterion;
-import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.InterestResultPolicy;
-import org.apache.geode.cache.operations.GetOperationContext;
import org.apache.geode.cache.operations.RegisterInterestOperationContext;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.tier.CachedRegionHelper;
-import org.apache.geode.internal.cache.tier.sockets.AcceptorImpl;
-import org.apache.geode.internal.cache.tier.sockets.CacheClientNotifier;
-import org.apache.geode.internal.cache.tier.sockets.CacheClientProxy;
-import org.apache.geode.internal.cache.tier.sockets.CacheServerStats;
import org.apache.geode.internal.cache.tier.sockets.ChunkedMessage;
-import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
import org.apache.geode.internal.cache.tier.sockets.Message;
-import org.apache.geode.internal.cache.tier.sockets.ObjectPartList;
import org.apache.geode.internal.cache.tier.sockets.Part;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
import org.apache.geode.internal.security.AuthorizeRequest;
@@ -57,7 +50,6 @@ public class RegisterInterestTest {
private static final String KEY = "key1";
private static final byte[] DURABLE = new byte[8];
-
@Mock
private SecurityService securityService;
@Mock
@@ -67,7 +59,7 @@ public class RegisterInterestTest {
@Mock
private AuthorizeRequest authzRequest;
@Mock
- private Cache cache;
+ private InternalCache cache;
@Mock
private Part regionNamePart;
@Mock
@@ -89,7 +81,6 @@ public class RegisterInterestTest {
this.registerInterest = new RegisterInterest();
MockitoAnnotations.initMocks(this);
-
when(this.authzRequest.registerInterestAuthorize(eq(REGION_NAME), eq(KEY), anyInt(), any()))
.thenReturn(mock(RegisterInterestOperationContext.class));
http://git-wip-us.apache.org/repos/asf/geode/blob/db79d223/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveAllTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveAllTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveAllTest.java
index dca4127..97cd581 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveAllTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RemoveAllTest.java
@@ -14,32 +14,28 @@
*/
package org.apache.geode.internal.cache.tier.sockets.command;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Matchers.*;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.isA;
import static org.mockito.Mockito.*;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.mockito.ArgumentCaptor;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.apache.geode.CancelCriterion;
-import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.operations.GetOperationContext;
import org.apache.geode.cache.operations.RemoveAllOperationContext;
-import org.apache.geode.internal.cache.LocalRegion;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.PartitionedRegion;
import org.apache.geode.internal.cache.tier.CachedRegionHelper;
import org.apache.geode.internal.cache.tier.sockets.CacheServerStats;
import org.apache.geode.internal.cache.tier.sockets.ChunkedMessage;
import org.apache.geode.internal.cache.tier.sockets.Message;
-import org.apache.geode.internal.cache.tier.sockets.ObjectPartList;
import org.apache.geode.internal.cache.tier.sockets.Part;
import org.apache.geode.internal.cache.tier.sockets.ServerConnection;
-import org.apache.geode.internal.cache.tier.sockets.VersionedObjectList;
import org.apache.geode.internal.security.AuthorizeRequest;
import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.security.NotAuthorizedException;
@@ -62,7 +58,7 @@ public class RemoveAllTest {
@Mock
private AuthorizeRequest authzRequest;
@Mock
- private Cache cache;
+ private InternalCache cache;
@Mock
private Part regionNamePart;
@Mock
@@ -196,5 +192,4 @@ public class RemoveAllTest {
verify(this.chunkedResponseMessage).sendChunk(eq(this.serverConnection));
}
-
}
http://git-wip-us.apache.org/repos/asf/geode/blob/db79d223/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RequestTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RequestTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RequestTest.java
index 33ee145..428ddde 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RequestTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/command/RequestTest.java
@@ -25,9 +25,9 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.apache.geode.CancelCriterion;
-import org.apache.geode.cache.Cache;
import org.apache.geode.cache.operations.GetOperationContext;
import org.apache.geode.internal.Version;
+import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.LocalRegion;
import org.apache.geode.internal.cache.tier.CachedRegionHelper;
import org.apache.geode.internal.cache.tier.sockets.CacheServerStats;
@@ -41,6 +41,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
public class RequestTest {
+
private static final String REGION_NAME = "region1";
private static final String KEY = "key1";
private static final Object CALLBACK_ARG = "arg";
@@ -57,7 +58,7 @@ public class RequestTest {
@Mock
private LocalRegion region;
@Mock
- private Cache cache;
+ private InternalCache cache;
@Mock
private CacheServerStats cacheServerStats;
@Mock