\Drupal calls should be avoided in classes, use dependency injection instead

Please review.

Please raise new MR.

Make the MR mergeable by updating fork. Please review.