From e4b212f30ef00a779fcad13aa35067d696601d6b Mon Sep 17 00:00:00 2001 From: Matthias Dhellin Date: Mon, 7 Oct 2024 17:17:17 +0200 Subject: [PATCH] Extracted string constants --- .../backup/backroll/BackrollClient.java | 17 +++++++++-------- .../backroll/model/response/TaskState.java | 7 +++++++ ...tateResponse.java => TaskStateResponse.java} | 2 +- 3 files changed, 17 insertions(+), 9 deletions(-) create mode 100644 plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/model/response/TaskState.java rename plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/model/response/{StateResponse.java => TaskStateResponse.java} (96%) 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 index 2634dcd13d5..fe462830853 100644 --- 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 @@ -39,7 +39,8 @@ import org.apache.cloudstack.backup.backroll.model.BackrollOffering; import org.apache.cloudstack.backup.backroll.model.BackrollTaskStatus; import org.apache.cloudstack.backup.backroll.model.BackrollVmBackup; import org.apache.cloudstack.backup.backroll.model.response.BackrollTaskRequestResponse; -import org.apache.cloudstack.backup.backroll.model.response.StateResponse; +import org.apache.cloudstack.backup.backroll.model.response.TaskState; +import org.apache.cloudstack.backup.backroll.model.response.TaskStateResponse; import org.apache.cloudstack.backup.backroll.model.response.api.LoginApiResponse; import org.apache.cloudstack.backup.backroll.model.response.archive.BackrollArchiveResponse; import org.apache.cloudstack.backup.backroll.model.response.archive.BackrollBackupsFromVMResponse; @@ -206,9 +207,9 @@ public class BackrollClient { post(String.format("/tasks/restore/%s", vmId), jsonBody))).location .replace("/api/v1", ""); - StateResponse response = waitGet(urlToRequest); + TaskStateResponse response = waitGet(urlToRequest); LOG.debug("RESTORE {}", response.state); - return response.state.equals("SUCCESS"); + return response.state.equals(TaskState.SUCCESS); } catch (final NotOkBodyException e) { return false; } catch (final IOException | InterruptedException e) { @@ -227,7 +228,7 @@ public class BackrollClient { String body = okBody(get("/status/" + taskId)); - if (body.contains("FAILURE") || body.contains("PENDING")) { + if (body.contains(TaskState.FAILURE) || body.contains(TaskState.PENDING)) { BackrollBackupStatusResponse backupStatusRequestResponse = parse(body); status.setState(backupStatusRequestResponse.state); } else { @@ -261,7 +262,7 @@ public class BackrollClient { BackrollBackupsFromVMResponse backrollBackupsFromVMResponse = waitGet(urlToRequest); LOG.debug(backrollBackupsFromVMResponse.state); - return backrollBackupsFromVMResponse.state.equals("SUCCESS"); + return backrollBackupsFromVMResponse.state.equals(TaskState.SUCCESS); } catch (final NotOkBodyException e) { return false; } catch (final Exception e) { @@ -286,7 +287,7 @@ public class BackrollClient { BackrollVmMetricsResponse vmMetricsResponse = waitGet(urlToRequest); if (vmMetricsResponse != null) { - if (vmMetricsResponse.state.equals("SUCCESS")) { + if (vmMetricsResponse.state.equals(TaskState.SUCCESS)) { LOG.debug("SUCCESS ok"); if (vmMetricsResponse.infos != null) { if (vmMetricsResponse.infos.cache != null) { @@ -345,7 +346,7 @@ public class BackrollClient { VirtualMachineBackupsResponse response = waitGet(urlToRequest); - if (response.state.equals("SUCCESS")) { + if (response.state.equals(TaskState.SUCCESS)) { if (response.info.archives.size() > 0) { for (BackupInfos infos : response.info.archives) { var dateStart = new DateTime(infos.start); @@ -445,7 +446,7 @@ public class BackrollClient { for (int attempt = 1; attempt <= maxAttempts; attempt++) { try { String body = okBody(get(url)); - if (!body.contains("PENDING")) { + if (!body.contains(TaskState.PENDING)) { return parse(body); } } catch (final NotOkBodyException e) { diff --git a/plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/model/response/TaskState.java b/plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/model/response/TaskState.java new file mode 100644 index 00000000000..e934b2ba621 --- /dev/null +++ b/plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/model/response/TaskState.java @@ -0,0 +1,7 @@ +package org.apache.cloudstack.backup.backroll.model.response; + +public class TaskState { + public static final String PENDING = "PENDING"; + public static final String FAILURE = "FAILURE"; + public static final String SUCCESS = "SUCCESS"; +} diff --git a/plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/model/response/StateResponse.java b/plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/model/response/TaskStateResponse.java similarity index 96% rename from plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/model/response/StateResponse.java rename to plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/model/response/TaskStateResponse.java index 67694eac932..10bd25d9803 100644 --- a/plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/model/response/StateResponse.java +++ b/plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/model/response/TaskStateResponse.java @@ -18,7 +18,7 @@ package org.apache.cloudstack.backup.backroll.model.response; import com.fasterxml.jackson.annotation.JsonProperty; -public class StateResponse { +public class TaskStateResponse { @JsonProperty("state") public String state; }