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

Please review MR.

Thank you.

Automatically closed - issue fixed for 2 weeks with no activity.