Repository#find now returns null if document was not found

ORM/Repository.php

@@ -11,6 +11,7 @@
 
 namespace ONGR\ElasticsearchBundle\ORM;
 
+use Elasticsearch\Common\Exceptions\Missing404Exception;
 use ONGR\ElasticsearchBundle\Document\DocumentInterface;
 use ONGR\ElasticsearchBundle\DSL\Query\TermsQuery;
 use ONGR\ElasticsearchBundle\DSL\Search;
@@ -83,33 +84,38 @@ protected function getTypes()
     }
 
     /**
-     * Returns a single document data by ID.
+     * Returns a single document data by ID or null if document is not found.
      *
-     * @param string $id
+     * @param string $id Document Id to find.
+     *
+     * @return DocumentInterface|null
      *
-     * @return DocumentInterface
      * @throws \LogicException
      */
     public function find($id)
     {
-        if (count($this->types) == 1) {
-            $params = [
-                'index' => $this->manager->getConnection()->getIndexName(),
-                'type' => $this->types[0],
-                'id' => $id,
-            ];
+        if (count($this->types) !== 1) {
+            throw new \LogicException('Only one type must be specified for the find() method');
+        }
+
+        $params = [
+            'index' => $this->manager->getConnection()->getIndexName(),
+            'type' => $this->types[0],
+            'id' => $id,
+        ];
 
+        try {
             $result = $this->manager->getConnection()->getClient()->get($params);
+        } catch (Missing404Exception $e) {
+            return null;
+        }
 
-            $converter = new Converter(
-                $this->manager->getTypesMapping(),
-                $this->manager->getBundlesMapping()
-            );
+        $converter = new Converter(
+            $this->manager->getTypesMapping(),
+            $this->manager->getBundlesMapping()
+        );
 
-            return $converter->convertToDocument($result);
-        } else {
-            throw new \LogicException('Only one type must be specified for the find() method');
-        }
+        return $converter->convertToDocument($result);
     }
 
     /**
@@ -224,9 +230,10 @@ public function suggest($suggesters)
     /**
      * Removes a single document data by ID.
      *
-     * @param string $id
+     * @param string $id Document ID to remove.
      *
      * @return array
+     *
      * @throws \LogicException
      */
     public function remove($id)

Tests/Functional/Client/ConnectionTest.php

@@ -103,8 +103,7 @@ public function testBulk()
         $connection->bulk('delete', 'product', ['_id' => 'baz']);
         $connection->commit();
 
-        $this->setExpectedException('Elasticsearch\Common\Exceptions\Missing404Exception');
-        $product = $repository->find('baz');
+        $this->assertNull($repository->find('baz'), 'Document should not be found.');
     }
 
     /**

Tests/Functional/ORM/RepositoryTest.php

@@ -226,14 +226,12 @@ public function testFind()
 
     /**
      * Test repository find on non-existent document.
-     *
-     * @expectedException \Elasticsearch\Common\Exceptions\Missing404Exception
      */
-    public function testFindException()
+    public function testFindNull()
     {
         $repo = $this->getManager()->getRepository('AcmeTestBundle:Product');
 
-        $repo->find(123);
+        $this->assertNull($repo->find(123));
     }
 
     /**