diff options
Diffstat (limited to 'juick-notifications/src/main/java/com/juick/components/configuration/NotificationsAppConfiguration.java')
-rw-r--r-- | juick-notifications/src/main/java/com/juick/components/configuration/NotificationsAppConfiguration.java | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/juick-notifications/src/main/java/com/juick/components/configuration/NotificationsAppConfiguration.java b/juick-notifications/src/main/java/com/juick/components/configuration/NotificationsAppConfiguration.java index 9c76b889..d6b4fa1e 100644 --- a/juick-notifications/src/main/java/com/juick/components/configuration/NotificationsAppConfiguration.java +++ b/juick-notifications/src/main/java/com/juick/components/configuration/NotificationsAppConfiguration.java @@ -1,21 +1,21 @@ package com.juick.components.configuration; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.datatype.jdk8.Jdk8Module; import com.juick.components.CleanUp; import com.juick.components.Notifications; -import com.notnoop.apns.APNS; -import com.notnoop.apns.ApnsService; +import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; -import org.springframework.core.env.Environment; import org.springframework.http.client.ClientHttpRequestInterceptor; import org.springframework.http.client.InterceptingClientHttpRequestFactory; import org.springframework.http.client.support.BasicAuthorizationInterceptor; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.web.client.RestTemplate; -import javax.inject.Inject; import java.util.Collections; import java.util.List; @@ -27,16 +27,16 @@ import java.util.List; @PropertySource("classpath:juick.conf") @ComponentScan(basePackages = {"com.juick.components.service"}) public class NotificationsAppConfiguration { - @Inject - private Environment env; + @Value("${api_user:'juick'}") + private String apiUser; + @Value("${api_password:'secret'}") + private String apiSecret; @Bean public RestTemplate rest() { RestTemplate rest = new RestTemplate(); List<ClientHttpRequestInterceptor> interceptors = Collections.singletonList( - new BasicAuthorizationInterceptor( - env.getProperty("api_user", "juick"), - env.getProperty("api_password", "secret"))); + new BasicAuthorizationInterceptor(apiUser, apiSecret)); rest.setRequestFactory(new InterceptingClientHttpRequestFactory(rest.getRequestFactory(), interceptors)); return rest; @@ -44,14 +44,19 @@ public class NotificationsAppConfiguration { @Bean public Notifications push() { - return new Notifications(env, rest()); + return new Notifications(); } @Bean - public ApnsService apns() { - return APNS.newService().withCert(env.getProperty("ios_pkcs12_file"), env.getProperty("ios_pkcs12_password")) - .withProductionDestination().build(); + public ObjectMapper jsonMapper() { + ObjectMapper mapper = new ObjectMapper(); + mapper.setSerializationInclusion(JsonInclude.Include.NON_EMPTY); + mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); + mapper.setSerializationInclusion(JsonInclude.Include.NON_DEFAULT); + mapper.registerModule(new Jdk8Module()); + return mapper; } + @Bean public CleanUp cleanUp() { return new CleanUp(); |