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

Issue #1977: Fix NCEP Plugin issues due to merge

Browse source 
Former-commit-id: 00aeeb338b [formerly fa6a457cd0 [formerly 7c054e201e41d4df5fdb82faf2648e3f8cd227cc]]
Former-commit-id: fa6a457cd0
Former-commit-id: 3879c810db
This commit is contained in:
Richard Peter 2013-07-22 16:11:40 -05:00
parent 38ef1633d2
commit fc28bf67bb
3 changed files with 181 additions and 140 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

102
ncep/gov.noaa.nws.ncep.common.dataplugin.geomag/src/gov/noaa/nws/ncep/common/dataplugin/geomag/GeoMagRecord.java
View file

@ -1,7 +1,7 @@
package gov.noaa.nws.ncep.common.dataplugin.geomag; package gov.noaa.nws.ncep.common.dataplugin.geomag;
import java.util.Calendar; import javax.persistence.Access;
import javax.persistence.AccessType;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.SequenceGenerator; import javax.persistence.SequenceGenerator;
@ -18,23 +18,22 @@ import com.raytheon.uf.common.dataplugin.PluginDataObject;
import com.raytheon.uf.common.dataplugin.annotations.DataURI; import com.raytheon.uf.common.dataplugin.annotations.DataURI;
import com.raytheon.uf.common.dataplugin.persist.PersistablePluginDataObject; import com.raytheon.uf.common.dataplugin.persist.PersistablePluginDataObject;
import com.raytheon.uf.common.datastorage.IDataStore; import com.raytheon.uf.common.datastorage.IDataStore;
import com.raytheon.uf.common.datastorage.records.ByteDataRecord;
import com.raytheon.uf.common.datastorage.records.FloatDataRecord; import com.raytheon.uf.common.datastorage.records.FloatDataRecord;
import com.raytheon.uf.common.datastorage.records.IDataRecord; import com.raytheon.uf.common.datastorage.records.IDataRecord;
import com.raytheon.uf.common.datastorage.records.IntegerDataRecord;
import com.raytheon.uf.common.datastorage.records.LongDataRecord; import com.raytheon.uf.common.datastorage.records.LongDataRecord;
import com.raytheon.uf.common.datastorage.records.StringDataRecord;
import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
/** /**
* Record implementation for geomag plugin. * Record implementation for geomag plugin.
* *
* <pre> * <pre>
* SOFTWARE HISTORY * SOFTWARE HISTORY
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ---------------- -------------------------- * ------------ ---------- ---------------- --------------------------
* 03/27/2013 975 sgurung Initial creation. * 03/27/2013 975 sgurung Initial creation.
* 05/26/2013 bhebbard Added SequenceGenerator annotation. * 05/26/2013 bhebbard Added SequenceGenerator annotation.
* 07/22/2013 1977 rjpeter Added getDataURI and annotations.
* </pre> * </pre>
* *
* @author sgurung * @author sgurung
@ -52,13 +51,13 @@ public class GeoMagRecord extends PersistablePluginDataObject {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
public static final String OBS_TIME = "OBS_TIME"; public static final String OBS_TIME = "OBS_TIME";
public static final String component1 = "component1"; public static final String component1 = "component1";
public static final String component2 = "component2"; public static final String component2 = "component2";
public static final String component3 = "component3"; public static final String component3 = "component3";
public static final String component4 = "component4"; public static final String component4 = "component4";
/** /**
@ -83,43 +82,46 @@ public class GeoMagRecord extends PersistablePluginDataObject {
* report type * report type
*/ */
@DataURI(position = 3) @DataURI(position = 3)
@Column @Column
@DynamicSerializeElement @DynamicSerializeElement
@XmlAttribute @XmlAttribute
private String reportType; private String reportType;
/** /**
* flag to indicate bad data point * flag to indicate bad data point
*/ */
/*@Column /*
@DynamicSerializeElement * @Column
@XmlAttribute *
private String badDataPoint;*/ * @DynamicSerializeElement
*
* @XmlAttribute private String badDataPoint;
*/
/** /**
* Observation Date and Time for the minute values * Observation Date and Time for the minute values
*/ */
@Transient @Transient
private long[] obs_times; private long[] obs_times;
/** /**
* H or X values * H or X values
*/ */
@Transient @Transient
private float[] comp1_data; private float[] comp1_data;
/** /**
* D or Y values * D or Y values
*/ */
@Transient @Transient
private float[] comp2_data; private float[] comp2_data;
/** /**
* Z values * Z values
*/ */
@Transient @Transient
private float[] comp3_data; private float[] comp3_data;
/** /**
* F values * F values
*/ */
@ -157,7 +159,7 @@ public class GeoMagRecord extends PersistablePluginDataObject {
public void setStationCode(String stationCode) { public void setStationCode(String stationCode) {
this.stationCode = stationCode; this.stationCode = stationCode;
} }
/** /**
* @return the sourceId * @return the sourceId
*/ */
@ -172,7 +174,7 @@ public class GeoMagRecord extends PersistablePluginDataObject {
public void setSourceId(int sourceId) { public void setSourceId(int sourceId) {
this.sourceId = sourceId; this.sourceId = sourceId;
} }
/** /**
* @return the reportType * @return the reportType
*/ */
@ -202,7 +204,7 @@ public class GeoMagRecord extends PersistablePluginDataObject {
public void setObsTimes(long[] obs_times) { public void setObsTimes(long[] obs_times) {
this.obs_times = obs_times; this.obs_times = obs_times;
} }
/** /**
* @return the comp1_data * @return the comp1_data
*/ */
@ -217,7 +219,7 @@ public class GeoMagRecord extends PersistablePluginDataObject {
public void setComp1Data(float[] h_data) { public void setComp1Data(float[] h_data) {
this.comp1_data = h_data; this.comp1_data = h_data;
} }
/** /**
* @return the comp2_data * @return the comp2_data
*/ */
@ -232,7 +234,7 @@ public class GeoMagRecord extends PersistablePluginDataObject {
public void setComp2Data(float[] d_data) { public void setComp2Data(float[] d_data) {
this.comp2_data = d_data; this.comp2_data = d_data;
} }
/** /**
* @return the comp3_data * @return the comp3_data
*/ */
@ -247,7 +249,7 @@ public class GeoMagRecord extends PersistablePluginDataObject {
public void setComp3Data(float[] z_data) { public void setComp3Data(float[] z_data) {
this.comp3_data = z_data; this.comp3_data = z_data;
} }
/** /**
* @return the comp4_data * @return the comp4_data
*/ */
@ -262,37 +264,43 @@ public class GeoMagRecord extends PersistablePluginDataObject {
public void setComp4Data(float[] f_data) { public void setComp4Data(float[] f_data) {
this.comp4_data = f_data; this.comp4_data = f_data;
} }
@Override @Override
public IDecoderGettable getDecoderGettable() { public IDecoderGettable getDecoderGettable() {
return null; return null;
} }
public void retrieveFromDataStore(IDataStore dataStore) { public void retrieveFromDataStore(IDataStore dataStore) {
try { try {
IDataRecord[] dataRec = dataStore.retrieve(getDataURI()); IDataRecord[] dataRec = dataStore.retrieve(getDataURI());
for (int i = 0; i < dataRec.length; i++) { for (IDataRecord element : dataRec) {
if (dataRec[i].getName().equals(GeoMagRecord.component1)) { if (element.getName().equals(GeoMagRecord.component1)) {
obs_times = (((LongDataRecord) dataRec[i]).getLongData()); obs_times = (((LongDataRecord) element).getLongData());
} }
if (dataRec[i].getName().equals(GeoMagRecord.component1)) { if (element.getName().equals(GeoMagRecord.component1)) {
comp1_data = (((FloatDataRecord) dataRec[i]).getFloatData()); comp1_data = (((FloatDataRecord) element).getFloatData());
} }
if (dataRec[i].getName().equals(GeoMagRecord.component2)) { if (element.getName().equals(GeoMagRecord.component2)) {
comp2_data = (((FloatDataRecord) dataRec[i]).getFloatData()); comp2_data = (((FloatDataRecord) element).getFloatData());
} }
if (dataRec[i].getName().equals(GeoMagRecord.component3)) { if (element.getName().equals(GeoMagRecord.component3)) {
comp3_data = (((FloatDataRecord) dataRec[i]).getFloatData()); comp3_data = (((FloatDataRecord) element).getFloatData());
} }
if (dataRec[i].getName().equals(GeoMagRecord.component4)) { if (element.getName().equals(GeoMagRecord.component4)) {
comp4_data = (((FloatDataRecord) dataRec[i]).getFloatData()); comp4_data = (((FloatDataRecord) element).getFloatData());
} }
} }
} catch (Exception se) { } catch (Exception se) {
se.printStackTrace(); se.printStackTrace();
} }
} }
@Override
@Column
@Access(AccessType.PROPERTY)
public String getDataURI() {
return super.getDataURI();
}
} }

209
ncep/gov.noaa.nws.ncep.common.dataplugin.idft/src/gov/noaa/nws/ncep/common/dataplugin/idft/IdftRecord.java
View file

@ -27,11 +27,12 @@
package gov.noaa.nws.ncep.common.dataplugin.idft; package gov.noaa.nws.ncep.common.dataplugin.idft;
import gov.noaa.nws.ncep.common.tools.IDecoderConstantsN; import gov.noaa.nws.ncep.common.tools.IDecoderConstantsN;
import java.util.Calendar; import java.util.Calendar;
import javax.persistence.Access;
import javax.persistence.AccessType;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.SequenceGenerator; import javax.persistence.SequenceGenerator;
@ -50,6 +51,22 @@ import com.raytheon.uf.common.dataplugin.annotations.DataURI;
import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
/**
*
*
* <pre>
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* 07/22/2013 1977 rjpeter Added getDataURI and annotations.
*
* </pre>
*
* @author rjpeter
* @version 1.0
*/
@Entity @Entity
@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "idftseq") @SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "idftseq")
@Table(name = "idft", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) @Table(name = "idft", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) })
@ -57,72 +74,66 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
* Both refTime and forecastTime are included in the refTimeIndex since * Both refTime and forecastTime are included in the refTimeIndex since
* forecastTime is unlikely to be used. * forecastTime is unlikely to be used.
*/ */
@org.hibernate.annotations.Table( @org.hibernate.annotations.Table(appliesTo = "idft", indexes = { @Index(name = "idft_refTimeIndex", columnNames = {
appliesTo = "idft", "refTime", "forecastTime" }) })
indexes = {
@Index(name = "idft_refTimeIndex", columnNames = { "refTime", "forecastTime" } )
}
)
@XmlRootElement @XmlRootElement
@XmlAccessorType(XmlAccessType.NONE) @XmlAccessorType(XmlAccessType.NONE)
@DynamicSerialize @DynamicSerialize
public class IdftRecord extends PluginDataObject {
public class IdftRecord extends PluginDataObject{ private static final long serialVersionUID = 1L;
private static final long serialVersionUID = 1L;
/** Report type */ /** Report type */
@Column(length=32) @Column(length = 32)
@XmlElement @XmlElement
@DataURI(position = 4) @DataURI(position = 4)
@DynamicSerializeElement @DynamicSerializeElement
private String reportType; private String reportType;
@Column @Column
@DataURI(position = 1) @DataURI(position = 1)
@DynamicSerializeElement @DynamicSerializeElement
@XmlElement @XmlElement
private Calendar issueTime; private Calendar issueTime;
@Column @Column
@DataURI(position = 2) @DataURI(position = 2)
@DynamicSerializeElement @DynamicSerializeElement
@XmlElement @XmlElement
private Calendar validTime; private Calendar validTime;
@XmlElement @XmlElement
@DataURI(position = 3) @DataURI(position = 3)
@DynamicSerializeElement @DynamicSerializeElement
private Integer pointNum; private Integer pointNum;
@XmlElement @XmlElement
@DynamicSerializeElement @DynamicSerializeElement
private Float lat; private Float lat;
@XmlElement @XmlElement
@DynamicSerializeElement @DynamicSerializeElement
private Float lon; private Float lon;
@XmlElement @XmlElement
@DynamicSerializeElement @DynamicSerializeElement
private Float direction; private Float direction;
@XmlElement @XmlElement
@DynamicSerializeElement @DynamicSerializeElement
private Float distanceNm; private Float distanceNm;
/**
/**
* Default Constructor * Default Constructor
*/ */
public IdftRecord() { public IdftRecord() {
this.issueTime = null; this.issueTime = null;
this.validTime = null; this.validTime = null;
this.pointNum = IDecoderConstantsN.INTEGER_MISSING; this.pointNum = IDecoderConstantsN.INTEGER_MISSING;
this.lat = IDecoderConstantsN.FLOAT_MISSING; this.lat = IDecoderConstantsN.FLOAT_MISSING;
this.lon = IDecoderConstantsN.FLOAT_MISSING; this.lon = IDecoderConstantsN.FLOAT_MISSING;
this.direction = IDecoderConstantsN.FLOAT_MISSING; this.direction = IDecoderConstantsN.FLOAT_MISSING;
this.distanceNm = IDecoderConstantsN.FLOAT_MISSING; this.distanceNm = IDecoderConstantsN.FLOAT_MISSING;
} }
/** /**
@ -140,61 +151,75 @@ public class IdftRecord extends PluginDataObject{
// TODO Auto-generated method stub // TODO Auto-generated method stub
return null; return null;
} }
public String getReportType() {
return reportType;
}
public void setReportType(String reportType) {
this.reportType = reportType;
}
public Calendar getIssueTime(){
return issueTime;
}
public void setIssueTime(Calendar issueTime){
this.issueTime=issueTime;
}
public Calendar getValidTime(){
return validTime;
}
public void setValidTime(Calendar validTime){
this.validTime=validTime;
}
public Integer getPointNum(){
return pointNum;
}
public void setPointNum(Integer pointNum){
this.pointNum=pointNum;
}
public float getLat(){
return lat;
}
public void setLat(float latitude){
this.lat=latitude;
}
public float getLon(){
return lon;
}
public void setLon(float longitude){
this.lon=longitude;
}
public float getDirection(){
return direction;
}
public void setDirection(float direction){
this.direction=direction;
}
public float getDistanceNm(){
return distanceNm;
}
public void setDistanceNm(float distanceNm){
this.distanceNm=distanceNm;
}
public String getReportType() {
return reportType;
}
public void setReportType(String reportType) {
this.reportType = reportType;
}
public Calendar getIssueTime() {
return issueTime;
}
public void setIssueTime(Calendar issueTime) {
this.issueTime = issueTime;
}
public Calendar getValidTime() {
return validTime;
}
public void setValidTime(Calendar validTime) {
this.validTime = validTime;
}
public Integer getPointNum() {
return pointNum;
}
public void setPointNum(Integer pointNum) {
this.pointNum = pointNum;
}
public float getLat() {
return lat;
}
public void setLat(float latitude) {
this.lat = latitude;
}
public float getLon() {
return lon;
}
public void setLon(float longitude) {
this.lon = longitude;
}
public float getDirection() {
return direction;
}
public void setDirection(float direction) {
this.direction = direction;
}
public float getDistanceNm() {
return distanceNm;
}
public void setDistanceNm(float distanceNm) {
this.distanceNm = distanceNm;
}
@Override
@Column
@Access(AccessType.PROPERTY)
public String getDataURI() {
return super.getDataURI();
}
} }

10
ncep/gov.noaa.nws.ncep.common.dataplugin.pgen/src/gov/noaa/nws/ncep/common/dataplugin/pgen/PgenRecord.java
View file

@ -1,5 +1,7 @@
package gov.noaa.nws.ncep.common.dataplugin.pgen; package gov.noaa.nws.ncep.common.dataplugin.pgen;
import javax.persistence.Access;
import javax.persistence.AccessType;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.SequenceGenerator; import javax.persistence.SequenceGenerator;
@ -30,7 +32,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
* ------------ ---------- ----------- -------------------------- * ------------ ---------- ----------- --------------------------
* Apr 22, 2013 sgilbert Initial creation * Apr 22, 2013 sgilbert Initial creation
* Jun 26, 2013 bhebbard Added SequenceGenerator annotation * Jun 26, 2013 bhebbard Added SequenceGenerator annotation
* * Jul 22, 2013 1977 rjpeter Added getDataURI and annotations.
* </pre> * </pre>
* *
* @author sgilbert * @author sgilbert
@ -262,4 +264,10 @@ public class PgenRecord extends PersistablePluginDataObject {
return null; return null;
} }
@Override
@Column
@Access(AccessType.PROPERTY)
public String getDataURI() {
return super.getDataURI();
}
} }