Refactoring in FileService

Refactoring in FileService
Fix FileService tests

Fix FileService tests
Refresh mock data on FileService Tests

Refresh mock data on FileService Tests
FileService cleanup

FileService cleanup
Merge pull request #1443 from CarlosManias/java-refactor-entitylists-fileservice

Java refactor entitylists fileservice