Use status field to check deployment status instead of state

State field was deprecated in CAPI and starting from CFJC 5.3 marked as nullable, since it won't be sent by CAPI versions 3.91+.

App Broker should use status field instead.

Author: alek-sys

gradle.properties

@@ -5,7 +5,7 @@ onlyShowStandardStreamsOnTestFailure = false
 
 awaitilityVersion = 4.0.2
 blockHoundVersion = 1.0.4.RELEASE
-cfJavaClientVersion = 5.1.0.RELEASE
+cfJavaClientVersion = 5.3.0.RELEASE
 checkstyleVersion = 8.37
 commonsTextVersion = 1.8
 immutablesVersion = 2.8.8

spring-cloud-app-broker-deployer-cloudfoundry/src/main/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryAppDeployer.java

@@ -64,6 +64,8 @@
 import org.cloudfoundry.client.v3.deployments.CreateDeploymentResponse;
 import org.cloudfoundry.client.v3.deployments.DeploymentRelationships;
 import org.cloudfoundry.client.v3.deployments.DeploymentState;
+import org.cloudfoundry.client.v3.deployments.DeploymentStatusReason;
+import org.cloudfoundry.client.v3.deployments.DeploymentStatusValue;
 import org.cloudfoundry.client.v3.deployments.GetDeploymentRequest;
 import org.cloudfoundry.client.v3.deployments.GetDeploymentResponse;
 import org.cloudfoundry.client.v3.packages.CreatePackageRequest;
@@ -441,15 +443,14 @@ private String getDefaultDomainId(List<Domain> domains) {
 			.getId();
 	}
 
-	@SuppressWarnings("deprecation")
 	private Mono<GetDeploymentResponse> waitForDeploymentDeployed(String deploymentId) {
 		return this.client
 			.deploymentsV3()
 			.get(GetDeploymentRequest
 				.builder()
 				.deploymentId(deploymentId)
 				.build())
-			.filter(p -> p.getState().equals(DeploymentState.DEPLOYED))
+			.filter(this::deploymentFinished)
 			.repeatWhenEmpty(getExponentialBackOff())
 			.doOnRequest(l -> LOG.debug("Waiting for deployment to complete. deploymentId={}", deploymentId))
 			.doOnSuccess(response -> {
@@ -460,6 +461,16 @@ private Mono<GetDeploymentResponse> waitForDeploymentDeployed(String deploymentI
 				ERROR_LOG_TEMPLATE, deploymentId, e.getMessage()), e));
 	}
 
+	@SuppressWarnings("deprecation")
+	private boolean deploymentFinished(GetDeploymentResponse p) {
+		if (p.getState() != null) {
+			return p.getState().equals(DeploymentState.DEPLOYED);
+		}
+
+		return p.getStatus().getValue().equals(DeploymentStatusValue.FINALIZED)
+			&& p.getStatus().getReason().equals(DeploymentStatusReason.DEPLOYED);
+	}
+
 	private Mono<CreateDeploymentResponse> createDeployment(String dropletId, String applicationId) {
 		return this.client
 			.deploymentsV3()

spring-cloud-app-broker-deployer-cloudfoundry/src/test/java/org/springframework/cloud/appbroker/deployer/cloudfoundry/CloudFoundryAppDeployerUpdateApplicationTest.java

@@ -48,6 +48,8 @@
 import org.cloudfoundry.client.v3.builds.GetBuildResponse;
 import org.cloudfoundry.client.v3.deployments.CreateDeploymentResponse;
 import org.cloudfoundry.client.v3.deployments.DeploymentState;
+import org.cloudfoundry.client.v3.deployments.DeploymentStatusReason;
+import org.cloudfoundry.client.v3.deployments.DeploymentStatusValue;
 import org.cloudfoundry.client.v3.deployments.DeploymentsV3;
 import org.cloudfoundry.client.v3.deployments.GetDeploymentResponse;
 import org.cloudfoundry.client.v3.packages.BitsData;
@@ -252,6 +254,8 @@ void setUp() {
 		given(deploymentsV3.get(any()))
 			.willReturn(Mono.just(GetDeploymentResponse.builder()
 				.state(DeploymentState.DEPLOYED)
+				.status(org.cloudfoundry.client.v3.deployments.Status.builder().value(DeploymentStatusValue.FINALIZED).reason(
+					DeploymentStatusReason.DEPLOYED).build())
 				.createdAt("DATETIME")
 				.id("deployment-id")
 				.build()));
@@ -273,6 +277,30 @@ void updateApp() {
 			.verifyComplete();
 	}
 
+	@Test
+	void updateAppWhenDeploymentObjectHasNotState() {
+		given(deploymentsV3.get(any()))
+			.willReturn(Mono.just(GetDeploymentResponse.builder()
+				.status(org.cloudfoundry.client.v3.deployments.Status.builder().value(DeploymentStatusValue.FINALIZED).reason(
+					DeploymentStatusReason.DEPLOYED).build())
+				.createdAt("DATETIME")
+				.id("deployment-id")
+				.build()));
+
+		given(applicationsV2.update(any()))
+			.willReturn(Mono.just(UpdateApplicationResponse.builder()
+				.build()));
+
+		UpdateApplicationRequest request = UpdateApplicationRequest.builder()
+			.name(APP_NAME)
+			.path(APP_PATH)
+			.build();
+
+		StepVerifier.create(appDeployer.update(request))
+			.assertNext(response -> assertThat(response.getName()).isEqualTo(APP_NAME))
+			.verifyComplete();
+	}
+
 	@Test
 	void updateAppWithTarget() {
 		given(applicationsV2.update(any()))

spring-cloud-app-broker-integration-tests/src/test/resources/responses/cloudcontroller/get-deployment-DEPLOYED.json

@@ -1,6 +1,13 @@
 {
 	"guid": "@guid",
 	"state": "DEPLOYED",
+	"status": {
+		"value": "FINALIZED",
+		"reason": "DEPLOYED",
+		"details": {
+			"last_successful_healthcheck": "2018-04-25T22:42:10Z"
+		}
+	},
 	"droplet": {
 		"guid": "44ccfa61-dbcf-4a0d-82fe-f668e9d2a962"
 	},