Factories refactor
Refactor in Factory classes:
- add FactoryHelper class and move common parts to it
- organize factories in new package
- refactor switch/cases to meet newer Java standard
Gitlab CC Testing
Refactor in Factory classes:
Gitlab CC Testing