Issue #2361 remove XML annotations and IDecoderGettable from a variety of plugins

Change-Id: Ib9b09659bbcca9b47c3e185e895d0deb1ba23739

Former-commit-id: 065be6691bf102699dc7ece3424f6972792c4d6f

edexOsgi/com.raytheon.uf.common.activetable/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject

@@ -1,2 +0,0 @@
-com.raytheon.uf.common.activetable.OperationalActiveTableRecord
-com.raytheon.uf.common.activetable.PracticeActiveTableRecord

edexOsgi/com.raytheon.uf.common.dataplugin.bufrascat/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject

@@ -1 +0,0 @@
-com.raytheon.uf.common.dataplugin.bufrascat.AScatObs

edexOsgi/com.raytheon.uf.common.dataplugin.bufrmthdw/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject

@@ -1 +0,0 @@
-com.raytheon.uf.common.dataplugin.bufrmthdw.BufrMTHDWObs

edexOsgi/com.raytheon.uf.common.dataplugin.bufrncwf/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject

@@ -1,2 +0,0 @@
-com.raytheon.uf.common.dataplugin.ncwf.BUFRncwf
-com.raytheon.uf.common.dataplugin.ncwf.NCWFFeature

edexOsgi/com.raytheon.uf.common.dataplugin.bufrncwf/src/com/raytheon/uf/common/dataplugin/ncwf/BUFRncwf.java

@@ -19,8 +19,6 @@
  **/
 package com.raytheon.uf.common.dataplugin.ncwf;
 
-import java.util.Collection;
-
 import javax.persistence.Access;
 import javax.persistence.AccessType;
 import javax.persistence.Column;
@@ -30,15 +28,9 @@ import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import javax.persistence.UniqueConstraint;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
 
 import org.hibernate.annotations.Index;
 
-import com.raytheon.uf.common.dataplugin.IDecoderGettable;
 import com.raytheon.uf.common.dataplugin.PluginDataObject;
 import com.raytheon.uf.common.dataplugin.annotations.DataURI;
 import com.raytheon.uf.common.dataplugin.persist.IPersistable;
@@ -52,7 +44,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
 import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
 
 /**
- * TODO Add Description
+ * Record implemtnation for National Convective Weather Forecast
  * 
  * <pre>
  * 
@@ -66,6 +58,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
  * May 07, 2013 1869       bsteffen    Remove dataURI column from
  *                                     PluginDataObject.
  * Aug 30, 2013 2298       rjpeter     Make getPluginName abstract
+ * Oct 15, 2013 2361       njensen     Remove XML annotations and IDecoderGettable
  * 
  * </pre>
  * 
@@ -81,11 +74,9 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
  */
 @org.hibernate.annotations.Table(appliesTo = "bufrncwf", indexes = { @Index(name = "bufrncwf_refTimeIndex", columnNames = {
         "refTime", "forecastTime" }) })
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.NONE)
 @DynamicSerialize
 public class BUFRncwf extends PersistablePluginDataObject implements
