Revert "Issue #2676258 by benjy, alexpott: Nuke builder plugins and migration storage"

This reverts commit f71ec898d6.

core/modules/migrate/migrate.services.yml

@@ -5,6 +5,12 @@ services:
       - { name: cache.bin }
     factory: cache_factory:get
     arguments: [migrate]
+  migrate.template_storage:
+    class: Drupal\migrate\MigrateTemplateStorage
+    arguments: ['@module_handler']
+  migrate.migration_builder:
+    class: Drupal\migrate\MigrationBuilder
+    arguments: ['@plugin.manager.migrate.builder']
   plugin.manager.migrate.source:
     class: Drupal\migrate\Plugin\MigratePluginManager
     arguments: [source, '@container.namespaces', '@cache.discovery', '@module_handler', 'Drupal\migrate\Annotation\MigrateSource']
@@ -17,6 +23,9 @@ services:
   plugin.manager.migrate.id_map:
     class: Drupal\migrate\Plugin\MigratePluginManager
     arguments: [id_map, '@container.namespaces', '@cache.discovery', '@module_handler']
+  plugin.manager.migrate.builder:
+    class: Drupal\migrate\Plugin\MigratePluginManager
+    arguments: [builder, '@container.namespaces', '@cache.discovery', '@module_handler']
   plugin.manager.migration:
     class: Drupal\migrate\Plugin\MigrationPluginManager
     arguments: ['@module_handler', '@cache.discovery', '@language_manager']

core/modules/migrate/src/MigrateTemplateStorage.php

