Skip to content

Cleanup of EnumUtils by using upstream method for creating values from strings #12158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 1, 2025
+2 −28
Merged

Cleanup of EnumUtils by using upstream method for creating values from strings #12158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...scaleio/src/main/java/org/apache/cloudstack/storage/datastore/api/VTreeMigrationInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/java/com/cloud/api/ApiDBUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
26 changes: 0 additions & 26 deletions utils/src/main/java/com/cloud/utils/EnumUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Loading