OPAL-1583: Fixed PMD warning, overly long method
Merge pull request #67 from emorency/master

OPAL-1583: Fixed PMD warning