Refactor to consistently use RetryExecutor for all transports

Author: clue

src/Resolver/Factory.php

@@ -128,7 +128,7 @@ private function createExecutor($nameserver, LoopInterface $loop)
             );
         }
 
-        return new CoopExecutor($executor);
+        return new CoopExecutor(new RetryExecutor($executor));
     }
 
     private function createTcpExecutor($nameserver, LoopInterface $loop)
@@ -142,15 +142,13 @@ private function createTcpExecutor($nameserver, LoopInterface $loop)
 
     private function createUdpExecutor($nameserver, LoopInterface $loop)
     {
-        return new RetryExecutor(
-            new TimeoutExecutor(
-                new UdpTransportExecutor(
-                    $nameserver,
-                    $loop
-                ),
-                5.0,
+        return new TimeoutExecutor(
+            new UdpTransportExecutor(
+                $nameserver,
                 $loop
-            )
+            ),
+            5.0,
+            $loop
         );
     }
 }

tests/Resolver/FactoryTest.php

@@ -36,21 +36,21 @@ public function createWithoutSchemeShouldCreateResolverWithSelectiveUdpAndTcpExe
 
         $ref = new \ReflectionProperty($coopExecutor, 'executor');
         $ref->setAccessible(true);
-        $selectiveExecutor = $ref->getValue($coopExecutor);
+        $retryExecutor = $ref->getValue($coopExecutor);
+
+        $this->assertInstanceOf('React\Dns\Query\RetryExecutor', $retryExecutor);
+
+        $ref = new \ReflectionProperty($retryExecutor, 'executor');
+        $ref->setAccessible(true);
+        $selectiveExecutor = $ref->getValue($retryExecutor);
 
         $this->assertInstanceOf('React\Dns\Query\SelectiveTransportExecutor', $selectiveExecutor);
 
         // udp below:
 
         $ref = new \ReflectionProperty($selectiveExecutor, 'datagramExecutor');
         $ref->setAccessible(true);
-        $retryExecutor = $ref->getValue($selectiveExecutor);
-
-        $this->assertInstanceOf('React\Dns\Query\RetryExecutor', $retryExecutor);
-
-        $ref = new \ReflectionProperty($retryExecutor, 'executor');
-        $ref->setAccessible(true);
-        $timeoutExecutor = $ref->getValue($retryExecutor);
+        $timeoutExecutor = $ref->getValue($selectiveExecutor);
 
         $this->assertInstanceOf('React\Dns\Query\TimeoutExecutor', $timeoutExecutor);
 
@@ -124,7 +124,13 @@ public function createWithTcpSchemeShouldCreateResolverWithTcpExecutorStack()
 
         $ref = new \ReflectionProperty($coopExecutor, 'executor');
         $ref->setAccessible(true);
-        $timeoutExecutor = $ref->getValue($coopExecutor);
+        $retryExecutor = $ref->getValue($coopExecutor);
+
+        $this->assertInstanceOf('React\Dns\Query\RetryExecutor', $retryExecutor);
+
+        $ref = new \ReflectionProperty($retryExecutor, 'executor');
+        $ref->setAccessible(true);
+        $timeoutExecutor = $ref->getValue($retryExecutor);
 
         $this->assertInstanceOf('React\Dns\Query\TimeoutExecutor', $timeoutExecutor);
 
@@ -154,7 +160,13 @@ public function createWithConfigWithTcpNameserverSchemeShouldCreateResolverWithT
 
         $ref = new \ReflectionProperty($coopExecutor, 'executor');
         $ref->setAccessible(true);
-        $timeoutExecutor = $ref->getValue($coopExecutor);
+        $retryExecutor = $ref->getValue($coopExecutor);
+
+        $this->assertInstanceOf('React\Dns\Query\RetryExecutor', $retryExecutor);
+
+        $ref = new \ReflectionProperty($retryExecutor, 'executor');
+        $ref->setAccessible(true);
+        $timeoutExecutor = $ref->getValue($retryExecutor);
 
         $this->assertInstanceOf('React\Dns\Query\TimeoutExecutor', $timeoutExecutor);