apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-12-16 10:32:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

use upstream method for creating enums from strings (#12158)

Browse Source 
Co-authored-by: Daan Hoogland <dahn@apache.org>
This commit is contained in:
dahn 2025-12-01 08:33:14 +01:00 committed by GitHub
parent db6147060b
commit f3a112fd9e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 2 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/api/VTreeMigrationInfo.java
View File

@ -59,7 +59,7 @@ public class VTreeMigrationInfo {
} }
public void setMigrationStatus(String migrationStatus) { public void setMigrationStatus(String migrationStatus) {
this.migrationStatus = EnumUtils.fromString(MigrationStatus.class, migrationStatus, MigrationStatus.None); this.migrationStatus = EnumUtils.getEnumIgnoreCase(MigrationStatus.class, migrationStatus, MigrationStatus.None);
} }
public void setMigrationStatus(MigrationStatus migrationStatus) { public void setMigrationStatus(MigrationStatus migrationStatus) {

2
server/src/main/java/com/cloud/api/ApiDBUtils.java
View File

@ -1767,7 +1767,7 @@ public class ApiDBUtils {
return null; return null;
} }
String jobInstanceId = null; String jobInstanceId = null;
ApiCommandResourceType jobInstanceType = EnumUtils.fromString(ApiCommandResourceType.class, job.getInstanceType(), ApiCommandResourceType.None); ApiCommandResourceType jobInstanceType = EnumUtils.getEnumIgnoreCase(ApiCommandResourceType.class, job.getInstanceType(), ApiCommandResourceType.None);
if (job.getInstanceId() == null) { if (job.getInstanceId() == null) {
// when assert is hit, implement 'getInstanceId' of BaseAsyncCmd and return appropriate instance id // when assert is hit, implement 'getInstanceId' of BaseAsyncCmd and return appropriate instance id

26
utils/src/main/java/com/cloud/utils/EnumUtils.java
View File

@ -29,30 +29,4 @@ public class EnumUtils extends org.apache.commons.lang3.EnumUtils {
b.append("]"); b.append("]");
return b.toString(); return b.toString();
} }
public static <T extends Enum<T>> T fromString(Class<T> clz, String value, T defaultVal) {
assert (clz != null);
if (value != null) {
try {
return Enum.valueOf(clz, value.trim());
} catch (IllegalArgumentException ex) {
assert (false);
}
}
return defaultVal;
}
public static <T extends Enum<T>> T fromString(Class<T> clz, String value) {
assert (clz != null);
if (value != null) {
try {
return Enum.valueOf(clz, value.trim());
} catch (IllegalArgumentException ex) {
assert (false);
}
}
return null;
}
} }