LPS-33680

Hey Victor,


these are the changes I made. Please follow this pattern and finish the coding and please also test and verify the solution before you sent the pull request back. A few additional comments:
- please rename the commit message to contains the proper LPS number (LPS-33680)
- please move the add finder method from the test commit to a separated commit before that one
- please add ALL the javadocs in the same separated commit

thanks,
Daniel