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 2021/01/17 03:14:40 UTC
[commons-configuration] branch master updated: Use isEmpty().
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
The following commit(s) were added to refs/heads/master by this push:
new 96d89f8 Use isEmpty().
96d89f8 is described below
commit 96d89f8159d10b83472329e3f5046ec9c63ca5fd
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jan 16 22:14:35 2021 -0500
Use isEmpty().
---
.../java/org/apache/commons/configuration2/interpol/ExprLookup.java | 2 +-
.../configuration2/TestAbstractConfigurationSynchronization.java | 2 +-
.../org/apache/commons/configuration2/TestPropertiesSequence.java | 5 +++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/apache/commons/configuration2/interpol/ExprLookup.java b/src/main/java/org/apache/commons/configuration2/interpol/ExprLookup.java
index e9fa90a..431591d 100644
--- a/src/main/java/org/apache/commons/configuration2/interpol/ExprLookup.java
+++ b/src/main/java/org/apache/commons/configuration2/interpol/ExprLookup.java
@@ -323,7 +323,7 @@ public class ExprLookup implements Lookup
public Variable getVariable()
{
- return size() > 0 ? get(size() - 1) : null;
+ return !isEmpty() ? get(size() - 1) : null;
}
}
diff --git a/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationSynchronization.java b/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationSynchronization.java
index 720b597..d9ea4ec 100644
--- a/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationSynchronization.java
+++ b/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationSynchronization.java
@@ -199,7 +199,7 @@ public class TestAbstractConfigurationSynchronization
@Test
public void testSizeSynchronized()
{
- assertTrue("Wrong size", config.size() > 0);
+ assertFalse("Wrong size", config.isEmpty());
sync.verify(Methods.BEGIN_READ, Methods.END_READ);
}
diff --git a/src/test/java/org/apache/commons/configuration2/TestPropertiesSequence.java b/src/test/java/org/apache/commons/configuration2/TestPropertiesSequence.java
index e4c30dc..3ea8a43 100644
--- a/src/test/java/org/apache/commons/configuration2/TestPropertiesSequence.java
+++ b/src/test/java/org/apache/commons/configuration2/TestPropertiesSequence.java
@@ -19,6 +19,7 @@ package org.apache.commons.configuration2;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
import java.util.Iterator;
import java.util.List;
@@ -57,7 +58,7 @@ public class TestPropertiesSequence
final List<String> keysSimpleConfiguration = ConfigurationAssert.keysToList(a);
final List<String> keysCompositeConfiguration = ConfigurationAssert.keysToList(b);
- assertTrue("Size:" + keysSimpleConfiguration.size(), keysSimpleConfiguration.size() > 0);
+ assertFalse("Size:" + keysSimpleConfiguration.size(), keysSimpleConfiguration.isEmpty());
assertEquals(keysSimpleConfiguration.size(), keysCompositeConfiguration.size());
for (int i = 0; i < keysSimpleConfiguration.size(); i++)
@@ -93,7 +94,7 @@ public class TestPropertiesSequence
final List<String> keysSimpleConfiguration = ConfigurationAssert.keysToList(a);
final List<String> keysCompositeConfiguration = ConfigurationAssert.keysToList(b);
- assertTrue("Size:" + keysSimpleConfiguration.size(), keysSimpleConfiguration.size() > 0);
+ assertFalse("Size:" + keysSimpleConfiguration.size(), keysSimpleConfiguration.isEmpty());
assertEquals(keysSimpleConfiguration.size(), keysCompositeConfiguration.size());
for (int i = 0; i < keysSimpleConfiguration.size(); i++)