OPAL-2265: Fixing pmd warnings