Compiles

PeterBackroll · PeterBackroll · commit 34a49316eedc · 2026-03-02T17:41:22.000+01:00
diff --git a/plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/BackrollBackupProvider.java b/plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/BackrollBackupProvider.java
@@ -102,7 +102,7 @@ public List<BackupOffering> listBackupOfferings(Long zoneId) {
 
             logger.info("BackrollProvider: results " + (results.size() > 0 ? "> 0" : "<= 0"));
             return results;
-        } catch (ParseException | BackrollApiException | IOException e) {
+        } catch (BackrollHttpClientException e) {
             logger.info("BackrollProvider: catch erreur: {}", e);
             throw new CloudRuntimeException("Failed to load backup offerings");
         }
@@ -131,7 +131,7 @@ public boolean restoreVMFromBackup(VirtualMachine vm, Backup backup) {
 
         try {
             return getClient(vm.getDataCenterId()).restoreVMFromBackup(vm.getUuid(), getBackupName(backup));
-        } catch (ParseException | BackrollApiException | IOException e) {
+        } catch (BackrollHttpClientException e) {
             throw new CloudRuntimeException("Failed to restore VM from Backup");
         }
     }
@@ -162,7 +162,7 @@ private Map<VirtualMachine, Backup.Metric> getBackupMetrics(Long zoneId, List<Vi
                         BackrollTaskStatus response;
                         try {
                             response = client.checkBackupTaskStatus(backup.getExternalId());
-                        } catch (ParseException | BackrollApiException | IOException e) {
+                        } catch (BackrollClientException e) {
                             logger.error(e);
                             throw new CloudRuntimeException("Failed to sync backups");
                         }
@@ -188,7 +188,7 @@ private Map<VirtualMachine, Backup.Metric> getBackupMetrics(Long zoneId, List<Vi
                                         backupToUpdate.setProtectedSize(backupMetrics.getDeduplicated());
                                         backupToUpdate.setSize(backupMetrics.getSize());
                                     }
-                                } catch (BackrollApiException | IOException e) {
+                                } catch (BackrollHttpClientException e) {
                                     logger.error(e);
                                     throw new CloudRuntimeException("Failed to get backup metrics");
                                 }
@@ -211,7 +211,7 @@ private Map<VirtualMachine, Backup.Metric> getBackupMetrics(Long zoneId, List<Vi
                                     backupToUpdate.setProtectedSize(backupMetrics.getDeduplicated());
                                     backupToUpdate.setSize(backupMetrics.getSize());
                                 }
-                            } catch (BackrollApiException | IOException e) {
+                            } catch (BackrollHttpClientException e) {
                                 logger.error(e);
                                 throw new CloudRuntimeException("Failed to get backup metrics");
                             }
@@ -251,7 +251,7 @@ private Map<VirtualMachine, Backup.Metric> getBackupMetrics(Long zoneId, List<Vi
                 logger.debug("Metrics for VM [uuid: {}, name: {}] is [backup size: {}, data size: {}].", vm.getUuid(), vm.getInstanceName(), metric.getBackupSize(),
                         metric.getDataSize());
                 metrics.put(vm, metric);
-            } catch (BackrollApiException | IOException e) {
+            } catch (BackrollHttpClientException e) {
                 throw new CloudRuntimeException("Failed to retrieve backup metrics");
             }
         }
@@ -297,7 +297,7 @@ public Pair<Boolean, Backup> takeBackup(VirtualMachine vm, Boolean quiesceVM) {
 
             return new Pair<Boolean, Backup>(result, backup);
 
-        } catch (ParseException | BackrollApiException | IOException e) {
+        } catch (BackrollHttpClientException e) {
             logger.debug(e.getMessage());
             throw new CloudRuntimeException("Failed to take backup");
         }
@@ -330,7 +330,7 @@ public boolean deleteBackup(Backup backup, boolean forced) {
                         logger.debug("BACKROLL: Backup deletion for backup {} complete on backroll side.", backup.getUuid());
                         return deleteBackupInDb(backup);
                     }
