OPAL-2082: Fixed pmd warnings