Prettified output

xwillq · May 7, 2020 · 61a9460 · 61a9460
1 parent be17d88
commit 61a9460
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/WebService/src/main/kotlin/com/kafedra/aaapp/di/GSONProvider.kt b/WebService/src/main/kotlin/com/kafedra/aaapp/di/GSONProvider.kt
@@ -5,5 +5,8 @@ import com.google.gson.GsonBuilder
 import com.google.inject.Provider
 
 class GSONProvider : Provider<Gson> {
-    override fun get() : Gson = GsonBuilder().excludeFieldsWithoutExposeAnnotation().create()
+    override fun get() : Gson = GsonBuilder()
+            .excludeFieldsWithoutExposeAnnotation()
+            .setPrettyPrinting()
+            .create()
 }
diff --git a/WebService/src/main/kotlin/com/kafedra/aaapp/servlet/ActivityServlet.kt b/WebService/src/main/kotlin/com/kafedra/aaapp/servlet/ActivityServlet.kt
@@ -48,6 +48,7 @@ class ActivityServlet: HttpServlet() {
         val gson = gsonProvider.get()
         val json = gson.toJson(activityList)
 
+        response.contentType = "text/plain"
         response.writer.print(json)
     }
 }
diff --git a/WebService/src/main/kotlin/com/kafedra/aaapp/servlet/AuthorityServlet.kt b/WebService/src/main/kotlin/com/kafedra/aaapp/servlet/AuthorityServlet.kt
@@ -47,6 +47,7 @@ class AuthorityServlet: HttpServlet() {
         val gson = gsonProvider.get()
         val json = gson.toJson(authorityList)
 
+        response.contentType = "text/plain"
         response.writer.print(json)
     }
 }
diff --git a/WebService/src/main/kotlin/com/kafedra/aaapp/servlet/UserServlet.kt b/WebService/src/main/kotlin/com/kafedra/aaapp/servlet/UserServlet.kt
@@ -35,7 +35,8 @@ class UserServlet: HttpServlet() {
         logger.info("Converting users to json")
         val gson = gsonProvider.get()
         val json = gson.toJson(userList)
-
+
+        response.contentType = "text/plain"
         response.writer.print(json)
     }
 }