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

Co-authored-by: Daan Hoogland <dahn@apache.org>

Author: 2 people

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

server/src/main/java/com/cloud/api/ApiDBUtils.java

@@ -1773,7 +1773,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

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