Service cleanup

Author: jekuaitk

os2web_key.services.yml

@@ -3,30 +3,12 @@ services:
     parent: logger.channel_base
     arguments: [ 'os2web_key' ]
 
-  os2web_key.key_helper:
-    class: 'Drupal\os2web_key\KeyHelper'
+  Drupal\os2web_key\KeyHelper:
+    autowire: true
     arguments:
-      - '@logger.channel.os2web_key'
+      $logger: '@logger.channel.os2web_key'
 
-  os2web_key.certificate_key_type:
-    class: 'Drupal\os2web_key\Plugin\KeyType\CertificateKeyType'
+  Drupal\os2web_key\Services\Psr16CacheAdapter:
+    autowire: true
     arguments:
-      - '@os2web_key.key_helper'
-
-  os2web_key.psr16_cache:
-    class: 'Drupal\os2web_key\Services\Psr16CacheAdapter'
-    arguments:
-      - '@cache.default'
-
-  os2web_key.certificate_helper:
-    class: 'Drupal\os2web_key\Services\VaultCertificateHelper'
-    arguments:
-      - '@file_system'
-
-  os2web_key.key_provider:
-    class: 'Drupal\os2web_key\Plugin\KeyProvider\VaultKeyProvider'
-    arguments:
-      - '@logger.channel.os2web_key'
-      - '@http_client'
-      - '@os2web_key.psr16_cache'
-      - '@os2web_key.key_helper'
+      $cacheBackend: '@cache.default'

src/Plugin/KeyProvider/VaultKeyProvider.php

@@ -9,6 +9,7 @@
 use Drupal\key\Plugin\KeyPluginFormInterface;
 use Drupal\key\Plugin\KeyProviderBase;
 use Drupal\os2web_key\KeyHelper;
+use Drupal\os2web_key\Services\Psr16CacheAdapter;
 use Drupal\os2web_key\Plugin\KeyType\CertificateKeyType;
 use GuzzleHttp\Psr7\HttpFactory;
 use ItkDev\Vault\Exception\UnknownErrorException;
@@ -78,8 +79,8 @@ public static function create(ContainerInterface $container, array $configuratio
       $plugin_definition,
       $container->get('logger.channel.default'),
       $container->get('http_client'),
-      $container->get('os2web_key.psr16_cache'),
-      $container->get('os2web_key.key_helper'),
+      $container->get(Psr16CacheAdapter::class),
+      $container->get(KeyHelper::class),
     );
   }
 

src/Plugin/KeyType/CertificateKeyType.php

@@ -56,7 +56,7 @@ public static function create(ContainerInterface $container, array $configuratio
       $configuration,
       $plugin_id,
       $plugin_definition,
-      $container->get('os2web_key.key_helper')
+      $container->get(KeyHelper::class)
     );
   }
 

src/Services/Psr16CacheAdapter.php

@@ -10,21 +10,13 @@
  */
 class Psr16CacheAdapter implements CacheInterface {
 
-  /**
-   * The Drupal cache backend.
-   *
-   * @var \Drupal\Core\Cache\CacheBackendInterface
-   */
-  protected CacheBackendInterface $cacheBackend;
-
   /**
    * Constructs a new Psr16CacheAdapter.
    *
    * @param \Drupal\Core\Cache\CacheBackendInterface $cacheBackend
    *   The Drupal cache backend.
    */
-  public function __construct(CacheBackendInterface $cacheBackend) {
-    $this->cacheBackend = $cacheBackend;
+  public function __construct(private readonly CacheBackendInterface $cacheBackend) {
   }
 
   /**