From 2fe503d3c0b4e076e231976d77a3afc6d9b75241 Mon Sep 17 00:00:00 2001
From: Alexander Nezdoiminoga <alex@magecore.com>
Date: Wed, 16 Dec 2015 17:09:21 +0200
Subject: [PATCH] Revert "CRM-4744: Optimize performance of the Magento sync
 for one day period"

---
 src/Oro/Bundle/BatchBundle/Step/ItemStep.php  | 14 -------------
 .../Step/StepExecutionRestoreInterface.php    | 17 ----------------
 .../Writer/PersistentBatchWriter.php          | 20 +------------------
 3 files changed, 1 insertion(+), 50 deletions(-)
 delete mode 100644 src/Oro/Bundle/BatchBundle/Step/StepExecutionRestoreInterface.php

diff --git a/src/Oro/Bundle/BatchBundle/Step/ItemStep.php b/src/Oro/Bundle/BatchBundle/Step/ItemStep.php
index 1b920831119..a9d4a585ee4 100644
--- a/src/Oro/Bundle/BatchBundle/Step/ItemStep.php
+++ b/src/Oro/Bundle/BatchBundle/Step/ItemStep.php
@@ -32,8 +32,6 @@ public function doExecute(StepExecution $stepExecution)
 
         $stepExecutor->execute($this);
         $this->flushStepElements();
-
-        $this->restoreStepElements();
     }
 
     /**
@@ -72,16 +70,4 @@ public function flushStepElements()
             }
         }
     }
-
-    /**
-     * Restores step elements to a state that was before a job execution.
-     */
-    protected function restoreStepElements()
-    {
-        foreach ($this->getConfigurableStepElements() as $element) {
-            if ($element instanceof StepExecutionRestoreInterface) {
-                $element->restoreStepExecution();
-            }
-        }
-    }
 }
diff --git a/src/Oro/Bundle/BatchBundle/Step/StepExecutionRestoreInterface.php b/src/Oro/Bundle/BatchBundle/Step/StepExecutionRestoreInterface.php
deleted file mode 100644
index 46289724399..00000000000
--- a/src/Oro/Bundle/BatchBundle/Step/StepExecutionRestoreInterface.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-namespace Oro\Bundle\BatchBundle\Step;
-
-/**
- * An interface which should be implemented by readers, writers or processors,
- * that can be reused in child jobs and as result a step execution context can be overridden
- * during an execution of a child job and need to be restored before such objects can be used
- * by a parent job again.
- */
-interface StepExecutionRestoreInterface
-{
-    /**
-     * Restores the previous instance of the StepExecution
-     */
-    public function restoreStepExecution();
-}
diff --git a/src/Oro/Bundle/IntegrationBundle/ImportExport/Writer/PersistentBatchWriter.php b/src/Oro/Bundle/IntegrationBundle/ImportExport/Writer/PersistentBatchWriter.php
index b16ca1303b8..bdd25883385 100644
--- a/src/Oro/Bundle/IntegrationBundle/ImportExport/Writer/PersistentBatchWriter.php
+++ b/src/Oro/Bundle/IntegrationBundle/ImportExport/Writer/PersistentBatchWriter.php
@@ -9,8 +9,6 @@
 
 use Doctrine\ORM\EntityManager;
 
-use Oro\Bundle\BatchBundle\Step\StepExecutionRestoreInterface;
-
 use Oro\Bundle\ImportExportBundle\Context\ContextRegistry;
 use Oro\Bundle\IntegrationBundle\Event\WriterErrorEvent;
 use Oro\Bundle\IntegrationBundle\Event\WriterAfterFlushEvent;
@@ -21,10 +19,7 @@
 use Akeneo\Bundle\BatchBundle\Item\InvalidItemException;
 use Akeneo\Bundle\BatchBundle\Step\StepExecutionAwareInterface;
 
-class PersistentBatchWriter implements
-    ItemWriterInterface,
-    StepExecutionAwareInterface,
-    StepExecutionRestoreInterface
+class PersistentBatchWriter implements ItemWriterInterface, StepExecutionAwareInterface
 {
     /** @var RegistryInterface */
     protected $registry;
@@ -41,9 +36,6 @@ class PersistentBatchWriter implements
     /** @var LoggerInterface */
     protected $logger;
 
-    /** @var StepExecution|null */
-    protected $previousStepExecution;
-
     /**
      * @param RegistryInterface        $registry
      * @param EventDispatcherInterface $eventDispatcher
@@ -132,16 +124,6 @@ public function write(array $items)
      */
     public function setStepExecution(StepExecution $stepExecution)
     {
-        $this->previousStepExecution = $this->stepExecution;
-
         $this->stepExecution = $stepExecution;
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function restoreStepExecution()
-    {
-        $this->stepExecution = $this->previousStepExecution;
-    }
 }