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/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new 54a278178 Use String#isEmpty (Java 6 API)
54a278178 is described below
commit 54a2781788a9e331e5934aeefde6edb9b387d5c4
Author: Gary Gregory <[email protected]>
AuthorDate: Tue Nov 28 11:23:58 2023 -0500
Use String#isEmpty (Java 6 API)
---
.../src/main/java/org/apache/juneau/config/internal/ConfigMap.java | 2 +-
.../juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java | 2 +-
juneau-utest/src/test/java/org/apache/juneau/config/ConfigTest.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMap.java
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMap.java
index 781aeeae4..51bb45cab 100644
---
a/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMap.java
+++
b/juneau-core/juneau-config/src/main/java/org/apache/juneau/config/internal/ConfigMap.java
@@ -874,7 +874,7 @@ public class ConfigMap implements ConfigStoreListener {
for (String s : preLines)
w.append(s).append('\n');
- if (! name.equals(""))
+ if (! name.isEmpty())
w.append(rawLine).append('\n');
else {
// Need separation between default prelines and
first-entry prelines.
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
index e37739100..e2eeda852 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
@@ -920,7 +920,7 @@ public class BeanSession extends ContextSession {
}
private static final boolean isNullOrEmpty(Object o) {
- return o == null || o.toString().equals("") ||
o.toString().equals("null");
+ return o == null || o.toString().isEmpty() ||
o.toString().equals("null");
}
private static int getMultiplier(String s) {
diff --git
a/juneau-utest/src/test/java/org/apache/juneau/config/ConfigTest.java
b/juneau-utest/src/test/java/org/apache/juneau/config/ConfigTest.java
index 6dea8c468..cdf772208 100644
--- a/juneau-utest/src/test/java/org/apache/juneau/config/ConfigTest.java
+++ b/juneau-utest/src/test/java/org/apache/juneau/config/ConfigTest.java
@@ -1258,7 +1258,7 @@ public class ConfigTest {
cf.addListener(events -> {
for (ConfigEvent ce : events) {
- String key = (ce.getSection().equals("") ? "" :
(ce.getSection() + '/')) + ce.getKey();
+ String key = (ce.getSection().isEmpty() ? "" :
(ce.getSection() + '/')) + ce.getKey();
if (ce.getType() == ConfigEventType.REMOVE_ENTRY) {
changes.add("REMOVE_ENTRY(" + key + ")");
} else if (ce.getType() == ConfigEventType.REMOVE_SECTION) {
