diff --git a/src/main/java/com/ntlab/irisserver/resources/RoomsRest.java b/src/main/java/com/ntlab/irisserver/resources/RoomsRest.java index 0822ee8..51f7f5f 100644 --- a/src/main/java/com/ntlab/irisserver/resources/RoomsRest.java +++ b/src/main/java/com/ntlab/irisserver/resources/RoomsRest.java @@ -1,4 +1,5 @@ package com.ntlab.irisserver.resources; +import com.ntlab.irisserver.entities.Member; import com.ntlab.irisserver.entities.RoomJson; import org.springframework.stereotype.Component; import com.ntlab.irisserver.entities.Room; @@ -30,10 +31,9 @@ @GET//部屋の情報を表示 @Path("/{rid}") @Produces(MediaType.APPLICATION_JSON) - public RoomJson getRoomMember(@PathParam("rid") String rid){ + public List getRoomMember(@PathParam("rid") String rid){ RoomManager rm = RoomManager.getInstance(); Room room = rm.getRoom(rid); - RoomJson rj = new RoomJson(room); if(room == null){ //部屋がなければエラー @@ -42,7 +42,7 @@ throw new WebApplicationException(response.build()); } - return rj; + return room.getMembers(); } @DELETE//部屋の削除