Fix sonar issues champ
https://sonar.onap.org/project/issues?id=org.onap.aai%3Achamp&open=AWIFhmmPRGy6eclHC8nT&resolved=false&types=BUG