LPS-43812 Refactor and remove duplicate code

This is not perfect at all, since the helper bean need to be passed the
request to perform its job. Nevertheless this is better than the
previous state since we removed all the duplication and prepares the way
to a better refactorization.
LPS-43812 SF