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

Issue #2361 remove XML annotations from bufrmos

Browse source 
Former-commit-id: e7f7b77e3c [formerly b1409d4002] [formerly 9b9d57bc94] [formerly e7f7b77e3c [formerly b1409d4002] [formerly 9b9d57bc94] [formerly 1a25186415 [formerly 9b9d57bc94 [formerly f6a873e20e4cb7ce6fb47654ce3292b4f3bab99e]]]]
Former-commit-id: 1a25186415
Former-commit-id: 73117fd1ce [formerly 173bff3eb8] [formerly 5eae392eb0ff88203cd5c173328a6f33e1e2156c [formerly b2847dd446]]
Former-commit-id: fbca2b170b41c30a43dbb4cdcda61022e00eec41 [formerly e1ecfb468a]
Former-commit-id: 7f50ec893e
This commit is contained in:
Nate Jensen 2013-11-04 13:34:01 -06:00
parent 4dfe17eca2
commit e2421889af
10 changed files with 9 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,9 +0,0 @@
com.raytheon.edex.plugin.bufrmos.common.BufrMosData
com.raytheon.edex.plugin.bufrmos.common.BufrMosDataLocation
com.raytheon.edex.plugin.bufrmos.common.BufrMosAvnData
com.raytheon.edex.plugin.bufrmos.common.BufrMosEtaData
com.raytheon.edex.plugin.bufrmos.common.BufrMosGfsData
com.raytheon.edex.plugin.bufrmos.common.BufrMosHpcData
com.raytheon.edex.plugin.bufrmos.common.BufrMosLampData
com.raytheon.edex.plugin.bufrmos.common.BufrMosMrfData
com.raytheon.edex.plugin.bufrmos.common.BufrMosNgmData

6
edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosAvnData.java
View file

