diff --git a/WebService/src/main/kotlin/com/kafedra/aaapp/di/GSONProvider.kt b/WebService/src/main/kotlin/com/kafedra/aaapp/di/GSONProvider.kt index fb752ae..f2b689c 100644 --- 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 { - override fun get() : Gson = GsonBuilder().excludeFieldsWithoutExposeAnnotation().create() + override fun get() : Gson = GsonBuilder() + .excludeFieldsWithoutExposeAnnotation() + .setPrettyPrinting() + .create() } \ No newline at end of file diff --git a/WebService/src/main/kotlin/com/kafedra/aaapp/servlet/ActivityServlet.kt b/WebService/src/main/kotlin/com/kafedra/aaapp/servlet/ActivityServlet.kt index 42ec4e6..ff432b0 100644 --- 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) } } \ No newline at end of file diff --git a/WebService/src/main/kotlin/com/kafedra/aaapp/servlet/AuthorityServlet.kt b/WebService/src/main/kotlin/com/kafedra/aaapp/servlet/AuthorityServlet.kt index 583d175..ec124f9 100644 --- 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) } } \ No newline at end of file diff --git a/WebService/src/main/kotlin/com/kafedra/aaapp/servlet/UserServlet.kt b/WebService/src/main/kotlin/com/kafedra/aaapp/servlet/UserServlet.kt index c08a46a..3b7e6d7 100644 --- 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) } } \ No newline at end of file