Fixing sonar issues in whole file
https://sonar.onap.org/project/issues?id=org.onap.appc%3Aappc&moduleUuids=AWBUki9h-08if2a6vSa6&resolved=false