Use proper service

modules/thunder_gqls/src/Plugin/GraphQL/DataProducer/ThunderSearchApiProducerBase.php

@@ -38,9 +38,9 @@ abstract class ThunderSearchApiProducerBase extends DataProducerPluginBase imple
   /**
    * The class resolver service.
    *
-   * @var \Drupal\Core\DependencyInjection\ClassResolverInterface
+   * @var \Drupal\thunder_gqls\Wrappers\SearchApiResponse
    */
-  private ClassResolverInterface $classResolver;
+  private SearchApiResponse $responseWrapper;
 
   /**
    * {@inheritdoc}
@@ -59,7 +59,7 @@ public static function create(
 
     $instance->setEntityTypeManager($container->get('entity_type.manager'));
     $instance->setLanguageManager($container->get('language_manager'));
-    $instance->setClassResolver($container->get('class_resolver'));
+    $instance->setResponseWrapper($container->get('thunder_gqls.search_api_response'));
 
     return $instance;
   }
@@ -70,7 +70,7 @@ public static function create(
    * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entityTypeManager
    *   The entity type manager service.
    */
-  public function setEntityTypeManager(EntityTypeManagerInterface $entityTypeManager): void {
+  private function setEntityTypeManager(EntityTypeManagerInterface $entityTypeManager): void {
     $this->entityTypeManager = $entityTypeManager;
   }
 
@@ -80,18 +80,18 @@ public function setEntityTypeManager(EntityTypeManagerInterface $entityTypeManag
    * @param \Drupal\Core\Language\LanguageManagerInterface $languageManager
    *   The language manager service.
    */
-  public function setLanguageManager(LanguageManagerInterface $languageManager): void {
+  private function setLanguageManager(LanguageManagerInterface $languageManager): void {
     $this->languageManager = $languageManager;
   }
 
   /**
    * Set the class resolver service.
    *
-   * @param \Drupal\Core\DependencyInjection\ClassResolverInterface $classResolver
+   * @param \Drupal\thunder_gqls\Wrappers\SearchApiResponse $responseWrapper
    *   The class resolver service.
    */
-  public function setClassResolver(ClassResolverInterface $classResolver): void {
-    $this->classResolver = $classResolver;
+  private function setResponseWrapper(SearchApiResponse $responseWrapper): void {
+    $this->responseWrapper = $responseWrapper;
   }
 
   /**
@@ -178,9 +178,7 @@ protected function buildBaseQuery(
    *   The search api response.
    */
   protected function searchApiResponse(QueryInterface $query): SearchApiResponse {
-    return $this->classResolver
-      ->getInstanceFromDefinition(SearchApiResponse::class)
-      ->setQuery($query);
+    return $this->responseWrapper->setQuery($query);
   }
 
 }

modules/thunder_gqls/src/Wrappers/EntityListResponse.php

@@ -18,7 +18,7 @@ class EntityListResponse implements EntityListResponseInterface, ContainerInject
    *
    * @var \Drupal\Core\Entity\Query\QueryInterface
    */
-  protected QueryInterface $query;
+  private QueryInterface $query;
 
   /**
    * The entity buffer.
@@ -34,6 +34,7 @@ class EntityListResponse implements EntityListResponseInterface, ContainerInject
    */
   public function __construct(QueryInterface|EntityBuffer $parameter) {
     if ($parameter instanceof QueryInterface) {
+      @trigger_error('Calling the constructor with the query parameter is deprecated. Use service injection instead of directly instantiating and then use ::setQuery() instead.', E_USER_DEPRECATED);
       $this->setQuery($parameter);
       return;
     }

modules/thunder_gqls/src/Wrappers/SearchApiResponse.php

@@ -30,7 +30,7 @@ class SearchApiResponse implements SearchApiResponseInterface, ContainerInjectio
    *
    * @var \Drupal\search_api\Query\ResultSetInterface|null
    */
-  protected ?ResultSetInterface $result;
+  protected ?ResultSetInterface $result = NULL;
 
   /**
    * Array of Facets.
@@ -62,7 +62,6 @@ class SearchApiResponse implements SearchApiResponseInterface, ContainerInjectio
    *   The entity type manager.
    */
   public function __construct(protected SearchApiResultBuffer $buffer, protected EntityFieldManagerInterface $entityFieldManager) {
-    $this->result = NULL;
   }
 
   /**

modules/thunder_gqls/thunder_gqls.services.yml

@@ -3,3 +3,6 @@ services:
     autowire: true
   thunder_gqls.buffer.search_api_result:
     class: Drupal\thunder_gqls\GraphQL\Buffers\SearchApiResultBuffer
+  Drupal\thunder_gqls\GraphQL\Buffers\SearchApiResultBuffer: '@thunder_gqls.buffer.search_api_result'
+  thunder_gqls.search_api_response:
+    class: Drupal\thunder_gqls\Wrappers\SearchApiResponse