splitio · mmelograno · Oct 27, 2020 · Oct 27, 2020
diff --git a/splitio/client/factory.py b/splitio/client/factory.py
@@ -35,12 +35,6 @@
 from splitio.api.telemetry import TelemetryAPI
 from splitio.api.auth import AuthAPI
 
-# Synchronizers
-from splitio.synchronizers.split import SplitSynchronizer, LocalSplitSynchronizer
-from splitio.synchronizers.segment import SegmentSynchronizer
-from splitio.synchronizers.impression import ImpressionSynchronizer, ImpressionsCountSynchronizer
-from splitio.synchronizers.event import EventSynchronizer
-from splitio.synchronizers.telemetry import TelemetrySynchronizer
 
 # Tasks
 from splitio.tasks.split_sync import SplitSynchronizationTask
@@ -49,12 +43,15 @@
 from splitio.tasks.events_sync import EventsSyncTask
 from splitio.tasks.telemetry_sync import TelemetrySynchronizationTask
 
-# Push
-from splitio.push.synchronizer import SplitTasks, SplitSynchronizers, Synchronizer, \
-    LocalhostSynchronizer
-
 # Synchronizer
+from splitio.sync.synchronizer import SplitTasks, SplitSynchronizers, Synchronizer, \
+    LocalhostSynchronizer
 from splitio.sync.manager import Manager
+from splitio.sync.split import SplitSynchronizer, LocalSplitSynchronizer
+from splitio.sync.segment import SegmentSynchronizer
+from splitio.sync.impression import ImpressionSynchronizer, ImpressionsCountSynchronizer
+from splitio.sync.event import EventSynchronizer
+from splitio.sync.telemetry import TelemetrySynchronizer
 
 # Localhost stuff
 from splitio.client.localhost import LocalhostEventsStorage, LocalhostImpressionsStorage, \

diff --git a/splitio/push/processor.py b/splitio/push/processor.py
@@ -17,7 +17,7 @@ def __init__(self, synchronizer):
         Class constructor.
 
         :param synchronizer: synchronizer component
