Merge "fixed sonar issues in CachedDataSourceFactory"