From e08bbf91414cf08487422a07ae5ccac6445aa7f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9sar=20Rom=C3=A1n?= <thecesrom@gmail.com>
Date: Tue, 5 Oct 2021 08:33:14 -0700
Subject: [PATCH] refactor: return instance of implementing classes

---
 .../ignition/common/alarming/query/__init__.py   | 16 +++++++++++++++-
 src/system/alarm.py                              |  5 +++--
 src/system/opc.py                                |  5 +++--
 src/system/tag.py                                |  7 ++++---
 src/system/util.py                               |  3 ++-
 5 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/src/com/inductiveautomation/ignition/common/alarming/query/__init__.py b/src/com/inductiveautomation/ignition/common/alarming/query/__init__.py
index 4ce4e55..4607db4 100644
--- a/src/com/inductiveautomation/ignition/common/alarming/query/__init__.py
+++ b/src/com/inductiveautomation/ignition/common/alarming/query/__init__.py
@@ -1,4 +1,4 @@
-__all__ = ["AlarmQueryResult"]
+__all__ = ["AlarmQueryResult", "AlarmQueryResultImpl"]
 
 
 class AlarmQueryResult(object):
@@ -18,3 +18,17 @@ def getDataSet(self):
 
     def getEvent(self, uuid):
         raise NotImplementedError
+
+
+class AlarmQueryResultImpl(AlarmQueryResult):
+    def __init__(self, *args):
+        pass
+
+    def getAssociatedDate(self, uuid):
+        pass
+
+    def getDataSet(self):
+        pass
+
+    def getEvent(self, uuid):
+        pass
diff --git a/src/system/alarm.py b/src/system/alarm.py
index 5fe90d5..c42b5c7 100644
--- a/src/system/alarm.py
+++ b/src/system/alarm.py
@@ -25,6 +25,7 @@
 )
 from com.inductiveautomation.ignition.common.alarming.query import (
     AlarmQueryResult,
+    AlarmQueryResultImpl,
 )
 from java.util import Date
 
@@ -218,7 +219,7 @@ def queryJournal(
         includeSystem,
         isSystem,
     )
-    return AlarmQueryResult()
+    return AlarmQueryResultImpl()
 
 
 def queryStatus(
@@ -295,7 +296,7 @@ def queryStatus(
         defined,
         includeShelved,
     )
-    return AlarmQueryResult()
+    return AlarmQueryResultImpl()
 
 
 def shelve(path, timeoutSeconds=None, timeoutMinutes=None):
diff --git a/src/system/opc.py b/src/system/opc.py
index f19564d..721acbb 100644
--- a/src/system/opc.py
+++ b/src/system/opc.py
@@ -21,6 +21,7 @@
 ]
 
 from com.inductiveautomation.ignition.common.model.values import (
+    BasicQualifiedValue,
     QualifiedValue,
     QualityCode,
 )
@@ -172,7 +173,7 @@ def readValue(opcServer, itemPath):
             specified.
     """
     print(opcServer, itemPath)
-    return QualifiedValue()
+    return BasicQualifiedValue()
 
 
 def readValues(opcServer, itemPaths):
@@ -196,7 +197,7 @@ def readValues(opcServer, itemPaths):
             for the corresponding address.
     """
     print(opcServer, itemPaths)
-    return [QualifiedValue()]
+    return [BasicQualifiedValue()]
 
 
 def setServerEnabled(serverName, enabled):
diff --git a/src/system/tag.py b/src/system/tag.py
index 8ef211a..5f68f5b 100644
--- a/src/system/tag.py
+++ b/src/system/tag.py
@@ -44,6 +44,7 @@
 import system.date
 from com.inductiveautomation.ignition.common.browsing import Results
 from com.inductiveautomation.ignition.common.model.values import (
+    BasicQualifiedValue,
     QualifiedValue,
     QualityCode,
 )
@@ -735,7 +736,7 @@ def read(tagPath):
         DeprecationWarning,
     )
     print(tagPath)
-    return QualifiedValue()
+    return BasicQualifiedValue()
 
 
 def readAll(tagPaths):
@@ -759,7 +760,7 @@ def readAll(tagPaths):
         DeprecationWarning,
     )
     print(tagPaths)
-    return [QualifiedValue() for _ in range(len(tagPaths))]
+    return [BasicQualifiedValue() for _ in range(len(tagPaths))]
 
 
 def readAsync(tagPaths, callback):
@@ -800,7 +801,7 @@ def readBlocking(tagPaths, timeout=45000):
             have three sub members: value, quality, and timestamp.
     """
     print(tagPaths, timeout)
-    return [QualifiedValue() for _ in tagPaths]
+    return [BasicQualifiedValue() for _ in tagPaths]
 
 
 def rename(tag, newName, collisionPollicy="a"):
diff --git a/src/system/util.py b/src/system/util.py
index 77fa1f4..d04919b 100644
--- a/src/system/util.py
+++ b/src/system/util.py
@@ -62,6 +62,7 @@
 from com.inductiveautomation.ignition.common.model import Version
 from com.inductiveautomation.ignition.common.script.builtin import (
     DatasetUtilities,
+    SystemUtilities,
 )
 from com.inductiveautomation.ignition.common.script.message import Request
 from com.inductiveautomation.ignition.common.util import LoggerEx
@@ -853,7 +854,7 @@ def sendRequestAsync(
         onSuccess,
         onError,
     )
-    return Request()
+    return SystemUtilities.RequestImpl()
 
 
 def setConnectTimeout(connectTimeout):