Repository: logging-log4j2 Updated Branches: refs/heads/GenericMapMessageSimple 5d6d38be3 -> ce13c1281
Fix some generics compiler warnings. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/ce13c128 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/ce13c128 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/ce13c128 Branch: refs/heads/GenericMapMessageSimple Commit: ce13c1281f4132df8097cbd56a641085f702cf52 Parents: 5d6d38b Author: Gary Gregory <[email protected]> Authored: Wed Jun 7 01:04:24 2017 -0700 Committer: Gary Gregory <[email protected]> Committed: Wed Jun 7 01:04:24 2017 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/logging/log4j/message/MapMessage.java | 1 + .../java/org/apache/logging/log4j/core/filter/MapFilter.java | 6 +++--- .../org/apache/logging/log4j/flume/appender/FlumeEvent.java | 1 - 3 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce13c128/log4j-api/src/main/java/org/apache/logging/log4j/message/MapMessage.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/message/MapMessage.java b/log4j-api/src/main/java/org/apache/logging/log4j/message/MapMessage.java index 843c705..7d79847 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/message/MapMessage.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/message/MapMessage.java @@ -146,6 +146,7 @@ public class MapMessage<M extends MapMessage<M, V>, V> implements MultiformatMes * Returns the message data as an unmodifiable Map. * @return the message data as an unmodifiable map. */ + @SuppressWarnings("unchecked") public Map<String, V> getData() { final TreeMap<String, V> result = new TreeMap<>(); // returned map must be sorted for (int i = 0; i < data.size(); i++) { http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce13c128/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java index c2ebc37..de17256 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/MapFilter.java @@ -67,7 +67,7 @@ public class MapFilter extends AbstractFilter { public Result filter(final Logger logger, final Level level, final Marker marker, final Message msg, final Throwable t) { if (msg instanceof MapMessage) { - return filter((MapMessage) msg) ? onMatch : onMismatch; + return filter((MapMessage<?, ?>) msg) ? onMatch : onMismatch; } return Result.NEUTRAL; } @@ -76,12 +76,12 @@ public class MapFilter extends AbstractFilter { public Result filter(final LogEvent event) { final Message msg = event.getMessage(); if (msg instanceof MapMessage) { - return filter((MapMessage) msg) ? onMatch : onMismatch; + return filter((MapMessage<?, ?>) msg) ? onMatch : onMismatch; } return Result.NEUTRAL; } - protected boolean filter(final MapMessage mapMessage) { + protected boolean filter(final MapMessage<?, ?> mapMessage) { boolean match = false; for (int i = 0; i < map.size(); i++) { final String toMatch = mapMessage.get(map.getKeyAt(i)); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ce13c128/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java ---------------------------------------------------------------------- diff --git a/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java b/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java index bf76e11..01559f2 100644 --- a/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java +++ b/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java @@ -36,7 +36,6 @@ import org.apache.logging.log4j.core.util.Patterns; import org.apache.logging.log4j.core.util.UuidUtil; import org.apache.logging.log4j.message.MapMessage; import org.apache.logging.log4j.message.Message; -import org.apache.logging.log4j.message.StringMapMessage; import org.apache.logging.log4j.message.StructuredDataId; import org.apache.logging.log4j.message.StructuredDataMessage; import org.apache.logging.log4j.util.ReadOnlyStringMap;