-        ISpatialEnabled, IDecoderGettable, IPointData, IPersistable {
+        ISpatialEnabled, IPointData, IPersistable {
 
     private static final long serialVersionUID = 1L;
 
@@ -95,32 +86,26 @@ public class BUFRncwf extends PersistablePluginDataObject implements
 
     @Embedded
     @DataURI(position = 1, embedded = true)
-    @XmlElement
     @DynamicSerializeElement
     private SurfaceObsLocation location;
 
     @Transient
-    @XmlElement
     @DynamicSerializeElement
     private NCWFFeature detection;
 
     @Transient
-    @XmlElement
     @DynamicSerializeElement
     private NCWFFeature forecast;
 
     @Transient
-    @XmlAttribute
     @DynamicSerializeElement
     private Double stormDir;
 
     @Transient
-    @XmlAttribute
     @DynamicSerializeElement
     private Double stormSpeed;
 
     @Transient
-    @XmlAttribute
     @DynamicSerializeElement
     private Double stormTop;
 
@@ -233,36 +218,11 @@ public class BUFRncwf extends PersistablePluginDataObject implements
         this.stormTop = stormTop;
     }
 
-    @Override
-    public IDecoderGettable getDecoderGettable() {
-        return null;
-    }
-
     @Override
     public ISpatialObject getSpatialObject() {
         return location;
     }
 
-    @Override
-    public String getString(String paramName) {
-        return null;
-    }
-
-    @Override
-    public String[] getStrings(String paramName) {
-        return null;
-    }
-
-    @Override
-    public Amount getValue(String paramName) {
-        return null;
-    }
-
-    @Override
-    public Collection<Amount> getValues(String paramName) {
-        return null;
-    }
-
     /**
      * 
      */

edexOsgi/com.raytheon.uf.common.dataplugin.bufrncwf/src/com/raytheon/uf/common/dataplugin/ncwf/NCWFFeature.java

@@ -20,31 +20,38 @@
 package com.raytheon.uf.common.dataplugin.ncwf;
 
 import java.io.Serializable;
-// import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-
-import com.raytheon.uf.common.serialization.ISerializableObject;
 import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
 import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
 import com.raytheon.uf.edex.decodertools.core.DecoderTools;
 import com.vividsolutions.jts.geom.Coordinate;
 
-@XmlAccessorType(XmlAccessType.NONE)
+/**
+ * Feature for NCWF
+ * 
+ * <pre>
+ * 
+ * SOFTWARE HISTORY
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * --/--/----              jkorman     Initial creation
+ * Oct 15, 2013 2361       njensen     Remove XML annotations
+ * 
+ * </pre>
+ * 
+ * @author jkorman
+ * @version 1.0
+ */
 @DynamicSerialize
-public class NCWFFeature implements Serializable, ISerializableObject {
+public class NCWFFeature implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @XmlElement
     @DynamicSerializeElement
     private Coordinate centroidLocation;
 
-    @XmlElement
     @DynamicSerializeElement
     List<Coordinate> featureBoundary;
 
@@ -59,7 +66,7 @@ public class NCWFFeature implements Serializable, ISerializableObject {
      *            Feature centroid longitude.
      */
     public NCWFFeature(Double lat, Double lon) {
-        centroidLocation = DecoderTools.createCoordinate(lat,lon);
+        centroidLocation = DecoderTools.createCoordinate(lat, lon);
     }
 
     /**
@@ -68,7 +75,7 @@ public class NCWFFeature implements Serializable, ISerializableObject {
     public Coordinate getCentroidLocation() {
         return centroidLocation;
     }
-    
+
     /**
      * 
      * @return
@@ -76,7 +83,7 @@ public class NCWFFeature implements Serializable, ISerializableObject {
     public double getCentroidLatitude() {
         return DecoderTools.getCoordinateLatitude(centroidLocation);
     }
-    
+
     /**
      * 
      * @return
@@ -84,7 +91,7 @@ public class NCWFFeature implements Serializable, ISerializableObject {
     public double getCentroidLongitude() {
         return DecoderTools.getCoordinateLongitude(centroidLocation);
     }
-    
+
     /**
      * @param centroidLocation
      *            the centroidLocation to set

edexOsgi/com.raytheon.uf.common.dataplugin.bufrquikscat/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject

@@ -1 +0,0 @@
-com.raytheon.uf.common.dataplugin.bufrquikscat.QUIKScatObs

edexOsgi/com.raytheon.uf.common.dataplugin.bufrquikscat/src/com/raytheon/uf/common/dataplugin/bufrquikscat/QUIKScatObs.java

@@ -20,7 +20,6 @@
 package com.raytheon.uf.common.dataplugin.bufrquikscat;
 
 import java.util.Calendar;
-import java.util.Collection;
 
 import javax.persistence.Access;
 import javax.persistence.AccessType;
@@ -31,15 +30,9 @@ import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import javax.persistence.UniqueConstraint;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
 
 import org.hibernate.annotations.Index;
 
-import com.raytheon.uf.common.dataplugin.IDecoderGettable;
 import com.raytheon.uf.common.dataplugin.PluginDataObject;
 import com.raytheon.uf.common.dataplugin.annotations.DataURI;
 import com.raytheon.uf.common.dataplugin.persist.IPersistable;
@@ -54,7 +47,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
 import com.vividsolutions.jts.geom.Geometry;
 
 /**
- * 
+ * Observation from QUIKScat
  * 
  * <pre>
  * 
@@ -68,6 +61,7 @@ import com.vividsolutions.jts.geom.Geometry;
  * May 07, 2013 1869       bsteffen    Remove dataURI column from
  *                                     PluginDataObject.
  * Aug 30, 2013 2298       rjpeter     Make getPluginName abstract
+ * Oct 14, 2013 2361       njensen     Removed XML annotations
  * 
  * </pre>
  * 
@@ -83,11 +77,9 @@ import com.vividsolutions.jts.geom.Geometry;
  */
 @org.hibernate.annotations.Table(appliesTo = "bufrquikscat", indexes = { @Index(name = "bufrquikscat_refTimeIndex", columnNames = {
         "refTime", "forecastTime" }) })
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.NONE)
 @DynamicSerialize
 public class QUIKScatObs extends PersistablePluginDataObject implements
-        ISpatialEnabled, IDecoderGettable, IPointData, IPersistable {
+        ISpatialEnabled, IPointData, IPersistable {
 
     private static final long serialVersionUID = 1L;
 
@@ -96,49 +88,40 @@ public class QUIKScatObs extends PersistablePluginDataObject implements
     private PointDataView pointDataView;
 
     @DataURI(position = 1)
-    @XmlAttribute
     @DynamicSerializeElement
     private Integer satId;
 
     @Embedded
     @DataURI(position = 2, embedded = true)
-    @XmlElement
     @DynamicSerializeElement
     private SurfaceObsLocation location;
 
     // Text of the WMO header
     @Column(length = 32)
     @DynamicSerializeElement
-    @XmlElement
     private String wmoHeader;
 
-    @XmlAttribute
     @DynamicSerializeElement
     @Transient
     private Integer orbitNumber;
 
     // The observation time.
-    @XmlAttribute
     @DynamicSerializeElement
     @Transient
     private Calendar timeObs;
 
-    @XmlAttribute
     @DynamicSerializeElement
     @Transient
     private Double windDir;
 
-    @XmlAttribute
     @DynamicSerializeElement
     @Transient
     private Double windSpd;
 
-    @XmlAttribute
     @DynamicSerializeElement
     @Transient
     private Double probRain;
 
-    @XmlAttribute
     @DynamicSerializeElement
     @Transient
     private Integer rainIndex;
@@ -346,36 +329,11 @@ public class QUIKScatObs extends PersistablePluginDataObject implements
         this.timeObs = timeObs;
     }
 
-    @Override
-    public IDecoderGettable getDecoderGettable() {
-        return null;
-    }
-
     @Override
     public ISpatialObject getSpatialObject() {
         return location;
     }
 
-    @Override
-    public String getString(String paramName) {
-        return null;
-    }
-
-    @Override
-    public String[] getStrings(String paramName) {
-        return null;
-    }
-
-    @Override
-    public Amount getValue(String paramName) {
-        return null;
-    }
-
-    @Override
-    public Collection<Amount> getValues(String paramName) {
-        return null;
-    }
-
     /**
      * 
      */

edexOsgi/com.raytheon.uf.common.dataplugin.bufrsigwx/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject

@@ -1 +0,0 @@
-com.raytheon.uf.common.dataplugin.bufrsigwx.SigWxData

edexOsgi/com.raytheon.uf.common.dataplugin.bufrsigwx/src/com/raytheon/uf/common/dataplugin/bufrsigwx/SigWxData.java

@@ -19,8 +19,6 @@
  **/
 package com.raytheon.uf.common.dataplugin.bufrsigwx;
 
-import java.util.Collection;
-
 import javax.persistence.Access;
 import javax.persistence.AccessType;
 import javax.persistence.Column;
@@ -30,15 +28,9 @@ import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import javax.persistence.UniqueConstraint;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
 
 import org.hibernate.annotations.Index;
 
-import com.raytheon.uf.common.dataplugin.IDecoderGettable;
 import com.raytheon.uf.common.dataplugin.PluginDataObject;
 import com.raytheon.uf.common.dataplugin.annotations.DataURI;
 import com.raytheon.uf.common.dataplugin.bufrsigwx.common.SigWxLayer;
@@ -52,7 +44,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
 import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
 
 /**
- * TODO Add Description
+ * Upper air pointdata for significant weather
  * 
  * <pre>
  * 
@@ -66,6 +58,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
  * May 07, 2013 1869       bsteffen    Remove dataURI column from
  *                                     PluginDataObject.
  * Aug 30, 2013 2298       rjpeter     Make getPluginName abstract
+ * Oct 14, 2013 2361       njensen     Removed XML annotations and IDecoderGettable
  * 
  * </pre>
  * 
@@ -82,38 +75,31 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
 @org.hibernate.annotations.Table(appliesTo = "bufrsigwx", indexes = { @Index(name = "bufrswigwx_refTimeIndex", columnNames = {
         "refTime", "forecastTime" }) })
 @DynamicSerialize
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.NONE)
 public class SigWxData extends PersistablePluginDataObject implements
-        IDecoderGettable, IPointData, IPersistable {
+        IPointData, IPersistable {
 
     private static final long serialVersionUID = 1L;
 
     @Column
     @DataURI(position = 1)
-    @XmlElement
     @DynamicSerializeElement
     private SigWxLayer wxLayer;
 
     @Column
     @DataURI(position = 2)
-    @XmlElement
     @DynamicSerializeElement
     private SigWxType wxType;
 
     @Column
     @DataURI(position = 3)
-    @XmlAttribute
     @DynamicSerializeElement
     private Integer key;
 
     @Column
-    @XmlAttribute
     @DynamicSerializeElement
     private Integer baseHeight;
 
     @Column
-    @XmlAttribute
     @DynamicSerializeElement
     private Integer topHeight;
 
@@ -124,12 +110,10 @@ public class SigWxData extends PersistablePluginDataObject implements
     // Text of the WMO header
     @Column(length = 32)
     @DynamicSerializeElement
-    @XmlElement
     private String wmoHeader;
 
     @Transient
     @DynamicSerializeElement
-    @XmlElement
     private TropopauseLayerData tropData;
 
     /**
@@ -256,31 +240,6 @@ public class SigWxData extends PersistablePluginDataObject implements
         this.key = key;
     }
 
-    @Override
-    public IDecoderGettable getDecoderGettable() {
-        return null;
-    }
-
-    @Override
-    public String getString(String paramName) {
-        return null;
-    }
-
-    @Override
-    public String[] getStrings(String paramName) {
-        return null;
-    }
-
-    @Override
-    public Amount getValue(String paramName) {
-        return null;
-    }
-
-    @Override
-    public Collection<Amount> getValues(String paramName) {
-        return null;
-    }
-
     /**
      * 
      */

edexOsgi/com.raytheon.uf.common.dataplugin.bufrssmi/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject

@@ -1 +0,0 @@
-com.raytheon.uf.common.dataplugin.bufrssmi.SSMIScanData

edexOsgi/com.raytheon.uf.common.dataplugin.cwa/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject

@@ -1 +0,0 @@
-com.raytheon.uf.common.dataplugin.cwa.CWARecord

edexOsgi/com.raytheon.uf.common.dataplugin.cwa/src/com/raytheon/uf/common/dataplugin/cwa/CWARecord.java

@@ -30,14 +30,9 @@ import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import javax.persistence.UniqueConstraint;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
 
 import org.hibernate.annotations.Index;
 
-import com.raytheon.uf.common.dataplugin.IDecoderGettable;
 import com.raytheon.uf.common.dataplugin.PluginDataObject;
 import com.raytheon.uf.common.dataplugin.annotations.DataURI;
 import com.raytheon.uf.common.dataplugin.persist.IPersistable;
@@ -49,7 +44,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
 import com.vividsolutions.jts.geom.Coordinate;
 
 /**
- * 
+ * A record for the CWA product
  * 
  * <pre>
  * 
@@ -63,6 +58,7 @@ import com.vividsolutions.jts.geom.Coordinate;
  * May 07, 2013 1869       bsteffen    Remove dataURI column from
  *                                     PluginDataObject.
  * Aug 30, 2013 2298       rjpeter     Make getPluginName abstract
+ * Oct 15, 2013 2361       njensen     Removed XML annotations
  * 
  * </pre>
  * 
@@ -78,8 +74,6 @@ import com.vividsolutions.jts.geom.Coordinate;
  */
 @org.hibernate.annotations.Table(appliesTo = "cwa", indexes = { @Index(name = "cwa_refTimeIndex", columnNames = {
         "refTime", "forecastTime" }) })
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.NONE)
 @DynamicSerialize
 public class CWARecord extends PersistablePluginDataObject implements
         IPointData, IPersistable {
@@ -92,27 +86,22 @@ public class CWARecord extends PersistablePluginDataObject implements
 
     // Text of the WMO header
     @Transient
-    @XmlElement
     @DynamicSerializeElement
     private String wmoHeader = "";
 
     @Transient
-    @XmlElement
     @DynamicSerializeElement
     private CWADimension dimension;
 
     @DataURI(position = 1, embedded = true)
-    @XmlElement
     @DynamicSerializeElement
     private String eventId;
 
     @Transient
-    @XmlElement
     @DynamicSerializeElement
     private Coordinate[] coordinates;
 
     @Transient
-    @XmlElement
     @DynamicSerializeElement
     private String text;
 
@@ -159,11 +148,6 @@ public class CWARecord extends PersistablePluginDataObject implements
         identifier = dataURI;
     }
 
-    @Override
-    public IDecoderGettable getDecoderGettable() {
-        return null;
-    }
-
     public String getText() {
         return text;
     }

edexOsgi/com.raytheon.uf.common.dataplugin.cwat/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject

@@ -1 +0,0 @@
-com.raytheon.uf.common.dataplugin.cwat.CWATRecord

edexOsgi/com.raytheon.uf.common.dataplugin.cwat/src/com/raytheon/uf/common/dataplugin/cwat/CWATRecord.java

@@ -31,10 +31,6 @@ import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import javax.persistence.UniqueConstraint;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
 
 import org.geotools.coverage.grid.GeneralGridEnvelope;
 import org.geotools.coverage.grid.GridGeometry2D;
@@ -42,7 +38,6 @@ import org.geotools.geometry.GeneralEnvelope;
 import org.hibernate.annotations.Index;
 import org.opengis.referencing.crs.ProjectedCRS;
 
-import com.raytheon.uf.common.dataplugin.IDecoderGettable;
 import com.raytheon.uf.common.dataplugin.PluginDataObject;
 import com.raytheon.uf.common.dataplugin.annotations.DataURI;
 import com.raytheon.uf.common.dataplugin.persist.IPersistable;
@@ -81,6 +76,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
  *                                      PluginDataObject.
  * Aug 06, 2013 2228        njensen     Use deserialize(byte[])
  * Aug 30, 2013 2298        rjpeter     Make getPluginName abstract
+ * Oct 14, 2013 2361        njensen     Removed XML annotations
  * 
  * </pre>
  * 
@@ -96,8 +92,6 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
  */
 @org.hibernate.annotations.Table(appliesTo = "cwat", indexes = { @Index(name = "cwat_refTimeIndex", columnNames = {
         "refTime", "forecastTime" }) })
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.NONE)
 @DynamicSerialize
 public class CWATRecord extends PersistablePluginDataObject implements
         IPersistable, ISpatialEnabled {
@@ -109,44 +103,36 @@ public class CWATRecord extends PersistablePluginDataObject implements
     @Column(length = 7)
     @DataURI(position = 1)
     @DynamicSerializeElement
-    @XmlElement(nillable = false)
     private String icao;
 
     @Column(length = 30)
     @DataURI(position = 2)
     @DynamicSerializeElement
-    @XmlElement(nillable = false)
     private String fieldName;
 
     @ManyToOne
     @PrimaryKeyJoinColumn
-    @XmlElement
     @DynamicSerializeElement
     private RadarStation spatialInfo;
 
     @Column
     @DynamicSerializeElement
-    @XmlElement(nillable = false)
     public Integer nx = 0;
 
     @Column
     @DynamicSerializeElement
-    @XmlElement(nillable = false)
     public Integer ny = 0;
 
     @Column
     @DynamicSerializeElement
-    @XmlElement(nillable = false)
     public Integer dx = 0;
 
     @Column
     @DynamicSerializeElement
-    @XmlElement(nillable = false)
     public Integer dy = 0;
 
     @Column
     @DynamicSerializeElement
-    @XmlElement(nillable = false)
     public Integer maxScti = 0;
 
     @Transient
@@ -363,17 +349,6 @@ public class CWATRecord extends PersistablePluginDataObject implements
         return maxScti;
     }
 
-    /**
-     * Get the IDecoderGettable reference for this record.
-     * 
-     * @return The IDecoderGettable reference for this record. Null for this
-     *         class.
-     */
-    @Override
-    public IDecoderGettable getDecoderGettable() {
-        return null;
-    }
-
     public RadarStation getSpatialInfo() {
         return spatialInfo;
     }

edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject

@@ -1 +0,0 @@
-com.raytheon.uf.common.dataplugin.ffmp.FFMPRecord

edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPRecord.java

@@ -37,10 +37,6 @@ import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import javax.persistence.UniqueConstraint;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
 
 import org.hibernate.annotations.Index;
 
@@ -77,13 +73,13 @@ import com.raytheon.uf.common.time.util.ImmutableDate;
  * 
  * Date         Ticket#     Engineer    Description
  * ------------ ----------  ----------- --------------------------
- * Jun 03, 2009 2521     D. Hladky   Initial release
+ * Jun 03, 2009 2521        D. Hladky   Initial release
  * Jan 27, 2013 1478        D. Hladky   OUN memory help
- * Feb 28, 2013 1729        dhladky    Supressed un-necessary debug loggers
+ * Feb 28, 2013 1729        dhladky     Supressed un-necessary debug loggers
  * Apr 04, 2013 1846        bkowal      Added an index on refTime and
  *                                      forecastTime
- * Apr 08, 2013 1293        bkowal     Removed references to hdffileid.
+ * Apr 08, 2013 1293        bkowal      Removed references to hdffileid.
- * April, 9 2013 1890       dhladky    Moved dates to referenced map in record
+ * April, 9 2013 1890       dhladky     Moved dates to referenced map in record
  *                                          rather than multiple dates in
  *                                          FFMPBasin objs.
  * Apr 12, 2013 1857        bgonzale    Added SequenceGenerator annotation.
@@ -93,6 +89,7 @@ import com.raytheon.uf.common.time.util.ImmutableDate;
  *                                      PluginDataObject.
  * Jul 15, 2013 2184        dhladky     Remove all HUC's for storage except ALL
  * Aug 30, 2013 2298        rjpeter     Make getPluginName abstract
+ * Oct 14, 2013 2361        njensen     Removed XML annotations
  * 
  * </pre>
  * 
@@ -108,8 +105,6 @@ import com.raytheon.uf.common.time.util.ImmutableDate;
  */
 @org.hibernate.annotations.Table(appliesTo = "ffmp", indexes = { @Index(name = "ffmp_refTimeIndex", columnNames = {
         "refTime", "forecastTime" }) })
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.NONE)
 @DynamicSerialize
 public class FFMPRecord extends PersistablePluginDataObject implements
         IPersistable {
@@ -119,25 +114,21 @@ public class FFMPRecord extends PersistablePluginDataObject implements
     @Column(length = 7)
     @DataURI(position = 1)
     @DynamicSerializeElement
-    @XmlElement(nillable = false)
     private String wfo;
 
     @Column(length = 32)
     @DataURI(position = 2)
     @DynamicSerializeElement
-    @XmlElement(nillable = false)
     private String sourceName;
 
     @Column(length = 32)
     @DataURI(position = 3)
     @DynamicSerializeElement
-    @XmlElement(nillable = false)
     private String dataKey;
 
     @Column(length = 32)
     @DataURI(position = 4)
     @DynamicSerializeElement
-    @XmlElement(nillable = false)
     private String siteKey;
 
     @Transient

edexOsgi/com.raytheon.uf.common.dataplugin.fog/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject

@@ -1 +0,0 @@
-com.raytheon.uf.common.dataplugin.fog.FogRecord

edexOsgi/com.raytheon.uf.common.dataplugin.fog/src/com/raytheon/uf/common/dataplugin/fog/FogRecord.java

@@ -29,10 +29,6 @@ import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import javax.persistence.UniqueConstraint;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
 
 import org.geotools.coverage.grid.GeneralGridEnvelope;
 import org.geotools.coverage.grid.GridGeometry2D;
@@ -40,7 +36,6 @@ import org.geotools.geometry.GeneralEnvelope;
 import org.hibernate.annotations.Index;
 import org.opengis.referencing.crs.ProjectedCRS;
 
-import com.raytheon.uf.common.dataplugin.IDecoderGettable;
 import com.raytheon.uf.common.dataplugin.PluginDataObject;
 import com.raytheon.uf.common.dataplugin.annotations.DataURI;
 import com.raytheon.uf.common.dataplugin.fog.analysis.FogRange;
@@ -70,6 +65,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
  * May 07, 2013 1869        bsteffen    Remove dataURI column from
  *                                      PluginDataObject.
  * Aug 30, 2013 2298        rjpeter     Make getPluginName abstract
+ * Oct 15, 2013 2361        njensen     Remove XML annotations
  * 
  * </pre>
  * 
@@ -85,8 +81,6 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
  */
 @org.hibernate.annotations.Table(appliesTo = "fog", indexes = { @Index(name = "fog_refTimeIndex", columnNames = {
         "refTime", "forecastTime" }) })
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.NONE)
 @DynamicSerialize
 public class FogRecord extends PersistablePluginDataObject implements
         IPersistable {
@@ -96,53 +90,43 @@ public class FogRecord extends PersistablePluginDataObject implements
     @Column(length = 7)
     @DataURI(position = 1)
     @DynamicSerializeElement
-    @XmlElement(nillable = false)
     private String cwa;
 
     // Time of the observation to the nearest hour.
     @Column
     @DynamicSerializeElement
-    @XmlElement
     private Calendar refHour;
 
     @Column
     @DynamicSerializeElement
-    @XmlElement(nillable = false)
     public int nx = 0;
 
     @Column
     @DynamicSerializeElement
-    @XmlElement(nillable = false)
     public int ny = 0;
 
     @Column
     @DynamicSerializeElement
-    @XmlElement(nillable = false)
     public float dx = 0;
 
     @Column
     @DynamicSerializeElement
-    @XmlElement(nillable = false)
     public float dy = 0;
 
     @Column
     @DynamicSerializeElement
-    @XmlElement(nillable = false)
     public double satLon = 0.0;
 
     @Column
     @DynamicSerializeElement
-    @XmlElement(nillable = false)
     public double satHeight = 0.0;
 
     @Column
     @DynamicSerializeElement
-    @XmlElement(nillable = false)
     public double lon = 0.0;
 
     @Column
     @DynamicSerializeElement
-    @XmlElement(nillable = false)
     public double lat = 0.0;
 
     @Transient
@@ -397,17 +381,6 @@ public class FogRecord extends PersistablePluginDataObject implements
         this.lon = lon;
     }
 
