You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2021/01/17 21:10:08 UTC
[logging-log4j2] branch release-2.x updated: Use isEmpty().
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/release-2.x by this push:
new e910e39 Use isEmpty().
e910e39 is described below
commit e910e395c4b2e524f12f91296f768e2a67c26794
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Jan 17 16:10:02 2021 -0500
Use isEmpty().
---
log4j-1.2-api/src/test/java/org/apache/log4j/CategoryTest.java | 6 +++---
.../logging/log4j/spi/CopyOnWriteSortedArrayThreadContextMap.java | 2 +-
.../java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java | 2 +-
.../org/apache/logging/log4j/spi/DefaultThreadContextStack.java | 6 +++---
.../logging/log4j/spi/GarbageFreeSortedArrayThreadContextMap.java | 2 +-
.../org/apache/logging/log4j/core/impl/Log4jContextFactory.java | 2 +-
.../org/apache/logging/log4j/core/pattern/MdcPatternConverter.java | 4 ++--
.../src/test/java/org/apache/logging/log4j/core/Log4j1222Test.java | 2 +-
.../src/main/java/org/apache/logging/log4j/jmx/gui/Client.java | 2 +-
.../java/org/apache/logging/log4j/perf/nogc/OpenHashStringMap.java | 2 +-
.../src/main/java/org/apache/logging/log4j/taglib/EntryTag.java | 2 +-
11 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/CategoryTest.java b/log4j-1.2-api/src/test/java/org/apache/log4j/CategoryTest.java
index 6ea36c9..b25aeb4 100644
--- a/log4j-1.2-api/src/test/java/org/apache/log4j/CategoryTest.java
+++ b/log4j-1.2-api/src/test/java/org/apache/log4j/CategoryTest.java
@@ -118,7 +118,7 @@ public class CategoryTest {
logger.setLevel(Level.ERROR);
final Priority debug = Level.DEBUG;
logger.l7dlog(debug, "Hello, World", null);
- assertTrue(appender.getEvents().size() == 0);
+ assertTrue(appender.getEvents().isEmpty());
}
/**
@@ -130,7 +130,7 @@ public class CategoryTest {
logger.setLevel(Level.ERROR);
final Priority debug = Level.DEBUG;
logger.l7dlog(debug, "Hello, World", new Object[0], null);
- assertTrue(appender.getEvents().size() == 0);
+ assertTrue(appender.getEvents().isEmpty());
}
/**
@@ -149,7 +149,7 @@ public class CategoryTest {
// the next line will throw an exception if the LogManager loggers
// aren't supported by 1.2 Logger/Category
logger.l7dlog(debug, "Hello, World", new Object[0], null);
- assertTrue(appender.getEvents().size() == 0);
+ assertTrue(appender.getEvents().isEmpty());
}
/**
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/CopyOnWriteSortedArrayThreadContextMap.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/CopyOnWriteSortedArrayThreadContextMap.java
index 12f7b11..0bd8559 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/CopyOnWriteSortedArrayThreadContextMap.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/CopyOnWriteSortedArrayThreadContextMap.java
@@ -235,7 +235,7 @@ class CopyOnWriteSortedArrayThreadContextMap implements ReadOnlyThreadContextMap
@Override
public boolean isEmpty() {
final StringMap map = localMap.get();
- return map == null || map.size() == 0;
+ return map == null || map.isEmpty();
}
@Override
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java
index 472b35a..fe2e353 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java
@@ -197,7 +197,7 @@ public class DefaultThreadContextMap implements ThreadContextMap, ReadOnlyString
@Override
public boolean isEmpty() {
final Map<String, String> map = localMap.get();
- return map == null || map.size() == 0;
+ return map == null || map.isEmpty();
}
@Override
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextStack.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextStack.java
index 7a07a89..e7a0f87 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextStack.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/DefaultThreadContextStack.java
@@ -170,7 +170,7 @@ public class DefaultThreadContextStack implements ThreadContextStack, StringBuil
@Override
public String peek() {
final MutableThreadContextStack values = STACK.get();
- if (values == null || values.size() == 0) {
+ if (values == null || values.isEmpty()) {
return Strings.EMPTY;
}
return values.peek();
@@ -182,7 +182,7 @@ public class DefaultThreadContextStack implements ThreadContextStack, StringBuil
return Strings.EMPTY;
}
final MutableThreadContextStack values = STACK.get();
- if (values == null || values.size() == 0) {
+ if (values == null || values.isEmpty()) {
// Like version 1.2
return Strings.EMPTY;
}
@@ -207,7 +207,7 @@ public class DefaultThreadContextStack implements ThreadContextStack, StringBuil
return false;
}
final MutableThreadContextStack values = STACK.get();
- if (values == null || values.size() == 0) {
+ if (values == null || values.isEmpty()) {
return false;
}
final MutableThreadContextStack copy = (MutableThreadContextStack) values.copy();
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/GarbageFreeSortedArrayThreadContextMap.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/GarbageFreeSortedArrayThreadContextMap.java
index d378360..63924ec 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/GarbageFreeSortedArrayThreadContextMap.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/GarbageFreeSortedArrayThreadContextMap.java
@@ -227,7 +227,7 @@ class GarbageFreeSortedArrayThreadContextMap implements ReadOnlyThreadContextMap
@Override
public boolean isEmpty() {
final StringMap map = localMap.get();
- return map == null || map.size() == 0;
+ return map == null || map.isEmpty();
}
@Override
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jContextFactory.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jContextFactory.java
index b221d72..3bee68b 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jContextFactory.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jContextFactory.java
@@ -300,7 +300,7 @@ public class Log4jContextFactory implements LoggerContextFactory, ShutdownCallba
LOGGER.info("Unable to access configuration {}, ignoring", configLocation.toString());
}
}
- if (configurations.size() == 0) {
+ if (configurations.isEmpty()) {
LOGGER.error("No configurations could be created for {}", configLocations.toString());
} else if (configurations.size() == 1) {
AbstractConfiguration config = configurations.get(0);
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MdcPatternConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MdcPatternConverter.java
index 95cb512..01bbd90 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MdcPatternConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/MdcPatternConverter.java
@@ -93,14 +93,14 @@ public final class MdcPatternConverter extends LogEventPatternConverter {
// if there is no additional options, we output every single
// Key/Value pair for the MDC in a similar format to Hashtable.toString()
if (full) {
- if (contextData == null || contextData.size() == 0) {
+ if (contextData == null || contextData.isEmpty()) {
toAppendTo.append("{}");
return;
}
appendFully(contextData, toAppendTo);
} else {
if (keys != null) {
- if (contextData == null || contextData.size() == 0) {
+ if (contextData == null || contextData.isEmpty()) {
toAppendTo.append("{}");
return;
}
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/Log4j1222Test.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/Log4j1222Test.java
index 073dfaa..fe53c4f 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/Log4j1222Test.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/Log4j1222Test.java
@@ -54,7 +54,7 @@ public class Log4j1222Test
private void trigger() {
Holder.LOGGER.info("Attempt to trigger");
assertTrue("Logger is of type " + Holder.LOGGER.getClass().getName(), Holder.LOGGER instanceof TestLogger);
- if (((TestLogger) Holder.LOGGER).getEntries().size() == 0) {
+ if (((TestLogger) Holder.LOGGER).getEntries().isEmpty()) {
System.out.println("Logger contains no messages");
}
for (final String msg : ((TestLogger) Holder.LOGGER).getEntries()) {
diff --git a/log4j-jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/Client.java b/log4j-jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/Client.java
index fe51356..bcc64a4 100644
--- a/log4j-jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/Client.java
+++ b/log4j-jmx-gui/src/main/java/org/apache/logging/log4j/jmx/gui/Client.java
@@ -140,7 +140,7 @@ public class Client {
final String mbean = String.format(pattern, Server.escape(contextName));
final ObjectName search = new ObjectName(mbean);
final Set<ObjectName> result = connection.queryNames(search, null);
- if (result.size() == 0) {
+ if (result.isEmpty()) {
return null;
}
if (result.size() > 1) {
diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/OpenHashStringMap.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/OpenHashStringMap.java
index 187e516..b7939f3 100644
--- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/OpenHashStringMap.java
+++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/OpenHashStringMap.java
@@ -477,7 +477,7 @@ public class OpenHashStringMap<K, V> implements StringMap, ThreadContextMap {
assertNotFrozen();
assertNoConcurrentModification();
- if (size() == 0 && source instanceof OpenHashStringMap) {
+ if (isEmpty() && source instanceof OpenHashStringMap) {
initFrom0((OpenHashStringMap) source);
} else if (source != null) {
source.forEach(PUT_ALL, this);
diff --git a/log4j-taglib/src/main/java/org/apache/logging/log4j/taglib/EntryTag.java b/log4j-taglib/src/main/java/org/apache/logging/log4j/taglib/EntryTag.java
index 07471c2..ab9440c 100644
--- a/log4j-taglib/src/main/java/org/apache/logging/log4j/taglib/EntryTag.java
+++ b/log4j-taglib/src/main/java/org/apache/logging/log4j/taglib/EntryTag.java
@@ -57,7 +57,7 @@ public class EntryTag extends LoggerAwareTagSupport implements DynamicAttributes
final Log4jTaglibLogger logger = this.getLogger();
if (TagUtils.isEnabled(logger, Level.TRACE, null)) {
- if (this.attributes.size() == 0) {
+ if (this.attributes.isEmpty()) {
logger.entry(FQCN);
} else {
logger.entry(FQCN, this.attributes.toArray());