Skip to content

UPDATE API! #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kaka-jaques merged 1 commit into from
Sep 26, 2022
Merged

UPDATE API! #27

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions ...SProject/src/main/java/br/com/entra21/teamroxo/TMSProject/controllers/ShipController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -24,7 +26,7 @@ public class ShipController {
final String GOOGLE = "https://maps.googleapis.com/maps/api/directions/json?origin=";

@GetMapping("/{cepOrigem}/{cepDestino}")
public ArrayList<String> getGoogleAPI(@PathVariable ("cepOrigem") int param1, @PathVariable ("cepDestino") int param2 ){
public JSONPObject getGoogleAPI(@PathVariable ("cepOrigem") int param1, @PathVariable ("cepDestino") int param2 ){

try {

Expand All @@ -37,7 +39,9 @@ public ArrayList<String> getGoogleAPI(@PathVariable ("cepOrigem") int param1, @P

String jsonEmString = converteJsonEmString(response);

return jsonEmString;
JSONPObject obj = new JSONPObject(jsonEmString, null);

return obj;

}catch (Exception e) {

Expand All @@ -50,11 +54,11 @@ public ArrayList<String> getGoogleAPI(@PathVariable ("cepOrigem") int param1, @P
public static String converteJsonEmString(BufferedReader buffereReader) throws IOException {

String resposta;
ArrayList<String> json = new ArrayList<>();
String json = "";

while ((resposta = buffereReader.readLine()) != null) {

json.add(resposta);
json += (resposta);

}

Expand Down