changed ArrayList and HashSet...

sonar message:  Avoid using implementation types like 'ArrayList'; use the interface instead