From 67811be32ea5e1a848a1d62c7125b712d911639a Mon Sep 17 00:00:00 2001 From: mjames-upc Date: Mon, 28 Mar 2016 16:22:44 -0500 Subject: [PATCH] reapply changes for dynamicserialize from unidata_16.1.4 --- docs/source/dev.rst | 2 +- .../DynamicSerializationManager.py | 2 +- .../ThriftSerializationContext.py | 1 - dynamicserialize/__init__.py | 2 +- .../adapters/ByteBufferAdapter.py | 4 + .../adapters/DatabaseIDAdapter.py | 2 +- dynamicserialize/adapters/DateAdapter.py | 2 +- dynamicserialize/adapters/EnumSetAdapter.py | 2 + .../adapters/FloatBufferAdapter.py | 4 + .../adapters/GridDataHistoryAdapter.py | 2 +- .../LocalizationLevelSerializationAdapter.py | 2 + dynamicserialize/adapters/LockTableAdapter.py | 2 +- dynamicserialize/adapters/ParmIDAdapter.py | 2 +- .../adapters/StackTraceElementAdapter.py | 3 + .../adapters/TimeConstraintsAdapter.py | 2 +- dynamicserialize/adapters/TimestampAdapter.py | 2 +- dynamicserialize/adapters/WsIdAdapter.py | 4 + .../uf/common/activetable/ActiveTableKey.py | 65 ++++ .../uf/common/activetable/ActiveTableMode.py | 2 +- .../common/activetable/ActiveTableRecord.py | 291 ++++++++++++++++++ .../OperationalActiveTableRecord.py | 268 +--------------- .../activetable/PracticeActiveTableRecord.py | 266 +--------------- .../PracticeProductOfftimeRequest.py | 47 --- .../activetable/SendPracticeProductRequest.py | 14 + .../uf/common/activetable/__init__.py | 6 +- .../auth/resp/AuthServerErrorResponse.py | 1 + .../dataaccess/impl/DefaultDataRequest.py | 2 + .../request/GetAvailableTimesRequest.py | 2 + .../raytheon/uf/common/dataplugin/__init__.py | 1 - .../common/dataplugin/gfe/GridDataHistory.py | 1 + .../gfe/request/GetGridDataRequest.py | 1 + .../gfe/request/GetLatestDbTimeRequest.py | 1 + .../gfe/request/GetLatestModelDbIdRequest.py | 1 + .../gfe/request/ProcessReceivedConfRequest.py | 2 +- .../ProcessReceivedDigitalDataRequest.py | 2 +- .../ServiceBackupStatusUpdateRequest.py | 47 --- .../gfe/server/message/ServerResponse.py | 2 +- .../dataplugin/gfe/slice/AbstractGridSlice.py | 3 +- .../dataplugin/gfe/slice/DiscreteGridSlice.py | 1 + .../uf/common/dataplugin/grib/__init__.py | 27 -- .../grib/request/DeleteAllModelDataRequest.py | 33 -- .../dataplugin/grib/request/__init__.py | 28 -- .../datastorage/records/LongDataRecord.py | 1 - .../datastorage/records/ShortDataRecord.py | 2 +- .../datastorage/records/StringDataRecord.py | 1 - .../stream/LocalizationStreamGetRequest.py | 2 + .../stream/LocalizationStreamPutRequest.py | 2 + .../com/raytheon/uf/common/message/WsId.py | 2 +- .../SerializableExceptionWrapper.py | 13 +- .../notify/ClusterActivationNotification.py | 2 +- .../site/notify/SiteActivationNotification.py | 1 - .../gpd/query/GenericPointDataReqMsg.py | 1 - dynamicserialize/setup.py | 8 - examples/notebooks/Dev_Guide.ipynb | 2 +- 54 files changed, 461 insertions(+), 730 deletions(-) create mode 100644 dynamicserialize/dstypes/com/raytheon/uf/common/activetable/ActiveTableKey.py create mode 100644 dynamicserialize/dstypes/com/raytheon/uf/common/activetable/ActiveTableRecord.py delete mode 100644 dynamicserialize/dstypes/com/raytheon/uf/common/activetable/PracticeProductOfftimeRequest.py delete mode 100644 dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/ServiceBackupStatusUpdateRequest.py delete mode 100644 dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/grib/__init__.py delete mode 100644 dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/grib/request/DeleteAllModelDataRequest.py delete mode 100644 dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/grib/request/__init__.py delete mode 100644 dynamicserialize/setup.py diff --git a/docs/source/dev.rst b/docs/source/dev.rst index adad060..e737c8a 100644 --- a/docs/source/dev.rst +++ b/docs/source/dev.rst @@ -119,7 +119,7 @@ To retrieve data using the Python interface : :: - from ufpy.dataaccess import DataAccessLayer + from awips.dataaccess import DataAccessLayer req = DataAccessLayer.newDataRequest() req.setDatatype("grid") req.setParameters("T") diff --git a/dynamicserialize/DynamicSerializationManager.py b/dynamicserialize/DynamicSerializationManager.py index 2615149..60d8512 100644 --- a/dynamicserialize/DynamicSerializationManager.py +++ b/dynamicserialize/DynamicSerializationManager.py @@ -66,4 +66,4 @@ class DynamicSerializationManager: return self.transport.getvalue() def _serialize(self, ctx, obj): - ctx.serializeMessage(obj) + ctx.serializeMessage(obj) \ No newline at end of file diff --git a/dynamicserialize/ThriftSerializationContext.py b/dynamicserialize/ThriftSerializationContext.py index e7a69d4..0ed39d2 100644 --- a/dynamicserialize/ThriftSerializationContext.py +++ b/dynamicserialize/ThriftSerializationContext.py @@ -418,4 +418,3 @@ class ThriftSerializationContext(object): def writeObject(self, obj): self.serializeMessage(obj) - diff --git a/dynamicserialize/__init__.py b/dynamicserialize/__init__.py index 47059f3..c7a94fd 100644 --- a/dynamicserialize/__init__.py +++ b/dynamicserialize/__init__.py @@ -55,4 +55,4 @@ def serialize(obj): def deserialize(bytes): dsm = DynamicSerializationManager.DynamicSerializationManager() - return dsm.deserializeBytes(bytes) + return dsm.deserializeBytes(bytes) \ No newline at end of file diff --git a/dynamicserialize/adapters/ByteBufferAdapter.py b/dynamicserialize/adapters/ByteBufferAdapter.py index 241c226..313c3de 100644 --- a/dynamicserialize/adapters/ByteBufferAdapter.py +++ b/dynamicserialize/adapters/ByteBufferAdapter.py @@ -34,9 +34,13 @@ ClassAdapter = ['java.nio.ByteBuffer', 'java.nio.HeapByteBuffer'] + def serialize(context, set): raise NotImplementedError("Serialization of ByteBuffers is not supported.") def deserialize(context): byteBuf = context.readBinary() return byteBuf + + + diff --git a/dynamicserialize/adapters/DatabaseIDAdapter.py b/dynamicserialize/adapters/DatabaseIDAdapter.py index f085ed8..6d51dc6 100644 --- a/dynamicserialize/adapters/DatabaseIDAdapter.py +++ b/dynamicserialize/adapters/DatabaseIDAdapter.py @@ -41,4 +41,4 @@ def serialize(context, dbId): def deserialize(context): result = DatabaseID(context.readString()) - return result + return result \ No newline at end of file diff --git a/dynamicserialize/adapters/DateAdapter.py b/dynamicserialize/adapters/DateAdapter.py index 183848f..4240cf8 100644 --- a/dynamicserialize/adapters/DateAdapter.py +++ b/dynamicserialize/adapters/DateAdapter.py @@ -42,4 +42,4 @@ def serialize(context, date): def deserialize(context): result = Date() result.setTime(context.readI64()) - return result + return result \ No newline at end of file diff --git a/dynamicserialize/adapters/EnumSetAdapter.py b/dynamicserialize/adapters/EnumSetAdapter.py index 7f0c6de..9603401 100644 --- a/dynamicserialize/adapters/EnumSetAdapter.py +++ b/dynamicserialize/adapters/EnumSetAdapter.py @@ -39,6 +39,7 @@ from dynamicserialize.dstypes.java.util import EnumSet ClassAdapter = ['java.util.EnumSet', 'java.util.RegularEnumSet'] + def serialize(context, set): setSize = len(set) context.writeI32(setSize) @@ -46,6 +47,7 @@ def serialize(context, set): for val in set: context.writeString(val) + def deserialize(context): setSize = context.readI32() enumClassName = context.readString() diff --git a/dynamicserialize/adapters/FloatBufferAdapter.py b/dynamicserialize/adapters/FloatBufferAdapter.py index 6487ac4..c5604ca 100644 --- a/dynamicserialize/adapters/FloatBufferAdapter.py +++ b/dynamicserialize/adapters/FloatBufferAdapter.py @@ -34,9 +34,13 @@ ClassAdapter = ['java.nio.FloatBuffer', 'java.nio.HeapFloatBuffer'] + def serialize(context, set): raise NotImplementedError("Serialization of FloatBuffers is not supported.") def deserialize(context): floatBuf = context.readFloatArray() return floatBuf + + + diff --git a/dynamicserialize/adapters/GridDataHistoryAdapter.py b/dynamicserialize/adapters/GridDataHistoryAdapter.py index 045a6ce..7a5d9e1 100644 --- a/dynamicserialize/adapters/GridDataHistoryAdapter.py +++ b/dynamicserialize/adapters/GridDataHistoryAdapter.py @@ -44,4 +44,4 @@ def serialize(context, history): def deserialize(context): result = GridDataHistory(context.readString()) - return result + return result \ No newline at end of file diff --git a/dynamicserialize/adapters/LocalizationLevelSerializationAdapter.py b/dynamicserialize/adapters/LocalizationLevelSerializationAdapter.py index e8eaf5b..252ff80 100644 --- a/dynamicserialize/adapters/LocalizationLevelSerializationAdapter.py +++ b/dynamicserialize/adapters/LocalizationLevelSerializationAdapter.py @@ -52,3 +52,5 @@ def deserialize(context): systemLevel = context.readBool() level = LocalizationLevel(text, order, systemLevel=systemLevel) return level + + diff --git a/dynamicserialize/adapters/LockTableAdapter.py b/dynamicserialize/adapters/LockTableAdapter.py index e198b45..254b275 100644 --- a/dynamicserialize/adapters/LockTableAdapter.py +++ b/dynamicserialize/adapters/LockTableAdapter.py @@ -85,4 +85,4 @@ def deserialize(context): lockTable.setWsId(wsIds[0]) lockTable.setLocks(locks) - return lockTable + return lockTable \ No newline at end of file diff --git a/dynamicserialize/adapters/ParmIDAdapter.py b/dynamicserialize/adapters/ParmIDAdapter.py index 097bae5..79e9291 100644 --- a/dynamicserialize/adapters/ParmIDAdapter.py +++ b/dynamicserialize/adapters/ParmIDAdapter.py @@ -41,4 +41,4 @@ def serialize(context, parmId): def deserialize(context): result = ParmID(context.readString()) - return result + return result \ No newline at end of file diff --git a/dynamicserialize/adapters/StackTraceElementAdapter.py b/dynamicserialize/adapters/StackTraceElementAdapter.py index ad6ad47..b20825e 100644 --- a/dynamicserialize/adapters/StackTraceElementAdapter.py +++ b/dynamicserialize/adapters/StackTraceElementAdapter.py @@ -37,6 +37,7 @@ from dynamicserialize.dstypes.java.lang import StackTraceElement ClassAdapter = 'java.lang.StackTraceElement' + def serialize(context, obj): raise dynamicserialize.SerializationException('Not implemented yet') @@ -47,3 +48,5 @@ def deserialize(context): result.setFileName(context.readString()) result.setLineNumber(context.readI32()) return result + + diff --git a/dynamicserialize/adapters/TimeConstraintsAdapter.py b/dynamicserialize/adapters/TimeConstraintsAdapter.py index 1b920a0..d518325 100644 --- a/dynamicserialize/adapters/TimeConstraintsAdapter.py +++ b/dynamicserialize/adapters/TimeConstraintsAdapter.py @@ -43,4 +43,4 @@ def serialize(context, timeConstraints): def deserialize(context): result = TimeConstraints(context.readI32(), context.readI32(), context.readI32()) - return result + return result \ No newline at end of file diff --git a/dynamicserialize/adapters/TimestampAdapter.py b/dynamicserialize/adapters/TimestampAdapter.py index 31e9fbc..cbe4f1b 100644 --- a/dynamicserialize/adapters/TimestampAdapter.py +++ b/dynamicserialize/adapters/TimestampAdapter.py @@ -41,4 +41,4 @@ def serialize(context, timestamp): def deserialize(context): result = Timestamp(context.readI64()) - return result + return result \ No newline at end of file diff --git a/dynamicserialize/adapters/WsIdAdapter.py b/dynamicserialize/adapters/WsIdAdapter.py index 7593bdc..9cb0153 100644 --- a/dynamicserialize/adapters/WsIdAdapter.py +++ b/dynamicserialize/adapters/WsIdAdapter.py @@ -33,10 +33,13 @@ # # + + from dynamicserialize.dstypes.com.raytheon.uf.common.message import WsId ClassAdapter = 'com.raytheon.uf.common.message.WsId' + def serialize(context, wsId): context.writeString(wsId.toString()) @@ -52,3 +55,4 @@ def deserialize(context): wsId.setThreadId(long(wsIdParts[4])) return wsId + diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/ActiveTableKey.py b/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/ActiveTableKey.py new file mode 100644 index 0000000..c36a837 --- /dev/null +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/ActiveTableKey.py @@ -0,0 +1,65 @@ +## +# This software was developed and / or modified by Raytheon Company, +# pursuant to Contract DG133W-05-CQ-1067 with the US Government. +# +# U.S. EXPORT CONTROLLED TECHNICAL DATA +# This software product contains export-restricted data whose +# export/transfer/disclosure is restricted by U.S. law. Dissemination +# to non-U.S. persons whether in the United States or abroad requires +# an export license or other authorization. +# +# Contractor Name: Raytheon Company +# Contractor Address: 6825 Pine Street, Suite 340 +# Mail Stop B8 +# Omaha, NE 68106 +# 402.291.0100 +# +# See the AWIPS II Master Rights File ("Master Rights File.pdf") for +# further licensing information. +## +# +# SOFTWARE HISTORY +# +# Date Ticket# Engineer Description +# ------------ ---------- ----------- -------------------------- +# 05/22/2015 4522 randerso Initial creation +# +## +class ActiveTableKey(object): + + def __init__(self): + self.officeid = None + self.phen = None + self.sig = None + self.etn = None + self.ugcZone = None + + def getOfficeid(self): + return self.officeid + + def setOfficeid(self, officeid): + self.officeid = officeid + + def getPhen(self): + return self.phen + + def setPhen(self, phen): + self.phen = phen + + def getSig(self): + return self.sig + + def setSig(self, sig): + self.sig = sig + + def getEtn(self): + return self.etn + + def setEtn(self, etn): + self.etn = etn + + def getUgcZone(self): + return self.ugcZone + + def setUgcZone(self, ugcZone): + self.ugcZone = ugcZone diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/ActiveTableMode.py b/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/ActiveTableMode.py index 04abe19..8fbaddb 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/ActiveTableMode.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/ActiveTableMode.py @@ -25,4 +25,4 @@ class ActiveTableMode(object): self.value = None def __str__(self): - return repr(self.value) + return repr(self.value) \ No newline at end of file diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/ActiveTableRecord.py b/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/ActiveTableRecord.py new file mode 100644 index 0000000..25c19fc --- /dev/null +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/ActiveTableRecord.py @@ -0,0 +1,291 @@ +## +# This software was developed and / or modified by Raytheon Company, +# pursuant to Contract DG133W-05-CQ-1067 with the US Government. +# +# U.S. EXPORT CONTROLLED TECHNICAL DATA +# This software product contains export-restricted data whose +# export/transfer/disclosure is restricted by U.S. law. Dissemination +# to non-U.S. persons whether in the United States or abroad requires +# an export license or other authorization. +# +# Contractor Name: Raytheon Company +# Contractor Address: 6825 Pine Street, Suite 340 +# Mail Stop B8 +# Omaha, NE 68106 +# 402.291.0100 +# +# See the AWIPS II Master Rights File ("Master Rights File.pdf") for +# further licensing information. +## +# +# SOFTWARE HISTORY +# +# Date Ticket# Engineer Description +# ------------ ---------- ----------- -------------------------- +# 05/22/2015 4522 randerso Initial creation (hand generated) +# +## + +import ActiveTableKey +import abc + +class ActiveTableRecord(object): + __metaclass__ = abc.ABCMeta + + @abc.abstractmethod + def __init__(self): + self.key = ActiveTableKey.ActiveTableKey() + self.wmoid = None + self.pil = None + self.xxxid = None + self.countyheader = None + self.vtecstr = None + self.productClass = None + self.act = None + self.startTime = None + self.endTime = None + self.issueTime = None + self.purgeTime = None + self.ufn = None + self.geometry = None + self.forecaster = None + self.motdir = None + self.motspd = None + self.loc = None + self.rawmessage = None + self.seg = None + self.phensig = None + self.region = None + self.overviewText = None + self.segText = None + self.locationID = None + self.floodSeverity = None + self.immediateCause = None + self.floodRecordStatus = None + self.floodBegin = None + self.floodCrest = None + self.floodEnd = None + self.identifier = None + + def getKey(self): + return self.key + + def setKey(self, key): + self.key = key + + def getWmoid(self): + return self.wmoid + + def setWmoid(self, wmoid): + self.wmoid = wmoid + + def getPil(self): + return self.pil + + def setPil(self, pil): + self.pil = pil + + def getXxxid(self): + return self.xxxid + + def setXxxid(self, xxxid): + self.xxxid = xxxid + + def getCountyheader(self): + return self.countyheader + + def setCountyheader(self, countyheader): + self.countyheader = countyheader + + def getUgcZone(self): + return self.key.getUgcZone() + + def setUgcZone(self, ugcZone): + self.key.setUgcZone(ugcZone) + + def getVtecstr(self): + return self.vtecstr + + def setVtecstr(self, vtecstr): + self.vtecstr = vtecstr + + def getProductClass(self): + return self.productClass + + def setProductClass(self, productClass): + self.productClass = productClass + + def getAct(self): + return self.act + + def setAct(self, act): + self.act = act + + def getOfficeid(self): + return self.key.getOfficeid() + + def setOfficeid(self, officeid): + self.key.setOfficeid(officeid) + + def getPhen(self): + return self.key.getPhen() + + def setPhen(self, phen): + self.key.setPhen(phen) + + def getSig(self): + return self.key.getSig() + + def setSig(self, sig): + self.key.setSig(sig) + + def getEtn(self): + return self.key.getEtn() + + def setEtn(self, etn): + self.key.setEtn(etn) + + 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 getIssueTime(self): + return self.issueTime + + def setIssueTime(self, issueTime): + self.issueTime = issueTime + + def getPurgeTime(self): + return self.purgeTime + + def setPurgeTime(self, purgeTime): + self.purgeTime = purgeTime + + def isUfn(self): + return self.ufn + + def setUfn(self, ufn): + self.ufn = ufn + + def getGeometry(self): + return self.geometry + + def setGeometry(self, geometry): + self.geometry = geometry + + def getForecaster(self): + return self.forecaster + + def setForecaster(self, forecaster): + self.forecaster = forecaster + + def getMotdir(self): + return self.motdir + + def setMotdir(self, motdir): + self.motdir = motdir + + def getMotspd(self): + return self.motspd + + def setMotspd(self, motspd): + self.motspd = motspd + + def getLoc(self): + return self.loc + + def setLoc(self, loc): + self.loc = loc + + def getRawmessage(self): + return self.rawmessage + + def setRawmessage(self, rawmessage): + self.rawmessage = rawmessage + + def getSeg(self): + return self.seg + + def setSeg(self, seg): + self.seg = seg + + def getPhensig(self): + return self.phensig + + def setPhensig(self, phensig): + self.phensig = phensig + + def getRegion(self): + return self.region + + def setRegion(self, region): + self.region = region + + def getOverviewText(self): + return self.overviewText + + def setOverviewText(self, overviewText): + self.overviewText = overviewText + + def getSegText(self): + return self.segText + + def setSegText(self, segText): + self.segText = segText + + def getLocationID(self): + return self.locationID + + def setLocationID(self, locationID): + self.locationID = locationID + + def getFloodSeverity(self): + return self.floodSeverity + + def setFloodSeverity(self, floodSeverity): + self.floodSeverity = floodSeverity + + def getImmediateCause(self): + return self.immediateCause + + def setImmediateCause(self, immediateCause): + self.immediateCause = immediateCause + + def getFloodRecordStatus(self): + return self.floodRecordStatus + + def setFloodRecordStatus(self, floodRecordStatus): + self.floodRecordStatus = floodRecordStatus + + def getFloodBegin(self): + return self.floodBegin + + def setFloodBegin(self, floodBegin): + self.floodBegin = floodBegin + + def getFloodCrest(self): + return self.floodCrest + + def setFloodCrest(self, floodCrest): + self.floodCrest = floodCrest + + def getFloodEnd(self): + return self.floodEnd + + def setFloodEnd(self, floodEnd): + self.floodEnd = floodEnd + + def getIdentifier(self): + return self.identifier + + def setIdentifier(self, identifier): + self.identifier = identifier + diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/OperationalActiveTableRecord.py b/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/OperationalActiveTableRecord.py index b5f4b36..86a959c 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/OperationalActiveTableRecord.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/OperationalActiveTableRecord.py @@ -17,264 +17,18 @@ # See the AWIPS II Master Rights File ("Master Rights File.pdf") for # further licensing information. ## +# +# SOFTWARE HISTORY +# +# Date Ticket# Engineer Description +# ------------ ---------- ----------- -------------------------- +# 05/22/2015 4522 randerso Changed to inherit from ActiveTableRecord +# +## -# File auto-generated against equivalent DynamicSerialize Java class -# Modified 2010-09-30: Changed getUfn to isUfn so we don't need two -# versions of ActiveTableVtec.py +import ActiveTableRecord -class OperationalActiveTableRecord(object): +class OperationalActiveTableRecord(ActiveTableRecord.ActiveTableRecord): def __init__(self): - self.wmoid = None - self.pil = None - self.xxxid = None - self.countyheader = None - self.ugcZone = None - self.vtecstr = None - self.productClass = None - self.act = None - self.officeid = None - self.phen = None - self.sig = None - self.etn = None - self.startTime = None - self.endTime = None - self.issueTime = None - self.purgeTime = None - self.ufn = None - self.geometry = None - self.forecaster = None - self.motdir = None - self.motspd = None - self.loc = None - self.rawmessage = None - self.seg = None - self.phensig = None - self.region = None - self.overviewText = None - self.segText = None - self.locationID = None - self.floodSeverity = None - self.immediateCause = None - self.floodRecordStatus = None - self.floodBegin = None - self.floodCrest = None - self.floodEnd = None - self.identifier = None - - def getWmoid(self): - return self.wmoid - - def setWmoid(self, wmoid): - self.wmoid = wmoid - - def getPil(self): - return self.pil - - def setPil(self, pil): - self.pil = pil - - def getXxxid(self): - return self.xxxid - - def setXxxid(self, xxxid): - self.xxxid = xxxid - - def getCountyheader(self): - return self.countyheader - - def setCountyheader(self, countyheader): - self.countyheader = countyheader - - def getUgcZone(self): - return self.ugcZone - - def setUgcZone(self, ugcZone): - self.ugcZone = ugcZone - - def getVtecstr(self): - return self.vtecstr - - def setVtecstr(self, vtecstr): - self.vtecstr = vtecstr - - def getProductClass(self): - return self.productClass - - def setProductClass(self, productClass): - self.productClass = productClass - - def getAct(self): - return self.act - - def setAct(self, act): - self.act = act - - def getOfficeid(self): - return self.officeid - - def setOfficeid(self, officeid): - self.officeid = officeid - - def getPhen(self): - return self.phen - - def setPhen(self, phen): - self.phen = phen - - def getSig(self): - return self.sig - - def setSig(self, sig): - self.sig = sig - - def getEtn(self): - return self.etn - - def setEtn(self, etn): - self.etn = etn - - 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 getIssueTime(self): - return self.issueTime - - def setIssueTime(self, issueTime): - self.issueTime = issueTime - - def getPurgeTime(self): - return self.purgeTime - - def setPurgeTime(self, purgeTime): - self.purgeTime = purgeTime - - def isUfn(self): - return self.ufn - - def setUfn(self, ufn): - self.ufn = ufn - - def getGeometry(self): - return self.geometry - - def setGeometry(self, geometry): - self.geometry = geometry - - def getForecaster(self): - return self.forecaster - - def setForecaster(self, forecaster): - self.forecaster = forecaster - - def getMotdir(self): - return self.motdir - - def setMotdir(self, motdir): - self.motdir = motdir - - def getMotspd(self): - return self.motspd - - def setMotspd(self, motspd): - self.motspd = motspd - - def getLoc(self): - return self.loc - - def setLoc(self, loc): - self.loc = loc - - def getRawmessage(self): - return self.rawmessage - - def setRawmessage(self, rawmessage): - self.rawmessage = rawmessage - - def getSeg(self): - return self.seg - - def setSeg(self, seg): - self.seg = seg - - def getPhensig(self): - return self.phensig - - def setPhensig(self, phensig): - self.phensig = phensig - - def getRegion(self): - return self.region - - def setRegion(self, region): - self.region = region - - def getOverviewText(self): - return self.overviewText - - def setOverviewText(self, overviewText): - self.overviewText = overviewText - - def getSegText(self): - return self.segText - - def setSegText(self, segText): - self.segText = segText - - def getLocationID(self): - return self.locationID - - def setLocationID(self, locationID): - self.locationID = locationID - - def getFloodSeverity(self): - return self.floodSeverity - - def setFloodSeverity(self, floodSeverity): - self.floodSeverity = floodSeverity - - def getImmediateCause(self): - return self.immediateCause - - def setImmediateCause(self, immediateCause): - self.immediateCause = immediateCause - - def getFloodRecordStatus(self): - return self.floodRecordStatus - - def setFloodRecordStatus(self, floodRecordStatus): - self.floodRecordStatus = floodRecordStatus - - def getFloodBegin(self): - return self.floodBegin - - def setFloodBegin(self, floodBegin): - self.floodBegin = floodBegin - - def getFloodCrest(self): - return self.floodCrest - - def setFloodCrest(self, floodCrest): - self.floodCrest = floodCrest - - def getFloodEnd(self): - return self.floodEnd - - def setFloodEnd(self, floodEnd): - self.floodEnd = floodEnd - - def getIdentifier(self): - return self.identifier - - def setIdentifier(self, identifier): - self.identifier = identifier - + super(OperationalActiveTableRecord, self).__init__() diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/PracticeActiveTableRecord.py b/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/PracticeActiveTableRecord.py index 3649431..d60e78a 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/PracticeActiveTableRecord.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/PracticeActiveTableRecord.py @@ -17,262 +17,18 @@ # See the AWIPS II Master Rights File ("Master Rights File.pdf") for # further licensing information. ## +# +# SOFTWARE HISTORY +# +# Date Ticket# Engineer Description +# ------------ ---------- ----------- -------------------------- +# 05/22/2015 4522 randerso Changed to inherit from ActiveTableRecord +# +## -# File auto-generated against equivalent DynamicSerialize Java class +import ActiveTableRecord -class PracticeActiveTableRecord(object): +class PracticeActiveTableRecord(ActiveTableRecord.ActiveTableRecord): def __init__(self): - self.wmoid = None - self.pil = None - self.xxxid = None - self.countyheader = None - self.ugcZone = None - self.vtecstr = None - self.productClass = None - self.act = None - self.officeid = None - self.phen = None - self.sig = None - self.etn = None - self.startTime = None - self.endTime = None - self.issueTime = None - self.purgeTime = None - self.ufn = None - self.geometry = None - self.forecaster = None - self.motdir = None - self.motspd = None - self.loc = None - self.rawmessage = None - self.seg = None - self.phensig = None - self.region = None - self.overviewText = None - self.segText = None - self.locationID = None - self.floodSeverity = None - self.immediateCause = None - self.floodRecordStatus = None - self.floodBegin = None - self.floodCrest = None - self.floodEnd = None - self.identifier = None - - def getWmoid(self): - return self.wmoid - - def setWmoid(self, wmoid): - self.wmoid = wmoid - - def getPil(self): - return self.pil - - def setPil(self, pil): - self.pil = pil - - def getXxxid(self): - return self.xxxid - - def setXxxid(self, xxxid): - self.xxxid = xxxid - - def getCountyheader(self): - return self.countyheader - - def setCountyheader(self, countyheader): - self.countyheader = countyheader - - def getUgcZone(self): - return self.ugcZone - - def setUgcZone(self, ugcZone): - self.ugcZone = ugcZone - - def getVtecstr(self): - return self.vtecstr - - def setVtecstr(self, vtecstr): - self.vtecstr = vtecstr - - def getProductClass(self): - return self.productClass - - def setProductClass(self, productClass): - self.productClass = productClass - - def getAct(self): - return self.act - - def setAct(self, act): - self.act = act - - def getOfficeid(self): - return self.officeid - - def setOfficeid(self, officeid): - self.officeid = officeid - - def getPhen(self): - return self.phen - - def setPhen(self, phen): - self.phen = phen - - def getSig(self): - return self.sig - - def setSig(self, sig): - self.sig = sig - - def getEtn(self): - return self.etn - - def setEtn(self, etn): - self.etn = etn - - 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 getIssueTime(self): - return self.issueTime - - def setIssueTime(self, issueTime): - self.issueTime = issueTime - - def getPurgeTime(self): - return self.purgeTime - - def setPurgeTime(self, purgeTime): - self.purgeTime = purgeTime - - def getUfn(self): - return self.ufn - - def setUfn(self, ufn): - self.ufn = ufn - - def getGeometry(self): - return self.geometry - - def setGeometry(self, geometry): - self.geometry = geometry - - def getForecaster(self): - return self.forecaster - - def setForecaster(self, forecaster): - self.forecaster = forecaster - - def getMotdir(self): - return self.motdir - - def setMotdir(self, motdir): - self.motdir = motdir - - def getMotspd(self): - return self.motspd - - def setMotspd(self, motspd): - self.motspd = motspd - - def getLoc(self): - return self.loc - - def setLoc(self, loc): - self.loc = loc - - def getRawmessage(self): - return self.rawmessage - - def setRawmessage(self, rawmessage): - self.rawmessage = rawmessage - - def getSeg(self): - return self.seg - - def setSeg(self, seg): - self.seg = seg - - def getPhensig(self): - return self.phensig - - def setPhensig(self, phensig): - self.phensig = phensig - - def getRegion(self): - return self.region - - def setRegion(self, region): - self.region = region - - def getOverviewText(self): - return self.overviewText - - def setOverviewText(self, overviewText): - self.overviewText = overviewText - - def getSegText(self): - return self.segText - - def setSegText(self, segText): - self.segText = segText - - def getLocationID(self): - return self.locationID - - def setLocationID(self, locationID): - self.locationID = locationID - - def getFloodSeverity(self): - return self.floodSeverity - - def setFloodSeverity(self, floodSeverity): - self.floodSeverity = floodSeverity - - def getImmediateCause(self): - return self.immediateCause - - def setImmediateCause(self, immediateCause): - self.immediateCause = immediateCause - - def getFloodRecordStatus(self): - return self.floodRecordStatus - - def setFloodRecordStatus(self, floodRecordStatus): - self.floodRecordStatus = floodRecordStatus - - def getFloodBegin(self): - return self.floodBegin - - def setFloodBegin(self, floodBegin): - self.floodBegin = floodBegin - - def getFloodCrest(self): - return self.floodCrest - - def setFloodCrest(self, floodCrest): - self.floodCrest = floodCrest - - def getFloodEnd(self): - return self.floodEnd - - def setFloodEnd(self, floodEnd): - self.floodEnd = floodEnd - - def getIdentifier(self): - return self.identifier - - def setIdentifier(self, identifier): - self.identifier = identifier - + super(PracticeActiveTableRecord, self).__init__() diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/PracticeProductOfftimeRequest.py b/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/PracticeProductOfftimeRequest.py deleted file mode 100644 index 5c4592d..0000000 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/PracticeProductOfftimeRequest.py +++ /dev/null @@ -1,47 +0,0 @@ -## -# This software was developed and / or modified by Raytheon Company, -# pursuant to Contract DG133W-05-CQ-1067 with the US Government. -# -# U.S. EXPORT CONTROLLED TECHNICAL DATA -# This software product contains export-restricted data whose -# export/transfer/disclosure is restricted by U.S. law. Dissemination -# to non-U.S. persons whether in the United States or abroad requires -# an export license or other authorization. -# -# Contractor Name: Raytheon Company -# Contractor Address: 6825 Pine Street, Suite 340 -# Mail Stop B8 -# Omaha, NE 68106 -# 402.291.0100 -# -# See the AWIPS II Master Rights File ("Master Rights File.pdf") for -# further licensing information. -## - -# File auto-generated against equivalent DynamicSerialize Java class - -class PracticeProductOfftimeRequest(object): - - def __init__(self): - self.drtString = None - self.notifyGFE = None - self.productText = None - - def getDrtString(self): - return self.drtString - - def setDrtString(self, drtString): - self.drtString = drtString - - def getNotifyGFE(self): - return self.notifyGFE - - def setNotifyGFE(self, notifyGFE): - self.notifyGFE = notifyGFE - - def getProductText(self): - return self.productText - - def setProductText(self, productText): - self.productText = productText - diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/SendPracticeProductRequest.py b/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/SendPracticeProductRequest.py index 4bc15c0..87974b8 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/SendPracticeProductRequest.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/SendPracticeProductRequest.py @@ -23,8 +23,22 @@ class SendPracticeProductRequest(object): def __init__(self): + self.drtString = None + self.notifyGFE = None self.productText = None + def getDrtString(self): + return self.drtString + + def setDrtString(self, drtString): + self.drtString = drtString + + def getNotifyGFE(self): + return self.notifyGFE + + def setNotifyGFE(self, notifyGFE): + self.notifyGFE = notifyGFE + def getProductText(self): return self.productText diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/__init__.py index 8e2f375..6dce1e6 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/__init__.py @@ -21,6 +21,8 @@ # File auto-generated by PythonFileGenerator __all__ = [ + 'ActiveTableKey', + 'ActiveTableRecord', 'ActiveTableMode', 'DumpActiveTableRequest', 'DumpActiveTableResponse', @@ -32,7 +34,6 @@ __all__ = [ 'GetVtecAttributeResponse', 'OperationalActiveTableRecord', 'PracticeActiveTableRecord', - 'PracticeProductOfftimeRequest', 'SendPracticeProductRequest', 'VTECChange', 'VTECTableChangeNotification', @@ -40,6 +41,8 @@ __all__ = [ 'response' ] +from ActiveTableKey import ActiveTableKey +from ActiveTableRecord import ActiveTableRecord from ActiveTableMode import ActiveTableMode from DumpActiveTableRequest import DumpActiveTableRequest from DumpActiveTableResponse import DumpActiveTableResponse @@ -51,7 +54,6 @@ from GetVtecAttributeRequest import GetVtecAttributeRequest from GetVtecAttributeResponse import GetVtecAttributeResponse from OperationalActiveTableRecord import OperationalActiveTableRecord from PracticeActiveTableRecord import PracticeActiveTableRecord -from PracticeProductOfftimeRequest import PracticeProductOfftimeRequest from SendPracticeProductRequest import SendPracticeProductRequest from VTECChange import VTECChange from VTECTableChangeNotification import VTECTableChangeNotification diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/auth/resp/AuthServerErrorResponse.py b/dynamicserialize/dstypes/com/raytheon/uf/common/auth/resp/AuthServerErrorResponse.py index b06fcf3..97d2eb9 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/auth/resp/AuthServerErrorResponse.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/auth/resp/AuthServerErrorResponse.py @@ -20,6 +20,7 @@ # File auto-generated against equivalent DynamicSerialize Java class + from dynamicserialize.dstypes.com.raytheon.uf.common.serialization.comm.response import ServerErrorResponse class AuthServerErrorResponse(ServerErrorResponse): diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/impl/DefaultDataRequest.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/impl/DefaultDataRequest.py index f122e7b..7fbf286 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/impl/DefaultDataRequest.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/impl/DefaultDataRequest.py @@ -29,11 +29,13 @@ # # + from awips.dataaccess import IDataRequest from dynamicserialize.dstypes.com.vividsolutions.jts.geom import Envelope from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.level import Level + class DefaultDataRequest(IDataRequest): def __init__(self): diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/request/GetAvailableTimesRequest.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/request/GetAvailableTimesRequest.py index b515c1a..ee97c58 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/request/GetAvailableTimesRequest.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataaccess/request/GetAvailableTimesRequest.py @@ -31,8 +31,10 @@ # # + from dynamicserialize.dstypes.com.raytheon.uf.common.dataaccess.request import AbstractDataAccessRequest + class GetAvailableTimesRequest(AbstractDataAccessRequest): def __init__(self): diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/__init__.py index cba92ed..006c19d 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/__init__.py @@ -23,7 +23,6 @@ __all__ = [ 'events', 'gfe', - 'grib', 'grid', 'level', 'message', diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/GridDataHistory.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/GridDataHistory.py index 15af62f..6c2a760 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/GridDataHistory.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/GridDataHistory.py @@ -20,6 +20,7 @@ # File auto-generated against equivalent DynamicSerialize Java class + class GridDataHistory(object): def __init__(self): diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/GetGridDataRequest.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/GetGridDataRequest.py index 158d16b..43be6e0 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/GetGridDataRequest.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/GetGridDataRequest.py @@ -24,6 +24,7 @@ import abc from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.gfe.server.request import GetGridRequest + class GetGridDataRequest(object): __metaclass__ = abc.ABCMeta diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/GetLatestDbTimeRequest.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/GetLatestDbTimeRequest.py index 1571738..d0504bf 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/GetLatestDbTimeRequest.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/GetLatestDbTimeRequest.py @@ -33,6 +33,7 @@ from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.gfe.request import AbstractGfeRequest from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.gfe.db.objects import DatabaseID + class GetLatestDbTimeRequest(AbstractGfeRequest): def __init__(self, dbId=None): diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/GetLatestModelDbIdRequest.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/GetLatestModelDbIdRequest.py index ead49df..519c7dd 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/GetLatestModelDbIdRequest.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/GetLatestModelDbIdRequest.py @@ -32,6 +32,7 @@ from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.gfe.request import AbstractGfeRequest + class GetLatestModelDbIdRequest(AbstractGfeRequest): def __init__(self, siteId=None, modelName=None): diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/ProcessReceivedConfRequest.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/ProcessReceivedConfRequest.py index e436e26..dc80f3d 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/ProcessReceivedConfRequest.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/ProcessReceivedConfRequest.py @@ -43,4 +43,4 @@ class ProcessReceivedConfRequest(object): return self.siteID def setSiteID(self, siteID): - self.siteID = siteID + self.siteID = siteID \ No newline at end of file diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/ProcessReceivedDigitalDataRequest.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/ProcessReceivedDigitalDataRequest.py index 32f0490..6a8108b 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/ProcessReceivedDigitalDataRequest.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/ProcessReceivedDigitalDataRequest.py @@ -43,4 +43,4 @@ class ProcessReceivedDigitalDataRequest(object): return self.siteID def setSiteID(self, siteID): - self.siteID = siteID + self.siteID = siteID \ No newline at end of file diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/ServiceBackupStatusUpdateRequest.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/ServiceBackupStatusUpdateRequest.py deleted file mode 100644 index 992b446..0000000 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/ServiceBackupStatusUpdateRequest.py +++ /dev/null @@ -1,47 +0,0 @@ -## -# This software was developed and / or modified by Raytheon Company, -# pursuant to Contract DG133W-05-CQ-1067 with the US Government. -# -# U.S. EXPORT CONTROLLED TECHNICAL DATA -# This software product contains export-restricted data whose -# export/transfer/disclosure is restricted by U.S. law. Dissemination -# to non-U.S. persons whether in the United States or abroad requires -# an export license or other authorization. -# -# Contractor Name: Raytheon Company -# Contractor Address: 6825 Pine Street, Suite 340 -# Mail Stop B8 -# Omaha, NE 68106 -# 402.291.0100 -# -# See the AWIPS II Master Rights File ("Master Rights File.pdf") for -# further licensing information. -## - -# File auto-generated against equivalent DynamicSerialize Java class - -class ServiceBackupStatusUpdateRequest(object): - - def __init__(self): - self.statusMessage = None - self.workstationID = None - self.siteID = None - - def getStatusMessage(self): - return self.statusMessage - - def setStatusMessage(self, statusMessage): - self.statusMessage = statusMessage - - 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/server/message/ServerResponse.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/message/ServerResponse.py index b07cd7c..36635f9 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/message/ServerResponse.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/server/message/ServerResponse.py @@ -62,4 +62,4 @@ class ServerResponse(object): return self.message() def __nonzero__(self): - return self.isOkay() + return self.isOkay() \ No newline at end of file diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/slice/AbstractGridSlice.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/slice/AbstractGridSlice.py index 030fa4b..d1bb11b 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/slice/AbstractGridSlice.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/slice/AbstractGridSlice.py @@ -20,6 +20,7 @@ import abc + class AbstractGridSlice(object): __metaclass__ = abc.ABCMeta @@ -49,4 +50,4 @@ class AbstractGridSlice(object): return self.gridDataHistory def setGridDataHistory(self, gridDataHistory): - self.gridDataHistory = gridDataHistory + self.gridDataHistory = gridDataHistory \ No newline at end of file diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/slice/DiscreteGridSlice.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/slice/DiscreteGridSlice.py index dded918..3f71917 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/slice/DiscreteGridSlice.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/slice/DiscreteGridSlice.py @@ -22,6 +22,7 @@ from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.gfe.slice import AbstractGridSlice + class DiscreteGridSlice(AbstractGridSlice): def __init__(self): diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/grib/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/grib/__init__.py deleted file mode 100644 index 0ffc322..0000000 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/grib/__init__.py +++ /dev/null @@ -1,27 +0,0 @@ -## -# This software was developed and / or modified by Raytheon Company, -# pursuant to Contract DG133W-05-CQ-1067 with the US Government. -# -# U.S. EXPORT CONTROLLED TECHNICAL DATA -# This software product contains export-restricted data whose -# export/transfer/disclosure is restricted by U.S. law. Dissemination -# to non-U.S. persons whether in the United States or abroad requires -# an export license or other authorization. -# -# Contractor Name: Raytheon Company -# Contractor Address: 6825 Pine Street, Suite 340 -# Mail Stop B8 -# Omaha, NE 68106 -# 402.291.0100 -# -# See the AWIPS II Master Rights File ("Master Rights File.pdf") for -# further licensing information. -## - -# File auto-generated by PythonFileGenerator - -__all__ = [ - 'request' - ] - - diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/grib/request/DeleteAllModelDataRequest.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/grib/request/DeleteAllModelDataRequest.py deleted file mode 100644 index 34ceae1..0000000 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/grib/request/DeleteAllModelDataRequest.py +++ /dev/null @@ -1,33 +0,0 @@ -## -# This software was developed and / or modified by Raytheon Company, -# pursuant to Contract DG133W-05-CQ-1067 with the US Government. -# -# U.S. EXPORT CONTROLLED TECHNICAL DATA -# This software product contains export-restricted data whose -# export/transfer/disclosure is restricted by U.S. law. Dissemination -# to non-U.S. persons whether in the United States or abroad requires -# an export license or other authorization. -# -# Contractor Name: Raytheon Company -# Contractor Address: 6825 Pine Street, Suite 340 -# Mail Stop B8 -# Omaha, NE 68106 -# 402.291.0100 -# -# See the AWIPS II Master Rights File ("Master Rights File.pdf") for -# further licensing information. -## - -# File auto-generated against equivalent DynamicSerialize Java class - -class DeleteAllModelDataRequest(object): - - def __init__(self, modelName=None): - self.modelName = modelName - - def getModelName(self): - return self.modelName - - def setModelName(self, modelName): - self.modelName = modelName - diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/grib/request/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/grib/request/__init__.py deleted file mode 100644 index 6fb8e3f..0000000 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/grib/request/__init__.py +++ /dev/null @@ -1,28 +0,0 @@ -## -# This software was developed and / or modified by Raytheon Company, -# pursuant to Contract DG133W-05-CQ-1067 with the US Government. -# -# U.S. EXPORT CONTROLLED TECHNICAL DATA -# This software product contains export-restricted data whose -# export/transfer/disclosure is restricted by U.S. law. Dissemination -# to non-U.S. persons whether in the United States or abroad requires -# an export license or other authorization. -# -# Contractor Name: Raytheon Company -# Contractor Address: 6825 Pine Street, Suite 340 -# Mail Stop B8 -# Omaha, NE 68106 -# 402.291.0100 -# -# See the AWIPS II Master Rights File ("Master Rights File.pdf") for -# further licensing information. -## - -# File auto-generated by PythonFileGenerator - -__all__ = [ - 'DeleteAllModelDataRequest' - ] - -from DeleteAllModelDataRequest import DeleteAllModelDataRequest - diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/datastorage/records/LongDataRecord.py b/dynamicserialize/dstypes/com/raytheon/uf/common/datastorage/records/LongDataRecord.py index fd0e900..dd72159 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/datastorage/records/LongDataRecord.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/datastorage/records/LongDataRecord.py @@ -105,4 +105,3 @@ class LongDataRecord(object): def putDataObject(self, obj): self.setLongData(obj) - diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/datastorage/records/ShortDataRecord.py b/dynamicserialize/dstypes/com/raytheon/uf/common/datastorage/records/ShortDataRecord.py index 2fa2e28..69cbacb 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/datastorage/records/ShortDataRecord.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/datastorage/records/ShortDataRecord.py @@ -104,4 +104,4 @@ class ShortDataRecord(object): return self.getShortData() def putDataObject(self, obj): - self.setShortData(obj) + self.setShortData(obj) \ No newline at end of file diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/datastorage/records/StringDataRecord.py b/dynamicserialize/dstypes/com/raytheon/uf/common/datastorage/records/StringDataRecord.py index daf3eb5..99b0282 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/datastorage/records/StringDataRecord.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/datastorage/records/StringDataRecord.py @@ -122,4 +122,3 @@ class StringDataRecord(object): def putDataObject(self, obj): self.setStringData(obj) - diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/localization/stream/LocalizationStreamGetRequest.py b/dynamicserialize/dstypes/com/raytheon/uf/common/localization/stream/LocalizationStreamGetRequest.py index e6d780e..915fddf 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/localization/stream/LocalizationStreamGetRequest.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/localization/stream/LocalizationStreamGetRequest.py @@ -20,7 +20,9 @@ # File auto-generated against equivalent DynamicSerialize Java class +import os from dynamicserialize.dstypes.com.raytheon.uf.common.localization.stream import AbstractLocalizationStreamRequest +from dynamicserialize.dstypes.com.raytheon.uf.common.plugin.nwsauth.user import User class LocalizationStreamGetRequest(AbstractLocalizationStreamRequest): diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/localization/stream/LocalizationStreamPutRequest.py b/dynamicserialize/dstypes/com/raytheon/uf/common/localization/stream/LocalizationStreamPutRequest.py index 4fcbf3c..e94a10b 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/localization/stream/LocalizationStreamPutRequest.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/localization/stream/LocalizationStreamPutRequest.py @@ -23,6 +23,8 @@ import os import uuid from dynamicserialize.dstypes.com.raytheon.uf.common.localization.stream import AbstractLocalizationStreamRequest +from dynamicserialize.dstypes.com.raytheon.uf.common.plugin.nwsauth.user import User + class LocalizationStreamPutRequest(AbstractLocalizationStreamRequest): diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/message/WsId.py b/dynamicserialize/dstypes/com/raytheon/uf/common/message/WsId.py index 117db7f..15930ea 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/message/WsId.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/message/WsId.py @@ -93,4 +93,4 @@ class WsId(object): return self.toString() def __repr__(self): - return self.toString() + return self.toString() \ No newline at end of file diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/serialization/SerializableExceptionWrapper.py b/dynamicserialize/dstypes/com/raytheon/uf/common/serialization/SerializableExceptionWrapper.py index 91defbe..1ebdbff 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/serialization/SerializableExceptionWrapper.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/serialization/SerializableExceptionWrapper.py @@ -16,7 +16,15 @@ # See the AWIPS II Master Rights File ("Master Rights File.pdf") for # further licensing information. -# File auto-generated against equivalent DynamicSerialize Java class +# File auto-generated against equivalent DynamicSerialize Java class and +# modified. +# +# SOFTWARE HISTORY +# +# Date Ticket# Engineer Description +# ------------ ---------- ----------- -------------------------- +# 2015-02-27 4174 nabowle Output full stacktrace. +# class SerializableExceptionWrapper(object): @@ -35,6 +43,9 @@ class SerializableExceptionWrapper(object): retVal = "" + self.exceptionClass + " exception thrown: " + self.message + "\n" for element in self.stackTrace: retVal += "\tat " + str(element) + "\n" + + if self.wrapper: + retVal += "Caused by: " + self.wrapper.__repr__() return retVal def getStackTrace(self): diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/site/notify/ClusterActivationNotification.py b/dynamicserialize/dstypes/com/raytheon/uf/common/site/notify/ClusterActivationNotification.py index 1b3779a..7fc0686 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/site/notify/ClusterActivationNotification.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/site/notify/ClusterActivationNotification.py @@ -55,4 +55,4 @@ class ClusterActivationNotification(SiteActivationNotification): else: s += " has been successfully deactivated on all cluster members" - return s + return s \ No newline at end of file diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/site/notify/SiteActivationNotification.py b/dynamicserialize/dstypes/com/raytheon/uf/common/site/notify/SiteActivationNotification.py index e7fa7f0..f5bb7f7 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/site/notify/SiteActivationNotification.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/site/notify/SiteActivationNotification.py @@ -86,4 +86,3 @@ class SiteActivationNotification(object): + self.modifiedSite.upper() + " on " \ + self.serverName + ":" \ + self.runMode - diff --git a/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gpd/query/GenericPointDataReqMsg.py b/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gpd/query/GenericPointDataReqMsg.py index 2fbc2ef..59e9729 100644 --- a/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gpd/query/GenericPointDataReqMsg.py +++ b/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/gpd/query/GenericPointDataReqMsg.py @@ -81,4 +81,3 @@ class GenericPointDataReqMsg(object): def setGpdDataString(self, gpdDataString): self.gpdDataString = gpdDataString - diff --git a/dynamicserialize/setup.py b/dynamicserialize/setup.py deleted file mode 100644 index 8760879..0000000 --- a/dynamicserialize/setup.py +++ /dev/null @@ -1,8 +0,0 @@ -from distutils.core import setup - -setup( - name='dynamicserialize', - version='', - packages=['dynamicserialize'], - license='Creative Commons Attribution-Noncommercial-Share Alike license', -) diff --git a/examples/notebooks/Dev_Guide.ipynb b/examples/notebooks/Dev_Guide.ipynb index 2196f79..4336bfe 100644 --- a/examples/notebooks/Dev_Guide.ipynb +++ b/examples/notebooks/Dev_Guide.ipynb @@ -94,7 +94,7 @@ "\n", "To retrieve data using the Python interface :\n", "\n", - " from ufpy.dataaccess import DataAccessLayer\n", + " from awips.dataaccess import DataAccessLayer\n", " req = DataAccessLayer.newDataRequest()\n", " req.setDatatype(\"grid\")\n", " req.setParameters(\"T\")\n",