X-Git-Url: https://juplo.de/gitweb/?p=facebook-utils;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Ffacebook%2FFacebookUtils.java;h=a0e6738436eac25cfb874e255c354af4eb4b2131;hp=b55eb3bb0af5ee54cd1fbc1a39eba99f8b7059a2;hb=c1c281d582d47643a1615a6525c4189d9788b9fc;hpb=450cc98b6aee21b0c7d9181a1a79437d558366c9 diff --git a/src/main/java/de/juplo/facebook/FacebookUtils.java b/src/main/java/de/juplo/facebook/FacebookUtils.java index b55eb3b..a0e6738 100644 --- a/src/main/java/de/juplo/facebook/FacebookUtils.java +++ b/src/main/java/de/juplo/facebook/FacebookUtils.java @@ -5,7 +5,6 @@ import java.util.Arrays; import java.util.LinkedList; import java.util.List; import javax.annotation.PostConstruct; -import org.codehaus.jackson.map.ObjectMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeansException; @@ -13,8 +12,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.BeanPostProcessor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.http.converter.HttpMessageConverter; -import org.springframework.http.converter.json.MappingJacksonHttpMessageConverter; import org.springframework.security.oauth2.client.OAuth2RestTemplate; import org.springframework.security.oauth2.client.http.OAuth2ErrorHandler; import org.springframework.security.oauth2.client.token.AccessTokenProvider; @@ -22,7 +19,6 @@ import org.springframework.security.oauth2.client.token.AccessTokenProviderChain import org.springframework.security.oauth2.client.token.grant.client.ClientCredentialsAccessTokenProvider; import org.springframework.security.oauth2.client.token.grant.implicit.ImplicitAccessTokenProvider; import org.springframework.security.oauth2.client.token.grant.password.ResourceOwnerPasswordAccessTokenProvider; -import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter; @@ -39,41 +35,11 @@ public class FacebookUtils @Autowired(required=false) private List accessTokenProviderChain; - /** - * Needed, to extract Jackson-ObjectMapper. - * Defined by - */ - @Autowired - private RequestMappingHandlerAdapter requestMappingHandlerAdapter; - - private ObjectMapper objectMapper; @PostConstruct public void init() { - for (HttpMessageConverter messageConverter : requestMappingHandlerAdapter.getMessageConverters()) - { - if (messageConverter instanceof MappingJacksonHttpMessageConverter) - { - MappingJacksonHttpMessageConverter m = - (MappingJacksonHttpMessageConverter)messageConverter; - objectMapper = m.getObjectMapper(); - log.info( - "found ObjectMapper {} ({})", - objectMapper, - objectMapper.getClass().getCanonicalName() - ); - break; - } - } - if (objectMapper == null) - { - throw new RuntimeException( - "Unable to find MappingJAcksonHttpMessageConverter!" - ); - } - if (accessTokenProviderChain == null) { log.info("no AccessTokenProviderChain configured, creating default-chain"); @@ -110,7 +76,6 @@ public class FacebookUtils SignedRequestAwareAuthorizationCodeAccessTokenProvider provider = new SignedRequestAwareAuthorizationCodeAccessTokenProvider(); provider.setSecret(clientSecret); - provider.setObjectMapper(objectMapper); chain.add(provider); template.setAccessTokenProvider(new AccessTokenProviderChain(chain)); log.info("injecting GraphApiErrorHandler");