GEODE-3472: Remove a great deal of commented-out code. * this closes #748
Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/fb9a405f Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/fb9a405f Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/fb9a405f Branch: refs/heads/develop Commit: fb9a405f78a1efd3fb3033ff36e9065e8b545ec3 Parents: 76b4ef5 Author: Patrick Rhomberg <[email protected]> Authored: Fri Aug 18 13:59:44 2017 -0700 Committer: Jinmei Liao <[email protected]> Committed: Wed Aug 30 09:34:06 2017 -0700 ---------------------------------------------------------------------- .../geode/management/GemFireProperties.java | 43 +--- .../cli/CommandProcessingException.java | 1 - .../geode/management/cli/CommandService.java | 47 +---- .../management/internal/MBeanJMXAdapter.java | 199 +++++++------------ .../management/internal/ManagementAgent.java | 70 ++++--- .../internal/SystemManagementService.java | 5 +- .../internal/beans/MBeanAggregator.java | 7 +- .../internal/beans/ManagementAdapter.java | 46 ++--- .../internal/beans/stats/VMStatsMonitor.java | 14 +- .../geode/management/internal/cli/CliUtil.java | 107 +++------- .../internal/cli/CommandResponseBuilder.java | 27 +-- .../geode/management/internal/cli/Launcher.java | 11 +- .../management/internal/cli/LogWrapper.java | 44 +--- .../internal/cli/commands/ConnectCommand.java | 68 +++---- .../internal/cli/commands/ShellCommands.java | 35 ++-- .../cli/commands/ShowMetricsCommand.java | 3 - .../internal/cli/commands/StartMemberUtils.java | 24 +-- .../cli/converters/MemberGroupConverter.java | 11 +- .../internal/cli/domain/DataCommandResult.java | 14 +- .../cli/functions/DataCommandFunction.java | 10 - .../internal/cli/i18n/CliStrings.java | 54 +---- .../cli/remote/CommandExecutionContext.java | 15 +- .../internal/cli/result/AbstractResultData.java | 49 ++--- .../internal/cli/result/CommandResult.java | 96 +++------ .../cli/result/CompositeResultData.java | 19 +- .../internal/cli/result/ResultBuilder.java | 17 +- .../internal/cli/result/ResultData.java | 6 +- .../internal/cli/result/TableBuilder.java | 9 +- .../management/internal/cli/shell/Gfsh.java | 84 +++----- .../cli/shell/GfshExecutionStrategy.java | 11 - .../internal/cli/shell/JmxOperationInvoker.java | 27 +-- .../cli/shell/unsafe/GfshSignalHandler.java | 13 +- .../internal/cli/util/ReadWriteFile.java | 78 +++----- .../configuration/domain/CacheElement.java | 20 +- .../configuration/domain/XmlEntity.java | 50 +++-- .../messages/ConfigurationRequest.java | 18 +- .../internal/configuration/utils/XmlUtils.java | 60 +++--- .../web/controllers/DataCommandsController.java | 7 +- .../controllers/RegionCommandsController.java | 13 +- .../controllers/ShellCommandsController.java | 63 +++--- .../cli/commands/FunctionCommandsDUnitTest.java | 19 +- 41 files changed, 491 insertions(+), 1023 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/fb9a405f/geode-core/src/main/java/org/apache/geode/management/GemFireProperties.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/GemFireProperties.java b/geode-core/src/main/java/org/apache/geode/management/GemFireProperties.java index 6257967..c892abd 100644 --- a/geode-core/src/main/java/org/apache/geode/management/GemFireProperties.java +++ b/geode-core/src/main/java/org/apache/geode/management/GemFireProperties.java @@ -94,7 +94,7 @@ public class GemFireProperties { * same package. * * The peer and server parameters are optional. They specify whether the locator can be used for - * peers to discover eachother, or for clients to discover peers. By default both are true. + * peers to discover each other, or for clients to discover peers. By default both are true. * Default: "" (doesn't start a locator) **/ private String startLocator; @@ -163,26 +163,6 @@ public class GemFireProperties { * file deletion. **/ private int logDiskSpaceLimit; - // /** - // * If true, all gemfire socket communication is configured to use SSL through - // * JSSE. - // **/ - // private boolean sslEnabled; - // /** - // * A space seperated list of the SSL cipher suites to enable. Those listed - // * must be supported by the available providers. - // **/ - // private String sslCiphers; - // /** - // * A space seperated list of the SSL protocols to enable. Those listed must be - // * supported by the available providers. - // **/ - // private String sslProtocols; - // /** - // * If false, allow ciphers that do not require the client side of the - // * connection to be authenticated. - // **/ - // private boolean sslRequireAuthentication; /** * The number of milliseconds a thread can keep exclusive access to a socket that it is not * actively using. Once a thread loses its lease to a socket it will need to re-acquire a socket @@ -993,26 +973,6 @@ public class GemFireProperties { } - // public void setSSLEnabled(boolean sslEnabled) { - // this.sslEnabled = sslEnabled; - // - // } - // - // public void setSSLCiphers(String sslCiphers) { - // this.sslCiphers = sslCiphers; - // - // } - // - // public void setSSLProtocols(String sslProtocols) { - // this.sslProtocols = sslProtocols; - // - // } - // - // public void setSSLRequireAuthentication(boolean sslRequireAuthentication) { - // this.sslRequireAuthentication = sslRequireAuthentication; - // - // } - public void setSocketLeaseTime(int socketLeaseTime) { this.socketLeaseTime = socketLeaseTime; @@ -1288,7 +1248,6 @@ public class GemFireProperties { } public void setJmxManagerHttpPort(int jmxManagerHttpPort) { - // this.jmxManagerHttpPort = jmxManagerHttpPort; setHttpServicePort(jmxManagerHttpPort); } http://git-wip-us.apache.org/repos/asf/geode/blob/fb9a405f/geode-core/src/main/java/org/apache/geode/management/cli/CommandProcessingException.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/cli/CommandProcessingException.java b/geode-core/src/main/java/org/apache/geode/management/cli/CommandProcessingException.java index 5f8c10f..1511da0 100644 --- a/geode-core/src/main/java/org/apache/geode/management/cli/CommandProcessingException.java +++ b/geode-core/src/main/java/org/apache/geode/management/cli/CommandProcessingException.java @@ -53,7 +53,6 @@ public class CommandProcessingException extends RuntimeException { * Error Type indicating the absence of value for named parameter of a command. */ public static int OPTION_VALUE_REQUIRED = 9; - // public static int ARGUMENT_VALUE_REQUIRED = 10; /** * Error Type indicating IO errors occurred while accessing File/Network resource */ http://git-wip-us.apache.org/repos/asf/geode/blob/fb9a405f/geode-core/src/main/java/org/apache/geode/management/cli/CommandService.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/cli/CommandService.java b/geode-core/src/main/java/org/apache/geode/management/cli/CommandService.java index 55957b2..20f1c75 100644 --- a/geode-core/src/main/java/org/apache/geode/management/cli/CommandService.java +++ b/geode-core/src/main/java/org/apache/geode/management/cli/CommandService.java @@ -113,16 +113,12 @@ public abstract class CommandService { "Can not create command service as cache doesn't exist or cache is closed."); } - /* - * if (!cache.isServer()) { throw new IllegalArgumentException("Server cache is required."); } - */ - if (localCommandService == null || !localCommandService.isUsable()) { String nonExistingDependency = CliUtil.cliDependenciesExist(false); if (nonExistingDependency != null) { throw new DependenciesNotFoundException( LocalizedStrings.CommandServiceManager_COULD_NOT_FIND__0__LIB_NEEDED_FOR_CLI_GFSH - .toLocalizedString(new Object[] {nonExistingDependency})); + .toLocalizedString(nonExistingDependency)); } localCommandService = new MemberCommandService((InternalCache) cache); @@ -144,45 +140,4 @@ public abstract class CommandService { return null; } - - // public static CommandService createCommandService(RegionService regionService) { - // if (regionService == null || regionService.isClosed()) { - // throw new CacheClosedException("Can not create command service as region service doesn't exist - // or cache is closed."); - // } - // - // CommandService commandService; - // - // if (Cache.class.isInstance(regionService) && - // ((Cache) regionService).isServer() && - // CacheFactory.getAnyInstance() == regionService) { - // commandService = createLocalCommandService((Cache) regionService); - // } else { - // Pool poolToUse = null; - // if (ProxyCache.class.isInstance(regionService)) { - // ProxyCache proxyCache = (ProxyCache) regionService; - // poolToUse = proxyCache.getUserAttributes().getPool(); - // } else if (ClientCache.class.isInstance(regionService)) { - // ClientCache localCache = (ClientCache) regionService; - // poolToUse = localCache.getDefaultPool(); - // } else { - // throw new IllegalArgumentException("Can not create Command Service for given Region Service: " - // + regionService); - // } - // commandService = new ProxyCommandService(poolToUse); - // } - // - // return commandService; - // } - // - // public static CommandService createRemoteCommandService(String poolName) { - // Pool poolToUse = PoolManager.find(poolName); - // - // if (poolToUse == null) { - // throw new IllegalArgumentException("Can not create Command Service as a Pool with name \"" + - // poolName+"\" was not found."); - // } - // - // return new ProxyCommandService(poolToUse); - // } } http://git-wip-us.apache.org/repos/asf/geode/blob/fb9a405f/geode-core/src/main/java/org/apache/geode/management/internal/MBeanJMXAdapter.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/MBeanJMXAdapter.java b/geode-core/src/main/java/org/apache/geode/management/internal/MBeanJMXAdapter.java index d375ac8..8d6b2e8 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/MBeanJMXAdapter.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/MBeanJMXAdapter.java @@ -72,16 +72,11 @@ public class MBeanJMXAdapter implements ManagementConstants { private DistributedMember distMember; /** - * log writer, or null if there is no distributed system available - */ - // private LogWriterI18n logger = InternalDistributedSystem.getLoggerI18n(); - - /** * public constructor */ public MBeanJMXAdapter() { - this.localGemFireMBean = new ConcurrentHashMap<ObjectName, Object>(); + this.localGemFireMBean = new ConcurrentHashMap<>(); this.distMember = InternalDistributedSystem.getConnectedInstance().getDistributedMember(); } @@ -95,7 +90,7 @@ public class MBeanJMXAdapter implements ManagementConstants { * * @param object * @param objectName - * @return modifed ObjectName + * @return modified ObjectName */ public ObjectName registerMBean(Object object, ObjectName objectName, boolean isGemFireMBean) { ObjectName newObjectName = objectName; @@ -110,15 +105,8 @@ public class MBeanJMXAdapter implements ManagementConstants { mbeanServer.registerMBean(object, newObjectName); this.localGemFireMBean.put(newObjectName, object); - } catch (InstanceAlreadyExistsException e) { - throw new ManagementException(e); - } catch (MBeanRegistrationException e) { - throw new ManagementException(e); - } catch (NotCompliantMBeanException e) { - throw new ManagementException(e); - } catch (MalformedObjectNameException e) { - throw new ManagementException(e); - } catch (NullPointerException e) { + } catch (InstanceAlreadyExistsException | NullPointerException | MalformedObjectNameException + | NotCompliantMBeanException | MBeanRegistrationException e) { throw new ManagementException(e); } return newObjectName; @@ -139,19 +127,17 @@ public class MBeanJMXAdapter implements ManagementConstants { String className = instance.getClassName(); Class cls = ClassLoadUtil.classFromName(className); Type[] intfTyps = cls.getGenericInterfaces(); - for (int i = 0; i < intfTyps.length; i++) { - Class intfTyp = (Class) intfTyps[i]; + for (Type intfTyp1 : intfTyps) { + Class intfTyp = (Class) intfTyp1; if (intfTyp.equals(NotificationEmitter.class)) { return true; } } - Class supreClassTyp = (Class) cls.getGenericSuperclass(); - if (supreClassTyp != null && supreClassTyp.equals(NotificationBroadcasterSupport.class)) { + Class superClassType = (Class) cls.getGenericSuperclass(); + if (superClassType != null && superClassType.equals(NotificationBroadcasterSupport.class)) { return true; } - } catch (InstanceNotFoundException e) { - throw new ManagementException(e); - } catch (ClassNotFoundException e) { + } catch (InstanceNotFoundException | ClassNotFoundException e) { throw new ManagementException(e); } return false; @@ -174,13 +160,8 @@ public class MBeanJMXAdapter implements ManagementConstants { mbeanServer.registerMBean(object, objectName); - } catch (InstanceAlreadyExistsException e) { - throw new ManagementException(e); - } catch (MBeanRegistrationException e) { - throw new ManagementException(e); - } catch (NotCompliantMBeanException e) { - throw new ManagementException(e); - } catch (NullPointerException e) { + } catch (InstanceAlreadyExistsException | NullPointerException | NotCompliantMBeanException + | MBeanRegistrationException e) { throw new ManagementException(e); } @@ -205,11 +186,7 @@ public class MBeanJMXAdapter implements ManagementConstants { if (localGemFireMBean.get(objectName) != null) { localGemFireMBean.remove(objectName); } - } catch (NullPointerException e) { - throw new ManagementException(e); - } catch (InstanceNotFoundException e) { - throw new ManagementException(e); - } catch (MBeanRegistrationException e) { + } catch (NullPointerException | MBeanRegistrationException | InstanceNotFoundException e) { throw new ManagementException(e); } @@ -253,9 +230,7 @@ public class MBeanJMXAdapter implements ManagementConstants { for (ObjectName objectName : gemFireObjects) { unregisterMBean(objectName); } - } catch (MalformedObjectNameException e) { - throw new ManagementException(e); - } catch (NullPointerException e) { + } catch (MalformedObjectNameException | NullPointerException e) { throw new ManagementException(e); } @@ -324,34 +299,13 @@ public class MBeanJMXAdapter implements ManagementConstants { } private static boolean containsSpecialChar(String value) { - if (value.contains(":")) { - return true; - } - if (value.contains("@")) { - return true; - } - if (value.contains("-")) { - return true; - } - if (value.contains("#")) { - return true; - } - if (value.contains("+")) { - return true; - } - if (value.contains("?")) { - return true; - } - return false; + return value.contains(":") || value.contains("@") || value.contains("-") || value.contains("#") + || value.contains("+") || value.contains("?"); } private static boolean isQuoted(String value) { final int len = value.length(); - if (len < 2 || value.charAt(0) != '"' || value.charAt(len - 1) != '"') { - return false; - } else { - return true; - } + return len >= 2 && value.charAt(0) == '"' && value.charAt(len - 1) == '"'; } /** @@ -428,7 +382,7 @@ public class MBeanJMXAdapter implements ManagementConstants { } public AsyncEventQueueMXBean getAsyncEventQueueMXBean(String queueId) { - ObjectName objName = getAsycnEventQueueMBeanName(distMember, queueId); + ObjectName objName = getAsyncEventQueueMBeanName(distMember, queueId); return (AsyncEventQueueMXBean) localGemFireMBean.get(objName); } @@ -441,104 +395,102 @@ public class MBeanJMXAdapter implements ManagementConstants { public static ObjectName getObjectName(String name) { try { return ObjectName.getInstance(name); - } catch (MalformedObjectNameException e) { - throw new ManagementException(e); - } catch (NullPointerException e) { + } catch (MalformedObjectNameException | NullPointerException e) { throw new ManagementException(e); } } public static ObjectName getMemberMBeanName(DistributedMember member) { - return getObjectName((MessageFormat.format(OBJECTNAME__MEMBER_MXBEAN, - new Object[] {getMemberNameOrId(member)}))); + return getObjectName( + (MessageFormat.format(OBJECTNAME__MEMBER_MXBEAN, getMemberNameOrId(member)))); } public static ObjectName getMemberMBeanName(String member) { - return getObjectName((MessageFormat.format(OBJECTNAME__MEMBER_MXBEAN, - new Object[] {makeCompliantName(member)}))); + return getObjectName( + (MessageFormat.format(OBJECTNAME__MEMBER_MXBEAN, makeCompliantName(member)))); } public static ObjectName getRegionMBeanName(DistributedMember member, String regionPath) { return getObjectName((MessageFormat.format(OBJECTNAME__REGION_MXBEAN, - new Object[] {makeCompliantRegionPath(regionPath), getMemberNameOrId(member)}))); + makeCompliantRegionPath(regionPath), getMemberNameOrId(member)))); } public static ObjectName getRegionMBeanName(String member, String regionPath) { return getObjectName((MessageFormat.format(OBJECTNAME__REGION_MXBEAN, - new Object[] {makeCompliantRegionPath(regionPath), makeCompliantName(member)}))); + makeCompliantRegionPath(regionPath), makeCompliantName(member)))); } public static ObjectName getRegionMBeanName(ObjectName memberMBeanName, String regionPath) { - return getObjectName((MessageFormat.format(OBJECTNAME__REGION_MXBEAN, - new Object[] {makeCompliantRegionPath(regionPath), - memberMBeanName.getKeyProperty(ManagementConstants.OBJECTNAME_MEMBER_APPENDER)}))); + return getObjectName( + (MessageFormat.format(OBJECTNAME__REGION_MXBEAN, makeCompliantRegionPath(regionPath), + memberMBeanName.getKeyProperty(ManagementConstants.OBJECTNAME_MEMBER_APPENDER)))); } public static ObjectName getDiskStoreMBeanName(DistributedMember member, String diskName) { - return getObjectName((MessageFormat.format(OBJECTNAME__DISKSTORE_MXBEAN, - new Object[] {diskName, getMemberNameOrId(member)}))); + return getObjectName( + (MessageFormat.format(OBJECTNAME__DISKSTORE_MXBEAN, diskName, getMemberNameOrId(member)))); } public static ObjectName getDiskStoreMBeanName(String member, String diskName) { - return getObjectName((MessageFormat.format(OBJECTNAME__DISKSTORE_MXBEAN, - new Object[] {diskName, makeCompliantName(member)}))); + return getObjectName( + (MessageFormat.format(OBJECTNAME__DISKSTORE_MXBEAN, diskName, makeCompliantName(member)))); } public static ObjectName getClientServiceMBeanName(int serverPort, DistributedMember member) { return getObjectName((MessageFormat.format(OBJECTNAME__CLIENTSERVICE_MXBEAN, - new Object[] {String.valueOf(serverPort), getMemberNameOrId(member)}))); + String.valueOf(serverPort), getMemberNameOrId(member)))); } public static ObjectName getClientServiceMBeanName(int serverPort, String member) { return getObjectName((MessageFormat.format(OBJECTNAME__CLIENTSERVICE_MXBEAN, - new Object[] {String.valueOf(serverPort), makeCompliantName(member)}))); + String.valueOf(serverPort), makeCompliantName(member)))); } public static ObjectName getLockServiceMBeanName(DistributedMember member, String lockServiceName) { - return getObjectName((MessageFormat.format(OBJECTNAME__LOCKSERVICE_MXBEAN, - new Object[] {lockServiceName, getMemberNameOrId(member)}))); + return getObjectName((MessageFormat.format(OBJECTNAME__LOCKSERVICE_MXBEAN, lockServiceName, + getMemberNameOrId(member)))); } public static ObjectName getLockServiceMBeanName(String member, String lockServiceName) { - return getObjectName((MessageFormat.format(OBJECTNAME__LOCKSERVICE_MXBEAN, - new Object[] {lockServiceName, makeCompliantName(member)}))); + return getObjectName((MessageFormat.format(OBJECTNAME__LOCKSERVICE_MXBEAN, lockServiceName, + makeCompliantName(member)))); } public static ObjectName getGatewayReceiverMBeanName(DistributedMember member) { - return getObjectName((MessageFormat.format(OBJECTNAME__GATEWAYRECEIVER_MXBEAN, - new Object[] {getMemberNameOrId(member)}))); + return getObjectName( + (MessageFormat.format(OBJECTNAME__GATEWAYRECEIVER_MXBEAN, getMemberNameOrId(member)))); } public static ObjectName getGatewayReceiverMBeanName(String member) { - return getObjectName((MessageFormat.format(OBJECTNAME__GATEWAYRECEIVER_MXBEAN, - new Object[] {makeCompliantName(member)}))); + return getObjectName( + (MessageFormat.format(OBJECTNAME__GATEWAYRECEIVER_MXBEAN, makeCompliantName(member)))); } public static ObjectName getGatewaySenderMBeanName(DistributedMember member, String id) { - return getObjectName((MessageFormat.format(OBJECTNAME__GATEWAYSENDER_MXBEAN, - new Object[] {id, getMemberNameOrId(member)}))); + return getObjectName( + (MessageFormat.format(OBJECTNAME__GATEWAYSENDER_MXBEAN, id, getMemberNameOrId(member)))); } public static ObjectName getGatewaySenderMBeanName(String member, String id) { - return getObjectName((MessageFormat.format(OBJECTNAME__GATEWAYSENDER_MXBEAN, - new Object[] {id, makeCompliantName(member)}))); + return getObjectName( + (MessageFormat.format(OBJECTNAME__GATEWAYSENDER_MXBEAN, id, makeCompliantName(member)))); } - public static ObjectName getAsycnEventQueueMBeanName(DistributedMember member, String queueId) { - return getObjectName((MessageFormat.format(OBJECTNAME__ASYNCEVENTQUEUE_MXBEAN, - new Object[] {queueId, getMemberNameOrId(member)}))); + public static ObjectName getAsyncEventQueueMBeanName(DistributedMember member, String queueId) { + return getObjectName((MessageFormat.format(OBJECTNAME__ASYNCEVENTQUEUE_MXBEAN, queueId, + getMemberNameOrId(member)))); } - public static ObjectName getAsycnEventQueueMBeanName(String member, String queueId) { - return getObjectName((MessageFormat.format(OBJECTNAME__ASYNCEVENTQUEUE_MXBEAN, - new Object[] {queueId, makeCompliantName(member)}))); + public static ObjectName getAsyncEventQueueMBeanName(String member, String queueId) { + return getObjectName((MessageFormat.format(OBJECTNAME__ASYNCEVENTQUEUE_MXBEAN, queueId, + makeCompliantName(member)))); } public static ObjectName getDistributedRegionMbeanName(String regionPath) { return getObjectName((MessageFormat.format(OBJECTNAME__DISTRIBUTEDREGION_MXBEAN, - new Object[] {makeCompliantRegionPath(regionPath)}))); + makeCompliantRegionPath(regionPath)))); } /** @@ -548,13 +500,12 @@ public class MBeanJMXAdapter implements ManagementConstants { * @return ObjectName MBean name */ public static ObjectName getDistributedRegionMbeanNameInternal(String regionPath) { - return getObjectName( - (MessageFormat.format(OBJECTNAME__DISTRIBUTEDREGION_MXBEAN, new Object[] {regionPath}))); + return getObjectName((MessageFormat.format(OBJECTNAME__DISTRIBUTEDREGION_MXBEAN, regionPath))); } public static ObjectName getDistributedLockServiceName(String lockService) { - return getObjectName((MessageFormat.format(OBJECTNAME__DISTRIBUTEDLOCKSERVICE_MXBEAN, - new Object[] {lockService}))); + return getObjectName( + (MessageFormat.format(OBJECTNAME__DISTRIBUTEDLOCKSERVICE_MXBEAN, lockService))); } public static ObjectName getDistributedSystemName() { @@ -564,23 +515,23 @@ public class MBeanJMXAdapter implements ManagementConstants { public static ObjectName getManagerName() { String member = getMemberNameOrId(InternalDistributedSystem.getConnectedInstance().getDistributedMember()); - return getObjectName((MessageFormat.format(OBJECTNAME__MANAGER_MXBEAN, new Object[] {member}))); + return getObjectName((MessageFormat.format(OBJECTNAME__MANAGER_MXBEAN, member))); } public static ObjectName getLocatorMBeanName(DistributedMember member) { - return getObjectName((MessageFormat.format(OBJECTNAME__LOCATOR_MXBEAN, - new Object[] {getMemberNameOrId(member)}))); + return getObjectName( + (MessageFormat.format(OBJECTNAME__LOCATOR_MXBEAN, getMemberNameOrId(member)))); } public static ObjectName getLocatorMBeanName(String member) { - return getObjectName((MessageFormat.format(OBJECTNAME__LOCATOR_MXBEAN, - new Object[] {makeCompliantName(member)}))); + return getObjectName( + (MessageFormat.format(OBJECTNAME__LOCATOR_MXBEAN, makeCompliantName(member)))); } public static ObjectName getCacheServiceMBeanName(DistributedMember member, String cacheServiceId) { - return getObjectName((MessageFormat.format(OBJECTNAME__CACHESERVICE_MXBEAN, - new Object[] {cacheServiceId, getMemberNameOrId(member)}))); + return getObjectName((MessageFormat.format(OBJECTNAME__CACHESERVICE_MXBEAN, cacheServiceId, + getMemberNameOrId(member)))); } public Map<ObjectName, Object> getLocalGemFireMBean() { @@ -592,12 +543,12 @@ public class MBeanJMXAdapter implements ManagementConstants { InternalDistributedMember iMember = (InternalDistributedMember) member; final StringBuilder sb = new StringBuilder(); sb.append(iMember.getInetAddress().getHostAddress()); - sb.append("<v" + iMember.getVmViewId() + ">"); // View ID will be 0 for - // Loner, but in that case no - // federation as well + // View ID will be 0 for Loner, but in that case no federation as well + sb.append("<v").append(iMember.getVmViewId()).append(">"); sb.append(iMember.getPort()); - return makeCompliantName(sb.toString().toLowerCase());// Lower case to - // handle IPv6 + // Lower case to handle IPv6 + return makeCompliantName(sb.toString().toLowerCase()); + } public static boolean isAttributeAvailable(String attributeName, String objectName) { @@ -605,24 +556,12 @@ public class MBeanJMXAdapter implements ManagementConstants { try { ObjectName objName = new ObjectName(objectName); mbeanServer.getAttribute(objName, attributeName); - } catch (MalformedObjectNameException e) { - return false; - } catch (NullPointerException e) { - return false; - } catch (AttributeNotFoundException e) { - return false; - } catch (InstanceNotFoundException e) { - return false; - } catch (MBeanException e) { - return false; - } catch (ReflectionException e) { + } catch (MalformedObjectNameException | ReflectionException | MBeanException + | InstanceNotFoundException | AttributeNotFoundException | NullPointerException e) { return false; } return true; } - - public static int VALUE_NOT_AVAILABLE = -1; - } http://git-wip-us.apache.org/repos/asf/geode/blob/fb9a405f/geode-core/src/main/java/org/apache/geode/management/internal/ManagementAgent.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/ManagementAgent.java b/geode-core/src/main/java/org/apache/geode/management/internal/ManagementAgent.java index 11590cf..39ad703 100755 --- a/geode-core/src/main/java/org/apache/geode/management/internal/ManagementAgent.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/ManagementAgent.java @@ -14,32 +14,6 @@ */ package org.apache.geode.management.internal; -import org.apache.commons.lang.StringUtils; -import org.apache.geode.GemFireConfigException; -import org.apache.geode.cache.CacheFactory; -import org.apache.geode.distributed.internal.DistributionConfig; -import org.apache.geode.distributed.internal.DistributionManager; -import org.apache.geode.internal.GemFireVersion; -import org.apache.geode.internal.cache.InternalCache; -import org.apache.geode.internal.logging.LogService; -import org.apache.geode.internal.net.SSLConfigurationFactory; -import org.apache.geode.internal.net.SocketCreator; -import org.apache.geode.internal.net.SocketCreatorFactory; -import org.apache.geode.internal.security.SecurableCommunicationChannel; -import org.apache.geode.internal.security.SecurityService; -import org.apache.geode.internal.security.shiro.JMXShiroAuthenticator; -import org.apache.geode.internal.tcp.TCPConduit; -import org.apache.geode.management.ManagementException; -import org.apache.geode.management.ManagementService; -import org.apache.geode.management.ManagerMXBean; -import org.apache.geode.management.internal.security.AccessControlMBean; -import org.apache.geode.management.internal.security.MBeanServerWrapper; -import org.apache.geode.management.internal.security.ResourceConstants; -import org.apache.geode.management.internal.unsafe.ReadOpFileAccessController; -import org.apache.logging.log4j.Logger; -import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.server.ServerConnector; - import java.io.IOException; import java.io.Serializable; import java.lang.management.ManagementFactory; @@ -55,6 +29,7 @@ import java.rmi.server.RMIServerSocketFactory; import java.rmi.server.UnicastRemoteObject; import java.util.HashMap; import java.util.Set; + import javax.management.InstanceAlreadyExistsException; import javax.management.MBeanRegistrationException; import javax.management.MBeanServer; @@ -68,6 +43,33 @@ import javax.management.remote.rmi.RMIJRMPServerImpl; import javax.management.remote.rmi.RMIServerImpl; import javax.rmi.ssl.SslRMIClientSocketFactory; +import org.apache.commons.lang.StringUtils; +import org.apache.logging.log4j.Logger; +import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.ServerConnector; + +import org.apache.geode.GemFireConfigException; +import org.apache.geode.cache.CacheFactory; +import org.apache.geode.distributed.internal.DistributionConfig; +import org.apache.geode.distributed.internal.DistributionManager; +import org.apache.geode.internal.GemFireVersion; +import org.apache.geode.internal.cache.InternalCache; +import org.apache.geode.internal.logging.LogService; +import org.apache.geode.internal.net.SSLConfigurationFactory; +import org.apache.geode.internal.net.SocketCreator; +import org.apache.geode.internal.net.SocketCreatorFactory; +import org.apache.geode.internal.security.SecurableCommunicationChannel; +import org.apache.geode.internal.security.SecurityService; +import org.apache.geode.internal.security.shiro.JMXShiroAuthenticator; +import org.apache.geode.internal.tcp.TCPConduit; +import org.apache.geode.management.ManagementException; +import org.apache.geode.management.ManagementService; +import org.apache.geode.management.ManagerMXBean; +import org.apache.geode.management.internal.security.AccessControlMBean; +import org.apache.geode.management.internal.security.MBeanServerWrapper; +import org.apache.geode.management.internal.security.ResourceConstants; +import org.apache.geode.management.internal.unsafe.ReadOpFileAccessController; + /** * Agent implementation that controls the JMX server end points for JMX clients to connect, such as * an RMI server. @@ -390,7 +392,7 @@ public class ManagementAgent { logger.debug("Starting jmx manager agent on port {}{}", port, (bindAddr != null ? (" bound to " + bindAddr) : "") + (ssl ? " using SSL" : "")); } - RMIClientSocketFactory rmiClientSocketFactory = ssl ? new SslRMIClientSocketFactory() : null;// RMISocketFactory.getDefaultSocketFactory(); + RMIClientSocketFactory rmiClientSocketFactory = ssl ? new SslRMIClientSocketFactory() : null; RMIServerSocketFactory rmiServerSocketFactory = new GemFireRMIServerSocketFactory(socketCreator, bindAddr); @@ -410,7 +412,7 @@ public class ManagementAgent { MBeanServer mbs = ManagementFactory.getPlatformMBeanServer(); // Environment map. why is this declared as HashMap? - final HashMap<String, Object> env = new HashMap<String, Object>(); + final HashMap<String, Object> env = new HashMap<>(); // Manually creates and binds a JMX RMI Connector Server stub with the // registry created above: the port we pass here is the port that can @@ -459,8 +461,7 @@ public class ManagementAgent { try { registry.bind("jmxrmi", stub); } catch (AlreadyBoundException x) { - final IOException io = new IOException(x.getMessage()); - io.initCause(x); + final IOException io = new IOException(x.getMessage(), x); throw io; } super.start(); @@ -487,12 +488,9 @@ public class ManagementAgent { String accessFile = this.config.getJmxManagerAccessFile(); if (accessFile != null && accessFile.length() > 0) { - // Lets not use default connector based authorization - // env.put("jmx.remote.x.access.file", accessFile); // Rewire the mbs hierarchy to set accessController ReadOpFileAccessController controller = new ReadOpFileAccessController(accessFile); controller.setMBeanServer(mbs); - mbs = controller; } } @@ -529,7 +527,7 @@ public class ManagementAgent { private static final long serialVersionUID = -7604285019188827617L; - private/* final hack to prevent serialization */ transient SocketCreator sc; + private transient SocketCreator sc; public GemFireRMIClientSocketFactory(SocketCreator sc) { this.sc = sc; @@ -537,7 +535,7 @@ public class ManagementAgent { @Override public Socket createSocket(String host, int port) throws IOException { - return this.sc.connectForClient(host, port, 0/* no timeout */); + return this.sc.connectForClient(host, port, 0); } } @@ -545,7 +543,7 @@ public class ManagementAgent { implements RMIServerSocketFactory, Serializable { private static final long serialVersionUID = -811909050641332716L; - private/* final hack to prevent serialization */ transient SocketCreator sc; + private transient SocketCreator sc; private final InetAddress bindAddr; public GemFireRMIServerSocketFactory(SocketCreator sc, InetAddress bindAddr) { http://git-wip-us.apache.org/repos/asf/geode/blob/fb9a405f/geode-core/src/main/java/org/apache/geode/management/internal/SystemManagementService.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/SystemManagementService.java b/geode-core/src/main/java/org/apache/geode/management/internal/SystemManagementService.java index c770f89..9a92eaa 100755 --- a/geode-core/src/main/java/org/apache/geode/management/internal/SystemManagementService.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/SystemManagementService.java @@ -320,8 +320,7 @@ public class SystemManagementService extends BaseManagementService { return jmxAdapter.getLocalRegionMXBean(regionPath); } - public <T> T getMBeanProxy(ObjectName objectName, Class<T> interfaceClass) { // TODO: this is too - // generic + public <T> T getMBeanProxy(ObjectName objectName, Class<T> interfaceClass) { if (!isStartedAndOpen()) { return null; } @@ -556,7 +555,7 @@ public class SystemManagementService extends BaseManagementService { @Override public ObjectName getAsyncEventQueueMBeanName(DistributedMember member, String queueId) { - return MBeanJMXAdapter.getAsycnEventQueueMBeanName(member, queueId); + return MBeanJMXAdapter.getAsyncEventQueueMBeanName(member, queueId); } @Override http://git-wip-us.apache.org/repos/asf/geode/blob/fb9a405f/geode-core/src/main/java/org/apache/geode/management/internal/beans/MBeanAggregator.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/MBeanAggregator.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/MBeanAggregator.java index d0a6e35..98d1810 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/MBeanAggregator.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/MBeanAggregator.java @@ -42,7 +42,7 @@ import org.apache.geode.management.internal.SystemManagementService; */ public class MBeanAggregator implements ProxyListener { - private static final List<Class> distributedMBeanList = new ArrayList<Class>(); + private static final List<Class> distributedMBeanList = new ArrayList<>(); /** @@ -405,10 +405,7 @@ public class MBeanAggregator implements ProxyListener { } public void quorumLost(Set<InternalDistributedMember> failures, - List<InternalDistributedMember> remaining) { - // [bruce] does this need to propagate through this bridge object? - // distributedSystemBridge.quorumLost(failures, remaining); - } + List<InternalDistributedMember> remaining) {} @Override public void memberSuspect(InternalDistributedMember id, InternalDistributedMember whoSuspected, http://git-wip-us.apache.org/repos/asf/geode/blob/fb9a405f/geode-core/src/main/java/org/apache/geode/management/internal/beans/ManagementAdapter.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/ManagementAdapter.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/ManagementAdapter.java index 8ea84f5..e35e97b 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/ManagementAdapter.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/ManagementAdapter.java @@ -14,7 +14,24 @@ */ package org.apache.geode.management.internal.beans; +import java.lang.reflect.Type; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import javax.management.InstanceNotFoundException; +import javax.management.MBeanServer; +import javax.management.MalformedObjectNameException; +import javax.management.Notification; +import javax.management.NotificationBroadcasterSupport; +import javax.management.ObjectInstance; +import javax.management.ObjectName; + import org.apache.commons.lang.StringUtils; +import org.apache.logging.log4j.Logger; + import org.apache.geode.cache.Cache; import org.apache.geode.cache.DiskStore; import org.apache.geode.cache.Region; @@ -58,21 +75,6 @@ import org.apache.geode.management.membership.ClientMembershipEvent; import org.apache.geode.management.membership.ClientMembershipListener; import org.apache.geode.management.membership.ClientMembershipListenerAdapter; import org.apache.geode.pdx.internal.PeerTypeRegistration; -import org.apache.logging.log4j.Logger; - -import java.lang.reflect.Type; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import javax.management.InstanceNotFoundException; -import javax.management.MBeanServer; -import javax.management.MalformedObjectNameException; -import javax.management.Notification; -import javax.management.NotificationBroadcasterSupport; -import javax.management.ObjectInstance; -import javax.management.ObjectName; /** * Acts as an intermediate between MBean layer and Federation Layer. Handles all Call backs from @@ -151,8 +153,7 @@ public class ManagementAdapter { // Type casting to MemberMXBean to expose only those methods described in // the interface; - ObjectName changedMBeanName = - service.registerInternalMBean((MemberMXBean) memberBean, memberMBeanName); + ObjectName changedMBeanName = service.registerInternalMBean(memberBean, memberMBeanName); service.federate(changedMBeanName, MemberMXBean.class, true); this.serviceInitialised = true; @@ -530,7 +531,7 @@ public class ManagementAdapter { } AsyncEventQueueMBeanBridge bridge = new AsyncEventQueueMBeanBridge(queue); AsyncEventQueueMXBean queueMBean = new AsyncEventQueueMBean(bridge); - ObjectName senderObjectName = MBeanJMXAdapter.getAsycnEventQueueMBeanName( + ObjectName senderObjectName = MBeanJMXAdapter.getAsyncEventQueueMBeanName( internalCache.getDistributedSystem().getDistributedMember(), queue.getId()); ObjectName changedMBeanName = service.registerInternalMBean(queueMBean, senderObjectName); @@ -553,7 +554,7 @@ public class ManagementAdapter { return; } - ObjectName asycnEventQueueMBeanName = MBeanJMXAdapter.getAsycnEventQueueMBeanName( + ObjectName asycnEventQueueMBeanName = MBeanJMXAdapter.getAsyncEventQueueMBeanName( internalCache.getDistributedSystem().getDistributedMember(), queue.getId()); AsyncEventQueueMBean bean; try { @@ -612,7 +613,7 @@ public class ManagementAdapter { userData.put(JMXNotificationUserData.THREAD, source); InternalDistributedMember sender = details.getSender(); - String nameOrId = memberSource; // TODO: what if sender is null? + String nameOrId = memberSource; if (sender != null) { nameOrId = sender.getName(); nameOrId = StringUtils.isNotBlank(nameOrId) ? nameOrId : sender.getId(); @@ -642,7 +643,7 @@ public class ManagementAdapter { cacheServer.getPort(), internalCache.getDistributedSystem().getDistributedMember()); ObjectName changedMBeanName = - service.registerInternalMBean((CacheServerMXBean) cacheServerMBean, cacheServerMBeanName); + service.registerInternalMBean(cacheServerMBean, cacheServerMBeanName); ClientMembershipListener managementClientListener = new CacheServerMembershipListenerAdapter( cacheServerMBean, memberLevelNotifEmitter, changedMBeanName); @@ -895,8 +896,7 @@ public class ManagementAdapter { LocatorMBeanBridge bridge = new LocatorMBeanBridge(locator); LocatorMBean locatorMBean = new LocatorMBean(bridge); - ObjectName changedMBeanName = - service.registerInternalMBean((LocatorMXBean) locatorMBean, locatorMBeanName); + ObjectName changedMBeanName = service.registerInternalMBean(locatorMBean, locatorMBeanName); service.federate(changedMBeanName, LocatorMXBean.class, true); http://git-wip-us.apache.org/repos/asf/geode/blob/fb9a405f/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/VMStatsMonitor.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/VMStatsMonitor.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/VMStatsMonitor.java index dd24942..a62f926 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/VMStatsMonitor.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/stats/VMStatsMonitor.java @@ -17,7 +17,6 @@ package org.apache.geode.management.internal.beans.stats; import java.lang.management.ManagementFactory; import org.apache.geode.StatisticDescriptor; -import org.apache.geode.distributed.internal.InternalDistributedSystem; import org.apache.geode.internal.statistics.StatisticId; import org.apache.geode.internal.statistics.StatisticNotFoundException; import org.apache.geode.internal.statistics.StatisticsNotification; @@ -30,9 +29,9 @@ import org.apache.geode.management.internal.MBeanJMXAdapter; */ public class VMStatsMonitor extends MBeanStatsMonitor { - private volatile float cpuUsage = 0; - + private static final int VALUE_NOT_AVAILABLE = -1; + private volatile float cpuUsage = 0; private static String processCPUTimeAttr = "ProcessCpuTime"; @@ -47,7 +46,7 @@ public class VMStatsMonitor extends MBeanStatsMonitor { processCPUTimeAvailable = MBeanJMXAdapter.isAttributeAvailable(processCPUTimeAttr, ManagementFactory.OPERATING_SYSTEM_MXBEAN_NAME); if (!processCPUTimeAvailable) { - cpuUsage = MBeanJMXAdapter.VALUE_NOT_AVAILABLE; + cpuUsage = VALUE_NOT_AVAILABLE; } } @@ -89,7 +88,7 @@ public class VMStatsMonitor extends MBeanStatsMonitor { // Some JVM like IBM is not handled by Stats layer properly. Ignoring the attribute for such // cases if (processCpuTime == null) { - cpuUsage = MBeanJMXAdapter.VALUE_NOT_AVAILABLE; + cpuUsage = VALUE_NOT_AVAILABLE; return; } @@ -106,9 +105,8 @@ public class VMStatsMonitor extends MBeanStatsMonitor { } long systemTime = System.currentTimeMillis(); - long denom = (systemTime - lastSystemTime) * 10000; // 10000 = (Nano - // conversion factor / - // 100 for percentage) + // 10000 = (Nano conversion factor / 100 for percentage) + long denom = (systemTime - lastSystemTime) * 10000; float processCpuUsage = (float) (cpuTime - lastProcessCpuTime) / denom; http://git-wip-us.apache.org/repos/asf/geode/blob/fb9a405f/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 8e9b54e..67f1b2b 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 @@ -75,7 +75,7 @@ public class CliUtil { public static final FileFilter JAR_FILE_FILTER = new CustomFileFilter(".jar"); public static String cliDependenciesExist(boolean includeGfshDependencies) { - String jarProductName = null; + String jarProductName; // Parser & CliCommand from Spring Shell jarProductName = @@ -127,23 +127,22 @@ public class CliUtil { } public static byte[][] filesToBytes(String[] fileNames) throws IOException { - List<byte[]> filesDataList = new ArrayList<byte[]>(); + List<byte[]> filesDataList = new ArrayList<>(); - for (int i = 0; i < fileNames.length; i++) { - File file = new File(fileNames[i]); + for (String fileName : fileNames) { + File file = new File(fileName); if (!file.exists()) { throw new FileNotFoundException("Could not find " + file.getCanonicalPath()); } if (file.isDirectory()) { - // TODO: (1) No recursive search yet. (2) Do we need to check/limit size of the files too? File[] childrenFiles = file.listFiles(JAR_FILE_FILTER); - for (int j = 0; j < childrenFiles.length; j++) { + for (File childrenFile : childrenFiles) { // 1. add name of the file as bytes at even index - filesDataList.add(childrenFiles[j].getName().getBytes()); + filesDataList.add(childrenFile.getName().getBytes()); // 2. add file contents as bytes at odd index - filesDataList.add(toByteArray(new FileInputStream(childrenFiles[j]))); + filesDataList.add(toByteArray(new FileInputStream(childrenFile))); } } else { filesDataList.add(file.getName().getBytes()); @@ -211,31 +210,21 @@ public class CliUtil { } } - public static boolean isValidFileName(String filePath, String extension) { - boolean isValid = true; - return isValid; - } - private static InternalCache getInternalCache() { return (InternalCache) CacheFactory.getAnyInstance(); } public static Set<String> getAllRegionNames() { InternalCache cache = getInternalCache(); - Set<String> regionNames = new HashSet<String>(); + Set<String> regionNames = new HashSet<>(); Set<Region<?, ?>> rootRegions = cache.rootRegions(); - Iterator<Region<?, ?>> rootRegionIters = rootRegions.iterator(); - - while (rootRegionIters.hasNext()) { - Region<?, ?> rootRegion = rootRegionIters.next(); + for (Region<?, ?> rootRegion : rootRegions) { regionNames.add(rootRegion.getFullPath().substring(1)); Set<Region<?, ?>> subRegions = rootRegion.subregions(true); - Iterator<Region<?, ?>> subRegionIters = subRegions.iterator(); - while (subRegionIters.hasNext()) { - Region<?, ?> subRegion = subRegionIters.next(); + for (Region<?, ?> subRegion : subRegions) { regionNames.add(subRegion.getFullPath().substring(1)); } } @@ -245,10 +234,8 @@ public class CliUtil { public static String convertStringSetToString(Set<String> stringSet, char delimiter) { StringBuilder sb = new StringBuilder(); if (stringSet != null) { - Iterator<String> iters = stringSet.iterator(); - while (iters.hasNext()) { - String stringValue = iters.next(); + for (String stringValue : stringSet) { sb.append(stringValue); sb.append(delimiter); } @@ -259,10 +246,8 @@ public class CliUtil { public static String convertStringListToString(List<String> stringList, char delimiter) { StringBuilder sb = new StringBuilder(); if (stringList != null) { - Iterator<String> iters = stringList.iterator(); - while (iters.hasNext()) { - String stringValue = iters.next(); + for (String stringValue : stringList) { sb.append(stringValue); sb.append(delimiter); } @@ -311,7 +296,7 @@ public class CliUtil { return membersToConsider; } - Set<DistributedMember> matchingMembers = new HashSet<DistributedMember>(); + Set<DistributedMember> matchingMembers = new HashSet<>(); // it will either go into this loop or the following loop, not both. for (String memberNameOrId : members) { for (DistributedMember member : membersToConsider) { @@ -384,7 +369,7 @@ public class CliUtil { } public static <K> K newInstance(Class<K> klass, String neededFor) { - K instance = null; + K instance; try { instance = klass.newInstance(); } catch (InstantiationException e) { @@ -449,7 +434,6 @@ public class CliUtil { System.arraycopy(buffer, 0, newResult, result.length, bytesRead); result = newResult; } - // System.out.println(new String(result)); decompresser.end(); return new DeflaterInflaterData(result.length, result); @@ -480,43 +464,6 @@ public class CliUtil { } } - public static void main(String[] args) { - try { - byte[][] filesToBytes = - filesToBytes(new String[] {"/export/abhishek1/work/aspenmm/GFTryouts/test.json"}); - - System.out.println(filesToBytes[1].length); - - DeflaterInflaterData compressBytes = compressBytes(filesToBytes[1]); - System.out.println(compressBytes); - - DeflaterInflaterData uncompressBytes = - uncompressBytes(compressBytes.data, compressBytes.dataLength); - System.out.println(uncompressBytes); - - System.out.println(new String(uncompressBytes.getData())); - } catch (FileNotFoundException e) { - e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); - } catch (DataFormatException e) { - e.printStackTrace(); - } - } - - public static void main1(String[] args) { - try { - byte[][] fileToBytes = filesToBytes(new String[] {"../dumped/source/lib"}); - - bytesToFiles(fileToBytes, "../dumped/dest/lib/", true); - - } catch (FileNotFoundException e) { - e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); - } - } - public static boolean contains(Object[] array, Object object) { boolean contains = false; @@ -560,7 +507,7 @@ public class CliUtil { */ public static Set<DistributedMember> getDistributedMembersByGroup(InternalCache cache, String[] groups) { - Set<DistributedMember> groupMembers = new HashSet<DistributedMember>(); + Set<DistributedMember> groupMembers = new HashSet<>(); for (String group : groups) { groupMembers.addAll( cache.getInternalDistributedSystem().getDistributionManager().getGroupMembers(group)); @@ -580,7 +527,7 @@ public class CliUtil { */ public static ResultCollector<?, ?> executeFunction(final Function function, Object args, final Set<DistributedMember> targetMembers) { - Execution execution = null; + Execution execution; if (args != null) { execution = FunctionService.onMembers(targetMembers).setArguments(args); @@ -603,7 +550,7 @@ public class CliUtil { */ public static ResultCollector<?, ?> executeFunction(final Function function, Object args, final DistributedMember targetMember) { - Execution execution = null; + Execution execution; if (args != null) { execution = FunctionService.onMember(targetMember).setArguments(args); @@ -635,9 +582,9 @@ public class CliUtil { ManagementService managementService = ManagementService.getExistingManagementService(cache); DistributedSystemMXBean distributedSystemMXBean = managementService.getDistributedSystemMXBean(); - Set<DistributedMember> matchedMembers = new HashSet<DistributedMember>(); + Set<DistributedMember> matchedMembers = new HashSet<>(); - Set<DistributedMember> allClusterMembers = new HashSet<DistributedMember>(); + Set<DistributedMember> allClusterMembers = new HashSet<>(); allClusterMembers.addAll(cache.getMembers()); allClusterMembers.add(cache.getDistributedSystem().getDistributedMember()); @@ -647,8 +594,7 @@ public class CliUtil { region) != null) { matchedMembers.add(member); } - } catch (Exception e) { - // ignore for now + } catch (Exception ignored) { } } return matchedMembers; @@ -729,7 +675,7 @@ public class CliUtil { } File file = null; - FileWriter fw = null; + FileWriter fw; try { file = File.createTempFile("gfsh_output", "less"); fw = new FileWriter(file); @@ -741,9 +687,7 @@ public class CliUtil { "LESSOPEN=\"|color %s\" less -SR " + file.getName() + " < /dev/tty > /dev/tty "}, null, workingDir); p.waitFor(); - } catch (IOException e) { - Gfsh.printlnErr(e.getMessage()); - } catch (InterruptedException e) { + } catch (IOException | InterruptedException e) { Gfsh.printlnErr(e.getMessage()); } finally { if (file != null) @@ -764,7 +708,7 @@ public class CliUtil { public static Set<DistributedMember> getMembersForeRegionViaFunction(InternalCache cache, String regionPath, boolean returnAll) { try { - Set<DistributedMember> regionMembers = new HashSet<DistributedMember>(); + Set<DistributedMember> regionMembers = new HashSet<>(); MembersForRegionFunction membersForRegionFunction = new MembersForRegionFunction(); FunctionService.registerFunction(membersForRegionFunction); Set<DistributedMember> targetMembers = CliUtil.getAllMembers(cache); @@ -786,9 +730,7 @@ public class CliUtil { } if (object != null) { Map<String, String> memberDetails = (Map<String, String>) object; - Iterator<Entry<String, String>> it = memberDetails.entrySet().iterator(); - while (it.hasNext()) { - Entry<String, String> entry = it.next(); + for (Entry<String, String> entry : memberDetails.entrySet()) { Set<DistributedMember> dsMems = CliUtil.getAllMembers(cache); for (DistributedMember mem : dsMems) { if (mem.getId().equals(entry.getKey())) { @@ -802,7 +744,6 @@ public class CliUtil { } } catch (Exception ex) { LogWrapper.getInstance().warning("getMembersForeRegionViaFunction exception " + ex); - continue; } } return regionMembers; http://git-wip-us.apache.org/repos/asf/geode/blob/fb9a405f/geode-core/src/main/java/org/apache/geode/management/internal/cli/CommandResponseBuilder.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/CommandResponseBuilder.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/CommandResponseBuilder.java index 3f8f20d..790e54b 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/CommandResponseBuilder.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/CommandResponseBuilder.java @@ -27,31 +27,16 @@ import org.apache.geode.management.internal.cli.result.CommandResult; public class CommandResponseBuilder { public static CommandResponse prepareCommandResponse(String memberName, CommandResult result) { - GfJsonObject content = null; - try { - content = result.getContent(); - } catch (GfJsonException e) { - try { - content = new GfJsonObject(e.getMessage()); - } catch (GfJsonException e1) { - content = new GfJsonObject(); - } - } - return new CommandResponse(memberName, // sender - getType(result), // contentType - result.getStatus().getCode(), // status code - "1/1", // page --- TODO - Abhishek - define a scrollable ResultData - CliMetaData.ANNOTATION_NULL_VALUE, // tokenAccessor for next results - getDebugInfo(result), // debugData - result.getHeader(), // header - content, // content - result.getFooter(), // footer - result.failedToPersist()); // failed to persist + GfJsonObject content; + content = result.getContent(); + return new CommandResponse(memberName, getType(result), result.getStatus().getCode(), "1/1", + CliMetaData.ANNOTATION_NULL_VALUE, getDebugInfo(result), result.getHeader(), content, + result.getFooter(), result.failedToPersist()); } // De-serializing to CommandResponse public static CommandResponse prepareCommandResponseFromJson(String jsonString) { - GfJsonObject jsonObject = null; + GfJsonObject jsonObject; try { jsonObject = new GfJsonObject(jsonString); } catch (GfJsonException e) { http://git-wip-us.apache.org/repos/asf/geode/blob/fb9a405f/geode-core/src/main/java/org/apache/geode/management/internal/cli/Launcher.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/Launcher.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/Launcher.java index 157bb91..a22f615 100755 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/Launcher.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/Launcher.java @@ -14,7 +14,6 @@ */ package org.apache.geode.management.internal.cli; -import java.io.IOException; import java.io.PrintStream; import java.util.HashSet; import java.util.List; @@ -94,7 +93,7 @@ public class Launcher { protected Launcher() { this.startupTimeLogHelper = new StartupTimeLogHelper(); - this.allowedCommandLineCommands = new HashSet<String>(); + this.allowedCommandLineCommands = new HashSet<>(); this.allowedCommandLineCommands.add(CliStrings.RUN); this.allowedCommandLineCommands.add(CliStrings.START_PULSE); this.allowedCommandLineCommands.add(CliStrings.START_JCONSOLE); @@ -141,10 +140,6 @@ public class Launcher { try { gfsh = Gfsh.getInstance(false, args, new GfshConfig()); this.startupTimeLogHelper.logStartupTime(); - } catch (ClassNotFoundException cnfex) { - log(cnfex, gfsh); - } catch (IOException ioex) { - log(ioex, gfsh); } catch (IllegalStateException isex) { System.err.println("ERROR : " + isex.getMessage()); } @@ -208,10 +203,6 @@ public class Launcher { try { gfsh = Gfsh.getInstance(launchShell, args, new GfshConfig()); this.startupTimeLogHelper.logStartupTime(); - } catch (ClassNotFoundException cnfex) { - log(cnfex, gfsh); - } catch (IOException ioex) { - log(ioex, gfsh); } catch (IllegalStateException isex) { System.err.println("ERROR : " + isex.getMessage()); } http://git-wip-us.apache.org/repos/asf/geode/blob/fb9a405f/geode-core/src/main/java/org/apache/geode/management/internal/cli/LogWrapper.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/LogWrapper.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/LogWrapper.java index 6aa4f74..2cd15f4 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/LogWrapper.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/LogWrapper.java @@ -16,12 +16,12 @@ package org.apache.geode.management.internal.cli; import java.io.IOException; import java.io.PrintWriter; +import java.io.StringWriter; import java.text.BreakIterator; import java.text.SimpleDateFormat; import java.util.Date; import java.util.logging.ConsoleHandler; import java.util.logging.FileHandler; -import java.util.logging.Filter; import java.util.logging.Formatter; import java.util.logging.Handler; import java.util.logging.Level; @@ -41,7 +41,7 @@ import org.apache.geode.management.internal.cli.shell.GfshConfig; */ public class LogWrapper { private static Object INSTANCE_LOCK = new Object(); - private volatile static LogWrapper INSTANCE = null; + private static volatile LogWrapper INSTANCE = null; private Logger logger; @@ -50,15 +50,9 @@ public class LogWrapper { Cache cache = CliUtil.getCacheIfExists(); if (cache != null && !cache.isClosed()) { - // TODO - Abhishek how to set different log levels for different handlers??? logger.addHandler(cache.getLogger().getHandler()); CommandResponseWriterHandler handler = new CommandResponseWriterHandler(); - handler.setFilter(new Filter() { - @Override - public boolean isLoggable(LogRecord record) { - return record.getLevel().intValue() >= Level.FINE.intValue(); - } - }); + handler.setFilter(record -> record.getLevel().intValue() >= Level.FINE.intValue()); handler.setLevel(Level.FINE); logger.addHandler(handler); } @@ -81,14 +75,12 @@ public class LogWrapper { if (config.isLoggingEnabled()) { try { FileHandler fileHandler = new FileHandler(config.getLogFilePath(), - config.getLogFileSizeLimit(), config.getLogFileCount(), true /* append */); + config.getLogFileSizeLimit(), config.getLogFileCount(), true); fileHandler.setFormatter(new GemFireFormatter()); fileHandler.setLevel(config.getLogLevel()); logger.addHandler(fileHandler); logger.setLevel(config.getLogLevel()); - } catch (SecurityException e) { - addDefaultConsoleHandler(logger, e.getMessage(), config.getLogFilePath()); - } catch (IOException e) { + } catch (SecurityException | IOException e) { addDefaultConsoleHandler(logger, e.getMessage(), config.getLogFilePath()); } } @@ -164,8 +156,7 @@ public class LogWrapper { return logger.getLevel(); } - // TODO - Abhishek - ideally shouldn't be exposed outside. - /* package */ Logger getLogger() { + Logger getLogger() { return logger; } @@ -185,19 +176,6 @@ public class LogWrapper { } } - // TODO - Abhishek - Check whether we can use GemFireLevel.ERROR - // public boolean errorEnabled() { - // return severeEnabled(); - // } - // - // public void error(String message) { - // logger.severe(message); - // } - // - // public void error(String message, Throwable t) { - // logger.log(Level.SEVERE, message, t); - // } - public boolean warningEnabled() { return logger.isLoggable(Level.WARNING); } @@ -298,15 +276,14 @@ public class LogWrapper { * * @since GemFire 7.0 */ - // Formatter code "copied" from LogWriterImpl static class GemFireFormatter extends Formatter { - private final static String FORMAT = "yyyy/MM/dd HH:mm:ss.SSS z"; + private static final String FORMAT = "yyyy/MM/dd HH:mm:ss.SSS z"; private SimpleDateFormat sdf = new SimpleDateFormat(FORMAT); @Override public synchronized String format(LogRecord record) { - java.io.StringWriter sw = new java.io.StringWriter(); + StringWriter sw = new StringWriter(); PrintWriter pw = new PrintWriter(sw); pw.println(); @@ -348,10 +325,9 @@ public class LogWrapper { pw.close(); try { sw.close(); - } catch (java.io.IOException ignore) { + } catch (IOException ignore) { } - String result = sw.toString(); - return result; + return sw.toString(); } private void formatText(PrintWriter writer, String target, int initialLength) { http://git-wip-us.apache.org/repos/asf/geode/blob/fb9a405f/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ConnectCommand.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ConnectCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ConnectCommand.java index d0f2e5a..a75eeb0 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ConnectCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ConnectCommand.java @@ -22,14 +22,13 @@ import static org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_S import java.io.File; import java.io.FileInputStream; import java.io.IOException; -import java.net.MalformedURLException; import java.security.KeyStore; +import java.security.SecureRandom; import java.util.Arrays; import java.util.Map; import java.util.Objects; import java.util.Properties; -import javax.net.ssl.HostnameVerifier; import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.KeyManagerFactory; import javax.net.ssl.SSLContext; @@ -69,9 +68,9 @@ import org.apache.geode.security.AuthenticationFailedException; public class ConnectCommand implements GfshCommand { // millis that connect --locator will wait for a response from the locator. - public final static int CONNECT_LOCATOR_TIMEOUT_MS = 60000; // see bug 45971 + static final int CONNECT_LOCATOR_TIMEOUT_MS = 60000; // see bug 45971 - static UserInputProperty[] USERINPUTPROPERTIES = + private static UserInputProperty[] USERINPUTPROPERTIES = {UserInputProperty.KEYSTORE, UserInputProperty.KEYSTORE_PASSWORD, UserInputProperty.KEYSTORE_TYPE, UserInputProperty.TRUSTSTORE, UserInputProperty.TRUSTSTORE_PASSWORD, UserInputProperty.TRUSTSTORE_TYPE, @@ -117,8 +116,7 @@ public class ConnectCommand implements GfshCommand { help = CliStrings.CONNECT__USE_SSL__HELP) boolean useSsl, @CliOption(key = {"skip-ssl-validation"}, specifiedDefaultValue = "true", unspecifiedDefaultValue = "false", - help = "When connecting via HTTP, connects using 1-way SSL validation rather than 2-way SSL validation.") boolean skipSslValidation) - throws MalformedURLException { + help = "When connecting via HTTP, connects using 1-way SSL validation rather than 2-way SSL validation.") boolean skipSslValidation) { Result result; Gfsh gfsh = getGfsh(); @@ -213,10 +211,7 @@ public class ConnectCommand implements GfshCommand { } boolean isSslImpliedBySslOptions(String... sslOptions) { - if (sslOptions == null) { - return false; - } - return Arrays.stream(sslOptions).anyMatch(Objects::nonNull); + return sslOptions != null && Arrays.stream(sslOptions).anyMatch(Objects::nonNull); } Properties loadProperties(File... files) { @@ -279,25 +274,22 @@ public class ConnectCommand implements GfshCommand { return ResultBuilder.createInfoResult( CliStrings.format(CliStrings.CONNECT__MSG__SUCCESS, operationInvoker.toString())); - } catch (Exception e) { - // all other exceptions, just logs it and returns a connection error - if (!(e instanceof SecurityException) && !(e instanceof AuthenticationFailedException)) { - return handleExcpetion(e, null); - } - - // if it's security exception, and we already sent in username and password, still retuns the + } catch (SecurityException | AuthenticationFailedException e) { + // if it's security exception, and we already sent in username and password, still returns the // connection error if (gfProperties.containsKey(ResourceConstants.USER_NAME)) { - return handleExcpetion(e, null); + return handleException(e); } - // otherwise, prompt for username and password and retry the conenction + // otherwise, prompt for username and password and retry the connection gfProperties.setProperty(UserInputProperty.USERNAME.getKey(), UserInputProperty.USERNAME.promptForAcceptableValue(gfsh)); gfProperties.setProperty(UserInputProperty.PASSWORD.getKey(), UserInputProperty.PASSWORD.promptForAcceptableValue(gfsh)); return httpConnect(gfProperties, url); - + } catch (Exception e) { + // all other exceptions, just logs it and returns a connection error + return handleException(e); } finally { Gfsh.redirectInternalJavaLoggers(); } @@ -358,25 +350,22 @@ public class ConnectCommand implements GfshCommand { LogWrapper.getInstance().info(CliStrings.format(CliStrings.CONNECT__MSG__SUCCESS, jmxHostPortToConnect.toString(false))); return ResultBuilder.buildResult(infoResultData); - } catch (Exception e) { - // all other exceptions, just logs it and returns a connection error - if (!(e instanceof SecurityException) && !(e instanceof AuthenticationFailedException)) { - return handleExcpetion(e, jmxHostPortToConnect); - } - + } catch (SecurityException | AuthenticationFailedException e) { // if it's security exception, and we already sent in username and password, still returns the // connection error if (gfProperties.containsKey(ResourceConstants.USER_NAME)) { - return handleExcpetion(e, jmxHostPortToConnect); + return handleException(e, jmxHostPortToConnect); } - // otherwise, prompt for username and password and retry the conenction + // otherwise, prompt for username and password and retry the connection gfProperties.setProperty(UserInputProperty.USERNAME.getKey(), UserInputProperty.USERNAME.promptForAcceptableValue(gfsh)); gfProperties.setProperty(UserInputProperty.PASSWORD.getKey(), UserInputProperty.PASSWORD.promptForAcceptableValue(gfsh)); return jmxConnect(gfProperties, useSsl, jmxHostPortToConnect, null, true); - + } catch (Exception e) { + // all other exceptions, just logs it and returns a connection error + return handleException(e, jmxHostPortToConnect); } finally { Gfsh.redirectInternalJavaLoggers(); } @@ -448,7 +437,7 @@ public class ConnectCommand implements GfshCommand { ssl.init(keyManagerFactory != null ? keyManagerFactory.getKeyManagers() : null, trustManagerFactory != null ? trustManagerFactory.getTrustManagers() : null, - new java.security.SecureRandom()); + new SecureRandom()); HttpsURLConnection.setDefaultSSLSocketFactory(ssl.getSocketFactory()); } finally { @@ -461,13 +450,20 @@ public class ConnectCommand implements GfshCommand { } } - private Result handleExcpetion(Exception e, ConnectionEndpoint hostPortToConnect) { - String errorMessage = e.getMessage(); - if (hostPortToConnect != null) { - errorMessage = CliStrings.format(CliStrings.CONNECT__MSG__ERROR, - hostPortToConnect.toString(false), e.getMessage()); - } + private Result handleException(Exception e) { + return handleException(e, e.getMessage()); + } + + private Result handleException(Exception e, String errorMessage) { LogWrapper.getInstance().severe(errorMessage, e); return ResultBuilder.createConnectionErrorResult(errorMessage); } + + private Result handleException(Exception e, ConnectionEndpoint hostPortToConnect) { + if (hostPortToConnect == null) { + return handleException(e); + } + return handleException(e, CliStrings.format(CliStrings.CONNECT__MSG__ERROR, + hostPortToConnect.toString(false), e.getMessage())); + } } http://git-wip-us.apache.org/repos/asf/geode/blob/fb9a405f/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShellCommands.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShellCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShellCommands.java index d2f9371..fca84a7 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShellCommands.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShellCommands.java @@ -44,6 +44,7 @@ import org.apache.geode.management.cli.Result; import org.apache.geode.management.internal.cli.CliUtil; import org.apache.geode.management.internal.cli.GfshParser; import org.apache.geode.management.internal.cli.LogWrapper; +import org.apache.geode.management.internal.cli.converters.RegionPathConverter; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.ErrorResultData; import org.apache.geode.management.internal.cli.result.InfoResultData; @@ -159,7 +160,7 @@ public class ShellCommands implements GfshCommand { @CliCommand(value = {CliStrings.EXIT, "quit"}, help = CliStrings.EXIT__HELP) @CliMetaData(shellOnly = true, relatedTopic = {CliStrings.TOPIC_GFSH}) - public ExitShellRequest exit() throws IOException { + public ExitShellRequest exit() { Gfsh gfshInstance = getGfsh(); gfshInstance.stop(); @@ -179,7 +180,7 @@ public class ShellCommands implements GfshCommand { @CliMetaData(shellOnly = true, relatedTopic = {CliStrings.TOPIC_GFSH, CliStrings.TOPIC_GEODE_JMX, CliStrings.TOPIC_GEODE_MANAGER}) public Result disconnect() { - Result result = null; + Result result; if (getGfsh() != null && !getGfsh().isConnectedAndReady()) { result = ResultBuilder.createInfoResult("Not connected."); @@ -195,8 +196,7 @@ public class ShellCommands implements GfshCommand { operationInvoker.toString())); LogWrapper.getInstance().info(CliStrings.format(CliStrings.DISCONNECT__MSG__DISCONNECTED, operationInvoker.toString())); - gfshInstance.setPromptPath( - org.apache.geode.management.internal.cli.converters.RegionPathConverter.DEFAULT_APP_CONTEXT_PATH); + gfshInstance.setPromptPath(RegionPathConverter.DEFAULT_APP_CONTEXT_PATH); } else { infoResultData.addLine(CliStrings.DISCONNECT__MSG__NOTCONNECTED); } @@ -213,13 +213,12 @@ public class ShellCommands implements GfshCommand { @CliCommand(value = {CliStrings.DESCRIBE_CONNECTION}, help = CliStrings.DESCRIBE_CONNECTION__HELP) @CliMetaData(shellOnly = true, relatedTopic = {CliStrings.TOPIC_GFSH, CliStrings.TOPIC_GEODE_JMX}) public Result describeConnection() { - Result result = null; + Result result; try { TabularResultData tabularResultData = ResultBuilder.createTabularResultData(); Gfsh gfshInstance = getGfsh(); if (gfshInstance.isConnectedAndReady()) { OperationInvoker operationInvoker = gfshInstance.getOperationInvoker(); - // tabularResultData.accumulate("Monitored GemFire DS", operationInvoker.toString()); tabularResultData.accumulate("Connection Endpoints", operationInvoker.toString()); } else { tabularResultData.accumulate("Connection Endpoints", "Not connected"); @@ -238,7 +237,7 @@ public class ShellCommands implements GfshCommand { @CliMetaData(shellOnly = true, relatedTopic = {CliStrings.TOPIC_GFSH}) public Result echo(@CliOption(key = {CliStrings.ECHO__STR, ""}, specifiedDefaultValue = "", mandatory = true, help = CliStrings.ECHO__STR__HELP) String stringToEcho) { - Result result = null; + Result result; if (stringToEcho.equals("$*")) { Gfsh gfshInstance = getGfsh(); @@ -256,10 +255,8 @@ public class ShellCommands implements GfshCommand { TabularResultData buildResultForEcho(Set<Entry<String, String>> propertyMap) { TabularResultData resultData = ResultBuilder.createTabularResultData(); - Iterator<Entry<String, String>> it = propertyMap.iterator(); - while (it.hasNext()) { - Entry<String, String> setEntry = it.next(); + for (Entry<String, String> setEntry : propertyMap) { resultData.accumulate("Property", setEntry.getKey()); resultData.accumulate("Value", String.valueOf(setEntry.getValue())); } @@ -273,7 +270,7 @@ public class ShellCommands implements GfshCommand { help = CliStrings.SET_VARIABLE__VAR__HELP) String var, @CliOption(key = CliStrings.SET_VARIABLE__VALUE, mandatory = true, help = CliStrings.SET_VARIABLE__VALUE__HELP) String value) { - Result result = null; + Result result; try { getGfsh().setEnvProperty(var, String.valueOf(value)); result = @@ -329,7 +326,7 @@ public class ShellCommands implements GfshCommand { } else { // Process file option Gfsh gfsh = Gfsh.getCurrentInstance(); - ErrorResultData errorResultData = null; + ErrorResultData errorResultData; StringBuilder contents = new StringBuilder(); Writer output = null; @@ -344,7 +341,7 @@ public class ShellCommands implements GfshCommand { while (it.hasNext()) { String line = it.next().toString(); - if (line.isEmpty() == false) { + if (!line.isEmpty()) { if (flagForLineNumbers) { lineNumber++; contents.append(String.format("%" + historySizeWordLength + "s ", lineNumber)); @@ -429,7 +426,7 @@ public class ShellCommands implements GfshCommand { @CliOption(key = {CliStrings.RUN__CONTINUEONERROR}, specifiedDefaultValue = "true", unspecifiedDefaultValue = "false", help = CliStrings.RUN__CONTINUEONERROR__HELP) boolean continueOnError) { - Result result = null; + Result result; Gfsh gfsh = Gfsh.getCurrentInstance(); try { @@ -457,7 +454,7 @@ public class ShellCommands implements GfshCommand { try { LogWrapper.getInstance().fine("Sleeping for " + time + "seconds."); Thread.sleep(Math.round(time * 1000)); - } catch (InterruptedException ignorable) { + } catch (InterruptedException ignored) { } return ResultBuilder.createInfoResult(""); } @@ -470,15 +467,11 @@ public class ShellCommands implements GfshCommand { @CliOption(key = CliStrings.SH__USE_CONSOLE, specifiedDefaultValue = "true", unspecifiedDefaultValue = "false", help = CliStrings.SH__USE_CONSOLE__HELP) boolean useConsole) { - Result result = null; + Result result; try { result = ResultBuilder.buildResult(executeCommand(Gfsh.getCurrentInstance(), command, useConsole)); - } catch (IllegalStateException e) { - result = ResultBuilder.createUserErrorResult(e.getMessage()); - LogWrapper.getInstance() - .warning("Unable to execute command \"" + command + "\". Reason:" + e.getMessage() + "."); - } catch (IOException e) { + } catch (IllegalStateException | IOException e) { result = ResultBuilder.createUserErrorResult(e.getMessage()); LogWrapper.getInstance() .warning("Unable to execute command \"" + command + "\". Reason:" + e.getMessage() + "."); http://git-wip-us.apache.org/repos/asf/geode/blob/fb9a405f/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowMetricsCommand.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowMetricsCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowMetricsCommand.java index 6236b38..7db3155 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowMetricsCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowMetricsCommand.java @@ -396,9 +396,6 @@ public class ShowMetricsCommand implements GfshCommand { csvBuilder); writeToTableAndCsv(metricsTable, "", "putAllAvgLatency", memberMxBean.getPutAllAvgLatency(), csvBuilder); - // Not available from stats. After Stats re-org it will be available - // writeToTableAndCsv(metricsTable, "", "getAllAvgLatency", - // memberMxBean.getGetAllAvgLatency(), csvBuilder); writeToTableAndCsv(metricsTable, "", "totalMissCount", memberMxBean.getTotalMissCount(), csvBuilder); writeToTableAndCsv(metricsTable, "", "totalHitCount", memberMxBean.getTotalHitCount(), http://git-wip-us.apache.org/repos/asf/geode/blob/fb9a405f/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartMemberUtils.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartMemberUtils.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartMemberUtils.java index 3e1053a..44d32a4 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartMemberUtils.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartMemberUtils.java @@ -29,6 +29,7 @@ import java.util.Properties; import javax.management.MalformedObjectNameException; import org.apache.commons.lang.ArrayUtils; +import org.apache.commons.lang.StringUtils; import org.apache.geode.distributed.internal.DistributionConfig; import org.apache.geode.internal.GemFireVersion; @@ -102,7 +103,7 @@ public class StartMemberUtils { for (final Object property : gemfireProperties.keySet()) { final String propertyName = property.toString(); final String propertyValue = gemfireProperties.getProperty(propertyName); - if (org.apache.geode.internal.lang.StringUtils.isNotBlank(propertyValue)) { + if (StringUtils.isNotBlank(propertyValue)) { commandLine.add( "-D" + DistributionConfig.GEMFIRE_PREFIX + "" + propertyName + "=" + propertyValue); } @@ -117,26 +118,24 @@ public class StartMemberUtils { } static void addInitialHeap(final List<String> commandLine, final String initialHeap) { - if (org.apache.geode.internal.lang.StringUtils.isNotBlank(initialHeap)) { + if (StringUtils.isNotBlank(initialHeap)) { commandLine.add("-Xms" + initialHeap); } } static void addMaxHeap(final List<String> commandLine, final String maxHeap) { - if (org.apache.geode.internal.lang.StringUtils.isNotBlank(maxHeap)) { + if (StringUtils.isNotBlank(maxHeap)) { commandLine.add("-Xmx" + maxHeap); commandLine.add("-XX:+UseConcMarkSweepGC"); commandLine.add("-XX:CMSInitiatingOccupancyFraction=" + CMS_INITIAL_OCCUPANCY_FRACTION); - // commandLine.add("-XX:MinHeapFreeRatio=" + MINIMUM_HEAP_FREE_RATIO); } } static void addCurrentLocators(GfshCommand gfshCommand, final List<String> commandLine, final Properties gemfireProperties) throws MalformedObjectNameException { - if (org.apache.geode.internal.lang.StringUtils - .isBlank(gemfireProperties.getProperty(LOCATORS))) { + if (StringUtils.isBlank(gemfireProperties.getProperty(LOCATORS))) { String currentLocators = getCurrentLocators(gfshCommand); - if (org.apache.geode.internal.lang.StringUtils.isNotBlank(currentLocators)) { + if (StringUtils.isNotBlank(currentLocators)) { commandLine.add("-D".concat(ProcessLauncherContext.OVERRIDDEN_DEFAULTS_PREFIX) .concat(LOCATORS).concat("=").concat(currentLocators)); } @@ -209,9 +208,8 @@ public class StartMemberUtils { // System CLASSPATH environment variable setting, which is consistent with the Java platform // behavior... for (String userClasspath : userClasspaths) { - if (org.apache.geode.internal.lang.StringUtils.isNotBlank(userClasspath)) { - classpath.append((classpath.length() == 0) - ? org.apache.geode.internal.lang.StringUtils.EMPTY : File.pathSeparator); + if (StringUtils.isNotBlank(userClasspath)) { + classpath.append((classpath.length() == 0) ? StringUtils.EMPTY : File.pathSeparator); classpath.append(userClasspath); } } @@ -227,9 +225,8 @@ public class StartMemberUtils { // And finally, include all GemFire dependencies on the CLASSPATH... for (String jarFilePathname : jarFilePathnames) { - if (org.apache.geode.internal.lang.StringUtils.isNotBlank(jarFilePathname)) { - classpath.append((classpath.length() == 0) - ? org.apache.geode.internal.lang.StringUtils.EMPTY : File.pathSeparator); + if (StringUtils.isNotBlank(jarFilePathname)) { + classpath.append((classpath.length() == 0) ? StringUtils.EMPTY : File.pathSeparator); classpath.append(jarFilePathname); } } @@ -240,7 +237,6 @@ public class StartMemberUtils { String classpath = getSystemClasspath(); String gemfireJarPath = GEODE_JAR_PATHNAME; for (String classpathElement : classpath.split(File.pathSeparator)) { - // MUST CHANGE THIS TO REGEX SINCE VERSION CHANGES IN JAR NAME if (classpathElement.endsWith("gemfire-core-8.2.0.0-SNAPSHOT.jar")) { gemfireJarPath = classpathElement; break;
