PLF-5606:Fix the violations found by Sonar - W01