sonar fixes in MRClientFactory.java