Refactor code to remove version from the PySiddhi name

PySiddhi4/DataTypes/DataWrapper.py → PySiddhi/DataTypes/DataWrapper.py

@@ -15,9 +15,9 @@
 # under the License.
 
 
-from PySiddhi4 import SiddhiLoader
-from PySiddhi4.DataTypes.DoubleType import DoubleType
-from PySiddhi4.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

PySiddhi4/SiddhiLoader.py → PySiddhi/SiddhiLoader.py

@@ -19,7 +19,7 @@
 
 import sys
 
-import PySiddhi4
+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=' + PySiddhi4.root_path + "/__PySiddhi4Proxy")
+    jnius_config.add_options('-Djava.library.path=' + PySiddhi.root_path + "/__PySiddhiProxy")
 
     # Determine library class path
     class_paths = ['.', os.path.join(siddhi_home, 'lib', '*')]

PySiddhi4/core/SiddhiAppRuntime.py → PySiddhi/core/SiddhiAppRuntime.py

@@ -14,11 +14,11 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from PySiddhi4 import SiddhiLoader
-from PySiddhi4.core.debugger.SiddhiDebugger import SiddhiDebugger
-from PySiddhi4.core.query.output.callback.QueryCallback import QueryCallback
-from PySiddhi4.core.stream.input.InputHandler import InputHandler
-from PySiddhi4.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):

PySiddhi4/core/SiddhiManager.py → PySiddhi/core/SiddhiManager.py

@@ -14,9 +14,9 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from PySiddhi4 import SiddhiLoader
-from PySiddhi4.DataTypes import DataWrapper
-from PySiddhi4.core.SiddhiAppRuntime import SiddhiAppRuntime
+from PySiddhi import SiddhiLoader
+from PySiddhi.DataTypes import DataWrapper
+from PySiddhi.core.SiddhiAppRuntime import SiddhiAppRuntime
 
 
 class SiddhiManager(object):

PySiddhi4/core/debugger/SiddhiDebugger.py → PySiddhi/core/debugger/SiddhiDebugger.py

@@ -17,10 +17,10 @@
 
 import threading
 from time import sleep
-from PySiddhi4 import SiddhiLoader
-from PySiddhi4.DataTypes.DataWrapper import unwrapHashMap
+from PySiddhi import SiddhiLoader
+from PySiddhi.DataTypes.DataWrapper import unwrapHashMap
 from enum import Enum
-from PySiddhi4.core.event.ComplexEvent import ComplexEvent
+from PySiddhi.core.event.ComplexEvent import ComplexEvent
 
 
 class SiddhiDebugger(object):

PySiddhi4/core/debugger/SiddhiDebuggerCallback.py → PySiddhi/core/debugger/SiddhiDebuggerCallback.py

@@ -17,7 +17,7 @@
 
 from abc import ABCMeta, abstractmethod
 from future.utils import with_metaclass
-from PySiddhi4 import SiddhiLoader
+from PySiddhi import SiddhiLoader
 
 _siddhi_debugger_callback_proxy = SiddhiLoader._loadType(
     "org.wso2.siddhi.pythonapi.proxy.core.debugger.siddhi_debugger_callback.SiddhiDebuggerCallbackProxy")

PySiddhi4/core/event/ComplexEvent.py → PySiddhi/core/event/ComplexEvent.py

@@ -16,8 +16,8 @@
 
 
 from enum import Enum
-from PySiddhi4 import SiddhiLoader
-from PySiddhi4.DataTypes.DataWrapper import unwrapData, wrapData
+from PySiddhi import SiddhiLoader
+from PySiddhi.DataTypes.DataWrapper import unwrapData, wrapData
 
 
 class ComplexEvent(object):

PySiddhi4/core/event/Event.py → PySiddhi/core/event/Event.py

@@ -14,10 +14,10 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from PySiddhi4 import SiddhiLoader
+from PySiddhi import SiddhiLoader
 
