diff --git a/src/main/java/com/ntlab/irisserver/IrisServerApplication.java b/src/main/java/com/ntlab/irisserver/IrisServerApplication.java index 755a665..fd81885 100644 --- a/src/main/java/com/ntlab/irisserver/IrisServerApplication.java +++ b/src/main/java/com/ntlab/irisserver/IrisServerApplication.java @@ -21,70 +21,10 @@ ApplicationContext applicationContext = SpringApplication.run(IrisServerApplication.class, args); String path; try { - path = applicationContext.getResource("file:").getFile().getAbsolutePath()+"/apache-tomcat-9.0.10/webapps/irisdata/keywords.txt"; + path = applicationContext.getResource("file:").getFile().getAbsolutePath() + "/apache-tomcat-9.0.10/webapps/irisdata/keywords.txt"; } catch (IOException e) { e.printStackTrace(); } - KeywordManager km = KeywordManager.getInstance(); - RoomManager rm = RoomManager.getInstance(); - rm.createTestRoom(); - - Room dr = rm.getRoom("drawtest"); - Room gr = rm.getRoom("gametest"); - dr.addMember("draw"); - gr.addMember("game"); - - //メンバー設定() - int length = 0; - char[] rch; - rch = new char[3]; - String rname; - while(length < 10){ - for(int i = 0; i<3; i++){ - Random random = new Random(); - rch[i] = (char)(random.nextInt(26) + 'a'); - } - rname = new String(rch); - dr.addMember(rname); - gr.addMember(rname); - List members = dr.getMembers(); - length = members.size(); - } - - //チームシャッフル - List dm = dr.getMembers(); - List gm = gr.getMembers(); - Collections.shuffle(dm); - Collections.shuffle(gm); - for(int i=0; i < 10; i++){ - if(i >= dm.size())break; - Member infod = dm.get(i); - Member infog = gm.get(i); - if(i==0){ - infod.setMaster(true); - infog.setMaster(true); - dr.changeTeamAndMaster(infod.getNickname(), "r", true); - gr.changeTeamAndMaster(infog.getNickname(), "r", true); - }else if(i==1){ - infod.setMaster(true); - infog.setMaster(true); - dr.changeTeamAndMaster(infod.getNickname(), "b", true); - gr.changeTeamAndMaster(infog.getNickname(), "b", true); - }else{ - infod.setMaster(false); - infog.setMaster(false); - } - if(i % 2 == 0){ - infod.setBelongs("r"); - infog.setBelongs("r"); - }else{ - infod.setBelongs("b"); - infog.setBelongs("b"); - } - } - - //drawtestの設定 } - } diff --git a/src/main/java/com/ntlab/irisserver/resources/GameRest.java b/src/main/java/com/ntlab/irisserver/resources/GameRest.java index cd769b2..734c312 100644 --- a/src/main/java/com/ntlab/irisserver/resources/GameRest.java +++ b/src/main/java/com/ntlab/irisserver/resources/GameRest.java @@ -10,6 +10,7 @@ import javax.ws.rs.PathParam; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -47,7 +48,7 @@ Game game = room.getGame(); Map keywordList = game.getKeywords(); List map = game.getMap(); - List keywords = null; + List keywords = new ArrayList<>(); for(int i=0; i<16; i++){ keywords.add(keywordList.get(map.get(i))); } diff --git a/src/main/java/com/ntlab/irisserver/resources/GameStateRest.java b/src/main/java/com/ntlab/irisserver/resources/GameStateRest.java index 02aa3ce..ceb84a3 100644 --- a/src/main/java/com/ntlab/irisserver/resources/GameStateRest.java +++ b/src/main/java/com/ntlab/irisserver/resources/GameStateRest.java @@ -9,6 +9,7 @@ import javax.ws.rs.*; import javax.ws.rs.core.MediaType; +import java.util.ArrayList; import java.util.List; @Component @@ -18,8 +19,8 @@ @Path("/{rid}/game/opens") @GET @Produces(MediaType.APPLICATION_JSON) - public List getOpens(@PathParam("rid") String rid, @FormParam("cno")Integer cno){ - List opens= null; + public List getOpens(@PathParam("rid") String rid){ + List opens= new ArrayList<>(); RoomManager rm = RoomManager.getInstance(); Room room = rm.getRoom(rid); Game game = room.getGame(); diff --git a/src/main/java/com/ntlab/irisserver/resources/TestRest.java b/src/main/java/com/ntlab/irisserver/resources/TestRest.java new file mode 100644 index 0000000..e2dfc6a --- /dev/null +++ b/src/main/java/com/ntlab/irisserver/resources/TestRest.java @@ -0,0 +1,85 @@ +package com.ntlab.irisserver.resources; + +import com.ntlab.irisserver.entities.Member; +import com.ntlab.irisserver.entities.Room; +import com.ntlab.irisserver.models.KeywordManager; +import com.ntlab.irisserver.models.RoomManager; +import org.springframework.stereotype.Component; + +import javax.ws.rs.PUT; +import javax.ws.rs.Path; +import java.util.Collections; +import java.util.List; +import java.util.Random; + +@Component +@Path("/rooms") + +public class TestRest { + + @PUT + @Path("/test") + public void putTestRoom(){ + KeywordManager km = KeywordManager.getInstance(); + RoomManager rm = RoomManager.getInstance(); + rm.createTestRoom(); + + Room dr = rm.getRoom("drawtest"); + Room gr = rm.getRoom("gametest"); + dr.addMember("draw"); + gr.addMember("game"); + + //メンバー設定() + int length = 0; + char[] rch; + rch = new char[3]; + String rname; + while(length < 10){ + for(int i = 0; i<3; i++){ + Random random = new Random(); + rch[i] = (char)(random.nextInt(26) + 'a'); + } + rname = new String(rch); + dr.addMember(rname); + gr.addMember(rname); + List members = dr.getMembers(); + length = members.size(); + } + + //チームシャッフル + List dm = dr.getMembers(); + List gm = gr.getMembers(); + Collections.shuffle(dm); + Collections.shuffle(gm); + for(int i=0; i < 10; i++){ + if(i >= dm.size())break; + Member infod = dm.get(i); + Member infog = gm.get(i); + if(i==0){ + infod.setMaster(true); + infog.setMaster(true); + dr.changeTeamAndMaster(infod.getNickname(), "r", true); + gr.changeTeamAndMaster(infog.getNickname(), "r", true); + }else if(i==1){ + infod.setMaster(true); + infog.setMaster(true); + dr.changeTeamAndMaster(infod.getNickname(), "b", true); + gr.changeTeamAndMaster(infog.getNickname(), "b", true); + }else{ + infod.setMaster(false); + infog.setMaster(false); + } + if(i % 2 == 0){ + infod.setBelongs("r"); + infog.setBelongs("r"); + }else{ + infod.setBelongs("b"); + infog.setBelongs("b"); + } + } + + //drawtestの設定 + } + + +}