Added binding-name parameter

Formatting
SAP · Jul 4, 2024 · d9bd980 · d9bd980
1 parent 8928d08
commit d9bd980
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 14 deletions.
diff --git a/src/main/java/com/sap/cloudfoundry/client/facade/CloudControllerClient.java b/src/main/java/com/sap/cloudfoundry/client/facade/CloudControllerClient.java
@@ -60,23 +60,25 @@ public interface CloudControllerClient {
     /**
      * Associate (provision) a service with an application.
      *
+     * @param bindingName the binding name
      * @param applicationName the application name
      * @param serviceInstanceName the service instance name
      * @return job id for async polling if present
      */
-    Optional<String> bindServiceInstance(String applicationName, String serviceInstanceName);
+    Optional<String> bindServiceInstance(String bindingName, String applicationName, String serviceInstanceName);
 
     /**
      * Associate (provision) a service with an application.
      *
+     * @param bindingName the binding name
      * @param applicationName the application name
      * @param serviceInstanceName the service instance name
      * @param parameters the binding parameters
      * @param updateServicesCallback callback used for error handling
      * @return job id for async polling if present
      */
-    Optional<String> bindServiceInstance(String applicationName, String serviceInstanceName, Map<String, Object> parameters,
-                                         ApplicationServicesUpdateCallback updateServicesCallback);
+    Optional<String> bindServiceInstance(String bindingName, String applicationName, String serviceInstanceName,
+                                         Map<String, Object> parameters, ApplicationServicesUpdateCallback updateServicesCallback);
 
     /**
      * Create application

diff --git a/src/main/java/com/sap/cloudfoundry/client/facade/CloudControllerClientImpl.java b/src/main/java/com/sap/cloudfoundry/client/facade/CloudControllerClientImpl.java
@@ -88,15 +88,15 @@ public void addRoute(String host, String domainName, String path) {
     }
 
     @Override
-    public Optional<String> bindServiceInstance(String applicationName, String serviceInstanceName) {
-        return handleExceptions(() -> delegate.bindServiceInstance(applicationName, serviceInstanceName));
+    public Optional<String> bindServiceInstance(String bindingName, String applicationName, String serviceInstanceName) {
+        return handleExceptions(() -> delegate.bindServiceInstance(bindingName, applicationName, serviceInstanceName));
     }
 
     @Override
-    public Optional<String> bindServiceInstance(String applicationName, String serviceInstanceName, Map<String, Object> parameters,
-                                                ApplicationServicesUpdateCallback updateServicesCallback) {
+    public Optional<String> bindServiceInstance(String bindingName, String applicationName, String serviceInstanceName,
+                                                Map<String, Object> parameters, ApplicationServicesUpdateCallback updateServicesCallback) {
         try {
-            return handleExceptions(() -> delegate.bindServiceInstance(applicationName, serviceInstanceName, parameters));
+            return handleExceptions(() -> delegate.bindServiceInstance(bindingName, applicationName, serviceInstanceName, parameters));
         } catch (CloudOperationException e) {
             updateServicesCallback.onError(e, applicationName, serviceInstanceName);
         }

diff --git a/src/main/java/com/sap/cloudfoundry/client/facade/rest/CloudControllerRestClient.java b/src/main/java/com/sap/cloudfoundry/client/facade/rest/CloudControllerRestClient.java
@@ -47,9 +47,9 @@ public interface CloudControllerRestClient {
 
     void addRoute(String host, String domainName, String path);
 
-    Optional<String> bindServiceInstance(String applicationName, String serviceInstanceName);
+    Optional<String> bindServiceInstance(String bindingName, String applicationName, String serviceInstanceName);
 
-    Optional<String> bindServiceInstance(String applicationName, String serviceInstanceName, Map<String, Object> parameters);
+    Optional<String> bindServiceInstance(String bindingName, String applicationName, String serviceInstanceName, Map<String, Object> parameters);
 
     void createApplication(ApplicationToCreateDto applicationToCreateDto);
 

diff --git a/src/main/java/com/sap/cloudfoundry/client/facade/rest/CloudControllerRestClientImpl.java b/src/main/java/com/sap/cloudfoundry/client/facade/rest/CloudControllerRestClientImpl.java
@@ -220,7 +220,6 @@
 
 /**
  * Abstract implementation of the CloudControllerClient intended to serve as the base.
- *
  */
 public class CloudControllerRestClientImpl implements CloudControllerRestClient {
 
@@ -270,16 +269,18 @@ public void addRoute(String host, String domainName, String path) {
     }
 
     @Override
-    public Optional<String> bindServiceInstance(String applicationName, String serviceInstanceName) {
-        return bindServiceInstance(applicationName, serviceInstanceName, null);
+    public Optional<String> bindServiceInstance(String bindingName, String applicationName, String serviceInstanceName) {
+        return bindServiceInstance(bindingName, applicationName, serviceInstanceName, null);
     }
 
     @Override
-    public Optional<String> bindServiceInstance(String applicationName, String serviceInstanceName, Map<String, Object> parameters) {
+    public Optional<String> bindServiceInstance(String bindingName, String applicationName, String serviceInstanceName,
+                                                Map<String, Object> parameters) {
         UUID applicationGuid = getRequiredApplicationGuid(applicationName);
         UUID serviceInstanceGuid = getRequiredServiceInstanceGuid(serviceInstanceName);
 
         var createBindingRequest = CreateServiceBindingRequest.builder()
+                                                              .name(bindingName)
                                                               .type(ServiceBindingType.APPLICATION)
                                                               .relationships(ServiceBindingRelationships.builder()
                                                                                                         .application(buildToOneRelationship(applicationGuid))