@ -26,9 +26,6 @@ import javax.persistence.Entity;
import javax.persistence.SequenceGenerator; import javax.persistence.SequenceGenerator;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.UniqueConstraint; import javax.persistence.UniqueConstraint;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import org.hibernate.annotations.Index; import org.hibernate.annotations.Index;
@ -53,6 +50,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
* May 14, 2013 1869 bsteffen Remove DataURI column from bufrmos. * May 14, 2013 1869 bsteffen Remove DataURI column from bufrmos.
* Aug 19, 2013 2275 bsteffen Add dataURI column back into bufrmos * Aug 19, 2013 2275 bsteffen Add dataURI column back into bufrmos
* types. * types.
* Nov 04, 2013 2361 njensen Remove XML annotations
* *
* </pre> * </pre>
* *
@ -73,8 +71,6 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
@Index(name = "bufrmosAvn_refTimeIndex", columnNames = { "refTime", "forecastTime" } ) @Index(name = "bufrmosAvn_refTimeIndex", columnNames = { "refTime", "forecastTime" } )
} }
) )
@XmlRootElement
@XmlAccessorType(XmlAccessType.NONE)
@DynamicSerialize @DynamicSerialize
public class BufrMosAvnData extends BufrMosData { public class BufrMosAvnData extends BufrMosData {
@Override @Override

10
edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosData.java
View file

@ -28,11 +28,6 @@ import javax.persistence.MappedSuperclass;
import javax.persistence.PrimaryKeyJoinColumn; import javax.persistence.PrimaryKeyJoinColumn;
import javax.persistence.SequenceGenerator; import javax.persistence.SequenceGenerator;
import javax.persistence.Transient; 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 javax.xml.bind.annotation.XmlRootElement;
import com.raytheon.uf.common.dataplugin.PluginDataObject; import com.raytheon.uf.common.dataplugin.PluginDataObject;
import com.raytheon.uf.common.dataplugin.annotations.DataURI; import com.raytheon.uf.common.dataplugin.annotations.DataURI;
@ -59,6 +54,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
* Entity annotation to MappedSuperClass. * Entity annotation to MappedSuperClass.
* May 14, 2013 1869 bsteffen Remove DataURI column from bufrmos. * May 14, 2013 1869 bsteffen Remove DataURI column from bufrmos.
* Aug 30, 2013 2298 rjpeter Make getPluginName abstract * Aug 30, 2013 2298 rjpeter Make getPluginName abstract
* Nov 04, 2013 2361 njensen Remove XML annotations
* *
* </pre> * </pre>
* *
@ -68,8 +64,6 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
@MappedSuperclass @MappedSuperclass
@SequenceGenerator(name = PluginDataObject.ID_GEN) @SequenceGenerator(name = PluginDataObject.ID_GEN)
@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS)
@XmlRootElement
@XmlAccessorType(XmlAccessType.NONE)
@DynamicSerialize @DynamicSerialize
public abstract class BufrMosData extends PersistablePluginDataObject implements public abstract class BufrMosData extends PersistablePluginDataObject implements
IPersistable, IPointData { IPersistable, IPointData {
@ -84,7 +78,6 @@ public abstract class BufrMosData extends PersistablePluginDataObject implements
// Text of the WMO header // Text of the WMO header
@Transient @Transient
@XmlAttribute
@DynamicSerializeElement @DynamicSerializeElement
private String wmoHeader; private String wmoHeader;
@ -95,7 +88,6 @@ public abstract class BufrMosData extends PersistablePluginDataObject implements
@ManyToOne(cascade = { CascadeType.REFRESH }) @ManyToOne(cascade = { CascadeType.REFRESH })
@PrimaryKeyJoinColumn @PrimaryKeyJoinColumn
@DataURI(position = 1, embedded = true) @DataURI(position = 1, embedded = true)
@XmlElement
@DynamicSerializeElement @DynamicSerializeElement
private BufrMosDataLocation location; private BufrMosDataLocation location;

10
edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosDataLocation.java
View file

@ -24,10 +24,6 @@ import javax.persistence.Entity;
import javax.persistence.Id; import javax.persistence.Id;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.UniqueConstraint; 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.XmlRootElement;
import org.hibernate.annotations.Index; import org.hibernate.annotations.Index;
@ -49,6 +45,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
* Jun 28, 2012 827 dgilling Annotate id field for serialization. * Jun 28, 2012 827 dgilling Annotate id field for serialization.
* Jul 26, 2013 1051 bsteffen Discard bufrmos data with invalid * Jul 26, 2013 1051 bsteffen Discard bufrmos data with invalid
* location. * location.
* Nov 04, 2013 2361 njensen Remove XML annotations
* *
* </pre> * </pre>
* *
@ -58,8 +55,6 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
@Entity @Entity
@Table(name = "bufrmos_location", uniqueConstraints = { @UniqueConstraint(columnNames = { @Table(name = "bufrmos_location", uniqueConstraints = { @UniqueConstraint(columnNames = {
"stationId", "latitude", "longitude" }) }) "stationId", "latitude", "longitude" }) })
@XmlRootElement
@XmlAccessorType(XmlAccessType.NONE)
@DynamicSerialize @DynamicSerialize
public class BufrMosDataLocation extends PersistableDataObject { public class BufrMosDataLocation extends PersistableDataObject {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ -73,19 +68,16 @@ public class BufrMosDataLocation extends PersistableDataObject {
@Column(length = 48) @Column(length = 48)
@Index(name = "mosLocationStationIndex") @Index(name = "mosLocationStationIndex")
@DataURI(position = 0) @DataURI(position = 0)
@XmlAttribute
@DynamicSerializeElement @DynamicSerializeElement
private String stationId; private String stationId;
@DataURI(position = 1) @DataURI(position = 1)
@Column @Column
@XmlAttribute
@DynamicSerializeElement @DynamicSerializeElement
private Double latitude; private Double latitude;
@DataURI(position = 2) @DataURI(position = 2)
@Column @Column
@XmlAttribute
@DynamicSerializeElement @DynamicSerializeElement
private Double longitude; private Double longitude;

6
edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosEtaData.java
View file

@ -26,9 +26,6 @@ import javax.persistence.Entity;
import javax.persistence.SequenceGenerator; import javax.persistence.SequenceGenerator;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.UniqueConstraint; import javax.persistence.UniqueConstraint;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import org.hibernate.annotations.Index; import org.hibernate.annotations.Index;
@ -49,6 +46,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
* Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation.
* May 07, 2013 1869 bsteffen Remove dataURI column from * May 07, 2013 1869 bsteffen Remove dataURI column from
* PluginDataObject. * PluginDataObject.
* Nov 04, 2013 2361 njensen Remove XML annotations
* *
* </pre> * </pre>
* *
@ -68,8 +66,6 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
@Index(name = "bufrmosEta_refTimeIndex", columnNames = { "refTime", "forecastTime" } ) @Index(name = "bufrmosEta_refTimeIndex", columnNames = { "refTime", "forecastTime" } )
} }
) )
@XmlRootElement
@XmlAccessorType(XmlAccessType.NONE)
@DynamicSerialize @DynamicSerialize
public class BufrMosEtaData extends BufrMosData { public class BufrMosEtaData extends BufrMosData {
@Override @Override

6
edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosGfsData.java
View file

@ -26,9 +26,6 @@ import javax.persistence.Entity;
import javax.persistence.SequenceGenerator; import javax.persistence.SequenceGenerator;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.UniqueConstraint; import javax.persistence.UniqueConstraint;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import org.hibernate.annotations.Index; import org.hibernate.annotations.Index;
@ -49,6 +46,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
* Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation.
* May 07, 2013 1869 bsteffen Remove dataURI column from * May 07, 2013 1869 bsteffen Remove dataURI column from
* PluginDataObject. * PluginDataObject.
* Nov 04, 2013 2361 njensen Remove XML annotations
* *
* </pre> * </pre>
* *
@ -68,8 +66,6 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
@Index(name = "bufrmosGfs_refTimeIndex", columnNames = { "refTime", "forecastTime" } ) @Index(name = "bufrmosGfs_refTimeIndex", columnNames = { "refTime", "forecastTime" } )
} }
) )
@XmlRootElement
@XmlAccessorType(XmlAccessType.NONE)
@DynamicSerialize @DynamicSerialize
public class BufrMosGfsData extends BufrMosData { public class BufrMosGfsData extends BufrMosData {
@Override @Override

6
edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosHpcData.java
View file

@ -26,9 +26,6 @@ import javax.persistence.Entity;
import javax.persistence.SequenceGenerator; import javax.persistence.SequenceGenerator;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.UniqueConstraint; import javax.persistence.UniqueConstraint;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import org.hibernate.annotations.Index; import org.hibernate.annotations.Index;
@ -53,6 +50,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
* May 14, 2013 1869 bsteffen Remove DataURI column from bufrmos. * May 14, 2013 1869 bsteffen Remove DataURI column from bufrmos.
* Aug 19, 2013 2275 bsteffen Add dataURI column back into bufrmos * Aug 19, 2013 2275 bsteffen Add dataURI column back into bufrmos
* types. * types.
* Nov 04, 2013 2361 njensen Remove XML annotations
* *
* </pre> * </pre>
* *
@ -73,8 +71,6 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
@Index(name = "bufrmosHpc_refTimeIndex", columnNames = { "refTime", "forecastTime" } ) @Index(name = "bufrmosHpc_refTimeIndex", columnNames = { "refTime", "forecastTime" } )
} }
) )
@XmlRootElement
@XmlAccessorType(XmlAccessType.NONE)
@DynamicSerialize @DynamicSerialize
public class BufrMosHpcData extends BufrMosData { public class BufrMosHpcData extends BufrMosData {
@Override @Override

6
edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosLampData.java
View file

@ -26,9 +26,6 @@ import javax.persistence.Entity;
import javax.persistence.SequenceGenerator; import javax.persistence.SequenceGenerator;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.UniqueConstraint; import javax.persistence.UniqueConstraint;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import org.hibernate.annotations.Index; import org.hibernate.annotations.Index;
@ -49,6 +46,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
* Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation.
* May 07, 2013 1869 bsteffen Remove dataURI column from * May 07, 2013 1869 bsteffen Remove dataURI column from
* PluginDataObject. * PluginDataObject.
* Nov 04, 2013 2361 njensen Remove XML annotations
* *
* </pre> * </pre>
* *
@ -68,8 +66,6 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
@Index(name = "bufrmosLamp_refTimeIndex", columnNames = { "refTime", "forecastTime" } ) @Index(name = "bufrmosLamp_refTimeIndex", columnNames = { "refTime", "forecastTime" } )
} }
) )
@XmlRootElement
@XmlAccessorType(XmlAccessType.NONE)
@DynamicSerialize @DynamicSerialize
public class BufrMosLampData extends BufrMosData { public class BufrMosLampData extends BufrMosData {
@Override @Override

6
edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosMrfData.java
View file

@ -26,9 +26,6 @@ import javax.persistence.Entity;
import javax.persistence.SequenceGenerator; import javax.persistence.SequenceGenerator;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.UniqueConstraint; import javax.persistence.UniqueConstraint;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import org.hibernate.annotations.Index; import org.hibernate.annotations.Index;
@ -49,6 +46,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
* Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation.
* May 07, 2013 1869 bsteffen Remove dataURI column from * May 07, 2013 1869 bsteffen Remove dataURI column from
* PluginDataObject. * PluginDataObject.
* Nov 04, 2013 2361 njensen Remove XML annotations
* *
* </pre> * </pre>
* *
@ -68,8 +66,6 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
@Index(name = "bufrmosMrf_refTimeIndex", columnNames = { "refTime", "forecastTime" } ) @Index(name = "bufrmosMrf_refTimeIndex", columnNames = { "refTime", "forecastTime" } )
} }
) )
@XmlRootElement
@XmlAccessorType(XmlAccessType.NONE)
@DynamicSerialize @DynamicSerialize
public class BufrMosMrfData extends BufrMosData { public class BufrMosMrfData extends BufrMosData {
@Override @Override

6
edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosNgmData.java
View file

@ -26,9 +26,6 @@ import javax.persistence.Entity;
import javax.persistence.SequenceGenerator; import javax.persistence.SequenceGenerator;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.UniqueConstraint; import javax.persistence.UniqueConstraint;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlRootElement;
import org.hibernate.annotations.Index; import org.hibernate.annotations.Index;
@ -49,6 +46,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
* Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation.
* May 07, 2013 1869 bsteffen Remove dataURI column from * May 07, 2013 1869 bsteffen Remove dataURI column from
* PluginDataObject. * PluginDataObject.
* Nov 04, 2013 2361 njensen Remove XML annotations
* *
* </pre> * </pre>
* *
@ -68,8 +66,6 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
@Index(name = "bufrmosNgm_refTimeIndex", columnNames = { "refTime", "forecastTime" } ) @Index(name = "bufrmosNgm_refTimeIndex", columnNames = { "refTime", "forecastTime" } )
} }
) )
@XmlRootElement
@XmlAccessorType(XmlAccessType.NONE)
@DynamicSerialize @DynamicSerialize
public class BufrMosNgmData extends BufrMosData { public class BufrMosNgmData extends BufrMosData {
@Override @Override