From f2c869982367c8f09bed7c6a6a6c1d5dddbd1735 Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Mon, 27 Jul 2015 17:58:38 -0700
Subject: [PATCH] Remove unused provider.

// FREEBIE
---
 .../federation/FederatedClient.java           |  6 -----
 .../providers/JacksonConfigurator.java        | 24 -------------------
 2 files changed, 30 deletions(-)
 delete mode 100644 src/main/java/org/whispersystems/textsecuregcm/providers/JacksonConfigurator.java

diff --git a/src/main/java/org/whispersystems/textsecuregcm/federation/FederatedClient.java b/src/main/java/org/whispersystems/textsecuregcm/federation/FederatedClient.java
index 7b1cee073..cad5659f5 100644
--- a/src/main/java/org/whispersystems/textsecuregcm/federation/FederatedClient.java
+++ b/src/main/java/org/whispersystems/textsecuregcm/federation/FederatedClient.java
@@ -18,15 +18,12 @@ package org.whispersystems.textsecuregcm.federation;
 
 
 import com.google.common.base.Optional;
-import org.apache.http.client.CredentialsProvider;
 import org.apache.http.config.Registry;
 import org.apache.http.config.RegistryBuilder;
 import org.apache.http.conn.socket.ConnectionSocketFactory;
 import org.apache.http.conn.ssl.DefaultHostnameVerifier;
 import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
-import org.apache.http.conn.ssl.StrictHostnameVerifier;
 import org.bouncycastle.openssl.PEMReader;
-import org.glassfish.jersey.SslConfigurator;
 import org.glassfish.jersey.client.ClientProperties;
 import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature;
 import org.slf4j.Logger;
@@ -38,15 +35,12 @@ import org.whispersystems.textsecuregcm.entities.ClientContacts;
 import org.whispersystems.textsecuregcm.entities.IncomingMessageList;
 import org.whispersystems.textsecuregcm.entities.PreKeyResponseV1;
 import org.whispersystems.textsecuregcm.entities.PreKeyResponseV2;
-import org.whispersystems.textsecuregcm.providers.JacksonConfigurator;
 
-import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManagerFactory;
 import javax.ws.rs.ProcessingException;
 import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.client.Entity;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
diff --git a/src/main/java/org/whispersystems/textsecuregcm/providers/JacksonConfigurator.java b/src/main/java/org/whispersystems/textsecuregcm/providers/JacksonConfigurator.java
deleted file mode 100644
index f2e538d42..000000000
--- a/src/main/java/org/whispersystems/textsecuregcm/providers/JacksonConfigurator.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.whispersystems.textsecuregcm.providers;
-
-import javax.ws.rs.ext.ContextResolver;
-import javax.ws.rs.ext.Provider;
-
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-@Provider
-public class JacksonConfigurator implements ContextResolver<ObjectMapper> {
-
-  private final ObjectMapper mapper;
-
-  public JacksonConfigurator() {
-    mapper = new ObjectMapper();
-    mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-  }
-
-  @Override
-  public ObjectMapper getContext(Class<?> type) {
-    return mapper;
-  }
-
-}
\ No newline at end of file