GEODE-3090: Fixing gfsh help message (and a lot of other typos) * this closes #590
Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/57123915 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/57123915 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/57123915 Branch: refs/heads/feature/GEM-1483 Commit: 571239151ea941ea7c09dc21a570c0e8e5e853b3 Parents: 119c20f Author: Emily Yeh <emilyyeh1...@gmail.com> Authored: Wed Jul 19 11:21:50 2017 -0700 Committer: Jinmei Liao <jil...@pivotal.io> Committed: Thu Jul 20 14:22:08 2017 -0700 ---------------------------------------------------------------------- .../geode/management/internal/cli/CliUtil.java | 70 ++++++++++---------- .../internal/cli/commands/ClientCommands.java | 2 +- .../CreateAlterDestroyRegionCommands.java | 6 +- .../cli/commands/DiskStoreCommands.java | 2 +- .../CreateAsyncEventQueueFunction.java | 14 ++-- .../cli/functions/DataCommandFunction.java | 29 ++++---- .../GatewayReceiverCreateFunction.java | 15 ++--- .../functions/GatewaySenderCreateFunction.java | 16 ++--- .../cli/functions/RegionAlterFunction.java | 18 ++--- .../cli/functions/RegionCreateFunction.java | 33 ++++----- .../internal/cli/i18n/CliStrings.java | 66 +++++++++--------- .../cli/commands/ClientCommandsDUnitTest.java | 13 ++-- 12 files changed, 142 insertions(+), 142 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/57123915/geode-core/src/main/java/org/apache/geode/management/internal/cli/CliUtil.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/CliUtil.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/CliUtil.java index b3bdf9a..8e9b54e 100755 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/CliUtil.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/CliUtil.java @@ -14,30 +14,6 @@ */ package org.apache.geode.management.internal.cli; -import org.apache.commons.lang.StringUtils; -import org.apache.geode.cache.CacheClosedException; -import org.apache.geode.cache.CacheFactory; -import org.apache.geode.cache.Region; -import org.apache.geode.cache.execute.Execution; -import org.apache.geode.cache.execute.Function; -import org.apache.geode.cache.execute.FunctionService; -import org.apache.geode.cache.execute.ResultCollector; -import org.apache.geode.distributed.DistributedMember; -import org.apache.geode.distributed.internal.InternalDistributedSystem; -import org.apache.geode.internal.ClassPathLoader; -import org.apache.geode.internal.cache.InternalCache; -import org.apache.geode.internal.cache.execute.AbstractExecution; -import org.apache.geode.internal.cache.tier.sockets.CacheClientProxy; -import org.apache.geode.internal.util.IOUtils; -import org.apache.geode.management.DistributedSystemMXBean; -import org.apache.geode.management.ManagementService; -import org.apache.geode.management.cli.Result; -import org.apache.geode.management.internal.cli.functions.MembersForRegionFunction; -import org.apache.geode.management.internal.cli.i18n.CliStrings; -import org.apache.geode.management.internal.cli.result.CommandResultException; -import org.apache.geode.management.internal.cli.result.ResultBuilder; -import org.apache.geode.management.internal.cli.shell.Gfsh; - import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileFilter; @@ -66,6 +42,29 @@ import java.util.zip.DataFormatException; import java.util.zip.Deflater; import java.util.zip.Inflater; +import org.apache.commons.lang.StringUtils; + +import org.apache.geode.cache.CacheClosedException; +import org.apache.geode.cache.CacheFactory; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.execute.Execution; +import org.apache.geode.cache.execute.Function; +import org.apache.geode.cache.execute.FunctionService; +import org.apache.geode.cache.execute.ResultCollector; +import org.apache.geode.distributed.DistributedMember; +import org.apache.geode.distributed.internal.InternalDistributedSystem; +import org.apache.geode.internal.ClassPathLoader; +import org.apache.geode.internal.cache.InternalCache; +import org.apache.geode.internal.cache.execute.AbstractExecution; +import org.apache.geode.internal.cache.tier.sockets.CacheClientProxy; +import org.apache.geode.internal.util.IOUtils; +import org.apache.geode.management.DistributedSystemMXBean; +import org.apache.geode.management.ManagementService; +import org.apache.geode.management.cli.Result; +import org.apache.geode.management.internal.cli.functions.MembersForRegionFunction; +import org.apache.geode.management.internal.cli.i18n.CliStrings; +import org.apache.geode.management.internal.cli.shell.Gfsh; + /** * This class contains utility methods used by classes used to build the Command Line Interface * (CLI). @@ -127,8 +126,7 @@ public class CliUtil { return cache; } - public static byte[][] filesToBytes(String[] fileNames) - throws FileNotFoundException, IOException { + public static byte[][] filesToBytes(String[] fileNames) throws IOException { List<byte[]> filesDataList = new ArrayList<byte[]>(); for (int i = 0; i < fileNames.length; i++) { @@ -190,7 +188,7 @@ public class CliUtil { } public static void bytesToFiles(byte[][] fileData, String parentDirPath, boolean mkRequireddirs) - throws FileNotFoundException, IOException, UnsupportedOperationException { + throws IOException, UnsupportedOperationException { FileOutputStream fos = null; File parentDir = new File(parentDirPath); @@ -373,13 +371,13 @@ public class CliUtil { } } catch (ClassNotFoundException | NoClassDefFoundError e) { throw new RuntimeException( - CliStrings.format(CliStrings.CREATE_REGION__MSG__COULDNOT_FIND_CLASS_0_SPECIFIED_FOR_1, - new Object[] {classToLoadName, neededFor}), + CliStrings.format(CliStrings.CREATE_REGION__MSG__COULD_NOT_FIND_CLASS_0_SPECIFIED_FOR_1, + classToLoadName, neededFor), e); } catch (ClassCastException e) { throw new RuntimeException(CliStrings.format( CliStrings.CREATE_REGION__MSG__CLASS_SPECIFIED_FOR_0_SPECIFIED_FOR_1_IS_NOT_OF_EXPECTED_TYPE, - new Object[] {classToLoadName, neededFor}), e); + classToLoadName, neededFor), e); } return loadedClass; @@ -391,12 +389,12 @@ public class CliUtil { instance = klass.newInstance(); } catch (InstantiationException e) { throw new RuntimeException(CliStrings.format( - CliStrings.CREATE_REGION__MSG__COULDNOT_INSTANTIATE_CLASS_0_SPECIFIED_FOR_1, - new Object[] {klass, neededFor}), e); + CliStrings.CREATE_REGION__MSG__COULD_NOT_INSTANTIATE_CLASS_0_SPECIFIED_FOR_1, klass, + neededFor), e); } catch (IllegalAccessException e) { throw new RuntimeException( - CliStrings.format(CliStrings.CREATE_REGION__MSG__COULDNOT_ACCESS_CLASS_0_SPECIFIED_FOR_1, - new Object[] {klass, neededFor}), + CliStrings.format(CliStrings.CREATE_REGION__MSG__COULD_NOT_ACCESS_CLASS_0_SPECIFIED_FOR_1, + klass, neededFor), e); } @@ -671,7 +669,7 @@ public class CliUtil { int lastNewlineAt = 0; for (Iterator<?> it = col.iterator(); it.hasNext();) { - Object object = (Object) it.next(); + Object object = it.next(); builder.append(String.valueOf(object)); if (it.hasNext()) { builder.append(", "); @@ -690,7 +688,7 @@ public class CliUtil { if (array != null) { StringBuilder builder = new StringBuilder(); for (int i = 0; i < array.length; i++) { - Object object = (Object) array[i]; + Object object = array[i]; builder.append(String.valueOf(object)); if (i < array.length - 1) { builder.append(", "); http://git-wip-us.apache.org/repos/asf/geode/blob/57123915/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ClientCommands.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ClientCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ClientCommands.java index dac12fa..83d1728 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ClientCommands.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ClientCommands.java @@ -283,7 +283,7 @@ public class ClientCommands implements GfshCommand { sectionResult.addData(CliStrings.DESCRIBE_CLIENT_COLUMN_PRIMARY_SERVERS, primServers); sectionResult.addData(CliStrings.DESCRIBE_CLIENT_COLUMN_SECONDARY_SERVERS, secondServers); sectionResult.addData(CliStrings.DESCRIBE_CLIENT_COLUMN_CPU, clientHealthStatus.getCpus()); - sectionResult.addData(CliStrings.DESCRIBE_CLIENT_COLUMN_LISTNER_CALLS, + sectionResult.addData(CliStrings.DESCRIBE_CLIENT_COLUMN_LISTENER_CALLS, clientHealthStatus.getNumOfCacheListenerCalls()); sectionResult.addData(CliStrings.DESCRIBE_CLIENT_COLUMN_GETS, clientHealthStatus.getNumOfGets()); http://git-wip-us.apache.org/repos/asf/geode/blob/57123915/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommands.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommands.java index 883bfee..2c61b73 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommands.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommands.java @@ -208,7 +208,7 @@ public class CreateAlterDestroyRegionCommands implements GfshCommand { CliStrings.CREATE_REGION__MSG__ONLY_ONE_OF_REGIONSHORTCUT_AND_USEATTRIBUESFROM_CAN_BE_SPECIFIED); } else if (regionShortcut == null && useAttributesFrom == null) { throw new IllegalArgumentException( - CliStrings.CREATE_REGION__MSG__ONE_OF_REGIONSHORTCUT_AND_USEATTRIBUESFROM_IS_REQUIRED); + CliStrings.CREATE_REGION__MSG__ONE_OF_REGIONSHORTCUT_AND_USEATTRIBUTESFROM_IS_REQUIRED); } validateRegionPathAndParent(cache, regionPath); @@ -586,7 +586,7 @@ public class CreateAlterDestroyRegionCommands implements GfshCommand { if (parentRegionPath != null && !Region.SEPARATOR.equals(parentRegionPath)) { if (!regionExists(cache, parentRegionPath)) { throw new IllegalArgumentException( - CliStrings.format(CliStrings.CREATE_REGION__MSG__PARENT_REGION_FOR_0_DOESNOT_EXIST, + CliStrings.format(CliStrings.CREATE_REGION__MSG__PARENT_REGION_FOR_0_DOES_NOT_EXIST, new Object[] {regionPath})); } } @@ -995,7 +995,7 @@ public class CreateAlterDestroyRegionCommands implements GfshCommand { if (regionMembersList.size() == 0) { return ResultBuilder.createUserErrorResult( - CliStrings.format(CliStrings.DESTROY_REGION__MSG__COULDNOT_FIND_REGIONPATH_0_IN_GEODE, + CliStrings.format(CliStrings.DESTROY_REGION__MSG__COULD_NOT_FIND_REGIONPATH_0_IN_GEODE, regionPath, "jmx-manager-update-rate milliseconds")); } http://git-wip-us.apache.org/repos/asf/geode/blob/57123915/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommands.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommands.java index 80f3804..96aa95e 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommands.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DiskStoreCommands.java @@ -417,7 +417,7 @@ public class DiskStoreCommands implements GfshCommand { // disk store exists validation if (!diskStoreExists(diskStoreName)) { result = ResultBuilder.createUserErrorResult( - CliStrings.format(CliStrings.COMPACT_DISK_STORE__DISKSTORE_0_DOESNOT_EXIST, + CliStrings.format(CliStrings.COMPACT_DISK_STORE__DISKSTORE_0_DOES_NOT_EXIST, new Object[] {diskStoreName})); } else { InternalDistributedSystem ds = getCache().getInternalDistributedSystem(); http://git-wip-us.apache.org/repos/asf/geode/blob/57123915/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CreateAsyncEventQueueFunction.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CreateAsyncEventQueueFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CreateAsyncEventQueueFunction.java index aab19be..5696696 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CreateAsyncEventQueueFunction.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/CreateAsyncEventQueueFunction.java @@ -156,12 +156,12 @@ public class CreateAsyncEventQueueFunction extends FunctionAdapter implements In return ClassPathLoader.getLatest().forName(className); } catch (ClassNotFoundException e) { throw new RuntimeException(CliStrings.format( - CliStrings.CREATE_ASYNC_EVENT_QUEUE__MSG__COULDNOT_FIND_CLASS_0_SPECIFIED_FOR_1, - new Object[] {className, neededFor}), e); + CliStrings.CREATE_ASYNC_EVENT_QUEUE__MSG__COULD_NOT_FIND_CLASS_0_SPECIFIED_FOR_1, + className, neededFor), e); } catch (ClassCastException e) { throw new RuntimeException(CliStrings.format( CliStrings.CREATE_ASYNC_EVENT_QUEUE__MSG__CLASS_0_SPECIFIED_FOR_1_IS_NOT_OF_EXPECTED_TYPE, - new Object[] {className, neededFor}), e); + className, neededFor), e); } } @@ -170,12 +170,12 @@ public class CreateAsyncEventQueueFunction extends FunctionAdapter implements In return klass.newInstance(); } catch (InstantiationException e) { throw new RuntimeException(CliStrings.format( - CliStrings.CREATE_ASYNC_EVENT_QUEUE__MSG__COULDNOT_INSTANTIATE_CLASS_0_SPECIFIED_FOR_1, - new Object[] {klass, neededFor}), e); + CliStrings.CREATE_ASYNC_EVENT_QUEUE__MSG__COULD_NOT_INSTANTIATE_CLASS_0_SPECIFIED_FOR_1, + klass, neededFor), e); } catch (IllegalAccessException e) { throw new RuntimeException(CliStrings.format( - CliStrings.CREATE_ASYNC_EVENT_QUEUE__MSG__COULDNOT_ACCESS_CLASS_0_SPECIFIED_FOR_1, - new Object[] {klass, neededFor}), e); + CliStrings.CREATE_ASYNC_EVENT_QUEUE__MSG__COULD_NOT_ACCESS_CLASS_0_SPECIFIED_FOR_1, klass, + neededFor), e); } } http://git-wip-us.apache.org/repos/asf/geode/blob/57123915/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 41cc171..e0e4411 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 @@ -14,7 +14,21 @@ */ package org.apache.geode.management.internal.cli.functions; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.atomic.AtomicInteger; + import org.apache.commons.lang.StringUtils; +import org.apache.logging.log4j.Logger; +import org.apache.shiro.subject.Subject; +import org.json.JSONArray; + import org.apache.geode.cache.CacheFactory; import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.Region; @@ -63,19 +77,6 @@ import org.apache.geode.management.internal.cli.result.ResultBuilder; import org.apache.geode.management.internal.cli.shell.Gfsh; import org.apache.geode.management.internal.cli.util.JsonUtil; import org.apache.geode.pdx.PdxInstance; -import org.apache.logging.log4j.Logger; -import org.apache.shiro.subject.Subject; -import org.json.JSONArray; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.atomic.AtomicInteger; /** * @since GemFire 7.0 @@ -423,7 +424,7 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnti CliStrings.format(CliStrings.REMOVE__MSG__CLEARED_ALL_CLEARS, regionName), true); } else { return DataCommandResult.createRemoveInfoResult(key, null, null, - CliStrings.REMOVE__MSG__CLEAREALL_NOT_SUPPORTED_FOR_PARTITIONREGION, false); + CliStrings.REMOVE__MSG__CLEARALL_NOT_SUPPORTED_FOR_PARTITIONREGION, false); } } } http://git-wip-us.apache.org/repos/asf/geode/blob/57123915/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GatewayReceiverCreateFunction.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GatewayReceiverCreateFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GatewayReceiverCreateFunction.java index 7462cb3..a7dc7ea 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GatewayReceiverCreateFunction.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GatewayReceiverCreateFunction.java @@ -19,7 +19,6 @@ import java.util.Map; import org.apache.logging.log4j.Logger; -import org.apache.geode.LogWriter; import org.apache.geode.cache.Cache; import org.apache.geode.cache.CacheFactory; import org.apache.geode.cache.execute.FunctionAdapter; @@ -172,13 +171,13 @@ public class GatewayReceiverCreateFunction extends FunctionAdapter implements In } } catch (ClassNotFoundException e) { throw new RuntimeException( - CliStrings.format(CliStrings.CREATE_REGION__MSG__COULDNOT_FIND_CLASS_0_SPECIFIED_FOR_1, - new Object[] {classToLoadName, neededFor}), + CliStrings.format(CliStrings.CREATE_REGION__MSG__COULD_NOT_FIND_CLASS_0_SPECIFIED_FOR_1, + classToLoadName, neededFor), e); } catch (ClassCastException e) { throw new RuntimeException(CliStrings.format( CliStrings.CREATE_REGION__MSG__CLASS_SPECIFIED_FOR_0_SPECIFIED_FOR_1_IS_NOT_OF_EXPECTED_TYPE, - new Object[] {classToLoadName, neededFor}), e); + classToLoadName, neededFor), e); } return loadedClass; @@ -190,12 +189,12 @@ public class GatewayReceiverCreateFunction extends FunctionAdapter implements In instance = klass.newInstance(); } catch (InstantiationException e) { throw new RuntimeException(CliStrings.format( - CliStrings.CREATE_GATEWAYSENDER__MSG__COULDNOT_INSTANTIATE_CLASS_0_SPECIFIED_FOR_1, - new Object[] {klass, neededFor}), e); + CliStrings.CREATE_GATEWAYSENDER__MSG__COULD_NOT_INSTANTIATE_CLASS_0_SPECIFIED_FOR_1, + klass, neededFor), e); } catch (IllegalAccessException e) { throw new RuntimeException(CliStrings.format( - CliStrings.CREATE_GATEWAYSENDER__MSG__COULDNOT_ACCESS_CLASS_0_SPECIFIED_FOR_1, - new Object[] {klass, neededFor}), e); + CliStrings.CREATE_GATEWAYSENDER__MSG__COULD_NOT_ACCESS_CLASS_0_SPECIFIED_FOR_1, klass, + neededFor), e); } return instance; } http://git-wip-us.apache.org/repos/asf/geode/blob/57123915/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GatewaySenderCreateFunction.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GatewaySenderCreateFunction.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GatewaySenderCreateFunction.java index b71bd0d..33bffd8 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GatewaySenderCreateFunction.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/GatewaySenderCreateFunction.java @@ -21,9 +21,9 @@ 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.execute.ResultSender; -import org.apache.geode.cache.wan.GatewaySender.OrderPolicy; import org.apache.geode.cache.wan.GatewayEventFilter; import org.apache.geode.cache.wan.GatewaySender; +import org.apache.geode.cache.wan.GatewaySender.OrderPolicy; import org.apache.geode.cache.wan.GatewaySenderFactory; import org.apache.geode.cache.wan.GatewayTransportFilter; import org.apache.geode.internal.ClassPathLoader; @@ -200,13 +200,13 @@ public class GatewaySenderCreateFunction extends FunctionAdapter implements Inte } } catch (ClassNotFoundException e) { throw new RuntimeException( - CliStrings.format(CliStrings.CREATE_REGION__MSG__COULDNOT_FIND_CLASS_0_SPECIFIED_FOR_1, - new Object[] {classToLoadName, neededFor}), + CliStrings.format(CliStrings.CREATE_REGION__MSG__COULD_NOT_FIND_CLASS_0_SPECIFIED_FOR_1, + classToLoadName, neededFor), e); } catch (ClassCastException e) { throw new RuntimeException(CliStrings.format( CliStrings.CREATE_REGION__MSG__CLASS_SPECIFIED_FOR_0_SPECIFIED_FOR_1_IS_NOT_OF_EXPECTED_TYPE, - new Object[] {classToLoadName, neededFor}), e); + classToLoadName, neededFor), e); } return loadedClass; @@ -218,12 +218,12 @@ public class GatewaySenderCreateFunction extends FunctionAdapter implements Inte instance = klass.newInstance(); } catch (InstantiationException e) { throw new RuntimeException(CliStrings.format( - CliStrings.CREATE_GATEWAYSENDER__MSG__COULDNOT_INSTANTIATE_CLASS_0_SPECIFIED_FOR_1, - new Object[] {klass, neededFor}), e); + CliStrings.CREATE_GATEWAYSENDER__MSG__COULD_NOT_INSTANTIATE_CLASS_0_SPECIFIED_FOR_1, + klass, neededFor), e); } catch (IllegalAccessException e) { throw new RuntimeException(CliStrings.format( - CliStrings.CREATE_GATEWAYSENDER__MSG__COULDNOT_ACCESS_CLASS_0_SPECIFIED_FOR_1, - new Object[] {klass, neededFor}), e); + CliStrings.CREATE_GATEWAYSENDER__MSG__COULD_NOT_ACCESS_CLASS_0_SPECIFIED_FOR_1, klass, + neededFor), e); } return instance; } http://git-wip-us.apache.org/repos/asf/geode/blob/57123915/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/RegionAlterFunction.java ---------------------------------------------------------------------- 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 6c0e14b..79dcbd4 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 @@ -102,8 +102,8 @@ public class RegionAlterFunction extends FunctionAdapter implements InternalEnti RegionPath regionPath = new RegionPath(regionPathString); AbstractRegion region = (AbstractRegion) cache.getRegion(regionPathString); if (region == null) { - throw new IllegalArgumentException(CliStrings - .format(CliStrings.ALTER_REGION__MSG__REGION_DOESNT_EXIST_0, new Object[] {regionPath})); + throw new IllegalArgumentException(CliStrings.format( + CliStrings.ALTER_REGION__MSG__REGION_DOES_NOT_EXIST_0, new Object[] {regionPath})); } AttributesMutator mutator = region.getAttributesMutator(); @@ -324,13 +324,13 @@ public class RegionAlterFunction extends FunctionAdapter implements InternalEnti } } catch (ClassNotFoundException e) { throw new RuntimeException( - CliStrings.format(CliStrings.ALTER_REGION__MSG__COULDNOT_FIND_CLASS_0_SPECIFIED_FOR_1, - new Object[] {classToLoadName, neededFor}), + CliStrings.format(CliStrings.ALTER_REGION__MSG__COULD_NOT_FIND_CLASS_0_SPECIFIED_FOR_1, + classToLoadName, neededFor), e); } catch (ClassCastException e) { throw new RuntimeException(CliStrings.format( CliStrings.ALTER_REGION__MSG__CLASS_SPECIFIED_FOR_0_SPECIFIED_FOR_1_IS_NOT_OF_EXPECTED_TYPE, - new Object[] {classToLoadName, neededFor}), e); + classToLoadName, neededFor), e); } return loadedClass; @@ -342,12 +342,12 @@ public class RegionAlterFunction extends FunctionAdapter implements InternalEnti instance = klass.newInstance(); } catch (InstantiationException e) { throw new RuntimeException(CliStrings.format( - CliStrings.ALTER_REGION__MSG__COULDNOT_INSTANTIATE_CLASS_0_SPECIFIED_FOR_1, - new Object[] {klass, neededFor}), e); + CliStrings.ALTER_REGION__MSG__COULD_NOT_INSTANTIATE_CLASS_0_SPECIFIED_FOR_1, klass, + neededFor), e); } catch (IllegalAccessException e) { throw new RuntimeException( - CliStrings.format(CliStrings.ALTER_REGION__MSG__COULDNOT_ACCESS_CLASS_0_SPECIFIED_FOR_1, - new Object[] {klass, neededFor}), + CliStrings.format(CliStrings.ALTER_REGION__MSG__COULD_NOT_ACCESS_CLASS_0_SPECIFIED_FOR_1, + klass, neededFor), e); } http://git-wip-us.apache.org/repos/asf/geode/blob/57123915/geode-core/src/main/java/org/apache/geode/management/internal/cli/functions/RegionCreateFunction.java ---------------------------------------------------------------------- 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 0811931..6ae10a3 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 @@ -14,7 +14,11 @@ */ package org.apache.geode.management.internal.cli.functions; +import java.util.Set; + 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; @@ -44,9 +48,6 @@ import org.apache.geode.management.internal.cli.exceptions.CreateSubregionExcept import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.util.RegionPath; import org.apache.geode.management.internal.configuration.domain.XmlEntity; -import org.apache.logging.log4j.Logger; - -import java.util.Set; /** * @@ -83,7 +84,7 @@ public class RegionCreateFunction extends FunctionAdapter implements InternalEnt resultSender.lastResult(new CliFunctionResult(memberNameOrId, true, CliStrings.format( CliStrings.CREATE_REGION__MSG__SKIPPING_0_REGION_PATH_1_ALREADY_EXISTS, - new Object[] {memberNameOrId, regionCreateArgs.getRegionPath()}))); + memberNameOrId, regionCreateArgs.getRegionPath()))); return; } } @@ -109,7 +110,7 @@ public class RegionCreateFunction extends FunctionAdapter implements InternalEnt } catch (RegionExistsException e) { String exceptionMsg = CliStrings.format(CliStrings.CREATE_REGION__MSG__REGION_PATH_0_ALREADY_EXISTS_ON_1, - new Object[] {regionCreateArgs.getRegionPath(), memberNameOrId}); + regionCreateArgs.getRegionPath(), memberNameOrId); resultSender.lastResult(handleException(memberNameOrId, exceptionMsg, e)); } catch (CreateSubregionException e) { resultSender.lastResult(handleException(memberNameOrId, e.getMessage(), e)); @@ -149,7 +150,7 @@ public class RegionCreateFunction extends FunctionAdapter implements InternalEnt parentRegion = cache.getRegion(parentRegionPath); if (parentRegion == null) { throw new IllegalArgumentException( - CliStrings.format(CliStrings.CREATE_REGION__MSG__PARENT_REGION_FOR_0_DOESNOT_EXIST, + CliStrings.format(CliStrings.CREATE_REGION__MSG__PARENT_REGION_FOR_0_DOES_NOT_EXIST, new Object[] {regionPath})); } @@ -164,7 +165,7 @@ public class RegionCreateFunction extends FunctionAdapter implements InternalEnt // One of Region Shortcut OR Use Attributes From has to be given if (regionShortcut == null && useAttributesFrom == null) { throw new IllegalArgumentException( - CliStrings.CREATE_REGION__MSG__ONE_OF_REGIONSHORTCUT_AND_USEATTRIBUESFROM_IS_REQUIRED); + CliStrings.CREATE_REGION__MSG__ONE_OF_REGIONSHORTCUT_AND_USEATTRIBUTESFROM_IS_REQUIRED); } boolean isPartitioned = false; @@ -183,7 +184,7 @@ public class RegionCreateFunction extends FunctionAdapter implements InternalEnt cache.listRegionAttributes()); } throw new IllegalStateException(CliStrings.format( - CliStrings.CREATE_REGION__MSG__COULDNOT_LOAD_REGION_ATTRIBUTES_FOR_SHORTCUT_0, + CliStrings.CREATE_REGION__MSG__COULD_NOT_LOAD_REGION_ATTRIBUTES_FOR_SHORTCUT_0, regionShortcut)); } } else { @@ -379,7 +380,7 @@ public class RegionCreateFunction extends FunctionAdapter implements InternalEnt Region<Object, Object> colocatedWithRegion = cache.getRegion(colocatedWith); if (colocatedWithRegion == null) { throw new IllegalArgumentException(CliStrings.format( - CliStrings.CREATE_REGION__MSG__COLOCATEDWITH_REGION_0_DOESNOT_EXIST, colocatedWith)); + CliStrings.CREATE_REGION__MSG__COLOCATEDWITH_REGION_0_DOES_NOT_EXIST, colocatedWith)); } if (!colocatedWithRegion.getAttributes().getDataPolicy().withPartitioning()) { throw new IllegalArgumentException(CliStrings.format( @@ -428,12 +429,12 @@ public class RegionCreateFunction extends FunctionAdapter implements InternalEnt return (Class<PartitionResolver>) ClassPathLoader.getLatest().forName(className); } catch (ClassNotFoundException e) { throw new RuntimeException(CliStrings.format( - CliStrings.CREATE_REGION_PARTITION_RESOLVER__MSG__COULDNOT_FIND_CLASS_0_SPECIFIED_FOR_1, - new Object[] {className, neededFor}), e); + CliStrings.CREATE_REGION_PARTITION_RESOLVER__MSG__COULD_NOT_FIND_CLASS_0_SPECIFIED_FOR_1, + className, neededFor), e); } catch (ClassCastException e) { throw new RuntimeException(CliStrings.format( CliStrings.CREATE_REGION__MSG__PARTITION_RESOLVER__CLASS_0_SPECIFIED_FOR_1_IS_NOT_OF_EXPECTED_TYPE, - new Object[] {className, neededFor}), e); + className, neededFor), e); } } @@ -442,12 +443,12 @@ public class RegionCreateFunction extends FunctionAdapter implements InternalEnt return klass.newInstance(); } catch (InstantiationException e) { throw new RuntimeException(CliStrings.format( - CliStrings.CREATE_REGION__MSG__PARTITION_RESOLVER__COULDNOT_INSTANTIATE_CLASS_0_SPECIFIED_FOR_1, - new Object[] {klass, neededFor}), e); + CliStrings.CREATE_REGION__MSG__PARTITION_RESOLVER__COULD_NOT_INSTANTIATE_CLASS_0_SPECIFIED_FOR_1, + klass, neededFor), e); } catch (IllegalAccessException e) { throw new RuntimeException(CliStrings.format( - CliStrings.CREATE_REGION__MSG__PARTITION_RESOLVER__COULDNOT_ACCESS_CLASS_0_SPECIFIED_FOR_1, - new Object[] {klass, neededFor}), e); + CliStrings.CREATE_REGION__MSG__PARTITION_RESOLVER__COULD_NOT_ACCESS_CLASS_0_SPECIFIED_FOR_1, + klass, neededFor), e); } } http://git-wip-us.apache.org/repos/asf/geode/blob/57123915/geode-core/src/main/java/org/apache/geode/management/internal/cli/i18n/CliStrings.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/i18n/CliStrings.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/i18n/CliStrings.java index 3d4d53f..5621b24 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/i18n/CliStrings.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/i18n/CliStrings.java @@ -291,7 +291,7 @@ public class CliStrings { "Together with --initial-capacity, sets the parameters on the underlying java.util.ConcurrentHashMap used for storing region entries. This must be a floating point number between 0 and 1, inclusive."; public static final String ALTER_DISK_STORE__COMPRESSOR = "compressor"; public static final String ALTER_DISK_STORE__COMPRESSOR__HELP = - "The fully-qualifed class name of the Compressor to use when compressing region entry values. A value of 'none' will remove the Compressor."; + "The fully-qualified class name of the Compressor to use when compressing region entry values. A value of 'none' will remove the Compressor."; public static final String ALTER_DISK_STORE__STATISTICS__ENABLED = "enable-statistics"; public static final String ALTER_DISK_STORE__STATISTICS__ENABLED__HELP = "Whether to enable statistics. Valid values are: true and false."; @@ -374,18 +374,19 @@ public class CliStrings { + ". \"{0}\" is not valid."; public static final String ALTER_REGION__MSG__REGION_0_ALTERED_ON_1 = "Region \"{0}\" altered on \"{1}\""; - public static final String ALTER_REGION__MSG__COULDNOT_FIND_CLASS_0_SPECIFIED_FOR_1 = + public static final String ALTER_REGION__MSG__COULD_NOT_FIND_CLASS_0_SPECIFIED_FOR_1 = "Could not find class \"{0}\" specified for \"{1}\"."; - public static final String ALTER_REGION__MSG__COULDNOT_INSTANTIATE_CLASS_0_SPECIFIED_FOR_1 = + public static final String ALTER_REGION__MSG__COULD_NOT_INSTANTIATE_CLASS_0_SPECIFIED_FOR_1 = "Could not instantiate class \"{0}\" specified for \"{1}\"."; public static final String ALTER_REGION__MSG__CLASS_SPECIFIED_FOR_0_SPECIFIED_FOR_1_IS_NOT_OF_EXPECTED_TYPE = "Class \"{0}\" specified for \"{1}\" is not of an expected type."; - public static final String ALTER_REGION__MSG__COULDNOT_ACCESS_CLASS_0_SPECIFIED_FOR_1 = + public static final String ALTER_REGION__MSG__COULD_NOT_ACCESS_CLASS_0_SPECIFIED_FOR_1 = "Could not access class \"{0}\" specified for \"{1}\"."; public static final String ALTER_REGION__MSG__SPECIFY_POSITIVE_INT_FOR_EVICTIONMAX_0_IS_NOT_VALID = "Specify 0 or a positive integer value for " + CliStrings.ALTER_REGION__EVICTIONMAX + ". \"{0}\" is not valid."; - public static final String ALTER_REGION__MSG__REGION_DOESNT_EXIST_0 = "Region doesn't exist: {0}"; + public static final String ALTER_REGION__MSG__REGION_DOES_NOT_EXIST_0 = + "Region doesn't exist: {0}"; public static final String ALTER_RUNTIME_CONFIG = "alter runtime"; public static final String ALTER_RUNTIME_CONFIG__HELP = @@ -488,7 +489,7 @@ public class CliStrings { "Name of the disk store to be compacted."; public static final String COMPACT_DISK_STORE__GROUP__HELP = "Group(s) of members that will perform disk compaction. If no group is specified the disk store will be compacted by all members."; - public static final String COMPACT_DISK_STORE__DISKSTORE_0_DOESNOT_EXIST = + public static final String COMPACT_DISK_STORE__DISKSTORE_0_DOES_NOT_EXIST = "Disk store \"{0}\" does not exist."; public static final String COMPACT_DISK_STORE__MSG__FOR_GROUP = " for group(s) \"{0}\""; public static final String COMPACT_DISK_STORE__NO_MEMBERS_FOUND_IN_SPECIFED_GROUP = @@ -514,7 +515,7 @@ public class CliStrings { public static final String COMPACT_OFFLINE_DISK_STORE__J = "J"; public static final String COMPACT_OFFLINE_DISK_STORE__J__HELP = "Arguments passed to the Java Virtual Machine performing the compact operation on the disk store."; - public static final String COMPACT_OFFLINE_DISK_STORE__MSG__DISKSTORE_0_DOESNOT_EXIST = + public static final String COMPACT_OFFLINE_DISK_STORE__MSG__DISKSTORE_0_DOES_NOT_EXIST = "Disk store \"{0}\" does not exist."; public static final String COMPACT_OFFLINE_DISK_STORE__MSG__COMPACTION_ATTEMPTED_BUT_NOTHING_TO_COMPACT = "Attempted to compact disk store, but there was nothing to do."; @@ -583,7 +584,7 @@ public class CliStrings { "The gfsecurity.properties file for configuring gfsh to connect to the Locator/Manager. The file's path can be absolute or relative to gfsh directory."; public static final String CONNECT__USE_SSL = "use-ssl"; public static final String CONNECT__USE_SSL__HELP = - "Whether to use SSL for communication with Locator and/or JMX Manager. If set to \"true\", will also read \"gfsecurity.properties\". SSL Options take precedence over properties file. If none are specified, defaults will be used. The default value for this options is \"false\"."; + "Whether to use SSL for communication with Locator and/or JMX Manager. If set to \"true\", \"gfsecurity.properties\" will also be read. SSL Options take precedence over the properties file. If none are specified, defaults will be used. The default value for this options is \"false\"."; public static final String CONNECT__MSG__CONNECTING_TO_MANAGER_AT_0 = "Connecting to Manager at {0} .."; public static final String CONNECT__MSG__CONNECTING_TO_MANAGER_HTTP_SERVICE_AT_0 = @@ -665,13 +666,13 @@ public class CliStrings { "Group(s) of members on which queue will be created. If no group is specified the queue will be created on all members."; public static final String CREATE_ASYNC_EVENT_QUEUE__ERROR_WHILE_CREATING_REASON_0 = "An error occurred while creating the queue: {0}"; - public static final String CREATE_ASYNC_EVENT_QUEUE__MSG__COULDNOT_ACCESS_CLASS_0_SPECIFIED_FOR_1 = + public static final String CREATE_ASYNC_EVENT_QUEUE__MSG__COULD_NOT_ACCESS_CLASS_0_SPECIFIED_FOR_1 = "Could not access class \"{0}\" specified for \"{1}\"."; - public static final String CREATE_ASYNC_EVENT_QUEUE__MSG__COULDNOT_INSTANTIATE_CLASS_0_SPECIFIED_FOR_1 = + public static final String CREATE_ASYNC_EVENT_QUEUE__MSG__COULD_NOT_INSTANTIATE_CLASS_0_SPECIFIED_FOR_1 = "Could not instantiate class \"{0}\" specified for \"{1}\"."; public static final String CREATE_ASYNC_EVENT_QUEUE__MSG__CLASS_0_SPECIFIED_FOR_1_IS_NOT_OF_EXPECTED_TYPE = "Class \"{0}\" specified for \"{1}\" is not of an expected type."; - public static final String CREATE_ASYNC_EVENT_QUEUE__MSG__COULDNOT_FIND_CLASS_0_SPECIFIED_FOR_1 = + public static final String CREATE_ASYNC_EVENT_QUEUE__MSG__COULD_NOT_FIND_CLASS_0_SPECIFIED_FOR_1 = "Could not find class \"{0}\" specified for \"{1}\"."; /* 'create disk-store' command */ @@ -927,7 +928,7 @@ public class CliStrings { + PartitionAttributesFactory.GLOBAL_MAX_BUCKETS_DEFAULT + ")."; public static final String CREATE_REGION__MSG__SPECIFY_VALID_REGION_PATH = "Specify a valid " + CliStrings.CREATE_REGION__REGION; - public static final String CREATE_REGION__MSG__PARENT_REGION_FOR_0_DOESNOT_EXIST = + public static final String CREATE_REGION__MSG__PARENT_REGION_FOR_0_DOES_NOT_EXIST = "Parent region for \"{0}\" doesn't exist. "; public static final String CREATE_REGION__MSG__GROUPS_0_ARE_INVALID = "Group(s) \"{0}\" are invalid."; @@ -969,18 +970,18 @@ public class CliStrings { public static final String CREATE_REGION__MSG__ONLY_ONE_OF_REGIONSHORTCUT_AND_USEATTRIBUESFROM_CAN_BE_SPECIFIED = "Only one of " + CREATE_REGION__REGIONSHORTCUT + " & " + CREATE_REGION__USEATTRIBUTESFROM + " can be specified."; - public static final String CREATE_REGION__MSG__ONE_OF_REGIONSHORTCUT_AND_USEATTRIBUESFROM_IS_REQUIRED = + public static final String CREATE_REGION__MSG__ONE_OF_REGIONSHORTCUT_AND_USEATTRIBUTESFROM_IS_REQUIRED = "One of \"" + CREATE_REGION__REGIONSHORTCUT + "\" or \"" + CREATE_REGION__USEATTRIBUTESFROM + "\" is required."; public static final String CREATE_REGION__MSG__SPECIFY_VALID_REGION_PATH_FOR_0_REGIONPATH_1_NOT_FOUND = "Specify a valid region path for {0}. Region {1} not found."; - public static final String CREATE_REGION__MSG__COULDNOT_FIND_CLASS_0_SPECIFIED_FOR_1 = + public static final String CREATE_REGION__MSG__COULD_NOT_FIND_CLASS_0_SPECIFIED_FOR_1 = "Could not find class \"{0}\" specified for \"{1}\"."; public static final String CREATE_REGION__MSG__CLASS_SPECIFIED_FOR_0_SPECIFIED_FOR_1_IS_NOT_OF_EXPECTED_TYPE = "Class \"{0}\" specified for \"{1}\" is not of an expected type."; - public static final String CREATE_REGION__MSG__COULDNOT_INSTANTIATE_CLASS_0_SPECIFIED_FOR_1 = + public static final String CREATE_REGION__MSG__COULD_NOT_INSTANTIATE_CLASS_0_SPECIFIED_FOR_1 = "Could not instantiate class \"{0}\" specified for \"{1}\"."; - public static final String CREATE_REGION__MSG__COULDNOT_ACCESS_CLASS_0_SPECIFIED_FOR_1 = + public static final String CREATE_REGION__MSG__COULD_NOT_ACCESS_CLASS_0_SPECIFIED_FOR_1 = "Could not access class \"{0}\" specified for \"{1}\"."; public static final String CREATE_REGION__MSG__EXPIRATION_ACTION_0_IS_NOT_VALID = "Expiration action \"{0}\" is not valid."; @@ -1009,11 +1010,11 @@ public class CliStrings { "\"{0}\" is not a Partitioned Region."; public static final String CREATE_REGION__MSG__COLOCATEDWITH_REGION_0_IS_NOT_PARTITIONEDREGION = CREATE_REGION__COLOCATEDWITH + " \"{0}\" is not a Partitioned Region."; - public static final String CREATE_REGION__MSG__COLOCATEDWITH_REGION_0_DOESNOT_EXIST = + public static final String CREATE_REGION__MSG__COLOCATEDWITH_REGION_0_DOES_NOT_EXIST = CREATE_REGION__COLOCATEDWITH + " \"{0}\" does not exists."; public static final String CREATE_REGION__MSG__REDUNDANT_COPIES_SHOULD_BE_ONE_OF_0123 = CREATE_REGION__REDUNDANTCOPIES + " \"{0}\" is not valid. It should be one of 0, 1, 2, 3."; - public static final String CREATE_REGION__MSG__COULDNOT_LOAD_REGION_ATTRIBUTES_FOR_SHORTCUT_0 = + public static final String CREATE_REGION__MSG__COULD_NOT_LOAD_REGION_ATTRIBUTES_FOR_SHORTCUT_0 = "Could not load Region Attributes for a valid " + CREATE_REGION__REGIONSHORTCUT + "={0}. Please check logs for any errors."; public static final String CREATE_REGION__MSG__0_IS_A_PR_CANNOT_HAVE_SUBREGIONS = @@ -1035,16 +1036,16 @@ public class CliStrings { public static final String CREATE_REGION__MSG__PARTITION_RESOLVER_ONLY_FOR_REGION_TYPE_PARTITION = "partition resolver property is only applicable to PARTITION region type"; - public static final String CREATE_REGION_PARTITION_RESOLVER__MSG__COULDNOT_FIND_CLASS_0_SPECIFIED_FOR_1 = + public static final String CREATE_REGION_PARTITION_RESOLVER__MSG__COULD_NOT_FIND_CLASS_0_SPECIFIED_FOR_1 = "Could not find class \"{0}\" specified for \"{1}\"."; public static final String CREATE_REGION__MSG__PARTITION_RESOLVER__CLASS_0_SPECIFIED_FOR_1_IS_NOT_OF_EXPECTED_TYPE = "Class \"{0}\" specified for \"{1}\" is not of an expected type."; - public static final String CREATE_REGION__MSG__PARTITION_RESOLVER__COULDNOT_INSTANTIATE_CLASS_0_SPECIFIED_FOR_1 = + public static final String CREATE_REGION__MSG__PARTITION_RESOLVER__COULD_NOT_INSTANTIATE_CLASS_0_SPECIFIED_FOR_1 = "Could not instantiate class \"{0}\" specified for \"{1}\"."; - public static final String CREATE_REGION__MSG__PARTITION_RESOLVER__COULDNOT_ACCESS_CLASS_0_SPECIFIED_FOR_1 = + public static final String CREATE_REGION__MSG__PARTITION_RESOLVER__COULD_NOT_ACCESS_CLASS_0_SPECIFIED_FOR_1 = "Could not access class \"{0}\" specified for \"{1}\"."; public static final String CREATE_REGION__MSG__INVALID_PARTITION_RESOLVER = @@ -1233,7 +1234,7 @@ public class CliStrings { public static final String DESTROY_REGION__MSG__REGIONPATH_0_NOT_VALID = "Region path \"{0}\" is not valid."; - public static final String DESTROY_REGION__MSG__COULDNOT_FIND_REGIONPATH_0_IN_GEODE = + public static final String DESTROY_REGION__MSG__COULD_NOT_FIND_REGIONPATH_0_IN_GEODE = "Could not find a Region with Region path \"{0}\" in this Geode cluster. If region was recently created, please wait for at least {1} to allow the associated Management resources to be federated."; public static final String DESTROY_REGION__MSG__AND_ITS_SUBREGIONS = "and its subregions"; public static final String DESTROY_REGION__MSG__REGION_0_1_DESTROYED = @@ -1242,7 +1243,7 @@ public class CliStrings { "Error occurred while destroying region \"{0}\". Reason: {1}"; public static final String DESTROY_REGION__MSG__UNKNOWN_RESULT_WHILE_DESTROYING_REGION_0_REASON_1 = "Unknown result while destroying region \"{0}\". Reason: {1}"; - public static final String DESTROY_REGION__MSG__COULDNOT_FIND_MEMBER_WITH_REGION_0 = + public static final String DESTROY_REGION__MSG__COULD_NOT_FIND_MEMBER_WITH_REGION_0 = "Could not find a Geode member which hosts a region with Region path \"{0}\""; public static final String DESTROY_REGION__MSG__SPECIFY_REGIONPATH_TO_DESTROY = "Please specify region path for the region to be destroyed."; @@ -1431,7 +1432,7 @@ public class CliStrings { "Group of members whose stack trace will be exported."; public static final String EXPORT_STACKTRACE_ALL_STACKS = "all-stacks"; public static final String EXPORT_STACKTRACE_ALL_STACKS__HELP = - "When set to true exports all the stackstraces."; + "When set to true exports all the stacktraces."; public static final String EXPORT_STACKTRACE__FILE = "file"; public static final String EXPORT_STACKTRACE__FILE__HELP = "Name of the file to which the stack traces will be written."; @@ -1595,7 +1596,8 @@ public class CliStrings { public static final String DESCRIBE_CLIENT_COLUMN_PRIMARY_SERVERS = "Primary Servers"; public static final String DESCRIBE_CLIENT_COLUMN_SECONDARY_SERVERS = "Secondary Servers"; public static final String DESCRIBE_CLIENT_COLUMN_CPU = "CPU"; - public static final String DESCRIBE_CLIENT_COLUMN_LISTNER_CALLS = "Number of Cache Listner Calls"; + public static final String DESCRIBE_CLIENT_COLUMN_LISTENER_CALLS = + "Number of Cache Listener Calls"; public static final String DESCRIBE_CLIENT_COLUMN_GETS = "Number of Gets"; public static final String DESCRIBE_CLIENT_COLUMN_MISSES = "Number of Misses"; public static final String DESCRIBE_CLIENT_COLUMN_PUTS = "Number of Puts"; @@ -1865,7 +1867,7 @@ public class CliStrings { public static final String REBALANCE__MSG__REGION_NOT_ASSOCIATED_WITH_MORE_THAN_ONE_MEMBER = "No regions associated with more than 1 members"; public static final String REBALANCE__MSG__EXCEPTION_OCCURRED_WHILE_REBALANCING_0 = - "Exception occurred while rebelancing. Reason : {0}"; + "Exception occurred while rebalancing. Reason : {0}"; /* remove command */ public static final String REMOVE = "remove"; @@ -1890,7 +1892,7 @@ public class CliStrings { public static final String REMOVE__MSG__REGION_NOT_FOUND = "Region <{0}> Not Found"; public static final String REMOVE__MSG__KEY_NOT_FOUND_REGION = "Key is not present in the region"; public static final String REMOVE__MSG__CLEARED_ALL_CLEARS = "Cleared all keys in the region"; - public static final String REMOVE__MSG__CLEAREALL_NOT_SUPPORTED_FOR_PARTITIONREGION = + public static final String REMOVE__MSG__CLEARALL_NOT_SUPPORTED_FOR_PARTITIONREGION = "Option --" + REMOVE__ALL + " is not supported on partitioned region"; /* resume gateway-sender */ @@ -2200,12 +2202,12 @@ public class CliStrings { "The fully qualified class name of GatewayTransportFilter to be added to the GatewaySender. "; public static final String CREATE_GATEWAYSENDER__MSG__GATEWAYSENDER_0_CREATED_ON_1 = "GatewaySender \"{0}\" created on \"{1}\""; - public static final String CREATE_GATEWAYSENDER__MSG__COULDNOT_INSTANTIATE_CLASS_0_SPECIFIED_FOR_1 = + public static final String CREATE_GATEWAYSENDER__MSG__COULD_NOT_INSTANTIATE_CLASS_0_SPECIFIED_FOR_1 = "Could not instantiate class \"{0}\" specified for \"{1}\"."; - public static final String CREATE_GATEWAYSENDER__MSG__COULDNOT_ACCESS_CLASS_0_SPECIFIED_FOR_1 = + public static final String CREATE_GATEWAYSENDER__MSG__COULD_NOT_ACCESS_CLASS_0_SPECIFIED_FOR_1 = "Could not access class \"{0}\" specified for \"{1}\"."; - /* stop gateway-reciver */ + /* stop gateway-receiver */ public static final String START_GATEWAYSENDER = "start gateway-sender"; public static final String START_GATEWAYSENDER__HELP = "Start the Gateway Sender on a member or members."; @@ -2232,7 +2234,7 @@ public class CliStrings { - /* start gfmon command */ + /* start pulse command */ public static final String START_PULSE = "start pulse"; public static final String START_PULSE__ERROR = "An error occurred while launching Geode Pulse - %1$s"; @@ -2792,7 +2794,7 @@ public class CliStrings { public static final String UPGRADE_OFFLINE_DISK_STORE__J = "J"; public static final String UPGRADE_OFFLINE_DISK_STORE__J__HELP = "Arguments passed to the Java Virtual Machine performing the upgrade operation on the disk store."; - public static final String UPGRADE_OFFLINE_DISK_STORE__DISKSTORE_0_DOESNOT_EXIST = + public static final String UPGRADE_OFFLINE_DISK_STORE__DISKSTORE_0_DOES_NOT_EXIST = "Disk store \"{0}\" does not exist."; public static final String UPGRADE_OFFLINE_DISK_STORE__UPGRADE_ATTEMPTED_BUT_NOTHING_TO_UPGRADE = "Upgradation was attempted but nothing to upgrade."; http://git-wip-us.apache.org/repos/asf/geode/blob/57123915/geode-cq/src/test/java/org/apache/geode/management/internal/cli/commands/ClientCommandsDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-cq/src/test/java/org/apache/geode/management/internal/cli/commands/ClientCommandsDUnitTest.java b/geode-cq/src/test/java/org/apache/geode/management/internal/cli/commands/ClientCommandsDUnitTest.java index b0552ad..7c80abf 100644 --- a/geode-cq/src/test/java/org/apache/geode/management/internal/cli/commands/ClientCommandsDUnitTest.java +++ b/geode-cq/src/test/java/org/apache/geode/management/internal/cli/commands/ClientCommandsDUnitTest.java @@ -237,8 +237,7 @@ public class ClientCommandsDUnitTest extends CliCommandTestBase { final VM server1 = Host.getHost(0).getVM(1); final VM server2 = Host.getHost(0).getVM(3); final VM manager = Host.getHost(0).getVM(0); - String serverName1 = - (String) server1.invoke("get DistributedMemberID ", this::getDistributedMemberId); + String serverName1 = server1.invoke("get DistributedMemberID ", this::getDistributedMemberId); String serverName2 = server2.invoke("get DistributedMemberID ", this::getDistributedMemberId); @@ -340,7 +339,7 @@ public class ClientCommandsDUnitTest extends CliCommandTestBase { assertTrue(puts.equals("2")); String queue = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_QUEUE_SIZE); assertTrue(queue.equals("1")); - String calls = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_LISTNER_CALLS); + String calls = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_LISTENER_CALLS); assertTrue(calls.equals("1")); String primServer = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_PRIMARY_SERVERS); assertTrue(primServer.equals(serverName)); @@ -400,7 +399,7 @@ public class ClientCommandsDUnitTest extends CliCommandTestBase { assertTrue(puts.equals("2")); String queue = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_QUEUE_SIZE); assertTrue(queue.equals("1")); - String calls = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_LISTNER_CALLS); + String calls = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_LISTENER_CALLS); assertTrue(calls.equals("1")); String primServer = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_PRIMARY_SERVERS); assertTrue(primServer.equals(serverName)); @@ -459,7 +458,7 @@ public class ClientCommandsDUnitTest extends CliCommandTestBase { assertTrue(puts.equals("2")); String queue = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_QUEUE_SIZE); assertTrue(queue.equals("1")); - String calls = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_LISTNER_CALLS); + String calls = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_LISTENER_CALLS); assertTrue(calls.equals("1")); String primServer = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_PRIMARY_SERVERS); assertTrue(primServer.equals(serverName)); @@ -955,7 +954,7 @@ public class ClientCommandsDUnitTest extends CliCommandTestBase { String puts = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_PUTS); assertTrue(puts.equals("2")); - String calls = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_LISTNER_CALLS); + String calls = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_LISTENER_CALLS); assertTrue(calls.equals("1")); String primServer = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_PRIMARY_SERVERS); @@ -1034,7 +1033,7 @@ public class ClientCommandsDUnitTest extends CliCommandTestBase { String puts = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_PUTS); assertTrue(puts.equals("2")); - String calls = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_LISTNER_CALLS); + String calls = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_LISTENER_CALLS); assertTrue(calls.equals("1")); String primServer = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_PRIMARY_SERVERS);
