diff --git a/src/main/java/framework/network/CallBack.java b/src/main/java/framework/network/CallBack.java index e56621d..d62d226 100644 --- a/src/main/java/framework/network/CallBack.java +++ b/src/main/java/framework/network/CallBack.java @@ -2,4 +2,5 @@ public interface CallBack { public void onResponse(String response); + } diff --git a/src/main/java/framework/network/HttpAsyncConnection.java b/src/main/java/framework/network/HttpAsyncConnection.java index 49ae5a6..206ff13 100644 --- a/src/main/java/framework/network/HttpAsyncConnection.java +++ b/src/main/java/framework/network/HttpAsyncConnection.java @@ -74,6 +74,7 @@ } catch (Exception e) { // TODO: handle exception //Log.d("error", "エラー！"); + } } @@ -124,6 +125,7 @@ BufferedReader reader; try { reader = new BufferedReader(new InputStreamReader(conn.getInputStream())); + reader = new BufferedReader(new InputStreamReader(conn.getInputStream())); String line; StringBuilder builder = new StringBuilder(); while((line = reader.readLine()) != null) diff --git a/src/main/java/org/ntlab/SproutServerMicro/accounts/AccountsRest.java b/src/main/java/org/ntlab/SproutServerMicro/accounts/AccountsRest.java index 24a0920..054a394 100644 --- a/src/main/java/org/ntlab/SproutServerMicro/accounts/AccountsRest.java +++ b/src/main/java/org/ntlab/SproutServerMicro/accounts/AccountsRest.java @@ -6,7 +6,9 @@ @Path("accounts") public class AccountsRest { - Accounts accounts; + + private Accounts accounts; + private AccountsConnection connection; public AccountsRest() { accounts = Accounts.getInstance(); diff --git a/src/main/java/org/ntlab/SproutServerMicro/battles/Battle.java b/src/main/java/org/ntlab/SproutServerMicro/battles/Battle.java index bc35ad7..449e5d7 100644 --- a/src/main/java/org/ntlab/SproutServerMicro/battles/Battle.java +++ b/src/main/java/org/ntlab/SproutServerMicro/battles/Battle.java @@ -3,11 +3,15 @@ import framework.model3D.Placeable; import framework.model3D.Position3D; import framework.model3D.Universe; +import framework.network.CallBack; import framework.physics.Ground; +import net.arnx.jsonic.JSON; +import net.arnx.jsonic.JSONHint; import org.ntlab.SproutServerMicro.rooms.Room; import org.ntlab.SproutServerMicro.rooms.Rooms; import javax.vecmath.Vector3d; +import javax.xml.ws.Response; import java.net.URLDecoder; import java.util.ArrayList; import java.util.HashMap; @@ -22,6 +26,9 @@ private double time = BattlesConst.BATTLE_INIT_TIME; // タイム private Universe universe = null; private Ground ground = null; + private RoomsConnection connection; + private Battles battles; + private int battleCount; private int teamId1 = -1; // チームを判別するID private int teamId2 = -1; // チームを判別するID @@ -31,17 +38,26 @@ */ private String state = "battle"; - public Battle(Room room1, Room room2) { + public Battle(Room room1, Room room2, int battleCount) { universe = new Universe(); teamId1 = room1.getRoomId(); teamId2 = room2.getRoomId(); teamMap.put(room1.getRoomId(), new Team(room1)); teamMap.put(room2.getRoomId(), new Team(room2)); + this.battleCount = battleCount; ground = createStage(); placeStage(ground); } + public int getBattleCount() { + return battleCount; + } + + public void setBattleCount(int battleCount) { + this.battleCount = battleCount; + } + public Team getTeam(int roomId) { return teamMap.get(roomId); } @@ -227,7 +243,7 @@ findTeamByID(teamId1).setResult(true); else findTeamByID(teamId2).setResult(true); - finish(); + finish(); } /** @@ -249,7 +265,10 @@ */ public void finish() { state = "end"; - Rooms.getInstance().getRoomList().get(teamId1).roomInitialize(); - Rooms.getInstance().getRoomList().get(teamId2).roomInitialize(); + + connection = battles.getRoomsConnection(); + connection.addFormParam("teamId1",String.valueOf(teamId1)); + connection.addFormParam("teamId2",String.valueOf(teamId2)); + connection.doPut(); } } \ No newline at end of file diff --git a/src/main/java/org/ntlab/SproutServerMicro/battles/Battles.java b/src/main/java/org/ntlab/SproutServerMicro/battles/Battles.java index 5bf3407..40bd51e 100644 --- a/src/main/java/org/ntlab/SproutServerMicro/battles/Battles.java +++ b/src/main/java/org/ntlab/SproutServerMicro/battles/Battles.java @@ -19,7 +19,8 @@ private HashMap battleMap = new HashMap<>(); // バトル一覧 private int battleCount = 0; // バトルを識別するためのid private ScheduledThreadPoolExecutor schedule = null; - private BattlesConnection battlesConnection = null; + private RoomsConnection RoomsConnection; + private Rooms rooms; @Context UriInfo uriInfo; @@ -37,14 +38,15 @@ return theInstance; } - // バトル作成 + /* // バトル作成 public int createBattle(Room room1, Room room2) { Battle battle = new Battle(room1, room2); battleMap.put(battleCount, battle); int resBattleCount = battleCount; battleCount++; return resBattleCount; - } + }*/ +/* // ダミーバトル作成 public void createDummyBattle(int battleId, Room room1, Room room2) { @@ -54,6 +56,7 @@ } battleMap.put(battleId, battle); } +*/ // バトル削除 public void removeBattle(int battleId) { @@ -96,8 +99,24 @@ return battleMap.get(battleId); } - @JSONHint(ignore = true) - public BattlesConnection getBattlesConnection() { - return battlesConnection; + public int getBattleCount() { + return battleCount; + } + + public void setBattleCount(int battleCount) { + this.battleCount = battleCount; + } + + public org.ntlab.SproutServerMicro.battles.RoomsConnection getRoomsConnection() { + RoomsConnection = new RoomsConnection(); + return RoomsConnection; + } + + public Rooms getRooms() { + return rooms; + } + + public void setRooms(Rooms rooms) { + this.rooms = rooms; } } diff --git a/src/main/java/org/ntlab/SproutServerMicro/battles/BattlesConnection.java b/src/main/java/org/ntlab/SproutServerMicro/battles/BattlesConnection.java deleted file mode 100644 index cbb48b4..0000000 --- a/src/main/java/org/ntlab/SproutServerMicro/battles/BattlesConnection.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.ntlab.SproutServerMicro.battles; - -import framework.network.HttpAsyncConnection; - -public class BattlesConnection extends HttpAsyncConnection { - - public BattlesConnection(){ - super("http://nitta-lab-www3.is.konan-u.ac.jp:8080/SproutServerMicro/battles"); - } -} - diff --git a/src/main/java/org/ntlab/SproutServerMicro/battles/BattlesRest.java b/src/main/java/org/ntlab/SproutServerMicro/battles/BattlesRest.java index f835c8b..adf2a4a 100644 --- a/src/main/java/org/ntlab/SproutServerMicro/battles/BattlesRest.java +++ b/src/main/java/org/ntlab/SproutServerMicro/battles/BattlesRest.java @@ -3,9 +3,11 @@ import net.arnx.jsonic.JSON; import org.ntlab.SproutServerMicro.accounts.Accounts; +import org.ntlab.SproutServerMicro.rooms.Room; import org.ntlab.SproutServerMicro.rooms.Rooms; import javax.ws.rs.*; +import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; import java.util.HashMap; @@ -17,10 +19,14 @@ */ @Path("battles") public class BattlesRest { + + public Battles battles; + public BattlesRest(){ } + @Path("/test") @GET @Produces(MediaType.TEXT_PLAIN) @@ -66,10 +72,13 @@ Battles.getInstance().updatePlayer(battleId, roomId, userId, playerData); return Battles.getInstance().findBattleById(battleId); } +/* + */ /** * ダミーデータの作成 - */ + *//* + @Path("/develop") @GET public void createDummyBattle() { @@ -88,4 +97,32 @@ Battles.getInstance().createDummyBattle(battleId, rooms.getRoomList().get(1000), rooms.getRoomList().get(1001)); } +*/ + + /** + * バトルの作成 + */ + @POST + @Produces(MediaType.APPLICATION_JSON) + public Battle createBattle(@FormParam("waitingRoom") String waitingRoom,@FormParam("waitingRoomSecond") String waitingRoomSecond){ + + Room waitRoom = JSON.decode(waitingRoom); + Room waitRoomSecond = JSON.decode(waitingRoomSecond); + + int resBattleCount = battles.getBattleCount(); + + Battle battle = new Battle(waitRoom, waitRoomSecond,resBattleCount); + + int count = resBattleCount++; + battles.setBattleCount(count); + + battles.getBattleMap().put(battles.getBattleCount(), battle); + + + return battle; + } + + + + } diff --git a/src/main/java/org/ntlab/SproutServerMicro/battles/Room.java b/src/main/java/org/ntlab/SproutServerMicro/battles/Room.java new file mode 100644 index 0000000..1bbc268 --- /dev/null +++ b/src/main/java/org/ntlab/SproutServerMicro/battles/Room.java @@ -0,0 +1,135 @@ +package org.ntlab.SproutServerMicro.battles; + +import net.arnx.jsonic.JSONHint; +import org.ntlab.SproutServerMicro.rooms.Member; + +import java.util.HashMap; + +public class Room { + + public String roomName; //ルーム名 + private String roomKey; //ルームキー（ルームパスワード） + public int roomId; //ルームID + public String hostName; //ホストネーム + public boolean keyCheck = false; + public HashMap memberList = new HashMap(); + public boolean readyToFight = false; //全員準備完了したか判定 + private int memberId=0; + public boolean startFrag; + public boolean battleState = false; + public int battleId = -1; + + //メンバーリスト + @JSONHint(ignore=true) + public HashMap getMemberList() { + return memberList; + } + + public void setMemberList(HashMap memberList) { + this.memberList = memberList; + } + + + //ルームID + @JSONHint(ignore=true) + public int getRoomId() { + return roomId; + } + + public void setId(int id) { + this.roomId = id; + } + + + //ルーム名 + @JSONHint(ignore=true) + public String getRoomName() { + return roomName; + } + + public void setRoomName(String roomName) { + this.roomName = roomName; + } + + + //ホストネーム + @JSONHint(ignore=true) + public String getHostName() { + return hostName; + } + + public void setHostName(String hostName) { + this.hostName = hostName; + } + + + //キーのチェック + @JSONHint(ignore=true) + public boolean isKeyCheck() { + return keyCheck; + } + + public void setKeyCheck(boolean keyCheck) { + this.keyCheck = keyCheck; + } + + + //準備完了判定 + @JSONHint(ignore=true) + public boolean isReadyToFight() { + return readyToFight; + } + + public void setReadyToFight(boolean allReady) { + this.readyToFight = allReady; + } + + + //ルームキー（ルームパスワード) + @JSONHint(ignore=true) + public String getRoomKey() { + return roomKey; + } + + public void setRoomKey(String roomKey) { + this.roomKey = roomKey; + } + + //メンバーID（入った順番） + @JSONHint(ignore=true) + public int getMemberId() { + return memberId; + } + + public void setMemberId(int memberId) { + this.memberId = memberId; + } + + //全員準備 + public boolean isStartFrag() { + return startFrag; + } + + public void setStartFrag(boolean startFrag) { + this.startFrag = startFrag; + } + + //バトル中か否か + public boolean isBattleState() { + return battleState; + } + + public void setBattleState(boolean battleState) { + this.battleState = battleState; + } + + + //バトルID + public int getBattleId() { + return battleId; + } + + public void setBattleId(int battleId) { + this.battleId = battleId; + } +} diff --git a/src/main/java/org/ntlab/SproutServerMicro/battles/Rooms.java b/src/main/java/org/ntlab/SproutServerMicro/battles/Rooms.java new file mode 100644 index 0000000..748ef37 --- /dev/null +++ b/src/main/java/org/ntlab/SproutServerMicro/battles/Rooms.java @@ -0,0 +1,77 @@ +package org.ntlab.SproutServerMicro.battles; + +import net.arnx.jsonic.JSONHint; +import org.ntlab.SproutServerMicro.rooms.Battles; +import org.ntlab.SproutServerMicro.rooms.BattlesConnection; +import org.ntlab.SproutServerMicro.rooms.Member; +import org.ntlab.SproutServerMicro.rooms.Room; + +import java.util.HashMap; + +public class Rooms { + + public static final int playerNumber = 2; //プレイヤー数(ルーム上限人数) + private static org.ntlab.SproutServerMicro.rooms.Rooms theInstance = null; + public HashMap roomList = new HashMap(); + public int roomId = 0; // ルームID + private org.ntlab.SproutServerMicro.rooms.Room waitingRoom = null; //待ち部屋 + private Room waitingRoomSecond = null; //待ち部屋2 + private BattlesConnection battlesConnection = null; + private Battles battlesTheInstance = null; + + //待ち部屋1 + //@JSONHint(ignore=true) + public Room getWaitingRoom() { + return waitingRoom; + } + + public void setWaitingRoom(Room waitingRoom) { + this.waitingRoom = waitingRoom; + } + + //待ち部屋2 + //@JSONHint(ignore=true) + public Room getWaitingRoomSecond() { + return waitingRoomSecond; + } + + public void setWaitingRoomSecond(Room waitingRoomSecond) { + this.waitingRoomSecond = waitingRoomSecond; + } + + //人数 + @JSONHint(ignore=true) + public int getPlayerNumber() { + return playerNumber; + } + + + //ルームID + public int getRoomId() { + return roomId; + } + + public void setRoomId(int roomId) { + this.roomId = roomId; + } + + @JSONHint(ignore = true) + public BattlesConnection getBattlesConnection() { + battlesConnection = new BattlesConnection(); + return battlesConnection; + } + + @JSONHint(ignore = true) + public Battles getBattlesTheInstance() { + return battlesTheInstance; + } + + public void setBattlesTheInstance() { + this.battlesTheInstance = battlesTheInstance; + } + + @JSONHint(ignore = true) + public HashMap getRoomList() { + return roomList; + } +} diff --git a/src/main/java/org/ntlab/SproutServerMicro/battles/RoomsConnection.java b/src/main/java/org/ntlab/SproutServerMicro/battles/RoomsConnection.java new file mode 100644 index 0000000..e7727a0 --- /dev/null +++ b/src/main/java/org/ntlab/SproutServerMicro/battles/RoomsConnection.java @@ -0,0 +1,9 @@ +package org.ntlab.SproutServerMicro.battles; + +import framework.network.HttpAsyncConnection; + +public class RoomsConnection extends HttpAsyncConnection{ + public RoomsConnection() { + super("http://nitta-lab-www2.is.konan-u.ac.jp:8080/SproutServerMicro/rooms"); + } +} diff --git a/src/main/java/org/ntlab/SproutServerMicro/rooms/Battle.java b/src/main/java/org/ntlab/SproutServerMicro/rooms/Battle.java new file mode 100644 index 0000000..8534c28 --- /dev/null +++ b/src/main/java/org/ntlab/SproutServerMicro/rooms/Battle.java @@ -0,0 +1,63 @@ +package org.ntlab.SproutServerMicro.rooms; + +import framework.model3D.Universe; +import framework.physics.Ground; +import org.ntlab.SproutServerMicro.battles.Battles; +import org.ntlab.SproutServerMicro.battles.BattlesConst; +import org.ntlab.SproutServerMicro.battles.RoomsConnection; +import org.ntlab.SproutServerMicro.battles.Team; + +import java.util.HashMap; + +public class Battle { + + private HashMap teamMap = new HashMap<>(); // チームの情報を保持 + private double time = BattlesConst.BATTLE_INIT_TIME; // タイム + private Universe universe = null; + private Ground ground = null; + private RoomsConnection connection; + private Battles battles; + private int battleCount; + + private int teamId1 = -1; // チームを判別するID + private int teamId2 = -1; // チームを判別するID + + private String state = "battle"; + + + + public int getBattleCount() { + return battleCount; + } + + public void setBattleCount(int battleCount) { + this.battleCount = battleCount; + } + + public Team getTeam(int roomId) { + return teamMap.get(roomId); + } + + public HashMap getTeamMap() { + return teamMap; + } + + public void setTeamMap(HashMap teamMap) { + this.teamMap = teamMap; + } + + public double getTime() { + return time; + } + + public void setTime(double time) { + } + + public String getState() { + return state; + } + + public void setState(String state) { + this.state = state; + } +} diff --git a/src/main/java/org/ntlab/SproutServerMicro/rooms/Battles.java b/src/main/java/org/ntlab/SproutServerMicro/rooms/Battles.java new file mode 100644 index 0000000..272aa3a --- /dev/null +++ b/src/main/java/org/ntlab/SproutServerMicro/rooms/Battles.java @@ -0,0 +1,49 @@ +package org.ntlab.SproutServerMicro.rooms; + + +import org.ntlab.SproutServerMicro.battles.Battle; +import org.ntlab.SproutServerMicro.battles.Rooms; +import org.ntlab.SproutServerMicro.battles.RoomsConnection; + +import java.util.HashMap; +import java.util.concurrent.ScheduledThreadPoolExecutor; + +public class Battles { + private static org.ntlab.SproutServerMicro.battles.Battles theInstance = null; // シングルトンパターン + private HashMap battleMap = new HashMap<>(); // バトル一覧 + private int battleCount = 0; // バトルを識別するためのid + private ScheduledThreadPoolExecutor schedule = null; + private org.ntlab.SproutServerMicro.battles.RoomsConnection RoomsConnection; + private Rooms rooms; + + /** + * battleIdによってBattleを取得 + * + * @param battleId 取得したいbattleのbattleId + * @return Battle + */ + public Battle findBattleById(int battleId) { + return battleMap.get(battleId); + } + + public int getBattleCount() { + return battleCount; + } + + public void setBattleCount(int battleCount) { + this.battleCount = battleCount; + } + + public org.ntlab.SproutServerMicro.battles.RoomsConnection getRoomsConnection() { + RoomsConnection = new RoomsConnection(); + return RoomsConnection; + } + + public Rooms getRooms() { + return rooms; + } + + public void setRooms(Rooms rooms) { + this.rooms = rooms; + } +} diff --git a/src/main/java/org/ntlab/SproutServerMicro/rooms/BattlesConnection.java b/src/main/java/org/ntlab/SproutServerMicro/rooms/BattlesConnection.java new file mode 100644 index 0000000..ee11488 --- /dev/null +++ b/src/main/java/org/ntlab/SproutServerMicro/rooms/BattlesConnection.java @@ -0,0 +1,11 @@ +package org.ntlab.SproutServerMicro.rooms; + +import framework.network.HttpAsyncConnection; + +public class BattlesConnection extends HttpAsyncConnection { + + public BattlesConnection(){ + super("http://nitta-lab-www2.is.konan-u.ac.jp:8080/SproutServerMicro/battles"); + } +} + diff --git a/src/main/java/org/ntlab/SproutServerMicro/rooms/Room.java b/src/main/java/org/ntlab/SproutServerMicro/rooms/Room.java index 878ed78..4c99461 100644 --- a/src/main/java/org/ntlab/SproutServerMicro/rooms/Room.java +++ b/src/main/java/org/ntlab/SproutServerMicro/rooms/Room.java @@ -11,16 +11,16 @@ public class Room { public String roomName; //ルーム名 - private String roomKey; //ルームキー（ルームパスワード） - public int roomId; //ルームID - public String hostName; //ホストネーム - public boolean keyCheck = false; - public HashMap memberList = new HashMap(); - public boolean readyToFight = false; //全員準備完了したか判定 - private int memberId=0; - public boolean startFrag; - public boolean battleState = false; - public int battleId = -1; + private String roomKey; //ルームキー（ルームパスワード） + public int roomId; //ルームID + public String hostName; //ホストネーム + public boolean keyCheck = false; + public HashMap memberList = new HashMap(); + public boolean readyToFight = false; //全員準備完了したか判定 + private int memberId=0; + public boolean startFrag; + public boolean battleState = false; + public int battleId = -1; public Room(String roomName,int roomId,String roomKey,Member member){ @@ -42,7 +42,11 @@ public Room(int roomId){ this.roomId = roomId; } - + + public static Room fromString(String value){ + return new Room(); + } + public Room() { // TODO Auto-generated constructor stub } diff --git a/src/main/java/org/ntlab/SproutServerMicro/rooms/Rooms.java b/src/main/java/org/ntlab/SproutServerMicro/rooms/Rooms.java index f9eda56..238c244 100644 --- a/src/main/java/org/ntlab/SproutServerMicro/rooms/Rooms.java +++ b/src/main/java/org/ntlab/SproutServerMicro/rooms/Rooms.java @@ -15,7 +15,8 @@ public int roomId = 0; // ルームID private Room waitingRoom = null; //待ち部屋 private Room waitingRoomSecond = null; //待ち部屋2 - private RoomsConnection roomsConnection = null; + private BattlesConnection battlesConnection = null; + private Battles battlesTheInstance = null; private Rooms(){ @@ -23,7 +24,8 @@ theInstance = this; } } - + + public static Rooms getInstance() { if (theInstance == null) { theInstance = new Rooms(); @@ -132,9 +134,18 @@ this.roomId = roomId; } - @JSONHint(ignore = true) - public RoomsConnection getRoomsConnection() { - return roomsConnection; + @JSONHint(ignore = true) + public BattlesConnection getBattlesConnection() { + battlesConnection = new BattlesConnection(); + return battlesConnection; } + @JSONHint(ignore = true) + public Battles getBattlesTheInstance() { + return battlesTheInstance; + } + + public void setBattlesTheInstance() { + this.battlesTheInstance = battlesTheInstance; + } } diff --git a/src/main/java/org/ntlab/SproutServerMicro/rooms/RoomsConnection.java b/src/main/java/org/ntlab/SproutServerMicro/rooms/RoomsConnection.java deleted file mode 100644 index a0674f2..0000000 --- a/src/main/java/org/ntlab/SproutServerMicro/rooms/RoomsConnection.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.ntlab.SproutServerMicro.rooms; - -import framework.network.HttpAsyncConnection; - -public class RoomsConnection extends HttpAsyncConnection{ - - public RoomsConnection(){ - super("http://nitta-lab-www2.is.konan-u.ac.jp:8080/SproutServerMicro/rooms"); - } -} diff --git a/src/main/java/org/ntlab/SproutServerMicro/rooms/RoomsRest.java b/src/main/java/org/ntlab/SproutServerMicro/rooms/RoomsRest.java index 3111687..5a9208a 100644 --- a/src/main/java/org/ntlab/SproutServerMicro/rooms/RoomsRest.java +++ b/src/main/java/org/ntlab/SproutServerMicro/rooms/RoomsRest.java @@ -1,6 +1,7 @@ package org.ntlab.SproutServerMicro.rooms; -import org.ntlab.SproutServerMicro.battles.Battles; +import framework.network.CallBack; +import net.arnx.jsonic.JSON; import javax.ws.rs.*; import javax.ws.rs.core.MediaType; @@ -9,7 +10,11 @@ @Path("rooms") public class RoomsRest { - Rooms rooms; + private Rooms rooms; + private Room room; + private BattlesConnection connection; + public Battles battles; + public RoomsRest() { rooms = Rooms.getInstance(); @@ -67,6 +72,15 @@ return roomRes; } + /** + * バトル終了チームの初期化 + */ + @PUT + @Produces(MediaType.APPLICATION_JSON) + public void initializeTeam(@FormParam("teamId1") int teamId1,@FormParam("teamId2") int teamId2){ + rooms.getRoomList().get(teamId1).roomInitialize(); + rooms.getRoomList().get(teamId2).roomInitialize(); + } /** * 入室(Room) @@ -150,12 +164,32 @@ rooms.getRoomList().get(firstId).setReadyToFight(true); rooms.getRoomList().get(secondId).setReadyToFight(true); + connection = rooms.getBattlesConnection(); + System.out.println("Callback前"); + connection.setCallBack(new CallBack() { + @Override + public void onResponse(String response) { + Battle battle = JSON.decode(response, Battle.class); + System.out.println("バトルカウント:" + battle.getBattleCount()); + rooms.getRoomList().get(rooms.getWaitingRoom().getRoomId()).setBattleId(battle.getBattleCount()); + rooms.getRoomList().get(rooms.getWaitingRoomSecond().getRoomId()).setBattleId(battle.getBattleCount()); + } + }); + String waitingRoom = JSON.encode(rooms.getWaitingRoom()); + String waitingRoomSecond = JSON.encode(rooms.getWaitingRoomSecond()); + System.out.println("FormParam前"); + connection.addFormParam("waitingRoom", waitingRoom); + connection.addFormParam("waitingRoomSecond",waitingRoomSecond); + System.out.println("POST前"); + connection.doPost(); + + /* Battles battles = Battles.getInstance(); battleId = battles.createBattle(rooms.getWaitingRoom(), rooms.getWaitingRoomSecond()); rooms.getRoomList().get(firstId).setBattleId(battleId); rooms.getRoomList().get(secondId).setBattleId(battleId); - + */ rooms.getWaitingRoom().setBattleState(true); rooms.getWaitingRoomSecond().setBattleState(true); rooms.setWaitingRoom(null); diff --git a/src/main/java/org/ntlab/SproutServerMicro/utils/ResourceParam.java b/src/main/java/org/ntlab/SproutServerMicro/utils/ResourceParam.java new file mode 100644 index 0000000..a468ba5 --- /dev/null +++ b/src/main/java/org/ntlab/SproutServerMicro/utils/ResourceParam.java @@ -0,0 +1,13 @@ +package org.ntlab.SproutServerMicro.utils; + +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Target({ElementType.PARAMETER, ElementType.METHOD, ElementType.FIELD}) +@Retention(RetentionPolicy.RUNTIME) +@Documented +public @interface ResourceParam { +}