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

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

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

diff --git a/juick-www/src/main/java/com/juick/www/controllers/TwitterAuth.java b/juick-www/src/main/java/com/juick/www/controllers/TwitterAuth.java
index 9b09539e..33f266b2 100644
--- a/juick-www/src/main/java/com/juick/www/controllers/TwitterAuth.java
+++ b/juick-www/src/main/java/com/juick/www/controllers/TwitterAuth.java
@@ -1,6 +1,5 @@
 package com.juick.www.controllers;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.scribejava.apis.TwitterApi;
 import com.github.scribejava.core.builder.ServiceBuilder;
@@ -33,7 +32,8 @@ public class TwitterAuth {
 
     private String consumerKey, consumerSecret;
 
-    private final ObjectMapper mapper;
+    @Inject
+    private ObjectMapper jsonMapper;
 
     @Inject
     UserService userService;
@@ -42,10 +42,6 @@ public class TwitterAuth {
     public TwitterAuth(Environment env) {
         this.consumerKey = env.getProperty("twitter_consumer_key");
         this.consumerSecret = env.getProperty("twitter_consumer_secret");
-        mapper = new ObjectMapper();
-        mapper.setSerializationInclusion(JsonInclude.Include.NON_EMPTY);
-        mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
-        mapper.setSerializationInclusion(JsonInclude.Include.NON_DEFAULT);
     }
 
     @RequestMapping(value = "/_twitter", method = RequestMethod.GET)
@@ -90,7 +86,7 @@ public class TwitterAuth {
                 OAuth1AccessToken accessToken = oAuthService.getAccessToken(requestToken, verifier);
                 OAuthRequest oAuthRequest = new OAuthRequest(Verb.GET, VERIFY_URL);
                 oAuthService.signRequest(accessToken, oAuthRequest);
-                com.juick.www.twitter.User twitterUser = mapper.readValue(oAuthService.execute(oAuthRequest).getBody(),
+                com.juick.www.twitter.User twitterUser = jsonMapper.readValue(oAuthService.execute(oAuthRequest).getBody(),
                         com.juick.www.twitter.User.class);
                 if (userService.linkTwitterAccount(user, accessToken.getToken(), accessToken.getTokenSecret(),
                         twitterUser.getScreenName())) {
-- 
cgit v1.2.3