-from PySiddhi4.DataTypes import DataWrapper
-from PySiddhi4.core.event import ComplexEvent
+from PySiddhi.DataTypes import DataWrapper
+from PySiddhi.core.event import ComplexEvent
 
 _event_class = SiddhiLoader._loadType("org.wso2.siddhi.core.event.Event")
 _event_proxy_class = SiddhiLoader._loadType("org.wso2.siddhi.pythonapi.proxy.core.event.event.EventProxy")

PySiddhi4/core/query/output/callback/QueryCallback.py → PySiddhi/core/query/output/callback/QueryCallback.py

@@ -18,8 +18,8 @@
 
 from abc import ABCMeta, abstractmethod
 
-from PySiddhi4 import SiddhiLoader
-from PySiddhi4.core.event.Event import Event
+from PySiddhi import SiddhiLoader
+from PySiddhi.core.event.Event import Event
 
 from future.utils import with_metaclass
 

PySiddhi4/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 PySiddhi4 import SiddhiLoader
-from PySiddhi4.DataTypes.DataWrapper import wrapData
+from PySiddhi import SiddhiLoader
+from PySiddhi.DataTypes.DataWrapper import wrapData
 
 input_handler_proxy = SiddhiLoader._loadType(
     "org.wso2.siddhi.pythonapi.proxy.core.stream.input.input_handler.InputHandlerProxy")

PySiddhi4/core/stream/output/StreamCallback.py → PySiddhi/core/stream/output/StreamCallback.py

@@ -20,8 +20,8 @@
 
 from abc import ABCMeta, abstractmethod
 
-from PySiddhi4 import SiddhiLoader
-from PySiddhi4.core.event.Event import Event
+from PySiddhi import SiddhiLoader
+from PySiddhi.core.event.Event import Event
 
 from future.utils import with_metaclass
 

PySiddhi4/core/util/EventPrinter.py → PySiddhi/core/util/EventPrinter.py

@@ -14,7 +14,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from PySiddhi4 import SiddhiLoader
+from PySiddhi import SiddhiLoader
 
 _event_printer_proxy = SiddhiLoader._loadType("org.wso2.siddhi.pythonapi.proxy.core.util.EventPrinterProxy")
 

PySiddhi4/sp/EventSimulator/AttributeConfiguration.py → PySiddhi/sp/EventSimulator/AttributeConfiguration.py

@@ -16,9 +16,9 @@
 
 from enum import Enum
 
-from PySiddhi4.sp.ObjectMapping.APIObject import APIObject, NotSet
-from PySiddhi4.sp.ObjectMapping.FieldMapping import FieldMapping, ListFieldMapping
-from PySiddhi4.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):

PySiddhi4/sp/EventSimulator/EventSimulatorClient.py → PySiddhi/sp/EventSimulator/EventSimulatorClient.py

@@ -17,8 +17,8 @@
 import json
 import logging
 
-from PySiddhi4.sp.__Communication.RestClient import RestClient
-from PySiddhi4.sp.EventSimulator.FeedSimulationConfiguration import FeedSimulationConfiguration
+from PySiddhi.sp.__Communication.RestClient import RestClient
+from PySiddhi.sp.EventSimulator.FeedSimulationConfiguration import FeedSimulationConfiguration
 from requests.auth import HTTPBasicAuth
 
 

PySiddhi4/sp/EventSimulator/FeedSimulationConfiguration.py → PySiddhi/sp/EventSimulator/FeedSimulationConfiguration.py

@@ -14,10 +14,10 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from PySiddhi4.sp.EventSimulator.SimulationProperties import SimulationProperties
-from PySiddhi4.sp.EventSimulator.SimulationSource import SimulationSource
-from PySiddhi4.sp.ObjectMapping.APIObject import APIObject
-from PySiddhi4.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):

PySiddhi4/sp/EventSimulator/SimulationProperties.py → PySiddhi/sp/EventSimulator/SimulationProperties.py

