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:43 UTC
[2/3] geode git commit: fixup
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