diff --git a/src/main/java/org/example/tampoposerverdtram/resources/DeletedFriendPair.java b/src/main/java/org/example/tampoposerverdtram/resources/DeletedFriendPair.java index 757bc8e..e3f1f85 100644 --- a/src/main/java/org/example/tampoposerverdtram/resources/DeletedFriendPair.java +++ b/src/main/java/org/example/tampoposerverdtram/resources/DeletedFriendPair.java @@ -27,12 +27,12 @@ temp_json0.put("user0Id", user0Id); temp_json0.put("user1Id", user1Id); this.value = temp_json0; - String result = client.target("http://localhost:8080").path("/users/"+user0Id+"/friends").queryParam("deletedFriendPair", this.value.toString()).request().delete(String.class); - result = client.target("http://localhost:8080").path("/users/"+user1Id+"/friends").queryParam("deletedFriendPair", this.value.toString()).request().delete(String.class); + String result = client.target("http://localhost:8080").path("/users/"+user0Id+"/friends").queryParam("deletedFriendPair", new ObjectMapper().writeValueAsString(this.value)).request().delete(String.class); + result = client.target("http://localhost:8080").path("/users/"+user1Id+"/friends").queryParam("deletedFriendPair", new ObjectMapper().writeValueAsString(this.value)).request().delete(String.class); Form form = new Form(); form.param("deletedFriendPair", this.value.toString()); Entity
entity = Entity.entity(form, MediaType.APPLICATION_FORM_URLENCODED); result = client.target("http://localhost:8080").path("/friends/users").request().post(entity, String.class); - result = client.target("http://localhost:8080").path("/friends/pairs").queryParam("deletedFriendPair", this.value.toString()).request().delete(String.class); + result = client.target("http://localhost:8080").path("/friends/pairs").queryParam("deletedFriendPair", new ObjectMapper().writeValueAsString(this.value)).request().delete(String.class); } } \ No newline at end of file diff --git a/src/main/java/org/example/tampoposerverdtram/resources/Friends.java b/src/main/java/org/example/tampoposerverdtram/resources/Friends.java index 8354487..052f264 100644 --- a/src/main/java/org/example/tampoposerverdtram/resources/Friends.java +++ b/src/main/java/org/example/tampoposerverdtram/resources/Friends.java @@ -38,7 +38,7 @@ } @Path("/pairs") @POST - public void postFriend(@FormParam("user1Id") String user1Id, @FormParam("user0Id") String user0Id) { + public void postFriend(@FormParam("user1Id") String user1Id, @FormParam("user0Id") String user0Id) throws JsonProcessingException { getPairs().postFriend(this, user1Id, user0Id); } @Path("/pairs/{pid}") diff --git a/src/main/java/org/example/tampoposerverdtram/resources/Pairs.java b/src/main/java/org/example/tampoposerverdtram/resources/Pairs.java index aa2b07d..6ba6428 100644 --- a/src/main/java/org/example/tampoposerverdtram/resources/Pairs.java +++ b/src/main/java/org/example/tampoposerverdtram/resources/Pairs.java @@ -32,7 +32,7 @@ } this.value = temp_if39; } - public void postFriend(Friends friends, String user1Id, String user0Id) { + public void postFriend(Friends friends, String user1Id, String user0Id) throws JsonProcessingException { String pairId = client.target("http://localhost:8080").path("/pairId").request().get(String.class); Map> users_json = client.target("http://localhost:8080").path("/users").request().get(HashMap.class); Map> users = new HashMap<>(); @@ -53,17 +53,17 @@ this.value = temp_if42; Form form = new Form(); form.param("pid", pairId); - form.param("pair", getPair(pairId).getValue().toString()); + form.param("pair", new ObjectMapper().writeValueAsString(getPair(pairId).getValue())); Entity entity = Entity.entity(form, MediaType.APPLICATION_FORM_URLENCODED); String result = client.target("http://localhost:8080").path("/users/"+user0Id+"/friends").request().post(entity, String.class); form = new Form(); form.param("pid", pairId); - form.param("pair", getPair(pairId).getValue().toString()); + form.param("pair", new ObjectMapper().writeValueAsString(getPair(pairId).getValue())); entity = Entity.entity(form, MediaType.APPLICATION_FORM_URLENCODED); result = client.target("http://localhost:8080").path("/users/"+user1Id+"/friends").request().post(entity, String.class); form = new Form(); form.param("pid", pairId); - form.param("pair", getPair(pairId).getValue().toString()); + form.param("pair", new ObjectMapper().writeValueAsString(getPair(pairId).getValue())); entity = Entity.entity(form, MediaType.APPLICATION_FORM_URLENCODED); result = client.target("http://localhost:8080").path("/pairId").request().post(entity, String.class); }