JDF-55 Apply fixes for Sonar rules