Fix blocker and critical sonar issues:
https://sonar.onap.org/project/issues?id=org.onap.dcaegen2.services.mapper%3Amapper&resolved=false&types=BUG