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 2020/11/21 21:33:33 UTC
[logging-log4j2] 04/04: Use Objects.equals().
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
commit 503194458ea782e4cdafa04165bfd99238ee306a
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Nov 21 16:33:10 2020 -0500
Use Objects.equals().
---
.../log4j/spi/CopyOnWriteSortedArrayThreadContextMap.java | 10 ++--------
.../org/apache/logging/log4j/spi/DefaultThreadContextMap.java | 10 ++--------
.../log4j/spi/GarbageFreeSortedArrayThreadContextMap.java | 10 ++--------
.../apache/logging/log4j/spi/MutableThreadContextStack.java | 9 +--------
4 files changed, 7 insertions(+), 32 deletions(-)
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 97fb7b9..43ab1d4 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
@@ -19,6 +19,7 @@ package org.apache.logging.log4j.spi;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import java.util.Objects;
import org.apache.logging.log4j.util.ReadOnlyStringMap;
import org.apache.logging.log4j.util.SortedArrayStringMap;
@@ -266,13 +267,6 @@ class CopyOnWriteSortedArrayThreadContextMap implements ReadOnlyThreadContextMap
final ThreadContextMap other = (ThreadContextMap) obj;
final Map<String, String> map = this.getImmutableMapOrNull();
final Map<String, String> otherMap = other.getImmutableMapOrNull();
- if (map == null) {
- if (otherMap != null) {
- return false;
- }
- } else if (!map.equals(otherMap)) {
- return false;
- }
- return true;
+ return Objects.equals(map, otherMap);
}
}
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 24e1b44..066d818 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
@@ -19,6 +19,7 @@ package org.apache.logging.log4j.spi;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import java.util.Objects;
import org.apache.logging.log4j.util.BiConsumer;
import org.apache.logging.log4j.util.ReadOnlyStringMap;
@@ -241,13 +242,6 @@ public class DefaultThreadContextMap implements ThreadContextMap, ReadOnlyString
final ThreadContextMap other = (ThreadContextMap) obj;
final Map<String, String> map = this.localMap.get();
final Map<String, String> otherMap = other.getImmutableMapOrNull();
- if (map == null) {
- if (otherMap != null) {
- return false;
- }
- } else if (!map.equals(otherMap)) {
- return false;
- }
- return true;
+ return Objects.equals(map, otherMap);
}
}
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 186e2a8..bd77559 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
@@ -19,6 +19,7 @@ package org.apache.logging.log4j.spi;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import java.util.Objects;
import org.apache.logging.log4j.util.ReadOnlyStringMap;
import org.apache.logging.log4j.util.StringMap;
@@ -258,13 +259,6 @@ class GarbageFreeSortedArrayThreadContextMap implements ReadOnlyThreadContextMap
final ThreadContextMap other = (ThreadContextMap) obj;
final Map<String, String> map = this.getImmutableMapOrNull();
final Map<String, String> otherMap = other.getImmutableMapOrNull();
- if (map == null) {
- if (otherMap != null) {
- return false;
- }
- } else if (!map.equals(otherMap)) {
- return false;
- }
- return true;
+ return Objects.equals(map, otherMap);
}
}
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/MutableThreadContextStack.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/MutableThreadContextStack.java
index f00fcb0..2937ae4 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/MutableThreadContextStack.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/MutableThreadContextStack.java
@@ -228,14 +228,7 @@ public class MutableThreadContextStack implements ThreadContextStack, StringBuil
}
final ThreadContextStack other = (ThreadContextStack) obj;
final List<String> otherAsList = other.asList();
- if (this.list == null) {
- if (otherAsList != null) {
- return false;
- }
- } else if (!this.list.equals(otherAsList)) {
- return false;
- }
- return true;
+ return Objects.equals(this.list, otherAsList);
}
@Override