-        :type synchronizer: splitio.push.synchronizer.Synchronizer
+        :type synchronizer: splitio.sync.synchronizer.Synchronizer
         """
         self._split_queue = Queue()
         self._segments_queue = Queue()

diff --git a/splitio/synchronizers/event.py → splitio/sync/event.py b/splitio/synchronizers/event.py → splitio/sync/event.py
diff --git a/splitio/synchronizers/impression.py → splitio/sync/impression.py b/splitio/synchronizers/impression.py → splitio/sync/impression.py
diff --git a/splitio/sync/manager.py b/splitio/sync/manager.py
@@ -22,7 +22,7 @@ def __init__(self, ready_flag, synchronizer, auth_api, streaming_enabled, sse_ur
         :type ready_flag: threading.Event
 
         :param split_synchronizers: synchronizers for performing start/stop logic
-        :type split_synchronizers: splitio.push.synchronizer.Synchronizer
+        :type split_synchronizers: splitio.sync.synchronizer.Synchronizer
 
         :param auth_api: Authentication api client
         :type auth_api: splitio.api.auth.AuthAPI

diff --git a/splitio/synchronizers/segment.py → splitio/sync/segment.py b/splitio/synchronizers/segment.py → splitio/sync/segment.py
diff --git a/splitio/synchronizers/split.py → splitio/sync/split.py b/splitio/synchronizers/split.py → splitio/sync/split.py
diff --git a/splitio/push/synchronizer.py → splitio/sync/synchronizer.py b/splitio/push/synchronizer.py → splitio/sync/synchronizer.py
@@ -9,11 +9,11 @@
 from splitio.api import APIException
 
 # Synchronizers
-from splitio.synchronizers.split import SplitSynchronizer
-from splitio.synchronizers.segment import SegmentSynchronizer
-from splitio.synchronizers.impression import ImpressionSynchronizer, ImpressionsCountSynchronizer
-from splitio.synchronizers.event import EventSynchronizer
-from splitio.synchronizers.telemetry import TelemetrySynchronizer
+from splitio.sync.split import SplitSynchronizer
+from splitio.sync.segment import SegmentSynchronizer
+from splitio.sync.impression import ImpressionSynchronizer, ImpressionsCountSynchronizer
+from splitio.sync.event import EventSynchronizer
+from splitio.sync.telemetry import TelemetrySynchronizer
 
 # Tasks
 from splitio.tasks.split_sync import SplitSynchronizationTask
@@ -35,17 +35,17 @@ def __init__(self, split_sync, segment_sync, impressions_sync, events_sync, tele
         SplitSynchronizer constructor.
 
         :param split_sync: sync for splits
-        :type split_sync: splitio.synchronizers.split.SplitSynchronizer
+        :type split_sync: splitio.sync.split.SplitSynchronizer
         :param segment_sync: sync for segments
-        :type segment_sync: splitio.synchronizers.segment.SegmentSynchronizer
+        :type segment_sync: splitio.sync.segment.SegmentSynchronizer
         :param impressions_sync: sync for impressions
-        :type impressions_sync: splitio.synchronizers.impression.ImpressionSynchronizer
+        :type impressions_sync: splitio.sync.impression.ImpressionSynchronizer
         :param events_sync: sync for events
-        :type events_sync: splitio.synchronizers.event.EventSynchronizer
+        :type events_sync: splitio.sync.event.EventSynchronizer
         :param telemetry_sync: sync for telemetry
-        :type telemetry_sync: splitio.synchronizers.telemetry.TelemetrySynchronizer
+        :type telemetry_sync: splitio.sync.telemetry.TelemetrySynchronizer
         :param impressions_count_sync: sync for impression_counts
-        :type impressions_count_sync: splitio.synchronizers.impression.ImpressionsCountSynchronizer
+        :type impressions_count_sync: splitio.sync.impression.ImpressionsCountSynchronizer
         """
         self._split_sync = split_sync
         self._segment_sync = segment_sync
@@ -212,9 +212,9 @@ def __init__(self, split_synchronizers, split_tasks):
         Synchronizer constructor.
 
         :param split_synchronizers: syncs for performing synchronization of segments and splits
-        :type split_synchronizers: splitio.push.synchronizer.SplitSynchronizers
+        :type split_synchronizers: splitio.sync.synchronizer.SplitSynchronizers
         :param split_tasks: tasks for starting/stopping tasks
-        :type split_tasks: splitio.push.synchronizer.SplitTasks
+        :type split_tasks: splitio.sync.synchronizer.SplitTasks
         """
         self._split_synchronizers = split_synchronizers
         self._split_tasks = split_tasks
@@ -323,9 +323,9 @@ def __init__(self, split_synchronizers, split_tasks):
         LocalhostSynchronizer constructor.
 
         :param split_synchronizers: syncs for performing synchronization of segments and splits
-        :type split_synchronizers: splitio.push.synchronizer.SplitSynchronizers
+        :type split_synchronizers: splitio.sync.synchronizer.SplitSynchronizers
         :param split_tasks: tasks for starting/stopping tasks
-        :type split_tasks: splitio.push.synchronizer.SplitTasks
+        :type split_tasks: splitio.sync.synchronizer.SplitTasks
         """
         self._split_synchronizers = split_synchronizers
         self._split_tasks = split_tasks

diff --git a/splitio/synchronizers/telemetry.py → splitio/sync/telemetry.py b/splitio/synchronizers/telemetry.py → splitio/sync/telemetry.py
diff --git a/splitio/synchronizers/__init__.py b/splitio/synchronizers/__init__.py
diff --git a/splitio/tasks/uwsgi_wrappers.py b/splitio/tasks/uwsgi_wrappers.py
@@ -15,11 +15,11 @@
 from splitio.api.telemetry import TelemetryAPI
 from splitio.api.events import EventsAPI
 from splitio.tasks.util import workerpool