@@ -0,0 +1,87 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\migrate\MigrateTemplateStorage.
+ */
+
+namespace Drupal\migrate;
+
+use Drupal\Component\Serialization\Yaml;
+use Drupal\Core\Extension\ModuleHandlerInterface;
+
+/**
+ * Storage to access migration template configuration in enabled extensions.
+ */
+class MigrateTemplateStorage implements MigrateTemplateStorageInterface {
+  /**
+   * Extension sub-directory containing default configuration for migrations.
+   */
+
+  const MIGRATION_TEMPLATE_DIRECTORY = 'migration_templates';
+
+  /**
+   * Template subdirectory.
+   *
+   * @var string
+   */
+  protected $directory;
+
+  /**
+   * @var \Drupal\Core\Extension\ModuleHandlerInterface
+   */
+  protected $moduleHandler;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function __construct(ModuleHandlerInterface $module_handler, $directory = self::MIGRATION_TEMPLATE_DIRECTORY) {
+    $this->moduleHandler = $module_handler;
+    $this->directory = $directory;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function findTemplatesByTag($tag) {
+    $templates = $this->getAllTemplates();
+    $matched_templates = [];
+    foreach ($templates as $template_name => $template) {
+      if (!empty($template['migration_tags'])) {
+        if (in_array($tag, $template['migration_tags'])) {
+          $matched_templates[$template_name] = $template;
+        }
+      }
+    }
+    return $matched_templates;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getTemplateByName($name) {
+    $templates = $this->getAllTemplates();
+    return isset($templates[$name]) ? $templates[$name] : NULL;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function getAllTemplates() {
+    $templates = [];
+    foreach ($this->moduleHandler->getModuleDirectories() as $directory) {
+      $full_directory = $directory . '/' . $this->directory;
+      if (file_exists($full_directory)) {
+        $files = scandir($full_directory);
+        foreach ($files as $file) {
+          if ($file[0] !== '.' && preg_match('/\.yml$/', $file)) {
+            $templates[basename($file, '.yml')] = Yaml::decode(file_get_contents("$full_directory/$file"));
+          }
+        }
+      }
+    }
+
+    return $templates;
+  }
+
+}

core/modules/migrate/src/MigrateTemplateStorageInterface.php

@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\migrate\MigrateTemplateStorageInterface.
+ */
+
+namespace Drupal\migrate;
+
+/**
+ * The MigrateTemplateStorageInterface interface.
+ */
+interface MigrateTemplateStorageInterface {
+
+  /**
+   * Find all migration templates with the specified tag.
+   *
+   * @param $tag
+   *   The tag to match.
+   *
+   * @return array
+   *   Any templates (parsed YAML config) that matched, keyed by the ID.
+   */
+  public function findTemplatesByTag($tag);
+
+  /**
+   * Retrieve a template given a specific name.
+   *
+   * @param string $name
+   *   A migration template name.
+   *
+   * @return NULL|array
+   *   A parsed migration template, or NULL if it doesn't exist.
+   */
+  public function getTemplateByName($name);
+
+  /**
+   * Retrieves all migration templates belonging to enabled extensions.
+   *
+   * @return array
+   *   Array of parsed templates, keyed by the fully-qualified id.
+   */
+  public function getAllTemplates();
+
+}

core/modules/migrate/src/MigrationBuilder.php

@@ -0,0 +1,61 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\migrate\MigrationBuilder.
+ */
+
+namespace Drupal\migrate;
+
+use Drupal\migrate\Plugin\MigratePluginManager;
+
+/**
+ * Builds migration entities from migration templates.
+ */
+class MigrationBuilder implements MigrationBuilderInterface {
+
+  /**
+   * The builder plugin manager.
+   *
+   * @var \Drupal\migrate\Plugin\MigratePluginManager
+   */
+  protected $builderManager;
+
+  /**
+   * Constructs a MigrationBuilder.
+   *
+   * @param \Drupal\migrate\Plugin\MigratePluginManager $builder_manager
+   *   The builder plugin manager.
+   */
+  public function __construct(MigratePluginManager $builder_manager) {
+    $this->builderManager = $builder_manager;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function createMigrations(array $templates) {
+    /** @var \Drupal\migrate\Entity\MigrationInterface[] $migrations */
+    $migrations = [];
+
+    foreach ($templates as $template_id => $template) {
+      if (isset($template['builder'])) {
+        $variants = $this->builderManager
+          ->createInstance($template['builder']['plugin'], $template['builder'])
+          ->buildMigrations($template);
+      }
+      else {
+        $variants = array(Migration::create($template));
+      }
+
+      /** @var \Drupal\migrate\Entity\MigrationInterface[] $variants */
+      foreach ($variants as $variant) {
+        $variant->set('template', $template_id);
+      }
+      $migrations = array_merge($migrations, $variants);
+    }
+
+    return $migrations;
+  }
+
+}

core/modules/migrate/src/MigrationBuilderInterface.php

@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\migrate\MigrationBuilderInterface.
+ */
+
+namespace Drupal\migrate;
+
+/**
+ * The migration builder interface.
+ */
+interface MigrationBuilderInterface {
+
+  /**
+   * Builds migration entities from templates.
+   *
+   * @param array $templates
+   *   The parsed templates (each of which is an array parsed from YAML), keyed
+   *   by ID.
+   *
+   * @return \Drupal\migrate\Entity\MigrationInterface[]
+   *   The migration entities derived from the templates.
+   */
+  public function createMigrations(array $templates);
+
+}

core/modules/migrate/src/Plugin/MigrateBuilderInterface.php

@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\migrate\Plugin\MigrateBuilderInterface.
+ */
+
+namespace Drupal\migrate\Plugin;
+
+/**
+ * Defines the builder plugin type.
+ *
+ * Builder plugins implement custom logic to generate migration entities from
+ * migration templates. For example, a migration may need to be customized based
+ * on data that's present in the source database; such customization is
+ * implemented by builders.
+ */
+interface MigrateBuilderInterface {
+
+  /**
+   * Builds migration entities based on a template.
+   *
+   * @param array $template
+   *   The parsed template.
+   *
+   * @return \Drupal\migrate\Entity\MigrationInterface[]
+   *   The unsaved migrations generated from the template.
+   */
+  public function buildMigrations(array $template);
+
+}

core/modules/migrate/src/Plugin/migrate/builder/BuilderBase.php

@@ -0,0 +1,52 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\migrate\Plugin\migrate\builder\BuilderBase.
+ */
+
+namespace Drupal\migrate\Plugin\migrate\builder;
+
+use Drupal\Core\Plugin\PluginBase;
+use Drupal\migrate\Plugin\MigrateBuilderInterface;
+
+/**
+ * Provides abstract base class for builder plugins.
+ */
+abstract class BuilderBase extends PluginBase implements MigrateBuilderInterface {
+
+  /**
+   * Returns a fully initialized instance of a source plugin.
+   *
+   * @param string $plugin_id
+   *   The plugin ID.
+   * @param array $configuration
+   *   (optional) Additional configuration for the plugin. Defaults to an empty
+   *   array.
+   *
+   * @return \Drupal\migrate\Plugin\MigrateSourceInterface|\Drupal\migrate\Plugin\RequirementsInterface
+   *   The fully initialized source plugin.
+   */
+  protected function getSourcePlugin($plugin_id, array $configuration = []) {
+    $configuration['plugin'] = $plugin_id;
+    // By default, SqlBase subclasses will try to join on a map table. But in
+    // this case we're trying to use the source plugin as a detached iterator
+    // over the source data, so we don't want to join on (or create) the map
+    // table.
+    // @see SqlBase::initializeIterator()
+    $configuration['ignore_map'] = TRUE;
+    // Source plugins are tightly coupled to migration entities, so we need
+    // to create a fake migration in order to properly initialize the plugin.
+    $values = [
+      'id' => uniqid(),
+      'source' => $configuration,
+      // Since this isn't a real migration, we don't want a real destination --
+      // the 'null' destination is perfect for this.
+      'destination' => [
+        'plugin' => 'null',
+      ],
+    ];
+    return Migration::create($values)->getSourcePlugin();
+  }
+
+}

core/modules/migrate/src/Tests/TemplateTest.php

@@ -0,0 +1,78 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\migrate\Tests\TemplateTest.
+ */
+
+namespace Drupal\migrate\Tests;
+
+/**
+ * Tests the migration template functionality.
+ *
+ * @group migrate
+ */
+class TemplateTest extends MigrateTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('template_test');
+
+  /**
+   * Tests different connection types.
+   */
+  public function testTemplates() {
+    $migration_templates = \Drupal::service('migrate.template_storage')->findTemplatesByTag("Template Test");
+    $expected_url = [
+      'id' => 'url_template',
+      'label' => 'Template test - URL',
+      'migration_tags' => ['Template Test'],
+      'source' => ['plugin' => 'empty'],
+      'process' => ['src' => 'foobar'],
+      'destination' => ['plugin' => 'url_alias'],
+    ];
+    $expected_node = [
+      'id' => 'node_template',
+      'label' => 'Template test - node',
+      'migration_tags' => ['Template Test'],
+      'source' => ['plugin' => 'empty'],
+      'process' => ['src' => 'barfoo'],
+      'destination' => ['plugin' => 'entity:node'],
+    ];
+    $this->assertIdentical($migration_templates['migrate.migration.url_template'], $expected_url);
+    $this->assertIdentical($migration_templates['migrate.migration.node_template'], $expected_node);
+    $this->assertFalse(isset($migration_templates['migrate.migration.other_template']));
+  }
+
+  /**
+   * Tests retrieving a template by name.
+   */
+  public function testGetTemplateByName() {
+    /** @var \Drupal\migrate\MigrateTemplateStorageInterface $template_storage */
+    $template_storage = \Drupal::service('migrate.template_storage');
+
+    $expected_url = [
+      'id' => 'url_template',
+      'label' => 'Template test - URL',
+      'migration_tags' => ['Template Test'],
+      'source' => ['plugin' => 'empty'],
+      'process' => ['src' => 'foobar'],
+      'destination' => ['plugin' => 'url_alias'],
+    ];
+    $expected_node = [
+      'id' => 'node_template',
+      'label' => 'Template test - node',
+      'migration_tags' => ['Template Test'],
+      'source' => ['plugin' => 'empty'],
+      'process' => ['src' => 'barfoo'],
+      'destination' => ['plugin' => 'entity:node'],
+    ];
+    $this->assertIdentical($template_storage->getTemplateByName('migrate.migration.url_template'), $expected_url);
+    $this->assertIdentical($template_storage->getTemplateByName('migrate.migration.node_template'), $expected_node);
+    $this->assertNull($template_storage->getTemplateByName('migrate.migration.dne'));
+  }
+
+}

core/modules/migrate_drupal/src/Plugin/migrate/builder/CckBuilder.php

@@ -0,0 +1,82 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\builder\CckBuilder.
+ */
+
+namespace Drupal\migrate_drupal\Plugin\migrate\builder;
+
+use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
+use Drupal\migrate\Entity\MigrationInterface;
+use Drupal\migrate\Plugin\migrate\builder\BuilderBase;
+use Drupal\migrate\Plugin\MigratePluginManager;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Base class for builders which leverage cckfield plugins.
+ */
+abstract class CckBuilder extends BuilderBase implements ContainerFactoryPluginInterface {
+
+  /**
+   * The cckfield plugin manager.
+   *
+   * @var \Drupal\migrate\Plugin\MigratePluginManager
+   */
+  protected $cckPluginManager;
+
+  /**
+   * Already-instantiated cckfield plugins, keyed by ID.
+   *
+   * @var \Drupal\migrate_drupal\Plugin\MigrateCckFieldInterface[]
+   */
+  protected $cckPluginCache = [];
+
+  /**
+   * Constructs a CckBuilder.
+   *
+   * @param array $configuration
+   *   Plugin configuration.
+   * @param string $plugin_id
+   *   The plugin ID.
+   * @param mixed $plugin_definition
+   *   The plugin definition.
+   * @param \Drupal\migrate\Plugin\MigratePluginManager $cck_manager
+   *   The cckfield plugin manager.
+   */
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, MigratePluginManager $cck_manager) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition);
+    $this->cckPluginManager = $cck_manager;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+    return new static(
+      $configuration,
+      $plugin_id,
+      $plugin_definition,
+      $container->get('plugin.manager.migrate.cckfield')
+    );
+  }
+
+  /**
+   * Gets a cckfield plugin instance.
+   *
+   * @param string $field_type
+   *   The field type (plugin ID).
+   * @param \Drupal\migrate\Entity\MigrationInterface|NULL $migration
+   *   The migration, if any.
+   *
+   * @return \Drupal\migrate_drupal\Plugin\MigrateCckFieldInterface
+   *   The cckfield plugin instance.
+   */
+  protected function getCckPlugin($field_type, MigrationInterface $migration = NULL) {
+    if (empty($this->cckPluginCache[$field_type])) {
+      $this->cckPluginCache[$field_type] = $this->cckPluginManager->createInstance($field_type, [], $migration);
+    }
+    return $this->cckPluginCache[$field_type];
+  }
+
+}

