This is an automated email from the ASF dual-hosted git repository.
khowe pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 125e9da GEODE_3299: Refactor Gfsh functions to acquire Cache from
FunctionContex
125e9da is described below
commit 125e9da1ab5ce46df37e6c31f1d0df37be70d33a
Author: Ken Howe <[email protected]>
AuthorDate: Tue Oct 10 15:37:50 2017 -0700
GEODE_3299: Refactor Gfsh functions to acquire Cache from FunctionContex
This commit is the third set of refactored Function classes.
---
.../internal/cli/functions/GetRegionDescriptionFunction.java | 3 +--
.../management/internal/cli/functions/GetStackTracesFunction.java | 3 +--
.../management/internal/cli/functions/ImportDataFunction.java | 3 +--
.../internal/cli/functions/ListAsyncEventQueuesFunction.java | 8 +-------
.../management/internal/cli/functions/ListDeployedFunction.java | 7 +------
.../internal/cli/functions/ListDurableCqNamesFunction.java | 8 +-------
.../management/internal/cli/functions/ListFunctionFunction.java | 3 +--
.../management/internal/cli/functions/MemberRegionFunction.java | 3 +--
.../internal/cli/functions/MembersForRegionFunction.java | 4 +---
.../management/internal/cli/functions/RebalanceFunction.java | 3 +--
.../management/internal/cli/functions/RegionAlterFunction.java | 3 +--
.../management/internal/cli/functions/RegionCreateFunction.java | 3 +--
.../management/internal/cli/functions/RegionDestroyFunction.java | 3 +--
.../geode/management/internal/cli/functions/UndeployFunction.java | 8 +-------
.../management/internal/cli/functions/UnregisterFunction.java | 4 ----
15 files changed, 14 insertions(+), 52 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GetRegionDescriptionFunction.java
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GetRegionDescriptionFunction.java
index cbf70ac..11c3678 100644
---
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GetRegionDescriptionFunction.java
+++
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GetRegionDescriptionFunction.java
@@ -17,7 +17,6 @@ package org.apache.geode.management.internal.cli.functions;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheClosedException;
-import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.execute.FunctionAdapter;
import org.apache.geode.cache.execute.FunctionContext;
@@ -33,7 +32,7 @@ public class GetRegionDescriptionFunction extends
FunctionAdapter implements Int
public void execute(FunctionContext context) {
String regionPath = (String) context.getArguments();
try {
- Cache cache = CacheFactory.getAnyInstance();
+ Cache cache = context.getCache();
Region<?, ?> region = cache.getRegion(regionPath);
if (region != null) {
diff --git
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GetStackTracesFunction.java
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GetStackTracesFunction.java
index 4e9f9d6..6f148dd 100644
---
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GetStackTracesFunction.java
+++
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GetStackTracesFunction.java
@@ -16,7 +16,6 @@ package org.apache.geode.management.internal.cli.functions;
import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.execute.FunctionAdapter;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.internal.InternalEntity;
@@ -30,7 +29,7 @@ public class GetStackTracesFunction extends FunctionAdapter
implements InternalE
@Override
public void execute(FunctionContext context) {
try {
- Cache cache = CacheFactory.getAnyInstance();
+ Cache cache = context.getCache();
String memberNameOrId =
cache.getDistributedSystem().getDistributedMember().getName();
if (memberNameOrId == null) {
diff --git
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ImportDataFunction.java
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ImportDataFunction.java
index e776c8e..1aa8522 100644
---
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ImportDataFunction.java
+++
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ImportDataFunction.java
@@ -17,7 +17,6 @@ package org.apache.geode.management.internal.cli.functions;
import java.io.File;
import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.execute.FunctionAdapter;
import org.apache.geode.cache.execute.FunctionContext;
@@ -48,7 +47,7 @@ public class ImportDataFunction extends FunctionAdapter
implements InternalEntit
final boolean parallel = (boolean) args[3];
try {
- final Cache cache = CacheFactory.getAnyInstance();
+ final Cache cache = context.getCache();
final Region<?, ?> region = cache.getRegion(regionName);
final String hostName =
cache.getDistributedSystem().getDistributedMember().getHost();
if (region != null) {
diff --git
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ListAsyncEventQueuesFunction.java
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ListAsyncEventQueuesFunction.java
index 507e9f8..25b81ee 100644
---
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ListAsyncEventQueuesFunction.java
+++
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ListAsyncEventQueuesFunction.java
@@ -19,11 +19,9 @@ import java.util.Set;
import org.apache.logging.log4j.Logger;
-import org.apache.geode.LogWriter;
import org.apache.geode.SystemFailure;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheClosedException;
-import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.asyncqueue.AsyncEventListener;
import org.apache.geode.cache.asyncqueue.AsyncEventQueue;
import org.apache.geode.cache.execute.FunctionAdapter;
@@ -51,17 +49,13 @@ public class ListAsyncEventQueuesFunction extends
FunctionAdapter implements Int
return getClass().getName();
}
- protected Cache getCache() {
- return CacheFactory.getAnyInstance();
- }
-
@Override
public void execute(final FunctionContext context) {
// Declared here so that it's available when returning a Throwable
String memberId = "";
try {
- Cache cache = CacheFactory.getAnyInstance();
+ Cache cache = context.getCache();
DistributedMember member =
cache.getDistributedSystem().getDistributedMember();
diff --git
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ListDeployedFunction.java
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ListDeployedFunction.java
index 88a77be..9ab5978 100644
---
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ListDeployedFunction.java
+++
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ListDeployedFunction.java
@@ -22,7 +22,6 @@ import org.apache.logging.log4j.Logger;
import org.apache.geode.SystemFailure;
import org.apache.geode.cache.CacheClosedException;
-import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.distributed.DistributedMember;
@@ -38,17 +37,13 @@ public class ListDeployedFunction implements Function,
InternalEntity {
private static final long serialVersionUID = 1L;
- private InternalCache getCache() {
- return (InternalCache) CacheFactory.getAnyInstance();
- }
-
@Override
public void execute(FunctionContext context) {
// Declared here so that it's available when returning a Throwable
String memberId = "";
try {
- InternalCache cache = getCache();
+ InternalCache cache = (InternalCache) context.getCache();
final JarDeployer jarDeployer =
ClassPathLoader.getLatest().getJarDeployer();
DistributedMember member =
cache.getDistributedSystem().getDistributedMember();
diff --git
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ListDurableCqNamesFunction.java
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ListDurableCqNamesFunction.java
index 434c619..22b8021 100644
---
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ListDurableCqNamesFunction.java
+++
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ListDurableCqNamesFunction.java
@@ -16,11 +16,9 @@
package org.apache.geode.management.internal.cli.functions;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.execute.FunctionAdapter;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.cache.query.internal.cq.CqService;
@@ -49,16 +47,12 @@ import
org.apache.geode.management.internal.cli.i18n.CliStrings;
public class ListDurableCqNamesFunction extends FunctionAdapter implements
InternalEntity {
private static final long serialVersionUID = 1L;
- protected Cache getCache() {
- return CacheFactory.getAnyInstance();
- }
-
public String getId() {
return ListDurableCqNamesFunction.class.getName();
}
public void execute(final FunctionContext context) {
- final Cache cache = getCache();
+ final Cache cache = context.getCache();
final DistributedMember member =
cache.getDistributedSystem().getDistributedMember();
String memberNameOrId = CliUtil.getMemberNameOrId(member);
DurableCqNamesResult result = new DurableCqNamesResult(memberNameOrId);
diff --git
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ListFunctionFunction.java
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ListFunctionFunction.java
index a45ed0b..e4d56a1 100644
---
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ListFunctionFunction.java
+++
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/ListFunctionFunction.java
@@ -25,7 +25,6 @@ import org.apache.logging.log4j.Logger;
import org.apache.geode.SystemFailure;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheClosedException;
-import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.cache.execute.FunctionService;
@@ -49,7 +48,7 @@ public class ListFunctionFunction implements Function,
InternalEntity {
final Object[] args = (Object[]) context.getArguments();
final String stringPattern = (String) args[0];
- Cache cache = CacheFactory.getAnyInstance();
+ Cache cache = context.getCache();
DistributedMember member =
cache.getDistributedSystem().getDistributedMember();
memberId = member.getId();
diff --git
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/MemberRegionFunction.java
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/MemberRegionFunction.java
index c23bcbe..d20edc7 100644
---
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/MemberRegionFunction.java
+++
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/MemberRegionFunction.java
@@ -15,7 +15,6 @@
package org.apache.geode.management.internal.cli.functions;
import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.execute.Execution;
import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.FunctionContext;
@@ -33,7 +32,7 @@ public class MemberRegionFunction implements Function,
InternalEntity {
Object[] args = (Object[]) context.getArguments();
String region = (String) args[0];
String functionId = (String) args[1];
- Cache cache = CacheFactory.getAnyInstance();
+ Cache cache = context.getCache();
try {
Function function = FunctionService.getFunction(functionId);
diff --git
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/MembersForRegionFunction.java
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/MembersForRegionFunction.java
index 72d37e7..de176a7 100644
---
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/MembersForRegionFunction.java
+++
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/MembersForRegionFunction.java
@@ -21,7 +21,6 @@ import java.util.Map;
import org.apache.logging.log4j.Logger;
import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.FunctionContext;
@@ -44,7 +43,7 @@ public class MembersForRegionFunction implements Function,
InternalEntity {
public void execute(FunctionContext context) {
Map<String, String> resultMap = new HashMap<String, String>();
try {
- Cache cache = CacheFactory.getAnyInstance();
+ Cache cache = context.getCache();
String memberNameOrId =
cache.getDistributedSystem().getDistributedMember().getId();
Object args = (Object) context.getArguments();
String regionName = ((String) args);
@@ -63,7 +62,6 @@ public class MembersForRegionFunction implements Function,
InternalEntity {
}
context.getResultSender().lastResult(resultMap);
} catch (Exception ex) {
- Cache cache = CacheFactory.getAnyInstance();
logger.info("MembersForRegionFunction exception {}", ex.getMessage(),
ex);
resultMap.put("", "");
context.getResultSender().lastResult(resultMap);
diff --git
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/RebalanceFunction.java
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/RebalanceFunction.java
index 218f212..c77d848 100644
---
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/RebalanceFunction.java
+++
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/RebalanceFunction.java
@@ -21,7 +21,6 @@ import java.util.concurrent.CancellationException;
import org.apache.logging.log4j.Logger;
import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.control.RebalanceFactory;
import org.apache.geode.cache.control.RebalanceOperation;
import org.apache.geode.cache.control.RebalanceResults;
@@ -48,7 +47,7 @@ public class RebalanceFunction implements Function,
InternalEntity {
RebalanceOperation op = null;
String[] str = new String[0];
- Cache cache = CacheFactory.getAnyInstance();
+ Cache cache = context.getCache();
ResourceManager manager = cache.getResourceManager();
Object[] args = (Object[]) context.getArguments();
String simulate = ((String) args[0]);
diff --git
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/RegionAlterFunction.java
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/RegionAlterFunction.java
index 79dcbd4..8933f6a 100644
---
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/RegionAlterFunction.java
+++
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/RegionAlterFunction.java
@@ -21,7 +21,6 @@ import org.apache.logging.log4j.Logger;
import org.apache.geode.SystemFailure;
import org.apache.geode.cache.AttributesMutator;
import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.CacheListener;
import org.apache.geode.cache.CacheLoader;
import org.apache.geode.cache.CacheWriter;
@@ -60,7 +59,7 @@ public class RegionAlterFunction extends FunctionAdapter
implements InternalEnti
public void execute(FunctionContext context) {
ResultSender<Object> resultSender = context.getResultSender();
- Cache cache = CacheFactory.getAnyInstance();
+ Cache cache = context.getCache();
String memberNameOrId =
CliUtil.getMemberNameOrId(cache.getDistributedSystem().getDistributedMember());
diff --git
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/RegionCreateFunction.java
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/RegionCreateFunction.java
index 69a8826..a58705e 100644
---
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/RegionCreateFunction.java
+++
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/RegionCreateFunction.java
@@ -20,7 +20,6 @@ import org.apache.commons.lang.StringUtils;
import org.apache.logging.log4j.Logger;
import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.CacheListener;
import org.apache.geode.cache.CacheLoader;
import org.apache.geode.cache.CacheWriter;
@@ -72,7 +71,7 @@ public class RegionCreateFunction implements Function,
InternalEntity {
public void execute(FunctionContext context) {
ResultSender<Object> resultSender = context.getResultSender();
- Cache cache = CacheFactory.getAnyInstance();
+ Cache cache = context.getCache();
String memberNameOrId =
CliUtil.getMemberNameOrId(cache.getDistributedSystem().getDistributedMember());
diff --git
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/RegionDestroyFunction.java
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/RegionDestroyFunction.java
index 5e4af3d..b658e61 100644
---
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/RegionDestroyFunction.java
+++
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/RegionDestroyFunction.java
@@ -15,7 +15,6 @@
package org.apache.geode.management.internal.cli.functions;
import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.FunctionContext;
@@ -49,7 +48,7 @@ public class RegionDestroyFunction implements Function,
InternalEntity {
Object arguments = context.getArguments();
if (arguments != null) {
regionPath = (String) arguments;
- Cache cache = CacheFactory.getAnyInstance();
+ Cache cache = context.getCache();
Region<?, ?> region = cache.getRegion(regionPath);
region.destroyRegion();
String regionName =
diff --git
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/UndeployFunction.java
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/UndeployFunction.java
index 031c855..6ab7cf1 100644
---
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/UndeployFunction.java
+++
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/UndeployFunction.java
@@ -16,7 +16,6 @@ package org.apache.geode.management.internal.cli.functions;
import java.util.ArrayList;
import java.util.List;
-import java.util.StringTokenizer;
import org.apache.commons.lang.ArrayUtils;
import org.apache.geode.internal.ClassPathLoader;
@@ -24,7 +23,6 @@ import org.apache.logging.log4j.Logger;
import org.apache.geode.SystemFailure;
import org.apache.geode.cache.CacheClosedException;
-import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.distributed.DistributedMember;
@@ -41,10 +39,6 @@ public class UndeployFunction implements Function,
InternalEntity {
private static final long serialVersionUID = 1L;
- private InternalCache getCache() {
- return (InternalCache) CacheFactory.getAnyInstance();
- }
-
@Override
public void execute(FunctionContext context) {
// Declared here so that it's available when returning a Throwable
@@ -53,7 +47,7 @@ public class UndeployFunction implements Function,
InternalEntity {
try {
final Object[] args = (Object[]) context.getArguments();
final String[] jarFilenameList = (String[]) args[0]; // Comma separated
- InternalCache cache = getCache();
+ InternalCache cache = (InternalCache) context.getCache();
final JarDeployer jarDeployer =
ClassPathLoader.getLatest().getJarDeployer();
diff --git
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/UnregisterFunction.java
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/UnregisterFunction.java
index 18e16ac..4d7adf0 100644
---
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/UnregisterFunction.java
+++
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/UnregisterFunction.java
@@ -14,14 +14,10 @@
*/
package org.apache.geode.management.internal.cli.functions;
-import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.cache.execute.FunctionService;
-import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.InternalEntity;
-import org.apache.geode.internal.admin.remote.ShutdownAllRequest;
/**
*
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
