Simplify *One methods in the persister

Author: merk

Persister/ObjectPersister.php

@@ -71,8 +71,7 @@ private function log(BulkException $e)
      */
     public function insertOne($object)
     {
-        $document = $this->transformToElasticaDocument($object);
-        $this->type->addDocument($document);
+        $this->insertMany(array($object));
     }
 
     /**
@@ -83,11 +82,7 @@ public function insertOne($object)
      **/
     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 @@ public function replaceOne($object)
      **/
     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 @@ public function deleteOne($object)
      **/
     public function deleteById($id)
     {
-        try {
-            $this->type->deleteById($id);
-        } catch (NotFoundException $e) {}
+        $this->deleteManyByIdentifiers(array($id));
     }
 
     /**

Tests/Persister/ObjectPersisterTest.php

@@ -47,10 +47,7 @@ public function testThatCanReplaceObject()
             ->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 @@ public function testThatCanInsertObject()
         $typeMock->expects($this->never())
             ->method('deleteById');
         $typeMock->expects($this->once())
-            ->method('addDocument');
+            ->method('addDocuments');
 
         $fields = array('name' => array());
 
@@ -130,7 +127,7 @@ public function testThatCanDeleteObject()
             ->disableOriginalConstructor()
             ->getMock();
         $typeMock->expects($this->once())
-            ->method('deleteById');
+            ->method('deleteDocuments');
         $typeMock->expects($this->never())
             ->method('addDocument');
 

Tests/Persister/ObjectSerializerPersisterTest.php

@@ -42,10 +42,7 @@ public function testThatCanReplaceObject()
             ->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 @@ public function testThatCanInsertObject()
         $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 @@ public function testThatCanDeleteObject()
             ->disableOriginalConstructor()
             ->getMock();
         $typeMock->expects($this->once())
-            ->method('deleteById');
+            ->method('deleteDocuments');
         $typeMock->expects($this->never())
             ->method('addDocument');