-    /**
-     * Get the IDecoderGettable reference for this record.
-     * 
-     * @return The IDecoderGettable reference for this record. Null for this
-     *         class.
-     */
-    @Override
-    public IDecoderGettable getDecoderGettable() {
-        return null;
-    }
-
     /**
      * Set the VIS pixel array
      * 

edexOsgi/com.raytheon.uf.common.dataplugin.fssobs/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject

@@ -1 +0,0 @@
-com.raytheon.uf.common.dataplugin.fssobs.FSSObsRecord

edexOsgi/com.raytheon.uf.common.dataplugin.fssobs/src/com/raytheon/uf/common/dataplugin/fssobs/FSSObsRecord.java

@@ -1,18 +1,7 @@
 package com.raytheon.uf.common.dataplugin.fssobs;
 
 import java.util.Calendar;
-import java.util.Collection;
-import java.util.HashMap;
 
-import javax.measure.quantity.Angle;
-import javax.measure.quantity.DataAmount;
-import javax.measure.quantity.Length;
-import javax.measure.quantity.Pressure;
-import javax.measure.quantity.Temperature;
-import javax.measure.quantity.Velocity;
-import javax.measure.unit.NonSI;
-import javax.measure.unit.SI;
-import javax.measure.unit.Unit;
 import javax.persistence.Access;
 import javax.persistence.AccessType;
 import javax.persistence.Column;
@@ -22,14 +11,9 @@ import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import javax.persistence.UniqueConstraint;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
 
 import org.hibernate.annotations.Index;
 
-import com.raytheon.uf.common.dataplugin.IDecoderGettable;
 import com.raytheon.uf.common.dataplugin.PluginDataObject;
 import com.raytheon.uf.common.dataplugin.annotations.DataURI;
 import com.raytheon.uf.common.dataplugin.persist.IPersistable;
@@ -42,6 +26,24 @@ import com.raytheon.uf.common.pointdata.spatial.SurfaceObsLocation;
 import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
 import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
 
+/**
+ * Record object for observations for Fog and Safeseas.
+ * 
+ * <pre>
+ * 
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * Dec 13, 2010            skorolev    Initial creation
+ * Oct 14, 2013 2361       njensen     Removed XML annotations and IDecoderGettable
+ * 
+ * </pre>
+ * 
+ * @author njensen
+ * @version 1.0
+ */
+
 @Entity
 @SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "fssobsseq")
 @Table(name = FSSObsRecord.PLUGIN_NAME, uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) })
@@ -51,69 +53,23 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
  */
 @org.hibernate.annotations.Table(appliesTo = FSSObsRecord.PLUGIN_NAME, indexes = { @Index(name = "fssobs_refTimeIndex", columnNames = {
         "refTime", "forecastTime" }) })
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.NONE)
 @DynamicSerialize
 public class FSSObsRecord extends PersistablePluginDataObject implements
-        ISpatialEnabled, IDecoderGettable, IPersistable, IPointData {
+        ISpatialEnabled, IPersistable, IPointData {
 
     private static final long serialVersionUID = 1L;
 
     public static final String PLUGIN_NAME = "fssobs";
 
-    private static final int MISSING = -9999;
-
-    // UNITS
-
-    public static final Unit<Temperature> TEMPERATURE_UNIT = SI.CELSIUS;
-
-    public static final Unit<Velocity> WIND_SPEED_UNIT = NonSI.KNOT;
-
-    public static final Unit<Length> HEIGHT_UNIT = SI.METER;
-
-    public static final Unit<Angle> WIND_DIR_UNIT = NonSI.DEGREE_ANGLE;
-
-    public static final Unit<Angle> LOCATION_UNIT = NonSI.DEGREE_ANGLE;
-
-    public static final Unit<Pressure> PRESSURE_UNIT = SI.HECTO(SI.PASCAL);
-
-    public static final Unit<Length> PRECIP_UNIT = NonSI.INCH;
-
-    public static final Unit<Length> WAVE_UNIT = SI.METER;
-
-    public static final Unit<Length> VISIBILITY_UNIT = NonSI.MILE;
-
-    public static final Unit<DataAmount> CLOUD_COVER = NonSI.OCTET;
-
-    /** Metar specific parameter keys */
-    public static final class ParameterKey {
-        public static final String SFC_ALTIMETER = "SFC.PRESS.ALTIMETER";
-
-        public static final String PRESSURE_CHANGE = "PCHNG";
-
-        public static final String VISIBILITY = "VIS";
-
-        public static final String PRECIPITATION_1HR = "PR1HR";
-    }
-
-    private static final HashMap<String, String> PARM_MAP = new HashMap<String, String>();
-    static {
-        PARM_MAP.put("NLAT", STA_LAT);
-        PARM_MAP.put("NLON", STA_LON);
-        PARM_MAP.put("rawMessage", "rawMessage");
-    }
-
     /** is feature new **/
     @Transient
     @DynamicSerializeElement
-    @XmlElement
     public boolean isNew = true;
 
     // Current CWA (WFO)
     @Column
     @DataURI(position = 2)
     @DynamicSerializeElement
-    @XmlElement(nillable = false)
     private String cwa;
 
     // Monitor which should use this station record
@@ -123,18 +79,15 @@ public class FSSObsRecord extends PersistablePluginDataObject implements
     @Column
     @DataURI(position = 4)
     @DynamicSerializeElement
-    @XmlElement
     private String monitorUse = "";
 
     // Station name
     @Column
     @DynamicSerializeElement
-    @XmlElement
     private String stnName;
 
     /* From ============ObReport================= */
 
-    @XmlElement
     @DynamicSerializeElement
     @Column
     @DataURI(position = 1)
@@ -142,30 +95,25 @@ public class FSSObsRecord extends PersistablePluginDataObject implements
 
     @Embedded
     @DataURI(position = 3, embedded = true)
-    @XmlElement
     @DynamicSerializeElement
     private SurfaceObsLocation location;
 
     // Observing platform identifier (same as stationID)
     @Transient
-    @XmlElement
     @DynamicSerializeElement
     private String platformId;
 
     // Indicator of whether observing platform is stationary
     @Transient
     @DynamicSerializeElement
-    @XmlElement
     private boolean isStationary;
 
     // Actual time of the observation
     @Transient
     @DynamicSerializeElement
-    @XmlElement
     private Calendar timeObs;
 
     // Time of the observation to the nearest hour.
-    @XmlElement
     @DynamicSerializeElement
     @Column
     private Calendar refHour;
@@ -173,214 +121,178 @@ public class FSSObsRecord extends PersistablePluginDataObject implements
     // Raw message
     @Transient
     @DynamicSerializeElement
-    @XmlElement
     private String rawMessage;
 
     // Observed wind speed in knots
     @Transient
     @DynamicSerializeElement
-    @XmlElement
     private float windSpeed = -9999;;
 
     // Wind gust in knots
     @Transient
     @DynamicSerializeElement
-    @XmlElement
     private float windGust = -9999;;
 
     // Observed maximum wind speed in knots
     @Transient
     @DynamicSerializeElement
-    @XmlElement
     private float maxWindSpeed = -9999;
 
     // Observed wind direction in azimuth degrees
     @Transient
     @DynamicSerializeElement
-    @XmlElement
     private float windDir;
 
     // Observed wind chill in Fahrenheit
     @Transient
     @DynamicSerializeElement
-    @XmlElement
     private float windChill = -9999;
 
     // Observed high resolution wave height in
     @Transient
     @DynamicSerializeElement
-    @XmlElement
     private float highResWaveHeight = -9999;
 
     // Observed wave steepness in seconds ??? None
     @Transient
     @DynamicSerializeElement
-    @XmlElement
     private float waveSteepness = -9999;
 
     // Observed visibility in Statute miles
     @Transient
     @DynamicSerializeElement
-    @XmlElement
     private float visibility = -9999;
 
     // Observed visibility in meters for Maritime obs.
     @Transient
     @DynamicSerializeElement
-    @XmlElement
     private float horzVisibility = -9999;
 
     // Observed temperature in degrees in Farenheit
     @Transient
     @DynamicSerializeElement
-    @XmlElement
     private float temperature = -9999;
 
     // in feet
     @Transient
-    @XmlElement
     @DynamicSerializeElement
     private Double waveHeight = -9999.0;
 
     // in seconds
     @Transient
-    @XmlElement
     @DynamicSerializeElement
     private Integer wavePeriod = -9999;
 
     // in Azimuth degrees
     @Transient
-    @XmlElement
     @DynamicSerializeElement
     private Double primarySwellWaveDir = -9999.0;
 
     // in seconds
     @Transient
-    @XmlElement
     @DynamicSerializeElement
     private Integer primarySwellWavePeriod = -9999;
 
     // in feet
     @Transient
-    @XmlElement
     @DynamicSerializeElement
     private Double primarySwellWaveHeight = -9999.0;
 
     // in Azimuth degrees
     @Transient
-    @XmlElement
     @DynamicSerializeElement
     private Double secondarySwellWaveDir = -9999.0;
 
     // in seconds
     @Transient
-    @XmlElement
     @DynamicSerializeElement
     private Integer secondarySwellWavePeriod = -9999;
 
     // in feet
     @Transient
-    @XmlElement
     @DynamicSerializeElement
     private Double secondarySwellWaveHeight = -9999.0;
 
     // Three-hour pressure change in thousandths of an inch of mercury ????
     @Transient
     @DynamicSerializeElement
-    @XmlElement
     private float pressChange3Hour = -9999f;
 
     // Pressure change character for metar plot model
     /** A string denoting the pressure tendency(rising or falling) */
     @Transient
     @DynamicSerializeElement
-    @XmlElement
     private String pressChangeChar;
 
     // Observed dewpoint in degrees Farenheit
     @Transient
     @DynamicSerializeElement
-    @XmlElement
     private float dewpoint = -9999f;
 
     // Observed sea surface temperature in degrees in Farenheit
     @Transient
     @DynamicSerializeElement
-    @XmlElement
     private float seaSurfaceTemp = -9999f;
 
     // the sea level pressure in hPa
-    @XmlElement
     @DynamicSerializeElement
     @Transient
     private float seaLevelPress = -9999f;
 
     // Altimeter setting in mm Hg.
     @Transient
-    @XmlElement
     @DynamicSerializeElement
     private float pressureAltimeter = -9999f;
 
     // Observed hourly precipitation in inches
     @Transient
     @DynamicSerializeElement
-    @XmlElement
     private float hourlyPrecip = -9999f;
 
     // Observed snow depth in inch
     @Transient
     @DynamicSerializeElement
-    @XmlElement
     private float snowDepth = -9999f;
 
     // Observed snow increasing rapidly, hourly total in inches
     @Transient
     @DynamicSerializeElement
-    @XmlElement
     private float snincrHourly = -9999f;
 
     // Observed snow increasing rapidly, total in inches
     @Transient
     @DynamicSerializeElement
-    @XmlElement
     private float snincrTotal = -9999f;
 
     // Observed frostbite time in minutes
     @Transient
     @DynamicSerializeElement
-    @XmlElement
     private float frostbiteTime;
 
     // present weather conditions for metar plot model
     @Transient
     @DynamicSerializeElement
-    @XmlElement
     private String[] presWeather;
 
     // Observed relative humidity in percent
     @Transient
     @DynamicSerializeElement
-    @XmlElement
     private float relativeHumidity = -9999f;
 
     // Observed ceiling in feet above ground level
     @Transient
     @DynamicSerializeElement
-    @XmlElement
     private float ceiling = -9999f;
 
     // Observed dewpoint depression in Farenheit
     @Transient
     @DynamicSerializeElement
-    @XmlElement
     private float dewpointDepr = -9999f;
 
-    @XmlElement
     @DynamicSerializeElement
     @Transient
     private String[] skyCover;
 
-    @XmlElement
     @DynamicSerializeElement
     @Transient
     private int totCloudAmount = -9999;
@@ -397,58 +309,6 @@ public class FSSObsRecord extends PersistablePluginDataObject implements
         super(uri);
     }
 
-    @Override
-    public IDecoderGettable getDecoderGettable() {
-        return null;
-    }
-
-    @Override
-    public Amount getValue(String paramName) {
-        Amount a = null;
-
-        String pName = PARM_MAP.get(paramName);
-
-        if (SFC_TEMP.equals(pName) && (temperature != -9999f)) {
-            a = new Amount(temperature, TEMPERATURE_UNIT);
-        } else if (SFC_DWPT.equals(pName) && (dewpoint != -9999f)) {
-            a = new Amount(dewpoint, TEMPERATURE_UNIT);
-        } else if (SFC_WNDSPD.equals(pName) && (windSpeed != -9999f)) {
-            a = new Amount(windSpeed, WIND_SPEED_UNIT);
-        } else if (SFC_WNDDIR.equals(pName) && (windDir != -9999f)) {
-            a = new Amount(windDir, WIND_DIR_UNIT);
-        } else if (SFC_WNDGST.equals(pName) && (windGust != -9999f)) {
-            a = new Amount(windGust, WIND_SPEED_UNIT);
-        } else if (PRES_SLP.equals(pName) && (seaLevelPress != -9999f)) {
-            a = new Amount(seaLevelPress, PRESSURE_UNIT);
-            // } else if (PRES_ALTSG.equals(pName) && (pressureAltimeter !=
-            // -9999f)) {
-            // a = new Amount(pressureAltimeter, PRESSURE_UNIT);
-        } else if (STA_LAT.equals(pName)) {
-            a = new Amount(this.getLatitude(), LOCATION_UNIT);
-        } else if (STA_LON.equals(pName)) {
-            a = new Amount(this.getLongitude(), LOCATION_UNIT);
-        } else if ("WT".equals(pName) && (this.seaSurfaceTemp != -9999f)) {
-            a = new Amount(this.seaSurfaceTemp, TEMPERATURE_UNIT);
-        } else if ("WH".equals(pName)) {
-            a = new Amount(waveHeight, WAVE_UNIT);
-        } else if ("SWP".equals(pName)) {
-            a = new Amount(primarySwellWavePeriod, WAVE_UNIT);
-        } else if ("SWH".equals(pName)) {
-            a = new Amount(primarySwellWaveHeight, WAVE_UNIT);
-            // } else if ("PCHNG".equals(pName) && pressChange3Hour != MISSING)
-            // {
-            // a = new Amount(pressChange3Hour, PRESSURE_UNIT);
-        } else if ("PKWND".equals(paramName) && (maxWindSpeed != MISSING)) {
-            a = new Amount(maxWindSpeed, WIND_SPEED_UNIT);
-        } else if ("SWS".equals(paramName) || "SWGS".equals(paramName)) {
-            a = new Amount(1, WIND_SPEED_UNIT);
-        } else if ("SWD".equals(paramName) && (primarySwellWaveDir != MISSING)) {
-            a = new Amount(primarySwellWaveDir, WIND_DIR_UNIT);
-        }
-
-        return a;
-    }
-
     /**
      * @return the isNew
      */
@@ -1172,21 +1032,6 @@ public class FSSObsRecord extends PersistablePluginDataObject implements
         return totCloudAmount;
     }
 
