diff --git a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/ShipController.java b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/ShipController.java index 99cfde3..bc38975 100644 --- a/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/ShipController.java +++ b/backend/TMSProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/ShipController.java @@ -16,6 +16,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import com.fasterxml.jackson.databind.util.JSONPObject; + @RestController @CrossOrigin(origins = "*") @RequestMapping("/ship") @@ -24,7 +26,7 @@ public class ShipController { final String GOOGLE = "https://maps.googleapis.com/maps/api/directions/json?origin="; @GetMapping("/{cepOrigem}/{cepDestino}") - public ArrayList getGoogleAPI(@PathVariable ("cepOrigem") int param1, @PathVariable ("cepDestino") int param2 ){ + public JSONPObject getGoogleAPI(@PathVariable ("cepOrigem") int param1, @PathVariable ("cepDestino") int param2 ){ try { @@ -37,7 +39,9 @@ public ArrayList getGoogleAPI(@PathVariable ("cepOrigem") int param1, @P String jsonEmString = converteJsonEmString(response); - return jsonEmString; + JSONPObject obj = new JSONPObject(jsonEmString, null); + + return obj; }catch (Exception e) { @@ -50,11 +54,11 @@ public ArrayList getGoogleAPI(@PathVariable ("cepOrigem") int param1, @P public static String converteJsonEmString(BufferedReader buffereReader) throws IOException { String resposta; - ArrayList json = new ArrayList<>(); + String json = ""; while ((resposta = buffereReader.readLine()) != null) { - json.add(resposta); + json += (resposta); }