-from splitio.synchronizers.split import SplitSynchronizer
-from splitio.synchronizers.segment import SegmentSynchronizer
-from splitio.synchronizers.impression import ImpressionSynchronizer
-from splitio.synchronizers.event import EventSynchronizer
-from splitio.synchronizers.telemetry import TelemetrySynchronizer
+from splitio.sync.split import SplitSynchronizer
+from splitio.sync.segment import SegmentSynchronizer
+from splitio.sync.impression import ImpressionSynchronizer
+from splitio.sync.event import EventSynchronizer
+from splitio.sync.telemetry import TelemetrySynchronizer
 
 _LOGGER = logging.getLogger(__name__)
 

diff --git a/tests/client/test_factory.py b/tests/client/test_factory.py
@@ -16,9 +16,9 @@
 from splitio.api.telemetry import TelemetryAPI
 from splitio.engine.impressions import Manager as ImpressionsManager
 from splitio.sync.manager import Manager
-from splitio.push.synchronizer import Synchronizer, SplitSynchronizers, SplitTasks
-from splitio.synchronizers.split import SplitSynchronizer
-from splitio.synchronizers.segment import SegmentSynchronizer
+from splitio.sync.synchronizer import Synchronizer, SplitSynchronizers, SplitTasks
+from splitio.sync.split import SplitSynchronizer
+from splitio.sync.segment import SegmentSynchronizer
 
 
 class SplitFactoryTests(object):

diff --git a/tests/client/test_localhost.py b/tests/client/test_localhost.py
@@ -5,7 +5,7 @@
 import tempfile
 
 from splitio.client import localhost
-from splitio.synchronizers.split import LocalSplitSynchronizer
+from splitio.sync.split import LocalSplitSynchronizer
 from splitio.models.splits import Split
 from splitio.models.grammar.matchers import AllKeysMatcher
 from splitio.storage import SplitStorage

diff --git a/tests/push/test_processor.py b/tests/push/test_processor.py
@@ -1,7 +1,7 @@
 """Message processor tests."""
 from queue import Queue
 from splitio.push.processor import MessageProcessor
-from splitio.push.synchronizer import Synchronizer
+from splitio.sync.synchronizer import Synchronizer
 from splitio.push.parser import SplitChangeUpdate, SegmentChangeUpdate, SplitKillUpdate
 
 

diff --git a/tests/sync/test_manager.py b/tests/sync/test_manager.py
@@ -9,14 +9,12 @@
 from splitio.tasks.events_sync import EventsSyncTask
 from splitio.tasks.telemetry_sync import TelemetrySynchronizationTask
 
-from splitio.synchronizers.split import SplitSynchronizer
-from splitio.synchronizers.segment import SegmentSynchronizer
-from splitio.synchronizers.impression import ImpressionSynchronizer, ImpressionsCountSynchronizer
-from splitio.synchronizers.event import EventSynchronizer
-from splitio.synchronizers.telemetry import TelemetrySynchronizer
-
-from splitio.push.synchronizer import Synchronizer, SplitTasks, SplitSynchronizers
-
+from splitio.sync.split import SplitSynchronizer
+from splitio.sync.segment import SegmentSynchronizer
+from splitio.sync.impression import ImpressionSynchronizer, ImpressionsCountSynchronizer
+from splitio.sync.event import EventSynchronizer
+from splitio.sync.telemetry import TelemetrySynchronizer
+from splitio.sync.synchronizer import Synchronizer, SplitTasks, SplitSynchronizers
 from splitio.sync.manager import Manager
 
 from splitio.storage import SplitStorage

diff --git a/tests/push/test_synchronizer.py → tests/sync/test_synchronizer.py b/tests/push/test_synchronizer.py → tests/sync/test_synchronizer.py
@@ -2,17 +2,17 @@
 
 import pytest
 
