From 61de5378542fe550252dc7905480ee4fd446a937 Mon Sep 17 00:00:00 2001 From: Michael James Date: Sun, 14 Oct 2018 18:01:38 -0600 Subject: [PATCH] add AbstractDataRecord for dynamicserialize/dstypes/com/raytheon/uf/common/datastorage/records --- .../datastorage/records/AbstractDataRecord.py | 78 ++++++++++++++++++ .../datastorage/records/ByteDataRecord.py | 74 +---------------- .../datastorage/records/DoubleDataRecord.py | 81 +------------------ .../datastorage/records/FloatDataRecord.py | 75 +---------------- .../datastorage/records/IntegerDataRecord.py | 75 +---------------- .../datastorage/records/LongDataRecord.py | 75 +---------------- .../datastorage/records/ShortDataRecord.py | 73 +---------------- .../datastorage/records/StringDataRecord.py | 74 +---------------- .../uf/common/datastorage/records/__init__.py | 4 +- 9 files changed, 100 insertions(+), 509 deletions(-) create mode 100644 dynamicserialize/dstypes/com/raytheon/uf/common/datastorage/records/AbstractDataRecord.py diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/datastorage/records/AbstractDataRecord.py b/dynamicserialize/dstypes/com/raytheon/uf/common/datastorage/records/AbstractDataRecord.py new file mode 100644 index 0000000..fd450a3 --- /dev/null +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/datastorage/records/AbstractDataRecord.py @@ -0,0 +1,78 @@ + +from six import with_metaclass +import abc + + +class AbstractDataRecord(with_metaclass(abc.ABCMeta, object)): + + def __init__(self): + self.name = None + self.dimension = None + self.sizes = None + self.maxSizes = None + self.props = None + self.minIndex = None + self.group = None + self.dataAttributes = None + self.fillValue = None + self.maxChunkSize = None + + def getName(self): + return self.name + + def setName(self, name): + self.name = name + + def getDimension(self): + return self.dimension + + def setDimension(self, dimension): + self.dimension = dimension + + def getSizes(self): + return self.sizes + + def setSizes(self, sizes): + self.sizes = sizes + + def getMaxSizes(self): + return self.maxSizes + + def setMaxSizes(self, maxSizes): + self.maxSizes = maxSizes + + def getProps(self): + return self.props + + def setProps(self, props): + self.props = props + + def getMinIndex(self): + return self.minIndex + + def setMinIndex(self, minIndex): + self.minIndex = minIndex + + def getGroup(self): + return self.group + + def setGroup(self, group): + self.group = group + + def getDataAttributes(self): + return self.dataAttributes + + def setDataAttributes(self, dataAttributes): + self.dataAttributes = dataAttributes + + def getFillValue(self): + return self.fillValue + + def setFillValue(self, fillValue): + self.fillValue = fillValue + + def getMaxChunkSize(self): + return self.maxChunkSize + + def setMaxChunkSize(self, maxChunkSize): + self.maxChunkSize = maxChunkSize diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/datastorage/records/ByteDataRecord.py b/dynamicserialize/dstypes/com/raytheon/uf/common/datastorage/records/ByteDataRecord.py index fe9bd4f..413dd17 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/datastorage/records/ByteDataRecord.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/datastorage/records/ByteDataRecord.py @@ -1,19 +1,11 @@ +from dynamicserialize.dstypes.com.raytheon.uf.common.datastorage.records import AbstractDataRecord -class ByteDataRecord(object): +class ByteDataRecord(AbstractDataRecord): def __init__(self): + super(ByteDataRecord, self).__init__() self.byteData = None - self.name = None - self.dimension = None - self.sizes = None - self.maxSizes = None - self.props = None - self.minIndex = None - self.group = None - self.dataAttributes = None - self.fillValue = None - self.maxChunkSize = None def getByteData(self): return self.byteData @@ -21,66 +13,6 @@ class ByteDataRecord(object): def setByteData(self, byteData): self.byteData = byteData - def getName(self): - return self.name - - def setName(self, name): - self.name = name - - def getDimension(self): - return self.dimension - - def setDimension(self, dimension): - self.dimension = dimension - - def getSizes(self): - return self.sizes - - def setSizes(self, sizes): - self.sizes = sizes - - def getMaxSizes(self): - return self.maxSizes - - def setMaxSizes(self, maxSizes): - self.maxSizes = maxSizes - - def getProps(self): - return self.props - - def setProps(self, props): - self.props = props - - def getMinIndex(self): - return self.minIndex - - def setMinIndex(self, minIndex): - self.minIndex = minIndex - - def getGroup(self): - return self.group - - def setGroup(self, group): - self.group = group - - def getDataAttributes(self): - return self.dataAttributes - - def setDataAttributes(self, dataAttributes): - self.dataAttributes = dataAttributes - - def getFillValue(self): - return self.fillValue - - def setFillValue(self, fillValue): - self.fillValue = fillValue - - def getMaxChunkSize(self): - return self.maxChunkSize - - def setMaxChunkSize(self, maxChunkSize): - self.maxChunkSize = maxChunkSize - def retrieveDataObject(self): return self.getByteData() diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/datastorage/records/DoubleDataRecord.py b/dynamicserialize/dstypes/com/raytheon/uf/common/datastorage/records/DoubleDataRecord.py index bd92a49..368226e 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/datastorage/records/DoubleDataRecord.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/datastorage/records/DoubleDataRecord.py @@ -1,80 +1,11 @@ -# -# SOFTWARE HISTORY -# -# Date Ticket# Engineer Description -# ------------ ---------- ----------- -------------------------- -# Sep 8, 2014 kustert Initial Creation -# Apr 24, 2015 4425 nabowle Bring in. +from dynamicserialize.dstypes.com.raytheon.uf.common.datastorage.records import AbstractDataRecord -class DoubleDataRecord(object): +class DoubleDataRecord(AbstractDataRecord): def __init__(self): - self.sizes = None - self.dimension = None - self.maxChunkSize = None - self.name = None - self.fillValue = None - self.dataAttributes = None - self.group = None - self.minIndex = None - self.props = None + super(DoubleDataRecord, self).__init__() self.doubleData = None - self.maxSizes = None - - def getSizes(self): - return self.sizes - - def setSizes(self, sizes): - self.sizes = sizes - - def getDimension(self): - return self.dimension - - def setDimension(self, dimension): - self.dimension = dimension - - def getMaxChunkSize(self): - return self.maxChunkSize - - def setMaxChunkSize(self, maxChunkSize): - self.maxChunkSize = maxChunkSize - - def getName(self): - return self.name - - def setName(self, name): - self.name = name - - def getFillValue(self): - return self.fillValue - - def setFillValue(self, fillValue): - self.fillValue = fillValue - - def getDataAttributes(self): - return self.dataAttributes - - def setDataAttributes(self, dataAttributes): - self.dataAttributes = dataAttributes - - def getGroup(self): - return self.group - - def setGroup(self, group): - self.group = group - - def getMinIndex(self): - return self.minIndex - - def setMinIndex(self, minIndex): - self.minIndex = minIndex - - def getProps(self): - return self.props - - def setProps(self, props): - self.props = props def getDoubleData(self): return self.doubleData @@ -82,12 +13,6 @@ class DoubleDataRecord(object): def setDoubleData(self, doubleData): self.doubleData = doubleData - def getMaxSizes(self): - return self.maxSizes - - def setMaxSizes(self, maxSizes): - self.maxSizes = maxSizes - def retrieveDataObject(self): return self.getDoubleData() diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/datastorage/records/FloatDataRecord.py b/dynamicserialize/dstypes/com/raytheon/uf/common/datastorage/records/FloatDataRecord.py index 4daf7f1..8e4d029 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/datastorage/records/FloatDataRecord.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/datastorage/records/FloatDataRecord.py @@ -1,19 +1,11 @@ +from dynamicserialize.dstypes.com.raytheon.uf.common.datastorage.records import AbstractDataRecord -class FloatDataRecord(object): +class FloatDataRecord(AbstractDataRecord): def __init__(self): + super(FloatDataRecord, self).__init__() self.floatData = None - self.name = None - self.dimension = None - self.sizes = None - self.maxSizes = None - self.props = None - self.minIndex = None - self.group = None - self.dataAttributes = None - self.fillValue = None - self.maxChunkSize = None def getFloatData(self): return self.floatData @@ -21,69 +13,8 @@ class FloatDataRecord(object): def setFloatData(self, floatData): self.floatData = floatData - def getName(self): - return self.name - - def setName(self, name): - self.name = name - - def getDimension(self): - return self.dimension - - def setDimension(self, dimension): - self.dimension = dimension - - def getSizes(self): - return self.sizes - - def setSizes(self, sizes): - self.sizes = sizes - - def getMaxSizes(self): - return self.maxSizes - - def setMaxSizes(self, maxSizes): - self.maxSizes = maxSizes - - def getProps(self): - return self.props - - def setProps(self, props): - self.props = props - - def getMinIndex(self): - return self.minIndex - - def setMinIndex(self, minIndex): - self.minIndex = minIndex - - def getGroup(self): - return self.group - - def setGroup(self, group): - self.group = group - - def getDataAttributes(self): - return self.dataAttributes - - def setDataAttributes(self, dataAttributes): - self.dataAttributes = dataAttributes - - def getFillValue(self): - return self.fillValue - - def setFillValue(self, fillValue): - self.fillValue = fillValue - - def getMaxChunkSize(self): - return self.maxChunkSize - - def setMaxChunkSize(self, maxChunkSize): - self.maxChunkSize = maxChunkSize - def retrieveDataObject(self): return self.getFloatData() def putDataObject(self, obj): self.setFloatData(obj) - diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/datastorage/records/IntegerDataRecord.py b/dynamicserialize/dstypes/com/raytheon/uf/common/datastorage/records/IntegerDataRecord.py index 25fb316..ec63a28 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/datastorage/records/IntegerDataRecord.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/datastorage/records/IntegerDataRecord.py @@ -1,20 +1,11 @@ +from dynamicserialize.dstypes.com.raytheon.uf.common.datastorage.records import AbstractDataRecord - -class IntegerDataRecord(object): +class IntegerDataRecord(AbstractDataRecord): def __init__(self): + super(IntegerDataRecord, self).__init__() self.intData = None - self.name = None - self.dimension = None - self.sizes = None - self.maxSizes = None - self.props = None - self.minIndex = None - self.group = None - self.dataAttributes = None - self.fillValue = None - self.maxChunkSize = None def getIntData(self): return self.intData @@ -22,66 +13,6 @@ class IntegerDataRecord(object): def setIntData(self, intData): self.intData = intData - def getName(self): - return self.name - - def setName(self, name): - self.name = name - - def getDimension(self): - return self.dimension - - def setDimension(self, dimension): - self.dimension = dimension - - def getSizes(self): - return self.sizes - - def setSizes(self, sizes): - self.sizes = sizes - - def getMaxSizes(self): - return self.maxSizes - - def setMaxSizes(self, maxSizes): - self.maxSizes = maxSizes - - def getProps(self): - return self.props - - def setProps(self, props): - self.props = props - - def getMinIndex(self): - return self.minIndex - - def setMinIndex(self, minIndex): - self.minIndex = minIndex - - def getGroup(self): - return self.group - - def setGroup(self, group): - self.group = group - - def getDataAttributes(self): - return self.dataAttributes - - def setDataAttributes(self, dataAttributes): - self.dataAttributes = dataAttributes - - def getFillValue(self): - return self.fillValue - - def setFillValue(self, fillValue): - self.fillValue = fillValue - - def getMaxChunkSize(self): - return self.maxChunkSize - - def setMaxChunkSize(self, maxChunkSize): - self.maxChunkSize = maxChunkSize - def retrieveDataObject(self): return self.getIntData() 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 7c441ec..5fec3d9 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/datastorage/records/LongDataRecord.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/datastorage/records/LongDataRecord.py @@ -1,20 +1,11 @@ +from dynamicserialize.dstypes.com.raytheon.uf.common.datastorage.records import AbstractDataRecord - -class LongDataRecord(object): +class LongDataRecord(AbstractDataRecord): def __init__(self): + super(LongDataRecord, self).__init__() self.longData = None - self.name = None - self.dimension = None - self.sizes = None - self.maxSizes = None - self.props = None - self.minIndex = None - self.group = None - self.dataAttributes = None - self.fillValue = None - self.maxChunkSize = None def getLongData(self): return self.longData @@ -22,66 +13,6 @@ class LongDataRecord(object): def setLongData(self, longData): self.longData = longData - def getName(self): - return self.name - - def setName(self, name): - self.name = name - - def getDimension(self): - return self.dimension - - def setDimension(self, dimension): - self.dimension = dimension - - def getSizes(self): - return self.sizes - - def setSizes(self, sizes): - self.sizes = sizes - - def getMaxSizes(self): - return self.maxSizes - - def setMaxSizes(self, maxSizes): - self.maxSizes = maxSizes - - def getProps(self): - return self.props - - def setProps(self, props): - self.props = props - - def getMinIndex(self): - return self.minIndex - - def setMinIndex(self, minIndex): - self.minIndex = minIndex - - def getGroup(self): - return self.group - - def setGroup(self, group): - self.group = group - - def getDataAttributes(self): - return self.dataAttributes - - def setDataAttributes(self, dataAttributes): - self.dataAttributes = dataAttributes - - def getFillValue(self): - return self.fillValue - - def setFillValue(self, fillValue): - self.fillValue = fillValue - - def getMaxChunkSize(self): - return self.maxChunkSize - - def setMaxChunkSize(self, maxChunkSize): - self.maxChunkSize = maxChunkSize - def retrieveDataObject(self): return self.getLongData() 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 a5a7d6f..8c574a3 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/datastorage/records/ShortDataRecord.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/datastorage/records/ShortDataRecord.py @@ -1,19 +1,10 @@ +from dynamicserialize.dstypes.com.raytheon.uf.common.datastorage.records import AbstractDataRecord -class ShortDataRecord(object): +class ShortDataRecord(AbstractDataRecord): def __init__(self): self.shortData = None - self.name = None - self.dimension = None - self.sizes = None - self.maxSizes = None - self.props = None - self.minIndex = None - self.group = None - self.dataAttributes = None - self.fillValue = None - self.maxChunkSize = None def getShortData(self): return self.shortData @@ -21,66 +12,6 @@ class ShortDataRecord(object): def setShortData(self, shortData): self.shortData = shortData - def getName(self): - return self.name - - def setName(self, name): - self.name = name - - def getDimension(self): - return self.dimension - - def setDimension(self, dimension): - self.dimension = dimension - - def getSizes(self): - return self.sizes - - def setSizes(self, sizes): - self.sizes = sizes - - def getMaxSizes(self): - return self.maxSizes - - def setMaxSizes(self, maxSizes): - self.maxSizes = maxSizes - - def getProps(self): - return self.props - - def setProps(self, props): - self.props = props - - def getMinIndex(self): - return self.minIndex - - def setMinIndex(self, minIndex): - self.minIndex = minIndex - - def getGroup(self): - return self.group - - def setGroup(self, group): - self.group = group - - def getDataAttributes(self): - return self.dataAttributes - - def setDataAttributes(self, dataAttributes): - self.dataAttributes = dataAttributes - - def getFillValue(self): - return self.fillValue - - def setFillValue(self, fillValue): - self.fillValue = fillValue - - def getMaxChunkSize(self): - return self.maxChunkSize - - def setMaxChunkSize(self, maxChunkSize): - self.maxChunkSize = maxChunkSize - def retrieveDataObject(self): return self.getShortData() 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 f1f90a6..c8eef9b 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/datastorage/records/StringDataRecord.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/datastorage/records/StringDataRecord.py @@ -1,20 +1,12 @@ +from dynamicserialize.dstypes.com.raytheon.uf.common.datastorage.records import AbstractDataRecord -class StringDataRecord(object): +class StringDataRecord(AbstractDataRecord): def __init__(self): + super(StringDataRecord, self).__init__() self.stringData = None self.maxLength = None - self.name = None - self.dimension = None - self.sizes = None - self.maxSizes = None - self.props = None - self.minIndex = None - self.group = None - self.dataAttributes = None - self.fillValue = None - self.maxChunkSize = None self.numpyData = None def getStringData(self): @@ -29,66 +21,6 @@ class StringDataRecord(object): def setMaxLength(self, maxLength): self.maxLength = maxLength - def getName(self): - return self.name - - def setName(self, name): - self.name = name - - def getDimension(self): - return self.dimension - - def setDimension(self, dimension): - self.dimension = dimension - - def getSizes(self): - return self.sizes - - def setSizes(self, sizes): - self.sizes = sizes - - def getMaxSizes(self): - return self.maxSizes - - def setMaxSizes(self, maxSizes): - self.maxSizes = maxSizes - - def getProps(self): - return self.props - - def setProps(self, props): - self.props = props - - def getMinIndex(self): - return self.minIndex - - def setMinIndex(self, minIndex): - self.minIndex = minIndex - - def getGroup(self): - return self.group - - def setGroup(self, group): - self.group = group - - def getDataAttributes(self): - return self.dataAttributes - - def setDataAttributes(self, dataAttributes): - self.dataAttributes = dataAttributes - - def getFillValue(self): - return self.fillValue - - def setFillValue(self, fillValue): - self.fillValue = fillValue - - def getMaxChunkSize(self): - return self.maxChunkSize - - def setMaxChunkSize(self, maxChunkSize): - self.maxChunkSize = maxChunkSize - def retrieveDataObject(self): if not self.numpyData: import numpy diff --git a/dynamicserialize/dstypes/com/raytheon/uf/common/datastorage/records/__init__.py b/dynamicserialize/dstypes/com/raytheon/uf/common/datastorage/records/__init__.py index 3382550..1978888 100644 --- a/dynamicserialize/dstypes/com/raytheon/uf/common/datastorage/records/__init__.py +++ b/dynamicserialize/dstypes/com/raytheon/uf/common/datastorage/records/__init__.py @@ -10,8 +10,8 @@ # Apr 24, 2015 4425 nabowle Add DoubleDataRecord # - __all__ = [ + 'AbstractDataRecord', 'ByteDataRecord', 'DoubleDataRecord', 'FloatDataRecord', @@ -21,6 +21,7 @@ __all__ = [ 'StringDataRecord' ] +from .AbstractDataRecord import AbstractDataRecord from .ByteDataRecord import ByteDataRecord from .DoubleDataRecord import DoubleDataRecord from .FloatDataRecord import FloatDataRecord @@ -28,4 +29,3 @@ from .IntegerDataRecord import IntegerDataRecord from .LongDataRecord import LongDataRecord from .ShortDataRecord import ShortDataRecord from .StringDataRecord import StringDataRecord -