http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/GfshConfig.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/GfshConfig.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/GfshConfig.java index c35f420..3c368c5 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/GfshConfig.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/GfshConfig.java @@ -14,12 +14,12 @@ */ package org.apache.geode.management.internal.cli.shell; +import org.apache.commons.lang.StringUtils; +import org.apache.geode.internal.util.IOUtils; + import java.io.File; import java.util.logging.Level; -import org.apache.geode.internal.lang.StringUtils; -import org.apache.geode.internal.util.IOUtils; - /** * * @since GemFire 7.0
http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/GfshExecutionStrategy.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/GfshExecutionStrategy.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/GfshExecutionStrategy.java index 7c80e0d..2b39bed 100755 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/GfshExecutionStrategy.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/GfshExecutionStrategy.java @@ -16,6 +16,7 @@ package org.apache.geode.management.internal.cli.shell; import static org.apache.geode.management.internal.cli.multistep.CLIMultiStepHelper.execCLISteps; +import org.apache.commons.lang.StringUtils; import org.apache.geode.internal.ClassPathLoader; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.CommandProcessingException; @@ -101,10 +102,7 @@ public class GfshExecutionStrategy implements ExecutionStrategy { } catch (NotAuthorizedException e) { result = ResultBuilder .createGemFireUnAuthorizedErrorResult("Unauthorized. Reason: " + e.getMessage()); - } catch (JMXInvocationException e) { - Gfsh.getCurrentInstance().logWarning(e.getMessage(), e); - } catch (IllegalStateException e) { - // Shouldn't occur - we are always using GfsParseResult + } catch (JMXInvocationException | IllegalStateException e) { Gfsh.getCurrentInstance().logWarning(e.getMessage(), e); } catch (CommandProcessingException e) { Gfsh.getCurrentInstance().logWarning(e.getMessage(), null); @@ -204,11 +202,7 @@ public class GfshExecutionStrategy implements ExecutionStrategy { try { interceptor = (CliAroundInterceptor) ClassPathLoader.getLatest().forName(interceptorClass) .newInstance(); - } catch (InstantiationException e) { - shell.logWarning("Configuration error", e); - } catch (IllegalAccessException e) { - shell.logWarning("Configuration error", e); - } catch (ClassNotFoundException e) { + } catch (InstantiationException | ClassNotFoundException | IllegalAccessException e) { shell.logWarning("Configuration error", e); } if (interceptor != null) { @@ -247,7 +241,7 @@ public class GfshExecutionStrategy implements ExecutionStrategy { + "Please check manager logs for error."); } - // the response could be a string which is a json respresentation of the CommandResult object + // the response could be a string which is a json representation of the CommandResult object // it can also be a Path to a temp file downloaded from the rest http request if (response instanceof String) { CommandResponse commandResponse = @@ -259,7 +253,7 @@ public class GfshExecutionStrategy implements ExecutionStrategy { } String debugInfo = commandResponse.getDebugInfo(); - if (debugInfo != null && !debugInfo.trim().isEmpty()) { + if (StringUtils.isNotBlank(debugInfo)) { // TODO - Abhishek When debug is ON, log response in gfsh logs // TODO - Abhishek handle \n better. Is it coming from GemFire formatter debugInfo = debugInfo.replaceAll("\n\n\n", "\n"); http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/JmxOperationInvoker.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/JmxOperationInvoker.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/JmxOperationInvoker.java index e9d183e..7ae7c3b 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/JmxOperationInvoker.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/JmxOperationInvoker.java @@ -17,8 +17,8 @@ package org.apache.geode.management.internal.cli.shell; import static org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_PREFIX; import static org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_SSL_PREFIX; +import org.apache.commons.lang.StringUtils; import org.apache.geode.distributed.internal.DistributionConfig; -import org.apache.geode.internal.lang.StringUtils; import org.apache.geode.internal.util.ArrayUtils; import org.apache.geode.internal.util.IOUtils; import org.apache.geode.management.DistributedSystemMXBean; @@ -192,7 +192,7 @@ public class JmxOperationInvoker implements OperationInvoker { URL gfSecurityPropertiesUrl = null; // Case 1: User has specified gfSecurity properties file - if (!StringUtils.isBlank(gfSecurityPropertiesPathToUse)) { + if (StringUtils.isNotBlank(gfSecurityPropertiesPathToUse)) { // User specified gfSecurity properties doesn't exist if (!IOUtils.isExistingPathname(gfSecurityPropertiesPathToUse)) { gfshInstance http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/CommandStringBuilder.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/CommandStringBuilder.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/CommandStringBuilder.java index 4410fea..cfb8a24 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/CommandStringBuilder.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/CommandStringBuilder.java @@ -14,7 +14,7 @@ */ package org.apache.geode.management.internal.cli.util; -import org.apache.geode.internal.lang.StringUtils; +import org.apache.commons.lang.StringUtils; import org.apache.geode.internal.lang.SystemUtils; import org.apache.geode.management.internal.cli.GfshParser; @@ -59,7 +59,7 @@ public class CommandStringBuilder { } public CommandStringBuilder addOptionWithValueCheck(String option, String value) { - if (!StringUtils.isBlank(value)) { + if (StringUtils.isNotBlank(value)) { return addOption(option, value); } return this; http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java index 0dbe7e5..00902a9 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/domain/XmlEntity.java @@ -14,6 +14,25 @@ */ package org.apache.geode.management.internal.configuration.domain; +import org.apache.commons.lang.StringUtils; +import org.apache.geode.DataSerializer; +import org.apache.geode.InternalGemFireError; +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.CacheFactory; +import org.apache.geode.internal.Assert; +import org.apache.geode.internal.Version; +import org.apache.geode.internal.VersionedDataSerializable; +import org.apache.geode.internal.cache.xmlcache.CacheXml; +import org.apache.geode.internal.cache.xmlcache.CacheXmlGenerator; +import org.apache.geode.internal.logging.LogService; +import org.apache.geode.management.internal.configuration.utils.XmlUtils; +import org.apache.geode.management.internal.configuration.utils.XmlUtils.XPathContext; +import org.apache.logging.log4j.Logger; +import org.w3c.dom.Document; +import org.w3c.dom.Node; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; + import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; @@ -24,32 +43,11 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; import java.util.Map.Entry; - import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerFactoryConfigurationError; import javax.xml.xpath.XPathExpressionException; -import org.apache.geode.internal.Assert; -import org.apache.geode.internal.Version; -import org.apache.geode.internal.VersionedDataSerializable; -import org.apache.logging.log4j.Logger; -import org.w3c.dom.Document; -import org.w3c.dom.Node; -import org.xml.sax.InputSource; -import org.xml.sax.SAXException; - -import org.apache.geode.DataSerializer; -import org.apache.geode.InternalGemFireError; -import org.apache.geode.cache.Cache; -import org.apache.geode.cache.CacheFactory; -import org.apache.geode.internal.cache.xmlcache.CacheXml; -import org.apache.geode.internal.cache.xmlcache.CacheXmlGenerator; -import org.apache.geode.internal.lang.StringUtils; -import org.apache.geode.internal.logging.LogService; -import org.apache.geode.management.internal.configuration.utils.XmlUtils; -import org.apache.geode.management.internal.configuration.utils.XmlUtils.XPathContext; - /**** * Domain class for defining a GemFire entity in XML. * @@ -156,13 +154,13 @@ public class XmlEntity implements VersionedDataSerializable { StringBuffer sb = new StringBuffer(); sb.append("//").append(this.prefix).append(':').append(this.parentType); - if (!StringUtils.isBlank(parentKey) && !StringUtils.isBlank(parentValue)) { + if (StringUtils.isNotBlank(parentKey) && StringUtils.isNotBlank(parentValue)) { sb.append("[@").append(parentKey).append("='").append(parentValue).append("']"); } sb.append("/").append(childPrefix).append(':').append(this.type); - if (!StringUtils.isBlank(childKey) && !StringUtils.isBlank(childValue)) { + if (StringUtils.isNotBlank(childKey) && StringUtils.isNotBlank(childValue)) { sb.append("[@").append(childKey).append("='").append(childValue).append("']"); } this.searchString = sb.toString(); @@ -175,9 +173,9 @@ public class XmlEntity implements VersionedDataSerializable { * @since GemFire 8.1 */ private void init() { - Assert.assertTrue(!StringUtils.isBlank(type)); - Assert.assertTrue(!StringUtils.isBlank(prefix)); - Assert.assertTrue(!StringUtils.isBlank(namespace)); + Assert.assertTrue(StringUtils.isNotBlank(type)); + Assert.assertTrue(StringUtils.isNotBlank(prefix)); + Assert.assertTrue(StringUtils.isNotBlank(namespace)); Assert.assertTrue(attributes != null); if (null == xmlDefinition) { http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/messages/ConfigurationRequest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/messages/ConfigurationRequest.java b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/messages/ConfigurationRequest.java index 837d99e..ac5e99a 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/messages/ConfigurationRequest.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/messages/ConfigurationRequest.java @@ -14,18 +14,16 @@ */ package org.apache.geode.management.internal.configuration.messages; +import org.apache.commons.lang.StringUtils; +import org.apache.geode.internal.DataSerializableFixedID; +import org.apache.geode.internal.Version; + import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; import java.util.Set; -import org.apache.geode.internal.DataSerializableFixedID; -import org.apache.geode.internal.Version; -import org.apache.geode.internal.lang.StringUtils; - /*** * Request sent by a member to the locator requesting the shared configuration * @@ -50,7 +48,7 @@ public class ConfigurationRequest implements DataSerializableFixedID { } public void addGroups(String group) { - if (!StringUtils.isBlank(group)) + if (StringUtils.isNotBlank(group)) this.groups.add(group); } http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/messages/ConfigurationResponse.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/messages/ConfigurationResponse.java b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/messages/ConfigurationResponse.java index 3248c98..cb9951f 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/messages/ConfigurationResponse.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/messages/ConfigurationResponse.java @@ -14,6 +14,15 @@ */ package org.apache.geode.management.internal.configuration.messages; +import org.apache.commons.lang.StringUtils; +import org.apache.geode.DataSerializer; +import org.apache.geode.InternalGemFireError; +import org.apache.geode.internal.DataSerializableFixedID; +import org.apache.geode.internal.Version; +import org.apache.geode.management.internal.configuration.domain.Configuration; +import org.apache.geode.management.internal.configuration.utils.XmlUtils; +import org.xml.sax.SAXException; + import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; @@ -22,21 +31,10 @@ import java.util.Iterator; import java.util.Map; import java.util.Map.Entry; import java.util.Set; - import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerFactoryConfigurationError; -import org.xml.sax.SAXException; - -import org.apache.geode.DataSerializer; -import org.apache.geode.InternalGemFireError; -import org.apache.geode.internal.DataSerializableFixedID; -import org.apache.geode.internal.Version; -import org.apache.geode.internal.lang.StringUtils; -import org.apache.geode.management.internal.configuration.domain.Configuration; -import org.apache.geode.management.internal.configuration.utils.XmlUtils; - /*** * Response containing the configuration requested by the {@link ConfigurationRequest} */ @@ -127,7 +125,7 @@ public class ConfigurationResponse implements DataSerializableFixedID { try { String cacheXmlContent = config.getCacheXmlContent(); - if (!StringUtils.isBlank(cacheXmlContent)) { + if (StringUtils.isNotBlank(cacheXmlContent)) { sb.append("\n" + XmlUtils.prettyXml(cacheXmlContent)); } } catch (IOException | TransformerFactoryConfigurationError | TransformerException http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/utils/XmlUtils.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/utils/XmlUtils.java b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/utils/XmlUtils.java index 218762c..f86b9a3 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/configuration/utils/XmlUtils.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/configuration/utils/XmlUtils.java @@ -14,12 +14,24 @@ */ package org.apache.geode.management.internal.configuration.utils; -import static org.apache.geode.management.internal.configuration.utils.XmlConstants.W3C_XML_SCHEMA_INSTANCE_ATTRIBUTE_SCHEMA_LOCATION; -import static org.apache.geode.management.internal.configuration.utils.XmlConstants.W3C_XML_SCHEMA_INSTANCE_PREFIX; import static javax.xml.XMLConstants.NULL_NS_URI; import static javax.xml.XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI; +import static org.apache.geode.management.internal.configuration.utils.XmlConstants.W3C_XML_SCHEMA_INSTANCE_ATTRIBUTE_SCHEMA_LOCATION; +import static org.apache.geode.management.internal.configuration.utils.XmlConstants.W3C_XML_SCHEMA_INSTANCE_PREFIX; + +import org.apache.commons.lang.StringUtils; +import org.apache.geode.internal.cache.xmlcache.CacheXml; +import org.apache.geode.internal.cache.xmlcache.CacheXmlParser; +import org.apache.geode.management.internal.configuration.domain.CacheElement; +import org.apache.geode.management.internal.configuration.domain.XmlEntity; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; -import java.io.File; import java.io.IOException; import java.io.Reader; import java.io.StringReader; @@ -33,7 +45,6 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.StringTokenizer; - import javax.xml.namespace.NamespaceContext; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; @@ -50,20 +61,6 @@ import javax.xml.xpath.XPathConstants; import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; -import org.xml.sax.InputSource; -import org.xml.sax.SAXException; - -import org.apache.geode.internal.cache.xmlcache.CacheXml; -import org.apache.geode.internal.cache.xmlcache.CacheXmlParser; -import org.apache.geode.internal.lang.StringUtils; -import org.apache.geode.management.internal.configuration.domain.CacheElement; -import org.apache.geode.management.internal.configuration.domain.XmlEntity; - public class XmlUtils { /** http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/AbstractCommandsController.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/AbstractCommandsController.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/AbstractCommandsController.java index 0b64a44..54c29f8 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/AbstractCommandsController.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/AbstractCommandsController.java @@ -15,36 +15,6 @@ package org.apache.geode.management.internal.web.controllers; -import java.io.PrintWriter; -import java.io.StringWriter; -import java.lang.management.ManagementFactory; -import java.net.URI; -import java.util.Collection; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.Callable; - -import javax.management.JMX; -import javax.management.MBeanServer; -import javax.management.MalformedObjectNameException; -import javax.management.ObjectName; -import javax.management.Query; -import javax.management.QueryExp; - -import org.apache.logging.log4j.Logger; -import org.springframework.beans.propertyeditors.StringArrayPropertyEditor; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.WebDataBinder; -import org.springframework.web.bind.annotation.ExceptionHandler; -import org.springframework.web.bind.annotation.InitBinder; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.ResponseStatus; -import org.springframework.web.context.request.WebRequest; -import org.springframework.web.servlet.support.ServletUriComponentsBuilder; - import org.apache.geode.internal.cache.GemFireCacheImpl; import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.internal.lang.StringUtils; @@ -64,6 +34,34 @@ import org.apache.geode.management.internal.cli.util.CommandStringBuilder; import org.apache.geode.management.internal.web.controllers.support.LoginHandlerInterceptor; import org.apache.geode.management.internal.web.util.UriUtils; import org.apache.geode.security.NotAuthorizedException; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.propertyeditors.StringArrayPropertyEditor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.WebDataBinder; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.InitBinder; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.ResponseStatus; +import org.springframework.web.context.request.WebRequest; +import org.springframework.web.servlet.support.ServletUriComponentsBuilder; + +import java.io.PrintWriter; +import java.io.StringWriter; +import java.lang.management.ManagementFactory; +import java.net.URI; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.Callable; +import javax.management.JMX; +import javax.management.MBeanServer; +import javax.management.MalformedObjectNameException; +import javax.management.ObjectName; +import javax.management.Query; +import javax.management.QueryExp; /** * The AbstractCommandsController class is the abstract base class encapsulating common @@ -251,7 +249,7 @@ public abstract class AbstractCommandsController { * @see java.lang.String */ protected static boolean hasValue(final String value) { - return !StringUtils.isBlank(value); + return StringUtils.isNotBlank(value); } /** @@ -530,7 +528,7 @@ public abstract class AbstractCommandsController { if (hasValue(optionValue)) { final String optionValueString = (optionValue instanceof String[] - ? StringUtils.concat((String[]) optionValue, StringUtils.COMMA_DELIMITER) + ? StringUtils.join((String[]) optionValue, StringUtils.COMMA_DELIMITER) : String.valueOf(optionValue)); command.addOption(optionName, optionValueString); } else if (request != null && request.getParameterMap().containsKey(optionName)) { http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ConfigCommandsController.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ConfigCommandsController.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ConfigCommandsController.java index f468c65..25d0cc3 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ConfigCommandsController.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ConfigCommandsController.java @@ -14,9 +14,6 @@ */ package org.apache.geode.management.internal.web.controllers; -import java.io.IOException; -import java.util.concurrent.Callable; - import org.apache.geode.internal.lang.StringUtils; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.util.CommandStringBuilder; @@ -30,6 +27,9 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.multipart.MultipartFile; +import java.io.IOException; +import java.util.concurrent.Callable; + /** * The ConfigCommandsController class implements GemFire Management REST API web service endpoints * for the Gfsh Config Commands. @@ -184,12 +184,12 @@ public class ConfigCommandsController extends AbstractMultiPartCommandsControlle if (hasValue(groups)) { command.addOption(CliStrings.EXPORT_CONFIG__GROUP, - StringUtils.concat(groups, StringUtils.COMMA_DELIMITER)); + StringUtils.join(groups, StringUtils.COMMA_DELIMITER)); } if (hasValue(members)) { command.addOption(CliStrings.EXPORT_CONFIG__MEMBER, - StringUtils.concat(members, StringUtils.COMMA_DELIMITER)); + StringUtils.join(members, StringUtils.COMMA_DELIMITER)); } if (hasValue(directory)) { http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DataCommandsController.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DataCommandsController.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DataCommandsController.java index 3a8ed82..ce2ed54 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DataCommandsController.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DataCommandsController.java @@ -215,12 +215,12 @@ public class DataCommandsController extends AbstractCommandsController { if (hasValue(includedRegions)) { command.addOption(CliStrings.REBALANCE__INCLUDEREGION, - StringUtils.concat(includedRegions, StringUtils.COMMA_DELIMITER)); + StringUtils.join(includedRegions, StringUtils.COMMA_DELIMITER)); } if (hasValue(excludedRegions)) { command.addOption(CliStrings.REBALANCE__EXCLUDEREGION, - StringUtils.concat(excludedRegions, StringUtils.COMMA_DELIMITER)); + StringUtils.join(excludedRegions, StringUtils.COMMA_DELIMITER)); } command.addOption(CliStrings.REBALANCE__SIMULATE, String.valueOf(simulate)); http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DeployCommandsController.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DeployCommandsController.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DeployCommandsController.java index fe5be62..35f57ef 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DeployCommandsController.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DeployCommandsController.java @@ -14,13 +14,10 @@ */ package org.apache.geode.management.internal.web.controllers; -import java.io.IOException; - import org.apache.geode.internal.lang.StringUtils; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.util.CommandStringBuilder; import org.apache.geode.management.internal.web.util.ConvertUtils; - import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -28,6 +25,8 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.multipart.MultipartFile; +import java.io.IOException; + /** * The DeployCommandsController class implements the GemFire Management REST API web service * endpoints for the Gfsh Deploy Commands. @@ -55,7 +54,7 @@ public class DeployCommandsController extends AbstractMultiPartCommandsControlle if (hasValue(groups)) { command.addOption(CliStrings.LIST_DEPLOYED__GROUP, - StringUtils.concat(groups, StringUtils.COMMA_DELIMITER)); + StringUtils.join(groups, StringUtils.COMMA_DELIMITER)); } return processCommand(command.toString()); @@ -75,7 +74,7 @@ public class DeployCommandsController extends AbstractMultiPartCommandsControlle if (hasValue(groups)) { command.addOption(CliStrings.DEPLOY__GROUP, - StringUtils.concat(groups, StringUtils.COMMA_DELIMITER)); + StringUtils.join(groups, StringUtils.COMMA_DELIMITER)); } if (hasValue(jarFileName)) { @@ -101,12 +100,12 @@ public class DeployCommandsController extends AbstractMultiPartCommandsControlle if (hasValue(groups)) { command.addOption(CliStrings.UNDEPLOY__GROUP, - StringUtils.concat(groups, StringUtils.COMMA_DELIMITER)); + StringUtils.join(groups, StringUtils.COMMA_DELIMITER)); } if (hasValue(jarFileNames)) { command.addOption(CliStrings.UNDEPLOY__JAR, - StringUtils.concat(jarFileNames, StringUtils.COMMA_DELIMITER)); + StringUtils.join(jarFileNames, StringUtils.COMMA_DELIMITER)); } return processCommand(command.toString()); http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DiskStoreCommandsController.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DiskStoreCommandsController.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DiskStoreCommandsController.java index 661340c..fa074c3 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DiskStoreCommandsController.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DiskStoreCommandsController.java @@ -14,8 +14,6 @@ */ package org.apache.geode.management.internal.web.controllers; -import java.util.concurrent.Callable; - import org.apache.geode.internal.lang.StringUtils; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.util.CommandStringBuilder; @@ -27,6 +25,8 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import java.util.concurrent.Callable; + /** * The DiskStoreCommandsController class implements GemFire Management REST API web service * endpoints for the Gfsh Disk Store Commands. @@ -80,7 +80,7 @@ public class DiskStoreCommandsController extends AbstractCommandsController { if (hasValue(groups)) { command.addOption(CliStrings.COMPACT_DISK_STORE__GROUP, - StringUtils.concat(groups, StringUtils.COMMA_DELIMITER)); + StringUtils.join(groups, StringUtils.COMMA_DELIMITER)); } return getProcessCommandCallable(command.toString()); @@ -115,8 +115,10 @@ public class DiskStoreCommandsController extends AbstractCommandsController { CommandStringBuilder command = new CommandStringBuilder(CliStrings.CREATE_DISK_STORE); command.addOption(CliStrings.CREATE_DISK_STORE__NAME, diskStoreNameId); - command.addOption(CliStrings.CREATE_DISK_STORE__DIRECTORY_AND_SIZE, - StringUtils.concat(directoryAndSizes, StringUtils.COMMA_DELIMITER)); + if (hasValue(directoryAndSizes)) { + command.addOption(CliStrings.CREATE_DISK_STORE__DIRECTORY_AND_SIZE, + StringUtils.join(directoryAndSizes, StringUtils.COMMA_DELIMITER)); + } command.addOption(CliStrings.CREATE_DISK_STORE__ALLOW_FORCE_COMPACTION, String.valueOf(Boolean.TRUE.equals(allowForceCompaction))); command.addOption(CliStrings.CREATE_DISK_STORE__AUTO_COMPACT, @@ -135,7 +137,7 @@ public class DiskStoreCommandsController extends AbstractCommandsController { if (hasValue(groups)) { command.addOption(CliStrings.CREATE_DISK_STORE__GROUP, - StringUtils.concat(groups, StringUtils.COMMA_DELIMITER)); + StringUtils.join(groups, StringUtils.COMMA_DELIMITER)); } return processCommand(command.toString()); @@ -163,7 +165,7 @@ public class DiskStoreCommandsController extends AbstractCommandsController { if (hasValue(groups)) { command.addOption(CliStrings.DESTROY_DISK_STORE__GROUP, - StringUtils.concat(groups, StringUtils.COMMA_DELIMITER)); + StringUtils.join(groups, StringUtils.COMMA_DELIMITER)); } return processCommand(command.toString()); http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DurableClientCommandsController.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DurableClientCommandsController.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DurableClientCommandsController.java index 1d718b4..8f31f7a 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DurableClientCommandsController.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/DurableClientCommandsController.java @@ -19,7 +19,11 @@ import org.apache.geode.internal.lang.StringUtils; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.util.CommandStringBuilder; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; /** * The DurableClientCommandsController class implements GemFire Management REST API web service @@ -59,7 +63,7 @@ public class DurableClientCommandsController extends AbstractCommandsController if (hasValue(groups)) { command.addOption(CliStrings.LIST_DURABLE_CQS__GROUP, - StringUtils.concat(groups, StringUtils.COMMA_DELIMITER)); + StringUtils.join(groups, StringUtils.COMMA_DELIMITER)); } return processCommand(command.toString()); @@ -109,7 +113,7 @@ public class DurableClientCommandsController extends AbstractCommandsController if (hasValue(groups)) { command.addOption(CliStrings.COUNT_DURABLE_CQ_EVENTS__GROUP, - StringUtils.concat(groups, StringUtils.COMMA_DELIMITER)); + StringUtils.join(groups, StringUtils.COMMA_DELIMITER)); } return processCommand(command.toString()); @@ -134,7 +138,7 @@ public class DurableClientCommandsController extends AbstractCommandsController if (hasValue(groups)) { command.addOption(CliStrings.CLOSE_DURABLE_CLIENTS__GROUP, - StringUtils.concat(groups, StringUtils.COMMA_DELIMITER)); + StringUtils.join(groups, StringUtils.COMMA_DELIMITER)); } return processCommand(command.toString()); @@ -161,7 +165,7 @@ public class DurableClientCommandsController extends AbstractCommandsController if (hasValue(groups)) { command.addOption(CliStrings.CLOSE_DURABLE_CQS__GROUP, - StringUtils.concat(groups, StringUtils.COMMA_DELIMITER)); + StringUtils.join(groups, StringUtils.COMMA_DELIMITER)); } return processCommand(command.toString()); http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ExportLogController.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ExportLogController.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ExportLogController.java index 604bdee..a369c6e 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ExportLogController.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ExportLogController.java @@ -64,7 +64,7 @@ public class ExportLogController extends AbstractCommandsController { if (hasValue(groups)) { command.addOption(CliStrings.EXPORT_LOGS__GROUP, - StringUtils.concat(groups, StringUtils.COMMA_DELIMITER)); + StringUtils.join(groups, StringUtils.COMMA_DELIMITER)); } if (hasValue(memberNameId)) { http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/FunctionCommandsController.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/FunctionCommandsController.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/FunctionCommandsController.java index 77cfb40..508c335 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/FunctionCommandsController.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/FunctionCommandsController.java @@ -14,8 +14,6 @@ */ package org.apache.geode.management.internal.web.controllers; -import java.util.concurrent.Callable; - import org.apache.geode.internal.lang.StringUtils; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.util.CommandStringBuilder; @@ -27,6 +25,8 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import java.util.concurrent.Callable; + /** * The FunctionCommandsController class implements GemFire Management REST API web service endpoints * for the Gfsh Function Commands. @@ -60,12 +60,12 @@ public class FunctionCommandsController extends AbstractCommandsController { if (hasValue(groups)) { command.addOption(CliStrings.LIST_FUNCTION__GROUP, - StringUtils.concat(groups, StringUtils.COMMA_DELIMITER)); + StringUtils.join(groups, StringUtils.COMMA_DELIMITER)); } if (hasValue(members)) { command.addOption(CliStrings.LIST_FUNCTION__MEMBER, - StringUtils.concat(members, StringUtils.COMMA_DELIMITER)); + StringUtils.join(members, StringUtils.COMMA_DELIMITER)); } if (hasValue(matches)) { @@ -108,7 +108,7 @@ public class FunctionCommandsController extends AbstractCommandsController { if (hasValue(arguments)) { command.addOption(CliStrings.EXECUTE_FUNCTION__ARGUMENTS, - StringUtils.concat(arguments, StringUtils.COMMA_DELIMITER)); + StringUtils.join(arguments, StringUtils.COMMA_DELIMITER)); } if (hasValue(filter)) { http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/MiscellaneousCommandsController.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/MiscellaneousCommandsController.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/MiscellaneousCommandsController.java index d19aee1..9b13b5f 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/MiscellaneousCommandsController.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/MiscellaneousCommandsController.java @@ -85,7 +85,7 @@ public class MiscellaneousCommandsController extends AbstractCommandsController if (hasValue(groups)) { command.addOption(CliStrings.GC__GROUP, - StringUtils.concat(groups, StringUtils.COMMA_DELIMITER)); + StringUtils.join(groups, StringUtils.COMMA_DELIMITER)); } return processCommand(command.toString()); @@ -175,7 +175,7 @@ public class MiscellaneousCommandsController extends AbstractCommandsController if (hasValue(categories)) { command.addOption(CliStrings.SHOW_METRICS__CATEGORY, - StringUtils.concat(categories, StringUtils.COMMA_DELIMITER)); + StringUtils.join(categories, StringUtils.COMMA_DELIMITER)); } return processCommand(command.toString()); http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/PdxCommandsController.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/PdxCommandsController.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/PdxCommandsController.java index c68ee35..c757fd3 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/PdxCommandsController.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/PdxCommandsController.java @@ -17,7 +17,6 @@ package org.apache.geode.management.internal.web.controllers; import org.apache.geode.internal.lang.StringUtils; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.util.CommandStringBuilder; - import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -72,12 +71,12 @@ public class PdxCommandsController extends AbstractCommandsController { if (hasValue(autoSerializerClasses)) { command.addOption(CliStrings.CONFIGURE_PDX__AUTO__SERIALIZER__CLASSES, - StringUtils.concat(autoSerializerClasses, StringUtils.COMMA_DELIMITER)); + StringUtils.join(autoSerializerClasses, StringUtils.COMMA_DELIMITER)); } if (hasValue(portableAutoSerializerClasses)) { command.addOption(CliStrings.CONFIGURE_PDX__PORTABLE__AUTO__SERIALIZER__CLASSES, - StringUtils.concat(portableAutoSerializerClasses, StringUtils.COMMA_DELIMITER)); + StringUtils.join(portableAutoSerializerClasses, StringUtils.COMMA_DELIMITER)); } return processCommand(command.toString()); @@ -97,7 +96,7 @@ public class PdxCommandsController extends AbstractCommandsController { if (hasValue(diskDirs)) { command.addOption(CliStrings.PDX_DISKDIR, - StringUtils.concat(diskDirs, StringUtils.COMMA_DELIMITER)); + StringUtils.join(diskDirs, StringUtils.COMMA_DELIMITER)); } return processCommand(command.toString()); @@ -118,7 +117,7 @@ public class PdxCommandsController extends AbstractCommandsController { if (hasValue(diskDirs)) { command.addOption(CliStrings.PDX_DISKDIR, - StringUtils.concat(diskDirs, StringUtils.COMMA_DELIMITER)); + StringUtils.join(diskDirs, StringUtils.COMMA_DELIMITER)); } return processCommand(command.toString()); http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/QueueCommandsController.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/QueueCommandsController.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/QueueCommandsController.java index 396726e..df49e49 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/QueueCommandsController.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/QueueCommandsController.java @@ -17,7 +17,6 @@ package org.apache.geode.management.internal.web.controllers; import org.apache.geode.internal.lang.StringUtils; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.util.CommandStringBuilder; - import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -88,12 +87,12 @@ public class QueueCommandsController extends AbstractCommandsController { if (hasValue(listenerParametersValues)) { command.addOption(CliStrings.CREATE_ASYNC_EVENT_QUEUE__LISTENER_PARAM_AND_VALUE, - StringUtils.concat(listenerParametersValues, StringUtils.COMMA_DELIMITER)); + StringUtils.join(listenerParametersValues, StringUtils.COMMA_DELIMITER)); } if (hasValue(groups)) { command.addOption(CliStrings.CREATE_ASYNC_EVENT_QUEUE__GROUP, - StringUtils.concat(groups, StringUtils.COMMA_DELIMITER)); + StringUtils.join(groups, StringUtils.COMMA_DELIMITER)); } command.addOption(CliStrings.CREATE_ASYNC_EVENT_QUEUE__PARALLEL, @@ -138,7 +137,7 @@ public class QueueCommandsController extends AbstractCommandsController { if (hasValue(gatewayEventFilters)) { command.addOption(CliStrings.CREATE_ASYNC_EVENT_QUEUE__GATEWAYEVENTFILTER, - StringUtils.concat(gatewayEventFilters, StringUtils.COMMA_DELIMITER)); + StringUtils.join(gatewayEventFilters, StringUtils.COMMA_DELIMITER)); } if (hasValue(gatewaySubstitutionFilter)) { http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/RegionCommandsController.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/RegionCommandsController.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/RegionCommandsController.java index e503e56..baf24e5 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/RegionCommandsController.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/RegionCommandsController.java @@ -17,7 +17,6 @@ package org.apache.geode.management.internal.web.controllers; import org.apache.geode.internal.lang.StringUtils; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.util.CommandStringBuilder; - import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; @@ -116,7 +115,7 @@ public class RegionCommandsController extends AbstractCommandsController { if (hasValue(groups)) { command.addOption(CliStrings.ALTER_REGION__GROUP, - StringUtils.concat(groups, StringUtils.COMMA_DELIMITER)); + StringUtils.join(groups, StringUtils.COMMA_DELIMITER)); } addCommandOption(request, command, CliStrings.ALTER_REGION__ENTRYEXPIRATIONIDLETIME, @@ -243,7 +242,7 @@ public class RegionCommandsController extends AbstractCommandsController { if (hasValue(groups)) { command.addOption(CliStrings.CREATE_REGION__GROUP, - StringUtils.concat(groups, StringUtils.COMMA_DELIMITER)); + StringUtils.join(groups, StringUtils.COMMA_DELIMITER)); } command.addOption(CliStrings.CREATE_REGION__SKIPIFEXISTS, @@ -323,7 +322,7 @@ public class RegionCommandsController extends AbstractCommandsController { if (hasValue(cacheListeners)) { command.addOption(CliStrings.CREATE_REGION__CACHELISTENER, - StringUtils.concat(cacheListeners, StringUtils.COMMA_DELIMITER)); + StringUtils.join(cacheListeners, StringUtils.COMMA_DELIMITER)); } if (hasValue(cacheLoader)) { @@ -336,12 +335,12 @@ public class RegionCommandsController extends AbstractCommandsController { if (hasValue(asyncEventQueueIds)) { command.addOption(CliStrings.CREATE_REGION__ASYNCEVENTQUEUEID, - StringUtils.concat(asyncEventQueueIds, StringUtils.COMMA_DELIMITER)); + StringUtils.join(asyncEventQueueIds, StringUtils.COMMA_DELIMITER)); } if (hasValue(gatewaySenderIds)) { command.addOption(CliStrings.CREATE_REGION__GATEWAYSENDERID, - StringUtils.concat(gatewaySenderIds, StringUtils.COMMA_DELIMITER)); + StringUtils.join(gatewaySenderIds, StringUtils.COMMA_DELIMITER)); } if (Boolean.TRUE.equals(enableConcurrencyChecks)) { http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ShellCommandsController.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ShellCommandsController.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ShellCommandsController.java index 0ecb77f..e983f2a 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ShellCommandsController.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/ShellCommandsController.java @@ -14,14 +14,15 @@ */ package org.apache.geode.management.internal.web.controllers; -import java.io.IOException; -import java.util.Set; - -import javax.management.AttributeNotFoundException; -import javax.management.InstanceNotFoundException; -import javax.management.MalformedObjectNameException; -import javax.management.ObjectName; - +import org.apache.commons.lang.ArrayUtils; +import org.apache.geode.internal.GemFireVersion; +import org.apache.geode.internal.lang.ObjectUtils; +import org.apache.geode.internal.util.IOUtils; +import org.apache.geode.management.internal.cli.i18n.CliStrings; +import org.apache.geode.management.internal.web.domain.Link; +import org.apache.geode.management.internal.web.domain.LinkIndex; +import org.apache.geode.management.internal.web.domain.QueryParameterSource; +import org.apache.geode.management.internal.web.http.HttpMethod; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -32,15 +33,12 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; -import org.apache.geode.internal.GemFireVersion; -import org.apache.geode.internal.lang.ObjectUtils; -import org.apache.geode.internal.lang.StringUtils; -import org.apache.geode.internal.util.IOUtils; -import org.apache.geode.management.internal.cli.i18n.CliStrings; -import org.apache.geode.management.internal.web.domain.Link; -import org.apache.geode.management.internal.web.domain.LinkIndex; -import org.apache.geode.management.internal.web.domain.QueryParameterSource; -import org.apache.geode.management.internal.web.http.HttpMethod; +import java.io.IOException; +import java.util.Set; +import javax.management.AttributeNotFoundException; +import javax.management.InstanceNotFoundException; +import javax.management.MalformedObjectNameException; +import javax.management.ObjectName; /** * The ShellCommandsController class implements GemFire REST API calls for Gfsh Shell Commands. @@ -97,7 +95,7 @@ public class ShellCommandsController extends AbstractCommandsController { @RequestParam("operationName") final String operationName, @RequestParam(value = "signature", required = false) String[] signature, @RequestParam(value = "parameters", required = false) Object[] parameters) { - signature = (signature != null ? signature : StringUtils.EMPTY_STRING_ARRAY); + signature = (signature != null ? signature : ArrayUtils.EMPTY_STRING_ARRAY); parameters = (parameters != null ? parameters : ObjectUtils.EMPTY_OBJECT_ARRAY); try { http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/WanCommandsController.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/WanCommandsController.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/WanCommandsController.java index fa5aa57..4fd4b96 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/WanCommandsController.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/controllers/WanCommandsController.java @@ -18,7 +18,6 @@ package org.apache.geode.management.internal.web.controllers; import org.apache.geode.internal.lang.StringUtils; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.util.CommandStringBuilder; - import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; @@ -54,12 +53,12 @@ public class WanCommandsController extends AbstractCommandsController { if (hasValue(groups)) { command.addOption(CliStrings.LIST_GATEWAY__GROUP, - StringUtils.concat(groups, StringUtils.COMMA_DELIMITER)); + StringUtils.join(groups, StringUtils.COMMA_DELIMITER)); } if (hasValue(members)) { command.addOption(CliStrings.LIST_GATEWAY__MEMBER, - StringUtils.concat(members, StringUtils.COMMA_DELIMITER)); + StringUtils.join(members, StringUtils.COMMA_DELIMITER)); } return processCommand(command.toString()); @@ -90,7 +89,7 @@ public class WanCommandsController extends AbstractCommandsController { if (hasValue(groups)) { command.addOption(CliStrings.CREATE_GATEWAYRECEIVER__GROUP, - StringUtils.concat(groups, StringUtils.COMMA_DELIMITER)); + StringUtils.join(groups, StringUtils.COMMA_DELIMITER)); } if (hasValue(manualStart)) { @@ -100,7 +99,7 @@ public class WanCommandsController extends AbstractCommandsController { if (hasValue(members)) { command.addOption(CliStrings.CREATE_GATEWAYRECEIVER__MEMBER, - StringUtils.concat(members, StringUtils.COMMA_DELIMITER)); + StringUtils.join(members, StringUtils.COMMA_DELIMITER)); } if (hasValue(startPort)) { @@ -127,7 +126,7 @@ public class WanCommandsController extends AbstractCommandsController { if (hasValue(gatewayTransportFilters)) { command.addOption(CliStrings.CREATE_GATEWAYRECEIVER__GATEWAYTRANSPORTFILTER, - StringUtils.concat(gatewayTransportFilters, StringUtils.COMMA_DELIMITER)); + StringUtils.join(gatewayTransportFilters, StringUtils.COMMA_DELIMITER)); } return processCommand(command.toString()); @@ -182,12 +181,12 @@ public class WanCommandsController extends AbstractCommandsController { if (hasValue(groups)) { command.addOption(CliStrings.CREATE_GATEWAYSENDER__GROUP, - StringUtils.concat(groups, StringUtils.COMMA_DELIMITER)); + StringUtils.join(groups, StringUtils.COMMA_DELIMITER)); } if (hasValue(members)) { command.addOption(CliStrings.CREATE_GATEWAYSENDER__MEMBER, - StringUtils.concat(members, StringUtils.COMMA_DELIMITER)); + StringUtils.join(members, StringUtils.COMMA_DELIMITER)); } if (hasValue(parallel)) { @@ -257,12 +256,12 @@ public class WanCommandsController extends AbstractCommandsController { if (hasValue(gatewayEventFilters)) { command.addOption(CliStrings.CREATE_GATEWAYSENDER__GATEWAYEVENTFILTER, - StringUtils.concat(gatewayEventFilters, StringUtils.COMMA_DELIMITER)); + StringUtils.join(gatewayEventFilters, StringUtils.COMMA_DELIMITER)); } if (hasValue(gatewayTransportFilters)) { command.addOption(CliStrings.CREATE_GATEWAYSENDER__GATEWAYTRANSPORTFILTER, - StringUtils.concat(gatewayTransportFilters, StringUtils.COMMA_DELIMITER)); + StringUtils.join(gatewayTransportFilters, StringUtils.COMMA_DELIMITER)); } return processCommand(command.toString()); @@ -281,12 +280,12 @@ public class WanCommandsController extends AbstractCommandsController { if (hasValue(groups)) { command.addOption(CliStrings.CREATE_GATEWAYSENDER__GROUP, - StringUtils.concat(groups, StringUtils.COMMA_DELIMITER)); + StringUtils.join(groups, StringUtils.COMMA_DELIMITER)); } if (hasValue(members)) { command.addOption(CliStrings.CREATE_GATEWAYSENDER__MEMBER, - StringUtils.concat(members, StringUtils.COMMA_DELIMITER)); + StringUtils.join(members, StringUtils.COMMA_DELIMITER)); } return processCommand(command.toString()); } @@ -318,12 +317,12 @@ public class WanCommandsController extends AbstractCommandsController { if (hasValue(groups)) { command.addOption(CliStrings.PAUSE_GATEWAYSENDER__GROUP, - StringUtils.concat(groups, StringUtils.COMMA_DELIMITER)); + StringUtils.join(groups, StringUtils.COMMA_DELIMITER)); } if (hasValue(members)) { command.addOption(CliStrings.PAUSE_GATEWAYSENDER__MEMBER, - StringUtils.concat(members, StringUtils.COMMA_DELIMITER)); + StringUtils.join(members, StringUtils.COMMA_DELIMITER)); } return processCommand(command.toString()); @@ -344,12 +343,12 @@ public class WanCommandsController extends AbstractCommandsController { if (hasValue(groups)) { command.addOption(CliStrings.RESUME_GATEWAYSENDER__GROUP, - StringUtils.concat(groups, StringUtils.COMMA_DELIMITER)); + StringUtils.join(groups, StringUtils.COMMA_DELIMITER)); } if (hasValue(members)) { command.addOption(CliStrings.RESUME_GATEWAYSENDER__MEMBER, - StringUtils.concat(members, StringUtils.COMMA_DELIMITER)); + StringUtils.join(members, StringUtils.COMMA_DELIMITER)); } return processCommand(command.toString()); @@ -367,12 +366,12 @@ public class WanCommandsController extends AbstractCommandsController { if (hasValue(groups)) { command.addOption(CliStrings.START_GATEWAYRECEIVER__GROUP, - StringUtils.concat(groups, StringUtils.COMMA_DELIMITER)); + StringUtils.join(groups, StringUtils.COMMA_DELIMITER)); } if (hasValue(members)) { command.addOption(CliStrings.START_GATEWAYRECEIVER__MEMBER, - StringUtils.concat(members, StringUtils.COMMA_DELIMITER)); + StringUtils.join(members, StringUtils.COMMA_DELIMITER)); } return processCommand(command.toString()); @@ -393,12 +392,12 @@ public class WanCommandsController extends AbstractCommandsController { if (hasValue(groups)) { command.addOption(CliStrings.START_GATEWAYSENDER__GROUP, - StringUtils.concat(groups, StringUtils.COMMA_DELIMITER)); + StringUtils.join(groups, StringUtils.COMMA_DELIMITER)); } if (hasValue(members)) { command.addOption(CliStrings.START_GATEWAYSENDER__MEMBER, - StringUtils.concat(members, StringUtils.COMMA_DELIMITER)); + StringUtils.join(members, StringUtils.COMMA_DELIMITER)); } return processCommand(command.toString()); @@ -415,12 +414,12 @@ public class WanCommandsController extends AbstractCommandsController { if (hasValue(groups)) { command.addOption(CliStrings.STATUS_GATEWAYRECEIVER__GROUP, - StringUtils.concat(groups, StringUtils.COMMA_DELIMITER)); + StringUtils.join(groups, StringUtils.COMMA_DELIMITER)); } if (hasValue(members)) { command.addOption(CliStrings.STATUS_GATEWAYRECEIVER__MEMBER, - StringUtils.concat(members, StringUtils.COMMA_DELIMITER)); + StringUtils.join(members, StringUtils.COMMA_DELIMITER)); } return processCommand(command.toString()); @@ -439,12 +438,12 @@ public class WanCommandsController extends AbstractCommandsController { if (hasValue(groups)) { command.addOption(CliStrings.STATUS_GATEWAYSENDER__GROUP, - StringUtils.concat(groups, StringUtils.COMMA_DELIMITER)); + StringUtils.join(groups, StringUtils.COMMA_DELIMITER)); } if (hasValue(members)) { command.addOption(CliStrings.STATUS_GATEWAYSENDER__MEMBER, - StringUtils.concat(members, StringUtils.COMMA_DELIMITER)); + StringUtils.join(members, StringUtils.COMMA_DELIMITER)); } return processCommand(command.toString()); @@ -461,12 +460,12 @@ public class WanCommandsController extends AbstractCommandsController { if (hasValue(groups)) { command.addOption(CliStrings.STOP_GATEWAYRECEIVER__GROUP, - StringUtils.concat(groups, StringUtils.COMMA_DELIMITER)); + StringUtils.join(groups, StringUtils.COMMA_DELIMITER)); } if (hasValue(members)) { command.addOption(CliStrings.STOP_GATEWAYRECEIVER__MEMBER, - StringUtils.concat(members, StringUtils.COMMA_DELIMITER)); + StringUtils.join(members, StringUtils.COMMA_DELIMITER)); } return processCommand(command.toString()); @@ -485,12 +484,12 @@ public class WanCommandsController extends AbstractCommandsController { if (hasValue(groups)) { command.addOption(CliStrings.STOP_GATEWAYSENDER__GROUP, - StringUtils.concat(groups, StringUtils.COMMA_DELIMITER)); + StringUtils.join(groups, StringUtils.COMMA_DELIMITER)); } if (hasValue(members)) { command.addOption(CliStrings.STOP_GATEWAYSENDER__MEMBER, - StringUtils.concat(members, StringUtils.COMMA_DELIMITER)); + StringUtils.join(members, StringUtils.COMMA_DELIMITER)); } return processCommand(command.toString()); http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/web/domain/Link.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/domain/Link.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/domain/Link.java index cef8cab..3ec04c7 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/web/domain/Link.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/domain/Link.java @@ -14,16 +14,16 @@ */ package org.apache.geode.management.internal.web.domain; -import java.io.Serializable; -import java.net.URI; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; - import org.apache.geode.internal.lang.ObjectUtils; import org.apache.geode.internal.lang.StringUtils; import org.apache.geode.management.internal.web.http.HttpMethod; import org.apache.geode.management.internal.web.util.UriUtils; +import java.io.Serializable; +import java.net.URI; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlType; + /** * The Link class models hypermedia controls/link relations. * <p/> @@ -97,7 +97,7 @@ public class Link implements Comparable<Link>, Serializable { } public final void setRelation(final String relation) { - assert !StringUtils.isBlank(relation) : "The Link relation (rel) must be specified!"; + assert StringUtils.isNotBlank(relation) : "The Link relation (rel) must be specified!"; this.relation = relation; } http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/web/domain/LinkIndex.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/domain/LinkIndex.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/domain/LinkIndex.java index 7d5bb37..2a99e82 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/web/domain/LinkIndex.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/domain/LinkIndex.java @@ -14,6 +14,8 @@ */ package org.apache.geode.management.internal.web.domain; +import org.apache.commons.lang.StringUtils; + import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -26,8 +28,6 @@ import java.util.TreeSet; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; -import org.apache.geode.internal.lang.StringUtils; - /** * The LinkIndex class is abstraction for modeling an index of Links. * <p/> @@ -127,7 +127,7 @@ public class LinkIndex implements Iterable<Link> { int count = 0; for (final Link link : this) { - buffer.append(count++ > 0 ? ", " : StringUtils.EMPTY_STRING).append(link); + buffer.append(count++ > 0 ? ", " : StringUtils.EMPTY).append(link); } buffer.append("]"); http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/web/http/HttpHeader.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/http/HttpHeader.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/http/HttpHeader.java index ee7e932..74836bc 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/web/http/HttpHeader.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/http/HttpHeader.java @@ -14,7 +14,7 @@ */ package org.apache.geode.management.internal.web.http; -import org.apache.geode.internal.lang.StringUtils; +import org.apache.commons.lang.StringUtils; /** * The HttpHeader enum is an enumeration of all HTTP request/response header names. @@ -78,7 +78,7 @@ public enum HttpHeader { private final String name; HttpHeader(final String name) { - assert !StringUtils.isBlank(name) : "The name of the HTTP request header must be specified!"; + assert StringUtils.isNotBlank(name) : "The name of the HTTP request header must be specified!"; this.name = name; } http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/web/shell/RestHttpOperationInvoker.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/shell/RestHttpOperationInvoker.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/shell/RestHttpOperationInvoker.java index eeedf40..13fd42c 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/web/shell/RestHttpOperationInvoker.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/shell/RestHttpOperationInvoker.java @@ -15,9 +15,9 @@ package org.apache.geode.management.internal.web.shell; +import org.apache.commons.lang.StringUtils; import org.apache.geode.internal.lang.Filter; import org.apache.geode.internal.lang.Initable; -import org.apache.geode.internal.lang.StringUtils; import org.apache.geode.internal.logging.LogService; import org.apache.geode.internal.util.CollectionUtils; import org.apache.geode.management.internal.cli.CommandRequest; @@ -447,7 +447,7 @@ public class RestHttpOperationInvoker extends AbstractHttpOperationInvoker imple @Override public boolean accept(final Map.Entry<String, String> entry) { - return !StringUtils.isBlank(entry.getValue()); + return StringUtils.isNotBlank(entry.getValue()); } } http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/web/util/ConvertUtils.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/util/ConvertUtils.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/util/ConvertUtils.java index f3b092d..0b6fbe3 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/web/util/ConvertUtils.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/util/ConvertUtils.java @@ -14,19 +14,18 @@ */ package org.apache.geode.management.internal.web.util; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - -import org.apache.geode.internal.lang.StringUtils; +import org.apache.commons.lang.StringUtils; import org.apache.geode.internal.util.IOUtils; import org.apache.geode.management.internal.cli.CliUtil; import org.apache.geode.management.internal.web.io.MultipartFileResourceAdapter; - import org.springframework.core.io.ByteArrayResource; import org.springframework.core.io.Resource; import org.springframework.web.multipart.MultipartFile; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + /** * The ConvertUtils class is a support class for performing conversions used by the GemFire web * application and REST interface. http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/main/java/org/apache/geode/management/internal/web/util/UriUtils.java ---------------------------------------------------------------------- diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/util/UriUtils.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/util/UriUtils.java index b83064e..a22ee13 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/web/util/UriUtils.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/util/UriUtils.java @@ -19,8 +19,6 @@ import java.net.URLDecoder; import java.net.URLEncoder; import java.util.Map; -import org.apache.geode.internal.lang.StringUtils; - /** * The UriUtils is a utility class for processing URIs and URLs. * <p/> @@ -32,7 +30,7 @@ import org.apache.geode.internal.lang.StringUtils; @SuppressWarnings("unused") public abstract class UriUtils { - public static final String DEFAULT_ENCODING = StringUtils.UTF_8; + public static final String DEFAULT_ENCODING = "UTF-8"; /** * Decodes the encoded String value using the default encoding, UTF-8. It is assumed the String http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorTestBase.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorTestBase.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorTestBase.java index c3b349a..7c168dc 100644 --- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorTestBase.java +++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorTestBase.java @@ -14,10 +14,20 @@ */ package org.apache.geode.cache.client.internal; -import org.apache.geode.internal.lang.StringUtils; -import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase; - -import org.apache.geode.cache.*; +import static org.apache.geode.distributed.ConfigurationProperties.ENABLE_CLUSTER_CONFIGURATION; +import static org.apache.geode.distributed.ConfigurationProperties.GROUPS; +import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS; +import static org.apache.geode.distributed.ConfigurationProperties.LOG_LEVEL; +import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT; +import static org.apache.geode.distributed.ConfigurationProperties.START_LOCATOR; + +import org.apache.commons.lang.StringUtils; +import org.apache.geode.cache.AttributesFactory; +import org.apache.geode.cache.Cache; +import org.apache.geode.cache.CacheFactory; +import org.apache.geode.cache.DataPolicy; +import org.apache.geode.cache.RegionAttributes; +import org.apache.geode.cache.Scope; import org.apache.geode.cache.client.Pool; import org.apache.geode.cache.client.PoolManager; import org.apache.geode.cache.server.CacheServer; @@ -25,16 +35,26 @@ import org.apache.geode.cache.server.ServerLoadProbe; import org.apache.geode.distributed.DistributedSystem; import org.apache.geode.distributed.Locator; import org.apache.geode.internal.cache.PoolFactoryImpl; -import org.apache.geode.test.dunit.*; +import org.apache.geode.test.dunit.Assert; +import org.apache.geode.test.dunit.Host; +import org.apache.geode.test.dunit.Invoke; +import org.apache.geode.test.dunit.LogWriterUtils; +import org.apache.geode.test.dunit.NetworkUtils; +import org.apache.geode.test.dunit.SerializableCallable; +import org.apache.geode.test.dunit.SerializableRunnable; +import org.apache.geode.test.dunit.VM; +import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase; import java.io.File; import java.io.IOException; import java.net.InetAddress; import java.net.InetSocketAddress; import java.net.UnknownHostException; -import java.util.*; - -import static org.apache.geode.distributed.ConfigurationProperties.*; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Properties; +import java.util.Set; /** * @@ -198,8 +218,8 @@ public abstract class LocatorTestBase extends JUnit4DistributedTestCase { Properties props = new Properties(); props.setProperty(MCAST_PORT, "0"); props.setProperty(LOCATORS, locators); - if (useGroupsProperty) { - props.setProperty(GROUPS, StringUtils.concat(groups, ",")); + if (useGroupsProperty && groups != null) { + props.setProperty(GROUPS, StringUtils.join(groups, ",")); } DistributedSystem ds = getSystem(props); Cache cache = CacheFactory.create(ds); http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherIntegrationTestCase.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherIntegrationTestCase.java b/geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherIntegrationTestCase.java index 09fa09e..bf6a854 100755 --- a/geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherIntegrationTestCase.java +++ b/geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherIntegrationTestCase.java @@ -17,9 +17,9 @@ package org.apache.geode.distributed; import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT; import static org.junit.Assert.assertTrue; +import org.apache.commons.lang.StringUtils; import org.apache.geode.distributed.internal.DistributionConfig; import org.apache.geode.distributed.internal.InternalDistributedSystem; -import org.apache.geode.internal.lang.StringUtils; import org.apache.geode.internal.logging.LogService; import org.apache.geode.internal.process.PidUnavailableException; import org.apache.geode.internal.process.ProcessStreamReader.InputListener; http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherTest.java b/geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherTest.java index 62d4bdd..416b459 100644 --- a/geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherTest.java +++ b/geode-core/src/test/java/org/apache/geode/distributed/AbstractLauncherTest.java @@ -14,10 +14,14 @@ */ package org.apache.geode.distributed; -import static org.apache.geode.distributed.ConfigurationProperties.*; -import static org.junit.Assert.*; - -import org.apache.geode.internal.lang.StringUtils; +import static org.apache.geode.distributed.ConfigurationProperties.NAME; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + +import org.apache.commons.lang.StringUtils; import org.apache.geode.test.junit.categories.UnitTest; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -108,11 +112,11 @@ public class AbstractLauncherTest { assertNotNull(distributedSystemProperties); assertFalse(distributedSystemProperties.containsKey(NAME)); - launcher = createAbstractLauncher(StringUtils.EMPTY_STRING, "333"); + launcher = createAbstractLauncher(StringUtils.EMPTY, "333"); assertNotNull(launcher); assertEquals("333", launcher.getMemberId()); - assertEquals(StringUtils.EMPTY_STRING, launcher.getMemberName()); + assertEquals(StringUtils.EMPTY, launcher.getMemberName()); distributedSystemProperties = launcher.getDistributedSystemProperties(); @@ -166,11 +170,11 @@ public class AbstractLauncherTest { assertNull(launcher.getMemberName()); assertEquals("123", launcher.getMember()); - launcher = createAbstractLauncher(StringUtils.EMPTY_STRING, "123"); + launcher = createAbstractLauncher(StringUtils.EMPTY, "123"); assertNotNull(launcher); assertEquals("123", launcher.getMemberId()); - assertEquals(StringUtils.EMPTY_STRING, launcher.getMemberName()); + assertEquals(StringUtils.EMPTY, launcher.getMemberName()); assertEquals("123", launcher.getMember()); launcher = createAbstractLauncher(" ", "123"); @@ -180,10 +184,10 @@ public class AbstractLauncherTest { assertEquals(" ", launcher.getMemberName()); assertEquals("123", launcher.getMember()); - launcher = createAbstractLauncher(null, StringUtils.EMPTY_STRING); + launcher = createAbstractLauncher(null, StringUtils.EMPTY); assertNotNull(launcher); - assertEquals(StringUtils.EMPTY_STRING, launcher.getMemberId()); + assertEquals(StringUtils.EMPTY, launcher.getMemberId()); assertNull(launcher.getMemberName()); assertNull(launcher.getMember()); http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherIntegrationTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherIntegrationTest.java index 5b53c6a..b856361 100755 --- a/geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherIntegrationTest.java +++ b/geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherIntegrationTest.java @@ -14,6 +14,12 @@ */ package org.apache.geode.distributed; +import static com.googlecode.catchexception.apis.BDDCatchException.caughtException; +import static com.googlecode.catchexception.apis.BDDCatchException.when; +import static org.apache.geode.distributed.ConfigurationProperties.NAME; +import static org.assertj.core.api.BDDAssertions.assertThat; +import static org.assertj.core.api.BDDAssertions.then; + import org.apache.geode.distributed.LocatorLauncher.Builder; import org.apache.geode.distributed.LocatorLauncher.Command; import org.apache.geode.distributed.internal.DistributionConfig; @@ -33,12 +39,6 @@ import java.io.IOException; import java.net.InetAddress; import java.util.Properties; -import static com.googlecode.catchexception.apis.BDDCatchException.caughtException; -import static com.googlecode.catchexception.apis.BDDCatchException.when; -import static org.assertj.core.api.BDDAssertions.assertThat; -import static org.assertj.core.api.BDDAssertions.then; -import static org.apache.geode.distributed.ConfigurationProperties.*; - /** * Integration tests for LocatorLauncher. These tests require file system I/O. */ @@ -110,7 +110,7 @@ public class LocatorLauncherIntegrationTest { gemfireProperties); // when: starting with null MemberName - LocatorLauncher launcher = new Builder().setCommand(Command.START).setMemberName(null).build(); + LocatorLauncher launcher = new Builder().setCommand(Command.START).build(); // then: name in gemfire.properties file should be used for MemberName assertThat(launcher).isNotNull(); http://git-wip-us.apache.org/repos/asf/geode/blob/d16d192b/geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherTest.java b/geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherTest.java index 06d6054..50cea4d 100644 --- a/geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherTest.java +++ b/geode-core/src/test/java/org/apache/geode/distributed/LocatorLauncherTest.java @@ -14,13 +14,22 @@ */ package org.apache.geode.distributed; +import static org.apache.geode.distributed.ConfigurationProperties.NAME; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; + import org.apache.geode.distributed.LocatorLauncher.Builder; import org.apache.geode.distributed.LocatorLauncher.Command; import org.apache.geode.distributed.internal.DistributionConfig; +import org.apache.geode.distributed.internal.InternalDistributedSystem; import org.apache.geode.internal.i18n.LocalizedStrings; import org.apache.geode.test.junit.categories.FlakyTest; import org.apache.geode.test.junit.categories.UnitTest; -import joptsimple.OptionException; +import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.contrib.java.lang.system.RestoreSystemProperties; @@ -29,9 +38,8 @@ import org.junit.rules.TestName; import java.net.InetAddress; import java.net.UnknownHostException; +import joptsimple.OptionException; -import static org.junit.Assert.*; -import static org.apache.geode.distributed.ConfigurationProperties.*; /** * The LocatorLauncherTest class is a test suite of test cases for testing the contract and @@ -53,6 +61,11 @@ public class LocatorLauncherTest { @Rule public final TestName testName = new TestName(); + @Before + public void setup() { + DistributedSystem.removeSystem(InternalDistributedSystem.getConnectedInstance()); + } + @Test(expected = IllegalArgumentException.class) public void testBuilderParseArgumentsWithNonNumericPort() { try { @@ -154,8 +167,6 @@ public class LocatorLauncherTest { assertNull(builder.getHostnameForClients()); assertSame(builder, builder.setHostnameForClients("Pegasus")); assertEquals("Pegasus", builder.getHostnameForClients()); - assertSame(builder, builder.setHostnameForClients(null)); - assertNull(builder.getHostnameForClients()); } @Test(expected = IllegalArgumentException.class) @@ -184,6 +195,19 @@ public class LocatorLauncherTest { } } + @Test(expected = IllegalArgumentException.class) + public void testSetHostnameForClientsWithNullString() { + try { + new Builder().setHostnameForClients(null); + } catch (IllegalArgumentException expected) { + assertEquals( + LocalizedStrings.LocatorLauncher_Builder_INVALID_HOSTNAME_FOR_CLIENTS_ERROR_MESSAGE + .toLocalizedString(), + expected.getMessage()); + throw expected; + } + } + @Test public void testSetAndGetMemberName() { Builder builder = new Builder(); @@ -191,8 +215,6 @@ public class LocatorLauncherTest { assertNull(builder.getMemberName()); assertSame(builder, builder.setMemberName("locatorOne")); assertEquals("locatorOne", builder.getMemberName()); - assertSame(builder, builder.setMemberName(null)); - assertNull(builder.getMemberName()); } @Test(expected = IllegalArgumentException.class) @@ -219,6 +241,18 @@ public class LocatorLauncherTest { } } + @Test(expected = IllegalArgumentException.class) + public void testSetMemberNameWithNullString() { + try { + new Builder().setMemberName(null); + } catch (IllegalArgumentException expected) { + assertEquals( + LocalizedStrings.Launcher_Builder_MEMBER_NAME_ERROR_MESSAGE.toLocalizedString("Locator"), + expected.getMessage()); + throw expected; + } + } + @Test public void testSetAndGetPid() { Builder builder = new Builder(); @@ -299,7 +333,7 @@ public class LocatorLauncherTest { .setHostnameForClients("beanstock.vmware.com").setMemberName("Beanstock").setPort(8192) .build(); - assertNotNull(launcher); + assertThat(launcher).isNotNull(); assertEquals(builder.getCommand(), launcher.getCommand()); assertTrue(launcher.isDebugging()); assertEquals(builder.getHostnameForClients(), launcher.getHostnameForClients()); @@ -312,10 +346,10 @@ public class LocatorLauncherTest { @Test public void testBuildWithMemberNameSetInApiPropertiesOnStart() { - LocatorLauncher launcher = new Builder().setCommand(LocatorLauncher.Command.START) - .setMemberName(null).set(NAME, "locatorABC").build(); + LocatorLauncher launcher = + new Builder().setCommand(LocatorLauncher.Command.START).set(NAME, "locatorABC").build(); - assertNotNull(launcher); + assertThat(launcher).isNotNull(); assertEquals(LocatorLauncher.Command.START, launcher.getCommand()); assertNull(launcher.getMemberName()); assertEquals("locatorABC", launcher.getProperties().getProperty(NAME)); @@ -325,10 +359,9 @@ public class LocatorLauncherTest { public void testBuildWithMemberNameSetInSystemPropertiesOnStart() { System.setProperty(DistributionConfig.GEMFIRE_PREFIX + NAME, "locatorXYZ"); - LocatorLauncher launcher = - new Builder().setCommand(LocatorLauncher.Command.START).setMemberName(null).build(); + LocatorLauncher launcher = new Builder().setCommand(LocatorLauncher.Command.START).build(); - assertNotNull(launcher); + assertThat(launcher).isNotNull(); assertEquals(LocatorLauncher.Command.START, launcher.getCommand()); assertNull(launcher.getMemberName()); }
