Merge pull request cloudfoundry#167 from scottfrederick/service-plans

Added checking for optional service plan fields before unboxing.

Author: scottfrederick

cloudfoundry-client-lib/src/main/java/org/cloudfoundry/client/lib/util/CloudEntityResourceMapper.java

@@ -195,13 +195,14 @@ private CloudServiceOffering mapServiceResource(Map<String, Object> resource) {
 		List<Map<String, Object>> servicePlanList = getEmbeddedResourceList(getEntity(resource), "service_plans");
 		if (servicePlanList != null) {
 			for (Map<String, Object> servicePlanResource : servicePlanList) {
+				Boolean publicPlan = getEntityAttribute(servicePlanResource, "public", Boolean.class);
 				CloudServicePlan servicePlan =
 						new CloudServicePlan(
 								getMeta(servicePlanResource),
 								getEntityAttribute(servicePlanResource, "name", String.class),
 								getEntityAttribute(servicePlanResource, "description", String.class),
 								getEntityAttribute(servicePlanResource, "free", Boolean.class),
-								getEntityAttribute(servicePlanResource, "public", Boolean.class),
+								publicPlan == null ? true : publicPlan,
 								getEntityAttribute(servicePlanResource, "extra", String.class),
 								getEntityAttribute(servicePlanResource, "unique_id", String.class),
 								cloudServiceOffering);

cloudfoundry-client-lib/src/test/java/org/cloudfoundry/client/lib/CloudFoundryClientTest.java

@@ -8,6 +8,7 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.junit.Assume.assumeTrue;
@@ -41,6 +42,7 @@
 import org.cloudfoundry.client.lib.domain.CloudRoute;
 import org.cloudfoundry.client.lib.domain.CloudService;
 import org.cloudfoundry.client.lib.domain.CloudServiceOffering;
+import org.cloudfoundry.client.lib.domain.CloudServicePlan;
 import org.cloudfoundry.client.lib.domain.CloudSpace;
 import org.cloudfoundry.client.lib.domain.CloudStack;
 import org.cloudfoundry.client.lib.domain.CrashInfo;
@@ -1087,11 +1089,14 @@ public void getServiceOfferings() {
 		assertNotNull(offering.getName());
 		assertNotNull(offering.getDescription());
 		assertNotNull(offering.getLabel());
-		assertNotNull(offering.getProvider());
-		assertNotNull(offering.getUrl());
-		assertNotNull(offering.getDocumentationUrl());
 		assertNotNull(offering.getUniqueId());
 		assertNotNull(offering.getExtra());
+
+		CloudServicePlan plan = offering.getCloudServicePlans().get(0);
+		assertNotNull(plan.getName());
+		assertNotNull(plan.getUniqueId());
+		assertNotNull(plan.getDescription());
+		assertSame(offering, plan.getServiceOffering());
 	}
 
 	@Test