Upgrading CFJC

Author: Albertoimpl

build.gradle

@@ -19,7 +19,7 @@ import java.util.concurrent.ConcurrentHashMap
 buildscript {
 	ext {
 		blockHoundVersion = "1.0.9.RELEASE"
-		cfJavaClientVersion = "5.10.0.RELEASE"
+		cfJavaClientVersion = "5.12.1.RELEASE"
 		commonsTextVersion = "1.12.0"
 		immutablesVersion = "2.10.1"
 		openServiceBrokerVersion = "4.1.2"

spring-cloud-app-broker-integration-tests/src/test/java/org/springframework/cloud/appbroker/integration/CreateInstanceComponentTest.java

@@ -58,6 +58,7 @@ class CreateInstanceComponentTest extends WiremockComponentTest {
 
 	@Test
 	void pushAppsWhenTheyDoNotExist() {
+		cloudControllerFixture.stubFindSpaceV3();
 		cloudControllerFixture.stubAppDoesNotExist(APP_NAME_1);
 		cloudControllerFixture.stubPushApp(APP_NAME_1,
 			matchingJsonPath("$.environment_json[?(@.SPRING_APPLICATION_JSON =~ " +

spring-cloud-app-broker-integration-tests/src/test/java/org/springframework/cloud/appbroker/integration/CreateInstanceWithCustomParametersMappingComponentTest.java

@@ -71,6 +71,7 @@ class CreateInstanceWithCustomParametersMappingComponentTest extends WiremockCom
 
 	@Test
 	void pushAppWithParametersTransformedUsingCustomTransformer() {
+		cloudControllerFixture.stubFindSpaceV3();
 		cloudControllerFixture.stubAppDoesNotExist(APP_NAME);
 		cloudControllerFixture.stubPushApp(APP_NAME,
 			matchingJsonPath(

spring-cloud-app-broker-integration-tests/src/test/java/org/springframework/cloud/appbroker/integration/CreateInstanceWithCustomTargetComponentTest.java

@@ -77,8 +77,11 @@ void pushAppWithServicesInSpace() {
 		String serviceInstanceId = "instance-id";
 		String customSpace = "my-space";
 		String customSpaceGuid = "my-space-guid";
+
+		cloudControllerFixture.stubFindTestOrg();
+		cloudControllerFixture.stubFindSpaceV3(customSpace, customSpaceGuid);
 		cloudControllerFixture.stubCreateSpace(customSpace, customSpaceGuid);
-		cloudControllerFixture.stubAssociatePermissions(customSpace, customSpaceGuid);
+		cloudControllerFixture.stubAssociatePermissions();
 		cloudControllerFixture.stubPushApp(APP_NAME);
 
 		// given services are available in the marketplace

spring-cloud-app-broker-integration-tests/src/test/java/org/springframework/cloud/appbroker/integration/CreateInstanceWithEnvironmentComponentTest.java

@@ -60,6 +60,7 @@ class CreateInstanceWithEnvironmentComponentTest extends WiremockComponentTest {
 
 	@Test
 	void pushAppWithEnvironmentVariables() {
+		cloudControllerFixture.stubFindSpaceV3();
 		cloudControllerFixture.stubAppDoesNotExist(APP_NAME_1);
 		cloudControllerFixture.stubPushApp(APP_NAME_1,
 			matchingJsonPath("$.environment_json[?(@.SPRING_APPLICATION_JSON =~ /.*ENV_VAR_1.*:.*value1.*/)]"),

spring-cloud-app-broker-integration-tests/src/test/java/org/springframework/cloud/appbroker/integration/CreateInstanceWithExistingServicesComponentTest.java

@@ -57,6 +57,7 @@ class CreateInstanceWithExistingServicesComponentTest extends WiremockComponentT
 
 	@Test
 	void pushAppWithServicesWhenServicesExist() {
+		cloudControllerFixture.stubFindSpaceV3();
 		cloudControllerFixture.stubAppDoesNotExist(APP_NAME);
 		cloudControllerFixture.stubPushApp(APP_NAME);
 

spring-cloud-app-broker-integration-tests/src/test/java/org/springframework/cloud/appbroker/integration/CreateInstanceWithOnlyABackingServiceComponentTest.java

@@ -57,7 +57,7 @@ class CreateInstanceWithOnlyABackingServiceComponentTest extends WiremockCompone
 
 	@Test
 	void createsServicesWhenOnlyBackingServiceIsRequested() {
-
+		cloudControllerFixture.stubFindSpaceV3();
 		// given services are available in the marketplace
 		cloudControllerFixture.stubServiceExists(BACKING_SERVICE_NAME, BACKING_PLAN_NAME);
 

spring-cloud-app-broker-integration-tests/src/test/java/org/springframework/cloud/appbroker/integration/CreateInstanceWithParametersMappingComponentTest.java

@@ -60,6 +60,7 @@ class CreateInstanceWithParametersMappingComponentTest extends WiremockComponent
 
 	@Test
 	void pushAppWithParametersTransformedToEnvironmentVariables() {
+		cloudControllerFixture.stubFindSpaceV3();
 		cloudControllerFixture.stubAppDoesNotExist(APP_NAME);
 		cloudControllerFixture.stubPushApp(APP_NAME,
 			matchingJsonPath("$.environment_json[?(@.SPRING_APPLICATION_JSON =~ /.*parameter1.*:.*value1.*/)]"),

spring-cloud-app-broker-integration-tests/src/test/java/org/springframework/cloud/appbroker/integration/CreateInstanceWithPropertiesComponentTest.java

@@ -57,6 +57,7 @@ class CreateInstanceWithPropertiesComponentTest extends WiremockComponentTest {
 
 	@Test
 	void pushAppWithProperties() {
+		cloudControllerFixture.stubFindSpaceV3();
 		cloudControllerFixture.stubAppDoesNotExist(APP_NAME);
 		cloudControllerFixture.stubPushApp(APP_NAME,
 			matchingJsonPath("$.[?(@.memory == '2048')]"),

spring-cloud-app-broker-integration-tests/src/test/java/org/springframework/cloud/appbroker/integration/CreateInstanceWithServiceInstanceGuidSuffixTargetComponentTest.java

@@ -68,6 +68,7 @@ void deployAppsWithServiceInstanceGuidSuffixOnCreateServiceWhenCreatingMoreThanO
 		String applicationName = APP_NAME + "-" + serviceInstanceId;
 		String backingServiceInstanceName = BACKING_SI_NAME + "-" + serviceInstanceId;
 
+		cloudControllerFixture.stubFindSpaceV3();
 		cloudControllerFixture.stubAppDoesNotExist(applicationName);
 		cloudControllerFixture.stubPushApp(applicationName);