diff --git a/src/main/java/org/example/tampoposerverdtram/resources/DeletedFriendPair.java b/src/main/java/org/example/tampoposerverdtram/resources/DeletedFriendPair.java index e3f1f85..7183291 100644 --- a/src/main/java/org/example/tampoposerverdtram/resources/DeletedFriendPair.java +++ b/src/main/java/org/example/tampoposerverdtram/resources/DeletedFriendPair.java @@ -30,7 +30,7 @@ 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()); + form.param("deletedFriendPair", new ObjectMapper().writeValueAsString(this.value)); 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", new ObjectMapper().writeValueAsString(this.value)).request().delete(String.class); diff --git a/src/main/java/org/example/tampoposerverdtram/resources/Friends.java b/src/main/java/org/example/tampoposerverdtram/resources/Friends.java index 052f264..6b388e9 100644 --- a/src/main/java/org/example/tampoposerverdtram/resources/Friends.java +++ b/src/main/java/org/example/tampoposerverdtram/resources/Friends.java @@ -47,6 +47,18 @@ public Map getPairValue(@PathParam("pid") String pid) { return getPairs().getPair(pid).getValue(); } + @Path("/pairs/{pid}/user0Id") + @Produces(MediaType.APPLICATION_JSON) + @GET + public String getUser0IdValue(@PathParam("pid") String pid) { + return getPairs().getPair(pid).getUser0Id(); + } + @Path("/pairs/{pid}/user1Id") + @Produces(MediaType.APPLICATION_JSON) + @GET + public String getUser1IdValue(@PathParam("pid") String pid) { + return getPairs().getPair(pid).getUser1Id(); + } @Path("/users") @POST public void updateUsersFromDeletedFriendPair(@FormParam("deletedFriendPair") String deletedFriendPair_json) throws JsonProcessingException { diff --git a/src/main/java/org/example/tampoposerverdtram/resources/Pair.java b/src/main/java/org/example/tampoposerverdtram/resources/Pair.java index 5022ec5..ed63da3 100644 --- a/src/main/java/org/example/tampoposerverdtram/resources/Pair.java +++ b/src/main/java/org/example/tampoposerverdtram/resources/Pair.java @@ -15,10 +15,10 @@ temp_nil11.put("user0Id",this.getUser0Id()); return temp_nil11; } - private String getUser0Id() { + public String getUser0Id() { return user0Id; } - private String getUser1Id() { + public String getUser1Id() { return user1Id; } public Pair(String pairId, String user0Id, String user1Id, Friends friends) {