(cloudstack) branch main updated: use upstream method for creating enums from strings (#12158)

[dahn]

This is an automated email from the ASF dual-hosted git repository.

dahn pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/main by this push:
     new f3a112fd9e7 use upstream method for creating enums from strings 
(#12158)
f3a112fd9e7 is described below

commit f3a112fd9e7437b6507434190083005824915ec8
Author: dahn <d...@onecht.net>
AuthorDate: Mon Dec 1 08:33:14 2025 +0100

    use upstream method for creating enums from strings (#12158)
    
    Co-authored-by: Daan Hoogland <d...@apache.org>
---
 .../storage/datastore/api/VTreeMigrationInfo.java  |  2 +-
 server/src/main/java/com/cloud/api/ApiDBUtils.java |  2 +-
 utils/src/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 f4e926bfd33..072b52b69d6 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 class VTreeMigrationInfo {
     }
 
     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 f7ffb039801..57eeb63ea9f 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 class ApiDBUtils {
             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 380b595a0ad..1af29066ef1 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 class EnumUtils extends 
org.apache.commons.lang3.EnumUtils {
         b.append("]");
         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;
-    }
 }