-    @Override
-    public Collection<Amount> getValues(String paramName) {
-        return null;
-    }
-
-    @Override
-    public String getString(String paramName) {
-        return null;
-    }
-
-    @Override
-    public String[] getStrings(String paramName) {
-        return null;
-    }
-
     @Override
     public ISpatialObject getSpatialObject() {
         return location;

edexOsgi/com.raytheon.uf.common.dataplugin.ldadhydro/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject

@@ -1 +0,0 @@
-com.raytheon.uf.common.dataplugin.ldadhydro.HydroLdadRecord

edexOsgi/com.raytheon.uf.common.dataplugin.ldadhydro/src/com/raytheon/uf/common/dataplugin/ldadhydro/HydroLdadRecord.java

@@ -21,8 +21,6 @@ package com.raytheon.uf.common.dataplugin.ldadhydro;
  **/
 
 import java.util.Calendar;
-import java.util.Collection;
-import java.util.HashMap;
 
 import javax.measure.quantity.Angle;
 import javax.measure.quantity.Length;
@@ -40,15 +38,9 @@ import javax.persistence.Entity;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import javax.persistence.UniqueConstraint;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
 
 import org.hibernate.annotations.Index;
 
-import com.raytheon.uf.common.dataplugin.IDecoderGettable;
 import com.raytheon.uf.common.dataplugin.PluginDataObject;
 import com.raytheon.uf.common.dataplugin.annotations.DataURI;
 import com.raytheon.uf.common.dataplugin.persist.IPersistable;
@@ -77,6 +69,7 @@ import com.vividsolutions.jts.geom.Geometry;
  * May 07, 2013 1869        bsteffen    Remove dataURI column from
  *                                      PluginDataObject.
  * Aug 30, 2013 2298        rjpeter     Make getPluginName abstract
+ * Oct 15, 2013 2361        njensen     Remove XML annotations and IDecoderGettable
  * 
  * </pre>
  * 
@@ -93,11 +86,9 @@ import com.vividsolutions.jts.geom.Geometry;
  */
 @org.hibernate.annotations.Table(appliesTo = "ldadhydro", indexes = { @Index(name = "ldadhydro_refTimeIndex", columnNames = {
         "refTime", "forecastTime" }) })
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.NONE)
 @DynamicSerialize
 public class HydroLdadRecord extends PersistablePluginDataObject implements
-        ISpatialEnabled, IDecoderGettable, IPointData, IPersistable {
+        ISpatialEnabled, IPointData, IPersistable {
 
     private static final long serialVersionUID = 1L;
 
@@ -115,269 +106,211 @@ public class HydroLdadRecord extends PersistablePluginDataObject implements
 
     public static final Unit<Angle> LOCATION_UNIT = NonSI.DEGREE_ANGLE;
 
-    private static final HashMap<String, String> PARM_MAP = new HashMap<String, String>();
-    static {
-        PARM_MAP.put("T", SFC_TEMP);
-        PARM_MAP.put("DpT", SFC_DWPT);
-        PARM_MAP.put("WS", SFC_WNDSPD);
-        PARM_MAP.put("WD", SFC_WNDDIR);
-        PARM_MAP.put("WGS", SFC_WNDGST);
-        PARM_MAP.put("ASET", "SFC.PRESS.ALTIMETER");
-        PARM_MAP.put("PMSL", PRES_SLP);
-        PARM_MAP.put("NLAT", STA_LAT);
-        PARM_MAP.put("NLON", STA_LON);
-        PARM_MAP.put("STA", "STA");
-        PARM_MAP.put("stationId", "STA");
-        PARM_MAP.put("message", OBS_TEXT);
-        PARM_MAP.put(OBS_TEXT, OBS_TEXT);
-    }
-
     // Time of the observation.
     @DataURI(position = 2)
     @Column
-    @XmlAttribute
     @DynamicSerializeElement
     private Calendar observationTime;
 
     // numeric WMO identification number
     @Column
-    @XmlElement
     @DynamicSerializeElement
     private long numericWMOid;
 
     // latitude, longitude, elevation, stationId="RALC2"
     @Embedded
     @DataURI(position = 3, embedded = true)
-    @XmlElement
     @DynamicSerializeElement
     private SurfaceObsLocation location;
 
     // Data Provider station Id
     @Column
-    @XmlElement
     @DynamicSerializeElement
     private String providerId; // * "110" "FA6026DA"
 
     @Column
-    @XmlElement
     @DynamicSerializeElement
     private String stationName; // * "Ralston_Res"
 
     // Handbook Id (AFOS id or SHEF id)
     @Column
-    @XmlElement
     @DynamicSerializeElement
     private String handbook5Id;
 
     // Home WFO Id for the LDAD data
     @Column
-    @XmlElement
     @DynamicSerializeElement
     private String homeWFO;
 
     // LDAD hydro station type.
     @Column
-    @XmlElement
     @DynamicSerializeElement
     private String stationType;
 
     // LDAD hydro data provider
     @DataURI(position = 1)
     @Column
-    @XmlElement
     @DynamicSerializeElement
     private String dataProvider;
 
     // time data was processed by the provider
     @Column
-    @XmlElement
     @DynamicSerializeElement
     private double reportTime; // * 1.247436157E9
 
     // * time data was received
     @Column
-    @XmlElement
     @DynamicSerializeElement
     private Double receivedTime; // seconds since 1-1-1970
 
     // Below surface
     @Column
-    @XmlElement
     @DynamicSerializeElement
     private Float belowSurface; // meter
 
     // River stage
     @Column
-    @XmlElement
     @DynamicSerializeElement
     private Float riverStage; // meter
 
     // Pool elevation
     @Column
-    @XmlElement
     @DynamicSerializeElement
     private Float poolElevation; // meter
 
     // Tail water stage
     @Column
-    @XmlElement
     @DynamicSerializeElement
     private Float tailwaterStage; // meter
 
     // River velocity
     @Column
-    @XmlElement
     @DynamicSerializeElement
     private Float riverVelocity; // kph
 
     // River inflow
     @Column
-    @XmlElement
     @DynamicSerializeElement
     private Float riverInflow; // meter^3 / sec
 
     // River flow
     @Column
-    @XmlElement
     @DynamicSerializeElement
     private Float riverFlow; // meter^3 / sec
 
     // Computed outflow
     @Column
-    @XmlElement
     @DynamicSerializeElement
     private Float computedOutflow; // meter^3 / sec
 
     // Water temperature
     @Column
-    @XmlElement
     @DynamicSerializeElement
     private Float waterTemperature; // kelvin
 
     // Battery voltage
     @Column
-    @XmlElement
     @DynamicSerializeElement
     private Float voltageBattery; // volt
 
     // Water conductance
     @Column
-    @XmlElement
     @DynamicSerializeElement
     private Float waterConductance; // umhos/cm
 
     // Water oxygen
     @Column
-    @XmlElement
     @DynamicSerializeElement
     private Float waterOxygen; // mg/l
 
     // Water PH
     @Column
-    @XmlElement
     @DynamicSerializeElement
     private Float waterPH; // pH
 
     // Relative humidity
     @Column
-    @XmlElement
     @DynamicSerializeElement
     private Float relHumidity;
 
     // River stage & flow - time of last change (ALERT)
     @Column
-    @XmlElement
     @DynamicSerializeElement
     private Double riverReportChangeTime; // seconds since 1970-1-1 00:00:00.0
 
     // Observation air temperature in degrees Kelvin.
     @Column
     @DynamicSerializeElement
-    @XmlElement
     private Float temperature;
 
     // Observation dewpoint temperature in degrees Kelvin.
     @Column
     @DynamicSerializeElement
-    @XmlElement
     private Float dewpoint;
 
     // Observation wind direction in angular degrees.
     @Column
     @DynamicSerializeElement
-    @XmlElement
     private Float windDir;
 
     // Observation wind speed in meters per second.
     @Column
     @DynamicSerializeElement
-    @XmlElement
     private Float windSpeed;
 
     // Wind speed peak
     @Column
-    @XmlElement
     @DynamicSerializeElement
     private Float windSpeedPeak;
 
     // Observation wind gust in meters per second.
     @Column
     @DynamicSerializeElement
-    @XmlElement
     private Double windGust;
 
     // precip accumulation with an unknown time period in mm.
     @Column
     @DynamicSerializeElement
-    @XmlElement
     private Float precipAccum; // mm
 
     // 5 minute precip accumulation
     @Column
     @DynamicSerializeElement
-    @XmlElement
     private Float precip5min; // mm
 
     // 1 hour precip accumulation
     @Column
     @DynamicSerializeElement
-    @XmlElement
     private Float precip1hr; // mm
 
     // 3 hour precip accumulation
     @Column
     @DynamicSerializeElement
-    @XmlElement
     private Float precip3hr; // float precip3hr mm
 
     // 6 hour precip accumulation
     @Column
     @DynamicSerializeElement
-    @XmlElement
     private Float precip6hr; // float precip6hr mm
 
     // 12 hour precip accumulation mm
     @Column
-    @XmlElement
     @DynamicSerializeElement
     private Float precip12hr;
 
     // 18 hour precip accumulation mm
     @Column
-    @XmlElement
     @DynamicSerializeElement
     private Float precip18hr;
 
     // 24 hour precip accumulation
     @Column
     @DynamicSerializeElement
-    @XmlElement
     private Float precip24hr; // mm
 
     // Raw text LDAD hydro report
     @Column
     @DynamicSerializeElement
-    @XmlElement
     private String rawMessage;
 
     private PointDataView pointDataView;
@@ -519,69 +452,6 @@ public class HydroLdadRecord extends PersistablePluginDataObject implements
         return location;
     }
 
-    /**
-     * This class implements IDecoderGettable so return this instance.
-     * 
-     * @return The reference to this instance.
-     */
-    @Override
-    public IDecoderGettable getDecoderGettable() {
-        return this;
-    }
-
-    /**
-     * 
-     */
-    @Override
-    public String getString(String paramName) {
-        String retValue = null;
-        String pName = PARM_MAP.get(paramName);
-        if ("STA".matches(pName)) {
-            retValue = getStationId();
-        } else if (OBS_TEXT.equals(pName)) {
-            retValue = getStationId();
-        }
-
-        return retValue;
-    }
-
-    @Override
-    public String[] getStrings(String paramName) {
-        return null;
-    }
-
-    @Override
-    public Amount getValue(String paramName) {
-        Amount a = null;
-        String pName = PARM_MAP.get(paramName);
-
-        if (SFC_TEMP.equals(pName)) {
-            a = new Amount(temperature, TEMPERATURE_UNIT);
-        } else if (SFC_DWPT.equals(pName)) {
-            a = new Amount(dewpoint, TEMPERATURE_UNIT);
-        } else if (SFC_WNDSPD.equals(pName)) {
-            a = new Amount(windSpeed, WIND_SPEED_UNIT);
-        } else if (SFC_WNDGST.equals(pName)) {
-            a = new Amount(windGust, WIND_SPEED_UNIT);
-        } else if (SFC_WNDDIR.equals(pName)) {
-            a = new Amount(windDir, WIND_DIR_UNIT);
-        } else if (STA_LAT.equals(pName)) {
-            a = new Amount(getLatitude(), LOCATION_UNIT);
-        } else if (STA_LON.equals(pName)) {
-            a = new Amount(getLongitude(), LOCATION_UNIT);
-        }
-
-        return a;
-    }
-
-    /**
-     * 
-     */
-    @Override
-    public Collection<Amount> getValues(String paramName) {
-        return null;
-    }
-
     /**
      * @param providerId
      *            the providerId to set

edexOsgi/com.raytheon.uf.common.dataplugin.ldadmesonet/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject

@@ -1 +0,0 @@
-com.raytheon.uf.common.dataplugin.ldadmesonet.MesonetLdadRecord

edexOsgi/com.raytheon.uf.common.dataplugin.lsr/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject

@@ -1 +0,0 @@
-com.raytheon.uf.common.dataplugin.lsr.LocalStormReport

edexOsgi/com.raytheon.uf.common.dataplugin.lsr/src/com/raytheon/uf/common/dataplugin/lsr/LocalStormReport.java

@@ -20,7 +20,6 @@
 package com.raytheon.uf.common.dataplugin.lsr;
 
 import java.util.Calendar;
-import java.util.Collection;
 
 import javax.measure.quantity.Angle;
 import javax.measure.quantity.DataAmount;
@@ -40,14 +39,9 @@ import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import javax.persistence.UniqueConstraint;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
 
 import org.hibernate.annotations.Index;
 
-import com.raytheon.uf.common.dataplugin.IDecoderGettable;
 import com.raytheon.uf.common.dataplugin.PluginDataObject;
 import com.raytheon.uf.common.dataplugin.annotations.DataURI;
 import com.raytheon.uf.common.dataplugin.persist.IPersistable;
@@ -61,7 +55,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
 import com.vividsolutions.jts.geom.Geometry;
 
 /**
- * 
+ * Record implementation for Local Storm Reports
  * 
  * <pre>
  * 
@@ -75,6 +69,7 @@ import com.vividsolutions.jts.geom.Geometry;
  * May 07, 2013 1869       bsteffen    Remove dataURI column from
  *                                     PluginDataObject.
  * Aug 30, 2013 2298       rjpeter     Make getPluginName abstract
+ * Oct 14, 2013 2361       njensen     Removed XML annotations and IDecoderGettable
  * 
  * </pre>
  * 
@@ -90,11 +85,9 @@ import com.vividsolutions.jts.geom.Geometry;
  */
 @org.hibernate.annotations.Table(appliesTo = "lsr", indexes = { @Index(name = "lsr_refTimeIndex", columnNames = {
         "refTime", "forecastTime" }) })
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.NONE)
 @DynamicSerialize
 public class LocalStormReport extends PersistablePluginDataObject implements
