You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2022/10/06 00:45:29 UTC
[commons-configuration] 01/03: StringUtils.isEmpty(key)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-configuration.git
commit 76162a82a2badc5bcb1c8571019f0f9b29a791b1
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Wed Oct 5 20:39:50 2022 -0400
StringUtils.isEmpty(key)
---
.../java/org/apache/commons/configuration2/AbstractConfiguration.java | 3 ++-
.../java/org/apache/commons/configuration2/SubsetConfiguration.java | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java b/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java
index 0d0be638..66b52ea8 100644
--- a/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java
@@ -51,6 +51,7 @@ import org.apache.commons.configuration2.sync.Synchronizer;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.ClassUtils;
import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
/**
* <p>
@@ -922,7 +923,7 @@ public abstract class AbstractConfiguration extends BaseEventSource implements C
final String pkey = token.substring(0, equalSign).trim();
final String pvalue = token.substring(equalSign + 1).trim();
props.put(pkey, pvalue);
- } else if (tokens.length == 1 && "".equals(token)) {
+ } else if (tokens.length == 1 && StringUtils.isEmpty(key)) {
// Semantically equivalent to an empty Properties
// object.
break;
diff --git a/src/main/java/org/apache/commons/configuration2/SubsetConfiguration.java b/src/main/java/org/apache/commons/configuration2/SubsetConfiguration.java
index 3924ea58..ea86addf 100644
--- a/src/main/java/org/apache/commons/configuration2/SubsetConfiguration.java
+++ b/src/main/java/org/apache/commons/configuration2/SubsetConfiguration.java
@@ -20,6 +20,7 @@ package org.apache.commons.configuration2;
import java.util.Iterator;
import org.apache.commons.configuration2.convert.ListDelimiterHandler;
+import org.apache.commons.lang3.StringUtils;
/**
* <p>
@@ -79,7 +80,7 @@ public class SubsetConfiguration extends AbstractConfiguration {
* @return the key as to be used by the parent
*/
protected String getParentKey(final String key) {
- if ("".equals(key) || key == null) {
+ if (StringUtils.isEmpty(key)) {
return prefix;
}
return delimiter == null ? prefix + key : prefix + delimiter + key;