Added getServiceInstanceLastOperation() to enable the broker to be polled for last service operation status. Former getServiceInstance() has been removed since it was not compliant with broker async api. see http://docs.cloudfoundry.org/services/asynchronous-operations.html for details

Author: s-bortolussi

src/main/java/org/cloudfoundry/community/servicebroker/controller/ServiceInstanceController.java

@@ -57,22 +57,23 @@ public ResponseEntity<ServiceInstance> createServiceInstance(
 
 	}
 
-	@RequestMapping(value = BASE_PATH + "/{instanceId}", method = RequestMethod.GET)
-	public ResponseEntity<?> getServiceInstance(
+	@RequestMapping(value = BASE_PATH + "/{instanceId}/last_operation", method = RequestMethod.GET)
+	public ResponseEntity<?> getServiceInstanceLastOperation(
 			@PathVariable("instanceId") String instanceId) {
-		
-		logger.debug("GET: " + BASE_PATH + "/{instanceId}" 
+
+		logger.debug("GET: " + BASE_PATH + "/{instanceId}/last_operation"
 				+ ", getServiceInstance(), serviceInstanceId = " + instanceId);
-		
+
 		ServiceInstance instance = service.getServiceInstance(instanceId);
-		
+
 		HttpHeaders headers = new HttpHeaders();
 		headers.setContentType(MediaType.APPLICATION_JSON);
-		if (null == instance) { 
+		if (null == instance) {
 			return new ResponseEntity<String>("{}", headers, HttpStatus.GONE);
-		} 
-		logger.debug("ServiceInstance: " + instance.getServiceInstanceId());
-		return new ResponseEntity<ServiceInstance>(instance, headers, HttpStatus.OK);
+		}
+		ServiceInstanceLastOperation lastOperation = instance.getServiceInstanceLastOperation();
+		logger.debug("ServiceInstance: " + instance.getServiceInstanceId() + "is in " +lastOperation.getState() + " state. Details : " +lastOperation.getDescription());
+		return new ResponseEntity<ServiceInstanceLastOperation>(lastOperation, headers, HttpStatus.OK);
 	}
 
 	@RequestMapping(value = BASE_PATH + "/{instanceId}", method = RequestMethod.DELETE)

src/test/java/org/cloudfoundry/community/servicebroker/model/fixture/ServiceInstanceControllerIntegrationTest.java

@@ -348,7 +348,7 @@ public void itShouldNotBeAsyncWhenAcceptsIncompleteParamIsNotPresent() throws Ex
 	@Test
 	public void itShouldReturnAnInProgressServiceInstance() throws Exception {
 		ServiceInstance instance = ServiceInstanceFixture.getServiceInstance();
-		String url = ServiceInstanceController.BASE_PATH + "/" + instance.getServiceInstanceId();
+		String url = ServiceInstanceController.BASE_PATH + "/" + instance.getServiceInstanceId() + "/last_operation";
 
 		when(serviceInstanceService.getServiceInstance(any(String.class))).thenReturn(
 				ServiceInstanceFixture.getAsyncServiceInstance().withLastOperation(
@@ -357,13 +357,13 @@ public void itShouldReturnAnInProgressServiceInstance() throws Exception {
 				get(url))
 				.andExpect(status().isOk())
 				.andExpect(content().contentTypeCompatibleWith(MediaType.APPLICATION_JSON))
-				.andExpect(jsonPath("$.last_operation.state", is("in progress")));
+				.andExpect(jsonPath("$.state", is("in progress")));
 	}
 
 	@Test
 	public void itShouldReturnAFailedServiceInstance() throws Exception {
 		ServiceInstance instance = ServiceInstanceFixture.getServiceInstance();
-		String url = ServiceInstanceController.BASE_PATH + "/" + instance.getServiceInstanceId();
+		String url = ServiceInstanceController.BASE_PATH + "/" + instance.getServiceInstanceId() + "/last_operation";
 
 		when(serviceInstanceService.getServiceInstance(any(String.class))).thenReturn(
 				ServiceInstanceFixture.getAsyncServiceInstance().withLastOperation(
@@ -372,13 +372,13 @@ public void itShouldReturnAFailedServiceInstance() throws Exception {
 				get(url))
 				.andExpect(status().isOk())
 				.andExpect(content().contentTypeCompatibleWith(MediaType.APPLICATION_JSON))
-				.andExpect(jsonPath("$.last_operation.state", is("failed")));
+				.andExpect(jsonPath("$.state", is("failed")));
 	}
 
 	@Test
 	public void itShouldReturnASucceededServiceInstance() throws Exception {
 		ServiceInstance instance = ServiceInstanceFixture.getServiceInstance();
-		String url = ServiceInstanceController.BASE_PATH + "/" + instance.getServiceInstanceId();
+		String url = ServiceInstanceController.BASE_PATH + "/" + instance.getServiceInstanceId() + "/last_operation";
 
 		when(serviceInstanceService.getServiceInstance(any(String.class))).thenReturn(
 				ServiceInstanceFixture.getAsyncServiceInstance().withLastOperation(
@@ -387,14 +387,14 @@ public void itShouldReturnASucceededServiceInstance() throws Exception {
 				get(url))
 				.andExpect(status().isOk())
 				.andExpect(content().contentTypeCompatibleWith(MediaType.APPLICATION_JSON))
-				.andExpect(jsonPath("$.last_operation.state", is("succeeded")));
+				.andExpect(jsonPath("$.state", is("succeeded")));
 	}
 
 
 	@Test
 	public void itShouldReturnGoneIfTheServiceInstanceDoesNotExist() throws Exception { 
 		ServiceInstance instance = ServiceInstanceFixture.getServiceInstance();
-		String url = ServiceInstanceController.BASE_PATH + "/" + instance.getServiceInstanceId();
+		String url = ServiceInstanceController.BASE_PATH + "/" + instance.getServiceInstanceId() + "/last_operation";
 
 		when(serviceInstanceService.getServiceInstance(any(String.class))).thenReturn(null);
 		mockMvc.perform(