Merge branch 'fix/custom_header_overrides' of github.com:splitio/java-client into fix/custom_header_overrides

Author: mmelograno

client/src/main/java/io/split/service/SplitHttpClientImpl.java

@@ -63,7 +63,9 @@ public SplitHttpResponse get(URI uri, FetchOptions options, Map<String, List<Str
             setBasicHeaders(request);
             if (additionalHeaders != null) {
                 for (Map.Entry<String, List<String>> entry : additionalHeaders.entrySet()) {
-                    request.addHeader(entry.getKey(), entry.getValue());
+                    for (String value : entry.getValue()) {
+                        request.addHeader(entry.getKey(), value);
+                    }
                 }
             }
             if (options.cacheControlHeadersEnabled()) {
@@ -105,7 +107,9 @@ public SplitHttpResponse post(URI uri, HttpEntity entity, Map<String, List<Strin
             setBasicHeaders(request);
             if (additionalHeaders != null) {
                 for (Map.Entry<String, List<String>> entry : additionalHeaders.entrySet()) {
-                    request.addHeader(entry.getKey(), entry.getValue());
+                    for (String value : entry.getValue()) {
+                        request.addHeader(entry.getKey(), value);
+                    }
                 }
             }
             request.setEntity(entity);

client/src/test/java/io/split/client/impressions/HttpImpressionsSenderTest.java

@@ -115,7 +115,6 @@ public void testImpressionCountsEndpointOptimized() throws URISyntaxException, I
         HttpUriRequest request = captor.getValue();
         assertThat(request.getUri(),
                 is(equalTo(URI.create("https://kubernetesturl.com/split/api/testImpressions/count"))));
-        assertThat(request.getHeaders().length, is(0));
         assertThat(request, instanceOf(HttpPost.class));
         HttpPost asPostRequest = (HttpPost) request;
         InputStreamReader reader = new InputStreamReader(asPostRequest.getEntity().getContent());
@@ -178,7 +177,6 @@ public void testImpressionBulksEndpoint() throws URISyntaxException, IOException
         HttpUriRequest request = captor.getValue();
         assertThat(request.getUri(),
                 is(equalTo(URI.create("https://kubernetesturl.com/split/api/testImpressions/bulk"))));
-        assertThat(request.getHeaders().length, is(1));
         assertThat(request.getFirstHeader("SplitSDKImpressionsMode").getValue(), is(equalTo("OPTIMIZED")));
         assertThat(request, instanceOf(HttpPost.class));
         HttpPost asPostRequest = (HttpPost) request;
@@ -199,7 +197,6 @@ public void testImpressionBulksEndpoint() throws URISyntaxException, IOException
         captor = ArgumentCaptor.forClass(HttpUriRequest.class);
         verify(httpClientDebugMode).execute(captor.capture());
         request = captor.getValue();
-        assertThat(request.getHeaders().length, is(1));
         assertThat(request.getFirstHeader("SplitSDKImpressionsMode").getValue(), is(equalTo("DEBUG")));
     }
 

client/src/test/java/io/split/service/HttpSplitClientTest.java

@@ -131,7 +131,6 @@ public void testPost() throws URISyntaxException, IOException, IllegalAccessExce
         HttpUriRequest request = captor.getValue();
         assertThat(request.getUri(),
                 is(equalTo(URI.create("https://kubernetesturl.com/split/api/testImpressions/bulk"))));
-        assertThat(request.getHeaders().length, is(1));
         assertThat(request.getFirstHeader("SplitSDKImpressionsMode").getValue(), is(equalTo("OPTIMIZED")));
         assertThat(request, instanceOf(HttpPost.class));
         HttpPost asPostRequest = (HttpPost) request;