Issue #1849752 by effulgentsia, Berdir, jibran, neclimdul: Abstract...

Issue #1849752 by effulgentsia, Berdir, jibran, neclimdul: Abstract non-Drupal-specific parts of AnnotatedClassDiscovery into a Drupal\Component base class.

core/lib/Drupal/Core/Annotation/Plugin.php

-<?php
-
-/**
- * @file
- * Definition of Drupal\Core\Annotation\Plugin.
- */
-
-namespace Drupal\Core\Annotation;
-
-use Drupal\Component\Annotation\Plugin as ComponentPlugin;
-
-/**
- * Defines a Plugin annotation object.
- *
- * @Annotation
- */
-class Plugin extends ComponentPlugin {
-}

core/lib/Drupal/Core/Plugin/Discovery/AnnotatedClassDiscovery.php

@@ -42,7 +42,7 @@ function __construct($owner, $type, array $root_namespaces = array()) {
     foreach ($root_namespaces as $namespace => $dir) {
       $plugin_namespaces["$namespace\\Plugin\\{$owner}\\{$type}"] = array($dir);
     }
-    parent::__construct($plugin_namespaces, $annotation_namespaces, 'Drupal\Core\Annotation\Plugin');
+    parent::__construct($plugin_namespaces, $annotation_namespaces);
   }
 
 }

core/lib/Drupal/Core/Plugin/Validation/Constraint/BundleConstraint.php

@@ -8,7 +8,7 @@
 namespace Drupal\Core\Plugin\Validation\Constraint;
 
 use Symfony\Component\Validator\Constraint;
-use Drupal\Core\Annotation\Plugin;
+use Drupal\Component\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
 
 

core/lib/Drupal/Core/Plugin/Validation/Constraint/EntityTypeConstraint.php

@@ -8,7 +8,7 @@
 namespace Drupal\Core\Plugin\Validation\Constraint;
 
 use Symfony\Component\Validator\Constraint;
-use Drupal\Core\Annotation\Plugin;
+use Drupal\Component\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
 
 

core/lib/Drupal/Core/Plugin/Validation/Constraint/LengthConstraint.php

@@ -7,7 +7,7 @@
 
 namespace Drupal\Core\Plugin\Validation\Constraint;
 
-use Drupal\Core\Annotation\Plugin;
+use Drupal\Component\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
 use Symfony\Component\Validator\Constraints\Length;
 

core/lib/Drupal/Core/Plugin/Validation/Constraint/PrimitiveTypeConstraint.php

@@ -7,7 +7,7 @@
 
 namespace Drupal\Core\Plugin\Validation\Constraint;
 
-use Drupal\Core\Annotation\Plugin;
+use Drupal\Component\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
 use Symfony\Component\Validator\Constraints\Type as SymfonyConstraint;
 

core/lib/Drupal/Core/Plugin/Validation/Constraint/RangeConstraint.php

@@ -7,7 +7,7 @@
 
 namespace Drupal\Core\Plugin\Validation\Constraint;
 
-use Drupal\Core\Annotation\Plugin;
+use Drupal\Component\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
 use Symfony\Component\Validator\Constraints\Range;
 

core/modules/action/lib/Drupal/action/Plugin/views/field/BulkForm.php

@@ -7,7 +7,7 @@
 
 namespace Drupal\action\Plugin\views\field;
 
