diff --git a/src/main/java/cactusServer/entities/Bullet.java b/src/main/java/cactusServer/entities/Bullet.java index 611f2c7..5c236cf 100644 --- a/src/main/java/cactusServer/entities/Bullet.java +++ b/src/main/java/cactusServer/entities/Bullet.java @@ -17,7 +17,7 @@ private Bullet() { // JSON�G���R�[�h���̌Ăяo���p } - + public Bullet(String playerID, Position3D position, Quaternion3D angle) { this.playerID = playerID; this.position = position; @@ -29,7 +29,7 @@ public String getPlayerID() { return playerID; } - + public Position3D getPosition() { return position; } @@ -41,7 +41,7 @@ public void setPlayerID(String playerID) { this.playerID = playerID; } - + public void setPosition(Position3D positon) { this.position = positon; } @@ -49,7 +49,7 @@ public void setAngle(Quaternion3D angle) { this.angle = angle; } - + public void update(Position3D position, Quaternion3D angle) { setPosition(position); setAngle(angle); diff --git a/src/main/java/cactusServer/entities/CameraState.java b/src/main/java/cactusServer/entities/CameraState.java index cdca7b1..a7d9da8 100644 --- a/src/main/java/cactusServer/entities/CameraState.java +++ b/src/main/java/cactusServer/entities/CameraState.java @@ -7,14 +7,14 @@ private Quaternion3D angle; private double tilt; // �`���g(rad) private double fov; // ����p(rad) - + public CameraState() { distance = 10; angle = new Quaternion3D(); tilt = 0; fov = 1.0; } - + public CameraState(double distance, Quaternion3D angle, double tilt, double fov) { setDistance(distance); setAngle(angle); @@ -37,7 +37,7 @@ public double getFov() { return fov; } - + public void setDistance(double distance) { this.distance = distance; } diff --git a/src/main/java/cactusServer/entities/EmoteState.java b/src/main/java/cactusServer/entities/EmoteState.java index e7fef2a..9c0cb56 100644 --- a/src/main/java/cactusServer/entities/EmoteState.java +++ b/src/main/java/cactusServer/entities/EmoteState.java @@ -3,6 +3,7 @@ /** * �G���[�g�̏���\���N���X
* �����ɃG���[�g�̎�ނ�\���񋓌^����` + * * @author r-isitani * */ @@ -12,11 +13,11 @@ public EmoteState() { this.emoteType = EmoteType.DUMMY; } - + public EmoteState(EmoteType emoteType) { setEmoteType(emoteType); } - + public EmoteType getEmoteType() { return emoteType; } @@ -24,7 +25,7 @@ public void setEmoteType(EmoteType emoteType) { this.emoteType = emoteType; } - + public static enum EmoteType { // �J�n����G���[�g�̎�ނ̗� DUMMY; diff --git a/src/main/java/cactusServer/entities/Entity.java b/src/main/java/cactusServer/entities/Entity.java index 433e43c..1d5383a 100644 --- a/src/main/java/cactusServer/entities/Entity.java +++ b/src/main/java/cactusServer/entities/Entity.java @@ -2,6 +2,7 @@ /** * AddressedEntity�N���X�ɂĈ������̂�\�����ۃN���X + * * @author r-isitani * */ diff --git a/src/main/java/cactusServer/entities/Instance.java b/src/main/java/cactusServer/entities/Instance.java index 470d2ca..14f9d41 100644 --- a/src/main/java/cactusServer/entities/Instance.java +++ b/src/main/java/cactusServer/entities/Instance.java @@ -117,7 +117,7 @@ public Character getCharacter(String characterId) { return characterMap.get(characterId); } - + @JSONHint(ignore = true) public HashMap> getBullets() { return bulletMap; @@ -167,8 +167,9 @@ returnedMap.put(id, character); return returnedMap; } - - public HashMapcreateBullet(String playerID, String bulletID, Position3D position, Quaternion3D angle) { + + public HashMap createBullet(String playerID, String bulletID, Position3D position, + Quaternion3D angle) { if (!bulletMap.containsKey(playerID)) { bulletMap.put(playerID, new HashMap()); } @@ -183,7 +184,7 @@ setState(state); return this; } - + public Character updateCharacter(String characterId, Position3D position, Quaternion3D angle, int modelID) { Character character = characterMap.get(characterId); if (character != null) { @@ -191,7 +192,7 @@ } return character; } - + public Bullet updateBullet(String playerId, String bulletId, Position3D position, Quaternion3D angle) { HashMap map = bulletMap.get(playerId); if (map != null) { @@ -215,7 +216,7 @@ public MovableObject destroyObject(String objId) { return objMap.remove(objId); } - + public Bullet destroyBullet(String playerId, String bulletId) { HashMap map = bulletMap.get(playerId); if (map != null) { diff --git a/src/main/java/cactusServer/entities/MovableObject.java b/src/main/java/cactusServer/entities/MovableObject.java index 5133f55..d160936 100644 --- a/src/main/java/cactusServer/entities/MovableObject.java +++ b/src/main/java/cactusServer/entities/MovableObject.java @@ -33,8 +33,8 @@ // JSONDecode���̌Ăяo���p } - public MovableObject(Position3D position, Velocity3D velocity, AngularVelocity3D angularVelocity, Quaternion3D angle, - Attribute attribute, int modelID) { + public MovableObject(Position3D position, Velocity3D velocity, AngularVelocity3D angularVelocity, + Quaternion3D angle, Attribute attribute, int modelID) { setPosition(position); setVelocity(velocity); setAngularVelocity(angularVelocity); @@ -49,11 +49,11 @@ public Position3D getPosition() { return position; } - + public Velocity3D getVelocity() { return velocity; } - + public AngularVelocity3D getAngularVelocity() { return angularVelocity; } @@ -72,6 +72,7 @@ public void setPosition(Position3D position) { this.position = position; + ((Object3D)(getPlaceable().getBody())).setPosition(position); } public void setVelocity(Velocity3D velocity) { @@ -84,6 +85,7 @@ public void setAngle(Quaternion3D angle) { this.angle = angle; + ((Object3D) getPlaceable().getBody()).apply(angle, false); } public void setAttribute(Attribute attribute) { @@ -136,7 +138,7 @@ @JSONHint(ignore = true) public Object3D getObject() { - return object; + return (Object3D) getPlaceable().getBody(); } public void setObject(Object3D object) { diff --git a/src/main/java/cactusServer/entities/Player.java b/src/main/java/cactusServer/entities/Player.java index 67c333e..148d7a5 100644 --- a/src/main/java/cactusServer/entities/Player.java +++ b/src/main/java/cactusServer/entities/Player.java @@ -114,10 +114,12 @@ public void setPosition(Position3D position) { this.position = position; + ((Object3D) getPlaceable().getBody()).setPosition(position); } public void setAngle(Quaternion3D angle) { this.angle = angle; + ((Object3D) getPlaceable().getBody()).apply(angle, false); } public void setCameraState(CameraState cameraState) { @@ -214,7 +216,7 @@ // if (character == null) return; character.update(position, angle, areaURI); } - + @JSONHint(ignore = true) public Object3D getObject() { return object; diff --git a/src/main/java/cactusServer/entities/URIAddressedAccount.java b/src/main/java/cactusServer/entities/URIAddressedAccount.java index 9d14e65..c15ea5f 100644 --- a/src/main/java/cactusServer/entities/URIAddressedAccount.java +++ b/src/main/java/cactusServer/entities/URIAddressedAccount.java @@ -2,24 +2,24 @@ import java.net.URI; -public class URIAddressedAccount{ +public class URIAddressedAccount { private URI uri; private Account account; - + private URIAddressedAccount() { // JSONDecode���̌Ăяo���p } - + public URIAddressedAccount(URI uri, Account body) { setAccount(body); setUri(uri); } - + public URIAddressedAccount(String str, Account body) { setAccount(body); setUri(URI.create(str)); } - + public URI getUri() { return uri; } diff --git a/src/main/java/cactusServer/models/Accounts.java b/src/main/java/cactusServer/models/Accounts.java index 3ca95c3..321e91a 100644 --- a/src/main/java/cactusServer/models/Accounts.java +++ b/src/main/java/cactusServer/models/Accounts.java @@ -14,7 +14,7 @@ private ArrayList accounts = new ArrayList<>(ACCOUNT_NUM_MAX); private HashSet userIDSet = new HashSet<>(ACCOUNT_NUM_MAX); private HashSet uniqueIDSet = new HashSet<>(ACCOUNT_NUM_MAX); - + private Accounts() { } diff --git a/src/main/java/cactusServer/models/CollisionManager.java b/src/main/java/cactusServer/models/CollisionManager.java index 310c65c..a5821c8 100644 --- a/src/main/java/cactusServer/models/CollisionManager.java +++ b/src/main/java/cactusServer/models/CollisionManager.java @@ -94,7 +94,8 @@ } private void collisionBulletsAndOthers(String instanceId, Instance instance) { - Iterator>> playersBulletsEntryIt = instance.getBullets().entrySet().iterator(); + Iterator>> playersBulletsEntryIt = instance.getBullets().entrySet() + .iterator(); while (playersBulletsEntryIt.hasNext()) { Map.Entry> playersBulletsEntry = playersBulletsEntryIt.next(); String bulletOwnerPlayerId = playersBulletsEntry.getKey(); @@ -104,7 +105,8 @@ Map.Entry bulletEntry = bulletEntryIt.next(); String bulletId = bulletEntry.getKey(); Bullet bullet = bulletEntry.getValue(); - boolean isRemoved = collisionBulletAndPlayers(instanceId, instance, bulletOwnerPlayerId, bulletId, bullet, bulletEntryIt); + boolean isRemoved = collisionBulletAndPlayers(instanceId, instance, bulletOwnerPlayerId, bulletId, + bullet, bulletEntryIt); if (!isRemoved) { collisionBulletAndObjects(instance, bulletOwnerPlayerId, bulletId, bullet, bulletEntryIt); } @@ -121,9 +123,9 @@ // Player(����������)�ƒe�������������̏��������� } // Player(�������܂�)�ɓ��������e������ -// bulletEntryIt.remove(); -// instance.getUniverse().displace(bullet.getPlaceable()); -// System.out.println(bulletId + "�폜"); + // bulletEntryIt.remove(); + // instance.getUniverse().displace(bullet.getPlaceable()); + // System.out.println(bulletId + "�폜"); return true; } } @@ -134,9 +136,9 @@ Bullet bullet, Iterator> bulletEntryIt) { for (MovableObject object : instance.getObjects().values()) { if (isCollision(bullet, object)) { -// bulletEntryIt.remove(); -// instance.getUniverse().displace(bullet.getPlaceable()); -// System.out.println(bulletId + "�폜"); + // bulletEntryIt.remove(); + // instance.getUniverse().displace(bullet.getPlaceable()); + // System.out.println(bulletId + "�폜"); return true; } } diff --git a/src/main/java/cactusServer/models/Instances.java b/src/main/java/cactusServer/models/Instances.java index ee2b9ee..20eab75 100644 --- a/src/main/java/cactusServer/models/Instances.java +++ b/src/main/java/cactusServer/models/Instances.java @@ -23,9 +23,9 @@ private HashMap playerMap = new HashMap<>(); private Instances() { -// // �_�~�[�R�[�h -// instanceMap.put("test1", new Instance("test1", 0)); -// instanceMap.put("test2", new Instance("test2", 1)); + // // �_�~�[�R�[�h + // instanceMap.put("test1", new Instance("test1", 0)); + // instanceMap.put("test2", new Instance("test2", 1)); } /** @@ -54,7 +54,7 @@ EmoteState.EmoteType animationClassToStart) { String id = RandomStringGenerator.generateUniqueString(Player.UNIQUE_ID_LENGTH, RandomStringGenerator.ALPHA_NUMERIC, playerMap.keySet()); - Player player = new Player(instanceID, characterID,cameraState, animationClassToStart); + Player player = new Player(instanceID, characterID, cameraState, animationClassToStart); playerMap.put(id, player); HashMap returnedMap = new HashMap<>(); returnedMap.put(id, player); diff --git a/src/main/java/cactusServer/models/StageModelManager.java b/src/main/java/cactusServer/models/StageModelManager.java index 1e13fc2..1fe960c 100644 --- a/src/main/java/cactusServer/models/StageModelManager.java +++ b/src/main/java/cactusServer/models/StageModelManager.java @@ -18,7 +18,7 @@ try { setStage(0, ModelFactory.loadModel(getClass().getResource("../../konan/konan.stl").getPath())); setStage(1, ModelFactory.loadModel(getClass().getResource("../../konan/konan.stl").getPath())); - } catch (IOException | ModelFileFormatException e) { + } catch (IOException | ModelFileFormatException e) { e.printStackTrace(); } } @@ -37,7 +37,7 @@ public Model3D getStage(int stageID) { return model.get(stageID); } - + public int getStageModelCount() { return model.size(); } diff --git a/src/main/java/cactusServer/resources/AccountsRest.java b/src/main/java/cactusServer/resources/AccountsRest.java index 659f3bc..c85fcea 100644 --- a/src/main/java/cactusServer/resources/AccountsRest.java +++ b/src/main/java/cactusServer/resources/AccountsRest.java @@ -10,7 +10,7 @@ @Path("/accounts") public class AccountsRest { @PUT - //@Produces(MediaType.APPLICATION_JSON) + // @Produces(MediaType.APPLICATION_JSON) @Produces(MediaType.TEXT_PLAIN) public String loginAccount(@FormParam("userID") String userID, @FormParam("userPass") String userPass) { URIAddressedAccount session = Accounts.getInstance().loginAccount(userID, userPass); @@ -23,14 +23,14 @@ @POST @Path("/logout") - //@Produces(MediaType.APPLICATION_JSON) + // @Produces(MediaType.APPLICATION_JSON) @Produces(MediaType.TEXT_PLAIN) public String logoutAccount(@FormParam("token") String token) { return JSON.encode(Accounts.getInstance().logoutAccount(token)); } @POST - //@Produces(MediaType.APPLICATION_JSON) + // @Produces(MediaType.APPLICATION_JSON) @Produces(MediaType.TEXT_PLAIN) public String createAccount(@FormParam("userID") String userID, @FormParam("userName") String userName, @FormParam("userPass") String userPass) { @@ -44,7 +44,7 @@ @GET @Path("/{uniqueID}") - //@Produces(MediaType.APPLICATION_JSON) + // @Produces(MediaType.APPLICATION_JSON) @Produces(MediaType.TEXT_PLAIN) public String getAccount(@PathParam("uniqueID") String uniqueID) { return JSON.encode(Accounts.getInstance().getAccountByuniqueID(uniqueID)); @@ -52,7 +52,7 @@ @DELETE @Path("/{uniqueID}") - //@Produces(MediaType.APPLICATION_JSON) + // @Produces(MediaType.APPLICATION_JSON) @Produces(MediaType.TEXT_PLAIN) public String deleteAccount(@PathParam("uniqueID") String uniqueID) { if (Accounts.getInstance().getAccountByuniqueID(uniqueID) != null) { @@ -63,7 +63,7 @@ } @GET - //@Produces(MediaType.APPLICATION_JSON) + // @Produces(MediaType.APPLICATION_JSON) @Produces(MediaType.TEXT_PLAIN) public String getAccounts() { return JSON.encode(Accounts.getInstance().getAccounts()); diff --git a/src/main/java/cactusServer/resources/BulletsRest.java b/src/main/java/cactusServer/resources/BulletsRest.java index ad2524e..1ff818b 100644 --- a/src/main/java/cactusServer/resources/BulletsRest.java +++ b/src/main/java/cactusServer/resources/BulletsRest.java @@ -23,7 +23,7 @@ @Path("/instances/{instanceId}/bullets") public class BulletsRest { - + @GET @Produces(MediaType.TEXT_PLAIN) public String getBullets(@PathParam("instanceId") String instanceId) { @@ -33,8 +33,9 @@ @Path("/{playerId}") @POST @Produces(MediaType.TEXT_PLAIN) - public String createBullet(@PathParam("instanceId") String instanceId, @PathParam("playerId") String playerId, - @FormParam("bulletID") String bulletId, @FormParam("position") Position3D position, @FormParam("angle") Quaternion3D angle) { + public String createBullet(@PathParam("instanceId") String instanceId, @PathParam("playerId") String playerId, + @FormParam("bulletID") String bulletId, @FormParam("position") Position3D position, + @FormParam("angle") Quaternion3D angle) { Instance instance = Instances.getInstance().getInstance(instanceId); HashMap idMap = instance.createBullet(playerId, bulletId, position, angle); HashMap uriMap = new HashMap<>(); @@ -49,7 +50,8 @@ @PUT @Produces(MediaType.TEXT_PLAIN) public String updateBullet(@PathParam("instanceId") String instanceId, @PathParam("playerId") String playerId, - @PathParam("bulletId") String bulletId, @FormParam("position") Position3D position, @FormParam("angle") Quaternion3D angle) { + @PathParam("bulletId") String bulletId, @FormParam("position") Position3D position, + @FormParam("angle") Quaternion3D angle) { Instance instance = Instances.getInstance().getInstance(instanceId); Bullet bullet = instance.updateBullet(playerId, bulletId, position, angle); if (bullet != null) { @@ -57,7 +59,7 @@ } throw new WebApplicationException(400); } - + @Path("/{playerId}/{bulletId}") @DELETE @Produces(MediaType.TEXT_PLAIN) diff --git a/src/main/java/cactusServer/resources/CharactersRest.java b/src/main/java/cactusServer/resources/CharactersRest.java index 0d0d838..8a66e83 100644 --- a/src/main/java/cactusServer/resources/CharactersRest.java +++ b/src/main/java/cactusServer/resources/CharactersRest.java @@ -26,7 +26,7 @@ @Path("/{characterId}") @GET - //@Produces(MediaType.APPLICATION_JSON) + // @Produces(MediaType.APPLICATION_JSON) @Produces(MediaType.TEXT_PLAIN) public String getCharacter(@PathParam("instanceId") String instanceId, @PathParam("characterId") String characterId) { @@ -40,14 +40,14 @@ } @GET - //@Produces(MediaType.APPLICATION_JSON) + // @Produces(MediaType.APPLICATION_JSON) @Produces(MediaType.TEXT_PLAIN) public String getCharacters(@PathParam("instanceId") String instanceId, @QueryParam("accountID") String accountID) { return JSON.encode(Instances.getInstance().getInstance(instanceId).getCharacters(accountID)); } @POST - //@Produces(MediaType.APPLICATION_JSON) + // @Produces(MediaType.APPLICATION_JSON) @Produces(MediaType.TEXT_PLAIN) public String createCharacter(@PathParam("instanceId") String instanceId, @FormParam("accountURI") String accountURI, @FormParam("name") String name, @@ -66,11 +66,11 @@ @Path("/{characterId}") @PUT - //@Produces(MediaType.APPLICATION_JSON) - //@Produces(MediaType.TEXT_PLAIN) - public void updateCharacter(@PathParam("instanceId") String instanceId, @PathParam("characterId") String characterId, - @FormParam("position") Position3D position, @FormParam("angle") Quaternion3D angle, - @FormParam("modelID") int modelID) { + // @Produces(MediaType.APPLICATION_JSON) + // @Produces(MediaType.TEXT_PLAIN) + public void updateCharacter(@PathParam("instanceId") String instanceId, + @PathParam("characterId") String characterId, @FormParam("position") Position3D position, + @FormParam("angle") Quaternion3D angle, @FormParam("modelID") int modelID) { Instance instance = Instances.getInstance().getInstance(instanceId); Character character = instance.updateCharacter(characterId, position, angle, modelID); if (character == null) { diff --git a/src/main/java/cactusServer/resources/InstancesRest.java b/src/main/java/cactusServer/resources/InstancesRest.java index 3d61e3d..02b1e74 100644 --- a/src/main/java/cactusServer/resources/InstancesRest.java +++ b/src/main/java/cactusServer/resources/InstancesRest.java @@ -37,18 +37,18 @@ public InstancesRest() { } - + @Path("/{instanceId}") @GET - //@Produces(MediaType.APPLICATION_JSON) + // @Produces(MediaType.APPLICATION_JSON) @Produces(MediaType.TEXT_PLAIN) public String getInstance(@PathParam("instanceId") String instanceId) { return JSON.encode(Instances.getInstance().getInstance(instanceId)); } - + @Path("{instanceId}/areas") @GET - //@Produces(MediaType.APPLICATION_JSON) + // @Produces(MediaType.APPLICATION_JSON) @Produces(MediaType.TEXT_PLAIN) public String getArea(@PathParam("areaId") String areaId) { HashMap areaMap = new HashMap<>(); @@ -57,7 +57,7 @@ @Path("/{instanceId}/areas/{areaId}") @GET - //@Produces(MediaType.APPLICATION_JSON) + // @Produces(MediaType.APPLICATION_JSON) @Produces(MediaType.TEXT_PLAIN) public String getArea(@PathParam("instanceId") String instanceId, @PathParam("areaId") String areaId) { Instance instance = Instances.getInstance().getInstance(instanceId); @@ -66,18 +66,16 @@ } return null; } - - - + @GET - //@Produces(MediaType.APPLICATION_JSON) + // @Produces(MediaType.APPLICATION_JSON) @Produces(MediaType.TEXT_PLAIN) - public String getInstances(){ + public String getInstances() { return JSON.encode(Instances.getInstance().getInstances()); } - + @POST - //@Produces(MediaType.APPLICATION_JSON) + // @Produces(MediaType.APPLICATION_JSON) @Produces(MediaType.TEXT_PLAIN) public String createInstance(@FormParam("name") String name, @FormParam("stageID") int stageID) { HashMap idMap = Instances.getInstance().createInstance(name, stageID); @@ -91,9 +89,9 @@ @Path("/{instanceId}/areas") @POST - //@Produces(MediaType.APPLICATION_JSON) + // @Produces(MediaType.APPLICATION_JSON) @Produces(MediaType.TEXT_PLAIN) - public String createArea(@PathParam("instanceId") String instanceId, @FormParam("name") String name, + public String createArea(@PathParam("instanceId") String instanceId, @FormParam("name") String name, @FormParam("region") Plain[] region, @FormParam("permissions") HashSet permissions) { Instance instance = Instances.getInstance().getInstance(instanceId); HashMap idMap = instance.createArea(name, region, permissions); @@ -104,26 +102,23 @@ } return JSON.encode(uriMap); } - + @Path("/{instanceId}") @PUT - //@Produces(MediaType.APPLICATION_JSON) + // @Produces(MediaType.APPLICATION_JSON) @Produces(MediaType.TEXT_PLAIN) public String updateInstance(@PathParam("instanceId") String instanceId, @FormParam("state") Instance.State state) { Instance instance = Instances.getInstance().getInstance(instanceId); return JSON.encode(instance.update(state)); } - - - - -// @Path("/test") -// @GET -// @Produces(MediaType.TEXT_PLAIN) -// public String hoge() { -// return "deploy jenkins from tomcat"; -// } - + + // @Path("/test") + // @GET + // @Produces(MediaType.TEXT_PLAIN) + // public String hoge() { + // return "deploy jenkins from tomcat"; + // } + // @DELETE // @Path("/destroyInstance") // @Produces(MediaType.APPLICATION_JSON) @@ -131,5 +126,4 @@ // return Instances.getInstance().destroyInstance(instanceId); // } - } diff --git a/src/main/java/cactusServer/resources/ObjectsRest.java b/src/main/java/cactusServer/resources/ObjectsRest.java index bfc996d..52c5bef 100644 --- a/src/main/java/cactusServer/resources/ObjectsRest.java +++ b/src/main/java/cactusServer/resources/ObjectsRest.java @@ -53,8 +53,8 @@ @FormParam("angle") Quaternion3D angle, @FormParam("attribute") Attribute attribute, @FormParam("model") int modelID) { Instance instance = Instances.getInstance().getInstance(instanceId); - HashMap idMap = instance.createObject(position, velocity, angularVelocity, angle, attribute, - modelID); + HashMap idMap = instance.createObject(position, velocity, angularVelocity, angle, + attribute, modelID); HashMap uriMap = new HashMap<>(); for (String id : idMap.keySet()) { String uri = (InstancesRest.INSTANCES_URI + "/" + instanceId + "/objects/") + id; diff --git a/src/main/java/cactusServer/resources/PlayersRest.java b/src/main/java/cactusServer/resources/PlayersRest.java index a9aefc6..890c8ed 100644 --- a/src/main/java/cactusServer/resources/PlayersRest.java +++ b/src/main/java/cactusServer/resources/PlayersRest.java @@ -32,8 +32,7 @@ public String createPlayer(@FormParam("instanceID") String instanceID, @FormParam("characterID") String characterID) { Instances instances = Instances.getInstance(); - HashMap idMap = instances.createPlayer(instanceID, characterID, null, - null); + HashMap idMap = instances.createPlayer(instanceID, characterID, null, null); HashMap uriMap = new HashMap<>(); for (String id : idMap.keySet()) { String uri = (InstancesRest.INSTANCES_URI + "/players/") + id; @@ -72,7 +71,7 @@ } throw new WebApplicationException(400); } - + @Path("/{playerId}") @DELETE @Produces(MediaType.TEXT_PLAIN)