Merge pull request #51 from zeroae/i/50-parse-mime-types

I/50 parse mime types

Author: sodre

src/main/java/co/zeroae/gate/App.java

@@ -13,8 +13,8 @@
 import gate.corpora.DocumentImpl;
 import gate.util.GateException;
 import gate.util.persistence.PersistenceManager;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -46,7 +46,7 @@ public class App implements RequestHandler<APIGatewayProxyRequestEvent, APIGatew
             "CACHE_DIR_PREFIX", "/tmp/lru/" + GATE_APP_NAME);
     private static final double CACHE_DIR_USAGE = .9;
     private static final String DIGEST_SALT = UUID.randomUUID().toString();
-    private static final Logger logger = LogManager.getLogger(App.class);
+    private static final Logger logger = LoggerFactory.getLogger(App.class);
     private static final CorpusController application = AWSXRay.createSegment(
             "Gate Load", App::loadApplication);
     private static final AppMetadata metadata = loadMetadata();
@@ -148,7 +148,7 @@ public APIGatewayProxyResponseEvent handleExecute(APIGatewayProxyRequestEvent in
                 AWSXRay.endSubsegment();
             }
         } catch (GateException e) {
-            logger.error(e);
+            logger.error(e.getMessage(), e);
             AWSXRay.getCurrentSubsegmentOptional().ifPresent((segment -> segment.addException(e)));
             response.getHeaders().put("Content-Type", "application/json");
             return response.withStatusCode(400).withBody(Utils.asJson(
@@ -157,7 +157,7 @@ public APIGatewayProxyResponseEvent handleExecute(APIGatewayProxyRequestEvent in
                     }}
             ));
         } catch (IOException e) {
-            logger.error(e);
+            logger.error(e.getMessage(), e);
             AWSXRay.getCurrentSubsegmentOptional().ifPresent((segment -> segment.addException(e)));
             response.getHeaders().put("Content-Type", "application/json");
             return response.withStatusCode(406).withBody(Utils.asJson(

src/main/java/co/zeroae/gate/Utils.java

@@ -35,8 +35,9 @@ static String asJson(Map<String, Object> obj) {
     }
 
     static String ensureValidRequestContentType(String contentType) throws GateException {
-        final String rv = contentType.equals("application/json") ? "text/json" : contentType;
-        if (!DocumentFormat.getSupportedMimeTypes().contains(rv)) {
+        final MimeType mimeType = DocumentFormat.getMimeTypeForString(
+                contentType.equals("application/json") ? "text/json" : contentType);
+        if (mimeType == null) {
             throw new GateException(
                     "Unsupported MIME type " + contentType + " valid options are "
                             + Arrays.toString(DocumentFormat.getSupportedMimeTypes()
@@ -46,7 +47,7 @@ static String ensureValidRequestContentType(String contentType) throws GateExcep
                             .toArray())
             );
         }
-        return rv;
+        return mimeType.toString();
     }
 
     static String ensureValidResponseType(String acceptHeader) throws GateException {

src/test/java/co/zeroae/gate/AppTest.java

@@ -24,7 +24,10 @@
 import java.io.IOException;
 import java.io.StringReader;
 import java.io.UnsupportedEncodingException;
-import java.util.*;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Random;
+import java.util.UUID;
 
 import static com.github.stefanbirkner.systemlambda.SystemLambda.withEnvironmentVariable;
 import static org.junit.Assert.*;
@@ -38,7 +41,7 @@ public static void setUpClass() throws Exception {
     }
 
     private static App app = null;
-    private static TestContext context = new TestContext();
+    private static final TestContext context = new TestContext();
 
     @Before
     public void setUp() {
@@ -213,7 +216,10 @@ public void testInputTypes() throws GateException {
                 "text/x-json-datasift",
                 "text/x-json-twitter",
         };
-        for (String type: types) assertNotNull(Utils.ensureValidRequestContentType(type));
+        for (String type : types) assertNotNull(Utils.ensureValidRequestContentType(type));
+
+        // This replicates issue #50
+        assertNotNull(Utils.ensureValidRequestContentType("text/plain; charset=UTF-8"));
     }
 
     @Test