From 06c8bb2a9f9eb73bffcbb25b317efd01186fbce4 Mon Sep 17 00:00:00 2001
From: Jochen Schalanda <jochen@schalanda.name>
Date: Wed, 18 Nov 2015 11:41:45 +0100
Subject: [PATCH] Merge pull request #1569 from Graylog2/issue-1686-server

Fix Html serialization in `FieldMapper#convertNewlinesToBr()`
Refs Graylog2/graylog2-web-interface#1686
(cherry picked from commit 5c3a713b5204f78df8777fe103f643bcd6322803)
---
 .../java/org/graylog2/restclient/models/FieldMapper.java   | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/graylog2-rest-client/src/main/java/org/graylog2/restclient/models/FieldMapper.java b/graylog2-rest-client/src/main/java/org/graylog2/restclient/models/FieldMapper.java
index 717d7d1a526c..f4e3b611c8e9 100644
--- a/graylog2-rest-client/src/main/java/org/graylog2/restclient/models/FieldMapper.java
+++ b/graylog2-rest-client/src/main/java/org/graylog2/restclient/models/FieldMapper.java
@@ -17,9 +17,8 @@
 package org.graylog2.restclient.models;
 
 import com.google.common.collect.Lists;
-import org.graylog2.restclient.lib.Tools;
 import org.apache.commons.lang3.StringEscapeUtils;
-import play.twirl.api.Html;
+import org.graylog2.restclient.lib.Tools;
 
 import java.util.List;
 
@@ -58,14 +57,14 @@ public Object map(String key, Object value) {
         return value;
     }
 
-    private static Html convertNewlinesToBr(Object fullMessage) {
+    private static String convertNewlinesToBr(Object fullMessage) {
         if (fullMessage == null) {
             return null;
         }
 
         String s = StringEscapeUtils.escapeHtml4(fullMessage.toString());
         s = s.replaceAll("\\n", "<br>");
-        return Html.apply(s);
+        return s;
     }
 
     private static String mapSyslogLevel(Object level) {