Refactor controller client methods

SAP · Oct 2, 2024 · 5d8606a · 5d8606a
1 parent e4e413d
commit 5d8606a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 21 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
@@ -661,12 +661,8 @@ Optional<String> unbindServiceInstance(String applicationName, String serviceIns
 
     void updateServiceSyslogDrainUrl(String serviceName, String syslogDrainUrl);
 
-    CloudPackage asyncUploadApplicationWithExponentialBackoff(String applicationName, Path file, Duration uploadTimeout);
-
     CloudPackage asyncUploadApplicationWithExponentialBackoff(String applicationName, Path file, UploadStatusCallback callback,
-                                                              Duration uploadTimeout);
-
-    CloudPackage asyncUploadApplicationWithExponentialBackoff(String applicationName, Path file, UploadStatusCallback callback);
+                                                              Duration overrideTimeout);
 
     Upload getUploadStatus(UUID packageGuid);
 

diff --git a/src/main/java/com/sap/cloudfoundry/client/facade/CloudControllerClientImpl.java b/src/main/java/com/sap/cloudfoundry/client/facade/CloudControllerClientImpl.java
@@ -561,18 +561,9 @@ public void updateServiceSyslogDrainUrl(String serviceName, String syslogDrainUr
     }
 
     @Override
-    public CloudPackage asyncUploadApplicationWithExponentialBackoff(String applicationName, Path file, Duration uploadTimeout) {
-        return handleExceptions(() -> delegate.asyncUploadApplication(applicationName, file, null, uploadTimeout));
-    }
-
-    @Override
-    public CloudPackage asyncUploadApplicationWithExponentialBackoff(String applicationName, Path file, UploadStatusCallback callback, Duration uploadTimeout) {
-        return handleExceptions(() -> delegate.asyncUploadApplication(applicationName, file, callback, uploadTimeout));
-    }
-
-    @Override
-    public CloudPackage asyncUploadApplicationWithExponentialBackoff(String applicationName, Path file, UploadStatusCallback callback) {
-        throw new UnsupportedOperationException("This method must not be used, as the timeout must be provided as a resilience");
+    public CloudPackage asyncUploadApplicationWithExponentialBackoff(String applicationName, Path file, UploadStatusCallback callback,
+                                                                     Duration overrideTimeout) {
+        return handleExceptions(() -> delegate.asyncUploadApplication(applicationName, file, callback, overrideTimeout));
     }
 
     @Override

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
@@ -2390,9 +2390,6 @@ private void processAsyncUploadInBackground(CloudPackage cloudPackage, UploadSta
     }
 
     private void processAsyncUpload(CloudPackage cloudPackage, UploadStatusCallback callback) {
-        if (callback == null) {
-            callback = UploadStatusCallback.NONE;
-        }
         while (true) {
             Upload upload = getUploadStatus(cloudPackage.getGuid());
             Status uploadStatus = upload.getStatus();

diff --git a/src/test/java/com/sap/cloudfoundry/client/facade/ApplicationUtil.java b/src/test/java/com/sap/cloudfoundry/client/facade/ApplicationUtil.java
@@ -22,7 +22,8 @@ public class ApplicationUtil {
 
     public static CloudPackage uploadApplication(CloudControllerClient client, String applicationName, Path pathToFile)
         throws InterruptedException {
-        CloudPackage cloudPackage = client.asyncUploadApplicationWithExponentialBackoff(applicationName, pathToFile, UPLOAD_TIMEOUT);
+        CloudPackage cloudPackage = client.asyncUploadApplicationWithExponentialBackoff(applicationName, pathToFile,
+                                                                                        UploadStatusCallback.NONE, UPLOAD_TIMEOUT);
         while (cloudPackage.getStatus() != Status.READY && !hasUploadFailed(cloudPackage.getStatus())) {
             Thread.sleep(TimeUnit.SECONDS.toMillis(1));
             cloudPackage = client.getPackage(cloudPackage.getGuid());