From b8bbbb23a89200a620199a7946ff09eeed2419e5 Mon Sep 17 00:00:00 2001 From: Michael James Date: Wed, 13 Jul 2016 13:50:10 -0500 Subject: [PATCH] raytheon (omaha_16.2.2) and NCEP (ncep_16.2.2-n) updates for release 0.9.4 --- .../adapters/FormattedDateAdapter.py | 46 +++++++++++++++++++ dynamicserialize/adapters/__init__.py | 3 +- .../uf/common/activetable/ActiveTableKey.py | 8 ++++ .../common/activetable/ActiveTableRecord.py | 4 ++ .../uf/common/alertviz/AlertVizRequest.py | 12 +++++ .../gfe/request/GetSiteTimeZoneInfoRequest.py | 32 +++++++------ .../uf/common/dataplugin/text/__init__.py | 2 +- .../dataplugin/text/subscription/__init__.py | 27 +++++++++++ .../request/SubscriptionRequest.py | 0 .../{ => subscription}/request/__init__.py | 0 .../pypies/request/DeleteOrphansRequest.py | 39 ++++++++++++++++ .../uf/common/pypies/request/__init__.py | 2 + .../raytheon/uf/common/time/FormattedDate.py | 39 ++++++++++++++++ .../com/raytheon/uf/common/time/__init__.py | 4 +- .../ncep/common/dataplugin/pgen/__init__.py | 3 +- .../dataplugin/pgen/request/__init__.py | 4 +- 16 files changed, 206 insertions(+), 19 deletions(-) create mode 100644 dynamicserialize/adapters/FormattedDateAdapter.py create mode 100644 dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/text/subscription/__init__.py rename dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/text/{ => subscription}/request/SubscriptionRequest.py (100%) rename dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/text/{ => subscription}/request/__init__.py (100%) create mode 100644 dynamicserialize/dstypes/com/raytheon/uf/common/pypies/request/DeleteOrphansRequest.py create mode 100644 dynamicserialize/dstypes/com/raytheon/uf/common/time/FormattedDate.py diff --git a/dynamicserialize/adapters/FormattedDateAdapter.py b/dynamicserialize/adapters/FormattedDateAdapter.py new file mode 100644 index 0000000..c028474 --- /dev/null +++ b/dynamicserialize/adapters/FormattedDateAdapter.py @@ -0,0 +1,46 @@ +## +# 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. +## + + +# +# Adapter for FormattedDate +# +# +# SOFTWARE HISTORY +# +# Date Ticket# Engineer Description +# ------------ ---------- ----------- -------------------------- +# 9/21/2015 4486 rjpeter Initial creation. +# +# +# + +from dynamicserialize.dstypes.com.raytheon.uf.common.time import FormattedDate + + +ClassAdapter = 'com.raytheon.uf.common.time.FormattedDate' + +def serialize(context, date): + context.writeI64(date.getTime()) + +def deserialize(context): + result = FormattedDate() + result.setTime(context.readI64()) + return result diff --git a/dynamicserialize/adapters/__init__.py b/dynamicserialize/adapters/__init__.py index 26cbdcd..f8509da 100644 --- a/dynamicserialize/adapters/__init__.py +++ b/dynamicserialize/adapters/__init__.py @@ -32,7 +32,7 @@ # 04/22/13 #1949 rjpeter Added LockTableAdapter # 02/06/14 #2672 bsteffen Added JTSEnvelopeAdapter # 06/22/2015 #4573 randerso Added JobProgressAdapter -# +# 09/21/2015 #4486 rjpeter Added FormattedDateAdapter # __all__ = [ @@ -43,6 +43,7 @@ __all__ = [ 'GregorianCalendarAdapter', 'ActiveTableModeAdapter', 'DateAdapter', + 'FormattedDateAdapter', 'LocalizationLevelSerializationAdapter', 'LocalizationTypeSerializationAdapter', 'GeometryTypeAdapter', diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/ActiveTableKey.py b/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/ActiveTableKey.py index c36a837..0828fe8 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/ActiveTableKey.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/ActiveTableKey.py @@ -23,6 +23,7 @@ # Date Ticket# Engineer Description # ------------ ---------- ----------- -------------------------- # 05/22/2015 4522 randerso Initial creation +# 03/17/2016 5426 randerso Add issueYear to primary key # ## class ActiveTableKey(object): @@ -33,6 +34,7 @@ class ActiveTableKey(object): self.sig = None self.etn = None self.ugcZone = None + self.issueYear = None def getOfficeid(self): return self.officeid @@ -63,3 +65,9 @@ class ActiveTableKey(object): def setUgcZone(self, ugcZone): self.ugcZone = ugcZone + + def getIssueYear(self): + return self.issueYear + + def setIssueYear(self, issueYear): + self.issueYear = issueYear diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/ActiveTableRecord.py b/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/ActiveTableRecord.py index 25c19fc..a2b4799 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/ActiveTableRecord.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/activetable/ActiveTableRecord.py @@ -23,6 +23,7 @@ # Date Ticket# Engineer Description # ------------ ---------- ----------- -------------------------- # 05/22/2015 4522 randerso Initial creation (hand generated) +# 03/17/2016 5426 randerso Add issueYear to primary key # ## @@ -161,6 +162,9 @@ class ActiveTableRecord(object): return self.issueTime def setIssueTime(self, issueTime): + from datetime import datetime + date = datetime.utcfromtimestamp(issueTime.getTime()/1000) + self.key.setIssueYear(date.year) self.issueTime = issueTime def getPurgeTime(self): diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/alertviz/AlertVizRequest.py b/dynamicserialize/dstypes/com/raytheon/uf/common/alertviz/AlertVizRequest.py index 83ffa6f..51333ca 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/alertviz/AlertVizRequest.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/alertviz/AlertVizRequest.py @@ -19,6 +19,7 @@ ## # File auto-generated against equivalent DynamicSerialize Java class +# Jul 27, 2015 4654 skorolev Added filters class AlertVizRequest(object): @@ -29,6 +30,7 @@ class AlertVizRequest(object): self.sourceKey = None self.category = None self.audioFile = None + self.filters = None def getMessage(self): return self.message @@ -66,3 +68,13 @@ class AlertVizRequest(object): def setAudioFile(self, audioFile): self.audioFile = audioFile + def getFilters(self): + return self.filters + + def setFilters(self, filters): + if filters is None: + self.filters = {} + elif not(filters.has_key(None) or filters.values().count(None)>0 or filters.has_key('') or filters.values().count('')>0): + self.filters = filters + else: + raise ValueError('Filters must not contain None or empty keys or values: %s' % filters) diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/GetSiteTimeZoneInfoRequest.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/GetSiteTimeZoneInfoRequest.py index 73a2d80..9beb726 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/GetSiteTimeZoneInfoRequest.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/gfe/request/GetSiteTimeZoneInfoRequest.py @@ -18,23 +18,27 @@ # further licensing information. ## -# File auto-generated against equivalent DynamicSerialize Java class +## +# SOFTWARE HISTORY +# +# Date Ticket# Engineer Description +# ------------ ---------- ----------- -------------------------- +# xx/xx/?? dgilling Initial Creation. +# 12/02/15 5129 dgilling Refactor based on AbstractGfeRequest. +# +## -class GetSiteTimeZoneInfoRequest(object): +from dynamicserialize.dstypes.com.raytheon.uf.common.dataplugin.gfe.request import AbstractGfeRequest + +class GetSiteTimeZoneInfoRequest(AbstractGfeRequest): def __init__(self): - self.workstationID = None - self.siteID = None + super(GetSiteTimeZoneInfoRequest, self).__init__() + self.requestedSiteIDs = None - def getWorkstationID(self): - return self.workstationID + def getRequestedSiteIDs(self): + return self.requestedSiteIDs - def setWorkstationID(self, workstationID): - self.workstationID = workstationID - - def getSiteID(self): - return self.siteID - - def setSiteID(self, siteID): - self.siteID = siteID + def setRequestedSiteIDs(self, requestedSiteIDs): + self.requestedSiteIDs = requestedSiteIDs diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/text/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/text/__init__.py index 360baf1..687105c 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/text/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/text/__init__.py @@ -22,7 +22,7 @@ __all__ = [ 'dbsrv', - 'request' + 'subscription' ] diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/text/subscription/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/text/subscription/__init__.py new file mode 100644 index 0000000..0ffc322 --- /dev/null +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/text/subscription/__init__.py @@ -0,0 +1,27 @@ +## +# 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/text/request/SubscriptionRequest.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/text/subscription/request/SubscriptionRequest.py similarity index 100% rename from dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/text/request/SubscriptionRequest.py rename to dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/text/subscription/request/SubscriptionRequest.py diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/text/request/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/text/subscription/request/__init__.py similarity index 100% rename from dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/text/request/__init__.py rename to dynamicserialize/dstypes/com/raytheon/uf/common/dataplugin/text/subscription/request/__init__.py diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/pypies/request/DeleteOrphansRequest.py b/dynamicserialize/dstypes/com/raytheon/uf/common/pypies/request/DeleteOrphansRequest.py new file mode 100644 index 0000000..13f2e5e --- /dev/null +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/pypies/request/DeleteOrphansRequest.py @@ -0,0 +1,39 @@ +## +# 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 DeleteOrphansRequest(object): + + def __init__(self): + self.filename = None + self.oldestDate = None + + def getOldestDate(self): + return self.oldestDate + + def setOldestDate(self, oldestDate): + self.oldestDate = oldestDate + + def getFilename(self): + return self.filename + + def setFilename(self, filename): + self.filename = filename diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/pypies/request/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/pypies/request/__init__.py index 648ea66..6a26239 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/pypies/request/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/pypies/request/__init__.py @@ -26,6 +26,7 @@ __all__ = [ 'DatasetDataRequest', 'DatasetNamesRequest', 'DeleteFilesRequest', + 'DeleteOrphansRequest', 'DeleteRequest', 'GroupsRequest', 'RepackRequest', @@ -38,6 +39,7 @@ from CreateDatasetRequest import CreateDatasetRequest from DatasetDataRequest import DatasetDataRequest from DatasetNamesRequest import DatasetNamesRequest from DeleteFilesRequest import DeleteFilesRequest +from DeleteOrphansRequest import DeleteOrphansRequest from DeleteRequest import DeleteRequest from GroupsRequest import GroupsRequest from RepackRequest import RepackRequest diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/time/FormattedDate.py b/dynamicserialize/dstypes/com/raytheon/uf/common/time/FormattedDate.py new file mode 100644 index 0000000..aa082e2 --- /dev/null +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/time/FormattedDate.py @@ -0,0 +1,39 @@ +## +# 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 +# ------------ ---------- ----------- -------------------------- +# 09/21/2015 4486 rjpeter Initial creation. +# +## + +from time import gmtime, strftime +from dynamicserialize.dstypes.java.util import Date + +class FormattedDate(Date): + + def __init__(self, timeInMillis=None): + super(FormattedDate, self).__init__(timeInMillis) + + def __repr__(self): + return strftime("%Y-%m-%d %H:%M:%S.", gmtime(self.time/1000.0)) + '{:03d}'.format(self.time%1000) diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/time/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/time/__init__.py index a31aacc..bcbcb2c 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/time/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/time/__init__.py @@ -22,9 +22,11 @@ __all__ = [ 'DataTime', - 'TimeRange' + 'TimeRange', + 'FormattedDate' ] from DataTime import DataTime from TimeRange import TimeRange +from FormattedDate import FormattedDate diff --git a/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/pgen/__init__.py b/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/pgen/__init__.py index 479ce8a..bf01e45 100644 --- a/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/pgen/__init__.py +++ b/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/pgen/__init__.py @@ -5,7 +5,8 @@ __all__ = [ 'ActivityInfo', 'DerivedProduct', 'ResponseMessageValidate', - 'request' + 'request', + 'response' ] from ActivityInfo import ActivityInfo diff --git a/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/pgen/request/__init__.py b/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/pgen/request/__init__.py index c5c872b..cecb082 100644 --- a/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/pgen/request/__init__.py +++ b/dynamicserialize/dstypes/gov/noaa/nws/ncep/common/dataplugin/pgen/request/__init__.py @@ -4,10 +4,12 @@ __all__ = [ 'RetrieveAllProductsRequest', 'StoreActivityRequest', - 'StoreDerivedProductRequest' + 'StoreDerivedProductRequest', + 'RetrieveActivityMapRequest' ] from RetrieveAllProductsRequest import RetrieveAllProductsRequest from StoreActivityRequest import StoreActivityRequest from StoreDerivedProductRequest import StoreDerivedProductRequest +from RetrieveActivityMapRequest import RetrieveActivityMapRequest