Skip to content

Commit

Permalink
tmpl: Fix template fixed variable name in validateParam() (#104)
Browse files Browse the repository at this point in the history 
If there are multiple fields of string type present in one typeModel,
all those fields will use the same variable name `value` in generated code,
cause compile failure. So instead, we define variable name extracted from
get/set{{Field}} and use it around.
  • Loading branch information
@owarai
owarai authored Nov 12, 2020
1 parent d39bb78 commit 640c55d
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 39 deletions.
30 changes: 15 additions & 15 deletions src/main/java/com/qingstor/sdk/service/Bucket.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1430,12 +1430,12 @@ public String validateParam() {
String[] typeValidValues = {"website", "normal"};

boolean typeIsValid = false;
String value = this.getType();
if (null == value || "".equals(value)) {
String type = this.getType();
if (null == type || "".equals(type)) {
typeIsValid = true;
} else {
for (String v : typeValidValues) {
if (v.equals(value)) {
if (v.equals(type)) {
typeIsValid = true;
}
}
Expand Down Expand Up @@ -3534,12 +3534,12 @@ public String validateParam() {
String[] typeValidValues = {"normal", "website"};

boolean typeIsValid = false;
String value = this.getType();
if (null == value || "".equals(value)) {
String type = this.getType();
if (null == type || "".equals(type)) {
typeIsValid = true;
} else {
for (String v : typeValidValues) {
if (v.equals(value)) {
if (v.equals(type)) {
typeIsValid = true;
}
}
Expand Down Expand Up @@ -5061,12 +5061,12 @@ public String validateParam() {
String[] xQSStorageClassValidValues = {"STANDARD", "STANDARD_IA"};

boolean xQSStorageClassIsValid = false;
String value = this.getXQSStorageClass();
if (null == value || "".equals(value)) {
String xQSStorageClass = this.getXQSStorageClass();
if (null == xQSStorageClass || "".equals(xQSStorageClass)) {
xQSStorageClassIsValid = true;
} else {
for (String v : xQSStorageClassValidValues) {
if (v.equals(value)) {
if (v.equals(xQSStorageClass)) {
xQSStorageClassIsValid = true;
}
}
Expand Down Expand Up @@ -7032,12 +7032,12 @@ public String validateParam() {
String[] xQSStorageClassValidValues = {"STANDARD", "STANDARD_IA"};

boolean xQSStorageClassIsValid = false;
String value = this.getXQSStorageClass();
if (null == value || "".equals(value)) {
String xQSStorageClass = this.getXQSStorageClass();
if (null == xQSStorageClass || "".equals(xQSStorageClass)) {
xQSStorageClassIsValid = true;
} else {
for (String v : xQSStorageClassValidValues) {
if (v.equals(value)) {
if (v.equals(xQSStorageClass)) {
xQSStorageClassIsValid = true;
}
}
Expand Down Expand Up @@ -8056,12 +8056,12 @@ public String validateParam() {
String[] xQSStorageClassValidValues = {"STANDARD", "STANDARD_IA"};

boolean xQSStorageClassIsValid = false;
String value = this.getXQSStorageClass();
if (null == value || "".equals(value)) {
String xQSStorageClass = this.getXQSStorageClass();
if (null == xQSStorageClass || "".equals(xQSStorageClass)) {
xQSStorageClassIsValid = true;
} else {
for (String v : xQSStorageClassValidValues) {
if (v.equals(value)) {
if (v.equals(xQSStorageClass)) {
xQSStorageClassIsValid = true;
}
}
Expand Down
42 changes: 21 additions & 21 deletions src/main/java/com/qingstor/sdk/service/Types.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,12 +97,12 @@ public String validateParam() {
String[] permissionValidValues = {"READ", "WRITE", "FULL_CONTROL"};

boolean permissionIsValid = false;
String value = this.getPermission();
if (null == value || "".equals(value)) {
String permission = this.getPermission();
if (null == permission || "".equals(permission)) {
permissionIsValid = true;
} else {
for (String v : permissionValidValues) {
if (v.equals(value)) {
if (v.equals(permission)) {
permissionIsValid = true;
}
}
Expand Down Expand Up @@ -271,12 +271,12 @@ public String validateParam() {
String[] typeValidValues = {"normal", "website"};

boolean typeIsValid = false;
String value = this.getType();
if (null == value || "".equals(value)) {
String type = this.getType();
if (null == type || "".equals(type)) {
typeIsValid = true;
} else {
for (String v : typeValidValues) {
if (v.equals(value)) {
if (v.equals(type)) {
typeIsValid = true;
}
}
Expand Down Expand Up @@ -340,12 +340,12 @@ public String validateParam() {
String[] typeValidValues = {"normal", "website"};

boolean typeIsValid = false;
String value = this.getType();
if (null == value || "".equals(value)) {
String type = this.getType();
if (null == type || "".equals(type)) {
typeIsValid = true;
} else {
for (String v : typeValidValues) {
if (v.equals(value)) {
if (v.equals(type)) {
typeIsValid = true;
}
}
Expand Down Expand Up @@ -666,12 +666,12 @@ public String validateParam() {
String[] typeValidValues = {"user", "group"};

boolean typeIsValid = false;
String value = this.getType();
if (null == value || "".equals(value)) {
String type = this.getType();
if (null == type || "".equals(type)) {
typeIsValid = true;
} else {
for (String v : typeValidValues) {
if (v.equals(value)) {
if (v.equals(type)) {
typeIsValid = true;
}
}
Expand Down Expand Up @@ -1023,12 +1023,12 @@ public String validateParam() {
String[] cloudfuncValidValues = {"tupu-porn", "notifier", "image"};

boolean cloudfuncIsValid = false;
String value = this.getCloudfunc();
if (null == value || "".equals(value)) {
String cloudfunc = this.getCloudfunc();
if (null == cloudfunc || "".equals(cloudfunc)) {
cloudfuncIsValid = true;
} else {
for (String v : cloudfuncValidValues) {
if (v.equals(value)) {
if (v.equals(cloudfunc)) {
cloudfuncIsValid = true;
}
}
Expand Down Expand Up @@ -1251,12 +1251,12 @@ public String validateParam() {
String[] statusValidValues = {"enabled", "disabled"};

boolean statusIsValid = false;
String value = this.getStatus();
if (null == value || "".equals(value)) {
String status = this.getStatus();
if (null == status || "".equals(status)) {
statusIsValid = true;
} else {
for (String v : statusValidValues) {
if (v.equals(value)) {
if (v.equals(status)) {
statusIsValid = true;
}
}
Expand Down Expand Up @@ -1363,12 +1363,12 @@ public String validateParam() {
String[] effectValidValues = {"allow", "deny"};

boolean effectIsValid = false;
String value = this.getEffect();
if (null == value || "".equals(value)) {
String effect = this.getEffect();
if (null == effect || "".equals(effect)) {
effectIsValid = true;
} else {
for (String v : effectValidValues) {
if (v.equals(value)) {
if (v.equals(effect)) {
effectIsValid = true;
}
}
Expand Down
7 changes: 4 additions & 3 deletions template/shared.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,13 @@
};

boolean {{$property.ID | camelCase | lowerFirst}}IsValid = false;
String value = this.get{{$property.ID | camelCase}}();
if (null == value || "".equals(value)) {
{{- $strValue := $property.ID | camelCase | lowerFirst -}}
String {{$strValue}} = this.get{{$property.ID | camelCase}}();
if (null == {{$strValue}} || "".equals({{$strValue}})) {
{{$property.ID | camelCase | lowerFirst}}IsValid = true;
} else {
for(String v : {{$property.ID | camelCase | lowerFirst}}ValidValues) {
if(v.equals(value)){
if(v.equals({{$strValue}})){
{{$property.ID | camelCase | lowerFirst}}IsValid = true;
}
}
Expand Down

0 comments on commit 640c55d

Please sign in to comment.