Fixing sonar quality issues

Sonarqube analysis has reported multiple code smells in the file service code.