core/modules/migrate_drupal/src/Plugin/migrate/builder/d6/CckMigration.php

@@ -0,0 +1,67 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\migrate_drupal\Plugin\migrate\builder\d6\CckMigration.
+ */
+
+namespace Drupal\migrate_drupal\Plugin\migrate\builder\d6;
+
+use Drupal\migrate\Exception\RequirementsException;
+use Drupal\migrate\Plugin\RequirementsInterface;
+use Drupal\migrate_drupal\Plugin\migrate\builder\CckBuilder;
+
+/**
+ * @PluginID("d6_cck_migration")
+ */
+class CckMigration extends CckBuilder {
+
+  /**
+   * List of cckfield plugin IDs which have already run.
+   *
+   * @var string[]
+   */
+  protected $processedFieldTypes = [];
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildMigrations(array $template) {
+    $migration = Migration::create($template);
+
+    $source_plugin = $migration->getSourcePlugin();
+    // The source plugin will throw RequirementsException if CCK is not enabled,
+    // in which case there is nothing else for us to do.
+    if ($source_plugin instanceof RequirementsInterface) {
+      try {
+        $source_plugin->checkRequirements();
+      }
+      catch (RequirementsException $e) {
+        return [$migration];
+      }
+    }
+
+    // Loop through every field that will be migrated.
+    foreach ($source_plugin as $field) {
+      $field_type = $field->getSourceProperty('type');
+
+      // Each field type should only be processed once.
+      if (in_array($field_type, $this->processedFieldTypes)) {
+        continue;
+      }
+      // Only process the current field type if a relevant cckfield plugin
+      // exists.
+      elseif ($this->cckPluginManager->hasDefinition($field_type)) {
+        $this->processedFieldTypes[] = $field_type;
+        // Allow the cckfield plugin to alter the migration as necessary so that
+        // it knows how to handle fields of this type.
+        $this->cckPluginManager
+          ->createInstance($field_type, [], $migration)
+          ->{$this->configuration['cck_plugin_method']}($migration);
+      }
+    }
+
+    return [$migration];
+  }
+
+}

