diff --git a/src/main/java/com/ntlab/irisserver/entities/Room.java b/src/main/java/com/ntlab/irisserver/entities/Room.java index d2d6d3d..d815e53 100644 --- a/src/main/java/com/ntlab/irisserver/entities/Room.java +++ b/src/main/java/com/ntlab/irisserver/entities/Room.java @@ -1,6 +1,8 @@ package com.ntlab.irisserver.entities; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; public class Room { @@ -16,14 +18,15 @@ Map members= new HashMap<>(); - public Member getMembers(String nick) { - Member m = members.get(nick); - return m; + public List getMembers() { + + List memberslist = new ArrayList(members.values()) ; + return memberslist; } public Member getMember(String nick) { - Member m = new Member(nick); + Member m = members.get(nick); return m; } @@ -32,4 +35,9 @@ m.setNickname(nick); members.put(nick,m); } + public int getStateRest(){ + return 0; + } + public Room(String rid, String owner) { + } } diff --git a/src/main/java/com/ntlab/irisserver/models/RoomManager.java b/src/main/java/com/ntlab/irisserver/models/RoomManager.java new file mode 100644 index 0000000..b79d3b2 --- /dev/null +++ b/src/main/java/com/ntlab/irisserver/models/RoomManager.java @@ -0,0 +1,45 @@ +package com.ntlab.irisserver.models; +import com.ntlab.irisserver.entities.Room; +import org.springframework.stereotype.Component; + +import javax.ws.rs.*; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + +@Component +@Path("/rooms") +public class RoomManager { + private static RoomManager theInstance = null; + private Map rooms = new HashMap(); + + @GET + public static RoomManager getInstance(){ + if(theInstance == null){ + theInstance = new RoomManager(); + } + return theInstance; + } + + @PUT + public Room creatRoom(@FormParam("nickname") String owner){ + UUID uuid = UUID.randomUUID(); + String rid = uuid.toString(); //uuid型からstring型に変換 + Room r = new Room(rid, owner); + rooms.put(rid, r); + return r; + } + + @GET + public Room getRoom(@FormParam("rid") String rid){ + Room r = rooms.get(rid); + return r; + } + + @DELETE + public void deleteRoom(@FormParam("rid") String rid){ + rooms.remove(rid); + } + + +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 75f7165..70533cf 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,2 +1 @@ -server.servlet.context-path=/iris - +server.servlet.context-path=/iris \ No newline at end of file