RESTWS-367: Update request should return updated object

omod-1.8/src/test/java/org/openmrs/module/webservices/rest/web/ClassHierarchyResourceTest.java

@@ -102,15 +102,13 @@ public void shouldUpdateASuperclass() throws Exception {
 		String newValue = "Do a CD4 Test STAT!";
 		Object updated = resource.update(SUPERCLASS_UUID, new SimpleObject().add("instructions", newValue), context);
 		Util.log("Updated subclass", updated);
-		Assert.assertEquals(Order.class, updated.getClass());
 		Assert.assertEquals(newValue, PropertyUtils.getProperty(updated, "instructions"));
 	}
 
 	@Test
 	public void shouldUpdateASubclass() throws Exception {
 		Object updated = resource.update(SUBCLASS_UUID, new SimpleObject().add("dose", "500"), context);
 		Util.log("Updated subclass", updated);
-		Assert.assertEquals(DrugOrder.class, updated.getClass());
 		Assert.assertEquals(500d, PropertyUtils.getProperty(updated, "dose"));
 	}
 

omod-1.8/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_8/PersonController1_8Test.java

@@ -133,7 +133,11 @@ public void shouldEditAPerson() throws Exception {
 		assertFalse(person.isDead());
 		assertNull(person.getCauseOfDeath());
 		String json = "{\"gender\":\"F\",\"dead\":true, \"causeOfDeath\":\"15f83cd6-64e9-4e06-a5f9-364d3b14a43d\"}";
-		handle(newPostRequest(getURI() + "/" + getUuid(), json));
+        SimpleObject response = deserialize(handle(newPostRequest(getURI() + "/" + getUuid(), json)));
+        assertNotNull(response);
+        Object responsePersonContents=PropertyUtils.getProperty(response,"person");
+        assertNotNull(responsePersonContents);
+        assertTrue("F".equals(PropertyUtils.getProperty(responsePersonContents,"gender").toString()));
 		assertEquals("F", person.getGender());
 		assertTrue(person.isDead());
 		assertNotNull(person.getCauseOfDeath());

omod-1.8/src/test/java/org/openmrs/module/webservices/rest/web/v1_0/controller/openmrs1_8/PersonNameController1_8Test.java

@@ -103,9 +103,10 @@ public void shouldEditName() throws Exception {
 		PersonName personName = service.getPersonNameByUuid(getUuid());
 		Assert.assertEquals("Chebaskwony", personName.getFamilyName());
 		String json = "{ \"familyName\":\"newName\" }";
-
-		handle(newPostRequest(getURI() + "/" + getUuid(), json));
-
+
+        SimpleObject response = deserialize(handle(newPostRequest(getURI() + "/" + getUuid(), json)));
+        Assert.assertNotNull(response);
+        Assert.assertEquals(PropertyUtils.getProperty(response,"familyName").toString(),"newName");
 		PersonName editedPersonName = service.getPersonNameByUuid(getUuid());
 		Assert.assertEquals(editedPersonName.getFamilyName(), "newName");
 

omod-common/src/main/java/org/openmrs/module/webservices/rest/web/RestUtil.java

@@ -573,6 +573,23 @@ public static Object created(HttpServletResponse response, Object created) {
 		return created;
 	}
 
+	/**
+	 * Sets the HTTP status for UPDATED and (if 'updated' has a uri) the Location header attribute
+	 *
+	 * @param response
+	 * @param updated
+	 * @return the object passed in
+	 */
+	public static Object updated(HttpServletResponse response, Object updated) {
+		response.setStatus(HttpServletResponse.SC_OK);
+		try {
+			String uri = (String) PropertyUtils.getProperty(updated, "uri");
+			response.addHeader("Location", uri);
+		}
+		catch (Exception ex) {}
+		return updated;
+	}
+
 	/**
 	 * Updates the Uri prefix through which clients consuming web services will connect to the web
 	 * app

omod-common/src/main/java/org/openmrs/module/webservices/rest/web/resource/impl/DelegatingCrudResource.java

@@ -130,7 +130,15 @@ public Object update(String uuid, SimpleObject propertiesToUpdate, RequestContex
 
 		setConvertedProperties(delegate, propertiesToUpdate, handler.getUpdatableProperties(), false);
 		delegate = save(delegate);
-		return delegate;
+
+		SimpleObject ret = (SimpleObject) ConversionUtil.convertToRepresentation(delegate, Representation.DEFAULT);
+
+		// add the 'type' discriminator if we support subclasses
+		if (hasTypesDefined()) {
+			ret.add(RestConstants.PROPERTY_FOR_TYPE, getTypeName(delegate));
+		}
+
+		return ret;
 	}
 
 	/**

omod-common/src/main/java/org/openmrs/module/webservices/rest/web/resource/impl/DelegatingSubResource.java

@@ -140,7 +140,7 @@ public Object update(String parentUniqueId, String uuid, SimpleObject properties
 		testParent(delegate, parentUniqueId);
 		setConvertedProperties(delegate, propertiesToUpdate, getUpdatableProperties(), false);
 		delegate = save(delegate);
-		return delegate;
+		return ConversionUtil.convertToRepresentation(delegate, Representation.DEFAULT);
 	}
 
 	/**

omod-common/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/controller/MainResourceController.java

@@ -99,8 +99,8 @@ public Object update(@PathVariable("resource") String resource, @PathVariable("u
 	        throws ResponseException {
 		RequestContext context = RestUtil.getRequestContext(request);
 		CrudResource res = (CrudResource) restService.getResourceByName(buildResourceName(resource));
-		res.update(uuid, post, context);
-		return RestUtil.noContent(response);
+		Object updated = res.update(uuid, post, context);
+		return RestUtil.updated(response, updated);
 	}
 
 	/**

omod-common/src/main/java/org/openmrs/module/webservices/rest/web/v1_0/controller/MainSubResourceController.java

@@ -115,8 +115,8 @@ public Object update(@PathVariable("resource") String resource, @PathVariable("p
 	        throws ResponseException {
 		RequestContext context = RestUtil.getRequestContext(request);
 		SubResource res = (SubResource) restService.getResourceByName(buildResourceName(resource) + "/" + subResource);
-		res.update(parentUuid, uuid, post, context);
-		return RestUtil.noContent(response);
+		Object updated = res.update(parentUuid, uuid, post, context);
+		return RestUtil.updated(response, updated);
 	}
 
 	/**