Improves compatibility with Resteasy though ContextResolvers

build.gradle

@@ -35,8 +35,10 @@ dependencies {
     compile 'javax.ws.rs:javax.ws.rs-api:2.0.1'
     compile 'javax.annotation:javax.annotation-api:1.2'
 
-    testCompile 'org.apache.cxf:cxf-rt-rs-client:3.0.3'
-    testCompile 'org.apache.cxf:cxf-rt-transports-http-hc:3.0.3'
+//    testCompile 'org.apache.cxf:cxf-rt-rs-client:3.0.3'
+//    testCompile 'org.apache.cxf:cxf-rt-transports-http-hc:3.0.3'
+    testCompile 'org.jboss.resteasy:resteasy-jackson2-provider:3.0.14.Final'
+    testCompile 'org.jboss.resteasy:resteasy-client:3.0.14.Final'
 
     testCompile 'junit:junit:4.12'
     testCompile 'org.mockito:mockito-all:1.9.5'

src/main/java/com/orbitz/consul/Consul.java

@@ -4,8 +4,11 @@
 import com.fasterxml.jackson.datatype.guava.GuavaModule;
 import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
 import com.google.common.base.Optional;
+import com.google.common.collect.FluentIterable;
+import com.google.common.base.Predicate;
 import com.google.common.net.HostAndPort;
 import com.orbitz.consul.util.Jackson;
+import com.orbitz.consul.util.ObjectMapperContextResolver;
 
 import javax.net.ssl.SSLContext;
 import javax.ws.rs.client.Client;
@@ -46,11 +49,17 @@ public class Consul {
      */
     private Consul(String url, ClientBuilder builder, ObjectMapper mapper) {
 
-        JacksonJaxbJsonProvider provider = new JacksonJaxbJsonProvider();
-        provider.setMapper(mapper);
-
-        Client client = builder
-                .register(provider)
+        if (!FluentIterable.from(builder.getConfiguration().getClasses())
+                      .filter(new Predicate<Class<?>>() {
+                        @Override
+                        public boolean apply(final Class<?> clazz) {
+                            return JacksonJaxbJsonProvider.class.isAssignableFrom(clazz);
+                        }
+                    }).first().isPresent()) {
+            builder.register(JacksonJaxbJsonProvider.class);
+        }
+        final Client client = builder
+                .register(new ObjectMapperContextResolver(mapper))
                 .build();
 
         this.agentClient = new AgentClient(client.target(url).path("v1").path("agent"));

src/main/java/com/orbitz/consul/util/ObjectMapperContextResolver.java

@@ -0,0 +1,19 @@
+package com.orbitz.consul.util;
+
+import javax.ws.rs.ext.ContextResolver;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+public class ObjectMapperContextResolver implements ContextResolver<ObjectMapper> {
+
+    private final ObjectMapper objectMapper;
+    public ObjectMapperContextResolver(final ObjectMapper objectMapper) {
+        this.objectMapper = objectMapper;
+    }
+
+    @Override
+    public ObjectMapper getContext(final Class<?> type) {
+        return objectMapper;
+    }
+
+}