From 0a29f41835829ef110384b86a90f87525bc7feec Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Fri, 1 Feb 2019 09:42:19 +0100
Subject: [PATCH] verify encoding and content type

---
 .../src/main/java/sonia/scm/web/i18n/I18nServlet.java    | 1 -
 .../test/java/sonia/scm/web/i18n/I18nServletTest.java    | 9 +++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/scm-webapp/src/main/java/sonia/scm/web/i18n/I18nServlet.java b/scm-webapp/src/main/java/sonia/scm/web/i18n/I18nServlet.java
index 6224b154a7..08a4a33493 100644
--- a/scm-webapp/src/main/java/sonia/scm/web/i18n/I18nServlet.java
+++ b/scm-webapp/src/main/java/sonia/scm/web/i18n/I18nServlet.java
@@ -81,7 +81,6 @@ public class I18nServlet extends HttpServlet {
     response.setCharacterEncoding("UTF-8");
     response.setContentType("application/json");
     try (PrintWriter out = response.getWriter()) {
-      response.setContentType("application/json");
       String path = req.getServletPath();
       Function<String, Optional<JsonNode>> jsonFileProvider = usedPath -> Optional.empty();
       BiConsumer<String, JsonNode> createdJsonFileConsumer = (usedPath, jsonNode) -> log.debug("A json File is created from the path {}", usedPath);
diff --git a/scm-webapp/src/test/java/sonia/scm/web/i18n/I18nServletTest.java b/scm-webapp/src/test/java/sonia/scm/web/i18n/I18nServletTest.java
index a912f738e2..4874acab37 100644
--- a/scm-webapp/src/test/java/sonia/scm/web/i18n/I18nServletTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/web/i18n/I18nServletTest.java
@@ -194,6 +194,8 @@ public class I18nServletTest {
     assertJson(json);
     verify(cache).get(path);
     verify(cache).put(eq(path), any());
+
+    verifyHeaders(response);
   }
 
   @Test
@@ -221,6 +223,8 @@ public class I18nServletTest {
     verify(cache, never()).put(eq(path), any());
     verify(cache).get(path);
     assertJson(json);
+
+    verifyHeaders(response);
   }
 
   @Test
@@ -234,6 +238,11 @@ public class I18nServletTest {
     assertJson(jsonNodeOptional.orElse(null));
   }
 
+  private void verifyHeaders(HttpServletResponse response) {
+    verify(response).setCharacterEncoding("UTF-8");
+    verify(response).setContentType("application/json");
+  }
+
   public void assertJson(JsonNode actual) throws IOException {
     assertJson(actual.toString());
   }