-        ISpatialEnabled, IDecoderGettable, IPointData, IPersistable {
+        ISpatialEnabled, IPointData, IPersistable {
 
     private static final long serialVersionUID = 1L;
 
@@ -119,20 +112,17 @@ public class LocalStormReport extends PersistablePluginDataObject implements
     //
     @DataURI(position = 1)
     @Column
-    @XmlElement
     @DynamicSerializeElement
     private LSREventType eventType;
 
     // Correction indicator from wmo header
     @DataURI(position = 2)
     @Column
-    @XmlElement
     @DynamicSerializeElement
     private String corIndicator;
 
     @Embedded
     @DataURI(position = 3, embedded = true)
-    @XmlElement
     @DynamicSerializeElement
     private SurfaceObsLocation location;
 
@@ -142,48 +132,40 @@ public class LocalStormReport extends PersistablePluginDataObject implements
 
     // Text of the WMO header
     @Transient
-    @XmlElement
     @DynamicSerializeElement
     private String wmoHeader = "";
 
     // Text of the office
-    @XmlElement
     @DynamicSerializeElement
     private String officeid = "";
 
     //
     @Transient
-    @XmlElement
     @DynamicSerializeElement
     private String cityLoc = "";
 
     //
     @Transient
-    @XmlElement
     @DynamicSerializeElement
     private String source = "";
 
     //
     @Transient
-    @XmlElement
     @DynamicSerializeElement
     private String countyLoc = "";
 
     //
     @Transient
-    @XmlElement
     @DynamicSerializeElement
     private String stateLoc = "";
 
     //
     @Transient
-    @XmlElement
     @DynamicSerializeElement
     private String remarks = "";
 
     //
     @Transient
-    @XmlElement
     @DynamicSerializeElement
     private Float magnitude = -9999.0f;
 
@@ -193,19 +175,16 @@ public class LocalStormReport extends PersistablePluginDataObject implements
     // 3 =
     // 4 =
     @Transient
-    @XmlElement
     @DynamicSerializeElement
     private Integer magQual = MISSING;
 
     //
     @Transient
-    @XmlElement
     @DynamicSerializeElement
     private Integer injuries = MISSING;
 
     //
     @Transient
-    @XmlElement
     @DynamicSerializeElement
     private Integer fatalities = MISSING;
 
@@ -430,11 +409,6 @@ public class LocalStormReport extends PersistablePluginDataObject implements
         identifier = dataURI;
     }
 
-    @Override
-    public IDecoderGettable getDecoderGettable() {
-        return null;
-    }
-
     @Override
     public SurfaceObsLocation getSpatialObject() {
         return location;
@@ -502,26 +476,6 @@ public class LocalStormReport extends PersistablePluginDataObject implements
         return location.getLocationDefined();
     }
 
-    @Override
-    public Amount getValue(String paramName) {
-        return null;
-    }
-
-    @Override
-    public String getString(String paramName) {
-        return null;
-    }
-
-    @Override
-    public String[] getStrings(String paramName) {
-        return null;
-    }
-
-    @Override
-    public Collection<Amount> getValues(String paramName) {
-        return null;
-    }
-
     @Override
     public PointDataView getPointDataView() {
         return pointDataView;

edexOsgi/com.raytheon.uf.common.dataplugin.madis/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject

@@ -1 +0,0 @@
-com.raytheon.uf.common.dataplugin.madis.MadisRecord

edexOsgi/com.raytheon.uf.common.dataplugin.madis/src/com/raytheon/uf/common/dataplugin/madis/MadisRecord.java

@@ -20,7 +20,6 @@ package com.raytheon.uf.common.dataplugin.madis;
  * further licensing information.
  **/
 
-import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
@@ -47,7 +46,6 @@ import javax.xml.bind.annotation.XmlEnumValue;
 
 import org.hibernate.annotations.Index;
 
-import com.raytheon.uf.common.dataplugin.IDecoderGettable;
 import com.raytheon.uf.common.dataplugin.PluginDataObject;
 import com.raytheon.uf.common.dataplugin.annotations.DataURI;
 import com.raytheon.uf.common.dataplugin.persist.PersistablePluginDataObject;
@@ -74,6 +72,8 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
  * Jul 12, 2013 2096       mpduff      Changed temperature unit to F.
  * Jul 14, 2013 2180       dhladky     GUI update for mouse over display
  * Aug 30, 2013 2298       rjpeter     Make getPluginName abstract
+ * Oct 14, 2013 2361       njensen     Removed IDecoderGettable
+ * 
  * </pre>
  * 
  * @author dhladky
@@ -88,7 +88,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
         "refTime", "location" }), })
 @DynamicSerialize
 public class MadisRecord extends PersistablePluginDataObject implements
