fixed jenkins lint&PMD errors