Skip to content

Commit

Permalink
refactor: return instance of implementing classes
Browse files Browse the repository at this point in the history
  • Loading branch information
cesarcoatl committed Oct 5, 2021
1 parent 88c45c4 commit e08bbf9
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 9 deletions.
@@ -1,4 +1,4 @@
__all__ = ["AlarmQueryResult"]
__all__ = ["AlarmQueryResult", "AlarmQueryResultImpl"]


class AlarmQueryResult(object):
Expand All @@ -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
5 changes: 3 additions & 2 deletions src/system/alarm.py
Expand Up @@ -25,6 +25,7 @@
)
from com.inductiveautomation.ignition.common.alarming.query import (
AlarmQueryResult,
AlarmQueryResultImpl,
)
from java.util import Date

Expand Down Expand Up @@ -218,7 +219,7 @@ def queryJournal(
includeSystem,
isSystem,
)
return AlarmQueryResult()
return AlarmQueryResultImpl()


def queryStatus(
Expand Down Expand Up @@ -295,7 +296,7 @@ def queryStatus(
defined,
includeShelved,
)
return AlarmQueryResult()
return AlarmQueryResultImpl()


def shelve(path, timeoutSeconds=None, timeoutMinutes=None):
Expand Down
5 changes: 3 additions & 2 deletions src/system/opc.py
Expand Up @@ -21,6 +21,7 @@
]

from com.inductiveautomation.ignition.common.model.values import (
BasicQualifiedValue,
QualifiedValue,
QualityCode,
)
Expand Down Expand Up @@ -172,7 +173,7 @@ def readValue(opcServer, itemPath):
specified.
"""
print(opcServer, itemPath)
return QualifiedValue()
return BasicQualifiedValue()


def readValues(opcServer, itemPaths):
Expand All @@ -196,7 +197,7 @@ def readValues(opcServer, itemPaths):
for the corresponding address.
"""
print(opcServer, itemPaths)
return [QualifiedValue()]
return [BasicQualifiedValue()]


def setServerEnabled(serverName, enabled):
Expand Down
7 changes: 4 additions & 3 deletions src/system/tag.py
Expand Up @@ -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,
)
Expand Down Expand Up @@ -735,7 +736,7 @@ def read(tagPath):
DeprecationWarning,
)
print(tagPath)
return QualifiedValue()
return BasicQualifiedValue()


def readAll(tagPaths):
Expand All @@ -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):
Expand Down Expand Up @@ -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"):
Expand Down
3 changes: 2 additions & 1 deletion src/system/util.py
Expand Up @@ -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
Expand Down Expand Up @@ -853,7 +854,7 @@ def sendRequestAsync(
onSuccess,
onError,
)
return Request()
return SystemUtilities.RequestImpl()


def setConnectTimeout(connectTimeout):
Expand Down

0 comments on commit e08bbf9

Please sign in to comment.