I changed two files to improve the sonar report. Here is the gerrit
https://gerrit.onap.org/r/#/c/25989/