core/modules/migrate_drupal/src/Tests/MigrateDrupalTestBase.php

@@ -50,4 +50,29 @@ abstract class MigrateDrupalTestBase extends MigrateTestBase {
     Database::setActiveConnection($default_db);
   }
 
+  /**
+   * Turn all the migration templates for the specified drupal version into
+   * real migration entities so we can test them.
+   *
+   * @param string $version
+   *  Drupal version as provided in migration_tags - e.g., 'Drupal 6'.
+   */
+  protected function installMigrations($version) {
+    // @TODO https://www.drupal.org/node/2668436
+    return;
+    $migration_templates = \Drupal::service('migrate.template_storage')->findTemplatesByTag($version);
+    $migrations = \Drupal::service('migrate.migration_builder')->createMigrations($migration_templates);
+    foreach ($migrations as $migration) {
+      try {
+        $migration->save();
+      }
+      catch (PluginNotFoundException $e) {
+        // Migrations requiring modules not enabled will throw an exception.
+        // Ignoring this exception is equivalent to placing config in the
+        // optional subdirectory - the migrations we require for the test will
+        // be successfully saved.
+      }
+    }
+  }
+
 }

core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6TestBase.php

@@ -6,7 +6,6 @@
  */
 
 namespace Drupal\migrate_drupal\Tests\d6;
