PLF-5549 : Fix the violations found by Sonar - W-47