Merge pull request #7 from vitalca/master

String has been replaced with JsonArray
eiffel-community · May 13, 2016 · df11817 · df11817
2 parents 1de05d8 + 55b80b9
commit df11817
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/src/main/java/com/ericsson/eiffel/remrem/producer/controller/ProducerController.java b/src/main/java/com/ericsson/eiffel/remrem/producer/controller/ProducerController.java
@@ -1,11 +1,12 @@
 package com.ericsson.eiffel.remrem.producer.controller;
 
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+
 import com.ericsson.eiffel.remrem.producer.helper.ResponseHelper;
 import com.ericsson.eiffel.remrem.producer.service.MessageService;
 import com.ericsson.eiffel.remrem.producer.service.SendResult;
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
-import lombok.extern.slf4j.Slf4j;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -15,9 +16,10 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.lang.reflect.Type;
+import java.util.ArrayList;
 import java.util.List;
 
+import lombok.extern.slf4j.Slf4j;
 
 @Slf4j @RestController @RequestMapping("/producer") public class ProducerController {
 
@@ -26,12 +28,14 @@
 
     @RequestMapping(value = "/msg", method = RequestMethod.POST) @ResponseBody
     public List<String> send(@RequestParam(value = "rk", required = true) String routingKey,
-        @RequestBody String body) {
+        @RequestBody JsonArray body) {
         log.debug("routingKey: " + routingKey);
         log.debug("body: " + body);
-        Type type = new TypeToken<List<String>>() {
-        }.getType();
-        List<String> msgs = new Gson().fromJson(body, type);
+
+        List<String> msgs = new ArrayList<>();
+        for (JsonElement obj : body) {
+            msgs.add(obj.toString());
+        }
         List<SendResult> results = messageService.send(routingKey, msgs);
         return responseHelper.convert(results);
     }

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -7,3 +7,5 @@ logging.level.com.ericsson.eiffel.remrem.producer=ERROR
 #rabbitmq.host=127.0.0.1
 # must exist
 #rabbitmq.exchange.name=eiffel.poc
+
+spring.http.converters.preferred-json-mapper=gson