From f50057f10c4731d4e65b4eb9257cd4e4e9d54c12 Mon Sep 17 00:00:00 2001
From: Jochen Schalanda <jochen@graylog.com>
Date: Thu, 13 Apr 2017 16:29:01 +0200
Subject: [PATCH] Fix bulid warnings

---
 .../plugins/internallogs/codec/SerializedLogEventCodec.java   | 4 +---
 .../internallogs/log4j/DirectConsumingAppenderTest.java       | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/graylog/plugins/internallogs/codec/SerializedLogEventCodec.java b/src/main/java/org/graylog/plugins/internallogs/codec/SerializedLogEventCodec.java
index 2001946..e7a93f4 100644
--- a/src/main/java/org/graylog/plugins/internallogs/codec/SerializedLogEventCodec.java
+++ b/src/main/java/org/graylog/plugins/internallogs/codec/SerializedLogEventCodec.java
@@ -134,9 +134,7 @@ private Message processLogEvent(LogEvent logEvent) {
         }
 
         if (includeThreadContext) {
-            for (Map.Entry<String, String> entry : logEvent.getContextMap().entrySet()) {
-                message.addField("context_" + entry.getKey(), entry.getValue());
-            }
+            logEvent.getContextData().forEach((k, v ) -> message.addField("context_" + k, v));
 
             // Guard against https://issues.apache.org/jira/browse/LOG4J2-1530
             final ThreadContext.ContextStack contextStack = logEvent.getContextStack();
diff --git a/src/test/java/org/graylog/plugins/internallogs/log4j/DirectConsumingAppenderTest.java b/src/test/java/org/graylog/plugins/internallogs/log4j/DirectConsumingAppenderTest.java
index f5f842e..09bdc9a 100644
--- a/src/test/java/org/graylog/plugins/internallogs/log4j/DirectConsumingAppenderTest.java
+++ b/src/test/java/org/graylog/plugins/internallogs/log4j/DirectConsumingAppenderTest.java
@@ -82,7 +82,7 @@ public void appenderUsesThresholdFilter() throws Exception {
         assertThat(appender.getFilter()).isInstanceOf(ThresholdFilter.class);
     }
 
-    private final class TestConsumer implements Consumer<byte[]> {
+    private static final class TestConsumer implements Consumer<byte[]> {
         private final List<byte[]> processedLogEvents = new ArrayList<>();
 
         @Override