xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Issue #2361 remove XML annotations from TAF and CCFP" into development

Browse source 
Former-commit-id: 2ee0cfe872 [formerly 8688681a8a] [formerly a72197e828] [formerly 2ee0cfe872 [formerly 8688681a8a] [formerly a72197e828] [formerly 3ef349882c [formerly a72197e828 [formerly 0a74b17463864bb9fb50b4e9450592b04a4dd481]]]]
Former-commit-id: 3ef349882c
Former-commit-id: c8e354e52a [formerly 823de65f07] [formerly e0223b638af06335d366d69114aeb47d9cfde773 [formerly 6bab0640a7]]
Former-commit-id: b5f611f62bb168b475509332b2b6fd682e38c08a [formerly bdadadec83]
Former-commit-id: 3e4f5cdc53
This commit is contained in:
Nate Jensen 2013-11-04 11:48:04 -06:00 • committed by Gerrit Code Review
commit 0648e10011
12 changed files with 21 additions and 164 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
edexOsgi/com.raytheon.edex.plugin.ccfp/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
View file

@ -1,2 +0,0 @@
com.raytheon.edex.plugin.ccfp.CcfpRecord
com.raytheon.edex.plugin.ccfp.CcfpLocation

10
edexOsgi/com.raytheon.edex.plugin.ccfp/src/com/raytheon/edex/plugin/ccfp/CcfpLocation.java
View file

