From de85c66271ba75d86ed3f5528e1b39d49c0f15ef Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Thu, 27 Nov 2025 16:10:15 +0100 Subject: [PATCH] use upstream method for creating enums from strings --- .../datastore/api/VTreeMigrationInfo.java | 2 +- .../main/java/com/cloud/api/ApiDBUtils.java | 2 +- .../main/java/com/cloud/utils/EnumUtils.java | 26 ------------------- 3 files changed, 2 insertions(+), 28 deletions(-) diff --git a/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/api/VTreeMigrationInfo.java b/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/api/VTreeMigrationInfo.java index f4e926bfd33f..072b52b69d66 100644 --- a/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/api/VTreeMigrationInfo.java +++ b/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/api/VTreeMigrationInfo.java @@ -59,7 +59,7 @@ public MigrationStatus getMigrationStatus() { } 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) { diff --git a/server/src/main/java/com/cloud/api/ApiDBUtils.java b/server/src/main/java/com/cloud/api/ApiDBUtils.java index f7ffb0398019..57eeb63ea9f9 100644 --- a/server/src/main/java/com/cloud/api/ApiDBUtils.java +++ b/server/src/main/java/com/cloud/api/ApiDBUtils.java @@ -1767,7 +1767,7 @@ public static String findJobInstanceUuid(AsyncJob job) { return 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) { // when assert is hit, implement 'getInstanceId' of BaseAsyncCmd and return appropriate instance id diff --git a/utils/src/main/java/com/cloud/utils/EnumUtils.java b/utils/src/main/java/com/cloud/utils/EnumUtils.java index 380b595a0ad1..1af29066ef1b 100644 --- a/utils/src/main/java/com/cloud/utils/EnumUtils.java +++ b/utils/src/main/java/com/cloud/utils/EnumUtils.java @@ -29,30 +29,4 @@ public static String listValues(Enum[] enums) { b.append("]"); return b.toString(); } - - public static > T fromString(Class 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 fromString(Class clz, String value) { - assert (clz != null); - - if (value != null) { - try { - return Enum.valueOf(clz, value.trim()); - } catch (IllegalArgumentException ex) { - assert (false); - } - } - return null; - } }