Remove version from component names

siddhi-io · Jun 18, 2019 · e5db02c · e5db02c
1 parent a6ebf19
commit e5db02c
Show file tree

Hide file tree

Showing 78 changed files with 87 additions and 88 deletions.
diff --git a/PySiddhi5/DataTypes/DataWrapper.py → PySiddhi/DataTypes/DataWrapper.py b/PySiddhi5/DataTypes/DataWrapper.py → PySiddhi/DataTypes/DataWrapper.py
@@ -15,9 +15,9 @@
 # under the License.
 
 
-from PySiddhi5 import SiddhiLoader
-from PySiddhi5.DataTypes.DoubleType import DoubleType
-from PySiddhi5.DataTypes.LongType import LongType
+from PySiddhi import SiddhiLoader
+from PySiddhi.DataTypes.DoubleType import DoubleType
+from PySiddhi.DataTypes.LongType import LongType
 
 '''
 Data Wrapping is used because python 3 doesn't distinctly support long and double data types

diff --git a/PySiddhi5/DataTypes/DoubleType.py → PySiddhi/DataTypes/DoubleType.py b/PySiddhi5/DataTypes/DoubleType.py → PySiddhi/DataTypes/DoubleType.py
diff --git a/PySiddhi5/DataTypes/LongType.py → PySiddhi/DataTypes/LongType.py b/PySiddhi5/DataTypes/LongType.py → PySiddhi/DataTypes/LongType.py
diff --git a/PySiddhi5/DataTypes/__init__.py → PySiddhi/DataTypes/__init__.py b/PySiddhi5/DataTypes/__init__.py → PySiddhi/DataTypes/__init__.py
diff --git a/PySiddhi5/SiddhiLoader.py → PySiddhi/SiddhiLoader.py b/PySiddhi5/SiddhiLoader.py → PySiddhi/SiddhiLoader.py
@@ -19,7 +19,7 @@
 
 import sys
 
-import PySiddhi5
+import PySiddhi
 
 # Instantiate Global Variables
 siddhi_api_core = None
@@ -91,7 +91,7 @@ def loadLibrary():
     # at initialization of pyjnius
     jnius_config.add_options('-Xss1280k')
 
-    jnius_config.add_options('-Djava.library.path=' + PySiddhi5.root_path + "/__PySiddhi5Proxy")
+    jnius_config.add_options('-Djava.library.path=' + PySiddhi.root_path + "/__PySiddhiProxy")
 
     # Determine library class path
     class_paths = ['.', os.path.join(siddhi_home, 'lib', '*')]

diff --git a/PySiddhi5/__init__.py → PySiddhi/__init__.py b/PySiddhi5/__init__.py → PySiddhi/__init__.py
diff --git a/PySiddhi5/core/SiddhiAppRuntime.py → PySiddhi/core/SiddhiAppRuntime.py b/PySiddhi5/core/SiddhiAppRuntime.py → PySiddhi/core/SiddhiAppRuntime.py
@@ -14,11 +14,11 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from PySiddhi5 import SiddhiLoader
-from PySiddhi5.core.debugger.SiddhiDebugger import SiddhiDebugger
-from PySiddhi5.core.query.output.callback.QueryCallback import QueryCallback
-from PySiddhi5.core.stream.input.InputHandler import InputHandler
-from PySiddhi5.core.stream.output.StreamCallback import StreamCallback
+from PySiddhi import SiddhiLoader
+from PySiddhi.core.debugger.SiddhiDebugger import SiddhiDebugger
+from PySiddhi.core.query.output.callback.QueryCallback import QueryCallback
+from PySiddhi.core.stream.input.InputHandler import InputHandler
+from PySiddhi.core.stream.output.StreamCallback import StreamCallback
 
 
 class SiddhiAppRuntime(object):

diff --git a/PySiddhi5/core/SiddhiManager.py → PySiddhi/core/SiddhiManager.py b/PySiddhi5/core/SiddhiManager.py → PySiddhi/core/SiddhiManager.py
@@ -14,9 +14,9 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from PySiddhi5 import SiddhiLoader
-from PySiddhi5.DataTypes import DataWrapper
-from PySiddhi5.core.SiddhiAppRuntime import SiddhiAppRuntime
+from PySiddhi import SiddhiLoader
+from PySiddhi.DataTypes import DataWrapper
+from PySiddhi.core.SiddhiAppRuntime import SiddhiAppRuntime
 
 
 class SiddhiManager(object):

diff --git a/PySiddhi5/core/__init__.py → PySiddhi/core/__init__.py b/PySiddhi5/core/__init__.py → PySiddhi/core/__init__.py
diff --git a/PySiddhi5/core/debugger/SiddhiDebugger.py → PySiddhi/core/debugger/SiddhiDebugger.py b/PySiddhi5/core/debugger/SiddhiDebugger.py → PySiddhi/core/debugger/SiddhiDebugger.py
@@ -17,10 +17,10 @@
 
 import threading
 from time import sleep
-from PySiddhi5 import SiddhiLoader
-from PySiddhi5.DataTypes.DataWrapper import unwrapHashMap
+from PySiddhi import SiddhiLoader
+from PySiddhi.DataTypes.DataWrapper import unwrapHashMap
 from enum import Enum
-from PySiddhi5.core.event.ComplexEvent import ComplexEvent
+from PySiddhi.core.event.ComplexEvent import ComplexEvent
 
 
 class SiddhiDebugger(object):

diff --git a/...5/core/debugger/SiddhiDebuggerCallback.py → ...i/core/debugger/SiddhiDebuggerCallback.py b/...5/core/debugger/SiddhiDebuggerCallback.py → ...i/core/debugger/SiddhiDebuggerCallback.py
@@ -17,7 +17,7 @@
 
 from abc import ABCMeta, abstractmethod
 from future.utils import with_metaclass
-from PySiddhi5 import SiddhiLoader
+from PySiddhi import SiddhiLoader
 
 _siddhi_debugger_callback_proxy = SiddhiLoader._loadType(
     "io.siddhi.pythonapi.proxy.core.debugger.siddhi_debugger_callback.SiddhiDebuggerCallbackProxy")

diff --git a/PySiddhi5/core/debugger/__init__.py → PySiddhi/core/debugger/__init__.py b/PySiddhi5/core/debugger/__init__.py → PySiddhi/core/debugger/__init__.py
diff --git a/PySiddhi5/core/event/ComplexEvent.py → PySiddhi/core/event/ComplexEvent.py b/PySiddhi5/core/event/ComplexEvent.py → PySiddhi/core/event/ComplexEvent.py
@@ -16,8 +16,8 @@
 
 
 from enum import Enum
-from PySiddhi5 import SiddhiLoader
-from PySiddhi5.DataTypes.DataWrapper import unwrapData, wrapData
+from PySiddhi import SiddhiLoader
+from PySiddhi.DataTypes.DataWrapper import unwrapData, wrapData
 
 
 class ComplexEvent(object):

diff --git a/PySiddhi5/core/event/Event.py → PySiddhi/core/event/Event.py b/PySiddhi5/core/event/Event.py → PySiddhi/core/event/Event.py
@@ -14,10 +14,10 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from PySiddhi5 import SiddhiLoader
+from PySiddhi import SiddhiLoader
 
-from PySiddhi5.DataTypes import DataWrapper
-from PySiddhi5.core.event import ComplexEvent
+from PySiddhi.DataTypes import DataWrapper
+from PySiddhi.core.event import ComplexEvent
 
 _event_class = SiddhiLoader._loadType("io.siddhi.core.event.Event")
 _event_proxy_class = SiddhiLoader._loadType("io.siddhi.pythonapi.proxy.core.event.event.EventProxy")

diff --git a/PySiddhi5/core/event/__init__.py → PySiddhi/core/event/__init__.py b/PySiddhi5/core/event/__init__.py → PySiddhi/core/event/__init__.py
diff --git a/PySiddhi5/core/query/__init__.py → PySiddhi/core/query/__init__.py b/PySiddhi5/core/query/__init__.py → PySiddhi/core/query/__init__.py
diff --git a/PySiddhi5/core/query/output/__init__.py → PySiddhi/core/query/output/__init__.py b/PySiddhi5/core/query/output/__init__.py → PySiddhi/core/query/output/__init__.py
diff --git a/...re/query/output/callback/QueryCallback.py → ...re/query/output/callback/QueryCallback.py b/...re/query/output/callback/QueryCallback.py → ...re/query/output/callback/QueryCallback.py
@@ -18,8 +18,8 @@
 
 from abc import ABCMeta, abstractmethod
 
-from PySiddhi5 import SiddhiLoader
-from PySiddhi5.core.event.Event import Event
+from PySiddhi import SiddhiLoader
+from PySiddhi.core.event.Event import Event
 
 from future.utils import with_metaclass
 

diff --git a/...i5/core/query/output/callback/__init__.py → ...hi/core/query/output/callback/__init__.py b/...i5/core/query/output/callback/__init__.py → ...hi/core/query/output/callback/__init__.py
diff --git a/PySiddhi5/core/stream/__init__.py → PySiddhi/core/stream/__init__.py b/PySiddhi5/core/stream/__init__.py → PySiddhi/core/stream/__init__.py
diff --git a/PySiddhi5/core/stream/input/InputHandler.py → PySiddhi/core/stream/input/InputHandler.py b/PySiddhi5/core/stream/input/InputHandler.py → PySiddhi/core/stream/input/InputHandler.py
@@ -14,8 +14,8 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from PySiddhi5 import SiddhiLoader
-from PySiddhi5.DataTypes.DataWrapper import wrapData
+from PySiddhi import SiddhiLoader
+from PySiddhi.DataTypes.DataWrapper import wrapData
 
 input_handler_proxy = SiddhiLoader._loadType(
     "io.siddhi.pythonapi.proxy.core.stream.input.input_handler.InputHandlerProxy")

diff --git a/PySiddhi5/core/stream/input/__init__.py → PySiddhi/core/stream/input/__init__.py b/PySiddhi5/core/stream/input/__init__.py → PySiddhi/core/stream/input/__init__.py
diff --git a/...dhi5/core/stream/output/StreamCallback.py → ...ddhi/core/stream/output/StreamCallback.py b/...dhi5/core/stream/output/StreamCallback.py → ...ddhi/core/stream/output/StreamCallback.py
@@ -20,8 +20,8 @@
 
 from abc import ABCMeta, abstractmethod
 
-from PySiddhi5 import SiddhiLoader
-from PySiddhi5.core.event.Event import Event
+from PySiddhi import SiddhiLoader
+from PySiddhi.core.event.Event import Event
 
 from future.utils import with_metaclass
 

diff --git a/PySiddhi5/core/stream/output/__init__.py → PySiddhi/core/stream/output/__init__.py b/PySiddhi5/core/stream/output/__init__.py → PySiddhi/core/stream/output/__init__.py
diff --git a/PySiddhi5/core/util/EventPrinter.py → PySiddhi/core/util/EventPrinter.py b/PySiddhi5/core/util/EventPrinter.py → PySiddhi/core/util/EventPrinter.py
@@ -14,7 +14,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from PySiddhi5 import SiddhiLoader
+from PySiddhi import SiddhiLoader
 
 _event_printer_proxy = SiddhiLoader._loadType("io.siddhi.pythonapi.proxy.core.util.EventPrinterProxy")
 

diff --git a/PySiddhi5/core/util/__init__.py → PySiddhi/core/util/__init__.py b/PySiddhi5/core/util/__init__.py → PySiddhi/core/util/__init__.py
diff --git a/PySiddhi5/log4j.xml → PySiddhi/log4j.xml b/PySiddhi5/log4j.xml → PySiddhi/log4j.xml
diff --git a/.../EventSimulator/AttributeConfiguration.py → .../EventSimulator/AttributeConfiguration.py b/.../EventSimulator/AttributeConfiguration.py → .../EventSimulator/AttributeConfiguration.py
@@ -16,9 +16,9 @@
 
 from enum import Enum
 
-from PySiddhi5.sp.ObjectMapping.APIObject import APIObject, NotSet
-from PySiddhi5.sp.ObjectMapping.FieldMapping import FieldMapping, ListFieldMapping
-from PySiddhi5.sp.__Util import decodeField, decodeObject
+from PySiddhi.sp.ObjectMapping.APIObject import APIObject, NotSet
+from PySiddhi.sp.ObjectMapping.FieldMapping import FieldMapping, ListFieldMapping
+from PySiddhi.sp.__Util import decodeField, decodeObject
 
 
 class AttributeConfiguration(APIObject):

diff --git a/...sp/EventSimulator/EventSimulatorClient.py → ...sp/EventSimulator/EventSimulatorClient.py b/...sp/EventSimulator/EventSimulatorClient.py → ...sp/EventSimulator/EventSimulatorClient.py
@@ -17,8 +17,8 @@
 import json
 import logging
 
-from PySiddhi5.sp.__Communication.RestClient import RestClient
-from PySiddhi5.sp.EventSimulator.FeedSimulationConfiguration import FeedSimulationConfiguration
+from PySiddhi.sp.__Communication.RestClient import RestClient
+from PySiddhi.sp.EventSimulator.FeedSimulationConfiguration import FeedSimulationConfiguration
 from requests.auth import HTTPBasicAuth
 
 

diff --git a/...tSimulator/FeedSimulationConfiguration.py → ...tSimulator/FeedSimulationConfiguration.py b/...tSimulator/FeedSimulationConfiguration.py → ...tSimulator/FeedSimulationConfiguration.py
@@ -14,10 +14,10 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from PySiddhi5.sp.EventSimulator.SimulationProperties import SimulationProperties
-from PySiddhi5.sp.EventSimulator.SimulationSource import SimulationSource
-from PySiddhi5.sp.ObjectMapping.APIObject import APIObject
-from PySiddhi5.sp.ObjectMapping.FieldMapping import FieldMapping, ListFieldMapping
+from PySiddhi.sp.EventSimulator.SimulationProperties import SimulationProperties
+from PySiddhi.sp.EventSimulator.SimulationSource import SimulationSource
+from PySiddhi.sp.ObjectMapping.APIObject import APIObject
+from PySiddhi.sp.ObjectMapping.FieldMapping import FieldMapping, ListFieldMapping
 
 
 class FeedSimulationConfiguration(APIObject):

diff --git a/...sp/EventSimulator/SimulationProperties.py → ...sp/EventSimulator/SimulationProperties.py b/...sp/EventSimulator/SimulationProperties.py → ...sp/EventSimulator/SimulationProperties.py
@@ -16,9 +16,9 @@
 
 import random
 
-from PySiddhi5.sp.ObjectMapping.APIObject import APIObject, NotSet
-from PySiddhi5.sp.ObjectMapping.FieldMapping import FieldMapping
-from PySiddhi5.sp.__Util import decodeField
+from PySiddhi.sp.ObjectMapping.APIObject import APIObject, NotSet
+from PySiddhi.sp.ObjectMapping.FieldMapping import FieldMapping
+from PySiddhi.sp.__Util import decodeField
 
 ran = random
 

diff --git a/...hi5/sp/EventSimulator/SimulationSource.py → ...dhi/sp/EventSimulator/SimulationSource.py b/...hi5/sp/EventSimulator/SimulationSource.py → ...dhi/sp/EventSimulator/SimulationSource.py
@@ -16,9 +16,9 @@
 
 from enum import Enum
 
-from PySiddhi5.sp.EventSimulator.AttributeConfiguration import AttributeConfiguration
-from PySiddhi5.sp.ObjectMapping.APIObject import APIObject, NotSet
-from PySiddhi5.sp.ObjectMapping.FieldMapping import FieldMapping, ListFieldMapping, strOrInt
+from PySiddhi.sp.EventSimulator.AttributeConfiguration import AttributeConfiguration
+from PySiddhi.sp.ObjectMapping.APIObject import APIObject, NotSet
+from PySiddhi.sp.ObjectMapping.FieldMapping import FieldMapping, ListFieldMapping, strOrInt
 
 
 class SimulationSource(APIObject):

diff --git a/...imulator/SingleSimulationConfiguration.py → ...imulator/SingleSimulationConfiguration.py b/...imulator/SingleSimulationConfiguration.py → ...imulator/SingleSimulationConfiguration.py
@@ -14,8 +14,8 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from PySiddhi5.sp.ObjectMapping.APIObject import APIObject
-from PySiddhi5.sp.ObjectMapping.FieldMapping import FieldMapping, ListFieldMapping
+from PySiddhi.sp.ObjectMapping.APIObject import APIObject
+from PySiddhi.sp.ObjectMapping.FieldMapping import FieldMapping, ListFieldMapping
 
 
 class SingleSimulationConfiguration(APIObject):

diff --git a/PySiddhi5/sp/EventSimulator/__init__.py → PySiddhi/sp/EventSimulator/__init__.py b/PySiddhi5/sp/EventSimulator/__init__.py → PySiddhi/sp/EventSimulator/__init__.py
diff --git a/PySiddhi5/sp/ObjectMapping/APIObject.py → PySiddhi/sp/ObjectMapping/APIObject.py b/PySiddhi5/sp/ObjectMapping/APIObject.py → PySiddhi/sp/ObjectMapping/APIObject.py
@@ -17,7 +17,7 @@
 from abc import ABCMeta
 from future.utils import with_metaclass
 
-from PySiddhi5.sp.__Util import decodeField, encodeField
+from PySiddhi.sp.__Util import decodeField, encodeField
 
 
 class NotSet(object):

diff --git a/PySiddhi5/sp/ObjectMapping/FieldMapping.py → PySiddhi/sp/ObjectMapping/FieldMapping.py b/PySiddhi5/sp/ObjectMapping/FieldMapping.py → PySiddhi/sp/ObjectMapping/FieldMapping.py
@@ -14,8 +14,8 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from PySiddhi5.sp.ObjectMapping.APIObject import NotSet
-from PySiddhi5.sp.__Util import encodeField, decodeField
+from PySiddhi.sp.ObjectMapping.APIObject import NotSet
+from PySiddhi.sp.__Util import encodeField, decodeField
 
 
 def strOrInt(v):

diff --git a/PySiddhi5/sp/ObjectMapping/__init__.py → PySiddhi/sp/ObjectMapping/__init__.py b/PySiddhi5/sp/ObjectMapping/__init__.py → PySiddhi/sp/ObjectMapping/__init__.py
diff --git a/PySiddhi5/sp/SPClient.py → PySiddhi/sp/SPClient.py b/PySiddhi5/sp/SPClient.py → PySiddhi/sp/SPClient.py
@@ -14,8 +14,8 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from PySiddhi5.sp.EventSimulator.EventSimulatorClient import EventSimulatorClient
-from PySiddhi5.sp.SiddhiAppManagement.SiddhiAppManagementClient import SiddhiAppManagementClient
+from PySiddhi.sp.EventSimulator.EventSimulatorClient import EventSimulatorClient
+from PySiddhi.sp.SiddhiAppManagement.SiddhiAppManagementClient import SiddhiAppManagementClient
 
 
 class SPClient(object):

diff --git a/...ppManagement/SiddhiAppManagementClient.py → ...ppManagement/SiddhiAppManagementClient.py b/...ppManagement/SiddhiAppManagementClient.py → ...ppManagement/SiddhiAppManagementClient.py
@@ -17,7 +17,7 @@
 from enum import Enum
 from requests.auth import HTTPBasicAuth
 
-from PySiddhi5.sp.__Communication.RestClient import RestClient
+from PySiddhi.sp.__Communication.RestClient import RestClient
 
 
 class UpdateAppStatusResponse(Enum):

diff --git a/PySiddhi5/sp/SiddhiAppManagement/__init__.py → PySiddhi/sp/SiddhiAppManagement/__init__.py b/PySiddhi5/sp/SiddhiAppManagement/__init__.py → PySiddhi/sp/SiddhiAppManagement/__init__.py
diff --git a/PySiddhi5/sp/__Communication/RestClient.py → PySiddhi/sp/__Communication/RestClient.py b/PySiddhi5/sp/__Communication/RestClient.py → PySiddhi/sp/__Communication/RestClient.py
diff --git a/PySiddhi5/sp/__Communication/__init__.py → PySiddhi/sp/__Communication/__init__.py b/PySiddhi5/sp/__Communication/__init__.py → PySiddhi/sp/__Communication/__init__.py
diff --git a/PySiddhi5/sp/__Util.py → PySiddhi/sp/__Util.py b/PySiddhi5/sp/__Util.py → PySiddhi/sp/__Util.py
diff --git a/PySiddhi5/sp/__init__.py → PySiddhi/sp/__init__.py b/PySiddhi5/sp/__init__.py → PySiddhi/sp/__init__.py
diff --git a/Tests/SPTests/EventSimulatorTests.py b/Tests/SPTests/EventSimulatorTests.py
@@ -20,11 +20,11 @@
 import os
 from time import sleep
 
-from PySiddhi5.sp.SPClient import SPClient
-from PySiddhi5.sp.EventSimulator.AttributeConfiguration import AttributeConfiguration
-from PySiddhi5.sp.EventSimulator.FeedSimulationConfiguration import FeedSimulationConfiguration
-from PySiddhi5.sp.EventSimulator.SimulationSource import SimulationSource
-from PySiddhi5.sp.EventSimulator.SingleSimulationConfiguration import SingleSimulationConfiguration
+from PySiddhi.sp.SPClient import SPClient
+from PySiddhi.sp.EventSimulator.AttributeConfiguration import AttributeConfiguration
+from PySiddhi.sp.EventSimulator.FeedSimulationConfiguration import FeedSimulationConfiguration
+from PySiddhi.sp.EventSimulator.SimulationSource import SimulationSource
+from PySiddhi.sp.EventSimulator.SingleSimulationConfiguration import SingleSimulationConfiguration
 
 logging.basicConfig(level=logging.INFO)
 

diff --git a/Tests/SPTests/SiddhiAppManagerTests.py b/Tests/SPTests/SiddhiAppManagerTests.py
@@ -20,8 +20,8 @@
 import logging
 from time import sleep
 
-from PySiddhi5.sp.SPClient import SPClient
-from PySiddhi5.sp.SiddhiAppManagement.SiddhiAppManagementClient import UpdateAppStatusResponse
+from PySiddhi.sp.SPClient import SPClient
+from PySiddhi.sp.SiddhiAppManagement.SiddhiAppManagementClient import UpdateAppStatusResponse
 
 logging.basicConfig(level=logging.INFO)
 

diff --git a/Tests/SiddhiCoreTests/BasicTest.py b/Tests/SiddhiCoreTests/BasicTest.py
@@ -18,10 +18,10 @@
 import unittest
 import logging
 from time import sleep
-from PySiddhi5.DataTypes.LongType import LongType
-from PySiddhi5.core.SiddhiManager import SiddhiManager
-from PySiddhi5.core.query.output.callback.QueryCallback import QueryCallback
-from PySiddhi5.core.util.EventPrinter import PrintEvent
+from PySiddhi.DataTypes.LongType import LongType
+from PySiddhi.core.SiddhiManager import SiddhiManager
+from PySiddhi.core.query.output.callback.QueryCallback import QueryCallback
+from PySiddhi.core.util.EventPrinter import PrintEvent
 
 logging.basicConfig(level=logging.INFO)
 

diff --git a/Tests/SiddhiCoreTests/EventTest.py b/Tests/SiddhiCoreTests/EventTest.py
@@ -19,8 +19,8 @@
 
 logging.basicConfig(level=logging.INFO)
 
-from PySiddhi5.DataTypes.LongType import LongType
-from PySiddhi5.core.event.Event import Event
+from PySiddhi.DataTypes.LongType import LongType
+from PySiddhi.core.event.Event import Event
 
 
 class BasicTests(unittest.TestCase):

diff --git a/Tests/SiddhiCoreTests/ExtensionsTest.py b/Tests/SiddhiCoreTests/ExtensionsTest.py
@@ -16,18 +16,18 @@
 
 from subprocess import call
 import os
-from PySiddhi5 import SiddhiLoader
+from PySiddhi import SiddhiLoader
 
 # Download extension jars
 
 import unittest
 import logging
 from time import sleep
 
-from PySiddhi5.DataTypes.LongType import LongType
-from PySiddhi5.core.SiddhiManager import SiddhiManager
-from PySiddhi5.core.query.output.callback.QueryCallback import QueryCallback
-from PySiddhi5.core.util.EventPrinter import PrintEvent
+from PySiddhi.DataTypes.LongType import LongType
+from PySiddhi.core.SiddhiManager import SiddhiManager
+from PySiddhi.core.query.output.callback.QueryCallback import QueryCallback
+from PySiddhi.core.util.EventPrinter import PrintEvent
 
 logging.basicConfig(level=logging.INFO)
 

diff --git a/...hiCoreTests/Resources/Extensions5/pom.xml → ...dhiCoreTests/Resources/Extensions/pom.xml b/...hiCoreTests/Resources/Extensions5/pom.xml → ...dhiCoreTests/Resources/Extensions/pom.xml
@@ -24,7 +24,7 @@
 
     <groupId>io.siddhi.python.api</groupId>
     <artifactId>siddhi-python-api-extensions-downloader-for-tests</artifactId>
-    <version>1.0.0</version>
+    <version>5.0.0</version>
     <description>Downloads extensions (JARS) used by Siddhi Python API Tests</description>
     <packaging>pom</packaging>
 

diff --git a/Tests/SiddhiCoreTests/TestDebugger.py b/Tests/SiddhiCoreTests/TestDebugger.py
@@ -23,10 +23,10 @@
 from time import sleep
 from unittest.case import TestCase
 
-from PySiddhi5.core.SiddhiManager import SiddhiManager
-from PySiddhi5.core.debugger.SiddhiDebugger import SiddhiDebugger
-from PySiddhi5.core.debugger.SiddhiDebuggerCallback import SiddhiDebuggerCallback
-from PySiddhi5.core.stream.output.StreamCallback import StreamCallback
+from PySiddhi.core.SiddhiManager import SiddhiManager
+from PySiddhi.core.debugger.SiddhiDebugger import SiddhiDebugger
+from PySiddhi.core.debugger.SiddhiDebuggerCallback import SiddhiDebuggerCallback
+from PySiddhi.core.stream.output.StreamCallback import StreamCallback
 from Tests.Util.AtomicInt import AtomicInt
 
 import threading

diff --git a/Tests/SiddhiCoreTests/TestOutputStream.py b/Tests/SiddhiCoreTests/TestOutputStream.py
@@ -23,8 +23,8 @@
 from time import sleep
 from unittest.case import TestCase
 
-from PySiddhi5.core.SiddhiManager import SiddhiManager
-from PySiddhi5.core.stream.output.StreamCallback import StreamCallback
+from PySiddhi.core.SiddhiManager import SiddhiManager
+from PySiddhi.core.stream.output.StreamCallback import StreamCallback
 from Tests.Util.AtomicInt import AtomicInt