Revert "BS-11338 : Sonar : Reduce complexity"

This reverts commit a0591bf6b7de7439e4a82729b834007d176465e1.