fixed LAST jenkins lint&PMD errors