Fix sonar issues champ
https://sonar.onap.org/project/issues?fileUuids=AV7LN38LWvyQfiQiNDri&id=org.onap.aai.aai-common%3Aaai-common&open=AWJxdlIFRGy6eclHFFU4&resolved=false
https://sonar.onap.org/project/issues?fileUuids=AV7LN38LWvyQfiQiNDri&id=org.onap.aai.aai-common%3Aaai-common&open=AV7LN4OzWvyQfiQiND02&resolved=false