BugFix ArrayList to List (sonar bugs)