@@ -16,9 +16,9 @@
 
 import random
 
-from PySiddhi4.sp.ObjectMapping.APIObject import APIObject, NotSet
-from PySiddhi4.sp.ObjectMapping.FieldMapping import FieldMapping
-from PySiddhi4.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
 

PySiddhi4/sp/EventSimulator/SimulationSource.py → PySiddhi/sp/EventSimulator/SimulationSource.py

@@ -16,9 +16,9 @@
 
 from enum import Enum
 
-from PySiddhi4.sp.EventSimulator.AttributeConfiguration import AttributeConfiguration
-from PySiddhi4.sp.ObjectMapping.APIObject import APIObject, NotSet
-from PySiddhi4.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):

PySiddhi4/sp/EventSimulator/SingleSimulationConfiguration.py → PySiddhi/sp/EventSimulator/SingleSimulationConfiguration.py

@@ -14,8 +14,8 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from PySiddhi4.sp.ObjectMapping.APIObject import APIObject
-from PySiddhi4.sp.ObjectMapping.FieldMapping import FieldMapping, ListFieldMapping
+from PySiddhi.sp.ObjectMapping.APIObject import APIObject
+from PySiddhi.sp.ObjectMapping.FieldMapping import FieldMapping, ListFieldMapping
 
 
 class SingleSimulationConfiguration(APIObject):

PySiddhi4/sp/ObjectMapping/APIObject.py → PySiddhi/sp/ObjectMapping/APIObject.py

@@ -17,7 +17,7 @@
 from abc import ABCMeta
 from future.utils import with_metaclass
 
-from PySiddhi4.sp.__Util import decodeField, encodeField
+from PySiddhi.sp.__Util import decodeField, encodeField
 
 
 class NotSet(object):

PySiddhi4/sp/ObjectMapping/FieldMapping.py → PySiddhi/sp/ObjectMapping/FieldMapping.py

@@ -14,8 +14,8 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from PySiddhi4.sp.ObjectMapping.APIObject import NotSet
-from PySiddhi4.sp.__Util import encodeField, decodeField
+from PySiddhi.sp.ObjectMapping.APIObject import NotSet
+from PySiddhi.sp.__Util import encodeField, decodeField
 
 
 def strOrInt(v):

PySiddhi4/sp/SPClient.py → PySiddhi/sp/SPClient.py

@@ -14,8 +14,8 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from PySiddhi4.sp.EventSimulator.EventSimulatorClient import EventSimulatorClient
-from PySiddhi4.sp.SiddhiAppManagement.SiddhiAppManagementClient import SiddhiAppManagementClient
+from PySiddhi.sp.EventSimulator.EventSimulatorClient import EventSimulatorClient
+from PySiddhi.sp.SiddhiAppManagement.SiddhiAppManagementClient import SiddhiAppManagementClient
 
 
 class SPClient(object):

PySiddhi4/sp/SiddhiAppManagement/SiddhiAppManagementClient.py → PySiddhi/sp/SiddhiAppManagement/SiddhiAppManagementClient.py

@@ -17,7 +17,7 @@
 from enum import Enum
 from requests.auth import HTTPBasicAuth
 
-from PySiddhi4.sp.__Communication.RestClient import RestClient
+from PySiddhi.sp.__Communication.RestClient import RestClient
 
 
 class UpdateAppStatusResponse(Enum):

README.md

@@ -4,8 +4,8 @@
 described via a ***Streaming SQL language***, and triggers actions. It performs both ***Stream Processing*** and 
 ***Complex Event Processing*** on streaming data. Its Siddhi core is written in Java library. 
 