-                } catch (BackrollHttpClientException | IOException e) {
+                } catch (BackrollHttpClientException e) {
                     logger.error(e);
                     throw new CloudRuntimeException("BACKROLL: Failed to delete backup");
                 }
@@ -354,7 +354,7 @@ private BackrollClient getClient(final Long zoneId) {
         try {
             if (backrollClient == null) {
                 logger.debug("backroll client null - instantiation of new one ");
-                BackrollHttpClientProvider provider = BackrollHttpClientProvider.createProvider(new BackrollHttpClientProvider(), BackrollUrlConfigKey.valueIn(zoneId),
+                BackrollHttpClient provider = BackrollHttpClient.createProvider(new BackrollHttpClient(), BackrollUrlConfigKey.valueIn(zoneId),
                         BackrollAppNameConfigKey.valueIn(zoneId), BackrollPasswordConfigKey.valueIn(zoneId), true, 300, 600);
                 backrollClient = new BackrollClient(provider);
             }
@@ -388,7 +388,7 @@ public List<RestorePoint> listRestorePoints(VirtualMachine vm) {
         try {
             final BackrollClient client = getClient(vm.getDataCenterId());
             return client.listRestorePoints(vm.getUuid());
-        } catch (BackrollApiException | IOException e) {
+        } catch (BackrollHttpClientException e) {
             logger.error(e);
             throw new CloudRuntimeException("Error while listing restore points");
         }
@@ -414,7 +414,7 @@ public Backup createNewBackupEntryForRestorePoint(RestorePoint restorePoint, Vir
                 backupToInsert.setProtectedSize(backupMetrics.getDeduplicated());
                 backupToInsert.setSize(backupMetrics.getSize());
             }
-        } catch (IOException | BackrollApiException e) {
+        } catch (BackrollHttpClientException e) {
             logger.error(e);
         }
 
diff --git a/plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/BackrollClient.java b/plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/BackrollClient.java
@@ -53,7 +53,7 @@ public class BackrollClient {
 
     private BackrollHttpClient backrollHttpClient;
 
-    public class BackrollClientException extends Exception {
+    public static class BackrollClientException extends Exception {
         public BackrollClientException(Throwable cause) {
             super(cause);
         }
diff --git a/plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/utils/BackrollHttpClient.java b/plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/utils/BackrollHttpClient.java
@@ -68,7 +68,7 @@ public class BackrollHttpClient {
 
     private Logger logger = LogManager.getLogger(BackrollClient.class);
 
-    public class BackrollHttpClientException extends Exception {
+    public static class BackrollHttpClientException extends Exception {
         public BackrollHttpClientException(Throwable cause) {
             super(cause);
         }
@@ -130,7 +130,7 @@ private void setRequestHeaders(HttpRequestBase request) {
         request.setHeader(HttpHeaders.AUTHORIZATION, "Bearer " + backrollToken);
     }
 
-    public class NotOkBodyException extends Exception {
+    public static class NotOkBodyException extends Exception {
     }
 
     public String okBody(final CloseableHttpResponse response) throws BackrollHttpClientException, NotOkBodyException {
@@ -204,7 +204,7 @@ private void login(final String appname, final String appsecret) throws Backroll
         }
     }
 
-    private boolean isAuthenticated() throws BackrollHttpClientException {
+    boolean isAuthenticated() throws BackrollHttpClientException {
         try {
             if (StringUtils.isEmpty(backrollToken)) {
                 logger.debug("isAuthenticated : token is empty : {}", backrollToken);
diff --git a/plugins/backup/backroll/src/test/java/org/apache/cloudstack/backup/BackrollBackupProviderTest.java b/plugins/backup/backroll/src/test/java/org/apache/cloudstack/backup/BackrollBackupProviderTest.java
@@ -26,6 +26,8 @@
 import org.apache.cloudstack.backup.backroll.BackrollClient;
 import org.apache.cloudstack.backup.backroll.model.BackrollBackupMetrics;
 import org.apache.cloudstack.backup.backroll.model.BackrollOffering;
+import org.apache.cloudstack.backup.backroll.utils.BackrollHttpClient;
+import org.apache.cloudstack.backup.backroll.utils.BackrollHttpClient.BackrollHttpClientException;
 import org.apache.cloudstack.backup.dao.BackupDao;
 import org.apache.cloudstack.framework.config.ConfigKey;
 import org.apache.logging.log4j.Logger;
@@ -83,14 +85,14 @@ public void setUp() throws Exception {
     }
 
     @Test
-    public void listBackupOfferings_Test() throws BackrollApiException, IOException {
+    public void listBackupOfferings_Test() throws BackrollHttpClientException, IOException {
         Mockito.doReturn(Arrays.asList(new BackrollOffering("dummyName", "dummyId"))).when(clientMock).getBackupOfferings();
         List<BackupOffering> results = backupProvider.listBackupOfferings(2L);
         assertTrue(results.size() == 1);
     }
 
     @Test
-    public void takeBackup_Test() throws BackrollApiException, IOException {
+    public void takeBackup_Test() throws BackrollHttpClientException, IOException {
 
         VMInstanceVO vmInstanceVO = new VMInstanceVO();
         vmInstanceVO.setInstanceName("test");
@@ -129,7 +131,7 @@ public void getConfigComponentName_Test() {
     }
 
     @Test
-    public void restoreVMFromBackupTrue_Test() throws BackrollApiException, IOException {
+    public void restoreVMFromBackupTrue_Test() throws BackrollHttpClientException, IOException {
         VMInstanceVO vmInstanceVO = new VMInstanceVO();
         vmInstanceVO.setDataCenterId(2l);
 
@@ -144,7 +146,7 @@ public void restoreVMFromBackupTrue_Test() throws BackrollApiException, IOExcept
     }
 
     @Test
-    public void restoreVMFromBackupFalse_Test() throws BackrollApiException, IOException {
+    public void restoreVMFromBackupFalse_Test() throws BackrollHttpClientException, IOException {
         VMInstanceVO vmInstanceVO = new VMInstanceVO();
         vmInstanceVO.setDataCenterId(2l);
 
@@ -203,7 +205,7 @@ public void getClient_Test() {
     }
 
     @Test
-    public void deleteBackupTestSuccess_Test() throws BackrollApiException, IOException {
+    public void deleteBackupTestSuccess_Test() throws BackrollHttpClientException, IOException {
         VMInstanceVO vmInstanceVO = new VMInstanceVO();
         vmInstanceVO.setInstanceName("test");
         vmInstanceVO.setDataCenterId(2l);
@@ -236,7 +238,7 @@ public void deleteBackupBackinUp_Test() {
     }
 
     @Test
-    public void listRestorePoints_Test() throws BackrollApiException, IOException {
+    public void listRestorePoints_Test() throws BackrollHttpClientException, IOException {
         List<RestorePoint> rps = Arrays.asList(new RestorePoint("rp1", new Date(), "incremental"), new RestorePoint("rp2", new Date(), "incremental"),
                 new RestorePoint("rp3", new Date(), "incremental"), new RestorePoint("rp4", new Date(), "incremental"));
 
@@ -254,7 +256,7 @@ public void listRestorePoints_Test() throws BackrollApiException, IOException {
     }
 
     @Test
-    public void createNewBackupEntryForRestorePoint_Test() throws BackrollApiException, IOException {
+    public void createNewBackupEntryForRestorePoint_Test() throws BackrollHttpClientException, IOException {
         RestorePoint restorePoint = new RestorePoint("restore-123", new Date(), "INCREMENTAL");
 
         VMInstanceVO vm = new VMInstanceVO();
@@ -293,7 +295,7 @@ public void createNewBackupEntryForRestorePoint_Test() throws BackrollApiExcepti
     }
 
     @Test
-    public void createNewBackupEntryForRestorePoint_WithMetric_Test() throws BackrollApiException, IOException {
+    public void createNewBackupEntryForRestorePoint_WithMetric_Test() throws BackrollHttpClientException, IOException {
         RestorePoint restorePoint = new RestorePoint("restore-789", new Date(), "INCREMENTAL");
 
         VMInstanceVO vm = new VMInstanceVO();
@@ -325,7 +327,7 @@ public void createNewBackupEntryForRestorePoint_WithMetric_Test() throws Backrol
     }
 
     @Test
-    public void createNewBackupEntryForRestorePoint_BackrollApiException_Test() throws BackrollApiException, IOException {
+    public void createNewBackupEntryForRestorePoint_BackrollHttpClientException_Test() throws BackrollHttpClientException, IOException {
 
         RestorePoint restorePoint = new RestorePoint("restore-404", new Date(), "INCREMENTAL");
 
@@ -336,13 +338,13 @@ public void createNewBackupEntryForRestorePoint_BackrollApiException_Test() thro
 
         Backup.Metric metric = null;
 
-        Mockito.doThrow(new BackrollApiException()).when(clientMock).getBackupMetrics(vm.getUuid(), restorePoint.getId());
+        Mockito.doThrow(new BackrollHttpClient.BackrollHttpClientException(new Exception())).when(clientMock).getBackupMetrics(vm.getUuid(), restorePoint.getId());
 
         // backupProvider.createNewBackupEntryForRestorePoint(restorePoint, vm, metric);
     }
 
     @Test
-    public void createNewBackupEntryForRestorePoint_IOException_Test() throws BackrollApiException, IOException {
+    public void createNewBackupEntryForRestorePoint_IOException_Test() throws BackrollHttpClientException, IOException {
 
         RestorePoint restorePoint = new RestorePoint("restore-500", new Date(), "INCREMENTAL");
 
diff --git a/plugins/backup/backroll/src/test/java/org/apache/cloudstack/backup/backroll/BackrollClientTest.java b/plugins/backup/backroll/src/test/java/org/apache/cloudstack/backup/backroll/BackrollClientTest.java
diff --git a/plugins/backup/backroll/src/test/java/org/apache/cloudstack/backup/backroll/utils/BackrollHttpClientTest.java b/plugins/backup/backroll/src/test/java/org/apache/cloudstack/backup/backroll/utils/BackrollHttpClientTest.java

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ public List<BackupOffering> listBackupOfferings(Long zoneId) {`
`102`	`102`
`103`	`103`	`logger.info("BackrollProvider: results " + (results.size() > 0 ? "> 0" : "<= 0"));`
`104`	`104`	`return results;`
`105`		`- } catch (ParseException \| BackrollApiException \| IOException e) {`
	`105`	`+ } catch (BackrollHttpClientException e) {`
`106`	`106`	`logger.info("BackrollProvider: catch erreur: {}", e);`
`107`	`107`	`throw new CloudRuntimeException("Failed to load backup offerings");`
`108`	`108`	`}`
`@@ -131,7 +131,7 @@ public boolean restoreVMFromBackup(VirtualMachine vm, Backup backup) {`
`131`	`131`
`132`	`132`	`try {`
`133`	`133`	`return getClient(vm.getDataCenterId()).restoreVMFromBackup(vm.getUuid(), getBackupName(backup));`
`134`		`- } catch (ParseException \| BackrollApiException \| IOException e) {`
	`134`	`+ } catch (BackrollHttpClientException e) {`
`135`	`135`	`throw new CloudRuntimeException("Failed to restore VM from Backup");`
`136`	`136`	`}`
`137`	`137`	`}`
`@@ -162,7 +162,7 @@ private Map<VirtualMachine, Backup.Metric> getBackupMetrics(Long zoneId, List<Vi`
`162`	`162`	`BackrollTaskStatus response;`
`163`	`163`	`try {`
`164`	`164`	`response = client.checkBackupTaskStatus(backup.getExternalId());`
`165`		`- } catch (ParseException \| BackrollApiException \| IOException e) {`
	`165`	`+ } catch (BackrollClientException e) {`
`166`	`166`	`logger.error(e);`
`167`	`167`	`throw new CloudRuntimeException("Failed to sync backups");`
`168`	`168`	`}`
`@@ -188,7 +188,7 @@ private Map<VirtualMachine, Backup.Metric> getBackupMetrics(Long zoneId, List<Vi`
`188`	`188`	`backupToUpdate.setProtectedSize(backupMetrics.getDeduplicated());`
`189`	`189`	`backupToUpdate.setSize(backupMetrics.getSize());`
`190`	`190`	`}`
`191`		`- } catch (BackrollApiException \| IOException e) {`
	`191`	`+ } catch (BackrollHttpClientException e) {`
`192`	`192`	`logger.error(e);`
`193`	`193`	`throw new CloudRuntimeException("Failed to get backup metrics");`
`194`	`194`	`}`
`@@ -211,7 +211,7 @@ private Map<VirtualMachine, Backup.Metric> getBackupMetrics(Long zoneId, List<Vi`
`211`	`211`	`backupToUpdate.setProtectedSize(backupMetrics.getDeduplicated());`
`212`	`212`	`backupToUpdate.setSize(backupMetrics.getSize());`
`213`	`213`	`}`
`214`		`- } catch (BackrollApiException \| IOException e) {`
	`214`	`+ } catch (BackrollHttpClientException e) {`
`215`	`215`	`logger.error(e);`
`216`	`216`	`throw new CloudRuntimeException("Failed to get backup metrics");`
`217`	`217`	`}`
`@@ -251,7 +251,7 @@ private Map<VirtualMachine, Backup.Metric> getBackupMetrics(Long zoneId, List<Vi`
`251`	`251`	`logger.debug("Metrics for VM [uuid: {}, name: {}] is [backup size: {}, data size: {}].", vm.getUuid(), vm.getInstanceName(), metric.getBackupSize(),`
`252`	`252`	`metric.getDataSize());`
`253`	`253`	`metrics.put(vm, metric);`
`254`		`- } catch (BackrollApiException \| IOException e) {`
	`254`	`+ } catch (BackrollHttpClientException e) {`
`255`	`255`	`throw new CloudRuntimeException("Failed to retrieve backup metrics");`
`256`	`256`	`}`
`257`	`257`	`}`
`@@ -297,7 +297,7 @@ public Pair<Boolean, Backup> takeBackup(VirtualMachine vm, Boolean quiesceVM) {`
`297`	`297`
`298`	`298`	`return new Pair<Boolean, Backup>(result, backup);`
`299`	`299`
`300`		`- } catch (ParseException \| BackrollApiException \| IOException e) {`
	`300`	`+ } catch (BackrollHttpClientException e) {`
`301`	`301`	`logger.debug(e.getMessage());`
`302`	`302`	`throw new CloudRuntimeException("Failed to take backup");`
`303`	`303`	`}`
`@@ -330,7 +330,7 @@ public boolean deleteBackup(Backup backup, boolean forced) {`
`330`	`330`	`logger.debug("BACKROLL: Backup deletion for backup {} complete on backroll side.", backup.getUuid());`
`331`	`331`	`return deleteBackupInDb(backup);`
`332`	`332`	`}`
`333`		`- } catch (BackrollHttpClientException \| IOException e) {`
	`333`	`+ } catch (BackrollHttpClientException e) {`
`334`	`334`	`logger.error(e);`
`335`	`335`	`throw new CloudRuntimeException("BACKROLL: Failed to delete backup");`
`336`	`336`	`}`
`@@ -354,7 +354,7 @@ private BackrollClient getClient(final Long zoneId) {`
`354`	`354`	`try {`
`355`	`355`	`if (backrollClient == null) {`
`356`	`356`	`logger.debug("backroll client null - instantiation of new one ");`
`357`		`- BackrollHttpClientProvider provider = BackrollHttpClientProvider.createProvider(new BackrollHttpClientProvider(), BackrollUrlConfigKey.valueIn(zoneId),`
	`357`	`+ BackrollHttpClient provider = BackrollHttpClient.createProvider(new BackrollHttpClient(), BackrollUrlConfigKey.valueIn(zoneId),`
`358`	`358`	`BackrollAppNameConfigKey.valueIn(zoneId), BackrollPasswordConfigKey.valueIn(zoneId), true, 300, 600);`
`359`	`359`	`backrollClient = new BackrollClient(provider);`
`360`	`360`	`}`
`@@ -388,7 +388,7 @@ public List<RestorePoint> listRestorePoints(VirtualMachine vm) {`
`388`	`388`	`try {`
`389`	`389`	`final BackrollClient client = getClient(vm.getDataCenterId());`
`390`	`390`	`return client.listRestorePoints(vm.getUuid());`
`391`		`- } catch (BackrollApiException \| IOException e) {`
	`391`	`+ } catch (BackrollHttpClientException e) {`
`392`	`392`	`logger.error(e);`
`393`	`393`	`throw new CloudRuntimeException("Error while listing restore points");`
`394`	`394`	`}`
`@@ -414,7 +414,7 @@ public Backup createNewBackupEntryForRestorePoint(RestorePoint restorePoint, Vir`
`414`	`414`	`backupToInsert.setProtectedSize(backupMetrics.getDeduplicated());`
`415`	`415`	`backupToInsert.setSize(backupMetrics.getSize());`
`416`	`416`	`}`
`417`		`- } catch (IOException \| BackrollApiException e) {`
	`417`	`+ } catch (BackrollHttpClientException e) {`
`418`	`418`	`logger.error(e);`
`419`	`419`	`}`
`420`	`420`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public class BackrollClient {`
`53`	`53`
`54`	`54`	`private BackrollHttpClient backrollHttpClient;`
`55`	`55`
`56`		`- public class BackrollClientException extends Exception {`
	`56`	`+ public static class BackrollClientException extends Exception {`
`57`	`57`	`public BackrollClientException(Throwable cause) {`
`58`	`58`	`super(cause);`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public class BackrollHttpClient {`
`68`	`68`
`69`	`69`	`private Logger logger = LogManager.getLogger(BackrollClient.class);`
`70`	`70`
`71`		`- public class BackrollHttpClientException extends Exception {`
	`71`	`+ public static class BackrollHttpClientException extends Exception {`
`72`	`72`	`public BackrollHttpClientException(Throwable cause) {`
`73`	`73`	`super(cause);`
`74`	`74`	`}`
`@@ -130,7 +130,7 @@ private void setRequestHeaders(HttpRequestBase request) {`
`130`	`130`	`request.setHeader(HttpHeaders.AUTHORIZATION, "Bearer " + backrollToken);`
`131`	`131`	`}`
`132`	`132`
`133`		`- public class NotOkBodyException extends Exception {`
	`133`	`+ public static class NotOkBodyException extends Exception {`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`public String okBody(final CloseableHttpResponse response) throws BackrollHttpClientException, NotOkBodyException {`
`@@ -204,7 +204,7 @@ private void login(final String appname, final String appsecret) throws Backroll`
`204`	`204`	`}`
`205`	`205`	`}`
`206`	`206`
`207`		`- private boolean isAuthenticated() throws BackrollHttpClientException {`
	`207`	`+ boolean isAuthenticated() throws BackrollHttpClientException {`
`208`	`208`	`try {`
`209`	`209`	`if (StringUtils.isEmpty(backrollToken)) {`
`210`	`210`	`logger.debug("isAuthenticated : token is empty : {}", backrollToken);`