OPAL-2118: Fixed PMD warnings