From e561d0c4faefce7f0e32e15a5667b6512c6341d7 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Wed, 29 Mar 2017 00:32:38 +0300
Subject: juick-notifications: refactor using with Spring annotations

---
 .../configuration/NotificationsMvcConfiguration.java      | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'juick-notifications/src/main/java/com/juick/components/configuration/NotificationsMvcConfiguration.java')

diff --git a/juick-notifications/src/main/java/com/juick/components/configuration/NotificationsMvcConfiguration.java b/juick-notifications/src/main/java/com/juick/components/configuration/NotificationsMvcConfiguration.java
index f92b6a19..3d828832 100644
--- a/juick-notifications/src/main/java/com/juick/components/configuration/NotificationsMvcConfiguration.java
+++ b/juick-notifications/src/main/java/com/juick/components/configuration/NotificationsMvcConfiguration.java
@@ -1,14 +1,13 @@
 package com.juick.components.configuration;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.converter.HttpMessageConverter;
-import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
 
+import javax.inject.Inject;
 import java.util.List;
 
 /**
@@ -17,16 +16,12 @@ import java.util.List;
 @Configuration
 @ComponentScan(basePackages = {"com.juick.components.controllers"})
 public class NotificationsMvcConfiguration extends WebMvcConfigurationSupport {
+    @Inject
+    ObjectMapper jsonMapper;
 
     @Override
     protected void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
-        Jackson2ObjectMapperBuilder builder = new Jackson2ObjectMapperBuilder()
-                .serializationInclusion(JsonInclude.Include.NON_DEFAULT)
-                .serializationInclusion(JsonInclude.Include.NON_NULL)
-                .serializationInclusion(JsonInclude.Include.NON_ABSENT)
-                .serializationInclusion(JsonInclude.Include.NON_EMPTY);
-        MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter(builder.build());
-        converter.getObjectMapper().registerModule(new Jdk8Module());
+        MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter(jsonMapper);
         converters.add(converter);
         super.configureMessageConverters(converters);
     }
-- 
cgit v1.2.3