From b8651556c21c83448e46b270ed7013f490e53a5d Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Wed, 29 Mar 2017 12:52:41 +0300
Subject: juick-www: inject json mapper

---
 .../main/java/com/juick/www/controllers/VKontakteLogin.java    | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'juick-www/src/main/java/com/juick/www/controllers/VKontakteLogin.java')

diff --git a/juick-www/src/main/java/com/juick/www/controllers/VKontakteLogin.java b/juick-www/src/main/java/com/juick/www/controllers/VKontakteLogin.java
index e0a39220..efc86f7c 100644
--- a/juick-www/src/main/java/com/juick/www/controllers/VKontakteLogin.java
+++ b/juick-www/src/main/java/com/juick/www/controllers/VKontakteLogin.java
@@ -17,7 +17,6 @@
  */
 package com.juick.www.controllers;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.scribejava.apis.VkontakteApi;
 import com.github.scribejava.core.builder.ServiceBuilder;
@@ -71,13 +70,10 @@ public class VKontakteLogin {
         VK_APPID = env.getProperty("vk_appid");
         VK_SECRET = env.getProperty("vk_secret");
         serviceBuilder = new ServiceBuilder();
-        mapper = new ObjectMapper();
-        mapper.setSerializationInclusion(JsonInclude.Include.NON_EMPTY);
-        mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
-        mapper.setSerializationInclusion(JsonInclude.Include.NON_DEFAULT);
     }
 
-    private final ObjectMapper mapper;
+    @Inject
+    private ObjectMapper jsonMapper;
 
     @RequestMapping(value = "/_vklogin", method = RequestMethod.GET)
     protected String doGet(HttpServletRequest request,
@@ -117,7 +113,7 @@ public class VKontakteLogin {
         vkService.signRequest(token, meRequest);
         String graph = vkService.execute(meRequest).getBody();
 
-        com.juick.www.vk.User jsonUser = mapper.readValue(graph, UsersResponse.class).getUsers().get(0);
+        com.juick.www.vk.User jsonUser = jsonMapper.readValue(graph, UsersResponse.class).getUsers().get(0);
         String vkName = jsonUser.getFirstName() + " " + jsonUser.getLastName();
         String vkLink = jsonUser.getScreenName();
 
-- 
cgit v1.2.3