diff --git a/src/main/java/cactusServer/resources/CharactersRest.java b/src/main/java/cactusServer/resources/CharactersRest.java index cdc3a28..ec28c56 100644 --- a/src/main/java/cactusServer/resources/CharactersRest.java +++ b/src/main/java/cactusServer/resources/CharactersRest.java @@ -1,5 +1,7 @@ package cactusServer.resources; +import java.util.HashMap; + import javax.ws.rs.FormParam; import javax.ws.rs.GET; import javax.ws.rs.POST; @@ -14,9 +16,7 @@ import org.ntlab.radishforandroidstudio.framework.model3D.Quaternion3D; import cactusServer.entities.Character; -import cactusServer.entities.IDAddressedEntity; import cactusServer.entities.Instance; -import cactusServer.entities.URIAddressedEntity; import cactusServer.models.Instances; @Path("/instances/{instanceId}/characters") @@ -36,13 +36,18 @@ @POST @Produces(MediaType.APPLICATION_JSON) - public URIAddressedEntity createCharacter(@PathParam("instanceId") String instanceId, + public HashMap createCharacter(@PathParam("instanceId") String instanceId, @FormParam("accountURI") String accountURI, @FormParam("name") String name, @FormParam("position") Position3D position, @FormParam("angle") Quaternion3D angle, @FormParam("modelID") String modelID) { Instance instance = Instances.getInstance().getInstance(instanceId); - IDAddressedEntity ae = instance.createCharacter(instanceId, accountURI, name, position, angle, modelID); - return new URIAddressedEntity((InstancesRest.INSTANCES_URI + "/" + instanceId + "/characters/" + ae.getId()), ae.getBody()); + HashMap idMap = instance.createCharacter(instanceId, accountURI, name, position, angle, modelID); + HashMap uriMap = new HashMap<>(); + for (String id : idMap.keySet()) { + String uri = (InstancesRest.INSTANCES_URI + "/" + instanceId + "/characters/") + id; + uriMap.put(uri, idMap.get(id)); + } + return uriMap; } @Path("/{characterId}")