LOG4J2-2215 reduce compiler warnings: interface ObjectThreadContextMap::getValue returns generic type; implementation classes should return the same type, not Object
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/c8c970c9 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/c8c970c9 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/c8c970c9 Branch: refs/heads/master Commit: c8c970c9a5d8e71419d67fd3333337023a2b704f Parents: f0ef617 Author: rpopma <[email protected]> Authored: Wed Jan 24 21:31:29 2018 +0900 Committer: rpopma <[email protected]> Committed: Wed Jan 24 21:31:29 2018 +0900 ---------------------------------------------------------------------- .../log4j/spi/CopyOnWriteSortedArrayThreadContextMap.java | 4 ++-- .../log4j/spi/GarbageFreeSortedArrayThreadContextMap.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c8c970c9/log4j-api/src/main/java/org/apache/logging/log4j/spi/CopyOnWriteSortedArrayThreadContextMap.java ---------------------------------------------------------------------- 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 9ba4221..862246e 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 @@ -170,9 +170,9 @@ class CopyOnWriteSortedArrayThreadContextMap implements ReadOnlyThreadContextMap } @Override - public Object getValue(final String key) { + public <V> V getValue(final String key) { final StringMap map = localMap.get(); - return map == null ? null : map.getValue(key); + return map == null ? null : map.<V>getValue(key); } @Override http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c8c970c9/log4j-api/src/main/java/org/apache/logging/log4j/spi/GarbageFreeSortedArrayThreadContextMap.java ---------------------------------------------------------------------- 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 c9cbd63..186e2a8 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 @@ -161,9 +161,9 @@ class GarbageFreeSortedArrayThreadContextMap implements ReadOnlyThreadContextMap } @Override - public Object getValue(final String key) { + public <V> V getValue(final String key) { final StringMap map = localMap.get(); - return map == null ? null : map.getValue(key); + return map == null ? null : map.<V>getValue(key); } @Override
