Fixed #1110 - PUT with Content-Type other than application/json succeeds

- Checking content-type for any PUSH/PUT requests does not make sense. For example, push attachment. In stead of checking content-type in `start()` method, check content-type in `getBodyAsDictionary()` which parses JSON body text.

Author: hideki

src/main/java/com/couchbase/lite/router/Router.java

@@ -197,6 +197,14 @@ private boolean cacheWithEtag(String etag) {
     }
 
     private Map<String, Object> getBodyAsDictionary() throws CouchbaseLiteException {
+        // check if content-type is `application/json`
+        String contentType = getContentType(connection);
+        if (contentType != null) {
+            if (!contentType.equals("application/json"))
+                throw new CouchbaseLiteException(Status.NOT_ACCEPTABLE);
+        }
+
+        // parse body text
         InputStream contentStream = connection.getRequestInputStream();
         try {
             return Manager.getObjectMapper().readValue(contentStream, Map.class);
@@ -341,13 +349,24 @@ private void sendErrorResponse(Status status) {
         sendResponse();
     }
 
+    // get Content-Type from URLConnection
     private static String getContentType(URLConnection connection) {
         String contentType = connection.getRequestProperty("Content-Type");
         if (contentType == null)
             // From Android: http://developer.android.com/reference/java/net/URLConnection.html
             contentType = connection.getRequestProperty("content-type");
+
+        if (contentType != null) {
+            // remove parameter (Content-Type := type "/" subtype *[";" parameter] )
+            int index = contentType.indexOf(';');
+            if (index > 0)
+                contentType = contentType.substring(0, index);
+            contentType = contentType.trim();
+        }
+
         return contentType;
     }
+
     private static String getAccept(URLConnection connection) {
         String accept = connection.getRequestProperty("Accept");
         if (accept == null)
@@ -360,23 +379,6 @@ public void start() {
         // Refer to: http://wiki.apache.org/couchdb/Complete_HTTP_API_Reference
 
         String method = connection.getRequestMethod();
-
-        // check if Content-Type is ""application/json" in case method is PUSH or PUT.
-        // https://github.com/couchbase/couchbase-lite-java-core/issues/1110
-        if (method != null && (method.equals("PUT") || method.equals("PUT"))) {
-            String contentType = getContentType(connection);
-            if (contentType != null) {
-                // application/json; charset=utf-8
-                String[] fields = contentType.split(";");
-                if (fields.length > 0) {
-                    if (!fields[0].trim().equals("application/json")) {
-                        sendErrorResponse(new Status(Status.NOT_ACCEPTABLE));
-                        return;
-                    }
-                }
-            }
-        }
-
         // We're going to map the request into a method call using reflection based on the method and path.
         // Accumulate the method name into the string 'message':
          if ("HEAD".equals(method)) {