diff --git a/src/main/java/cactusServer/resources/ObjectsRest.java b/src/main/java/cactusServer/resources/ObjectsRest.java index a3b1747..7d85823 100644 --- a/src/main/java/cactusServer/resources/ObjectsRest.java +++ b/src/main/java/cactusServer/resources/ObjectsRest.java @@ -18,14 +18,11 @@ import framework.physics.AngularVelocity3D; import framework.physics.Velocity3D; +@Path("/instances/{instanceId}/objects") public class ObjectsRest { - - public static final String INSTANCES_URI = "/CactusServer/rest/instances"; - public ObjectsRest() { - } - - @Path("/{instanceId}/objects/{objectId}") +// @Path("/{instanceId}/objects/{objectId}") + @Path("/{objectId}") @GET @Produces(MediaType.APPLICATION_JSON) public Object getObject(@PathParam("instanceId") String instanceId, @PathParam("objectId") String objectId) { @@ -36,7 +33,7 @@ return null; } - @Path("/{instanceId}/objects") +// @Path("/{instanceId}/objects") @POST @Produces(MediaType.APPLICATION_JSON) public URIAddressedEntity createObject(@PathParam("instanceId") String instanceId, @FormParam("position") Position3D position, @@ -44,7 +41,7 @@ @FormParam("angle") Angle angle, @FormParam("attribute") Attribute attribute, @FormParam("model") String model) { Instance instance = Instances.getInstance().getInstance(instanceId); IDAddressedEntity ae = instance.createObject(position, velocity, angularVelocity, angle, attribute, model); - return new URIAddressedEntity((INSTANCES_URI + "/" + instanceId + "/objects/" + ae.getId()), ae.getBody()); + return new URIAddressedEntity((InstancesRest.INSTANCES_URI + "/" + instanceId + "/objects/" + ae.getId()), ae.getBody()); } }