etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Extracted string constants

This commit is contained in:
Matthias Dhellin 2024-10-07 17:17:17 +02:00
parent 63bdc0ffa2
commit e4b212f30e
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/BackrollClient.java
View File

@ -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) {

7
plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/model/response/TaskState.java Normal file
View File

@ -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";
}

2
plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/model/response/StateResponse.java → plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/model/response/TaskStateResponse.java
View File

@ -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;
}