-- PySiddhi4 wraps [Siddhi 4](https://wso2.github.io/siddhi/)
-- PySiddhi4 includes a REST Client for [WSO2 Stream Processor(SP) 4.x.x](https://wso2.com/analytics).
+- PySiddhi wraps [Siddhi 4](https://wso2.github.io/siddhi/)
+- PySiddhi includes a REST Client for [WSO2 Stream Processor(SP) 4.x.x](https://wso2.com/analytics).
 
 ## Features
 

Tests/SPTests/EventSimulatorTests.py

@@ -20,11 +20,11 @@
 import os
 from time import sleep
 
-from PySiddhi4.sp.SPClient import SPClient
-from PySiddhi4.sp.EventSimulator.AttributeConfiguration import AttributeConfiguration
-from PySiddhi4.sp.EventSimulator.FeedSimulationConfiguration import FeedSimulationConfiguration
-from PySiddhi4.sp.EventSimulator.SimulationSource import SimulationSource
-from PySiddhi4.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)
 

Tests/SPTests/SiddhiAppManagerTests.py

@@ -20,8 +20,8 @@
 import logging
 from time import sleep
 
-from PySiddhi4.sp.SPClient import SPClient
-from PySiddhi4.sp.SiddhiAppManagement.SiddhiAppManagementClient import UpdateAppStatusResponse
+from PySiddhi.sp.SPClient import SPClient
+from PySiddhi.sp.SiddhiAppManagement.SiddhiAppManagementClient import UpdateAppStatusResponse
 
 logging.basicConfig(level=logging.INFO)
 

Tests/SiddhiCoreTests/BasicTest.py

@@ -18,10 +18,10 @@
 import unittest
 import logging
 from time import sleep
-from PySiddhi4.DataTypes.LongType import LongType
-from PySiddhi4.core.SiddhiManager import SiddhiManager
-from PySiddhi4.core.query.output.callback.QueryCallback import QueryCallback
-from PySiddhi4.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)
 

Tests/SiddhiCoreTests/EventTest.py

@@ -19,8 +19,8 @@
 
 logging.basicConfig(level=logging.INFO)
 
-from PySiddhi4.DataTypes.LongType import LongType
-from PySiddhi4.core.event.Event import Event
+from PySiddhi.DataTypes.LongType import LongType
+from PySiddhi.core.event.Event import Event
 
 
 class BasicTests(unittest.TestCase):

Tests/SiddhiCoreTests/ExtensionsTest.py

@@ -16,18 +16,18 @@
 
 from subprocess import call
 import os
-from PySiddhi4 import SiddhiLoader
+from PySiddhi import SiddhiLoader
 
 # Download extension jars
 
 import unittest
 import logging
 from time import sleep
 
-from PySiddhi4.DataTypes.LongType import LongType
-from PySiddhi4.core.SiddhiManager import SiddhiManager
-from PySiddhi4.core.query.output.callback.QueryCallback import QueryCallback
-from PySiddhi4.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)
 

Tests/SiddhiCoreTests/Resources/Extensions4/pom.xml → Tests/SiddhiCoreTests/Resources/Extensions/pom.xml

@@ -24,25 +24,25 @@
 
     <groupId>org.wso2.siddhi-python-api</groupId>
     <artifactId>siddhi-python-api-extensions-downloader-for-tests</artifactId>
-    <version>1.1.0</version>
+    <version>4.0.0</version>
     <description>Downloads extensions (JARS) used by Siddhi Python API Tests</description>
     <packaging>pom</packaging>
 
     <dependencies>
         <dependency>
             <groupId>org.wso2.extension.siddhi.execution.string</groupId>
             <artifactId>siddhi-execution-string</artifactId>
-            <version>4.0.1</version>
+            <version>4.1.1</version>
         </dependency>
         <dependency>
             <groupId>org.wso2.extension.siddhi.execution.math</groupId>
             <artifactId>siddhi-execution-math</artifactId>
-            <version>4.0.1</version>
+            <version>4.1.1</version>
         </dependency>
         <dependency>
             <groupId>org.wso2.extension.siddhi.execution.timeseries</groupId>
             <artifactId>siddhi-execution-timeseries</artifactId>
-            <version>4.0.1</version>
+            <version>4.1.2</version>
         </dependency>
 
         <dependency>