Start removing deprecated methods for Message for D8

message-d8-remove-deprecated-methods.patch

diff --git a/message.api.php b/message.api.php
index 0f62a1a..4e9366f 100644
--- a/message.api.php
+++ b/message.api.php
@@ -6,6 +6,8 @@
  *
  */
 
+use Drupal\message\Entity\MessageType;
+
 /**
  * @addtogroup hooks
  * @{
@@ -72,7 +74,7 @@ function hook_message_view_alter(&$build) {
  * @see hook_default_message_type_alter()
  */
 function hook_default_message_type() {
-  $defaults['main'] = entity_create('message_type', array(
+  $defaults['main'] = MessageType::create(array(
   ));
   return $defaults;
 }
diff --git a/message.module b/message.module
index 010761b..e16ac68 100644
--- a/message.module
+++ b/message.module
@@ -172,7 +172,7 @@ function message_cron() {
 
   // Delete all gathered messages.
   if (!empty($purge_messages)) {
-    \Drupal::entityManager()->getStorage('message')->delete($purge_messages);
+    \Drupal::entityTypeManager()->getStorage('message')->delete($purge_messages);
   }
 }
 
diff --git a/modules/message_example/message_example.tokens.inc b/modules/message_example/message_example.tokens.inc
index c26ed5a..2c12511 100644
--- a/modules/message_example/message_example.tokens.inc
+++ b/modules/message_example/message_example.tokens.inc
@@ -112,10 +112,12 @@ function message_example_tokens($type, $tokens, array $data = array(), array $op
           break;
         case 'node-render':
           if ($message->bundle() == 'example_create_comment') {
-            $replacements[$original] = render(entity_view($message->field_comment_reference->entity->getCommentedEntity(), 'teaser'));
+            $view_builder = \Drupal::entityTypeManager()->getViewBuilder($message->getEntityTypeId());
+            $replacements[$original] = render($view_builder->view($message->field_comment_reference->entity->getCommentedEntity(), 'teaser', $langcode));
           }
           else {
-            $replacements[$original] = render(entity_view($message->field_node_reference->get(0)->entity, 'teaser'));
+            $view_builder = \Drupal::entityTypeManager()->getViewBuilder($message->getEntityTypeId());
+            $replacements[$original] = render($view_builder->view($message->field_node_reference->get(0)->entity, 'teaser', $langcode));
           }
           break;
         case 'comment-url':
diff --git a/src/Form/DeleteMultiple.php b/src/Form/DeleteMultiple.php
index 28f53f3..7b36831 100644
--- a/src/Form/DeleteMultiple.php
+++ b/src/Form/DeleteMultiple.php
@@ -13,7 +13,6 @@ use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Url;
 use Drupal\message\Entity\Message;
 use Drupal\user\PrivateTempStoreFactory;
-use Drupal\user\TempStoreFactory;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
diff --git a/src/MessageTypeListBuilder.php b/src/MessageTypeListBuilder.php
index 4ae4e9a..2bb4b15 100644
--- a/src/MessageTypeListBuilder.php
+++ b/src/MessageTypeListBuilder.php
@@ -35,7 +35,7 @@ class MessageTypeListBuilder extends ConfigEntityListBuilder {
    */
   public function buildRow(EntityInterface $entity) {
     $row['title'] = array(
-      'data' => $this->getLabel($entity),
+      'data' => $entity->label(),
       'class' => array('menu-label'),
     );
     $row['description'] = Xss::filterAdmin($entity->getDescription());
diff --git a/src/MessageViewBuilder.php b/src/MessageViewBuilder.php
index f77beb9..94d5589 100644
--- a/src/MessageViewBuilder.php
+++ b/src/MessageViewBuilder.php
@@ -22,6 +22,7 @@ class MessageViewBuilder extends EntityViewBuilder {
     $build = parent::view($entity, $view_mode, $langcode);
 
     // Load the partials in the correct language.
+    /* @var $entity \Drupal\message\Entity\Message */
     $partials = $entity->getType()->getText(NULL, array('text' => TRUE));
 
     if (!$langcode) {
@@ -36,7 +37,7 @@ class MessageViewBuilder extends EntityViewBuilder {
     $extra = '';
 
     // Get the partials the user selected for the current view mode.
-    $extra_fields = entity_get_display('message', $entity->bundle(), $view_mode);
+    $extra_fields = \Drupal::entityTypeManager()->getStorage('entity_view_display')->load('message' . '.' . $entity->bundle() . '.' . $view_mode);
     foreach (array_keys($extra_fields->getComponents()) as $extra_fields) {
       list(, $delta) = explode('_', $extra_fields);
 
diff --git a/src/Tests/MessageEntityDelete.php b/src/Tests/MessageEntityDelete.php
index 6c82d39..6e96935 100644
--- a/src/Tests/MessageEntityDelete.php
+++ b/src/Tests/MessageEntityDelete.php
@@ -54,7 +54,7 @@ class MessageEntityDelete extends MessageTestBase {
     $this->createMessageType('dummy_message', 'Dummy message', 'This is a dummy message text', array('Dummy message type.'));
 
     // Create a vocabulary.
-    $this->vocabulary = entity_create('taxonomy_vocabulary', array(
+    $this->vocabulary = Vocabulary::create(array(
       'name' => $this->randomMachineName(),
       'description' => $this->randomMachineName(),
       'vid' => Unicode::strtolower($this->randomMachineName()),
@@ -74,12 +74,12 @@ class MessageEntityDelete extends MessageTestBase {
     $this->contentType = $this->drupalCreateContentType();
 
     for ($i = 0; $i <= 5; $i++) {
-      entity_create('node', array(
+      Node::create(array(
         'type' => $this->contentType->id(),
         'title' => 'Node ' . $i,
       ))->save();
 
-      entity_create('taxonomy_term', array(
+      Term::create(array(
         'vid' => $this->vocabulary->id(),
         'name' => 'term ' . $i,
       ))->save();
@@ -192,6 +192,7 @@ class MessageEntityDelete extends MessageTestBase {
     $message->set('field_term_reference', $term);
     $message->save();
 
+    /* @var $term Term */
     $term->delete();
     $this->assertFalse(Message::load($message->id()), 'Message deleted after deleting single referenced term.');