From 4531b0967cfb6747cd74f5464cdebedc046ff212 Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Wed, 21 Jun 2017 14:11:41 -0500
Subject: [PATCH] MAGETWO-66480: [GITHUB] URL key for specified store already
 exists #6671

- refactoring
---
 .../Model/Message/UrlRewriteExceptionMessageFactory.php       | 2 --
 .../Magento/Framework/Message/ExceptionMessageFactoryPool.php | 2 +-
 .../Framework/Message/ExceptionMessageLookupFactory.php       | 2 +-
 .../Message/Test/Unit/ExceptionMessageFactoryPoolTest.php     | 4 ++--
 .../Message/Test/Unit/ExceptionMessageLookupFactoryTest.php   | 4 ++--
 5 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/UrlRewrite/Model/Message/UrlRewriteExceptionMessageFactory.php b/app/code/Magento/UrlRewrite/Model/Message/UrlRewriteExceptionMessageFactory.php
index 9b4c29d26157..846d65564154 100644
--- a/app/code/Magento/UrlRewrite/Model/Message/UrlRewriteExceptionMessageFactory.php
+++ b/app/code/Magento/UrlRewrite/Model/Message/UrlRewriteExceptionMessageFactory.php
@@ -16,8 +16,6 @@ class UrlRewriteExceptionMessageFactory implements ExceptionMessageFactoryInterf
 {
     const URL_DUPLICATE_MESSAGE = 'urlDuplicateMessage';
 
-    const EXCEPTION_CLASS = UrlAlreadyExistsException::class;
-
     /** @var Factory */
     private $messageFactory;
 
diff --git a/lib/internal/Magento/Framework/Message/ExceptionMessageFactoryPool.php b/lib/internal/Magento/Framework/Message/ExceptionMessageFactoryPool.php
index e407b894d219..60c12d6606f2 100644
--- a/lib/internal/Magento/Framework/Message/ExceptionMessageFactoryPool.php
+++ b/lib/internal/Magento/Framework/Message/ExceptionMessageFactoryPool.php
@@ -33,7 +33,7 @@ public function __construct(
      * @param \Exception $exception
      * @return ExceptionMessageFactoryInterface|null
      */
-    public function getMessageGenerator(\Exception $exception)
+    public function getMessageFactory(\Exception $exception)
     {
         if (isset($this->exceptionMessageFactoryMap[get_class($exception)])) {
             return $this->exceptionMessageFactoryMap[get_class($exception)];
diff --git a/lib/internal/Magento/Framework/Message/ExceptionMessageLookupFactory.php b/lib/internal/Magento/Framework/Message/ExceptionMessageLookupFactory.php
index 66dbf42418af..b0f8c3d17baa 100644
--- a/lib/internal/Magento/Framework/Message/ExceptionMessageLookupFactory.php
+++ b/lib/internal/Magento/Framework/Message/ExceptionMessageLookupFactory.php
@@ -26,7 +26,7 @@ public function __construct(ExceptionMessageFactoryPool $exceptionMessageFactory
      */
     public function createMessage(\Exception $exception, $type = MessageInterface::TYPE_ERROR)
     {
-        $messageGenerator = $this->exceptionMessageFactoryPool->getMessageGenerator($exception);
+        $messageGenerator = $this->exceptionMessageFactoryPool->getMessageFactory($exception);
         return $messageGenerator->createMessage($exception, $type);
     }
 }
diff --git a/lib/internal/Magento/Framework/Message/Test/Unit/ExceptionMessageFactoryPoolTest.php b/lib/internal/Magento/Framework/Message/Test/Unit/ExceptionMessageFactoryPoolTest.php
index 41c829edc05a..29069913c8cf 100644
--- a/lib/internal/Magento/Framework/Message/Test/Unit/ExceptionMessageFactoryPoolTest.php
+++ b/lib/internal/Magento/Framework/Message/Test/Unit/ExceptionMessageFactoryPoolTest.php
@@ -50,7 +50,7 @@ public function testSuccessfulDefaultCreateMessage()
         $exception = new \Exception('message');
         $this->assertEquals(
             $this->defaultExceptionMessageFactoryMock,
-            $this->exceptionMessageFactoryPool->getMessageGenerator($exception)
+            $this->exceptionMessageFactoryPool->getMessageFactory($exception)
         );
     }
 
@@ -59,7 +59,7 @@ public function testSuccessfulSpecificCreateMessage()
         $localizedException = new LocalizedException(__('message'));
         $this->assertEquals(
             $this->specificExceptionMessageFactoryPoolMock,
-            $this->exceptionMessageFactoryPool->getMessageGenerator($localizedException)
+            $this->exceptionMessageFactoryPool->getMessageFactory($localizedException)
         );
     }
 }
diff --git a/lib/internal/Magento/Framework/Message/Test/Unit/ExceptionMessageLookupFactoryTest.php b/lib/internal/Magento/Framework/Message/Test/Unit/ExceptionMessageLookupFactoryTest.php
index ad82e8c3d44f..55a90d6140f9 100644
--- a/lib/internal/Magento/Framework/Message/Test/Unit/ExceptionMessageLookupFactoryTest.php
+++ b/lib/internal/Magento/Framework/Message/Test/Unit/ExceptionMessageLookupFactoryTest.php
@@ -29,7 +29,7 @@ protected function setUp()
     {
         $this->exceptionMessageFactoryPool = $this->getMock(
             \Magento\Framework\Message\ExceptionMessageFactoryPool::class,
-            ['getMessageGenerator'],
+            ['getMessageFactory'],
             [],
             '',
             false
@@ -58,7 +58,7 @@ public function test()
         $this->exceptionMessageFactoryPool->expects(
             $this->once()
         )->method(
-            'getMessageGenerator'
+            'getMessageFactory'
         )->with(
             $exception
         )->will(