OPAL-2077: Fixing PMD warnings