diff --git a/src/main/java/org/example/tampoposerverdtram/resources/ChatRequests.java b/src/main/java/org/example/tampoposerverdtram/resources/ChatRequests.java index f53cf22..1306c8a 100644 --- a/src/main/java/org/example/tampoposerverdtram/resources/ChatRequests.java +++ b/src/main/java/org/example/tampoposerverdtram/resources/ChatRequests.java @@ -19,7 +19,7 @@ return new HashMap<>(this.value); } @DELETE - public void deleteChatRequest(@FormParam("id") String id) throws JsonProcessingException { + public void deleteChatRequest(@QueryParam("id") String id) throws JsonProcessingException { Map> temp_if23; if (this.value.containsKey(id)) { this.value.remove(id); diff --git a/src/main/java/org/example/tampoposerverdtram/resources/ChatRooms.java b/src/main/java/org/example/tampoposerverdtram/resources/ChatRooms.java index bf0bd11..0e04dd8 100644 --- a/src/main/java/org/example/tampoposerverdtram/resources/ChatRooms.java +++ b/src/main/java/org/example/tampoposerverdtram/resources/ChatRooms.java @@ -57,7 +57,7 @@ String result = client.target("http://localhost:8080").path("/roomId").request().post(entity, String.class); } @DELETE - public void deleteChatRoomMember(@FormParam("userId") String userId, @QueryParam("chatRoomId") String chatRoomId) throws JsonProcessingException { + public void deleteChatRoomMember(@QueryParam("userId") String userId, @QueryParam("chatRoomId") String chatRoomId) throws JsonProcessingException { Map> temp_if34; if (this.value.get(chatRoomId).containsKey(userId)) { Map> temp_if33; diff --git a/src/main/java/org/example/tampoposerverdtram/resources/DeletedFriendPair.java b/src/main/java/org/example/tampoposerverdtram/resources/DeletedFriendPair.java index 7183291..f7d7a72 100644 --- a/src/main/java/org/example/tampoposerverdtram/resources/DeletedFriendPair.java +++ b/src/main/java/org/example/tampoposerverdtram/resources/DeletedFriendPair.java @@ -1,5 +1,7 @@ package org.example.tampoposerverdtram.resources; +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; import java.util.*; import jakarta.ws.rs.*; import jakarta.ws.rs.client.*; @@ -27,12 +29,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", 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); + String result = client.target("http://localhost:8080").path("/users/"+user0Id+"/friends").queryParam("deletedFriendPair", URLEncoder.encode(new ObjectMapper().writeValueAsString(this.value), StandardCharsets.UTF_8)).request().delete(String.class); + result = client.target("http://localhost:8080").path("/users/"+user1Id+"/friends").queryParam("deletedFriendPair", URLEncoder.encode(new ObjectMapper().writeValueAsString(this.value), StandardCharsets.UTF_8)).request().delete(String.class); Form form = new Form(); 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); + result = client.target("http://localhost:8080").path("/friends/pairs").queryParam("deletedFriendPair", URLEncoder.encode(new ObjectMapper().writeValueAsString(this.value), StandardCharsets.UTF_8)).request().delete(String.class); } } \ No newline at end of file diff --git a/src/main/java/org/example/tampoposerverdtram/resources/FriendRequests.java b/src/main/java/org/example/tampoposerverdtram/resources/FriendRequests.java index 37d8e90..42efb92 100644 --- a/src/main/java/org/example/tampoposerverdtram/resources/FriendRequests.java +++ b/src/main/java/org/example/tampoposerverdtram/resources/FriendRequests.java @@ -19,7 +19,7 @@ return new ArrayList<>(this.value); } @DELETE - public void deleteFriendRequest(@FormParam("friendRequestId") int friendRequestId) { + public void deleteFriendRequest(@QueryParam("friendRequestId") int friendRequestId) { List> temp_if35; if ((friendRequestId temp_if40; if (this.value.containsKey(userId)) { this.value.remove(userId); @@ -95,7 +95,7 @@ } @Path("/{user1Id}/friends") @DELETE - public void updateFriendsFromDeletedFriendPair(@PathParam("user1Id") String user1Id, @FormParam("deletedFriendPair") String deletedFriendPair_json) throws JsonProcessingException { + public void updateFriendsFromDeletedFriendPair(@PathParam("user1Id") String user1Id, @QueryParam("deletedFriendPair") String deletedFriendPair_json) throws JsonProcessingException { getUser(user1Id).updateFriendsFromDeletedFriendPair(user1Id, deletedFriendPair_json); } @Path("/{user1Id}/friends")