PLF-5280 : Fix the violations found by Sonar - W-46