@ -22,17 +22,12 @@ package com.raytheon.edex.plugin.ccfp;
import javax.persistence.Column;
import javax.persistence.Embeddable;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.hibernate.annotations.Type;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import com.raytheon.uf.common.dataplugin.annotations.DataURI;
import com.raytheon.uf.common.geospatial.ISpatialObject;
import com.raytheon.uf.common.serialization.adapters.GeometryAdapter;
import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
import com.vividsolutions.jts.geom.Geometry;
@ -50,6 +45,7 @@ import com.vividsolutions.jts.geom.Geometry;
* Sep 17, 2009 3072 bsteffen Fixed type of geometry
* Jul 16, 2013 2181 bsteffen Convert geometry types to use hibernate-
* spatial
* Nov 01, 2013 2361 njensen Remove XML annotations
*
*
* </pre>
@ -58,7 +54,6 @@ import com.vividsolutions.jts.geom.Geometry;
* @version 1
*/
@Embeddable
@XmlAccessorType(XmlAccessType.NONE)
@DynamicSerialize
public class CcfpLocation implements ISpatialObject {
@ -66,20 +61,17 @@ public class CcfpLocation implements ISpatialObject {
@Column(name = "location")
@Type(type = "org.hibernatespatial.GeometryUserType")
@XmlJavaTypeAdapter(value = GeometryAdapter.class)
@DynamicSerializeElement
private Geometry geometry;
@DataURI(position = 0)
@Column
@DynamicSerializeElement
@XmlElement
private double boxLat;
@DataURI(position = 1)
@Column
@DynamicSerializeElement
@XmlElement
private double boxLong;
@Override

24
edexOsgi/com.raytheon.edex.plugin.ccfp/src/com/raytheon/edex/plugin/ccfp/CcfpRecord.java
View file

@ -28,15 +28,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.geospatial.ISpatialEnabled;
@ -61,6 +55,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
* Nov 01, 2013 2361 njensen Remove XML annotations
*
*
* </pre>
@ -77,8 +72,6 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
*/
@org.hibernate.annotations.Table(appliesTo = "ccfp", indexes = { @Index(name = "ccfp_refTimeIndex", columnNames = {
"refTime", "forecastTime" }) })
@XmlRootElement
@XmlAccessorType(XmlAccessType.NONE)
@DynamicSerialize
public class CcfpRecord extends PluginDataObject implements ISpatialEnabled {
@ -86,48 +79,39 @@ public class CcfpRecord extends PluginDataObject implements ISpatialEnabled {
@DataURI(position = 1)
@Column(length = 8)
@XmlAttribute
@DynamicSerializeElement
private String producttype;
@Column
@XmlAttribute
@DynamicSerializeElement
private Integer coverage;
@Column
@XmlAttribute
@DynamicSerializeElement
private Integer conf;
@Column
@XmlAttribute
@DynamicSerializeElement
private Integer growth;
@Column
@XmlAttribute
@DynamicSerializeElement
private Integer tops;
@Column
@XmlAttribute
@DynamicSerializeElement
private Integer speed;
@Column
@XmlAttribute
@DynamicSerializeElement
private Integer direction;
@Column
@DynamicSerializeElement
@XmlElement
private Boolean canadaflag;
@DataURI(position = 2, embedded = true)
@Embedded
@XmlElement
@DynamicSerializeElement
private CcfpLocation location;
@ -159,12 +143,6 @@ public class CcfpRecord extends PluginDataObject implements ISpatialEnabled {
super(uri);
}
@Override
public IDecoderGettable getDecoderGettable() {
// TODO Auto-generated method stub
return null;
}
public java.lang.String getProducttype() {
return producttype;
}

8
edexOsgi/com.raytheon.edex.plugin.taf/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
View file

@ -1,8 +0,0 @@
com.raytheon.edex.plugin.taf.common.TafRecord
com.raytheon.edex.plugin.taf.common.ChangeGroup
com.raytheon.edex.plugin.taf.common.IcingLayer
com.raytheon.edex.plugin.taf.common.TafPeriod
com.raytheon.edex.plugin.taf.common.TafSkyCover
com.raytheon.edex.plugin.taf.common.TafWeatherCondition
com.raytheon.edex.plugin.taf.common.TemperatureForecast
com.raytheon.edex.plugin.taf.common.TurbulenceLayer

31
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/ChangeGroup.java
View file

@ -58,13 +58,8 @@ import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
import javax.persistence.Table;
import javax.persistence.Transient;
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 com.raytheon.uf.common.dataplugin.persist.PersistableDataObject;
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.time.TimeTools;
@ -86,6 +81,7 @@ import com.raytheon.uf.edex.decodertools.time.TimeTools;
* Oct 21, 2008 1515 jkorman Added 30 Hour capability changes.
* Jun 28, 2012 #827 dgilling Annotate id field for
* serialization.
* Nov 01, 2013 2361 njensen Remove XML annotations
*
* </pre>
*
@ -95,9 +91,7 @@ import com.raytheon.uf.edex.decodertools.time.TimeTools;
@Entity
@Table(name = "taf_change_groups")
@DynamicSerialize
@XmlAccessorType(XmlAccessType.NONE)
public class ChangeGroup extends PersistableDataObject implements
ISerializableObject {
public class ChangeGroup extends PersistableDataObject {
private static final long serialVersionUID = 1L;
@ -124,7 +118,6 @@ public class ChangeGroup extends PersistableDataObject implements
* The period for which the change group conditions apply.
*/
@DynamicSerializeElement
@XmlElement
@Embedded
private TafPeriod tafChangePeriod;
@ -134,7 +127,6 @@ public class ChangeGroup extends PersistableDataObject implements
* and TEMPO change group could share the same start time.
*/
@DynamicSerializeElement
@XmlAttribute
@Column
private Integer sequenceId;
@ -142,7 +134,6 @@ public class ChangeGroup extends PersistableDataObject implements
* The change group indicator i.e. BECMG, FM, TEMPO, etc
*/
@DynamicSerializeElement
@XmlAttribute
@Column(length = 10)
private String change_indicator;
@ -150,61 +141,51 @@ public class ChangeGroup extends PersistableDataObject implements
* The probability percentage for PROB and PROB TEMPO change groups.
*/
@DynamicSerializeElement
@XmlAttribute
@Column
private Integer probability;
/** Wind direction in degrees */
@DynamicSerializeElement
@XmlAttribute
@Column(length = 3)
private String wind_dir_degrees;
/** Wind speed in knots */
@DynamicSerializeElement
@XmlAttribute
@Column
private Integer wind_speed_kt;
/** Wind gust in knots */
@DynamicSerializeElement
@XmlAttribute
@Column
private Integer wind_gust_kt;
/** Wind shear height above ground level */
@DynamicSerializeElement
@XmlAttribute
@Column
private Integer wind_shear_hgt_ft_agl;
/** Wind shear direction in degrees */
@DynamicSerializeElement
@XmlAttribute
@Column
private Integer wind_shear_dir_degrees;
/** Wind shear speed in knots */
@DynamicSerializeElement
@XmlAttribute
@Column
private Integer wind_shear_speed_kt;
/** Visibility (horizontal) in miles */
@DynamicSerializeElement
@XmlAttribute
@Column(length = 8)
private String visibility_mi;
/** Altimeter reading in inches of mercury */
@DynamicSerializeElement
@XmlAttribute
@Column(length = 16)
private String altim_in_hg;
/** Vertical visibility */
@DynamicSerializeElement
@XmlAttribute
@Column(length = 8)
private String vert_vis_ft;
@ -212,48 +193,40 @@ public class ChangeGroup extends PersistableDataObject implements
* Weather and obscurations
*/
@DynamicSerializeElement
@XmlElement
@OneToMany(cascade = CascadeType.ALL, mappedBy = "parentID", fetch = FetchType.EAGER)
private Set<TafWeatherCondition> weather;
/** Sky coverage */
@DynamicSerializeElement
@XmlElement
@OneToMany(cascade = CascadeType.ALL, mappedBy = "parentID", fetch = FetchType.EAGER)
private Set<TafSkyCover> sky_cover;
/** The turbulence layers */
@DynamicSerializeElement
@XmlElement
@OneToMany(cascade = CascadeType.ALL, mappedBy = "parentID", fetch = FetchType.EAGER)
private Set<TurbulenceLayer> turbulence_layers;
/** The icing layers */
@DynamicSerializeElement
@XmlElement
@OneToMany(cascade = CascadeType.ALL, mappedBy = "parentID", fetch = FetchType.EAGER)
private Set<IcingLayer> icing_layers;
/** The temperature forecasts */
@DynamicSerializeElement
@XmlElement
@OneToMany(cascade = CascadeType.ALL, mappedBy = "parentID", fetch = FetchType.EAGER)
private Set<TemperatureForecast> temp_forecasts;
/** Maximum temperature */
@DynamicSerializeElement
@XmlAttribute
@Column
private Integer max_temp_c;
/** Minimum temperature */
@DynamicSerializeElement
@XmlAttribute
@Column
private Integer min_temp_c;
@DynamicSerializeElement
@XmlElement
@Column
private String remarks;

12
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/IcingLayer.java
View file

@ -27,14 +27,10 @@ import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import org.apache.commons.lang.builder.HashCodeBuilder;
import com.raytheon.uf.common.dataplugin.persist.PersistableDataObject;
import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
@ -48,6 +44,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
* ------------ ---------- ----------- --------------------------
* 8/30/06 bphillip Initial Creation
* 6/21/07 180 bphillip Updated for use with plugin persistance pattern
* Nov 01, 2013 2361 njensen Remove XML annotations
*
* </pre>
*
@ -56,10 +53,8 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
*/
@Entity
@Table(name = "taf_icing_layers")
@XmlAccessorType(XmlAccessType.NONE)
@DynamicSerialize
public class IcingLayer extends PersistableDataObject implements
ISerializableObject {
public class IcingLayer extends PersistableDataObject {
@Id
@GeneratedValue
@ -76,19 +71,16 @@ public class IcingLayer extends PersistableDataObject implements
/** The icing intensity */
@DynamicSerializeElement
@XmlAttribute
@Column
private Integer icing_intensity;
/** The minimum altitude for the icing */
@DynamicSerializeElement
@XmlAttribute
@Column
private Integer icing_min_alt_ft_agl;
/** The maximum altitude for the icing */
@DynamicSerializeElement
@XmlAttribute
@Column
private Integer icing_max_alt_ft_agl;

11
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafPeriod.java
View file

@ -25,11 +25,7 @@ import java.util.Calendar;
import javax.persistence.Column;
import javax.persistence.Embeddable;
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.time.TimeTools;
@ -50,6 +46,7 @@ import com.raytheon.uf.edex.wmo.message.WMOHeader;
* 09Dec2003 377 J. Wilwerding Adjust date for month rollover
* 23Mar2005 1055 D. Weeks Modified for use to decode TAFs for JET
* 30Aug2006 B. Phillippe Modified for use to decode TAFs for AWIPS
* Nov 01, 2013 2361 njensen Remove XML annotations
*
* </pre>
*
@ -58,8 +55,7 @@ import com.raytheon.uf.edex.wmo.message.WMOHeader;
*/
@Embeddable
@DynamicSerialize
@XmlAccessorType(XmlAccessType.NONE)
public class TafPeriod implements Serializable, ISerializableObject {
public class TafPeriod implements Serializable {
/**
*
@ -70,14 +66,12 @@ public class TafPeriod implements Serializable, ISerializableObject {
* The forecast valid starting date
*/
@DynamicSerializeElement
@XmlElement
@Column
private Calendar startDate;
// This time is only used for BECMG groups. It marks the end time of the
// BECMG transition period.
@DynamicSerializeElement
@XmlElement
@Column
private Calendar transitionEndDate;
@ -85,7 +79,6 @@ public class TafPeriod implements Serializable, ISerializableObject {
* The forecast valid ending date
*/
@DynamicSerializeElement
@XmlElement
@Column
private Calendar endDate;

30
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java
View file

@ -36,14 +36,9 @@ import javax.persistence.PrimaryKeyJoinColumn;
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.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.geospatial.ISpatialEnabled;
@ -69,6 +64,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
* Nov 01, 2013 2361 njensen Remove XML annotations
*
* </pre>
*
@ -85,8 +81,6 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
@org.hibernate.annotations.Table(appliesTo = TafRecord.PLUGIN_NAME, indexes = { @Index(name = "taf_refTimeIndex", columnNames = {
"refTime", "forecastTime" }) })
@DynamicSerialize
@XmlAccessorType(XmlAccessType.NONE)
@XmlRootElement
public class TafRecord extends PluginDataObject implements ISpatialEnabled {
private static final long serialVersionUID = 1L;
@ -94,70 +88,59 @@ public class TafRecord extends PluginDataObject implements ISpatialEnabled {
public static final String PLUGIN_NAME = "taf";
@DynamicSerializeElement
@XmlElement
@Column
private String wmoHeader;
@DynamicSerializeElement
@XmlElement
@Column(length = 1024)
private String tafText;
// Station Identifier for the data
@DynamicSerializeElement
@XmlElement
@Column
@Index(name = "taf_stationIndex")
@DataURI(position = 1)
private String stationId;
@DynamicSerializeElement
@XmlElement
@Column
@DataURI(position = 2)
private String corIndicator;
@DynamicSerializeElement
@XmlElement
@Column
@DataURI(position = 3)
private String amdIndicator;
/** Issue date */
@DynamicSerializeElement
@XmlElement
@Column
// @DataURI(position = 4)
private Date issue_time;
/** Issue date string */
@DynamicSerializeElement
@XmlElement
@Column
@DataURI(position = 4)
private String issue_timeString;
/** Bulletin issuance time */
@DynamicSerializeElement
@XmlElement
@Column
private Date bulletin_time;
/** Any remarks contained in the TAF record */
@DynamicSerializeElement
@XmlElement
@Column
private String remarks;
/** List of change groups (FM, BECMG, etc.) */
@DynamicSerializeElement
@XmlElement
@OneToMany(cascade = CascadeType.ALL, mappedBy = "parentID", fetch = FetchType.EAGER)
private Set<ChangeGroup> changeGroups = new HashSet<ChangeGroup>();
@ManyToOne
@PrimaryKeyJoinColumn
@XmlElement
@DynamicSerializeElement
protected ObStation location;
@ -354,17 +337,6 @@ public class TafRecord extends PluginDataObject implements ISpatialEnabled {
}
/**
* Get the IDecoderGettable reference for this record.
*
* @return The IDecoderGettable reference for this record. Null for this
* class.
*/
@Override
public IDecoderGettable getDecoderGettable() {
return null;
}
@Override
public ObStation getSpatialObject() {
return location;

12
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafSkyCover.java
View file

@ -27,14 +27,10 @@ import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import org.apache.commons.lang.builder.HashCodeBuilder;
import com.raytheon.uf.common.dataplugin.persist.PersistableDataObject;
import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
@ -49,6 +45,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
* ------------ ---------- ----------- --------------------------
* 6/21/2007 180 Phillippe initial creation.
* 4/16/2008 934 grichard Added toString overridden method.
* Nov 01, 2013 2361 njensen Remove XML annotations
*
* </pre>
*
@ -58,9 +55,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
@Entity
@Table(name = "taf_sky_cover")
@DynamicSerialize
@XmlAccessorType(XmlAccessType.NONE)
public class TafSkyCover extends PersistableDataObject implements
ISerializableObject {
public class TafSkyCover extends PersistableDataObject {
private static final long serialVersionUID = 1L;
@ -75,19 +70,16 @@ public class TafSkyCover extends PersistableDataObject implements
/** The type of sky coverage * */
@DynamicSerializeElement
@XmlAttribute
@Column(length = 3)
private String type;
/** The height of the cloud layer * */
@DynamicSerializeElement
@XmlAttribute
@Column
private Integer height;
// For convective low level cloud - CB
@DynamicSerializeElement
@XmlAttribute
@Column(length = 3)
private String genus;

22
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafWeatherCondition.java
View file

@ -28,14 +28,10 @@ import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.Transient;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import org.apache.commons.lang.builder.HashCodeBuilder;
import com.raytheon.uf.common.dataplugin.persist.PersistableDataObject;
import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
@ -46,10 +42,11 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* 6/21/2007 180 Phillippe Initial creation
* 20081106 1515 jkorman Changed length of &quot;other&quot; attribute.
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* 6/21/2007 180 Phillippe Initial creation
* 20081106 1515 jkorman Changed length of &quot;other&quot; attribute.
* Nov 01, 2013 2361 njensen Remove XML annotations
*
* </pre>
*
@ -59,9 +56,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
@Entity
@Table(name = "taf_weather_conditions")
@DynamicSerialize
@XmlAccessorType(XmlAccessType.NONE)
public class TafWeatherCondition extends PersistableDataObject implements
ISerializableObject {
public class TafWeatherCondition extends PersistableDataObject {
private static final long serialVersionUID = 1L;
@ -76,30 +71,25 @@ public class TafWeatherCondition extends PersistableDataObject implements
/** The intensity proximity notation * */
@DynamicSerializeElement
@XmlAttribute
@Column(length = 2)
private String intensityProximity = "";
/** The descriptor notation * */
@XmlAttribute
@DynamicSerializeElement
@Column(length = 2)
private String descriptor = "";
/** The precipitation notation * */
@XmlAttribute
@DynamicSerializeElement
@Column(length = 2)
private String precipitation = "";
/** The obscuration notation * */
@XmlAttribute
@DynamicSerializeElement
@Column(length = 2)
private String obscuration = "";
/** The other notation * */
@XmlAttribute
@DynamicSerializeElement
@Column(length = 3)
private String other = "";

11
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TemperatureForecast.java
View file

@ -27,14 +27,10 @@ import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import org.apache.commons.lang.builder.HashCodeBuilder;
import com.raytheon.uf.common.dataplugin.persist.PersistableDataObject;
import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
@ -50,6 +46,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
* ------------ ---------- ----------- --------------------------
* 8/30/2006 bphillip Initial Creation
* 6/21/2007 180 bphillip Updated for use with plugin persistence pattern
* Nov 01, 2013 2361 njensen Remove XML annotations
*
* </pre>
*
@ -59,9 +56,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
@Entity
@Table(name = "taf_temperature_forecasts")
@DynamicSerialize
@XmlAccessorType(XmlAccessType.NONE)
public class TemperatureForecast extends PersistableDataObject implements
ISerializableObject {
public class TemperatureForecast extends PersistableDataObject {
@Id
@GeneratedValue
@ -79,13 +74,11 @@ public class TemperatureForecast extends PersistableDataObject implements
/** Temperature valid time */
@DynamicSerializeElement
@XmlAttribute
@Column
private Integer valid_time;
/** Surface temperature */
@DynamicSerializeElement
@XmlAttribute
@Column
private Integer sfc_temp_c;

12
edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TurbulenceLayer.java
View file

@ -27,14 +27,10 @@ import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import org.apache.commons.lang.builder.HashCodeBuilder;
import com.raytheon.uf.common.dataplugin.persist.PersistableDataObject;
import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
@ -48,6 +44,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
* ------------ ---------- ----------- --------------------------
* 8/30/2006 bphillip Initial Creation
* 6/21/2007 bphillip Updated for use with plugin persistance pattern
* Nov 01, 2013 2361 njensen Remove XML annotations
*
* </pre>
*
@ -57,9 +54,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
@Entity
@Table(name = "taf_turbulence_layers")
@DynamicSerialize
@XmlAccessorType(XmlAccessType.NONE)
public class TurbulenceLayer extends PersistableDataObject implements
ISerializableObject {
public class TurbulenceLayer extends PersistableDataObject {
/**
*
@ -76,19 +71,16 @@ public class TurbulenceLayer extends PersistableDataObject implements
/** The intensity of the turbulence */
@DynamicSerializeElement
@XmlAttribute
@Column
private Integer turbulence_intensity;
/** The minimum altitude for the turbulence */
@DynamicSerializeElement
@XmlAttribute
@Column
private Integer turbulence_min_alt_ft_agl;
/** The maximum altitude for the turbulence */
@DynamicSerializeElement
@XmlAttribute
@Column
private Integer turbulence_max_alt_ft_agl;