-
 use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase;
 
 /**
@@ -34,6 +33,7 @@ abstract class MigrateDrupal6TestBase extends MigrateDrupalTestBase {
   protected function setUp() {
     parent::setUp();
     $this->loadFixture( __DIR__ . '/../../../tests/fixtures/drupal6.php');
+    $this->installMigrations('Drupal 6');
   }
 
   /**

core/modules/migrate_drupal/src/Tests/d7/MigrateDrupal7TestBase.php

@@ -20,6 +20,7 @@ abstract class MigrateDrupal7TestBase extends MigrateDrupalTestBase {
   protected function setUp() {
     parent::setUp();
     $this->loadFixture(__DIR__ . '/../../../tests/fixtures/drupal7.php');
+    $this->installMigrations('Drupal 7');
   }
 
 }

core/modules/node/src/Plugin/migrate/builder/d6/Node.php

@@ -0,0 +1,74 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\node\Plugin\migrate\builder\d6\Node.
+ */
+
+namespace Drupal\node\Plugin\migrate\builder\d6;
+
+use Drupal\migrate\Exception\RequirementsException;
+use Drupal\migrate_drupal\Plugin\migrate\builder\CckBuilder;
+
+/**
+ * @PluginID("d6_node")
+ */
+class Node extends CckBuilder {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildMigrations(array $template) {
+    $migrations = [];
+
+    // Read all CCK field instance definitions in the source database.
+    $fields = array();
+    $source_plugin = $this->getSourcePlugin('d6_field_instance', $template['source']);
+    try {
+      $source_plugin->checkRequirements();
+
+      foreach ($source_plugin as $field) {
+        $info = $field->getSource();
+        $fields[$info['type_name']][$info['field_name']] = $info;
+      }
+    }
+    catch (RequirementsException $e) {
+      // Don't do anything; $fields will be empty.
+    }
+
+    foreach ($this->getSourcePlugin('d6_node_type', $template['source']) as $row) {
+      $node_type = $row->getSourceProperty('type');
+      $values = $template;
+      $values['id'] = $template['id'] . '__' . $node_type;
+
+      $label = $template['label'];
+      $values['label'] = $this->t("@label (@type)", ['@label' => $label, '@type' => $node_type]);
+      $values['source']['node_type'] = $node_type;
+
+      // If this migration is based on the d6_node_revision template, it should
+      // explicitly depend on the corresponding d6_node variant.
+      if ($template['id'] == 'd6_node_revision') {
+        $values['migration_dependencies']['required'][] = 'd6_node__' . $node_type;
+      }
+
+      $migration = Migration::create($values);
+
+      if (isset($fields[$node_type])) {
+        foreach ($fields[$node_type] as $field => $info) {
+          if ($this->cckPluginManager->hasDefinition($info['type'])) {
+            $this->getCckPlugin($info['type'])
+              ->processCckFieldValues($migration, $field, $info);
+          }
+          else {
+            $migration->setProcessOfProperty($field, $field);
+          }
+        }
+      }
+
+      $migrations[] = $migration;
+    }
+
+    return $migrations;
+  }
+
+}

