Fix partial aggregate deployment state

spring-cloud-dataflow-server-core/src/main/java/org/springframework/cloud/dataflow/server/controller/StreamDefinitionController.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2017 the original author or authors.
+ * Copyright 2015-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -146,6 +146,10 @@ public static DeploymentState aggregateState(Set<DeploymentState> states) {
 			logger.debug("aggregateState: Returning " + DeploymentState.error);
 			return DeploymentState.error;
 		}
+		if (states.contains(DeploymentState.deployed) && states.contains(DeploymentState.failed)) {
+			logger.debug("aggregateState: Returning " + DeploymentState.partial);
+			return DeploymentState.partial;
+		}
 		if (states.contains(DeploymentState.failed)) {
 			logger.debug("aggregateState: Returning " + DeploymentState.failed);
 			return DeploymentState.failed;

spring-cloud-dataflow-server-core/src/test/java/org/springframework/cloud/dataflow/server/controller/StreamControllerTests.java

@@ -889,7 +889,7 @@ public void testDeployWithCommonApplicationProperties() throws Exception {
 
 	@Test
 	public void testAggregateState() {
-		assertThat(StreamDefinitionController.aggregateState(EnumSet.of(deployed, failed)), is(failed));
+		assertThat(StreamDefinitionController.aggregateState(EnumSet.of(deployed, failed)), is(partial));
 		assertThat(StreamDefinitionController.aggregateState(EnumSet.of(unknown, failed)), is(failed));
 		assertThat(StreamDefinitionController.aggregateState(EnumSet.of(deployed, failed, error)), is(error));
 		assertThat(StreamDefinitionController.aggregateState(EnumSet.of(deployed, undeployed)), is(partial));