ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve equals generation for jvpp DTOs

Browse Source 
Variable 'other' is no longer defined in equals method
of DTOs without defined fileds.
Fixes dead local store coverity issues.

Change-Id: I69eddf2b4b3f433149ff4d49e49c46515572d61a
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
This commit is contained in:
Marek Gradzki
2016-10-25 07:57:30 +02:00
committed by Damjan Marion
parent 5b3808ed63
commit af0c70cf76
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
vpp-api/java/jvpp/gen/jvppgen/dto_gen.py
View File

@ -150,7 +150,9 @@ def generate_dto_tostring(camel_case_dto_name, func):
return tostring_template.substitute(cls_name=camel_case_dto_name,
fields_tostring=tostring_fields[:-8])
equals_other_template = Template("""
final $cls_name other = ($cls_name) o;
\n""")
equals_field_template = Template(""" if (!java.util.Objects.equals(this.$field_name, other.$field_name)) {
return false;
}\n""")
@ -165,9 +167,6 @@ equals_template = Template(""" @Override
if (o == null || getClass() != o.getClass()) {
return false;
}
final $cls_name other = ($cls_name) o;
$comparisons
return true;
}\n\n""")
@ -187,8 +186,10 @@ def generate_dto_equals(camel_case_dto_name, func):
else:
equals_fields += equals_field_template.substitute(field_name=field_name)
return equals_template.substitute(cls_name=camel_case_dto_name,
comparisons=equals_fields)
if equals_fields != "":
equals_fields = equals_other_template.substitute(cls_name=camel_case_dto_name) + equals_fields
return equals_template.substitute(comparisons=equals_fields)
hash_template = Template(""" @Override