-use Drupal\Core\Annotation\Plugin;
+use Drupal\Component\Annotation\Plugin;
 use Drupal\system\Plugin\views\field\BulkFormBase;
 
 /**

core/modules/aggregator/lib/Drupal/aggregator/Plugin/Core/Entity/Feed.php

@@ -9,7 +9,7 @@
 
 use Drupal\Core\Entity\ContentEntityInterface;
 use Drupal\Core\Entity\EntityNG;
-use Drupal\Core\Annotation\Plugin;
+use Drupal\Component\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
 
 /**

core/modules/aggregator/lib/Drupal/aggregator/Plugin/Core/Entity/Item.php

@@ -9,7 +9,7 @@
 
 use Drupal\Core\Entity\ContentEntityInterface;
 use Drupal\Core\Entity\EntityNG;
-use Drupal\Core\Annotation\Plugin;
+use Drupal\Component\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
 
 /**

core/modules/aggregator/lib/Drupal/aggregator/Plugin/aggregator/fetcher/DefaultFetcher.php

@@ -9,7 +9,7 @@
 
 use Drupal\aggregator\Plugin\FetcherInterface;
 use Drupal\aggregator\Plugin\Core\Entity\Feed;
-use Drupal\Core\Annotation\Plugin;
+use Drupal\Component\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
 use Guzzle\Http\Exception\BadResponseException;
 

core/modules/aggregator/lib/Drupal/aggregator/Plugin/block/block/AggregatorCategoryBlock.php

@@ -8,7 +8,7 @@
 namespace Drupal\aggregator\Plugin\block\block;
 
 use Drupal\block\BlockBase;
-use Drupal\Core\Annotation\Plugin;
+use Drupal\Component\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
 
 /**

core/modules/aggregator/lib/Drupal/aggregator/Plugin/block/block/AggregatorFeedBlock.php

@@ -8,7 +8,7 @@
 namespace Drupal\aggregator\Plugin\block\block;
 
 use Drupal\block\BlockBase;
-use Drupal\Core\Annotation\Plugin;
+use Drupal\Component\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
 
 /**

core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Core/Entity/CustomBlock.php

@@ -9,7 +9,7 @@
 
 use Drupal\Core\Entity\ContentEntityInterface;
 use Drupal\Core\Entity\EntityNG;
-use Drupal\Core\Annotation\Plugin;
+use Drupal\Component\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
 
 /**

core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/Core/Entity/CustomBlockType.php

@@ -8,7 +8,7 @@
 namespace Drupal\custom_block\Plugin\Core\Entity;
 
 use Drupal\Core\Config\Entity\ConfigEntityBase;
-use Drupal\Core\Annotation\Plugin;
+use Drupal\Component\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
 
 /**

core/modules/block/custom_block/lib/Drupal/custom_block/Plugin/block/block/CustomBlockBlock.php

@@ -8,7 +8,7 @@
 namespace Drupal\custom_block\Plugin\block\block;
 
 use Drupal\block\BlockBase;
-use Drupal\Core\Annotation\Plugin;
+use Drupal\Component\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
 
 /**

core/modules/block/lib/Drupal/block/Plugin/Core/Entity/Block.php

@@ -8,7 +8,7 @@
 namespace Drupal\block\Plugin\Core\Entity;
 
 use Drupal\Core\Config\Entity\ConfigEntityBase;
-use Drupal\Core\Annotation\Plugin;
+use Drupal\Component\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
 use Drupal\Component\Plugin\Exception\PluginException;
 

core/modules/block/lib/Drupal/block/Plugin/system/plugin_ui/BlockPluginUI.php

@@ -7,7 +7,7 @@
 namespace Drupal\block\Plugin\system\plugin_ui;
 
 use Drupal\system\Plugin\PluginUIBase;
-use Drupal\Core\Annotation\Plugin;
+use Drupal\Component\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
 
 /**

core/modules/block/lib/Drupal/block/Plugin/views/display/Block.php

@@ -8,7 +8,7 @@
 
 namespace Drupal\block\Plugin\views\display;
 
-use Drupal\Core\Annotation\Plugin;
+use Drupal\Component\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
 use Drupal\views\Plugin\views\display\DisplayPluginBase;
 

core/modules/block/tests/lib/Drupal/block_test/Plugin/block/block/TestCacheBlock.php

@@ -8,7 +8,7 @@
 namespace Drupal\block_test\Plugin\block\block;
 
 use Drupal\block\BlockBase;
-use Drupal\Core\Annotation\Plugin;
+use Drupal\Component\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
 
 /**