[jmeter] branch master updated: Use StringUtils#defaultIfBlank instead of simulating it

[fs...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git


The following commit(s) were added to refs/heads/master by this push:
     new 1d7cc1b  Use StringUtils#defaultIfBlank instead of simulating it
1d7cc1b is described below

commit 1d7cc1b07344d93ece3e39c0935d5f8af4ab064d
Author: Felix Schumacher <fe...@internetallee.de>
AuthorDate: Tue Jun 23 19:16:59 2020 +0200

    Use StringUtils#defaultIfBlank instead of simulating it
---
 .../jmeter/report/processor/graph/AbstractSeriesSelector.java      | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractSeriesSelector.java b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractSeriesSelector.java
index cbd991f..1b3c871 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractSeriesSelector.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractSeriesSelector.java
@@ -63,12 +63,9 @@ public abstract class AbstractSeriesSelector implements GraphSeriesSelector {
     /**
      * @param value String value
      * @param defaultValue Default value to use if value is empty or null
-     * @return Iterable 
+     * @return input or default value wrapped in a list
      */
     protected Iterable<String> withDefaultIfEmpty(String value, String defaultValue) {
-        if (StringUtils.isEmpty(value)) {
-            value = defaultValue;
-        }
-        return Arrays.asList(value);
+        return Arrays.asList(StringUtils.defaultIfBlank(value, defaultValue));
     }
 }