Skip to content

Commit b90542f

Browse files
Srivastava, PiyushSrivastava, Piyush
authored andcommitted
bugfix/CSTACKEX-169: Fix enum case sensitive issues
1 parent 44d12e2 commit b90542f

2 files changed

Lines changed: 16 additions & 3 deletions

File tree

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/ExportRule.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,11 @@
1919

2020
package org.apache.cloudstack.storage.feign.model;
2121

22+
import com.fasterxml.jackson.annotation.JsonCreator;
2223
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
2324
import com.fasterxml.jackson.annotation.JsonInclude;
2425
import com.fasterxml.jackson.annotation.JsonProperty;
26+
import com.fasterxml.jackson.annotation.JsonValue;
2527
import java.util.List;
2628

2729
/**
@@ -54,6 +56,7 @@ public enum ProtocolsEnum {
5456
this.value = value;
5557
}
5658

59+
@JsonValue
5760
public String getValue() {
5861
return value;
5962
}
@@ -63,9 +66,11 @@ public String toString() {
6366
return String.valueOf(value);
6467
}
6568

69+
@JsonCreator
6670
public static ProtocolsEnum fromValue(String text) {
71+
if (text == null) return null;
6772
for (ProtocolsEnum b : ProtocolsEnum.values()) {
68-
if (String.valueOf(b.value).equals(text)) {
73+
if (b.value.equalsIgnoreCase(text)) {
6974
return b;
7075
}
7176
}

plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/Igroup.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,11 @@
1919

2020
package org.apache.cloudstack.storage.feign.model;
2121

22+
import com.fasterxml.jackson.annotation.JsonCreator;
2223
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
2324
import com.fasterxml.jackson.annotation.JsonInclude;
2425
import com.fasterxml.jackson.annotation.JsonProperty;
26+
import com.fasterxml.jackson.annotation.JsonValue;
2527

2628
import java.util.List;
2729
import java.util.Objects;
@@ -71,6 +73,7 @@ public enum OsTypeEnum {
7173
this.value = value;
7274
}
7375

76+
@JsonValue
7477
public String getValue() {
7578
return value;
7679
}
@@ -80,9 +83,11 @@ public String toString() {
8083
return String.valueOf(value);
8184
}
8285

86+
@JsonCreator
8387
public static OsTypeEnum fromValue(String text) {
88+
if (text == null) return null;
8489
for (OsTypeEnum b : OsTypeEnum.values()) {
85-
if (String.valueOf(b.value).equals(text)) {
90+
if (b.value.equalsIgnoreCase(text)) {
8691
return b;
8792
}
8893
}
@@ -122,6 +127,7 @@ public enum ProtocolEnum {
122127
this.value = value;
123128
}
124129

130+
@JsonValue
125131
public String getValue() {
126132
return value;
127133
}
@@ -131,9 +137,11 @@ public String toString() {
131137
return String.valueOf(value);
132138
}
133139

140+
@JsonCreator
134141
public static ProtocolEnum fromValue(String text) {
142+
if (text == null) return null;
135143
for (ProtocolEnum b : ProtocolEnum.values()) {
136-
if (String.valueOf(b.value).equals(text)) {
144+
if (b.value.equalsIgnoreCase(text)) {
137145
return b;
138146
}
139147
}

0 commit comments

Comments
 (0)