refactored gerrit adpater