fix application type to be JSON like NettyRequest

Author: jcantrill

src/main/java/io/fabric8/elasticsearch/plugin/OpenshiftRequestContextFactory.java

@@ -202,7 +202,7 @@ public static class OpenshiftRequestContext {
         private final String kibanaIndex;
         private final String kibanaIndexMode;
 
-        protected OpenshiftRequestContext(final String user, final String token, boolean isClusterAdmin,
+        public OpenshiftRequestContext(final String user, final String token, boolean isClusterAdmin,
                 Set<String> projects, String kibanaIndex, final String kibanaIndexMode) {
             this.user = user;
             this.token = token;

src/main/java/io/fabric8/elasticsearch/util/RequestUtils.java

@@ -186,6 +186,9 @@ public RestRequest modifyRequest(final RestRequest request, OpenshiftRequestCont
             final Map<String, List<String>> modifiedHeaders = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
             modifiedHeaders.putAll(request.getHeaders());
             modifiedHeaders.put(proxyUserHeader, Arrays.asList(context.getUser()));
+            if(request.header("Content-Type") != null && request.header("Content-Type").toLowerCase().endsWith("json")){
+                modifiedHeaders.put("Content-Type", Arrays.asList("application/json"));
+            }
             RestRequest modified = new RestRequest(request.getXContentRegistry(), uri, modifiedHeaders) {
 
                 @Override
@@ -235,6 +238,7 @@ public Channel getChannel() {
             if (uri.contains(defaultKibanaIndex)) {
                 modified.params().put("index", context.getKibanaIndex());
             }
+
             return modified;
         }
         return request;

src/test/java/io/fabric8/elasticsearch/util/RequestUtilsTest.java

@@ -19,6 +19,7 @@
 import static org.junit.Assert.assertEquals;
 
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
@@ -29,10 +30,13 @@
 import org.junit.Test;
 
 import io.fabric8.elasticsearch.plugin.ConfigurationSettings;
+import io.fabric8.elasticsearch.plugin.OpenshiftRequestContextFactory;
+import io.fabric8.elasticsearch.plugin.OpenshiftRequestContextFactory.OpenshiftRequestContext;
 import io.fabric8.elasticsearch.plugin.PluginSettings;
 
 public class RequestUtilsTest {
 
+    private static final String CONTENT_TYPE = "Content-Type";
     private static final String PROXY_HEADER = "aValue";
     private static final String USER = "auser";
     private RequestUtils util;
@@ -52,5 +56,16 @@ public void testGetUserFromHeader() {
 
         assertEquals(USER, util.getUser(request));
     }
+
+    @Test
+    public void testModifyContentType() {
+        Map<String, List<String>> headers = new TreeMap<String, List<String>>(String.CASE_INSENSITIVE_ORDER);
+        headers.put(CONTENT_TYPE, Arrays.asList("application/x-ndjson"));
+        RestRequest request = new TestRestRequest(headers);
+        
+        OpenshiftRequestContext context = new OpenshiftRequestContextFactory.OpenshiftRequestContext("foo", null, false, new HashSet<>(), null, null);
+        RestRequest modifyRequest = util.modifyRequest(request, context , null);
+        assertEquals("application/json", modifyRequest.header(CONTENT_TYPE));
+    }
 
 }

src/test/java/io/fabric8/elasticsearch/util/TestRestRequest.java

@@ -20,6 +20,7 @@
 import java.util.List;
 import java.util.Map;
 
+import org.elasticsearch.common.bytes.BytesArray;
 import org.elasticsearch.common.bytes.BytesReference;
 import org.elasticsearch.common.xcontent.NamedXContentRegistry;
 import org.elasticsearch.rest.RestRequest;
@@ -50,7 +51,7 @@ public boolean hasContent() {
 
     @Override
     public BytesReference content() {
-        return null;
+        return new BytesArray("");
     }
 
 }