Review IndexerMappingServiceImpl

Review comments from MR !650 (merged)