-from splitio.push.synchronizer import Synchronizer, SplitTasks, SplitSynchronizers
+from splitio.sync.synchronizer import Synchronizer, SplitTasks, SplitSynchronizers
 from splitio.tasks.split_sync import SplitSynchronizationTask
 from splitio.tasks.segment_sync import SegmentSynchronizationTask
 from splitio.tasks.impressions_sync import ImpressionsSyncTask, ImpressionsCountSyncTask
 from splitio.tasks.events_sync import EventsSyncTask
 from splitio.tasks.telemetry_sync import TelemetrySynchronizationTask
-from splitio.synchronizers.split import SplitSynchronizer
-from splitio.synchronizers.segment import SegmentSynchronizer
-from splitio.synchronizers.impression import ImpressionSynchronizer, ImpressionsCountSynchronizer
-from splitio.synchronizers.event import EventSynchronizer
-from splitio.synchronizers.telemetry import TelemetrySynchronizer
+from splitio.sync.split import SplitSynchronizer
+from splitio.sync.segment import SegmentSynchronizer
+from splitio.sync.impression import ImpressionSynchronizer, ImpressionsCountSynchronizer
+from splitio.sync.event import EventSynchronizer
+from splitio.sync.telemetry import TelemetrySynchronizer
 from splitio.storage import SegmentStorage, SplitStorage
 from splitio.api import APIException
 from splitio.models.splits import Split

diff --git a/tests/syncrhonizers/test_events_synchronizer.py b/tests/syncrhonizers/test_events_synchronizer.py
@@ -8,7 +8,7 @@
 from splitio.api import APIException
 from splitio.storage import EventStorage
 from splitio.models.events import Event
-from splitio.synchronizers.event import EventSynchronizer
+from splitio.sync.event import EventSynchronizer
 
 
 class EventsSynchronizerTests(object):

diff --git a/tests/syncrhonizers/test_impressions_count_synchronizer.py b/tests/syncrhonizers/test_impressions_count_synchronizer.py
@@ -8,7 +8,7 @@
 from splitio.api import APIException
 from splitio.engine.impressions import Manager as ImpressionsManager
 from splitio.engine.impressions import Counter
-from splitio.synchronizers.impression import ImpressionsCountSynchronizer
+from splitio.sync.impression import ImpressionsCountSynchronizer
 from splitio.api.impressions import ImpressionsAPI
 
 

diff --git a/tests/syncrhonizers/test_impressions_synchronizer.py b/tests/syncrhonizers/test_impressions_synchronizer.py
@@ -8,7 +8,7 @@
 from splitio.api import APIException
 from splitio.storage import ImpressionStorage
 from splitio.models.impressions import Impression
-from splitio.synchronizers.impression import ImpressionSynchronizer
+from splitio.sync.impression import ImpressionSynchronizer
 
 
 class ImpressionsSynchronizerTests(object):

diff --git a/tests/syncrhonizers/test_segments_synchronizer.py b/tests/syncrhonizers/test_segments_synchronizer.py
@@ -7,7 +7,7 @@
 from splitio.api import APIException
 from splitio.storage import SplitStorage, SegmentStorage
 from splitio.models.splits import Split
-from splitio.synchronizers.segment import SegmentSynchronizer
+from splitio.sync.segment import SegmentSynchronizer
 from splitio.models.segments import Segment
 
 

diff --git a/tests/syncrhonizers/test_splits_synchronizer.py b/tests/syncrhonizers/test_splits_synchronizer.py
@@ -8,7 +8,7 @@
 from splitio.tasks import split_sync
 from splitio.storage import SplitStorage
 from splitio.models.splits import Split
-from splitio.synchronizers.split import SplitSynchronizer
+from splitio.sync.split import SplitSynchronizer
 
 
 class SplitsSynchronizerTests(object):

diff --git a/tests/syncrhonizers/test_telemetry_synchronizer.py b/tests/syncrhonizers/test_telemetry_synchronizer.py
@@ -7,7 +7,7 @@
 from splitio.api.client import HttpResponse
 from splitio.api import APIException
 from splitio.storage import TelemetryStorage
