#1165 - POJO conversion doesn't work on Content-Type = application/js…

…on; charset=UTF-8
javalite · Nov 22, 2021 · 2931d6c · 2931d6c
1 parent 7497b01
commit 2931d6c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/activeweb/src/main/java/org/javalite/activeweb/ControllerRunner.java b/activeweb/src/main/java/org/javalite/activeweb/ControllerRunner.java
@@ -143,7 +143,7 @@ private void executeAction(Route route) {
     @SuppressWarnings("unchecked")
     private Object getRequestObject(Route route) throws IllegalAccessException, InstantiationException, IOException, InvocationTargetException, NoSuchMethodException {
         String contentType = RequestContext.getHttpRequest().getContentType();
-        boolean jsonRequest = contentType != null && contentType.equals("application/json");
+        boolean jsonRequest = contentType != null && contentType.toLowerCase().contains("application/json");
         Map<String, String> requestMap;
         if(jsonRequest){
             InputStream in = route.getController().getRequestInputStream();

diff --git a/activeweb/src/test/java/org/javalite/activeweb/RequestArgumentControllerModelSpec.java b/activeweb/src/test/java/org/javalite/activeweb/RequestArgumentControllerModelSpec.java
@@ -63,7 +63,7 @@ public void shouldInvalidateOutOfRangeValue() throws IOException, ServletExcepti
     public void should_convert_JSON_to_Model() throws IOException, ServletException {
         request.setServletPath("/request_argument/get_total");
         request.setMethod("GET");
-        request.setContentType("application/json");
+        request.setContentType("application/json; charset=utf-8");
 
         request.setContent("{ \"amount\" : 50, \"total\" : 30  }".getBytes());
         dispatcher.doFilter(request, response, filterChain);