Merge "fixed sonar issue in ObjectFactory.java"