GEODE-2704: Remove Pulse's custom StringUtils in favor of Apache Commons StringUtils
Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/afc5e3a3 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/afc5e3a3 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/afc5e3a3 Branch: refs/heads/feature/GEODE-2420 Commit: afc5e3a3e415f331aeb9954f7bc41e498de7e941 Parents: f722c51 Author: Kevin J. Duling <[email protected]> Authored: Tue Mar 21 15:23:05 2017 -0700 Committer: Ken Howe <[email protected]> Committed: Mon Mar 27 14:01:44 2017 -0700 ---------------------------------------------------------------------- .../tools/pulse/internal/PulseAppListener.java | 30 ++++---- .../internal/controllers/PulseController.java | 28 ++++--- .../tools/pulse/internal/data/Cluster.java | 6 +- .../tools/pulse/internal/data/DataBrowser.java | 10 +-- .../pulse/internal/data/JMXDataUpdater.java | 10 +-- .../internal/service/ClusterRegionService.java | 7 +- .../internal/service/ClusterRegionsService.java | 9 +-- .../service/ClusterSelectedRegionService.java | 7 +- .../service/MemberAsynchEventQueuesService.java | 5 +- .../internal/service/MemberClientsService.java | 7 +- .../internal/service/MemberDetailsService.java | 8 +- .../service/MemberDiskThroughputService.java | 5 +- .../internal/service/MemberGCPausesService.java | 5 +- .../service/MemberGatewayHubService.java | 14 ++-- .../service/MemberHeapUsageService.java | 6 +- .../service/MemberKeyStatisticsService.java | 5 +- .../internal/service/MemberRegionsService.java | 15 ++-- .../internal/service/SystemAlertsService.java | 4 +- .../tools/pulse/internal/util/NameUtil.java | 38 ++++++++++ .../tools/pulse/internal/util/StringUtils.java | 79 -------------------- 20 files changed, 127 insertions(+), 171 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/afc5e3a3/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/PulseAppListener.java ---------------------------------------------------------------------- diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/PulseAppListener.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/PulseAppListener.java index 5408a56..4bad45c 100644 --- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/PulseAppListener.java +++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/PulseAppListener.java @@ -17,17 +17,15 @@ package org.apache.geode.tools.pulse.internal; +import org.apache.commons.lang.StringUtils; import org.apache.geode.tools.pulse.internal.controllers.PulseController; import org.apache.geode.tools.pulse.internal.data.PulseConfig; import org.apache.geode.tools.pulse.internal.data.PulseConstants; import org.apache.geode.tools.pulse.internal.data.Repository; import org.apache.geode.tools.pulse.internal.log.PulseLogWriter; -import org.apache.geode.tools.pulse.internal.util.StringUtils; import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.support.WebApplicationContextUtils; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; import java.io.IOException; import java.io.InputStream; import java.io.PrintWriter; @@ -44,6 +42,8 @@ import java.util.Properties; import java.util.ResourceBundle; import java.util.Set; import java.util.logging.Level; +import javax.servlet.ServletContextEvent; +import javax.servlet.ServletContextListener; /** * This class is used for checking the application running mode i.e. Embedded or not @@ -447,50 +447,50 @@ public class PulseAppListener implements ServletContextListener { PulseConfig pulseConfig = Repository.get().getPulseConfig(); // log file name - if (StringUtils.isNotNullNotEmptyNotWhiteSpace( - logPropertiesHM.get(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGFILENAME))) { + if (StringUtils + .isNotBlank(logPropertiesHM.get(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGFILENAME))) { pulseConfig.setLogFileName( logPropertiesHM.get(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGFILENAME)); } // log file location - if (StringUtils.isNotNullNotEmptyNotWhiteSpace( + if (StringUtils.isNotBlank( logPropertiesHM.get(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGFILELOCATION))) { pulseConfig.setLogFileLocation( logPropertiesHM.get(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGFILELOCATION)); } // log file size - if (StringUtils.isNotNullNotEmptyNotWhiteSpace( - logPropertiesHM.get(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGFILESIZE))) { + if (StringUtils + .isNotBlank(logPropertiesHM.get(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGFILESIZE))) { pulseConfig.setLogFileSize(Integer .parseInt(logPropertiesHM.get(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGFILESIZE))); } // log file count - if (StringUtils.isNotNullNotEmptyNotWhiteSpace( - logPropertiesHM.get(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGFILECOUNT))) { + if (StringUtils + .isNotBlank(logPropertiesHM.get(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGFILECOUNT))) { pulseConfig.setLogFileCount(Integer .parseInt(logPropertiesHM.get(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGFILECOUNT))); } // log message date pattern - if (StringUtils.isNotNullNotEmptyNotWhiteSpace( + if (StringUtils.isNotBlank( logPropertiesHM.get(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGDATEPATTERN))) { pulseConfig.setLogDatePattern( logPropertiesHM.get(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGDATEPATTERN)); } // log level - if (StringUtils.isNotNullNotEmptyNotWhiteSpace( - logPropertiesHM.get(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGLEVEL))) { + if (StringUtils + .isNotBlank(logPropertiesHM.get(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGLEVEL))) { pulseConfig.setLogLevel(Level.parse( logPropertiesHM.get(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGLEVEL).toUpperCase())); } // log append - if (StringUtils.isNotNullNotEmptyNotWhiteSpace( - logPropertiesHM.get(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGAPPEND))) { + if (StringUtils + .isNotBlank(logPropertiesHM.get(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGAPPEND))) { pulseConfig.setLogAppend(Boolean .valueOf(logPropertiesHM.get(PulseConstants.APPLICATION_PROPERTY_PULSE_LOGAPPEND))); } http://git-wip-us.apache.org/repos/asf/geode/blob/afc5e3a3/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/controllers/PulseController.java ---------------------------------------------------------------------- diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/controllers/PulseController.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/controllers/PulseController.java index 9b24393..12b6172 100644 --- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/controllers/PulseController.java +++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/controllers/PulseController.java @@ -17,18 +17,12 @@ package org.apache.geode.tools.pulse.internal.controllers; -import java.io.IOException; -import java.util.Collection; -import java.util.Iterator; -import java.util.List; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; -import com.sun.net.httpserver.Headers; +import org.apache.commons.lang.StringEscapeUtils; +import org.apache.commons.lang.StringUtils; import org.apache.geode.tools.pulse.internal.data.Cluster; import org.apache.geode.tools.pulse.internal.data.PulseConstants; import org.apache.geode.tools.pulse.internal.data.PulseVersion; @@ -37,14 +31,18 @@ import org.apache.geode.tools.pulse.internal.log.PulseLogWriter; import org.apache.geode.tools.pulse.internal.service.PulseService; import org.apache.geode.tools.pulse.internal.service.PulseServiceFactory; import org.apache.geode.tools.pulse.internal.service.SystemAlertsService; -import org.apache.geode.tools.pulse.internal.util.StringUtils; - -import org.apache.commons.lang.StringEscapeUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; +import java.io.IOException; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + /** * Class PulseController * @@ -350,7 +348,7 @@ public class PulseController { ObjectNode queryResult = mapper.createObjectNode(); try { - if (StringUtils.isNotNullNotEmptyNotWhiteSpace(query)) { + if (StringUtils.isNotBlank(query)) { // get cluster object Cluster cluster = Repository.get().getCluster(); String userName = request.getUserPrincipal().getName(); @@ -388,13 +386,13 @@ public class PulseController { // get query string action = request.getParameter(QUERYSTRING_PARAM_ACTION); - if (!StringUtils.isNotNullNotEmptyNotWhiteSpace(action)) { + if (StringUtils.isBlank(action)) { action = ACTION_VIEW; } if (action.toLowerCase().equalsIgnoreCase(ACTION_DELETE)) { String queryId = request.getParameter(QUERYSTRING_PARAM_QUERYID); - if (StringUtils.isNotNullNotEmptyNotWhiteSpace(queryId)) { + if (StringUtils.isNotBlank(queryId)) { boolean deleteStatus = cluster.deleteQueryById(userName, queryId); if (deleteStatus) { @@ -443,7 +441,7 @@ public class PulseController { ObjectNode queryResult = mapper.createObjectNode(); try { - if (StringUtils.isNotNullNotEmptyNotWhiteSpace(query)) { + if (StringUtils.isNotBlank(query)) { // get cluster object Cluster cluster = Repository.get().getCluster(); String userName = request.getUserPrincipal().getName(); http://git-wip-us.apache.org/repos/asf/geode/blob/afc5e3a3/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/Cluster.java ---------------------------------------------------------------------- diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/Cluster.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/Cluster.java index 083731b..e71388d 100644 --- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/Cluster.java +++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/Cluster.java @@ -22,8 +22,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; import org.apache.commons.collections.buffer.CircularFifoBuffer; +import org.apache.commons.lang.StringUtils; import org.apache.geode.tools.pulse.internal.log.PulseLogWriter; -import org.apache.geode.tools.pulse.internal.util.StringUtils; import java.io.BufferedReader; import java.io.File; @@ -441,9 +441,9 @@ public class Cluster extends Thread { } public String getHostnameForClients() { - if (StringUtils.isNotNullNotEmptyNotWhiteSpace(hostnameForClients)) + if (StringUtils.isNotBlank(hostnameForClients)) return this.hostnameForClients; - else if (StringUtils.isNotNullNotEmptyNotWhiteSpace(bindAddress)) + else if (StringUtils.isNotBlank(bindAddress)) return this.bindAddress; return null; } http://git-wip-us.apache.org/repos/asf/geode/blob/afc5e3a3/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/DataBrowser.java ---------------------------------------------------------------------- diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/DataBrowser.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/DataBrowser.java index d20be59..03077c2 100644 --- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/DataBrowser.java +++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/DataBrowser.java @@ -21,8 +21,8 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; +import org.apache.commons.lang.StringUtils; import org.apache.geode.tools.pulse.internal.log.PulseLogWriter; -import org.apache.geode.tools.pulse.internal.util.StringUtils; import java.io.File; import java.io.FileInputStream; @@ -59,8 +59,7 @@ public class DataBrowser { */ public boolean addQueryInHistory(String queryText, String userId) { boolean operationStatus = false; - if (StringUtils.isNotNullNotEmptyNotWhiteSpace(queryText) - && StringUtils.isNotNullNotEmptyNotWhiteSpace(userId)) { + if (StringUtils.isNotBlank(queryText) && StringUtils.isNotBlank(userId)) { // Fetch all queries from query log file ObjectNode queries = fetchAllQueriesFromFile(); @@ -92,8 +91,7 @@ public class DataBrowser { public boolean deleteQueryById(String userId, String queryId) { boolean operationStatus = false; - if (StringUtils.isNotNullNotEmptyNotWhiteSpace(queryId) - && StringUtils.isNotNullNotEmptyNotWhiteSpace(userId)) { + if (StringUtils.isNotBlank(queryId) && StringUtils.isNotBlank(userId)) { // Fetch all queries from query log file ObjectNode queries = fetchAllQueriesFromFile(); @@ -123,7 +121,7 @@ public class DataBrowser { ArrayNode queryList = mapper.createArrayNode(); - if (StringUtils.isNotNullNotEmptyNotWhiteSpace(userId)) { + if (StringUtils.isNotBlank(userId)) { // Fetch all queries from query log file ObjectNode queries = fetchAllQueriesFromFile(); http://git-wip-us.apache.org/repos/asf/geode/blob/afc5e3a3/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/JMXDataUpdater.java ---------------------------------------------------------------------- diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/JMXDataUpdater.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/JMXDataUpdater.java index 758ad4b..9633b9a 100644 --- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/JMXDataUpdater.java +++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/data/JMXDataUpdater.java @@ -19,9 +19,9 @@ package org.apache.geode.tools.pulse.internal.data; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; +import org.apache.commons.lang.StringUtils; import org.apache.geode.tools.pulse.internal.data.JmxManagerFinder.JmxManagerInfo; import org.apache.geode.tools.pulse.internal.log.PulseLogWriter; -import org.apache.geode.tools.pulse.internal.util.StringUtils; import java.io.IOException; import java.io.PrintWriter; @@ -115,11 +115,7 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener { this.MBEAN_OBJECT_NAME_STATEMENT_DISTRIBUTED = new ObjectName(PulseConstants.OBJECT_NAME_STATEMENT_DISTRIBUTED); - } catch (MalformedObjectNameException e) { - if (LOGGER.severeEnabled()) { - LOGGER.severe(e.getMessage(), e); - } - } catch (NullPointerException e) { + } catch (MalformedObjectNameException | NullPointerException e) { if (LOGGER.severeEnabled()) { LOGGER.severe(e.getMessage(), e); } @@ -234,7 +230,7 @@ public class JMXDataUpdater implements IClusterUpdater, NotificationListener { jmxSerURL = formJMXServiceURLString(this.serverName, this.port); } - if (StringUtils.isNotNullNotEmptyNotWhiteSpace(jmxSerURL)) { + if (StringUtils.isNotBlank(jmxSerURL)) { JMXServiceURL url = new JMXServiceURL(jmxSerURL); String[] creds = {this.cluster.getJmxUserName(), this.cluster.getJmxUserPassword()}; Map<String, Object> env = new HashMap<String, Object>(); http://git-wip-us.apache.org/repos/asf/geode/blob/afc5e3a3/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterRegionService.java ---------------------------------------------------------------------- diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterRegionService.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterRegionService.java index 2e0a6f4..57ea397 100644 --- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterRegionService.java +++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterRegionService.java @@ -20,22 +20,21 @@ package org.apache.geode.tools.pulse.internal.service; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; -import org.apache.geode.tools.pulse.internal.controllers.PulseController; +import org.apache.commons.lang.StringUtils; import org.apache.geode.tools.pulse.internal.data.Cluster; import org.apache.geode.tools.pulse.internal.data.PulseConstants; import org.apache.geode.tools.pulse.internal.data.Repository; -import org.apache.geode.tools.pulse.internal.util.StringUtils; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; import org.springframework.stereotype.Service; -import javax.servlet.http.HttpServletRequest; import java.text.DecimalFormat; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; import java.util.List; import java.util.Map; +import javax.servlet.http.HttpServletRequest; /** * Class ClusterRegionService @@ -160,7 +159,7 @@ public class ClusterRegionService implements PulseService { } String regCompCodec = reg.getCompressionCodec(); - if (StringUtils.isNotNullNotEmptyNotWhiteSpace(regCompCodec)) { + if (StringUtils.isNotBlank(regCompCodec)) { regionJSON.put("compressionCodec", reg.getCompressionCodec()); } else { regionJSON.put("compressionCodec", VALUE_NA); http://git-wip-us.apache.org/repos/asf/geode/blob/afc5e3a3/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterRegionsService.java ---------------------------------------------------------------------- diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterRegionsService.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterRegionsService.java index 7993742..35cfd5b 100644 --- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterRegionsService.java +++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterRegionsService.java @@ -20,22 +20,21 @@ package org.apache.geode.tools.pulse.internal.service; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; -import org.apache.geode.tools.pulse.internal.controllers.PulseController; +import org.apache.commons.lang.StringUtils; import org.apache.geode.tools.pulse.internal.data.Cluster; import org.apache.geode.tools.pulse.internal.data.PulseConstants; import org.apache.geode.tools.pulse.internal.data.Repository; -import org.apache.geode.tools.pulse.internal.util.StringUtils; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; import org.springframework.stereotype.Service; -import javax.servlet.http.HttpServletRequest; import java.text.DecimalFormat; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; import java.util.List; import java.util.Map; +import javax.servlet.http.HttpServletRequest; /** * Class ClusterRegionsService @@ -154,7 +153,7 @@ public class ClusterRegionsService implements PulseService { } String regCompCodec = reg.getCompressionCodec(); - if (StringUtils.isNotNullNotEmptyNotWhiteSpace(regCompCodec)) { + if (StringUtils.isNotBlank(regCompCodec)) { regionJSON.put("compressionCodec", reg.getCompressionCodec()); } else { regionJSON.put("compressionCodec", this.VALUE_NA); @@ -179,7 +178,7 @@ public class ClusterRegionsService implements PulseService { String entrySizeInMB = form.format(entrySize / (1024f * 1024f)); if (entrySize < 0) { - regionJSON.put(this.ENTRY_SIZE, this.VALUE_NA); + regionJSON.put(this.ENTRY_SIZE, VALUE_NA); } else { regionJSON.put(this.ENTRY_SIZE, entrySizeInMB); } http://git-wip-us.apache.org/repos/asf/geode/blob/afc5e3a3/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterSelectedRegionService.java ---------------------------------------------------------------------- diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterSelectedRegionService.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterSelectedRegionService.java index e94ef63..a088ccb 100644 --- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterSelectedRegionService.java +++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/ClusterSelectedRegionService.java @@ -21,23 +21,22 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; -import org.apache.geode.tools.pulse.internal.controllers.PulseController; +import org.apache.commons.lang.StringUtils; import org.apache.geode.tools.pulse.internal.data.Cluster; import org.apache.geode.tools.pulse.internal.data.PulseConstants; import org.apache.geode.tools.pulse.internal.data.Repository; import org.apache.geode.tools.pulse.internal.log.PulseLogWriter; -import org.apache.geode.tools.pulse.internal.util.StringUtils; import org.apache.geode.tools.pulse.internal.util.TimeUtils; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; import org.springframework.stereotype.Service; -import javax.servlet.http.HttpServletRequest; import java.text.DecimalFormat; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; import java.util.List; +import javax.servlet.http.HttpServletRequest; /** * Class ClusterSelectedRegionService @@ -186,7 +185,7 @@ public class ClusterSelectedRegionService implements PulseService { reg.isEnableOffHeapMemory() ? PulseService.VALUE_ON : PulseService.VALUE_OFF); String regCompCodec = reg.getCompressionCodec(); - if (StringUtils.isNotNullNotEmptyNotWhiteSpace(regCompCodec)) { + if (StringUtils.isNotBlank(regCompCodec)) { regionJSON.put("compressionCodec", reg.getCompressionCodec()); } else { regionJSON.put("compressionCodec", PulseService.VALUE_NA); http://git-wip-us.apache.org/repos/asf/geode/blob/afc5e3a3/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberAsynchEventQueuesService.java ---------------------------------------------------------------------- diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberAsynchEventQueuesService.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberAsynchEventQueuesService.java index e421ea0..2c66b23 100644 --- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberAsynchEventQueuesService.java +++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberAsynchEventQueuesService.java @@ -17,13 +17,14 @@ package org.apache.geode.tools.pulse.internal.service; +import static org.apache.geode.tools.pulse.internal.util.NameUtil.makeCompliantName; + import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; import org.apache.geode.tools.pulse.internal.data.Cluster; import org.apache.geode.tools.pulse.internal.data.Repository; -import org.apache.geode.tools.pulse.internal.util.StringUtils; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; import org.springframework.stereotype.Service; @@ -57,7 +58,7 @@ public class MemberAsynchEventQueuesService implements PulseService { String memberName = requestDataJSON.get("MemberAsynchEventQueues").get("memberName").textValue(); - Cluster.Member clusterMember = cluster.getMember(StringUtils.makeCompliantName(memberName)); + Cluster.Member clusterMember = cluster.getMember(makeCompliantName(memberName)); if (clusterMember != null) { // response http://git-wip-us.apache.org/repos/asf/geode/blob/afc5e3a3/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberClientsService.java ---------------------------------------------------------------------- diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberClientsService.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberClientsService.java index 2486fd4..3eed748 100644 --- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberClientsService.java +++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberClientsService.java @@ -17,13 +17,14 @@ package org.apache.geode.tools.pulse.internal.service; +import static org.apache.geode.tools.pulse.internal.util.NameUtil.makeCompliantName; + import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; import org.apache.geode.tools.pulse.internal.data.Cluster; import org.apache.geode.tools.pulse.internal.data.Repository; -import org.apache.geode.tools.pulse.internal.util.StringUtils; import org.apache.geode.tools.pulse.internal.util.TimeUtils; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; @@ -62,7 +63,7 @@ public class MemberClientsService implements PulseService { ArrayNode clientListJson = mapper.createArrayNode(); - Cluster.Member clusterMember = cluster.getMember(StringUtils.makeCompliantName(memberName)); + Cluster.Member clusterMember = cluster.getMember(makeCompliantName(memberName)); if (clusterMember != null) { responseJSON.put("memberId", clusterMember.getId()); responseJSON.put(this.NAME, clusterMember.getName()); @@ -83,7 +84,7 @@ public class MemberClientsService implements PulseService { memberClient.isSubscriptionEnabled() ? "Yes" : "No"); regionJSON.put("uptime", TimeUtils.convertTimeSecondsToHMS(memberClient.getUptime())); - regionJSON.put("cpuUsage", String.format("%.4f", memberClient.getCpuUsage()).toString()); + regionJSON.put("cpuUsage", String.format("%.4f", memberClient.getCpuUsage())); // regionJSON.put("cpuUsage", memberClient.getCpuUsage()); regionJSON.put("threads", memberClient.getThreads()); regionJSON.put("gets", memberClient.getGets()); http://git-wip-us.apache.org/repos/asf/geode/blob/afc5e3a3/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberDetailsService.java ---------------------------------------------------------------------- diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberDetailsService.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberDetailsService.java index c311c67..f82727a 100644 --- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberDetailsService.java +++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberDetailsService.java @@ -17,20 +17,20 @@ package org.apache.geode.tools.pulse.internal.service; +import static org.apache.geode.tools.pulse.internal.util.NameUtil.makeCompliantName; + import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; -import org.apache.geode.tools.pulse.internal.controllers.PulseController; import org.apache.geode.tools.pulse.internal.data.Cluster; import org.apache.geode.tools.pulse.internal.data.PulseConstants; import org.apache.geode.tools.pulse.internal.data.Repository; -import org.apache.geode.tools.pulse.internal.util.StringUtils; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; import org.springframework.stereotype.Service; -import javax.servlet.http.HttpServletRequest; import java.text.DecimalFormat; +import javax.servlet.http.HttpServletRequest; /** * Class MemberDetailsService @@ -60,7 +60,7 @@ public class MemberDetailsService implements PulseService { String memberName = requestDataJSON.get("MemberDetails").get("memberName").textValue(); DecimalFormat df2 = new DecimalFormat(PulseConstants.DECIMAL_FORMAT_PATTERN); - Cluster.Member clusterMember = cluster.getMember(StringUtils.makeCompliantName(memberName)); + Cluster.Member clusterMember = cluster.getMember(makeCompliantName(memberName)); if (clusterMember != null) { responseJSON.put("memberId", clusterMember.getId()); responseJSON.put("name", clusterMember.getName()); http://git-wip-us.apache.org/repos/asf/geode/blob/afc5e3a3/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberDiskThroughputService.java ---------------------------------------------------------------------- diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberDiskThroughputService.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberDiskThroughputService.java index 98d094f..644661b 100644 --- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberDiskThroughputService.java +++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberDiskThroughputService.java @@ -17,12 +17,13 @@ package org.apache.geode.tools.pulse.internal.service; +import static org.apache.geode.tools.pulse.internal.util.NameUtil.makeCompliantName; + import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; import org.apache.geode.tools.pulse.internal.data.Cluster; import org.apache.geode.tools.pulse.internal.data.Repository; -import org.apache.geode.tools.pulse.internal.util.StringUtils; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; import org.springframework.stereotype.Service; @@ -56,7 +57,7 @@ public class MemberDiskThroughputService implements PulseService { JsonNode requestDataJSON = mapper.readTree(request.getParameter("pulseData")); String memberName = requestDataJSON.get("MemberDiskThroughput").get("memberName").textValue(); - Cluster.Member clusterMember = cluster.getMember(StringUtils.makeCompliantName(memberName)); + Cluster.Member clusterMember = cluster.getMember(makeCompliantName(memberName)); if (clusterMember != null) { // response http://git-wip-us.apache.org/repos/asf/geode/blob/afc5e3a3/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberGCPausesService.java ---------------------------------------------------------------------- diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberGCPausesService.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberGCPausesService.java index 1a34b0a..a967bf1 100644 --- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberGCPausesService.java +++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberGCPausesService.java @@ -17,12 +17,13 @@ package org.apache.geode.tools.pulse.internal.service; +import static org.apache.geode.tools.pulse.internal.util.NameUtil.makeCompliantName; + import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; import org.apache.geode.tools.pulse.internal.data.Cluster; import org.apache.geode.tools.pulse.internal.data.Repository; -import org.apache.geode.tools.pulse.internal.util.StringUtils; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; import org.springframework.stereotype.Service; @@ -56,7 +57,7 @@ public class MemberGCPausesService implements PulseService { // members list JsonNode requestDataJSON = mapper.readTree(request.getParameter("pulseData")); String memberName = requestDataJSON.get("MemberGCPauses").get("memberName").textValue(); - Cluster.Member clusterMember = cluster.getMember(StringUtils.makeCompliantName(memberName)); + Cluster.Member clusterMember = cluster.getMember(makeCompliantName(memberName)); if (clusterMember != null) { // response http://git-wip-us.apache.org/repos/asf/geode/blob/afc5e3a3/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberGatewayHubService.java ---------------------------------------------------------------------- diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberGatewayHubService.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberGatewayHubService.java index c9b40fd..2ac5d14 100644 --- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberGatewayHubService.java +++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberGatewayHubService.java @@ -17,11 +17,7 @@ package org.apache.geode.tools.pulse.internal.service; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; +import static org.apache.geode.tools.pulse.internal.util.NameUtil.makeCompliantName; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; @@ -29,11 +25,15 @@ import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; import org.apache.geode.tools.pulse.internal.data.Cluster; import org.apache.geode.tools.pulse.internal.data.Repository; -import org.apache.geode.tools.pulse.internal.util.StringUtils; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import javax.servlet.http.HttpServletRequest; + /** * Class MemberGatewayHubService * @@ -60,7 +60,7 @@ public class MemberGatewayHubService implements PulseService { JsonNode requestDataJSON = mapper.readTree(request.getParameter("pulseData")); String memberName = requestDataJSON.get("MemberGatewayHub").get("memberName").textValue(); - Cluster.Member clusterMember = cluster.getMember(StringUtils.makeCompliantName(memberName)); + Cluster.Member clusterMember = cluster.getMember(makeCompliantName(memberName)); if (clusterMember != null) { // response http://git-wip-us.apache.org/repos/asf/geode/blob/afc5e3a3/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberHeapUsageService.java ---------------------------------------------------------------------- diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberHeapUsageService.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberHeapUsageService.java index 1a7c54f..15af527 100644 --- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberHeapUsageService.java +++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberHeapUsageService.java @@ -17,12 +17,13 @@ package org.apache.geode.tools.pulse.internal.service; +import static org.apache.geode.tools.pulse.internal.util.NameUtil.makeCompliantName; + import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; import org.apache.geode.tools.pulse.internal.data.Cluster; import org.apache.geode.tools.pulse.internal.data.Repository; -import org.apache.geode.tools.pulse.internal.util.StringUtils; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; import org.springframework.stereotype.Service; @@ -56,7 +57,7 @@ public class MemberHeapUsageService implements PulseService { JsonNode requestDataJSON = mapper.readTree(request.getParameter("pulseData")); String memberName = requestDataJSON.get("MemberHeapUsage").get("memberName").textValue(); - Cluster.Member clusterMember = cluster.getMember(StringUtils.makeCompliantName(memberName)); + Cluster.Member clusterMember = cluster.getMember(makeCompliantName(memberName)); if (clusterMember != null) { // response @@ -68,4 +69,5 @@ public class MemberHeapUsageService implements PulseService { // Send json response return responseJSON; } + } http://git-wip-us.apache.org/repos/asf/geode/blob/afc5e3a3/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberKeyStatisticsService.java ---------------------------------------------------------------------- diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberKeyStatisticsService.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberKeyStatisticsService.java index ef6ccb8..629bac6 100644 --- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberKeyStatisticsService.java +++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberKeyStatisticsService.java @@ -17,12 +17,13 @@ package org.apache.geode.tools.pulse.internal.service; +import static org.apache.geode.tools.pulse.internal.util.NameUtil.makeCompliantName; + import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; import org.apache.geode.tools.pulse.internal.data.Cluster; import org.apache.geode.tools.pulse.internal.data.Repository; -import org.apache.geode.tools.pulse.internal.util.StringUtils; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; import org.springframework.stereotype.Service; @@ -54,7 +55,7 @@ public class MemberKeyStatisticsService implements PulseService { JsonNode requestDataJSON = mapper.readTree(request.getParameter("pulseData")); String memberName = requestDataJSON.get("MemberKeyStatistics").get("memberName").textValue(); - Cluster.Member clusterMember = cluster.getMember(StringUtils.makeCompliantName(memberName)); + Cluster.Member clusterMember = cluster.getMember(makeCompliantName(memberName)); if (clusterMember != null) { // response http://git-wip-us.apache.org/repos/asf/geode/blob/afc5e3a3/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberRegionsService.java ---------------------------------------------------------------------- diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberRegionsService.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberRegionsService.java index c8addd9..583f478 100644 --- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberRegionsService.java +++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/MemberRegionsService.java @@ -17,21 +17,22 @@ package org.apache.geode.tools.pulse.internal.service; +import static org.apache.geode.tools.pulse.internal.util.NameUtil.makeCompliantName; + import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; -import org.apache.geode.tools.pulse.internal.controllers.PulseController; +import org.apache.commons.lang.StringUtils; import org.apache.geode.tools.pulse.internal.data.Cluster; import org.apache.geode.tools.pulse.internal.data.PulseConstants; import org.apache.geode.tools.pulse.internal.data.Repository; -import org.apache.geode.tools.pulse.internal.util.StringUtils; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; import org.springframework.stereotype.Service; -import javax.servlet.http.HttpServletRequest; import java.text.DecimalFormat; +import javax.servlet.http.HttpServletRequest; /** * Class MemberRegionsService @@ -65,7 +66,7 @@ public class MemberRegionsService implements PulseService { JsonNode requestDataJSON = mapper.readTree(request.getParameter("pulseData")); String memberName = requestDataJSON.get("MemberRegions").get("memberName").textValue(); - Cluster.Member clusterMember = cluster.getMember(StringUtils.makeCompliantName(memberName)); + Cluster.Member clusterMember = cluster.getMember(makeCompliantName(memberName)); if (clusterMember != null) { responseJSON.put("memberId", clusterMember.getId()); @@ -89,17 +90,17 @@ public class MemberRegionsService implements PulseService { String entrySizeInMB = form.format(entrySize / (1024f * 1024f)); if (entrySize < 0) { - regionJSON.put(this.ENTRY_SIZE, this.VALUE_NA); + regionJSON.put(this.ENTRY_SIZE, VALUE_NA); } else { regionJSON.put(this.ENTRY_SIZE, entrySizeInMB); } regionJSON.put("scope", memberRegion.getScope()); String diskStoreName = memberRegion.getDiskStoreName(); - if (StringUtils.isNotNullNotEmptyNotWhiteSpace(diskStoreName)) { + if (StringUtils.isNotBlank(diskStoreName)) { regionJSON.put(this.DISC_STORE_NAME, diskStoreName); regionJSON.put(this.DISC_SYNCHRONOUS, memberRegion.isDiskSynchronous()); } else { - regionJSON.put(this.DISC_SYNCHRONOUS, this.VALUE_NA); + regionJSON.put(this.DISC_SYNCHRONOUS, VALUE_NA); regionJSON.put(this.DISC_STORE_NAME, ""); } regionJSON.put("gatewayEnabled", memberRegion.getWanEnabled()); http://git-wip-us.apache.org/repos/asf/geode/blob/afc5e3a3/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/SystemAlertsService.java ---------------------------------------------------------------------- diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/SystemAlertsService.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/SystemAlertsService.java index d7f119b..0403c5e 100644 --- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/SystemAlertsService.java +++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/service/SystemAlertsService.java @@ -21,9 +21,9 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; +import org.apache.commons.lang.StringUtils; import org.apache.geode.tools.pulse.internal.data.Cluster; import org.apache.geode.tools.pulse.internal.data.Repository; -import org.apache.geode.tools.pulse.internal.util.StringUtils; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; import org.springframework.stereotype.Service; @@ -57,7 +57,7 @@ public class SystemAlertsService implements PulseService { JsonNode requestDataJSON = mapper.readTree(request.getParameter("pulseData")); int pageNumber = 1; // Default String strPageNumber = requestDataJSON.get("SystemAlerts").get("pageNumber").textValue(); - if (StringUtils.isNotNullNotEmptyNotWhiteSpace(strPageNumber)) { + if (StringUtils.isNotBlank(strPageNumber)) { try { pageNumber = Integer.valueOf(strPageNumber); } catch (NumberFormatException e) { http://git-wip-us.apache.org/repos/asf/geode/blob/afc5e3a3/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/util/NameUtil.java ---------------------------------------------------------------------- diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/util/NameUtil.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/util/NameUtil.java new file mode 100644 index 0000000..3340d6b --- /dev/null +++ b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/util/NameUtil.java @@ -0,0 +1,38 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. You may obtain a + * copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the License + * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express + * or implied. See the License for the specific language governing permissions and limitations under + * the License. + * + */ +package org.apache.geode.tools.pulse.internal.util; + +public class NameUtil { + /** + * Checking for String that is not null, not empty, and not white space only using standard Java + * classes. + * + * @param value String to be made compliant. + * @return string compliant string. + */ + public static String makeCompliantName(String value) { + value = value.replace(':', '-'); + value = value.replace(',', '-'); + value = value.replace('=', '-'); + value = value.replace('*', '-'); + value = value.replace('?', '-'); + if (value.length() < 1) { + value = "nothing"; + } + return value; + } +} http://git-wip-us.apache.org/repos/asf/geode/blob/afc5e3a3/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/util/StringUtils.java ---------------------------------------------------------------------- diff --git a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/util/StringUtils.java b/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/util/StringUtils.java deleted file mode 100644 index df7c5a5..0000000 --- a/geode-pulse/src/main/java/org/apache/geode/tools/pulse/internal/util/StringUtils.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one or more contributor license - * agreements. See the NOTICE file distributed with this work for additional information regarding - * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. You may obtain a - * copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License - * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing permissions and limitations under - * the License. - * - */ - -package org.apache.geode.tools.pulse.internal.util; - -/** - * Class StringUtils This is utility class for string. - * - * - * @since GemFire version 7.0.1 - */ -public class StringUtils { - /** - * Checks the string if it is not null, not empty, and not white space only using standard Java - * classes. - * - * @param string String to be checked. - * @return {@code true} if provided String is not null, is not empty, and has at least one - * character that is not considered white space. - */ - public static boolean isNotNullNotEmptyNotWhiteSpace(final String string) { - return string != null && !string.isEmpty() && !string.trim().isEmpty(); - } - - /** - * Checking for String that is not null, not empty, and not white space only using standard Java - * classes. - * - * @param value String to be made compliant. - * @return string compliant string. - */ - public static String makeCompliantName(String value) { - value = value.replace(':', '-'); - value = value.replace(',', '-'); - value = value.replace('=', '-'); - value = value.replace('*', '-'); - value = value.replace('?', '-'); - if (value.length() < 1) { - value = "nothing"; - } - return value; - } - - /** - * Function to get table name derived from region name/full path - * - * @param regionName String to be made compliant. - * @return string compliant string. - */ - public static String getTableNameFromRegionName(String regionName) { - String tableName = regionName.replaceFirst("/", "").replace('/', '.'); - return tableName; - } - - /** - * Function to get region name/full path derived from table name - * - * @param tableName String to be made compliant. - * @return string compliant string. - */ - public static String getRegionNameFromTableName(String tableName) { - String regionName = "/" + tableName.replace('.', '/'); - return regionName; - } -}