-        ISpatialEnabled, IDecoderGettable, IPointData {
+        ISpatialEnabled, IPointData {
 
     private static final long serialVersionUID = -2234739310998758367L;
 
@@ -370,20 +370,6 @@ public class MadisRecord extends PersistablePluginDataObject implements
 
     public static final Unit<Length> PRECIP_UNIT = NonSI.INCH;
 
-    /** Keys that map back to known decoder params **/
-    private static final HashMap<String, String> PARM_MAP = new HashMap<String, String>();
-    static {
-        PARM_MAP.put(SFC_DWPT, SFC_DWPT);
-        PARM_MAP.put(SFC_TEMP, SFC_TEMP);
-        PARM_MAP.put(SFC_WNDSPD, SFC_WNDSPD);
-        PARM_MAP.put(SFC_WNDDIR, SFC_WNDDIR);
-        PARM_MAP.put(SFC_WNDGST, SFC_WNDGST);
-        PARM_MAP.put(PRES_ALTSG, PRES_ALTSG);
-        PARM_MAP.put(PRES_STATION, PRES_STATION);
-        PARM_MAP.put(STA_LAT, STA_LAT);
-        PARM_MAP.put(STA_LON, STA_LON);
-    }
-
     /** MADIS specific parameter keys */
     public static final class ParameterKey {
 
@@ -482,80 +468,6 @@ public class MadisRecord extends PersistablePluginDataObject implements
         this.pointDataView = pointDataView;
     }
 
-    @Override
-    public Amount getValue(final String paramName) {
-        Amount a = null;
-
-        String pName = paramName;
-
-        if (SFC_TEMP.equals(pName)) {
-            if (temperature != -9999) {
-                a = new Amount(temperature, TEMPERATURE_UNIT);
-            }
-        } else if (SFC_DWPT.equals(pName)) {
-            if (dewpoint != -9999) {
-                a = new Amount(dewpoint, TEMPERATURE_UNIT);
-            }
-        } else if (SFC_WNDSPD.equals(pName)) {
-            a = new Amount(windSpeed, WIND_SPEED_UNIT);
-        } else if (SFC_WNDGST.equals(pName)) {
-            a = new Amount(windGust, WIND_SPEED_UNIT);
-        } else if (SFC_WNDDIR.equals(pName)) {
-            if (getWindDirection() != -9999) {
-                Double result = (double) getWindDirection();
-                a = new Amount(result, WIND_DIR_UNIT);
-            }
-        } else if (PRES_ALTSG.equals(pName)) {
-            a = new Amount(altimeter, ALTIMETER_UNIT);
-        } else if (STA_LAT.equals(pName)) {
-            a = new Amount(getLatitude(), LOCATION_UNIT);
-        } else if (STA_LON.equals(pName)) {
-            a = new Amount(getLongitude(), LOCATION_UNIT);
-        } else if (ParameterKey.PRECIPITALWATER.equals(pName)) {
-            if (precipitalWater != -9999) {
-                a = new Amount(precipitalWater, PRECIP_UNIT);
-            }
-        } else if (ParameterKey.RELATIVEHUMIDITY.equals(pName)) {
-            if (rh != -9999) {
-                a = new Amount(rh, HUMIDITY_UNIT);
-            }
-        } else if (PRES_STATION.equals(pName)) {
-            if (pressure != -9999) {
-                a = new Amount(pressure, PRESSURE_UNIT);
-            }
-        }
-        return a;
-    }
-
-    @Override
-    public Collection<Amount> getValues(final String paramName) {
-        return Collections.emptyList();
-    }
-
-    @Override
-    public String getString(final String paramName) {
-        if (ParameterKey.PROVIDER.matches(paramName)) {
-            return getProvider();
-        } else if (ParameterKey.SUB_PROVIDER.matches(paramName)) {
-            return getSubProvider();
-        } else if (ParameterKey.STATIONID.matches(paramName)) {
-            return getStationId();
-        }
-        return null;
-    }
-
-    @Override
-    public String[] getStrings(final String paramName) {
-        if (ParameterKey.PROVIDER.matches(paramName)) {
-            return new String[] { getProvider() };
-        } else if (ParameterKey.SUB_PROVIDER.matches(paramName)) {
-            return new String[] { getSubProvider() };
-        } else if (ParameterKey.STATIONID.matches(paramName)) {
-            return new String[] { getStationId() };
-        }
-        return null;
-    }
-
     /**
      * Enumeration of Quality types, we know so far
      * 

edexOsgi/com.raytheon.uf.common.dataplugin.npp.crimss/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject

@@ -1 +0,0 @@
-com.raytheon.uf.common.dataplugin.npp.crimss.CrimssRecord

edexOsgi/com.raytheon.uf.common.dataplugin.npp.crimss/src/com/raytheon/uf/common/dataplugin/npp/crimss/CrimssRecord.java

@@ -26,9 +26,6 @@ import javax.persistence.Entity;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import javax.persistence.UniqueConstraint;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
 
 import com.raytheon.uf.common.dataplugin.PluginDataObject;
 import com.raytheon.uf.common.dataplugin.npp.sounding.NPPSoundingRecord;
@@ -48,6 +45,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
  * May 07, 2013 1869       bsteffen    Remove dataURI column from
  *                                     PluginDataObject.
  * Aug 30, 2013 2298       rjpeter     Make getPluginName abstract
+ * Oct 14, 2013 2361       njensen     Removed XML annotations
  * 
  * </pre>
  * 
@@ -58,8 +56,6 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
 @SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "crimssseq")
 @Table(name = "crimss", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) })
 @DynamicSerialize
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.NONE)
 public class CrimssRecord extends NPPSoundingRecord {
 
     private static final long serialVersionUID = 1L;

edexOsgi/com.raytheon.uf.common.dataplugin.npp.nucaps/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject

@@ -1 +0,0 @@
-com.raytheon.uf.common.dataplugin.npp.nucaps.NucapsRecord

edexOsgi/com.raytheon.uf.common.dataplugin.npp.nucaps/src/com/raytheon/uf/common/dataplugin/npp/nucaps/NucapsRecord.java

@@ -26,9 +26,6 @@ import javax.persistence.Entity;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import javax.persistence.UniqueConstraint;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
 
 import com.raytheon.uf.common.dataplugin.PluginDataObject;
 import com.raytheon.uf.common.dataplugin.npp.sounding.NPPSoundingRecord;
@@ -48,6 +45,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
  * May 07, 2013 1869       bsteffen    Remove dataURI column from
  *                                     PluginDataObject.
  * Aug 30, 2013 2298       rjpeter     Make getPluginName abstract
+ * Oct 14, 2013 2361       njensen     Removed XML annotations
  * 
  * </pre>
  * 
@@ -58,8 +56,6 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
 @SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "nucapsseq")
 @Table(name = NucapsRecord.PLUGIN_NAME, uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) })
 @DynamicSerialize
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.NONE)
 public class NucapsRecord extends NPPSoundingRecord {
 
     private static final long serialVersionUID = 1L;

edexOsgi/com.raytheon.uf.common.dataplugin.npp.viirs/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject

@@ -1,2 +0,0 @@
-com.raytheon.uf.common.dataplugin.npp.viirs.VIIRSDataRecord
-com.raytheon.uf.common.dataplugin.npp.viirs.VIIRSSpatialCoverage

edexOsgi/com.raytheon.uf.common.dataplugin.preciprate/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject

@@ -1 +0,0 @@
-com.raytheon.uf.common.dataplugin.preciprate.PrecipRateRecord

edexOsgi/com.raytheon.uf.common.dataplugin.preciprate/src/com/raytheon/uf/common/dataplugin/preciprate/PrecipRateRecord.java

@@ -32,10 +32,6 @@ import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import javax.persistence.UniqueConstraint;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
 
 import org.geotools.coverage.grid.GeneralGridEnvelope;
 import org.geotools.coverage.grid.GridGeometry2D;
@@ -43,7 +39,6 @@ import org.geotools.geometry.GeneralEnvelope;
 import org.hibernate.annotations.Index;
 import org.opengis.referencing.crs.ProjectedCRS;
 
-import com.raytheon.uf.common.dataplugin.IDecoderGettable;
 import com.raytheon.uf.common.dataplugin.PluginDataObject;
 import com.raytheon.uf.common.dataplugin.annotations.DataURI;
 import com.raytheon.uf.common.dataplugin.persist.PersistablePluginDataObject;
@@ -83,6 +78,7 @@ import com.raytheon.uf.common.status.UFStatus.Priority;
  *                                      PluginDataObject.
  * Aug 06, 2013 2228        njensen     Use deserialize(byte[])
  * Aug 30, 2013 2298        rjpeter     Make getPluginName abstract
+ * Oct 14, 2013 2361        njensen     Removed XML annotations
  * 
  * </pre>
  * 
@@ -98,8 +94,6 @@ import com.raytheon.uf.common.status.UFStatus.Priority;
  */
 @org.hibernate.annotations.Table(appliesTo = "preciprate", indexes = { @Index(name = "preciprate_refTimeIndex", columnNames = {
         "refTime", "forecastTime" }) })
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.NONE)
 @DynamicSerialize
 public class PrecipRateRecord extends PersistablePluginDataObject implements
         IMonitorProcessing {
@@ -110,69 +104,56 @@ public class PrecipRateRecord extends PersistablePluginDataObject implements
 
     @Column
     @DynamicSerializeElement
-    @XmlElement(nillable = false)
     private Integer gateResolution;
 
     @Column(length = 7)
     @DataURI(position = 1)
     @DynamicSerializeElement
-    @XmlElement(nillable = false)
     private String icao;
 
     @Column
     @DynamicSerializeElement
-    @XmlElement(nillable = false)
     private Float latitude;
 
     @Column
     @DynamicSerializeElement
-    @XmlElement(nillable = false)
     private Float longitude;
 
     @Column
     @DynamicSerializeElement
-    @XmlElement(nillable = false)
     private Integer numRadials;
 
     @Column
     @DynamicSerializeElement
-    @XmlElement(nillable = false)
     private Integer numBins;
 
     @Column(length = 7)
     @DynamicSerializeElement
-    @XmlElement(nillable = false)
     private String mnemonic;
 
     @Column
     @DynamicSerializeElement
-    @XmlElement(nillable = false)
     private Integer volumeCoveragePattern;
 
     @ManyToOne
     @PrimaryKeyJoinColumn
-    @XmlElement
     @DynamicSerializeElement
     private RadarStation location;
 
     @Column
     @DynamicSerializeElement
-    @XmlElement(nillable = false)
     private Double coefficent = 0.0;
 
     @Column
     @DynamicSerializeElement
-    @XmlElement(nillable = false)
     private Double acoefficent = 0.0;
 
     @Column
     @DynamicSerializeElement
-    @XmlElement(nillable = false)
     private Double hailcap = 0.0;
 
     @Column
     @DynamicSerializeElement
-    @XmlElement(nillable = false)
     private Double bias = 0.0;
 
     @Transient
@@ -183,7 +164,6 @@ public class PrecipRateRecord extends PersistablePluginDataObject implements
 
     @Transient
     @DynamicSerializeElement
-    @XmlElement
     protected float[] angleData;
 
     @Transient
@@ -596,17 +576,6 @@ public class PrecipRateRecord extends PersistablePluginDataObject implements
         this.crs = crs;
     }
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see
-     * com.raytheon.uf.common.dataplugin.PluginDataObject#getDecoderGettable()
-     */
-    @Override
-    public IDecoderGettable getDecoderGettable() {
-        return null;
-    }
-
     @Override
     @Column
     @Access(AccessType.PROPERTY)

edexOsgi/com.raytheon.uf.common.dataplugin.profiler/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject

@@ -1,2 +0,0 @@
-com.raytheon.uf.common.dataplugin.profiler.ProfilerObs
-com.raytheon.uf.common.dataplugin.profiler.ProfilerLevel

edexOsgi/com.raytheon.uf.common.dataplugin.profiler/src/com/raytheon/uf/common/dataplugin/profiler/ProfilerLevel.java

@@ -21,11 +21,6 @@ package com.raytheon.uf.common.dataplugin.profiler;
 
 import java.io.Serializable;
 
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-
-import com.raytheon.uf.common.serialization.ISerializableObject;
 import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
 import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
 
@@ -37,6 +32,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * 20080303            969 jkorman     Initial implementation.
+ * Oct 15, 2013 2361       njensen     Remove XML annotations
  * 
  * </pre>
  * 
@@ -44,53 +40,41 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
  * @version 1.0
  */
 @DynamicSerialize
-@XmlAccessorType(XmlAccessType.NONE)
+public class ProfilerLevel implements Serializable, Comparable<ProfilerLevel> {
-public class ProfilerLevel implements Serializable, ISerializableObject, Comparable<ProfilerLevel> {
 
     private static final long serialVersionUID = 1L;
 
     @DynamicSerializeElement
-    @XmlAttribute
     private Integer modeInfo;
 
     @DynamicSerializeElement
-    @XmlAttribute
     private Integer levelQualCode;
 
     @DynamicSerializeElement
-    @XmlAttribute
     private Double peakPower;
 
     @DynamicSerializeElement
-    @XmlAttribute
     private Integer levelHeight;
 
     @DynamicSerializeElement
-    @XmlAttribute
     private Double ucWind;
 
     @DynamicSerializeElement
-    @XmlAttribute
     private Double vcWind;
 
     @DynamicSerializeElement
-    @XmlAttribute
     private Double horzStdDev;
 
     @DynamicSerializeElement
-    @XmlAttribute
     private Integer horzConsensus;
 
     @DynamicSerializeElement
-    @XmlAttribute
     private Double wcWind;
 
     @DynamicSerializeElement
-    @XmlAttribute
     private Double vertStdDev;
 
     @DynamicSerializeElement
-    @XmlAttribute
     private Integer vertConsensus;
 
     /**
@@ -339,5 +323,5 @@ public class ProfilerLevel implements Serializable, ISerializableObject, Compara
         }
         return result;
     }
-    
+
 }

edexOsgi/com.raytheon.uf.common.dataplugin.profiler/src/com/raytheon/uf/common/dataplugin/profiler/ProfilerObs.java

@@ -21,7 +21,6 @@ package com.raytheon.uf.common.dataplugin.profiler;
 
 import java.util.ArrayList;
 import java.util.Calendar;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.regex.Matcher;
@@ -41,15 +40,9 @@ import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import javax.persistence.UniqueConstraint;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
 
 import org.hibernate.annotations.Index;
 
-import com.raytheon.uf.common.dataplugin.IDecoderGettable;
 import com.raytheon.uf.common.dataplugin.PluginDataObject;
 import com.raytheon.uf.common.dataplugin.annotations.DataURI;
 import com.raytheon.uf.common.dataplugin.persist.IPersistable;
@@ -81,6 +74,7 @@ import com.vividsolutions.jts.geom.Geometry;
  * May 07, 2013 1869       bsteffen    Remove dataURI column from
  *                                     PluginDataObject.
  * Aug 30, 2013 2298       rjpeter     Make getPluginName abstract
+ * Oct 14, 2013 2361       njensen     Removed XML annotations and IDecoderGettable
  * 
  * </pre>
  * 
@@ -96,12 +90,9 @@ import com.vividsolutions.jts.geom.Geometry;
  */
 @org.hibernate.annotations.Table(appliesTo = ProfilerObs.PLUGIN_NAME, indexes = { @Index(name = "profiler_refTimeIndex", columnNames = {
         "refTime", "forecastTime" }) })
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.NONE)
 @DynamicSerialize
 public class ProfilerObs extends PersistablePluginDataObject implements
-        ISpatialEnabled, IDecoderGettable, IPointData, IPersistable,
+        ISpatialEnabled, IPointData, IPersistable, Comparable<ProfilerObs> {
-        Comparable<ProfilerObs> {
 
     private static final long serialVersionUID = 1L;
 
@@ -127,18 +118,6 @@ public class ProfilerObs extends PersistablePluginDataObject implements
 
     public static final Unit<Angle> WIND_DIR_UNIT = NonSI.DEGREE_ANGLE;
 
-    private static final HashMap<String, String> PARM_MAP = new HashMap<String, String>();
-
-    private static final String PROF_ID = "profid";
-
-    static {
-        PARM_MAP.put("NLAT", STA_LAT);
-        PARM_MAP.put("NLON", STA_LON);
-        PARM_MAP.put("WS", SFC_WNDSPD);
-        PARM_MAP.put("WD", SFC_WNDDIR);
-        PARM_MAP.put("PROF_ID", PROF_ID);
-    }
-
     private static final String PRESS = "PRESS";
 
     private static final String AGL = "AGL";
@@ -166,24 +145,20 @@ public class ProfilerObs extends PersistablePluginDataObject implements
     private Integer levelId;
 
     @DataURI(position = 1)
-    @XmlAttribute
     @DynamicSerializeElement
     private Integer reportType;
 
     // The profiler observation time.
     @Column
-    @XmlAttribute
     @DynamicSerializeElement
     private Calendar timeObs;
 
     @Embedded
     @DataURI(position = 2, embedded = true)
-    @XmlElement
     @DynamicSerializeElement
     private SurfaceObsLocation location;
 
     @Column
-    @XmlAttribute
     @DynamicSerializeElement
     private String profilerId;
 
@@ -192,28 +167,23 @@ public class ProfilerObs extends PersistablePluginDataObject implements
     private PointDataView pointDataView;
 
     // Text of the WMO header
-    @XmlAttribute
     @DynamicSerializeElement
     private String wmoHeader;
 
     // the level data
-    @XmlElement
     @DynamicSerializeElement
     @Transient
     private String profilerName;
 
     // the level data
-    @XmlElement
     @DynamicSerializeElement
     @Transient
     private List<ProfilerLevel> levels;
 
-    @XmlAttribute
     @DynamicSerializeElement
     @Transient
     private Double sfcWindSpeed;
 
-    @XmlAttribute
     @DynamicSerializeElement
     @Transient
     private Double sfcWindDir;
@@ -383,75 +353,6 @@ public class ProfilerObs extends PersistablePluginDataObject implements
         return wmoHeader;
     }
 
-    @Override
-    public String getString(String paramName) {
-        String value = null;
-        String pName = PARM_MAP.get(paramName);
-        if (PROF_ID.equals(pName)) {
-            value = profilerId;
-        }
-        return value;
-    }
-
-    @Override
-    public String[] getStrings(String paramName) {
-        return null;
-    }
-
-    @Override
-    public Amount getValue(String paramName) {
-        Amount a = null;
-
-        if (parseParameter(paramName)) {
-            String pName = PARM_MAP.get(parameterName);
-            if (unit.equals(AGL) && (levelId == 0)) {
-                Double dValue = null;
-                if (SFC_WNDSPD.equals(pName)) {
-                    dValue = getSfcWindSpeed();
-                    if (dValue != null) {
-                        a = new Amount(dValue, WIND_SPEED_UNIT);
-                    }
-                } else if (SFC_WNDDIR.equals(pName)) {
-                    dValue = getSfcWindDir();
-                    if (dValue != null) {
-                        a = new Amount(dValue, WIND_DIR_UNIT);
-                    }
-                }
-            } else {
-                if ((pName != null) && (levels != null) && (levels.size() > 0)) {
-                    profLevel = getLevel(levelId);
-                    if (profLevel != null) {
-                        Double dValue = null;
-                        if (SFC_WNDSPD.equals(pName)) {
-                            dValue = getWindSpeed();
-                            if (dValue != null) {
-                                a = new Amount(dValue, WIND_SPEED_UNIT);
-                            }
-                        } else if (SFC_WNDDIR.equals(pName)) {
-                            dValue = getWindDirection();
-                            if (dValue != null) {
-                                a = new Amount(dValue, WIND_DIR_UNIT);
-                            }
-                        }
-                    }
-                }
-            }
-        } else {
-            String pName = PARM_MAP.get(paramName);
-            if (STA_LAT.equals(pName)) {
-                a = new Amount(getLatitude(), LOCATION_UNIT);
-            } else if (STA_LON.equals(pName)) {
-                a = new Amount(getLongitude(), LOCATION_UNIT);
-            }
-        }
-        return a;
-    }
-
-    @Override
-    public Collection<Amount> getValues(String paramName) {
-        return null;
-    }
-
     /**
      * Get the WMOHeader of the file that contained this data.
      * 
@@ -508,17 +409,6 @@ public class ProfilerObs extends PersistablePluginDataObject implements
         this.levels = levels;
     }
 
-    /**
-     * Get the IDecoderGettable interface implementation. This class does not
-     * currently support this interface.
-     * 
-     * @return Returns null.
-     */
-    @Override
-    public IDecoderGettable getDecoderGettable() {
-        return this;
-    }
-
     @Override
     public SurfaceObsLocation getSpatialObject() {
         return location;

edexOsgi/com.raytheon.uf.common.dataplugin.qc/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject

@@ -1 +0,0 @@
-com.raytheon.uf.common.dataplugin.qc.QCRecord

edexOsgi/com.raytheon.uf.common.dataplugin.qpf/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject

@@ -1 +0,0 @@
-com.raytheon.uf.common.dataplugin.qpf.QPFRecord

edexOsgi/com.raytheon.uf.common.dataplugin.qpf/src/com/raytheon/uf/common/dataplugin/qpf/QPFRecord.java

@@ -29,10 +29,6 @@ import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import javax.persistence.UniqueConstraint;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
 
 import org.geotools.coverage.grid.GeneralGridEnvelope;
 import org.geotools.coverage.grid.GridGeometry2D;
@@ -40,7 +36,6 @@ import org.geotools.geometry.GeneralEnvelope;
 import org.hibernate.annotations.Index;
 import org.opengis.referencing.crs.ProjectedCRS;
 
-import com.raytheon.uf.common.dataplugin.IDecoderGettable;
 import com.raytheon.uf.common.dataplugin.PluginDataObject;
 import com.raytheon.uf.common.dataplugin.annotations.DataURI;
 import com.raytheon.uf.common.dataplugin.persist.PersistablePluginDataObject;
@@ -74,6 +69,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
  * May 07, 2013 1869        bsteffen    Remove dataURI column from
  *                                      PluginDataObject.
  * Aug 30, 2013 2298        rjpeter     Make getPluginName abstract
+ * Oct 14, 2013 2361        njensen     Removed XML annotations
  * 
  * </pre>
  * 
@@ -89,8 +85,6 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
  */
 @org.hibernate.annotations.Table(appliesTo = "qpf", indexes = { @Index(name = "qpf_refTimeIndex", columnNames = {
         "refTime", "forecastTime" }) })
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.NONE)
 @DynamicSerialize
 public class QPFRecord extends PersistablePluginDataObject implements
         ISpatialEnabled, IMonitorProcessing {
@@ -100,59 +94,48 @@ public class QPFRecord extends PersistablePluginDataObject implements
     @Column(length = 7)
     @DataURI(position = 1)
     @DynamicSerializeElement
-    @XmlElement(nillable = false)
     private String icao;
 
     @Column(length = 30)
     @DataURI(position = 2)
     @DynamicSerializeElement
-    @XmlElement(nillable = false)
     private String fieldName;
 
     @ManyToOne
     @PrimaryKeyJoinColumn
-    @XmlElement
     @DynamicSerializeElement
     private RadarStation spatialInfo;
 
     @Column
     @DynamicSerializeElement
-    @XmlElement(nillable = false)
     public Integer nx = 0;
 
     @Column
     @DynamicSerializeElement
-    @XmlElement(nillable = false)
     public Integer ny = 0;
 
     @Column
     @DynamicSerializeElement
-    @XmlElement(nillable = false)
     public Integer dx = 0;
 
     @Column
     @DynamicSerializeElement
-    @XmlElement(nillable = false)
     public Integer dy = 0;
 
     @Column
     @DynamicSerializeElement
-    @XmlElement(nillable = false)
     public Float nsvelocity = 0.0f;
 
     @Column
     @DynamicSerializeElement
-    @XmlElement(nillable = false)
     public Float ewvelocity = 0.0f;
 
     @Column
     @DynamicSerializeElement
-    @XmlElement(nillable = false)
     public Float avgdir = 0.0f;
 
     @Column
     @DynamicSerializeElement
-    @XmlElement(nillable = false)
     public Float avgspd = 0.0f;
 
     @Transient
@@ -423,17 +406,6 @@ public class QPFRecord extends PersistablePluginDataObject implements
         return avgdir;
     }
 
-    /**
-     * Get the IDecoderGettable reference for this record.
-     * 
-     * @return The IDecoderGettable reference for this record. Null for this
-     *         class.
-     */
-    @Override
-    public IDecoderGettable getDecoderGettable() {
-        return null;
-    }
-
     public RadarStation getSpatialInfo() {
         return spatialInfo;
     }

edexOsgi/com.raytheon.uf.common.dataplugin.scan/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject

@@ -1 +0,0 @@
-com.raytheon.uf.common.dataplugin.scan.ScanRecord

edexOsgi/com.raytheon.uf.common.dataplugin.scan/src/com/raytheon/uf/common/dataplugin/scan/ScanRecord.java

@@ -30,15 +30,10 @@ import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import javax.persistence.UniqueConstraint;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
 
 import org.geotools.coverage.grid.GridGeometry2D;
 import org.hibernate.annotations.Index;
 
-import com.raytheon.uf.common.dataplugin.IDecoderGettable;
 import com.raytheon.uf.common.dataplugin.PluginDataObject;
 import com.raytheon.uf.common.dataplugin.annotations.DataURI;
 import com.raytheon.uf.common.dataplugin.persist.PersistablePluginDataObject;
@@ -78,6 +73,7 @@ import com.raytheon.uf.common.status.UFStatus.Priority;
  *                                      PluginDataObject.
  * Aug 06, 2013 2228        njensen     Use deserialize(byte[])
  * Aug 30, 2013 2298        rjpeter     Make getPluginName abstract
+ * Oct 14, 2013 2361        njensen     Removed XML annotations
  * 
  * </pre>
  * 
@@ -94,8 +90,6 @@ import com.raytheon.uf.common.status.UFStatus.Priority;
  */
 @org.hibernate.annotations.Table(appliesTo = "scan", indexes = { @Index(name = "scan_refTimeIndex", columnNames = {
         "refTime", "forecastTime" }) })
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.NONE)
 @DynamicSerialize
 public class ScanRecord extends PersistablePluginDataObject {
 
@@ -110,19 +104,16 @@ public class ScanRecord extends PersistablePluginDataObject {
     @Column(length = 7)
     @DataURI(position = 1)
     @DynamicSerializeElement
-    @XmlElement(nillable = false)
     private String icao;
 
     @Column(length = 7)
     @DataURI(position = 2)
     @DynamicSerializeElement
-    @XmlElement(nillable = false)
     private String type;
 
     @Column(length = 7)
     @DataURI(position = 3)
     @DynamicSerializeElement
-    @XmlElement(nillable = false)
     private double tilt;
 
     @Transient
@@ -130,12 +121,10 @@ public class ScanRecord extends PersistablePluginDataObject {
 
     @Column
     @DynamicSerializeElement
-    @XmlElement(nillable = false)
     public Date volScanTime = null;
 
     @Column
     @DynamicSerializeElement
-    @XmlElement(nillable = false)
     private boolean lastElevationAngle;
 
     /** table data **/
@@ -158,12 +147,6 @@ public class ScanRecord extends PersistablePluginDataObject {
         super(uri);
     }
 
-    @Override
-    public IDecoderGettable getDecoderGettable() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
     /**
      * Gets the type of Table
      * 

edexOsgi/com.raytheon.uf.common.dataplugin.svrwx/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject

@@ -1 +0,0 @@
-com.raytheon.uf.common.dataplugin.svrwx.SvrWxRecord

edexOsgi/com.raytheon.uf.common.dataplugin.svrwx/src/com/raytheon/uf/common/dataplugin/svrwx/SvrWxRecord.java

@@ -30,14 +30,9 @@ import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import javax.persistence.UniqueConstraint;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
 
 import org.hibernate.annotations.Index;
 
-import com.raytheon.uf.common.dataplugin.IDecoderGettable;
 import com.raytheon.uf.common.dataplugin.PluginDataObject;
 import com.raytheon.uf.common.dataplugin.annotations.DataURI;
 import com.raytheon.uf.common.dataplugin.persist.PersistablePluginDataObject;
@@ -50,7 +45,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
 import com.vividsolutions.jts.geom.Geometry;
 
 /**
- * 
+ * Pointdata for severe weather
  * 
  * <pre>
  * 
@@ -64,6 +59,7 @@ import com.vividsolutions.jts.geom.Geometry;
  * May 07, 2013 1869       bsteffen    Remove dataURI column from
  *                                     PluginDataObject.
  * Aug 30, 2013 2298       rjpeter     Make getPluginName abstract
+ * Oct 14, 2013 2361       njensen     Remove XML annotations
  * 
  * </pre>
  * 
@@ -79,8 +75,6 @@ import com.vividsolutions.jts.geom.Geometry;
  */
 @org.hibernate.annotations.Table(appliesTo = "svrwx", indexes = { @Index(name = "svrwx_refTimeIndex", columnNames = {
         "refTime", "forecastTime" }) })
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.NONE)
 @DynamicSerialize
 public class SvrWxRecord extends PersistablePluginDataObject implements
         ISpatialEnabled, IPointData {
@@ -93,34 +87,28 @@ public class SvrWxRecord extends PersistablePluginDataObject implements
 
     // Text of the WMO header
     @Transient
-    @XmlElement
     @DynamicSerializeElement
     private String wmoHeader = "";
 
     @Embedded
     @DataURI(position = 2, embedded = true)
-    @XmlElement
     @DynamicSerializeElement
     private SurfaceObsLocation location;
 
     @Transient
-    @XmlElement
     @DynamicSerializeElement
     protected String eventKey;
 
-    @XmlElement
     @DynamicSerializeElement
     @Column
     @DataURI(position = 1)
     protected String reportType;
 
     @Transient
-    @XmlElement
     @DynamicSerializeElement
     protected String details;
 
     @Transient
-    @XmlElement
     @DynamicSerializeElement
     protected String greenTime;
 
@@ -165,11 +153,6 @@ public class SvrWxRecord extends PersistablePluginDataObject implements
         identifier = dataURI;
     }
 
-    @Override
-    public IDecoderGettable getDecoderGettable() {
-        return null;
-    }
-
     @Override
     public SurfaceObsLocation getSpatialObject() {
         return location;

edexOsgi/com.raytheon.uf.common.dataplugin.tcg/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject

@@ -1 +0,0 @@
-com.raytheon.uf.common.dataplugin.tcg.TropicalCycloneGuidance

edexOsgi/com.raytheon.uf.common.dataplugin.tcg/src/com/raytheon/uf/common/dataplugin/tcg/TropicalCycloneGuidance.java

@@ -30,14 +30,9 @@ import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import javax.persistence.UniqueConstraint;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
 
 import org.hibernate.annotations.Index;
 
-import com.raytheon.uf.common.dataplugin.IDecoderGettable;
 import com.raytheon.uf.common.dataplugin.PluginDataObject;
 import com.raytheon.uf.common.dataplugin.annotations.DataURI;
 import com.raytheon.uf.common.dataplugin.persist.PersistablePluginDataObject;
@@ -64,6 +59,7 @@ import com.vividsolutions.jts.geom.Geometry;
  * May 07, 2013 1869       bsteffen    Remove dataURI column from
  *                                     PluginDataObject.
  * Aug 30, 2013 2298       rjpeter     Make getPluginName abstract
+ * Oct 15, 2013 2361       njensen     Removed XML annotations
  * 
  * </pre>
  * 
@@ -79,8 +75,6 @@ import com.vividsolutions.jts.geom.Geometry;
  */
 @org.hibernate.annotations.Table(appliesTo = "tcg", indexes = { @Index(name = "tcg_refTimeIndex", columnNames = {
         "refTime", "forecastTime" }) })
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.NONE)
 @DynamicSerialize
 public class TropicalCycloneGuidance extends PersistablePluginDataObject
         implements ISpatialEnabled, IPointData {
@@ -93,22 +87,18 @@ public class TropicalCycloneGuidance extends PersistablePluginDataObject
 
     // Text of the WMO header
     @Transient
-    @XmlElement
     @DynamicSerializeElement
     private String wmoHeader = "";
 
-    @XmlElement
     @DynamicSerializeElement
     @Transient
     protected String stormName;
 
-    @XmlElement
     @DynamicSerializeElement
     @DataURI(position = 1)
     @Column
     protected String productType = "";
 
-    @XmlElement
     @DynamicSerializeElement
     @DataURI(position = 2)
     @Column
@@ -116,12 +106,10 @@ public class TropicalCycloneGuidance extends PersistablePluginDataObject
 
     @Embedded
     @DataURI(position = 3, embedded = true)
-    @XmlElement
     @DynamicSerializeElement
     private SurfaceObsLocation location;
 
     @Transient
-    @XmlElement
     @DynamicSerializeElement
     protected TCGStormType type = TCGStormType.UNKNOWN;
 
@@ -174,11 +162,6 @@ public class TropicalCycloneGuidance extends PersistablePluginDataObject
         identifier = dataURI;
     }
 
-    @Override
-    public IDecoderGettable getDecoderGettable() {
-        return null;
-    }
-
     @Override
     public SurfaceObsLocation getSpatialObject() {
         return location;

edexOsgi/com.raytheon.uf.common.dataplugin.vil/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject

@@ -1 +0,0 @@
-com.raytheon.uf.common.dataplugin.vil.VILRecord

edexOsgi/com.raytheon.uf.common.dataplugin.vil/src/com/raytheon/uf/common/dataplugin/vil/VILRecord.java

@@ -29,10 +29,6 @@ import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import javax.persistence.UniqueConstraint;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
 
 import org.geotools.coverage.grid.GeneralGridEnvelope;
 import org.geotools.coverage.grid.GridGeometry2D;
@@ -40,7 +36,6 @@ import org.geotools.geometry.GeneralEnvelope;
 import org.hibernate.annotations.Index;
 import org.opengis.referencing.crs.ProjectedCRS;
 
-import com.raytheon.uf.common.dataplugin.IDecoderGettable;
 import com.raytheon.uf.common.dataplugin.PluginDataObject;
 import com.raytheon.uf.common.dataplugin.annotations.DataURI;
 import com.raytheon.uf.common.dataplugin.persist.PersistablePluginDataObject;
@@ -71,6 +66,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
  * May 07, 2013 1869        bsteffen    Remove dataURI column from
  *                                      PluginDataObject.
  * Aug 30, 2013 2298        rjpeter     Make getPluginName abstract
+ * Oct 14, 2013 2361        njensen     Removed XML annotations
  * 
  * </pre>
  * 
@@ -86,8 +82,6 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
  */
 @org.hibernate.annotations.Table(appliesTo = "vil", indexes = { @Index(name = "vil_refTimeIndex", columnNames = {
         "refTime", "forecastTime" }) })
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.NONE)
 @DynamicSerialize
 public class VILRecord extends PersistablePluginDataObject implements
         ISpatialEnabled {
@@ -99,39 +93,32 @@ public class VILRecord extends PersistablePluginDataObject implements
     @Column(length = 7)
     @DataURI(position = 1)
     @DynamicSerializeElement
-    @XmlElement(nillable = false)
     private String icao;
 
     @Column(length = 30)
     @DataURI(position = 2)
     @DynamicSerializeElement
-    @XmlElement(nillable = false)
     private String fieldName;
 
     @ManyToOne
     @PrimaryKeyJoinColumn
-    @XmlElement
     @DynamicSerializeElement
     private RadarStation spatialInfo;
 
     @Column
     @DynamicSerializeElement
-    @XmlElement(nillable = false)
     public Integer nx = 0;
 
     @Column
     @DynamicSerializeElement
-    @XmlElement(nillable = false)
     public Integer ny = 0;
 
     @Column
     @DynamicSerializeElement
-    @XmlElement(nillable = false)
     public Integer dx = 0;
 
     @Column
     @DynamicSerializeElement
-    @XmlElement(nillable = false)
     public Integer dy = 0;
 
     @Transient
@@ -329,17 +316,6 @@ public class VILRecord extends PersistablePluginDataObject implements
         return dy;
     }
 
-    /**
-     * Get the IDecoderGettable reference for this record.
-     * 
-     * @return The IDecoderGettable reference for this record. Null for this
-     *         class.
-     */
-    @Override
-    public IDecoderGettable getDecoderGettable() {
-        return null;
-    }
-
     public RadarStation getSpatialInfo() {
         return spatialInfo;
     }

edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/IDecoderGettable.java

@@ -37,12 +37,17 @@ import javax.measure.unit.Unit;
  * ------------ ---------- ----------- --------------------------
  * 20071129            472 jkorman     Initial Coding.
  * 20090402            952 jsanchez    Added PIREP constants.
+ * Oct 14, 2013 2361       njensen     Deprecated
  * 
  * </pre>
  * 
  * @author jkorman
  * @version 1.0
+ * @deprecated With the pointdata APIs, this class is deprecated. Anything using
+ *             this should be removed from the system or converted to use the
+ *             pointdata APIs.
  */
+@Deprecated
 public interface IDecoderGettable {
 
     public static class Amount {
@@ -147,19 +152,19 @@ public interface IDecoderGettable {
     public static final String UA_PRESSURE = "UA.PRESSURE";
 
     public static final String UA_GEOHGT = "UA.GEOPOTENTIAL_HGT";
-    
+
     public static final String UA_FLTLVL = "UA.FLT_LVL";
-    
+
     public static final String UA_ICETYPE = "UA.ICE_TYPE";
-    
+
     public static final String UA_ICEINTENSE = "UA.ICE_INTENSITY";
-    
+
     public static final String UA_TURBFREQ = "UA.TURB_FREQ";
-    
+
     public static final String UA_TURBINTENSE = "UA.TURB_INTENSITY";
-    
+
     public static final String UA_TOPHGT = "UA.TOP_HGT";
-    
+
     public static final String UA_BOTHGT = "UA.BOTTOM_HGT";
 
 }

edexOsgi/com.raytheon.uf.common.tafqueue/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject

@@ -1 +0,0 @@
-com.raytheon.uf.common.tafqueue.TafQueueRecord

edexOsgi/com.raytheon.uf.common.tafqueue/src/com/raytheon/uf/common/tafqueue/TafQueueRecord.java

@@ -34,12 +34,11 @@ import javax.persistence.Table;
 import org.hibernate.annotations.Index;
 
 import com.raytheon.uf.common.dataplugin.persist.IPersistableDataObject;
-import com.raytheon.uf.common.serialization.ISerializableObject;
 import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
 import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
 
 /**
- * TODO Add Description
+ * A record corresponding to a TAF ready to be sent
  * 
  * <pre>
  * 
@@ -59,7 +58,8 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
 @Table(name = "taf_queue")
 @DynamicSerialize
 public class TafQueueRecord implements IPersistableDataObject,
-        ISerializableObject, Comparable<TafQueueRecord> {
+        Comparable<TafQueueRecord> {
+
     private static final long serialVersionUID = 1L;
 
     public enum TafQueueState {
@@ -118,9 +118,9 @@ public class TafQueueRecord implements IPersistableDataObject,
     @Column
     private boolean display;
 
-	public TafQueueRecord() {
+    public TafQueueRecord() {
-		super();
+        super();
-	}
+    }
 
     /**
      * Construct a record with the desired values.
@@ -158,10 +158,13 @@ public class TafQueueRecord implements IPersistableDataObject,
      * @return info
      */
     public String getInfo() {
-    	String productTag = "TAF";
+        String productTag = "TAF";
-    	if ( forecasterId == TafQueueVftConfigMgr.getInstance().getFcstid() ) { // for VFT product (DR15375)
+        if (forecasterId == TafQueueVftConfigMgr.getInstance().getFcstid()) { // for
-    		productTag = "VFT";
+                                                                              // VFT
-    	}
+                                                                              // product
+                                                                              // (DR15375)
+            productTag = "VFT";
+        }
         return String
                 .format("%1$03d-%7$s%8$s%5$s-%6$s-%7$s-%2$ty%2$tm%2$td%2$tH%2$tM-%4$s-%9$d",
                         forecasterId, headerTime, tafText, bbb, siteId, wmoId,