Make new ODM2 to use the refractored ODM2

Author: lsetiawan

odm2api/ODM2/__init__.py

@@ -0,0 +1,8 @@
+from __future__ import (absolute_import, division, print_function)
+
+from odm2api.base import modelBase, serviceBase
+
+__all__ = [
+    'serviceBase',
+    'modelBase',
+]

odm2api/ODM2/models.py

@@ -0,0 +1,9 @@
+from __future__ import (absolute_import, division, print_function)
+
+import warnings
+
+from odm2api.models import *  # noqa
+
+warnings.warn('The module odm2api.ODM2.models will be deprecated. '
+              'Please use odm2api.models instead.',
+              FutureWarning, stacklevel=2)

odm2api/ODM2/services/__init__.py

@@ -0,0 +1,15 @@
+from __future__ import (absolute_import, division, print_function)
+
+from odm2api.ODM2.services.createService import CreateODM2
+from odm2api.ODM2.services.deleteService import DeleteODM2
+from odm2api.ODM2.services.readService import ReadODM2
+from odm2api.ODM2.services.updateService import UpdateODM2
+
+__author__ = 'jmeline'
+
+__all__ = [
+    'CreateODM2',
+    'DeleteODM2',
+    'ReadODM2',
+    'UpdateODM2'
+]

odm2api/ODM2/services/createService.py

@@ -0,0 +1,19 @@
+from __future__ import (absolute_import, division, print_function)
+
+import warnings
+
+from odm2api.services import CreateODM2 as newClass
+
+warnings.warn('The module odm2api.ODM2.services.createService will be deprecated. '
+              'Please use odm2api.services.createService instead.',
+              FutureWarning, stacklevel=2)
+
+
+__author__ = 'sreeder'
+
+
+def CreateODM2(*args, **kwargs):
+    warnings.warn('The class odm2api.ODM2.services.readService.CreateODM2 will be deprecated. '
+                  'Please use odm2api.services.readService.CreateODM2 instead.',
+                  FutureWarning, stacklevel=2)
+    return newClass(*args, **kwargs)

odm2api/ODM2/services/deleteService.py

@@ -0,0 +1,21 @@
+from __future__ import (absolute_import, division, print_function)
+
+import warnings
+
+from odm2api.services.deleteService import DeleteODM2 as newClass
+
+warnings.warn('The module odm2api.ODM2.services.deleteService will be deprecated. '
+              'Please use odm2api.services.deleteService instead.',
+              FutureWarning, stacklevel=2)
+
+
+__author__ = 'jmeline'
+
+# Annotations
+
+
+def DeleteODM2(*args, **kwargs):
+    warnings.warn('The class odm2api.ODM2.services.readService.DeleteODM2 will be deprecated. '
+                  'Please use odm2api.services.readService.DeleteODM2 instead.',
+                  FutureWarning, stacklevel=2)
+    return newClass(*args, **kwargs)

odm2api/ODM2/services/readService.py

@@ -0,0 +1,19 @@
+from __future__ import (absolute_import, division, print_function)
+
+import warnings
+
+from odm2api.services.readService import ReadODM2 as newClass
+
+warnings.warn('The module odm2api.ODM2.services.readService will be deprecated. '
+              'Please use odm2api.services.readService instead.',
+              FutureWarning, stacklevel=2)
+
+
+__author__ = 'sreeder'
+
+
+def ReadODM2(*args, **kwargs):
+    warnings.warn('The class odm2api.ODM2.services.readService.ReadODM2 will be deprecated. '
+                  'Please use odm2api.services.readService.ReadODM2 instead.',
+                  FutureWarning, stacklevel=2)
+    return newClass(*args, **kwargs)

odm2api/ODM2/services/updateService.py

@@ -0,0 +1,18 @@
+from __future__ import (absolute_import, division, print_function)
+
+import warnings
+
+from odm2api.services import UpdateODM2 as newClass
+
+warnings.warn('The module odm2api.ODM2.services.updateService will be deprecated. '
+              'Please use odm2api.services.updateService instead.',
+              FutureWarning, stacklevel=2)
+
+__author__ = 'jmeline'
+
+
+def UpdateODM2(*args, **kwargs):
+    warnings.warn('The class odm2api.ODM2.services.readService.CreateODM2 will be deprecated. '
+                  'Please use odm2api.services.readService.CreateODM2 instead.',
+                  FutureWarning, stacklevel=2)
+    return newClass(*args, **kwargs)

odm2api/ODMconnection.py

@@ -7,7 +7,7 @@
 except ImportError:
     from urllib.parse import quote_plus
 
-from odm2api.ODM2.models import setSchema
+from odm2api.models import setSchema
 
 from sqlalchemy import create_engine
 from sqlalchemy.orm import scoped_session, sessionmaker

odm2api/services/__init__.py

@@ -1,9 +1,9 @@
 from __future__ import (absolute_import, division, print_function)
 
-from odm2api.ODM2.services.createService import CreateODM2
-from odm2api.ODM2.services.deleteService import DeleteODM2
-from odm2api.ODM2.services.readService import ReadODM2
-from odm2api.ODM2.services.updateService import UpdateODM2
+from odm2api.services.createService import CreateODM2
+from odm2api.services.deleteService import DeleteODM2
+from odm2api.services.readService import ReadODM2
+from odm2api.services.updateService import UpdateODM2
 
 __author__ = 'jmeline'
 

odm2api/services/createService.py

@@ -2,8 +2,8 @@
 
 import uuid
 
-from odm2api.ODM2 import serviceBase
-from odm2api.ODM2.models import TimeSeriesResultValues
+from odm2api import serviceBase
+from odm2api.models import TimeSeriesResultValues
 
 __author__ = 'sreeder'