OPAL-1662: Fixed PMD warnings