From 837ab55f5cf9f8ead91282a6d168bbfd9cb2fa01 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@gopivotal.com>
Date: Fri, 18 Jul 2014 16:37:03 +0100
Subject: [PATCH] Tweak binding service

---
 .../SimpleServiceInstanceBindingService.java       | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/main/java/org/springframework/platform/cloudfoundry/broker/SimpleServiceInstanceBindingService.java b/src/main/java/org/springframework/platform/cloudfoundry/broker/SimpleServiceInstanceBindingService.java
index c9561c4..eca6246 100644
--- a/src/main/java/org/springframework/platform/cloudfoundry/broker/SimpleServiceInstanceBindingService.java
+++ b/src/main/java/org/springframework/platform/cloudfoundry/broker/SimpleServiceInstanceBindingService.java
@@ -61,25 +61,15 @@ public class SimpleServiceInstanceBindingService implements ServiceInstanceBindi
 			throw new ServiceInstanceBindingExistsException(binding);
 		}
 
-		if (!isBindingPermitted(serviceInstance, serviceId, planId, appGuid)) {
-			throw new ServiceBrokerException(
-					"Binding is not permitted for this plan, app and service");
-		}
-
 		binding = new ServiceInstanceBinding(bindingId, serviceInstance.getId(),
-				getCredentials(serviceInstance, serviceId), null, appGuid);
+				getCredentials(serviceInstance, serviceId, planId, appGuid), null, appGuid);
 		repository.save(binding);
 
 		return binding;
 	}
 
-	protected boolean isBindingPermitted(ServiceInstance serviceInstance,
-			String serviceId, String planId, String appGuid) {
-		return true;
-	}
-
 	protected Map<String, Object> getCredentials(ServiceInstance instance,
-			String serviceId) {
+			String serviceId, String planId, String appGuid) {
 		Map<String, Object> credentials = new HashMap<String, Object>();
 		credentials.put("uri", findUriFromService(serviceId));
 		credentials.put("domain", applicationDomain);