AT improvements

* Remove log noise in ATs
* Work around inability to create orgs with client credentials. Our AT
setup was failing due to our use of client credentials in CFJC's
`UaaClient`, in combination with cloudfoundry/cf-java-client#939.

Author: spikymonkey

spring-cloud-app-broker-acceptance-tests/src/test/java/org/springframework/cloud/appbroker/acceptance/fixtures/cf/CloudFoundryClientConfiguration.java

@@ -75,7 +75,7 @@ public class CloudFoundryClientConfiguration {
 	protected CloudFoundryOperations cloudFoundryOperations(CloudFoundryProperties properties,
 		CloudFoundryClient client,
 		DopplerClient dopplerClient,
-		UaaClient uaaClient) {
+		@Qualifier("userCredentials") UaaClient uaaClient) {
 		return DefaultCloudFoundryOperations.builder()
 			.cloudFoundryClient(client)
 			.dopplerClient(dopplerClient)
@@ -114,7 +114,18 @@ protected DopplerClient dopplerClient(ConnectionContext connectionContext,
 	}
 
 	@Bean
-	protected UaaClient uaaClient(ConnectionContext connectionContext,
+	@Qualifier("userCredentials")
+	protected UaaClient userCredentialsUaaClient(ConnectionContext connectionContext,
+		@Qualifier("userCredentials") TokenProvider tokenProvider) {
+		return ReactorUaaClient.builder()
+			.connectionContext(connectionContext)
+			.tokenProvider(tokenProvider)
+			.build();
+	}
+
+	@Bean
+	@Qualifier("clientCredentials")
+	protected UaaClient clientCredentialsUaaClient(ConnectionContext connectionContext,
 		@Qualifier("clientCredentials") TokenProvider tokenProvider) {
 		return ReactorUaaClient.builder()
 			.connectionContext(connectionContext)

spring-cloud-app-broker-acceptance-tests/src/test/java/org/springframework/cloud/appbroker/acceptance/fixtures/cf/CloudFoundryService.java

@@ -176,20 +176,26 @@ public Mono<Void> updateBrokerApp(String appName, String brokerClientId, List<St
 	}
 
 	public Mono<Void> deleteApp(String appName) {
-		return cloudFoundryOperations.applications().delete(DeleteApplicationRequest.builder()
-			.name(appName)
-			.deleteRoutes(true)
-			.build())
+		return cloudFoundryOperations.applications().list()
+			.filter(app -> appName.equals(app.getName()))
+			.singleOrEmpty()
+			.flatMap(app -> cloudFoundryOperations.applications().delete(DeleteApplicationRequest.builder()
+				.name(appName)
+				.deleteRoutes(true)
+				.build()))
 			.doOnSuccess(item -> LOG.info("Success deleting app. appName={}", appName))
 			.doOnError(e -> LOG.warn(String.format("Error deleting app. appName=%s, error=%s", appName,
 				e.getMessage()), e))
 			.onErrorResume(e -> Mono.empty());
 	}
 
 	public Mono<Void> deleteServiceBroker(String brokerName) {
-		return cloudFoundryOperations.serviceAdmin().delete(DeleteServiceBrokerRequest.builder()
-			.name(brokerName)
-			.build())
+		return cloudFoundryOperations.serviceAdmin().list()
+			.filter(serviceBroker -> brokerName.equals(serviceBroker.getName()))
+			.singleOrEmpty()
+			.flatMap(serviceBroker -> cloudFoundryOperations.serviceAdmin()
+				.delete(DeleteServiceBrokerRequest.builder().name(brokerName).build())
+			)
 			.doOnSuccess(item -> LOG.info("Success deleting service broker. brokerName={}", brokerName))
 			.doOnError(e -> LOG.warn(String.format("Error deleting service broker. brokerName=%s, error=%s ",
 				brokerName, e.getMessage()), e))

spring-cloud-app-broker-acceptance-tests/src/test/java/org/springframework/cloud/appbroker/acceptance/fixtures/uaa/UaaService.java

@@ -26,6 +26,7 @@
 import org.slf4j.LoggerFactory;
 import reactor.core.publisher.Mono;
 
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 
 @Service
@@ -35,7 +36,7 @@ public class UaaService {
 
 	private final UaaClient uaaClient;
 
-	public UaaService(UaaClient uaaClient) {
+	public UaaService(@Qualifier("clientCredentials") UaaClient uaaClient) {
 		this.uaaClient = uaaClient;
 	}
 
@@ -48,21 +49,19 @@ public Mono<GetClientResponse> getUaaClient(String clientId) {
 	}
 
 	public Mono<Void> createClient(String clientId, String clientSecret, String... authorities) {
-		return uaaClient.clients().delete(DeleteClientRequest
-			.builder()
-			.clientId(clientId)
-			.build())
-			.doOnError(error -> LOG.warn("Error deleting client: " + clientId + " with error: " + error))
-			.onErrorResume(e -> Mono.empty())
-			.then(uaaClient.clients().create(CreateClientRequest
-				.builder()
-				.clientId(clientId)
-				.clientSecret(clientSecret)
-				.authorizedGrantType(GrantType.CLIENT_CREDENTIALS)
-				.authorities(authorities)
-				.build())
-				.doOnError(error -> LOG.error("Error creating client: " + clientId + " with error: " + error))
-				.onErrorResume(e -> Mono.empty()))
+		return getUaaClient(clientId)
+			.flatMap(response -> uaaClient.clients()
+				.delete(DeleteClientRequest.builder().clientId(clientId).build())
+				.doOnError(error -> LOG.error("Error deleting client: " + clientId + " with error: " + error)))
+			.then(uaaClient.clients()
+				.create(CreateClientRequest
+					.builder()
+					.clientId(clientId)
+					.clientSecret(clientSecret)
+					.authorizedGrantType(GrantType.CLIENT_CREDENTIALS)
+					.authorities(authorities)
+					.build())
+				.doOnError(error -> LOG.error("Error creating client: " + clientId + " with error: " + error)))
 			.then();
 	}