Switch from AnnotatedClassDiscovery to ViewsDiscovery.

lib/Drupal/views/Plugin/Type/ArgumentDefaultPluginManager.php

@@ -9,12 +9,11 @@
 
 use Drupal\Component\Plugin\PluginManagerBase;
 use Drupal\Component\Plugin\Factory\DefaultFactory;
-use Drupal\Core\Plugin\Discovery\AnnotatedClassDiscovery;
-
+use Drupal\views\Plugin\Discovery\ViewsDiscovery;
 
 class ArgumentDefaultPluginManager extends PluginManagerBase {
   public function __construct() {
-    $this->discovery = new AnnotatedClassDiscovery('views', 'argument_default');
+    $this->discovery = new ViewsDiscovery('views', 'argument_default');
     $this->factory = new DefaultFactory($this->discovery);
   }
 }

lib/Drupal/views/Plugin/Type/ArgumentValidatorPluginManager.php

@@ -10,11 +10,10 @@
 use Drupal\Component\Plugin\PluginManagerBase;
 use Drupal\Component\Plugin\Factory\DefaultFactory;
 use Drupal\views\Plugin\Discovery\ViewsDiscovery;
-use Drupal\Core\Plugin\Discovery\AnnotatedClassDiscovery;
 
 class ArgumentValidatorPluginManager extends PluginManagerBase {
   public function __construct() {
-    $this->discovery = new AnnotatedClassDiscovery('views', 'argument_validator');
+    $this->discovery = new ViewsDiscovery('views', 'argument_validator');
     $this->factory = new DefaultFactory($this->discovery);
   }
 }

lib/Drupal/views/Plugin/Type/CachePluginManager.php

@@ -10,11 +10,10 @@
 use Drupal\Component\Plugin\PluginManagerBase;
 use Drupal\Component\Plugin\Factory\DefaultFactory;
 use Drupal\views\Plugin\Discovery\ViewsDiscovery;
-use Drupal\Core\Plugin\Discovery\AnnotatedClassDiscovery;
 
 class CachePluginManager extends PluginManagerBase {
   public function __construct() {
-    $this->discovery = new AnnotatedClassDiscovery('views', 'cache');
+    $this->discovery = new ViewsDiscovery('views', 'cache');
     $this->factory = new DefaultFactory($this->discovery);
   }
 }