core/modules/node/src/Plugin/migrate/builder/d7/Node.php

@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\node\Plugin\migrate\builder\d7\Node.
+ */
+
+namespace Drupal\node\Plugin\migrate\builder\d7;
+
+use Drupal\migrate_drupal\Plugin\migrate\builder\CckBuilder;
+
+/**
+ * @PluginID("d7_node")
+ */
+class Node extends CckBuilder {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildMigrations(array $template) {
+    $migrations = [];
+
+    // Read all field instance definitions in the source database.
+    $fields = array();
+    foreach ($this->getSourcePlugin('d7_field_instance', $template['source']) as $field) {
+      $info = $field->getSource();
+      $fields[$info['entity_type']][$info['bundle']][$info['field_name']] = $info;
+    }
+
+    foreach ($this->getSourcePlugin('d7_node_type', $template['source']) as $node_type) {
+      $bundle = $node_type->getSourceProperty('type');
+      $values = $template;
+      $values['id'] .= '__' . $bundle;
+      $values['label'] = $this->t('@label (@type)', ['@label' => $values['label'], '@type' => $node_type->getSourceProperty('name')]);
+      $values['source']['node_type'] = $bundle;
+      $migration = Migration::create($values);
+
+      if (isset($fields['node'][$bundle])) {
+        foreach ($fields['node'][$bundle] as $field => $data) {
+          if ($this->cckPluginManager->hasDefinition($data['type'])) {
+            $this->getCckPlugin($data['type'])
+              ->processCckFieldValues($migration, $field, $data);
+          }
+          else {
+            $migration->setProcessOfProperty($field, $field);
+          }
+        }
+      }
+
+      $migrations[] = $migration;
+    }
+
+    return $migrations;
+  }
+
+}

core/modules/node/src/Tests/Migrate/d7/NodeBuilderTest.php

