Merge pull request #23 from lasanthaS/master

Refactor code to support Siddhi 5.0.0

Author: lasanthaS

.gitignore

@@ -88,3 +88,4 @@ ENV/
 # Rope project settings
 .ropeproject
 .idea/
+*.iml

PySiddhi4/DataTypes/DataWrapper.py PySiddhi/DataTypes/DataWrapper.pyPySiddhi4/DataTypes/DataWrapper.py renamed to 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
@@ -69,7 +69,7 @@ def wrapDataItem(d):
     :param d: 
     :return: 
     '''
-    wrapped_data_proxy = SiddhiLoader._loadType("org.wso2.siddhi.pythonapi.DataWrapProxy")
+    wrapped_data_proxy = SiddhiLoader._loadType("io.siddhi.pythonapi.DataWrapProxy")
     wrapped_data = None
     if d is None:
         # Constructor for null type

PySiddhi4/DataTypes/DoubleType.py PySiddhi/DataTypes/DoubleType.pyPySiddhi4/DataTypes/DoubleType.py renamed to PySiddhi/DataTypes/DoubleType.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', '*')]
@@ -117,7 +117,7 @@ def loadLibrary():
 
     # Generate references and store in backup
     global t_siddhi_api_core, t_siddhi_api_core_inst, t_java_method, t_PythonJavaClass, t_JavaClass
-    t_siddhi_api_core = autoclass("org.wso2.siddhi.pythonapi.proxy.core.SiddhiAPICoreProxy")
+    t_siddhi_api_core = autoclass("io.siddhi.pythonapi.proxy.core.SiddhiAPICoreProxy")
     t_siddhi_api_core_inst = t_siddhi_api_core(sys.version_info[0], sys.version_info[1])
     t_java_method = java_method
     t_PythonJavaClass = PythonJavaClass

PySiddhi4/DataTypes/LongType.py PySiddhi/DataTypes/LongType.pyPySiddhi4/DataTypes/LongType.py renamed to PySiddhi/DataTypes/LongType.py

@@ -14,16 +14,16 @@
 # 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):
     '''
-    Wrapper on org.wso2.core.SiddhiAppRuntime
+    Wrapper on io.core.SiddhiAppRuntime
     '''
 
     def __init__(self):

PySiddhi4/DataTypes/__init__.py PySiddhi/DataTypes/__init__.pyPySiddhi4/DataTypes/__init__.py renamed to PySiddhi/DataTypes/__init__.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):