Minor refactoring

Author: pokki-deploy

src/main/java/in/erail/route/OpenAPI3RouteBuilder.java

@@ -2,6 +2,7 @@
 
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.Timer;
+import com.google.common.base.Strings;
 import com.google.common.net.HttpHeaders;
 import com.google.common.net.MediaType;
 import java.io.File;
@@ -102,7 +103,10 @@ public JsonObject serialiseRoutingContext(RoutingContext pContext) {
     if (pContext.request().method() == HttpMethod.POST) {
       boolean bodyAsJson = pContext.<Boolean>get(FrameworkConstants.RoutingContext.Attribute.BODY_AS_JSON);
       if (bodyAsJson) {
-        result.put(FrameworkConstants.RoutingContext.Json.BODY, pContext.getBodyAsJson());
+        String contentType = pContext.request().headers().get(HttpHeaders.CONTENT_TYPE);
+        if (!Strings.isNullOrEmpty(contentType) && contentType.equals(MediaType.JSON_UTF_8.toString())) {
+          result.put(FrameworkConstants.RoutingContext.Json.BODY, pContext.getBodyAsJson());
+        }
       } else {
         result.put(FrameworkConstants.RoutingContext.Json.BODY, pContext.getBody().getDelegate().getBytes());
       }
@@ -158,7 +162,7 @@ public Map<String, Object> convertMultiMapIntoMap(MultiMap pMultiMap) {
             .getDelegate()
             .entries()
             .stream()
-            .collect(Collectors.toMap((t) -> t.getKey(), (t) -> t.getValue()));
+            .collect(Collectors.toMap((t) -> t.getKey(), (t) -> t.getValue(), (a, b) -> a));
   }
 
   public DeliveryOptions getDeliveryOptions() {

src/test/java/in/erail/service/BroadcastServiceTest.java

@@ -1,6 +1,7 @@
 package in.erail.service;
 
 import com.google.common.net.HttpHeaders;
+import com.google.common.net.MediaType;
 import in.erail.server.Server;
 import in.erail.test.TestConstants;
 import org.junit.Test;
@@ -45,7 +46,7 @@ public void testProcess(TestContext context) {
             .getVertx()
             .createHttpClient()
             .post(server.getPort(), server.getHost(), "/v1/broadcast/testTopic")
-            .putHeader("content-type", "application/json")
+            .putHeader("content-type", MediaType.JSON_UTF_8.toString())
             .putHeader(HttpHeaders.ORIGIN, "https://test.com")
             .putHeader("content-length", Integer.toString(json.length()))
             .putHeader(HttpHeaders.AUTHORIZATION, TestConstants.ACCESS_TOKEN)