@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\node\Tests\Migrate\d7\NodeMigrateDeriverTest.
+ * Contains \Drupal\node\Tests\Migrate\d7\NodeBuilderTest.
  */
 
 namespace Drupal\node\Tests\Migrate\d7;
@@ -10,11 +10,11 @@ namespace Drupal\node\Tests\Migrate\d7;
 use Drupal\migrate_drupal\Tests\d7\MigrateDrupal7TestBase;
 
 /**
- * Tests the d7_node node deriver.
+ * Tests the d7_node builder.
  *
  * @group node
  */
-class NodeMigrateDeriverTest extends MigrateDrupal7TestBase {
+class NodeBuilderTest extends MigrateDrupal7TestBase {
 
   public static $modules = ['node'];
 

core/modules/taxonomy/src/Plugin/migrate/builder/d6/TermNode.php

@@ -0,0 +1,106 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\taxonomy\Plugin\migrate\builder\d6\TermNode.
+ */
+
+namespace Drupal\taxonomy\Plugin\migrate\builder\d6;
+
+use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
+use Drupal\migrate\MigrateExecutable;
+use Drupal\migrate\MigrateMessage;
+use Drupal\migrate\MigrateTemplateStorageInterface;
+use Drupal\migrate\Plugin\migrate\builder\BuilderBase;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * @PluginID("d6_term_node")
+ */
+class TermNode extends BuilderBase implements ContainerFactoryPluginInterface {
+
+  /**
+   * The migration template storage service.
+   *
+   * @var \Drupal\migrate\MigrateTemplateStorage
+   */
+  protected $templateStorage;
+
+  /**
+   * Constructs a TermNode builder.
+   *
+   * @param array $configuration
+   *   Plugin configuration.
+   * @param string $plugin_id
+   *   The plugin ID.
+   * @param mixed $plugin_definition
+   *   The plugin definition.
+   * @param \Drupal\migrate\MigrateTemplateStorageInterface $template_storage
+   *   The migration template storage handler.
+   */
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, MigrateTemplateStorageInterface $template_storage) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition);
+    $this->templateStorage = $template_storage;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+    return new static(
+      $configuration,
+      $plugin_id,
+      $plugin_definition,
+      $container->get('migrate.template_storage')
+    );
+  }
+
+  /**
+   * Builds a map of source vocabulary IDs to expected destination IDs.
+   *
+   * @param array $source
+   *   Additional configuration for the d6_taxonomy_vocabulary source.
+   *
+   * @return array
+   *   The vid map. The keys are the source IDs and the values are the
+   *   (expected) destination IDs.
+   */
+  protected function getVocabularyIdMap(array $source) {
+    $map = [];
+
+    $template = $this->templateStorage->getTemplateByName('d6_taxonomy_vocabulary');
+    $template['source'] += $source;
+
+    $migration = Migration::create($template);
+    $executable = new MigrateExecutable($migration, new MigrateMessage());
+    // Only process the destination ID properties.
+    $process = array_intersect_key($template['process'], $migration->getDestinationPlugin()->getIds());
+
+    foreach ($migration->getSourcePlugin() as $source_row) {
+      // Process the row to generate the expected destination ID.
+      $executable->processRow($source_row, $process);
+      $map[$source_row->getSourceProperty('vid')] = $source_row->getDestinationProperty('vid');
+    }
+
+    return $map;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildMigrations(array $template) {
+    $migrations = [];
+
+    foreach ($this->getVocabularyIdMap($template['source']) as $source_vid => $destination_vid) {
+      $values = $template;
+      $values['id'] .= '__' . $source_vid;
+      $values['source']['vid'] = $source_vid;
+      $migration = Migration::create($values);
+      $migration->setProcessOfProperty($destination_vid, 'tid');
+      $migrations[] = $migration;
+    }
+
+    return $migrations;
+  }
+
+}

core/modules/user/src/Plugin/migrate/User.php

