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 22:24:53 UTC
[logging-log4j2] 06/12: Use diamonds.
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 8b6868c16fa81aedd3e14c104cfd2a4a7d0ea5a7
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Nov 21 16:42:00 2020 -0500
Use diamonds.
---
.../logging/log4j/spi/CopyOnWriteSortedArrayThreadContextMap.java | 2 +-
.../java/org/apache/logging/log4j/spi/DefaultThreadContextMap.java | 6 +++---
.../logging/log4j/spi/GarbageFreeSortedArrayThreadContextMap.java | 2 +-
3 files changed, 5 insertions(+), 5 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 43ab1d4..12f7b11 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
@@ -214,7 +214,7 @@ class CopyOnWriteSortedArrayThreadContextMap implements ReadOnlyThreadContextMap
@Override
public Map<String, String> getCopy() {
final StringMap map = localMap.get();
- return map == null ? new HashMap<String, String>() : map.toMap();
+ return map == null ? new HashMap<>() : map.toMap();
}
/**
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 066d818..472b35a 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
@@ -86,7 +86,7 @@ public class DefaultThreadContextMap implements ThreadContextMap, ReadOnlyString
return;
}
Map<String, String> map = localMap.get();
- map = map == null ? new HashMap<String, String>(1) : new HashMap<>(map);
+ map = map == null ? new HashMap<>(1) : new HashMap<>(map);
map.put(key, value);
localMap.set(Collections.unmodifiableMap(map));
}
@@ -96,7 +96,7 @@ public class DefaultThreadContextMap implements ThreadContextMap, ReadOnlyString
return;
}
Map<String, String> map = localMap.get();
- map = map == null ? new HashMap<String, String>(m.size()) : new HashMap<>(map);
+ map = map == null ? new HashMap<>(m.size()) : new HashMap<>(map);
for (final Map.Entry<String, String> e : m.entrySet()) {
map.put(e.getKey(), e.getValue());
}
@@ -186,7 +186,7 @@ public class DefaultThreadContextMap implements ThreadContextMap, ReadOnlyString
@Override
public Map<String, String> getCopy() {
final Map<String, String> map = localMap.get();
- return map == null ? new HashMap<String, String>() : new HashMap<>(map);
+ return map == null ? new HashMap<>() : new HashMap<>(map);
}
@Override
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 bd77559..d378360 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
@@ -202,7 +202,7 @@ class GarbageFreeSortedArrayThreadContextMap implements ReadOnlyThreadContextMap
@Override
public Map<String, String> getCopy() {
final StringMap map = localMap.get();
- return map == null ? new HashMap<String, String>() : map.toMap();
+ return map == null ? new HashMap<>() : map.toMap();
}
/**