Merge "Fixed sonar fix in DataSourceWrap.java"