@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\user\Plugin\migrate\User.
+ * Contains \Drupal\user\Plugin\migrate\builder\d7\User.
  */
 
 namespace Drupal\user\Plugin\migrate;

core/modules/user/src/Plugin/migrate/builder/d6/ProfileValues.php

@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\user\Plugin\migrate\builder\d6\ProfileValues.
+ */
+
+namespace Drupal\user\Plugin\migrate\builder\d6;
+
+use Drupal\migrate\Exception\RequirementsException;
+use Drupal\migrate\Plugin\migrate\builder\BuilderBase;
+
+/**
+ * @PluginID("d6_profile_values")
+ */
+class ProfileValues extends BuilderBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildMigrations(array $template) {
+    $migration = Migration::create($template);
+
+    // @TODO The source plugin should accept a database connection.
+    // @see https://www.drupal.org/node/2552791
+    $source_plugin = $this->getSourcePlugin('profile_field', $template['source']);
+    try {
+      $source_plugin->checkRequirements();
+    }
+    catch (RequirementsException $e) {
+      return [];
+    }
+
+    foreach ($source_plugin as $field) {
+      $migration->setProcessOfProperty($field->getSourceProperty('name'), $field->getSourceProperty('name'));
+    }
+
+    return [$migration];
+  }
+
+}

core/modules/user/src/Plugin/migrate/builder/d7/User.php

@@ -0,0 +1,89 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\user\Plugin\migrate\builder\d7\User.
+ */
+
+namespace Drupal\user\Plugin\migrate\builder\d7;
+
+use Drupal\Core\Extension\ModuleHandlerInterface;
+use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
+use Drupal\migrate\Exception\RequirementsException;
+use Drupal\migrate\Plugin\migrate\builder\BuilderBase;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * @PluginID("d7_user")
+ */
+class User extends BuilderBase implements ContainerFactoryPluginInterface {
+
+  /**
+   * The module handler service.
+   *
+   * @var \Drupal\Core\Extension\ModuleHandlerInterface
+   */
+  protected $moduleHandler;
+
+  /**
+   * Constructs a d7_user builder plugin instance.
+   *
+   * @param array $configuration
+   *   The plugin configuration.
+   * @param string $plugin_id
+   *   The plugin ID.
+   * @param mixed $plugin_definition
+   *   The plugin definition.
+   * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
+   *   The module handler service.
+   */
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, ModuleHandlerInterface $module_handler) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition);
+    $this->moduleHandler = $module_handler;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+    return new static(
+      $configuration,
+      $plugin_id,
+      $plugin_definition,
+      $container->get('module_handler')
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function buildMigrations(array $template) {
+    $migration = Migration::create($template);
+
+    if ($this->moduleHandler->moduleExists('field')) {
+      $template['source']['entity_type'] = 'user';
+
+      $source_plugin = $this->getSourcePlugin('d7_field_instance', $template['source']);
+      foreach ($source_plugin as $field) {
+        $field_name = $field->getSourceProperty('field_name');
+        $migration->setProcessOfProperty($field_name, $field_name);
+      }
+    }
+
+    try {
+      $profile_fields = $this->getSourcePlugin('profile_field', $template['source']);
+      // Ensure that Profile is enabled in the source DB.
+      $profile_fields->checkRequirements();
+      foreach ($profile_fields as $field) {
+        $field_name = $field->getSourceProperty('name');
+        $migration->setProcessOfProperty($field_name, $field_name);
+      }
+    }
+    catch (RequirementsException $e) {
+      // Profile is not enabled in the source DB, so don't do anything.
+    }
+
+    return [$migration];
+  }
+
+}

core/modules/user/src/Tests/Migrate/d7/UserMigrationClassTest.php

@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\user\Tests\Migrate\d7\UserMigrationClassTest.
+ * Contains \Drupal\user\Tests\Migrate\d7\UserMigrationBuilderTest.
  */
 
 namespace Drupal\user\Tests\Migrate\d7;