From 21e5d906a7ec8fd696dbacd03eb176d3d053314c Mon Sep 17 00:00:00 2001
From: Tim Nagel <tim@nagel.com.au>
Date: Thu, 3 Jul 2014 23:37:44 +1000
Subject: [PATCH] Simplify *One methods in the persister

---
 Persister/ObjectPersister.php                  | 18 ++++--------------
 Tests/Persister/ObjectPersisterTest.php        |  9 +++------
 .../ObjectSerializerPersisterTest.php          |  9 +++------
 3 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/Persister/ObjectPersister.php b/Persister/ObjectPersister.php
index 54d5fd1..9604f7e 100644
--- a/Persister/ObjectPersister.php
+++ b/Persister/ObjectPersister.php
@@ -71,8 +71,7 @@ class ObjectPersister implements ObjectPersisterInterface
      */
     public function insertOne($object)
     {
-        $document = $this->transformToElasticaDocument($object);
-        $this->type->addDocument($document);
+        $this->insertMany(array($object));
     }
 
     /**
@@ -83,11 +82,7 @@ class ObjectPersister implements ObjectPersisterInterface
      **/
     public function replaceOne($object)
     {
-        $document = $this->transformToElasticaDocument($object);
-        try {
-            $this->type->deleteById($document->getId());
-        } catch (NotFoundException $e) {}
-        $this->type->addDocument($document);
+        $this->replaceMany(array($object));
     }
 
     /**
@@ -98,10 +93,7 @@ class ObjectPersister implements ObjectPersisterInterface
      **/
     public function deleteOne($object)
     {
-        $document = $this->transformToElasticaDocument($object);
-        try {
-            $this->type->deleteById($document->getId());
-        } catch (NotFoundException $e) {}
+        $this->deleteMany(array($object));
     }
 
     /**
@@ -113,9 +105,7 @@ class ObjectPersister implements ObjectPersisterInterface
      **/
     public function deleteById($id)
     {
-        try {
-            $this->type->deleteById($id);
-        } catch (NotFoundException $e) {}
+        $this->deleteManyByIdentifiers(array($id));
     }
 
     /**
diff --git a/Tests/Persister/ObjectPersisterTest.php b/Tests/Persister/ObjectPersisterTest.php
index 497c286..77a8809 100644
--- a/Tests/Persister/ObjectPersisterTest.php
+++ b/Tests/Persister/ObjectPersisterTest.php
@@ -47,10 +47,7 @@ class ObjectPersisterTest extends \PHPUnit_Framework_TestCase
             ->disableOriginalConstructor()
             ->getMock();
         $typeMock->expects($this->once())
-            ->method('deleteById')
-            ->with($this->equalTo(123));
-        $typeMock->expects($this->once())
-            ->method('addDocument');
+            ->method('updateDocuments');
 
         $fields = array('name' => array());
 
@@ -91,7 +88,7 @@ class ObjectPersisterTest extends \PHPUnit_Framework_TestCase
         $typeMock->expects($this->never())
             ->method('deleteById');
         $typeMock->expects($this->once())
-            ->method('addDocument');
+            ->method('addDocuments');
 
         $fields = array('name' => array());
 
@@ -130,7 +127,7 @@ class ObjectPersisterTest extends \PHPUnit_Framework_TestCase
             ->disableOriginalConstructor()
             ->getMock();
         $typeMock->expects($this->once())
-            ->method('deleteById');
+            ->method('deleteDocuments');
         $typeMock->expects($this->never())
             ->method('addDocument');
 
diff --git a/Tests/Persister/ObjectSerializerPersisterTest.php b/Tests/Persister/ObjectSerializerPersisterTest.php
index aae3a64..fe15c0c 100644
--- a/Tests/Persister/ObjectSerializerPersisterTest.php
+++ b/Tests/Persister/ObjectSerializerPersisterTest.php
@@ -42,10 +42,7 @@ class ObjectSerializerPersisterTest extends \PHPUnit_Framework_TestCase
             ->disableOriginalConstructor()
             ->getMock();
         $typeMock->expects($this->once())
-            ->method('deleteById')
-            ->with($this->equalTo(123));
-        $typeMock->expects($this->once())
-            ->method('addDocument');
+            ->method('updateDocuments');
 
         $serializerMock = $this->getMockBuilder('FOS\ElasticaBundle\Serializer\Callback')->getMock();
         $serializerMock->expects($this->once())->method('serialize');
@@ -65,7 +62,7 @@ class ObjectSerializerPersisterTest extends \PHPUnit_Framework_TestCase
         $typeMock->expects($this->never())
             ->method('deleteById');
         $typeMock->expects($this->once())
-            ->method('addDocument');
+            ->method('addDocuments');
 
         $serializerMock = $this->getMockBuilder('FOS\ElasticaBundle\Serializer\Callback')->getMock();
         $serializerMock->expects($this->once())->method('serialize');
@@ -83,7 +80,7 @@ class ObjectSerializerPersisterTest extends \PHPUnit_Framework_TestCase
             ->disableOriginalConstructor()
             ->getMock();
         $typeMock->expects($this->once())
-            ->method('deleteById');
+            ->method('deleteDocuments');
         $typeMock->expects($this->never())
             ->method('addDocument');