summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDries2014-02-27 19:34:39 (GMT)
committerDries2014-02-27 19:34:39 (GMT)
commit03ddf8c283e1d84ee5444da66ef3d4c702971294 (patch)
treec541f482dcf000431955ee7245a9690ffa6c11aa
parent3a5c3b322a8de80ee223c80b4948a96b73cc9e1d (diff)
Issue #2198377 by alexpott: Enforce UUID key name in configuration entities.
-rw-r--r--core/includes/entity.inc7
-rw-r--r--core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php7
-rw-r--r--core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php11
-rw-r--r--core/modules/block/custom_block/lib/Drupal/custom_block/Entity/CustomBlockType.php3
-rw-r--r--core/modules/block/lib/Drupal/block/Entity/Block.php3
-rw-r--r--core/modules/breakpoint/lib/Drupal/breakpoint/Entity/Breakpoint.php3
-rw-r--r--core/modules/breakpoint/lib/Drupal/breakpoint/Entity/BreakpointGroup.php3
-rw-r--r--core/modules/config/lib/Drupal/config/Form/ConfigSingleExportForm.php2
-rw-r--r--core/modules/config/lib/Drupal/config/Form/ConfigSingleImportForm.php9
-rw-r--r--core/modules/config/lib/Drupal/config/Tests/ConfigEntityUnitTest.php7
-rw-r--r--core/modules/config/lib/Drupal/config/Tests/ConfigSingleImportExportTest.php6
-rw-r--r--core/modules/config/tests/config_test/lib/Drupal/config_test/Entity/ConfigQueryTest.php3
-rw-r--r--core/modules/config/tests/config_test/lib/Drupal/config_test/Entity/ConfigTest.php1
-rw-r--r--core/modules/contact/lib/Drupal/contact/Entity/Category.php3
-rw-r--r--core/modules/editor/lib/Drupal/editor/Entity/Editor.php3
-rw-r--r--core/modules/entity/lib/Drupal/entity/Entity/EntityFormDisplay.php1
-rw-r--r--core/modules/entity/lib/Drupal/entity/Entity/EntityFormMode.php3
-rw-r--r--core/modules/entity/lib/Drupal/entity/Entity/EntityViewDisplay.php1
-rw-r--r--core/modules/entity/lib/Drupal/entity/Entity/EntityViewMode.php3
-rw-r--r--core/modules/field/lib/Drupal/field/Entity/FieldConfig.php3
-rw-r--r--core/modules/field/lib/Drupal/field/Entity/FieldInstanceConfig.php3
-rw-r--r--core/modules/filter/lib/Drupal/filter/Entity/FilterFormat.php1
-rw-r--r--core/modules/image/lib/Drupal/image/Entity/ImageStyle.php3
-rw-r--r--core/modules/language/lib/Drupal/language/Entity/Language.php3
-rw-r--r--core/modules/migrate/lib/Drupal/migrate/Entity/Migration.php3
-rw-r--r--core/modules/node/lib/Drupal/node/Entity/NodeType.php3
-rw-r--r--core/modules/picture/lib/Drupal/picture/Entity/PictureMapping.php3
-rw-r--r--core/modules/rdf/lib/Drupal/rdf/Entity/RdfMapping.php3
-rw-r--r--core/modules/search/lib/Drupal/search/Entity/SearchPage.php1
-rw-r--r--core/modules/shortcut/lib/Drupal/shortcut/Entity/ShortcutSet.php3
-rw-r--r--core/modules/system/lib/Drupal/system/Entity/Action.php3
-rw-r--r--core/modules/system/lib/Drupal/system/Entity/DateFormat.php3
-rw-r--r--core/modules/system/lib/Drupal/system/Entity/Menu.php3
-rw-r--r--core/modules/taxonomy/lib/Drupal/taxonomy/Entity/Vocabulary.php3
-rw-r--r--core/modules/tour/lib/Drupal/tour/Entity/Tour.php3
-rw-r--r--core/modules/user/lib/Drupal/user/Entity/Role.php1
-rw-r--r--core/modules/views/lib/Drupal/views/Entity/View.php1
37 files changed, 52 insertions, 73 deletions
diff --git a/core/includes/entity.inc b/core/includes/entity.inc
index 39701ef..fa5f370 100644
--- a/core/includes/entity.inc
+++ b/core/includes/entity.inc
@@ -240,7 +240,12 @@ function entity_revision_delete($entity_type, $revision_id) {
*/
function entity_load_by_uuid($entity_type_id, $uuid, $reset = FALSE) {
$entity_type = \Drupal::entityManager()->getDefinition($entity_type_id);
- if (!$uuid_key = $entity_type->getKey('uuid')) {
+
+ // Configuration entities do not use annotations to set the UUID key.
+ if ($entity_type->isSubclassOf('Drupal\Core\Config\Entity\ConfigEntityInterface')) {
+ $uuid_key = 'uuid';
+ }
+ elseif (!$uuid_key = $entity_type->getKey('uuid')) {
throw new EntityStorageException("Entity type $entity_type_id does not support UUIDs.");
}
diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
index 42ad63e..87b43f7 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
@@ -174,7 +174,12 @@ abstract class ConfigEntityBase extends Entity implements ConfigEntityInterface
* {@inheritdoc}
*/
public function createDuplicate() {
- $duplicate = parent::createDuplicate();
+ $duplicate = clone $this;
+ $duplicate->set($this->getEntityType()->getKey('id'), NULL);
+
+ // @todo Inject the UUID service into the Entity class once possible.
+ $duplicate->set('uuid', \Drupal::service('uuid')->generate());
+
// Prevent the new duplicate from being misinterpreted as a rename.
$duplicate->setOriginalId(NULL);
return $duplicate;
diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php b/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php
index 46db8c7..a70ad36 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigStorageController.php
@@ -38,13 +38,6 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
class ConfigStorageController extends EntityStorageControllerBase implements ConfigStorageControllerInterface {
/**
- * Name of the entity's UUID property.
- *
- * @var string
- */
- protected $uuidKey = 'uuid';
-
- /**
* The UUID service.
*
* @var \Drupal\Component\Uuid\UuidInterface
@@ -261,8 +254,8 @@ class ConfigStorageController extends EntityStorageControllerBase implements Con
$entity->enforceIsNew();
// Assign a new UUID if there is none yet.
- if (!isset($entity->{$this->uuidKey})) {
- $entity->{$this->uuidKey} = $this->uuidService->generate();
+ if (!$entity->uuid()) {
+ $entity->set('uuid', $this->uuidService->generate());
}
$entity->postCreate($this);
diff --git a/core/modules/block/custom_block/lib/Drupal/custom_block/Entity/CustomBlockType.php b/core/modules/block/custom_block/lib/Drupal/custom_block/Entity/CustomBlockType.php
index 7c3ce11..48bef95 100644
--- a/core/modules/block/custom_block/lib/Drupal/custom_block/Entity/CustomBlockType.php
+++ b/core/modules/block/custom_block/lib/Drupal/custom_block/Entity/CustomBlockType.php
@@ -31,8 +31,7 @@ use Drupal\custom_block\CustomBlockTypeInterface;
* bundle_of = "custom_block",
* entity_keys = {
* "id" = "id",
- * "label" = "label",
- * "uuid" = "uuid"
+ * "label" = "label"
* },
* links = {
* "delete-form" = "custom_block.type_delete",
diff --git a/core/modules/block/lib/Drupal/block/Entity/Block.php b/core/modules/block/lib/Drupal/block/Entity/Block.php
index d4e3039..c0d4de9 100644
--- a/core/modules/block/lib/Drupal/block/Entity/Block.php
+++ b/core/modules/block/lib/Drupal/block/Entity/Block.php
@@ -31,8 +31,7 @@ use Drupal\Core\Config\Entity\EntityWithPluginBagInterface;
* fieldable = FALSE,
* entity_keys = {
* "id" = "id",
- * "label" = "label",
- * "uuid" = "uuid"
+ * "label" = "label"
* },
* links = {
* "delete-form" = "block.admin_block_delete",
diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/Entity/Breakpoint.php b/core/modules/breakpoint/lib/Drupal/breakpoint/Entity/Breakpoint.php
index 69283d8..08ae4b6 100644
--- a/core/modules/breakpoint/lib/Drupal/breakpoint/Entity/Breakpoint.php
+++ b/core/modules/breakpoint/lib/Drupal/breakpoint/Entity/Breakpoint.php
@@ -23,8 +23,7 @@ use Drupal\breakpoint\InvalidBreakpointMediaQueryException;
* label = @Translation("Breakpoint"),
* entity_keys = {
* "id" = "id",
- * "label" = "label",
- * "uuid" = "uuid"
+ * "label" = "label"
* }
* )
*/
diff --git a/core/modules/breakpoint/lib/Drupal/breakpoint/Entity/BreakpointGroup.php b/core/modules/breakpoint/lib/Drupal/breakpoint/Entity/BreakpointGroup.php
index 08c63bf..f3807af 100644
--- a/core/modules/breakpoint/lib/Drupal/breakpoint/Entity/BreakpointGroup.php
+++ b/core/modules/breakpoint/lib/Drupal/breakpoint/Entity/BreakpointGroup.php
@@ -20,8 +20,7 @@ use Drupal\breakpoint\InvalidBreakpointSourceTypeException;
* label = @Translation("Breakpoint group"),
* entity_keys = {
* "id" = "id",
- * "label" = "label",
- * "uuid" = "uuid"
+ * "label" = "label"
* }
* )
*/
diff --git a/core/modules/config/lib/Drupal/config/Form/ConfigSingleExportForm.php b/core/modules/config/lib/Drupal/config/Form/ConfigSingleExportForm.php
index 2f146c6..cee2fb9 100644
--- a/core/modules/config/lib/Drupal/config/Form/ConfigSingleExportForm.php
+++ b/core/modules/config/lib/Drupal/config/Form/ConfigSingleExportForm.php
@@ -75,7 +75,7 @@ class ConfigSingleExportForm extends FormBase {
*/
public function buildForm(array $form, array &$form_state, $config_type = NULL, $config_name = NULL) {
foreach ($this->entityManager->getDefinitions() as $entity_type => $definition) {
- if ($definition->getConfigPrefix() && $definition->hasKey('uuid')) {
+ if ($definition->isSubclassOf('Drupal\Core\Config\Entity\ConfigEntityInterface')) {
$this->definitions[$entity_type] = $definition;
}
}
diff --git a/core/modules/config/lib/Drupal/config/Form/ConfigSingleImportForm.php b/core/modules/config/lib/Drupal/config/Form/ConfigSingleImportForm.php
index 8f0d076..434745e 100644
--- a/core/modules/config/lib/Drupal/config/Form/ConfigSingleImportForm.php
+++ b/core/modules/config/lib/Drupal/config/Form/ConfigSingleImportForm.php
@@ -122,7 +122,7 @@ class ConfigSingleImportForm extends ConfirmFormBase {
$entity_types = array();
foreach ($this->entityManager->getDefinitions() as $entity_type => $definition) {
- if ($definition->getConfigPrefix() && $definition->hasKey('uuid')) {
+ if ($definition->isSubclassOf('Drupal\Core\Config\Entity\ConfigEntityInterface')) {
$entity_types[$entity_type] = $definition->getLabel();
}
}
@@ -187,21 +187,20 @@ class ConfigSingleImportForm extends ConfirmFormBase {
$this->setFormError('import', $form_state, $this->t('Missing ID key "@id_key" for this @entity_type import.', array('@id_key' => $id_key, '@entity_type' => $definition->getLabel())));
return;
}
- $uuid_key = $definition->getKey('uuid');
// If there is an existing entity, ensure matching ID and UUID.
if ($entity = $entity_storage->load($data[$id_key])) {
$this->configExists = $entity;
- if (!isset($data[$uuid_key])) {
+ if (!isset($data['uuid'])) {
$this->setFormError('import', $form_state, $this->t('An entity with this machine name already exists but the import did not specify a UUID.'));
return;
}
- if ($data[$uuid_key] !== $entity->uuid()) {
+ if ($data['uuid'] !== $entity->uuid()) {
$this->setFormError('import', $form_state, $this->t('An entity with this machine name already exists but the UUID does not match.'));
return;
}
}
// If there is no entity with a matching ID, check for a UUID match.
- elseif (isset($data[$uuid_key]) && $entity_storage->loadByProperties(array($uuid_key => $data[$uuid_key]))) {
+ elseif (isset($data['uuid']) && $entity_storage->loadByProperties(array('uuid' => $data['uuid']))) {
$this->setFormError('import', $form_state, $this->t('An entity with this UUID already exists but the machine name does not match.'));
}
}
diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigEntityUnitTest.php b/core/modules/config/lib/Drupal/config/Tests/ConfigEntityUnitTest.php
index df6c96d..55ded74 100644
--- a/core/modules/config/lib/Drupal/config/Tests/ConfigEntityUnitTest.php
+++ b/core/modules/config/lib/Drupal/config/Tests/ConfigEntityUnitTest.php
@@ -78,6 +78,13 @@ class ConfigEntityUnitTest extends DrupalUnitTestBase {
));
$entity->save();
+ // Ensure that the configuration entity can be loaded by UUID.
+ $entity_loaded_by_uuid = entity_load_by_uuid($entity_type->id(), $entity->uuid());
+ // Compare UUIDs as the objects are not identical since
+ // $entity->enforceIsNew is FALSE and $entity_loaded_by_uuid->enforceIsNew
+ // is NULL.
+ $this->assertIdentical($entity->uuid(), $entity_loaded_by_uuid->uuid());
+
$entities = $this->storage->loadByProperties();
$this->assertEqual(count($entities), 3, 'Three entities are loaded when no properties are specified.');
diff --git a/core/modules/config/lib/Drupal/config/Tests/ConfigSingleImportExportTest.php b/core/modules/config/lib/Drupal/config/Tests/ConfigSingleImportExportTest.php
index bfa8304..fbd7497 100644
--- a/core/modules/config/lib/Drupal/config/Tests/ConfigSingleImportExportTest.php
+++ b/core/modules/config/lib/Drupal/config/Tests/ConfigSingleImportExportTest.php
@@ -124,7 +124,7 @@ EOD;
$this->drupalLogin($this->drupalCreateUser(array('export configuration')));
$this->drupalGet('admin/config/development/configuration/single/export/system.simple');
- $this->assertFieldByXPath('//select[@name="config_type"]//option', t('Date format'), 'The date format entity type is selected when specified in the URL.');
+ $this->assertFieldByXPath('//select[@name="config_type"]//option[@selected="selected"]', t('Simple configuration'), 'The simple configuration option is selected when specified in the URL.');
// Spot check several known simple configuration files.
$element = $this->xpath('//select[@name="config_name"]');
$options = $this->getAllOptions($element[0]);
@@ -138,10 +138,10 @@ EOD;
$this->assertFieldByXPath('//textarea[@name="export"]', "toolkit: gd\n", 'The expected system configuration is displayed.');
$this->drupalGet('admin/config/development/configuration/single/export/date_format');
- $this->assertFieldByXPath('//select[@name="config_type"]//option', t('Date format'), 'The date format entity type is selected when specified in the URL.');
+ $this->assertFieldByXPath('//select[@name="config_type"]//option[@selected="selected"]', t('Date format'), 'The date format entity type is selected when specified in the URL.');
$this->drupalGet('admin/config/development/configuration/single/export/date_format/fallback');
- $this->assertFieldByXPath('//select[@name="config_name"]//option', t('Fallback date format'), 'The fallback date format config entity is selected when specified in the URL.');
+ $this->assertFieldByXPath('//select[@name="config_name"]//option[@selected="selected"]', t('Fallback date format'), 'The fallback date format config entity is selected when specified in the URL.');
$fallback_date = \Drupal::entityManager()->getStorageController('date_format')->load('fallback');
$data = \Drupal::service('config.storage')->encode($fallback_date->getExportProperties());
diff --git a/core/modules/config/tests/config_test/lib/Drupal/config_test/Entity/ConfigQueryTest.php b/core/modules/config/tests/config_test/lib/Drupal/config_test/Entity/ConfigQueryTest.php
index 296b2fe..c3528f9 100644
--- a/core/modules/config/tests/config_test/lib/Drupal/config_test/Entity/ConfigQueryTest.php
+++ b/core/modules/config/tests/config_test/lib/Drupal/config_test/Entity/ConfigQueryTest.php
@@ -23,8 +23,7 @@ namespace Drupal\config_test\Entity;
* config_prefix = "query",
* entity_keys = {
* "id" = "id",
- * "label" = "label",
- * "uuid" = "uuid"
+ * "label" = "label"
* }
* )
*
diff --git a/core/modules/config/tests/config_test/lib/Drupal/config_test/Entity/ConfigTest.php b/core/modules/config/tests/config_test/lib/Drupal/config_test/Entity/ConfigTest.php
index d9c4cfa..1bb4deb 100644
--- a/core/modules/config/tests/config_test/lib/Drupal/config_test/Entity/ConfigTest.php
+++ b/core/modules/config/tests/config_test/lib/Drupal/config_test/Entity/ConfigTest.php
@@ -29,7 +29,6 @@ use Drupal\config_test\ConfigTestInterface;
* entity_keys = {
* "id" = "id",
* "label" = "label",
- * "uuid" = "uuid",
* "status" = "status"
* },
* links = {
diff --git a/core/modules/contact/lib/Drupal/contact/Entity/Category.php b/core/modules/contact/lib/Drupal/contact/Entity/Category.php
index db502c7..b2f2460 100644
--- a/core/modules/contact/lib/Drupal/contact/Entity/Category.php
+++ b/core/modules/contact/lib/Drupal/contact/Entity/Category.php
@@ -31,8 +31,7 @@ use Drupal\contact\CategoryInterface;
* bundle_of = "contact_message",
* entity_keys = {
* "id" = "id",
- * "label" = "label",
- * "uuid" = "uuid"
+ * "label" = "label"
* },
* links = {
* "delete-form" = "contact.category_delete",
diff --git a/core/modules/editor/lib/Drupal/editor/Entity/Editor.php b/core/modules/editor/lib/Drupal/editor/Entity/Editor.php
index 7573c28..0053de4 100644
--- a/core/modules/editor/lib/Drupal/editor/Entity/Editor.php
+++ b/core/modules/editor/lib/Drupal/editor/Entity/Editor.php
@@ -17,8 +17,7 @@ use Drupal\editor\EditorInterface;
* id = "editor",
* label = @Translation("Editor"),
* entity_keys = {
- * "id" = "format",
- * "uuid" = "uuid"
+ * "id" = "format"
* }
* )
*/
diff --git a/core/modules/entity/lib/Drupal/entity/Entity/EntityFormDisplay.php b/core/modules/entity/lib/Drupal/entity/Entity/EntityFormDisplay.php
index 611e28f..18b8dc5 100644
--- a/core/modules/entity/lib/Drupal/entity/Entity/EntityFormDisplay.php
+++ b/core/modules/entity/lib/Drupal/entity/Entity/EntityFormDisplay.php
@@ -20,7 +20,6 @@ use Drupal\entity\EntityDisplayBase;
* config_prefix = "form_display",
* entity_keys = {
* "id" = "id",
- * "uuid" = "uuid",
* "status" = "status"
* }
* )
diff --git a/core/modules/entity/lib/Drupal/entity/Entity/EntityFormMode.php b/core/modules/entity/lib/Drupal/entity/Entity/EntityFormMode.php
index eea183c..4b57139 100644
--- a/core/modules/entity/lib/Drupal/entity/Entity/EntityFormMode.php
+++ b/core/modules/entity/lib/Drupal/entity/Entity/EntityFormMode.php
@@ -42,8 +42,7 @@ use Drupal\entity\EntityFormModeInterface;
* admin_permission = "administer display modes",
* entity_keys = {
* "id" = "id",
- * "label" = "label",
- * "uuid" = "uuid"
+ * "label" = "label"
* },
* links = {
* "delete-form" = "entity.form_mode_delete",
diff --git a/core/modules/entity/lib/Drupal/entity/Entity/EntityViewDisplay.php b/core/modules/entity/lib/Drupal/entity/Entity/EntityViewDisplay.php
index bb57639..a35c4ac 100644
--- a/core/modules/entity/lib/Drupal/entity/Entity/EntityViewDisplay.php
+++ b/core/modules/entity/lib/Drupal/entity/Entity/EntityViewDisplay.php
@@ -25,7 +25,6 @@ use Drupal\entity\EntityDisplayBase;
* config_prefix = "view_display",
* entity_keys = {
* "id" = "id",
- * "uuid" = "uuid",
* "status" = "status"
* }
* )
diff --git a/core/modules/entity/lib/Drupal/entity/Entity/EntityViewMode.php b/core/modules/entity/lib/Drupal/entity/Entity/EntityViewMode.php
index fd30fb5..2d98442 100644
--- a/core/modules/entity/lib/Drupal/entity/Entity/EntityViewMode.php
+++ b/core/modules/entity/lib/Drupal/entity/Entity/EntityViewMode.php
@@ -42,8 +42,7 @@ use Drupal\entity\EntityViewModeInterface;
* admin_permission = "administer display modes",
* entity_keys = {
* "id" = "id",
- * "label" = "label",
- * "uuid" = "uuid"
+ * "label" = "label"
* },
* links = {
* "delete-form" = "entity.view_mode_delete",
diff --git a/core/modules/field/lib/Drupal/field/Entity/FieldConfig.php b/core/modules/field/lib/Drupal/field/Entity/FieldConfig.php
index da997b6..503fe14 100644
--- a/core/modules/field/lib/Drupal/field/Entity/FieldConfig.php
+++ b/core/modules/field/lib/Drupal/field/Entity/FieldConfig.php
@@ -28,8 +28,7 @@ use Drupal\field\FieldConfigInterface;
* config_prefix = "field",
* entity_keys = {
* "id" = "id",
- * "label" = "id",
- * "uuid" = "uuid"
+ * "label" = "id"
* }
* )
*/
diff --git a/core/modules/field/lib/Drupal/field/Entity/FieldInstanceConfig.php b/core/modules/field/lib/Drupal/field/Entity/FieldInstanceConfig.php
index 3c35bfb..6024061 100644
--- a/core/modules/field/lib/Drupal/field/Entity/FieldInstanceConfig.php
+++ b/core/modules/field/lib/Drupal/field/Entity/FieldInstanceConfig.php
@@ -27,8 +27,7 @@ use Drupal\field\FieldInstanceConfigInterface;
* config_prefix = "instance",
* entity_keys = {
* "id" = "id",
- * "label" = "label",
- * "uuid" = "uuid"
+ * "label" = "label"
* }
* )
*/
diff --git a/core/modules/filter/lib/Drupal/filter/Entity/FilterFormat.php b/core/modules/filter/lib/Drupal/filter/Entity/FilterFormat.php
index 11a4675..09e098f 100644
--- a/core/modules/filter/lib/Drupal/filter/Entity/FilterFormat.php
+++ b/core/modules/filter/lib/Drupal/filter/Entity/FilterFormat.php
@@ -35,7 +35,6 @@ use Drupal\filter\Plugin\FilterInterface;
* entity_keys = {
* "id" = "format",
* "label" = "name",
- * "uuid" = "uuid",
* "weight" = "weight",
* "status" = "status"
* },
diff --git a/core/modules/image/lib/Drupal/image/Entity/ImageStyle.php b/core/modules/image/lib/Drupal/image/Entity/ImageStyle.php
index 6e5babd..2d9304c 100644
--- a/core/modules/image/lib/Drupal/image/Entity/ImageStyle.php
+++ b/core/modules/image/lib/Drupal/image/Entity/ImageStyle.php
@@ -36,8 +36,7 @@ use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
* config_prefix = "style",
* entity_keys = {
* "id" = "name",
- * "label" = "label",
- * "uuid" = "uuid"
+ * "label" = "label"
* },
* links = {
* "flush-form" = "image.style_flush",
diff --git a/core/modules/language/lib/Drupal/language/Entity/Language.php b/core/modules/language/lib/Drupal/language/Entity/Language.php
index a9dee76..7c92351 100644
--- a/core/modules/language/lib/Drupal/language/Entity/Language.php
+++ b/core/modules/language/lib/Drupal/language/Entity/Language.php
@@ -32,8 +32,7 @@ use Drupal\language\LanguageInterface;
* entity_keys = {
* "id" = "id",
* "label" = "label",
- * "weight" = "weight",
- * "uuid" = "uuid"
+ * "weight" = "weight"
* },
* links = {
* "delete-form" = "language.delete",
diff --git a/core/modules/migrate/lib/Drupal/migrate/Entity/Migration.php b/core/modules/migrate/lib/Drupal/migrate/Entity/Migration.php
index 0f06a6e..3967aec 100644
--- a/core/modules/migrate/lib/Drupal/migrate/Entity/Migration.php
+++ b/core/modules/migrate/lib/Drupal/migrate/Entity/Migration.php
@@ -32,8 +32,7 @@ use Drupal\migrate\Plugin\MigrateIdMapInterface;
* entity_keys = {
* "id" = "id",
* "label" = "label",
- * "weight" = "weight",
- * "uuid" = "uuid"
+ * "weight" = "weight"
* }
* )
*/
diff --git a/core/modules/node/lib/Drupal/node/Entity/NodeType.php b/core/modules/node/lib/Drupal/node/Entity/NodeType.php
index a7418d8..97d9029 100644
--- a/core/modules/node/lib/Drupal/node/Entity/NodeType.php
+++ b/core/modules/node/lib/Drupal/node/Entity/NodeType.php
@@ -33,8 +33,7 @@ use Drupal\node\NodeTypeInterface;
* bundle_of = "node",
* entity_keys = {
* "id" = "type",
- * "label" = "name",
- * "uuid" = "uuid"
+ * "label" = "name"
* },
* links = {
* "add-form" = "node.add",
diff --git a/core/modules/picture/lib/Drupal/picture/Entity/PictureMapping.php b/core/modules/picture/lib/Drupal/picture/Entity/PictureMapping.php
index 883a0e61..ba1351d 100644
--- a/core/modules/picture/lib/Drupal/picture/Entity/PictureMapping.php
+++ b/core/modules/picture/lib/Drupal/picture/Entity/PictureMapping.php
@@ -30,8 +30,7 @@ use Drupal\picture\PictureMappingInterface;
* config_prefix = "mappings",
* entity_keys = {
* "id" = "id",
- * "label" = "label",
- * "uuid" = "uuid"
+ * "label" = "label"
* },
* links = {
* "edit-form" = "picture.mapping_page_edit",
diff --git a/core/modules/rdf/lib/Drupal/rdf/Entity/RdfMapping.php b/core/modules/rdf/lib/Drupal/rdf/Entity/RdfMapping.php
index 2ca8a7b..1916320 100644
--- a/core/modules/rdf/lib/Drupal/rdf/Entity/RdfMapping.php
+++ b/core/modules/rdf/lib/Drupal/rdf/Entity/RdfMapping.php
@@ -19,8 +19,7 @@ use Drupal\rdf\RdfMappingInterface;
* label = @Translation("RDF mapping"),
* config_prefix = "mapping",
* entity_keys = {
- * "id" = "id",
- * "uuid" = "uuid"
+ * "id" = "id"
* }
* )
*/
diff --git a/core/modules/search/lib/Drupal/search/Entity/SearchPage.php b/core/modules/search/lib/Drupal/search/Entity/SearchPage.php
index 45b249d..b992a76 100644
--- a/core/modules/search/lib/Drupal/search/Entity/SearchPage.php
+++ b/core/modules/search/lib/Drupal/search/Entity/SearchPage.php
@@ -44,7 +44,6 @@ use Drupal\search\SearchPageInterface;
* entity_keys = {
* "id" = "id",
* "label" = "label",
- * "uuid" = "uuid",
* "weight" = "weight",
* "status" = "status"
* }
diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Entity/ShortcutSet.php b/core/modules/shortcut/lib/Drupal/shortcut/Entity/ShortcutSet.php
index ab6a85d..ce52aca 100644
--- a/core/modules/shortcut/lib/Drupal/shortcut/Entity/ShortcutSet.php
+++ b/core/modules/shortcut/lib/Drupal/shortcut/Entity/ShortcutSet.php
@@ -33,8 +33,7 @@ use Drupal\shortcut\ShortcutSetInterface;
* config_prefix = "set",
* entity_keys = {
* "id" = "id",
- * "label" = "label",
- * "uuid" = "uuid"
+ * "label" = "label"
* },
* links = {
* "customize-form" = "shortcut.set_customize",
diff --git a/core/modules/system/lib/Drupal/system/Entity/Action.php b/core/modules/system/lib/Drupal/system/Entity/Action.php
index a487433..972b4a3 100644
--- a/core/modules/system/lib/Drupal/system/Entity/Action.php
+++ b/core/modules/system/lib/Drupal/system/Entity/Action.php
@@ -22,8 +22,7 @@ use Drupal\Component\Plugin\ConfigurablePluginInterface;
* admin_permission = "administer actions",
* entity_keys = {
* "id" = "id",
- * "label" = "label",
- * "uuid" = "uuid"
+ * "label" = "label"
* }
* )
*/
diff --git a/core/modules/system/lib/Drupal/system/Entity/DateFormat.php b/core/modules/system/lib/Drupal/system/Entity/DateFormat.php
index 593e5bf..71c2451 100644
--- a/core/modules/system/lib/Drupal/system/Entity/DateFormat.php
+++ b/core/modules/system/lib/Drupal/system/Entity/DateFormat.php
@@ -29,8 +29,7 @@ use Drupal\system\DateFormatInterface;
* },
* entity_keys = {
* "id" = "id",
- * "label" = "label",
- * "uuid" = "uuid"
+ * "label" = "label"
* },
* admin_permission = "administer site configuration",
* links = {
diff --git a/core/modules/system/lib/Drupal/system/Entity/Menu.php b/core/modules/system/lib/Drupal/system/Entity/Menu.php
index 7477a83..e8aecff 100644
--- a/core/modules/system/lib/Drupal/system/Entity/Menu.php
+++ b/core/modules/system/lib/Drupal/system/Entity/Menu.php
@@ -24,8 +24,7 @@ use Drupal\system\MenuInterface;
* admin_permission = "administer menu",
* entity_keys = {
* "id" = "id",
- * "label" = "label",
- * "uuid" = "uuid"
+ * "label" = "label"
* }
* )
*/
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Entity/Vocabulary.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Entity/Vocabulary.php
index d1d763a..6a0132a 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Entity/Vocabulary.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Entity/Vocabulary.php
@@ -32,8 +32,7 @@ use Drupal\taxonomy\VocabularyInterface;
* entity_keys = {
* "id" = "vid",
* "label" = "name",
- * "weight" = "weight",
- * "uuid" = "uuid"
+ * "weight" = "weight"
* },
* links = {
* "add-form" = "taxonomy.term_add",
diff --git a/core/modules/tour/lib/Drupal/tour/Entity/Tour.php b/core/modules/tour/lib/Drupal/tour/Entity/Tour.php
index f00d1fc..f581488 100644
--- a/core/modules/tour/lib/Drupal/tour/Entity/Tour.php
+++ b/core/modules/tour/lib/Drupal/tour/Entity/Tour.php
@@ -22,8 +22,7 @@ use Drupal\tour\TourInterface;
* },
* entity_keys = {
* "id" = "id",
- * "label" = "label",
- * "uuid" = "uuid"
+ * "label" = "label"
* }
* )
*/
diff --git a/core/modules/user/lib/Drupal/user/Entity/Role.php b/core/modules/user/lib/Drupal/user/Entity/Role.php
index c89dea8..49152e3 100644
--- a/core/modules/user/lib/Drupal/user/Entity/Role.php
+++ b/core/modules/user/lib/Drupal/user/Entity/Role.php
@@ -31,7 +31,6 @@ use Drupal\user\RoleInterface;
* config_prefix = "role",
* entity_keys = {
* "id" = "id",
- * "uuid" = "uuid",
* "weight" = "weight",
* "label" = "label"
* },
diff --git a/core/modules/views/lib/Drupal/views/Entity/View.php b/core/modules/views/lib/Drupal/views/Entity/View.php
index 0006310..62e5536 100644
--- a/core/modules/views/lib/Drupal/views/Entity/View.php
+++ b/core/modules/views/lib/Drupal/views/Entity/View.php
@@ -29,7 +29,6 @@ use Drupal\views\ViewExecutable;
* entity_keys = {
* "id" = "id",
* "label" = "label",
- * "uuid" = "uuid",
* "status" = "status"
* }
* )