-from splitio.synchronizers.telemetry import TelemetrySynchronizer
+from splitio.sync.telemetry import TelemetrySynchronizer
 from splitio.api.telemetry import TelemetryAPI
 
 

diff --git a/tests/tasks/test_events_sync.py b/tests/tasks/test_events_sync.py
@@ -7,7 +7,7 @@
 from splitio.storage import EventStorage
 from splitio.models.events import Event
 from splitio.api.events import EventsAPI
-from splitio.synchronizers.event import EventSynchronizer
+from splitio.sync.event import EventSynchronizer
 
 
 class EventsSyncTests(object):

diff --git a/tests/tasks/test_impressions_sync.py b/tests/tasks/test_impressions_sync.py
@@ -7,7 +7,7 @@
 from splitio.storage import ImpressionStorage
 from splitio.models.impressions import Impression
 from splitio.api.impressions import ImpressionsAPI
-from splitio.synchronizers.impression import ImpressionSynchronizer, ImpressionsCountSynchronizer
+from splitio.sync.impression import ImpressionSynchronizer, ImpressionsCountSynchronizer
 from splitio.engine.impressions import Manager as ImpressionsManager
 from splitio.engine.impressions import Counter
 

diff --git a/tests/tasks/test_segment_sync.py b/tests/tasks/test_segment_sync.py
@@ -9,7 +9,7 @@
 from splitio.models.segments import Segment
 from splitio.models.grammar.condition import Condition
 from splitio.models.grammar.matchers import UserDefinedSegmentMatcher
-from splitio.synchronizers.segment import SegmentSynchronizer
+from splitio.sync.segment import SegmentSynchronizer
 
 
 class SegmentSynchronizationTests(object):

diff --git a/tests/tasks/test_split_sync.py b/tests/tasks/test_split_sync.py
@@ -6,7 +6,7 @@
 from splitio.tasks import split_sync
 from splitio.storage import SplitStorage
 from splitio.models.splits import Split
-from splitio.synchronizers.split import SplitSynchronizer
+from splitio.sync.split import SplitSynchronizer
 
 
 class SplitSynchronizationTests(object):

diff --git a/tests/tasks/test_telemetry_sync.py b/tests/tasks/test_telemetry_sync.py
@@ -5,7 +5,7 @@
 from splitio.storage import TelemetryStorage
 from splitio.api.telemetry import TelemetryAPI
 from splitio.tasks.telemetry_sync import TelemetrySynchronizationTask
-from splitio.synchronizers.telemetry import TelemetrySynchronizer
+from splitio.sync.telemetry import TelemetrySynchronizer
 
 
 class TelemetrySyncTests(object):  # pylint: disable=too-few-public-methods

diff --git a/tests/tasks/test_uwsgi_wrappers.py b/tests/tasks/test_uwsgi_wrappers.py
@@ -5,11 +5,11 @@
 from splitio.storage.uwsgi import UWSGISplitStorage
 from splitio.tasks.uwsgi_wrappers import uwsgi_update_splits, uwsgi_update_segments, \
     uwsgi_report_events, uwsgi_report_impressions, uwsgi_report_telemetry
-from splitio.synchronizers.split import SplitSynchronizer
-from splitio.synchronizers.segment import SegmentSynchronizer
-from splitio.synchronizers.impression import ImpressionSynchronizer
-from splitio.synchronizers.event import EventSynchronizer
-from splitio.synchronizers.telemetry import TelemetrySynchronizer
+from splitio.sync.split import SplitSynchronizer
+from splitio.sync.segment import SegmentSynchronizer
+from splitio.sync.impression import ImpressionSynchronizer
+from splitio.sync.event import EventSynchronizer
+from splitio.sync.telemetry import TelemetrySynchronizer
 
 
 class NonCatchableException(BaseException):