You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by je...@apache.org on 2018/11/14 20:21:07 UTC
[geode] branch develop updated: GEODE-5971: Refactor export/import
commands to extend GfshCommand (#2837)
This is an automated email from the ASF dual-hosted git repository.
jensdeppe 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 f2c3d26 GEODE-5971: Refactor export/import commands to extend GfshCommand (#2837)
f2c3d26 is described below
commit f2c3d26fae91c66763102d30412e7eadb35b6018
Author: Jens Deppe <jd...@pivotal.io>
AuthorDate: Wed Nov 14 12:20:57 2018 -0800
GEODE-5971: Refactor export/import commands to extend GfshCommand (#2837)
---
.../cli/commands/ExportClusterConfigurationCommand.java | 14 +++++++-------
.../internal/cli/commands/ExportConfigCommand.java | 3 ++-
.../cli/commands/ImportClusterConfigurationCommand.java | 6 ++++--
3 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportClusterConfigurationCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportClusterConfigurationCommand.java
index 90d2106..5b32c47 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportClusterConfigurationCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportClusterConfigurationCommand.java
@@ -35,6 +35,7 @@ import org.apache.geode.distributed.ConfigurationPersistenceService;
import org.apache.geode.distributed.internal.InternalConfigurationPersistenceService;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.management.cli.CliMetaData;
+import org.apache.geode.management.cli.GfshCommand;
import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.AbstractCliAroundInterceptor;
import org.apache.geode.management.internal.cli.GfshParseResult;
@@ -49,13 +50,11 @@ import org.apache.geode.management.internal.security.ResourceOperation;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
-;
-
/**
* Commands for the cluster configuration
*/
@SuppressWarnings("unused")
-public class ExportClusterConfigurationCommand extends InternalGfshCommand {
+public class ExportClusterConfigurationCommand extends GfshCommand {
private static Logger logger = LogService.getLogger();
public static final String XML_FILE = "xml-file";
@@ -79,14 +78,15 @@ public class ExportClusterConfigurationCommand extends InternalGfshCommand {
}
ResultModel result = new ResultModel();
+ InternalConfigurationPersistenceService configPersistenceService =
+ (InternalConfigurationPersistenceService) getConfigurationPersistenceService();
if (zipFileName != null) {
Path tempDir = Files.createTempDirectory("temp");
Path exportedDir = tempDir.resolve("cluster_config");
Path zipFile = tempDir.resolve(FilenameUtils.getName(zipFileName));
- InternalConfigurationPersistenceService sc = getConfigurationPersistenceService();
try {
- for (Configuration config : sc.getEntireConfiguration().values()) {
- sc.writeConfigToFile(config, exportedDir.toFile());
+ for (Configuration config : configPersistenceService.getEntireConfiguration().values()) {
+ configPersistenceService.writeConfigToFile(config, exportedDir.toFile());
}
ZipUtils.zipDirectory(exportedDir, zipFile);
result.addFile(zipFile.toFile(), FileResultModel.FILE_TYPE_BINARY);
@@ -96,7 +96,7 @@ public class ExportClusterConfigurationCommand extends InternalGfshCommand {
FileUtils.deleteQuietly(tempDir.toFile());
}
} else {
- Configuration configuration = getConfigurationPersistenceService().getConfiguration(group);
+ Configuration configuration = configPersistenceService.getConfiguration(group);
if (configuration == null) {
return ResultModel.createError("No cluster configuration for '" + group + "'.");
}
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportConfigCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportConfigCommand.java
index 82da225..703443a 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportConfigCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportConfigCommand.java
@@ -28,6 +28,7 @@ import org.apache.geode.cache.execute.ResultCollector;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.management.cli.CliMetaData;
import org.apache.geode.management.cli.ConverterHint;
+import org.apache.geode.management.cli.GfshCommand;
import org.apache.geode.management.internal.cli.AbstractCliAroundInterceptor;
import org.apache.geode.management.internal.cli.CliUtil;
import org.apache.geode.management.internal.cli.GfshParseResult;
@@ -39,7 +40,7 @@ import org.apache.geode.management.internal.cli.result.model.ResultModel;
import org.apache.geode.management.internal.security.ResourceOperation;
import org.apache.geode.security.ResourcePermission;
-public class ExportConfigCommand extends InternalGfshCommand {
+public class ExportConfigCommand extends GfshCommand {
private final ExportConfigFunction exportConfigFunction = new ExportConfigFunction();
/**
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ImportClusterConfigurationCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ImportClusterConfigurationCommand.java
index a7256a0..0787ec1 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ImportClusterConfigurationCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ImportClusterConfigurationCommand.java
@@ -42,6 +42,7 @@ import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.internal.InternalConfigurationPersistenceService;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.management.cli.CliMetaData;
+import org.apache.geode.management.cli.GfshCommand;
import org.apache.geode.management.internal.cli.AbstractCliAroundInterceptor;
import org.apache.geode.management.internal.cli.GfshParseResult;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
@@ -63,7 +64,7 @@ import org.apache.geode.security.ResourcePermission.Resource;
* Commands for the cluster configuration
*/
@SuppressWarnings("unused")
-public class ImportClusterConfigurationCommand extends InternalGfshCommand {
+public class ImportClusterConfigurationCommand extends GfshCommand {
public static Logger logger = LogService.getLogger();
public static final String XML_FILE = "xml-file";
public static final String ACTION = "action";
@@ -95,7 +96,8 @@ public class ImportClusterConfigurationCommand extends InternalGfshCommand {
return ResultModel.createError("Cluster configuration service is not running.");
}
- InternalConfigurationPersistenceService ccService = getConfigurationPersistenceService();
+ InternalConfigurationPersistenceService ccService =
+ (InternalConfigurationPersistenceService) getConfigurationPersistenceService();
Set<DistributedMember> servers = findMembers(group);
File file = getUploadedFile();