diff --git a/awips/gfe/IFPClient.py b/awips/gfe/IFPClient.py index 828abf7..71d16a4 100644 --- a/awips/gfe/IFPClient.py +++ b/awips/gfe/IFPClient.py @@ -1,6 +1,3 @@ -## -## - from awips import ThriftClient from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.gfe.db.objects import DatabaseID diff --git a/dynamicserialize/adapters/JobProgressAdapter.py b/dynamicserialize/adapters/JobProgressAdapter.py deleted file mode 100644 index 3df0ae1..0000000 --- a/dynamicserialize/adapters/JobProgressAdapter.py +++ /dev/null @@ -1,34 +0,0 @@ -## -## - - -# -# Adapter for com.raytheon.uf.common.dataplugin.gfe.svcbu.JobProgress -# -# -# SOFTWARE HISTORY -# -# Date Ticket# Engineer Description -# ------------ ---------- ----------- -------------------------- -# 06/22/2015 4573 randerso Initial creation -# -# -# - -from thrift.Thrift import TType -from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.gfe.svcbu import JobProgress - -ClassAdapter = 'com.raytheon.uf.common.dataplugin.gfe.svcbu.JobProgress' - -def serialize(context, mode): - context.protocol.writeFieldBegin('__enumValue__', TType.STRING, 0) - context.writeString(mode.value) - -def deserialize(context): - result = JobProgress() - # Read the TType.STRING, "__enumValue__", and id. - # We're not interested in any of those, so just discard them. - context.protocol.readFieldBegin() - # now get the actual enum value - result.value = context.readString() - return result diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/__init__.py index 8786885..f3a0059 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/__init__.py @@ -1,11 +1,10 @@ -## -## # # SOFTWARE HISTORY # # Date Ticket# Engineer Description # ------------ ---------- ----------- -------------------------- # 06/22/2015 4573 randerso Added svcbu package +# 10/06/2015 mjames@ucar Removed svcbu package # ## @@ -17,7 +16,6 @@ __all__ = [ 'request', 'server', 'slice', - 'svcbu', 'weather', 'GridDataHistory' ] diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/ExecuteIfpNetCDFGridRequest.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/ExecuteIfpNetCDFGridRequest.py index 3675107..d962e95 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/ExecuteIfpNetCDFGridRequest.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/ExecuteIfpNetCDFGridRequest.py @@ -1,6 +1,3 @@ -## -## - # File auto-generated against equivalent DynamicSerialize Java class # and then modified post-generation to use AbstractGfeRequest and # implement str(), repr() diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/ExecuteIscMosaicRequest.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/ExecuteIscMosaicRequest.py deleted file mode 100644 index ad27b27..0000000 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/ExecuteIscMosaicRequest.py +++ /dev/null @@ -1,217 +0,0 @@ -## -## - -# File auto-generated against equivalent DynamicSerialize Java class -# and then modified post-generation to use AbstractGfeRequest and -# implement str(), repr() -# -# SOFTWARE HISTORY -# -# Date Ticket# Engineer Description -# ------------ ---------- ----------- -------------------------- -# xx/xx/?? dgilling Initial Creation. -# 03/13/13 1759 dgilling Add software history header. -# -# -# - - -from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.gfe.request import AbstractGfeRequest -from dynamicserialize.dstypes.com.raytheon.uf.common.message import WsId - -class ExecuteIscMosaicRequest(AbstractGfeRequest): - - def __init__(self, userID=None, databaseID=None, parmsToProcess=[], - blankOtherPeriods=False, startTime=None, endTime=None, - altMask=None, replaceOnly=False, eraseFirst=False, announce="", - renameWE=False, iscSends=False, inFiles=[], ignoreMask=False, - adjustTranslate=False, deleteInput=False, parmsToIgnore=[], - gridDelay=0.0, logFileName=None): - super(ExecuteIscMosaicRequest, self).__init__() - self.userID = userID - self.databaseID = databaseID - self.parmsToProcess = parmsToProcess - self.blankOtherPeriods = blankOtherPeriods - self.startTime = startTime - self.endTime = endTime - self.altMask = altMask - self.replaceOnly = replaceOnly - self.eraseFirst = eraseFirst - self.announce = announce - self.renameWE = renameWE - self.iscSends = iscSends - self.inFiles = inFiles - self.ignoreMask = ignoreMask - self.adjustTranslate = adjustTranslate - self.deleteInput = deleteInput - self.parmsToIgnore = parmsToIgnore - self.gridDelay = gridDelay - self.logFileName = logFileName - if self.userID is not None: - self.workstationID = WsId(progName='iscMosaic', userName=self.userID) - if self.databaseID is not None: - self.siteID = self.databaseID.getSiteId() - - def __str__(self): - retVal = "ExecuteIscMosaicRequest[" - retVal += "wokstationID: " + str(self.workstationID) + ", " - retVal += "siteID: " + str(self.siteID) + ", " - retVal += "userID: " + str(self.userID) + ", " - retVal += "databaseID: " + str(self.databaseID) + ", " - retVal += "parmsToProcess: " + str(self.parmsToProcess) + ", " - retVal += "blankOtherPeriods: " + str(self.blankOtherPeriods) + ", " - retVal += "startTime: " + str(self.startTime) + ", " - retVal += "endTime: " + str(self.endTime) + ", " - retVal += "altMask: " + str(self.altMask) + ", " - retVal += "replaceOnly: " + str(self.replaceOnly) + ", " - retVal += "eraseFirst: " + str(self.eraseFirst) + ", " - retVal += "announce: " + str(self.announce) + ", " - retVal += "renameWE: " + str(self.renameWE) + ", " - retVal += "iscSends: " + str(self.iscSends) + ", " - retVal += "inFiles: " + str(self.inFiles) + ", " - retVal += "ignoreMask: " + str(self.ignoreMask) + ", " - retVal += "adjustTranslate: " + str(self.adjustTranslate) + ", " - retVal += "deleteInput: " + str(self.deleteInput) + ", " - retVal += "parmsToIgnore: " + str(self.parmsToIgnore) + ", " - retVal += "gridDelay: " + str(self.gridDelay) + ", " - retVal += "logFileName: " + str(self.logFileName) + "]" - return retVal - - def __repr__(self): - retVal = "ExecuteIscMosaicRequest(" - retVal += "wokstationID= " + str(self.workstationID) + ", " - retVal += "siteID= " + str(self.siteID) + ", " - retVal += "userID= " + str(self.userID) + ", " - retVal += "databaseID= " + str(self.databaseID) + ", " - retVal += "parmsToProcess= " + str(self.parmsToProcess) + ", " - retVal += "blankOtherPeriods= " + str(self.blankOtherPeriods) + ", " - retVal += "startTime= " + str(self.startTime) + ", " - retVal += "endTime= " + str(self.endTime) + ", " - retVal += "altMask= " + str(self.altMask) + ", " - retVal += "replaceOnly= " + str(self.replaceOnly) + ", " - retVal += "eraseFirst= " + str(self.eraseFirst) + ", " - retVal += "announce= " + str(self.announce) + ", " - retVal += "renameWE= " + str(self.renameWE) + ", " - retVal += "iscSends= " + str(self.iscSends) + ", " - retVal += "inFiles= " + str(self.inFiles) + ", " - retVal += "ignoreMask= " + str(self.ignoreMask) + ", " - retVal += "adjustTranslate= " + str(self.adjustTranslate) + ", " - retVal += "deleteInput= " + str(self.deleteInput) + ", " - retVal += "parmsToIgnore= " + str(self.parmsToIgnore) + ", " - retVal += "gridDelay= " + str(self.gridDelay) + ", " - retVal += "logFileName= " + str(self.logFileName) + ")" - return retVal - - def getUserID(self): - return self.userID - - def setUserID(self, userID): - self.userID = userID - - def getDatabaseID(self): - return self.databaseID - - def setDatabaseID(self, databaseID): - self.databaseID = databaseID - - def getParmsToProcess(self): - return self.parmsToProcess - - def setParmsToProcess(self, parmsToProcess): - self.parmsToProcess = parmsToProcess - - def getBlankOtherPeriods(self): - return self.blankOtherPeriods - - def setBlankOtherPeriods(self, blankOtherPeriods): - self.blankOtherPeriods = blankOtherPeriods - - def getStartTime(self): - return self.startTime - - def setStartTime(self, startTime): - self.startTime = startTime - - def getEndTime(self): - return self.endTime - - def setEndTime(self, endTime): - self.endTime = endTime - - def getAltMask(self): - return self.altMask - - def setAltMask(self, altMask): - self.altMask = altMask - - def getReplaceOnly(self): - return self.replaceOnly - - def setReplaceOnly(self, replaceOnly): - self.replaceOnly = replaceOnly - - def getEraseFirst(self): - return self.eraseFirst - - def setEraseFirst(self, eraseFirst): - self.eraseFirst = eraseFirst - - def getAnnounce(self): - return self.announce - - def setAnnounce(self, announce): - self.announce = announce - - def getRenameWE(self): - return self.renameWE - - def setRenameWE(self, renameWE): - self.renameWE = renameWE - - def getIscSends(self): - return self.iscSends - - def setIscSends(self, iscSends): - self.iscSends = iscSends - - def getInFiles(self): - return self.inFiles - - def setInFiles(self, inFiles): - self.inFiles = inFiles - - def getIgnoreMask(self): - return self.ignoreMask - - def setIgnoreMask(self, ignoreMask): - self.ignoreMask = ignoreMask - - def getAdjustTranslate(self): - return self.adjustTranslate - - def setAdjustTranslate(self, adjustTranslate): - self.adjustTranslate = adjustTranslate - - def getDeleteInput(self): - return self.deleteInput - - def setDeleteInput(self, deleteInput): - self.deleteInput = deleteInput - - def getParmsToIgnore(self): - return self.parmsToIgnore - - def setParmsToIgnore(self, parmsToIgnore): - self.parmsToIgnore = parmsToIgnore - - def getGridDelay(self): - return self.gridDelay - - def setGridDelay(self, gridDelay): - self.gridDelay = gridDelay - - def getLogFileName(self): - return self.logFileName - - def setLogFileName(self, logFileName): - self.logFileName = logFileName diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/IscDataRecRequest.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/IscDataRecRequest.py deleted file mode 100644 index 866a918..0000000 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/IscDataRecRequest.py +++ /dev/null @@ -1,30 +0,0 @@ -## -## - -# File auto-generated against equivalent DynamicSerialize Java class - -class IscDataRecRequest(object): - - def __init__(self): - self.argString = None - self.workstationID = None - self.siteID = None - - def getArgString(self): - return self.argString - - def setArgString(self, argString): - self.argString = argString - - def getWorkstationID(self): - return self.workstationID - - def setWorkstationID(self, workstationID): - self.workstationID = workstationID - - def getSiteID(self): - return self.siteID - - def setSiteID(self, siteID): - self.siteID = siteID - diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/__init__.py index 9e97123..448ceb3 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/__init__.py @@ -13,7 +13,6 @@ __all__ = [ 'CommitGridsRequest', 'ConfigureTextProductsRequest', 'ExecuteIfpNetCDFGridRequest', - 'ExecuteIscMosaicRequest', 'ExportGridsRequest', 'GetASCIIGridsRequest', 'GetGridDataRequest', @@ -28,7 +27,6 @@ __all__ = [ 'GetSiteTimeZoneInfoRequest', 'GfeClientRequest', 'GridLocRequest', - 'IscDataRecRequest', 'LockChangeRequest', 'ProcessReceivedConfRequest', 'ProcessReceivedDigitalDataRequest', @@ -42,7 +40,6 @@ from .AbstractGfeRequest import AbstractGfeRequest from .CommitGridsRequest import CommitGridsRequest from .ConfigureTextProductsRequest import ConfigureTextProductsRequest from .ExecuteIfpNetCDFGridRequest import ExecuteIfpNetCDFGridRequest -from .ExecuteIscMosaicRequest import ExecuteIscMosaicRequest from .ExportGridsRequest import ExportGridsRequest from .GetASCIIGridsRequest import GetASCIIGridsRequest from .GetGridDataRequest import GetGridDataRequest @@ -57,7 +54,6 @@ from .GetSingletonDbIdsRequest import GetSingletonDbIdsRequest from .GetSiteTimeZoneInfoRequest import GetSiteTimeZoneInfoRequest from .GfeClientRequest import GfeClientRequest from .GridLocRequest import GridLocRequest -from .IscDataRecRequest import IscDataRecRequest from .LockChangeRequest import LockChangeRequest from .ProcessReceivedConfRequest import ProcessReceivedConfRequest from .ProcessReceivedDigitalDataRequest import ProcessReceivedDigitalDataRequest diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/svcbu/JobProgress.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/svcbu/JobProgress.py deleted file mode 100644 index 3f0a247..0000000 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/svcbu/JobProgress.py +++ /dev/null @@ -1,20 +0,0 @@ -## -## -# -# SOFTWARE HISTORY -# -# Date Ticket# Engineer Description -# ------------ ---------- ----------- -------------------------- -# 06/22/2015 4573 randerso Initial creation (hand generated) -# 08/27/2015 4812 randerso Change __str__ to return the self.value -# instead of __repr__(self.value) to eliminate -# ''s around string. -# -## - -class JobProgress(object): - def __init__(self): - self.value = None - - def __str__(self): - return self.value diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/svcbu/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/svcbu/__init__.py deleted file mode 100644 index 06b1aa5..0000000 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/svcbu/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -## -## -# -# SOFTWARE HISTORY -# -# Date Ticket# Engineer Description -# ------------ ---------- ----------- -------------------------- -# 06/22/2015 4573 randerso Initial creation (hand generated) -# -## - -__all__ = [ - 'JobProgress' - ] - -from .JobProgress import JobProgress