diff --git a/src/main/java/cactusServer/entities/Account.java b/src/main/java/cactusServer/entities/Account.java index 86f9c7d..cb11ffe 100644 --- a/src/main/java/cactusServer/entities/Account.java +++ b/src/main/java/cactusServer/entities/Account.java @@ -10,6 +10,10 @@ private String id, name, token, pass, uniqueID; private boolean login = false; + private Account() { + + } + public Account(String userID, String userName, String userPass, String uniqueID) { setId(userID); setName(userName); @@ -35,7 +39,7 @@ this.name = name; } - @JSONHint(ignore=true) + @JSONHint(ignore = true) public String getPass() { return pass; } @@ -61,7 +65,11 @@ return token; } - @JSONHint(ignore=true) + public void setToken(String token) { + this.token = token; + } + + @JSONHint(ignore = true) public String getUniqueID() { return uniqueID; } diff --git a/src/main/java/cactusServer/resources/AccountsRest.java b/src/main/java/cactusServer/resources/AccountsRest.java index 1ecb7a7..dd5af7e 100644 --- a/src/main/java/cactusServer/resources/AccountsRest.java +++ b/src/main/java/cactusServer/resources/AccountsRest.java @@ -11,7 +11,8 @@ @Path("/accounts") public class AccountsRest { @PUT - @Produces(MediaType.APPLICATION_JSON) + //@Produces(MediaType.APPLICATION_JSON) + @Produces(MediaType.TEXT_PLAIN) public URIAddressedAccount loginAccount(@FormParam("userID") String userID, @FormParam("userPass") String userPass) { URIAddressedAccount session = Accounts.getInstance().loginAccount(userID, userPass); if (session != null) { @@ -23,13 +24,15 @@ @POST @Path("/logout") - @Produces(MediaType.APPLICATION_JSON) + //@Produces(MediaType.APPLICATION_JSON) + @Produces(MediaType.TEXT_PLAIN) public Account logoutAccount(@FormParam("token") String token) { return Accounts.getInstance().logoutAccount(token); } @POST - @Produces(MediaType.APPLICATION_JSON) + //@Produces(MediaType.APPLICATION_JSON) + @Produces(MediaType.TEXT_PLAIN) public URIAddressedAccount createAccount(@FormParam("userID") String userID, @FormParam("userName") String userName, @FormParam("userPass") String userPass) { URIAddressedAccount editAccount = Accounts.getInstance().createAcount(userID, userName, userPass); @@ -42,14 +45,16 @@ @GET @Path("/{uniqueID}") - @Produces(MediaType.APPLICATION_JSON) + //@Produces(MediaType.APPLICATION_JSON) + @Produces(MediaType.TEXT_PLAIN) public Account getAccount(@PathParam("uniqueID") String uniqueID) { return Accounts.getInstance().getAccountByuniqueID(uniqueID); } @DELETE @Path("/{uniqueID}") - @Produces(MediaType.APPLICATION_JSON) + //@Produces(MediaType.APPLICATION_JSON) + @Produces(MediaType.TEXT_PLAIN) public Account deleteAccount(@PathParam("uniqueID") String uniqueID) { if (Accounts.getInstance().getAccountByuniqueID(uniqueID) != null) { return Accounts.getInstance().deleteAccount(uniqueID); @@ -59,7 +64,8 @@ } @GET - @Produces(MediaType.APPLICATION_JSON) + //@Produces(MediaType.APPLICATION_JSON) + @Produces(MediaType.TEXT_PLAIN) public ArrayList getAccounts() { return Accounts.getInstance().getAccounts(); } diff --git a/src/main/java/cactusServer/utils/App.java b/src/main/java/cactusServer/utils/App.java index a3c455c..2284104 100644 --- a/src/main/java/cactusServer/utils/App.java +++ b/src/main/java/cactusServer/utils/App.java @@ -46,8 +46,9 @@ } private void initDummy() { - // �_�~�[�A�J�E���g1�� + // �_�~�[�A�J�E���g2�� Accounts.getInstance().createAcount("test", "test", "test"); + Accounts.getInstance().createAcount("test2", "test2", "test2"); // �_�~�[�C���X�^���X2�� Instances.getInstance().getInstances().put("test1", new Instance("test1", 0)); Instances.getInstance().getInstances().put("test2", new Instance("test2", 1)); @@ -60,6 +61,10 @@ Instances.getInstance().getInstance("test1").getCharacters().put("chara2", chara2); Instances.getInstance().getInstance("test2").getCharacters().put("chara1", chara1); Instances.getInstance().getInstance("test2").getCharacters().put("chara2", chara2); + accountUri = "/CactusServer/rest/accounts/" + + Accounts.getInstance().getAccountByID("test2").getUniqueID(); + chara1 = new Character("test2", accountUri, "chara3", new Position3D(), new Quaternion3D(), 0); + Instances.getInstance().getInstance("test2").getCharacters().put("chara3", chara1); // �_�~�[�v���C���[2�� chara1.setPosition(new Position3D(34.5, 23.4, 19)); CameraState cameraState = new CameraState(1.24, new Quaternion3D(), 2.38, 3);