From 885af064c9873458d36c06531c14fec0b8fd0d82 Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Sun, 29 Jun 2014 18:16:43 -0700
Subject: [PATCH] Support unrecognized properties.

---
 .../org/whispersystems/textsecuregcm/WhisperServerService.java  | 2 ++
 .../textsecuregcm/controllers/KeysController.java               | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java b/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
index 57cdcc538..5e6a828ae 100644
--- a/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
+++ b/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
@@ -18,6 +18,7 @@ package org.whispersystems.textsecuregcm;
 
 import com.codahale.metrics.SharedMetricRegistries;
 import com.codahale.metrics.graphite.GraphiteReporter;
+import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.google.common.base.Optional;
 import net.spy.memcached.MemcachedClient;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
@@ -112,6 +113,7 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
       throws Exception
   {
     SharedMetricRegistries.add(Constants.METRICS_NAME, environment.metrics());
+    environment.getObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
 
     DBIFactory dbiFactory = new DBIFactory();
     DBI        jdbi       = dbiFactory.build(environment, config.getDataSourceFactory(), "postgresql");
diff --git a/src/main/java/org/whispersystems/textsecuregcm/controllers/KeysController.java b/src/main/java/org/whispersystems/textsecuregcm/controllers/KeysController.java
index 2fd3a3b47..ade3e4e3f 100644
--- a/src/main/java/org/whispersystems/textsecuregcm/controllers/KeysController.java
+++ b/src/main/java/org/whispersystems/textsecuregcm/controllers/KeysController.java
@@ -84,7 +84,6 @@ public class KeysController {
 
   @Timed
   @GET
-  @Path("/")
   @Produces(MediaType.APPLICATION_JSON)
   public PreKeyStatus getStatus(@Auth Account account) {
     int count = keys.getCount(account.getNumber(), account.getAuthenticatedDevice().get().getId());