diff --git a/cots/org.hibernate/.classpath b/cots/org.hibernate/.classpath index a49aca05d1..c934e2da60 100644 --- a/cots/org.hibernate/.classpath +++ b/cots/org.hibernate/.classpath @@ -2,7 +2,7 @@ - + diff --git a/cots/org.hibernate/META-INF/MANIFEST.MF b/cots/org.hibernate/META-INF/MANIFEST.MF index fa6dd0f32e..e9f8a57777 100644 --- a/cots/org.hibernate/META-INF/MANIFEST.MF +++ b/cots/org.hibernate/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.hibernate Bundle-Version: 1.0.0.qualifier Bundle-ClassPath: hibernate-spatial-1.0.jar, hibernate-spatial-postgis-1.0.jar, - hibernate3.5.0-Final.jar, + hibernate3.5.6-Final.jar, javassist-3.9.0.GA.jar, jta-1.1.jar Bundle-Vendor: Hibernate diff --git a/cots/org.hibernate/build.properties b/cots/org.hibernate/build.properties index 802fa8462a..131e6678ba 100644 --- a/cots/org.hibernate/build.properties +++ b/cots/org.hibernate/build.properties @@ -1,6 +1,6 @@ bin.includes = META-INF/,\ hibernate-spatial-1.0.jar,\ hibernate-spatial-postgis-1.0.jar,\ - hibernate3.5.0-Final.jar,\ + hibernate3.5.6-Final.jar,\ javassist-3.9.0.GA.jar,\ jta-1.1.jar diff --git a/cots/org.hibernate/hibernate3.5.6-Final.jar b/cots/org.hibernate/hibernate3.5.6-Final.jar new file mode 100644 index 0000000000..3cc99f71bf Binary files /dev/null and b/cots/org.hibernate/hibernate3.5.6-Final.jar differ diff --git a/deltaScripts/13.4.1/createPluginDataObjectSequences.sh b/deltaScripts/13.4.1/createPluginDataObjectSequences.sh new file mode 100644 index 0000000000..bb5efa6643 --- /dev/null +++ b/deltaScripts/13.4.1/createPluginDataObjectSequences.sh @@ -0,0 +1,28 @@ +#!/bin/bash +# DR #1857 - this update script will create sequences for the metadata database. +# No arguments are passed to this script. It reads sequences.txt from the local directory. + +PSQL="/awips2/psql/bin/psql" +_sequences_txt=sequences.txt + +echo "INFO: Creating sequences." + +for sequence in `cat ${_sequences_txt}`; +do + table=${sequence%%seq} + echo "INFO: Creating sequence ${sequence} for table ${table}" + ##To start sequence with (current max id + 1 ), uncomment the next two lines. + #sequenceStart=`${PSQL} -tU awips -d metadata -c "SELECT max(id) FROM ${table};" | tr -d '\n' | tr -d ' '` + #let sequenceStart=${sequenceStart}+1 + ${PSQL} -U awips -d metadata -c "CREATE SEQUENCE ${sequence} INCREMENT 1 MINVALUE 1 MAXVALUE 9223372036854775807 CACHE 1 START ${sequenceStart:=1};" + ${PSQL} -U awips -d metadata -c "ALTER TABLE ${sequence} OWNER TO awips;" + if [ $? -ne 0 ]; then + echo "ERROR: Failed to create sequence ${sequence}." + echo "FATAL: The update has failed." + exit 1 + fi +done + +echo "INFO: sequence creation has completed successfully!" + +exit 0 diff --git a/deltaScripts/13.4.1/sequences.txt b/deltaScripts/13.4.1/sequences.txt new file mode 100644 index 0000000000..49feaff303 --- /dev/null +++ b/deltaScripts/13.4.1/sequences.txt @@ -0,0 +1,89 @@ +ffgseq +convsigmetseq +atcfseq +nonconvsigmetseq +nctextseq +sgwhseq +ncgribseq +mcidasseq +idftseq +sshaseq +ncscatseq +wcpseq +awwseq +stormtrackseq +ntransseq +ncpafmseq +intlsigmetseq +mosaicseq +ncscdseq +ncuairseq +ncccfpseq +ncairepseq +nctafseq +ncpirepseq +airmetseq +solarimageseq +tcmseq +sgwhvseq +tafseq +ldadmesonetseq +cwatseq +crimssseq +ffmpseq +fogseq +airepseq +reccoseq +bufruaseq +cwaseq +bufrmthdwseq +svrwxseq +bufrascatseq +redbookseq +qpfseq +radarseq +ccfpseq +satelliteseq +scanseq +bufrhdwseq +pirepseq +acarsseq +bufrsigwxseq +lsrseq +gridseq +qcseq +ldadhydroseq +modelsoundingseq +profilerseq +binlightningseq +ldadprofilerseq +vilseq +sfcobsseq +tcgseq +fssobsseq +poessoundingseq +nucapsseq +goessoundingseq +bufrquikscatseq +gribseq +viirsseq +acarssoundingseq +preciprateseq +bufrncwfseq +gfeseq +tcsseq +practicewarningseq +warningseq +obsseq +bufrssmiseq +bufrmosHpcseq +bufrmosMrfseq +bufrmosEtaseq +bufrmosNgmseq +bufrmosseq +bufrmosAvnseq +bufrmosGfsseq +bufrmosLampseq +mesowestseq +ldad_manualseq +vaaseq diff --git a/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosAvnData.java b/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosAvnData.java index 0b65eeebb0..e8e2e62d41 100644 --- a/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosAvnData.java +++ b/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosAvnData.java @@ -20,17 +20,20 @@ package com.raytheon.edex.plugin.bufrmos.common; 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 org.hibernate.annotations.Index; +import com.raytheon.uf.common.dataplugin.PluginDataObject; import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; /** - * TODO Add Description + * BUFR MOS Aviation data. * * 
  * 
@@ -40,6 +43,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
  * ------------ ---------- ----------- --------------------------
  * May 25, 2011            rjpeter     Initial creation
  * Apr 4, 2013   1846      bkowal      Added an index on refTime and forecastTime
+ * Apr 12, 2013  1857      bgonzale    Added SequenceGenerator annotation.
  * 
  *
* @@ -47,6 +51,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; * @version 1.0 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "bufrmosAvnseq") @Table(name = "bufrmosAvn", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosData.java b/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosData.java index c84c3bc11e..09afae7248 100644 --- a/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosData.java +++ b/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosData.java @@ -26,6 +26,7 @@ import javax.persistence.Embedded; import javax.persistence.Entity; import javax.persistence.ManyToOne; import javax.persistence.PrimaryKeyJoinColumn; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.UniqueConstraint; @@ -36,6 +37,7 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; 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.annotations.DataURIConfig; import com.raytheon.uf.common.dataplugin.persist.IPersistable; @@ -56,6 +58,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; * ------------ ---------- ----------- -------------------------- * 20080221 862 jkorman Initial Coding. * 02/06/09 1990 bphillip removed populateDataStore method + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @@ -63,6 +66,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; * @version 1.0 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "bufrmosseq") @Table(name = "bufrmos", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) @XmlRootElement @XmlAccessorType(XmlAccessType.NONE) diff --git a/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosEtaData.java b/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosEtaData.java index 3b9480de16..7d5c8d531e 100644 --- a/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosEtaData.java +++ b/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosEtaData.java @@ -20,17 +20,20 @@ package com.raytheon.edex.plugin.bufrmos.common; 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 org.hibernate.annotations.Index; +import com.raytheon.uf.common.dataplugin.PluginDataObject; import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; /** - * TODO Add Description + * BUFR MOS Eta based data. * * 
  * 
@@ -40,6 +43,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
  * ------------ ---------- ----------- --------------------------
  * May 25, 2011            rjpeter     Initial creation
  * Apr 4, 2013        1846 bkowal      Added an index on refTime and forecastTime
+ * Apr 12, 2013 1857       bgonzale    Added SequenceGenerator annotation.
  * 
  *
* @@ -47,6 +51,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; * @version 1.0 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "bufrmosEtaseq") @Table(name = "bufrmosEta", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosGfsData.java b/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosGfsData.java index fa01fe21c6..004ed22b78 100644 --- a/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosGfsData.java +++ b/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosGfsData.java @@ -20,17 +20,20 @@ package com.raytheon.edex.plugin.bufrmos.common; 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 org.hibernate.annotations.Index; +import com.raytheon.uf.common.dataplugin.PluginDataObject; import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; /** - * TODO Add Description + * BUFR MOS GFS data. * * 
  * 
@@ -40,6 +43,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
  * ------------ ---------- ----------- --------------------------
  * May 25, 2011            rjpeter     Initial creation
  * Apr 4, 2013 1846        bkowal      Added an index on refTime and forecastTime
+ * Apr 12, 2013 1857       bgonzale    Added SequenceGenerator annotation.
  * 
  *
* @@ -47,6 +51,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; * @version 1.0 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "bufrmosGfsseq") @Table(name = "bufrmosGfs", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosHpcData.java b/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosHpcData.java index 7538c7340a..758b9a6695 100644 --- a/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosHpcData.java +++ b/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosHpcData.java @@ -20,17 +20,20 @@ package com.raytheon.edex.plugin.bufrmos.common; 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 org.hibernate.annotations.Index; +import com.raytheon.uf.common.dataplugin.PluginDataObject; import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; /** - * TODO Add Description + * BUFR MOS Hydrometeorological Center(HPC) data. * * 
  * 
@@ -40,6 +43,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
  * ------------ ---------- ----------- --------------------------
  * May 25, 2011            rjpeter     Initial creation
  * Apr 4, 2013        1846 bkowal      Added an index on refTime and forecastTime
+ * Apr 12, 2013       1857 bgonzale    Added SequenceGenerator annotation.
  * 
  *
* @@ -47,6 +51,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; * @version 1.0 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "bufrmosHpcseq") @Table(name = "bufrmosHpc", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosLampData.java b/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosLampData.java index d2d77d9760..a966543147 100644 --- a/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosLampData.java +++ b/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosLampData.java @@ -20,17 +20,20 @@ package com.raytheon.edex.plugin.bufrmos.common; 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 org.hibernate.annotations.Index; +import com.raytheon.uf.common.dataplugin.PluginDataObject; import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; /** - * TODO Add Description + * BUFR MOS LAMP data. * * 
  * 
@@ -40,6 +43,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
  * ------------ ---------- ----------- --------------------------
  * May 25, 2011            rjpeter     Initial creation
  * Apr 4, 2013        1846 bkowal      Added an index on refTime and forecastTime
+ * Apr 12, 2013       1857 bgonzale    Added SequenceGenerator annotation.
  * 
  *
* @@ -47,6 +51,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; * @version 1.0 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "bufrmosLampseq") @Table(name = "bufrmosLamp", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosMrfData.java b/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosMrfData.java index 54a165757b..82dfcb1107 100644 --- a/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosMrfData.java +++ b/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosMrfData.java @@ -20,17 +20,20 @@ package com.raytheon.edex.plugin.bufrmos.common; 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 org.hibernate.annotations.Index; +import com.raytheon.uf.common.dataplugin.PluginDataObject; import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; /** - * TODO Add Description + * BUFR MOS MRF data. * * 
  * 
@@ -40,6 +43,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
  * ------------ ---------- ----------- --------------------------
  * May 25, 2011            rjpeter     Initial creation
  * Apr 4, 2013        1846 bkowal      Added an index on refTime and forecastTime
+ * Apr 12, 2013       1857 bgonzale    Added SequenceGenerator annotation.
  * 
  *
* @@ -47,6 +51,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; * @version 1.0 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "bufrmosMrfseq") @Table(name = "bufrmosMrf", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosNgmData.java b/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosNgmData.java index 2d19379551..48a568b93e 100644 --- a/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosNgmData.java +++ b/edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosNgmData.java @@ -20,6 +20,7 @@ package com.raytheon.edex.plugin.bufrmos.common; import javax.persistence.Entity; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.UniqueConstraint; import javax.xml.bind.annotation.XmlAccessType; @@ -28,10 +29,11 @@ import javax.xml.bind.annotation.XmlRootElement; import org.hibernate.annotations.Index; +import com.raytheon.uf.common.dataplugin.PluginDataObject; import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; /** - * TODO Add Description + * BUFR MOS NGM data. * * 
  * 
@@ -41,6 +43,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
  * ------------ ---------- ----------- --------------------------
  * May 25, 2011            rjpeter     Initial creation
  * Apr 4, 2013        1846 bkowal      Added an index on refTime and forecastTime
+ * Apr 12, 2013       1857 bgonzale    Added SequenceGenerator annotation.
  * 
  *
* @@ -48,6 +51,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; * @version 1.0 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "bufrmosNgmseq") @Table(name = "bufrmosNgm", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/edexOsgi/com.raytheon.edex.plugin.ccfp/src/com/raytheon/edex/plugin/ccfp/CcfpRecord.java b/edexOsgi/com.raytheon.edex.plugin.ccfp/src/com/raytheon/edex/plugin/ccfp/CcfpRecord.java index 412bb7e987..f29916a9ee 100644 --- a/edexOsgi/com.raytheon.edex.plugin.ccfp/src/com/raytheon/edex/plugin/ccfp/CcfpRecord.java +++ b/edexOsgi/com.raytheon.edex.plugin.ccfp/src/com/raytheon/edex/plugin/ccfp/CcfpRecord.java @@ -23,6 +23,7 @@ package com.raytheon.edex.plugin.ccfp; import javax.persistence.Column; import javax.persistence.Embedded; import javax.persistence.Entity; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.UniqueConstraint; import javax.xml.bind.annotation.XmlAccessType; @@ -30,6 +31,7 @@ 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; @@ -51,6 +53,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; * 09/15/2009 3027 njensen Use dates for times * 09/21/2009 3072 bsteffen Removed times because they are stored in DataTime * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @@ -59,6 +62,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; * @version 1 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "ccfpseq") @Table(name = "ccfp", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/edexOsgi/com.raytheon.edex.plugin.ldadmanual/src/com/raytheon/edex/plugin/ldadmanual/dao/ManualLdadRecord.java b/edexOsgi/com.raytheon.edex.plugin.ldadmanual/src/com/raytheon/edex/plugin/ldadmanual/dao/ManualLdadRecord.java index 7bb5eb3c3d..3d70ae7fed 100644 --- a/edexOsgi/com.raytheon.edex.plugin.ldadmanual/src/com/raytheon/edex/plugin/ldadmanual/dao/ManualLdadRecord.java +++ b/edexOsgi/com.raytheon.edex.plugin.ldadmanual/src/com/raytheon/edex/plugin/ldadmanual/dao/ManualLdadRecord.java @@ -34,6 +34,7 @@ import javax.measure.unit.Unit; import javax.persistence.Column; import javax.persistence.Embedded; import javax.persistence.Entity; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.UniqueConstraint; import javax.xml.bind.annotation.XmlAccessType; @@ -41,6 +42,7 @@ 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; @@ -63,6 +65,7 @@ import com.vividsolutions.jts.geom.Geometry; * ----------- ---------- ----------- -------------------------- * 9/30/09 vkorolev Initial creation * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @author vkorolev @@ -70,6 +73,7 @@ import com.vividsolutions.jts.geom.Geometry; */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "ldad_manualseq") @Table(name = "ldad_manual", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/edexOsgi/com.raytheon.edex.plugin.ldadprofiler/src/com/raytheon/edex/plugin/ldadprofiler/common/ProfilerLdadObs.java b/edexOsgi/com.raytheon.edex.plugin.ldadprofiler/src/com/raytheon/edex/plugin/ldadprofiler/common/ProfilerLdadObs.java index fe124acb64..b562e2de16 100644 --- a/edexOsgi/com.raytheon.edex.plugin.ldadprofiler/src/com/raytheon/edex/plugin/ldadprofiler/common/ProfilerLdadObs.java +++ b/edexOsgi/com.raytheon.edex.plugin.ldadprofiler/src/com/raytheon/edex/plugin/ldadprofiler/common/ProfilerLdadObs.java @@ -32,6 +32,7 @@ import javax.measure.unit.Unit; import javax.persistence.Column; import javax.persistence.Embedded; import javax.persistence.Entity; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.UniqueConstraint; @@ -40,9 +41,11 @@ 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; import com.raytheon.uf.common.dataplugin.persist.PersistablePluginDataObject; @@ -65,6 +68,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; * ----------- ---------- ----------- -------------------------- * 10/07/09 vkorolev Initial creation * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @author vkorolev @@ -72,6 +76,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "ldadprofilerseq") @Table(name = "ldadprofiler", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/edexOsgi/com.raytheon.edex.plugin.modelsounding/src/com/raytheon/edex/plugin/modelsounding/common/SoundingSite.java b/edexOsgi/com.raytheon.edex.plugin.modelsounding/src/com/raytheon/edex/plugin/modelsounding/common/SoundingSite.java index 344380b984..48f48e1eb5 100644 --- a/edexOsgi/com.raytheon.edex.plugin.modelsounding/src/com/raytheon/edex/plugin/modelsounding/common/SoundingSite.java +++ b/edexOsgi/com.raytheon.edex.plugin.modelsounding/src/com/raytheon/edex/plugin/modelsounding/common/SoundingSite.java @@ -27,6 +27,7 @@ import java.util.Set; import javax.persistence.Column; import javax.persistence.Embedded; import javax.persistence.Entity; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.UniqueConstraint; @@ -34,9 +35,11 @@ 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; import com.raytheon.uf.common.dataplugin.persist.PersistablePluginDataObject; @@ -59,6 +62,7 @@ import com.vividsolutions.jts.geom.Geometry; * ------------ ---------- ----------- -------------------------- * 20080303 1026 jkorman Initial implementation. * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @@ -66,6 +70,7 @@ import com.vividsolutions.jts.geom.Geometry; * @version 1.0 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "modelsoundingseq") @Table(name = "modelsounding", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/edexOsgi/com.raytheon.edex.plugin.recco/src/com/raytheon/edex/plugin/recco/common/RECCORecord.java b/edexOsgi/com.raytheon.edex.plugin.recco/src/com/raytheon/edex/plugin/recco/common/RECCORecord.java index 661b4da5fa..1509b2c1cc 100644 --- a/edexOsgi/com.raytheon.edex.plugin.recco/src/com/raytheon/edex/plugin/recco/common/RECCORecord.java +++ b/edexOsgi/com.raytheon.edex.plugin.recco/src/com/raytheon/edex/plugin/recco/common/RECCORecord.java @@ -33,6 +33,7 @@ import javax.measure.unit.Unit; import javax.persistence.Column; import javax.persistence.Embedded; import javax.persistence.Entity; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.UniqueConstraint; import javax.xml.bind.annotation.XmlAccessType; @@ -40,6 +41,7 @@ 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; @@ -63,12 +65,14 @@ import com.vividsolutions.jts.geom.Geometry; * 20080103 384 jkorman Initial Coding. * 20080107 720 jkorman remove default assignments from attributes. * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @author jkorman * @version 1.0 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "reccoseq") @Table(name = "recco", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/edexOsgi/com.raytheon.edex.plugin.redbook/src/com/raytheon/edex/plugin/redbook/common/RedbookRecord.java b/edexOsgi/com.raytheon.edex.plugin.redbook/src/com/raytheon/edex/plugin/redbook/common/RedbookRecord.java index 3a260ef9f2..228bc9e39d 100644 --- a/edexOsgi/com.raytheon.edex.plugin.redbook/src/com/raytheon/edex/plugin/redbook/common/RedbookRecord.java +++ b/edexOsgi/com.raytheon.edex.plugin.redbook/src/com/raytheon/edex/plugin/redbook/common/RedbookRecord.java @@ -24,6 +24,7 @@ import java.util.Date; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.UniqueConstraint; @@ -31,9 +32,11 @@ 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 com.raytheon.uf.common.dataplugin.IDecoderGettable; +import com.raytheon.uf.common.dataplugin.PluginDataObject; import com.raytheon.uf.common.dataplugin.PluginException; import com.raytheon.uf.common.dataplugin.annotations.DataURI; import com.raytheon.uf.common.dataplugin.persist.IPersistable; @@ -59,12 +62,14 @@ import com.raytheon.uf.common.time.DataTime; * 20080529 1131 jkorman getPersistenceTime now returns system time. * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime * 20130408 1293 bkowal Removed references to hdffileid. + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @author jkorman * @version 1.0 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "redbookseq") @Table(name = "redbook", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java b/edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java index f52b2e1b93..329c88d54b 100644 --- a/edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java +++ b/edexOsgi/com.raytheon.edex.plugin.taf/src/com/raytheon/edex/plugin/taf/common/TafRecord.java @@ -32,6 +32,7 @@ import javax.persistence.FetchType; import javax.persistence.ManyToOne; import javax.persistence.OneToMany; import javax.persistence.PrimaryKeyJoinColumn; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.UniqueConstraint; import javax.xml.bind.annotation.XmlAccessType; @@ -62,6 +63,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; * 6/21/07 180 bphillip Updated to use new plugin pattern * 20071129 472 jkorman Added IDecoderGettable interface. * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @@ -69,6 +71,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; * @version 1 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "tafseq") @Table(name = "taf", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.acars/src/com/raytheon/uf/common/dataplugin/acars/ACARSRecord.java b/edexOsgi/com.raytheon.uf.common.dataplugin.acars/src/com/raytheon/uf/common/dataplugin/acars/ACARSRecord.java index 05d9d61f0f..2d248ea9eb 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.acars/src/com/raytheon/uf/common/dataplugin/acars/ACARSRecord.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.acars/src/com/raytheon/uf/common/dataplugin/acars/ACARSRecord.java @@ -34,6 +34,7 @@ import javax.measure.unit.Unit; import javax.persistence.Column; import javax.persistence.Embedded; import javax.persistence.Entity; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.UniqueConstraint; @@ -54,7 +55,6 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; import com.vividsolutions.jts.geom.Geometry; - /** * TODO Add Description * @@ -69,6 +69,7 @@ import com.vividsolutions.jts.geom.Geometry; * Apr 21, 2009 2245 jsanchez Returned temperature unit to kelvin. * May 21, 2009 2338 jsanchez Updated the getMessageData. * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @@ -76,6 +77,7 @@ import com.vividsolutions.jts.geom.Geometry; * @version 1.0 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "acarsseq") @Table(name = "acars", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.acarssounding/src/com/raytheon/uf/common/dataplugin/acarssounding/ACARSSoundingRecord.java b/edexOsgi/com.raytheon.uf.common.dataplugin.acarssounding/src/com/raytheon/uf/common/dataplugin/acarssounding/ACARSSoundingRecord.java index cd1d98c41f..fc9c9f15f7 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.acarssounding/src/com/raytheon/uf/common/dataplugin/acarssounding/ACARSSoundingRecord.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.acarssounding/src/com/raytheon/uf/common/dataplugin/acarssounding/ACARSSoundingRecord.java @@ -34,6 +34,7 @@ import javax.persistence.Embedded; import javax.persistence.Entity; import javax.persistence.FetchType; import javax.persistence.OneToMany; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.UniqueConstraint; import javax.xml.bind.annotation.XmlAccessType; @@ -41,6 +42,7 @@ 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; @@ -62,6 +64,7 @@ import com.vividsolutions.jts.geom.Geometry; * ------------ ---------- ----------- -------------------------- * 20090403 1939 jkorman Initial creation * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @@ -69,6 +72,7 @@ import com.vividsolutions.jts.geom.Geometry; * @version 1.0 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "acarssoundingseq") @Table(name = "acarssounding", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java b/edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java index f9e2b012e8..f9003f77bd 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java @@ -38,6 +38,7 @@ import javax.measure.unit.Unit; import javax.persistence.Column; import javax.persistence.Embedded; import javax.persistence.Entity; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.UniqueConstraint; import javax.xml.bind.annotation.XmlAccessType; @@ -45,6 +46,7 @@ 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; @@ -74,12 +76,14 @@ import com.vividsolutions.jts.geom.Geometry; * AWIPS2 DR Work * 20120911 1011 jkorman Added ability to report turbulence from decoded * TB group. + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @author jkorman * @version 1.0 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "airepseq") @Table(name = "airep", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.binlightning/src/com/raytheon/uf/common/dataplugin/binlightning/BinLightningRecord.java b/edexOsgi/com.raytheon.uf.common.dataplugin.binlightning/src/com/raytheon/uf/common/dataplugin/binlightning/BinLightningRecord.java index 3ff6fc46dd..0095343a71 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.binlightning/src/com/raytheon/uf/common/dataplugin/binlightning/BinLightningRecord.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.binlightning/src/com/raytheon/uf/common/dataplugin/binlightning/BinLightningRecord.java @@ -23,6 +23,7 @@ import java.util.Calendar; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.UniqueConstraint; @@ -30,9 +31,11 @@ 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 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.binlightning.impl.LightningStrikePoint; import com.raytheon.uf.common.dataplugin.persist.IPersistable; @@ -72,12 +75,14 @@ import com.raytheon.uf.edex.decodertools.time.TimeTools; * 20130227 DCS 152 jgerth/elau Support for WWLLN and multiple sources * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime * 20130408 1293 bkowal Removed references to hdffileid. + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @author jkorman * @version 1 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "binlightningseq") @Table(name = "binlightning", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrascat/src/com/raytheon/uf/common/dataplugin/bufrascat/AScatObs.java b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrascat/src/com/raytheon/uf/common/dataplugin/bufrascat/AScatObs.java index 13df1f75d1..12741b86e7 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrascat/src/com/raytheon/uf/common/dataplugin/bufrascat/AScatObs.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrascat/src/com/raytheon/uf/common/dataplugin/bufrascat/AScatObs.java @@ -25,6 +25,7 @@ import java.util.Collection; import javax.persistence.Column; import javax.persistence.Embedded; import javax.persistence.Entity; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.UniqueConstraint; @@ -33,9 +34,11 @@ 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; import com.raytheon.uf.common.dataplugin.persist.PersistablePluginDataObject; @@ -58,6 +61,7 @@ import com.vividsolutions.jts.geom.Geometry; * ------------ ---------- ----------- -------------------------- * Jun 18, 2009 2624 jkorman Initial creation * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @@ -65,6 +69,7 @@ import com.vividsolutions.jts.geom.Geometry; * @version 1.0 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "bufrascatseq") @Table(name = "bufrascat", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrhdw/src/com/raytheon/uf/common/dataplugin/bufrhdw/BufrHDWObs.java b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrhdw/src/com/raytheon/uf/common/dataplugin/bufrhdw/BufrHDWObs.java index b4b6b2e124..e4b1fbf535 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrhdw/src/com/raytheon/uf/common/dataplugin/bufrhdw/BufrHDWObs.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrhdw/src/com/raytheon/uf/common/dataplugin/bufrhdw/BufrHDWObs.java @@ -25,6 +25,7 @@ import java.util.Collection; import javax.persistence.Column; import javax.persistence.Embedded; import javax.persistence.Entity; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.UniqueConstraint; @@ -33,9 +34,11 @@ 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; import com.raytheon.uf.common.dataplugin.persist.PersistablePluginDataObject; @@ -57,6 +60,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; * ------------ ---------- ----------- -------------------------- * Jun 18, 2009 jkorman Initial creation * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @@ -64,6 +68,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; * @version 1.0 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "bufrhdwseq") @Table(name = "bufrhdw", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrmthdw/src/com/raytheon/uf/common/dataplugin/bufrmthdw/BufrMTHDWObs.java b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrmthdw/src/com/raytheon/uf/common/dataplugin/bufrmthdw/BufrMTHDWObs.java index 117b6a86c7..e5ec77f1a3 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrmthdw/src/com/raytheon/uf/common/dataplugin/bufrmthdw/BufrMTHDWObs.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrmthdw/src/com/raytheon/uf/common/dataplugin/bufrmthdw/BufrMTHDWObs.java @@ -25,6 +25,7 @@ import java.util.Collection; import javax.persistence.Column; import javax.persistence.Embedded; import javax.persistence.Entity; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.UniqueConstraint; @@ -33,9 +34,11 @@ 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; import com.raytheon.uf.common.dataplugin.persist.PersistablePluginDataObject; @@ -57,6 +60,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; * ------------ ---------- ----------- -------------------------- * Jul 26, 2010 jkorman Initial creation * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @@ -64,6 +68,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; * @version 1.0 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "bufrmthdwseq") @Table(name = "bufrmthdw", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrncwf/src/com/raytheon/uf/common/dataplugin/ncwf/BUFRncwf.java b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrncwf/src/com/raytheon/uf/common/dataplugin/ncwf/BUFRncwf.java index 2a945898e5..4cd8b1b277 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrncwf/src/com/raytheon/uf/common/dataplugin/ncwf/BUFRncwf.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrncwf/src/com/raytheon/uf/common/dataplugin/ncwf/BUFRncwf.java @@ -23,6 +23,7 @@ import java.util.Collection; import javax.persistence.Embedded; import javax.persistence.Entity; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.UniqueConstraint; @@ -31,9 +32,11 @@ 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; import com.raytheon.uf.common.dataplugin.persist.PersistablePluginDataObject; @@ -55,6 +58,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; * ------------ ---------- ----------- -------------------------- * Aug 17, 2009 jkorman Initial creation * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @@ -62,6 +66,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; * @version 1.0 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "bufrncwfseq") @Table(name = "bufrncwf", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrquikscat/src/com/raytheon/uf/common/dataplugin/bufrquikscat/QUIKScatObs.java b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrquikscat/src/com/raytheon/uf/common/dataplugin/bufrquikscat/QUIKScatObs.java index 2cef2f4758..68a63d52be 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrquikscat/src/com/raytheon/uf/common/dataplugin/bufrquikscat/QUIKScatObs.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrquikscat/src/com/raytheon/uf/common/dataplugin/bufrquikscat/QUIKScatObs.java @@ -25,6 +25,7 @@ import java.util.Collection; import javax.persistence.Column; import javax.persistence.Embedded; import javax.persistence.Entity; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.UniqueConstraint; @@ -33,9 +34,11 @@ 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; import com.raytheon.uf.common.dataplugin.persist.PersistablePluginDataObject; @@ -58,6 +61,7 @@ import com.vividsolutions.jts.geom.Geometry; * ------------ ---------- ----------- -------------------------- * Jun 18, 2009 2520 jkorman Initial creation * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @@ -65,6 +69,7 @@ import com.vividsolutions.jts.geom.Geometry; * @version 1.0 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "bufrquikscatseq") @Table(name = "bufrquikscat", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrsigwx/src/com/raytheon/uf/common/dataplugin/bufrsigwx/SigWxData.java b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrsigwx/src/com/raytheon/uf/common/dataplugin/bufrsigwx/SigWxData.java index d5ff8389d6..c7aff21bdc 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrsigwx/src/com/raytheon/uf/common/dataplugin/bufrsigwx/SigWxData.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrsigwx/src/com/raytheon/uf/common/dataplugin/bufrsigwx/SigWxData.java @@ -24,6 +24,7 @@ import java.util.Collection; import javax.persistence.Column; import javax.persistence.Embedded; import javax.persistence.Entity; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.UniqueConstraint; @@ -32,9 +33,11 @@ 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; import com.raytheon.uf.common.dataplugin.bufrsigwx.common.SigWxType; @@ -56,6 +59,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; * ------------ ---------- ----------- -------------------------- * Jun 18, 2009 jkorman Initial creation * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @@ -63,6 +67,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; * @version 1.0 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "bufrsigwxseq") @Table(name = "bufrsigwx", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrssmi/src/com/raytheon/uf/common/dataplugin/bufrssmi/SSMIScanData.java b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrssmi/src/com/raytheon/uf/common/dataplugin/bufrssmi/SSMIScanData.java index d076d5f660..4cf136b290 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrssmi/src/com/raytheon/uf/common/dataplugin/bufrssmi/SSMIScanData.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrssmi/src/com/raytheon/uf/common/dataplugin/bufrssmi/SSMIScanData.java @@ -25,6 +25,7 @@ import java.util.Collection; import javax.persistence.Column; import javax.persistence.Embedded; import javax.persistence.Entity; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.UniqueConstraint; @@ -33,9 +34,11 @@ 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; import com.raytheon.uf.common.dataplugin.persist.PersistablePluginDataObject; @@ -58,6 +61,7 @@ import com.vividsolutions.jts.geom.Geometry; * ------------ ---------- ----------- -------------------------- * Jun 18, 2009 jkorman Initial creation * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @@ -65,6 +69,7 @@ import com.vividsolutions.jts.geom.Geometry; * @version 1.0 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "bufrssmiseq") @Table(name = "bufrssmi", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrua/src/com/raytheon/uf/common/dataplugin/bufrua/UAObs.java b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrua/src/com/raytheon/uf/common/dataplugin/bufrua/UAObs.java index a97fdd54d9..64f7533233 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrua/src/com/raytheon/uf/common/dataplugin/bufrua/UAObs.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrua/src/com/raytheon/uf/common/dataplugin/bufrua/UAObs.java @@ -39,6 +39,7 @@ import javax.measure.unit.Unit; import javax.persistence.Column; import javax.persistence.Embedded; import javax.persistence.Entity; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.UniqueConstraint; @@ -47,9 +48,11 @@ 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; import com.raytheon.uf.common.dataplugin.persist.PersistablePluginDataObject; @@ -82,12 +85,14 @@ import com.vividsolutions.jts.geom.Geometry; * 20080114 763 jkorman Added "below" ground level exclusion to * getValue. * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @author jkorman * @version 1.0 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "bufruaseq") @Table(name = "bufrua", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.cwa/src/com/raytheon/uf/common/dataplugin/cwa/CWARecord.java b/edexOsgi/com.raytheon.uf.common.dataplugin.cwa/src/com/raytheon/uf/common/dataplugin/cwa/CWARecord.java index 6749b91063..a07f604e38 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.cwa/src/com/raytheon/uf/common/dataplugin/cwa/CWARecord.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.cwa/src/com/raytheon/uf/common/dataplugin/cwa/CWARecord.java @@ -23,6 +23,7 @@ import java.util.Calendar; import javax.persistence.Embedded; import javax.persistence.Entity; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.UniqueConstraint; @@ -30,9 +31,11 @@ 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; import com.raytheon.uf.common.dataplugin.persist.PersistablePluginDataObject; @@ -52,6 +55,7 @@ import com.vividsolutions.jts.geom.Coordinate; * ------------ ---------- ----------- -------------------------- * Feb 1, 2010 jsanchez Initial creation * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @@ -59,6 +63,7 @@ import com.vividsolutions.jts.geom.Coordinate; * @version 1.0 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "cwaseq") @Table(name = "cwa", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.cwat/src/com/raytheon/uf/common/dataplugin/cwat/CWATRecord.java b/edexOsgi/com.raytheon.uf.common.dataplugin.cwat/src/com/raytheon/uf/common/dataplugin/cwat/CWATRecord.java index bfa4ed97c3..c537f0de05 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.cwat/src/com/raytheon/uf/common/dataplugin/cwat/CWATRecord.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.cwat/src/com/raytheon/uf/common/dataplugin/cwat/CWATRecord.java @@ -26,6 +26,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.ManyToOne; import javax.persistence.PrimaryKeyJoinColumn; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.UniqueConstraint; @@ -37,10 +38,11 @@ import javax.xml.bind.annotation.XmlRootElement; import org.geotools.coverage.grid.GeneralGridEnvelope; import org.geotools.coverage.grid.GridGeometry2D; import org.geotools.geometry.GeneralEnvelope; -import org.opengis.referencing.crs.ProjectedCRS; 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; import com.raytheon.uf.common.dataplugin.persist.PersistablePluginDataObject; @@ -72,6 +74,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; * 06/03/09 2037 D. Hladky Initial release * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime * 04/08/13 1293 bkowal Removed references to hdffileid. + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @@ -79,6 +82,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; * @version 1 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "cwatseq") @Table(name = "cwat", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPRecord.java b/edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPRecord.java index bbb8692a15..7f307b1c98 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPRecord.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPRecord.java @@ -33,6 +33,7 @@ import java.util.concurrent.ConcurrentMap; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.UniqueConstraint; @@ -44,6 +45,7 @@ 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; import com.raytheon.uf.common.dataplugin.persist.PersistablePluginDataObject; @@ -78,6 +80,7 @@ import com.raytheon.uf.common.time.util.ImmutableDate; * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime * Apr 8, 2013 1293 bkowal Removed references to hdffileid. * 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. * * * @@ -85,6 +88,7 @@ import com.raytheon.uf.common.time.util.ImmutableDate; * @version 1 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "ffmpseq") @Table(name = "ffmp", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.fog/src/com/raytheon/uf/common/dataplugin/fog/FogRecord.java b/edexOsgi/com.raytheon.uf.common.dataplugin.fog/src/com/raytheon/uf/common/dataplugin/fog/FogRecord.java index b8901536b5..dae9bc0b20 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.fog/src/com/raytheon/uf/common/dataplugin/fog/FogRecord.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.fog/src/com/raytheon/uf/common/dataplugin/fog/FogRecord.java @@ -23,6 +23,7 @@ import java.util.Calendar; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.UniqueConstraint; @@ -34,10 +35,11 @@ import javax.xml.bind.annotation.XmlRootElement; import org.geotools.coverage.grid.GeneralGridEnvelope; import org.geotools.coverage.grid.GridGeometry2D; import org.geotools.geometry.GeneralEnvelope; -import org.opengis.referencing.crs.ProjectedCRS; 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; import com.raytheon.uf.common.dataplugin.persist.IPersistable; @@ -61,6 +63,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; * 12/12/09 D. Hladky Initial release * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime * 04/08/13 1293 bkowal Removed references to hdffileid. + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @@ -68,6 +71,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; * @version 1 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "fogseq") @Table(name = "fog", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.fssobs/src/com/raytheon/uf/common/dataplugin/fssobs/FSSObsRecord.java b/edexOsgi/com.raytheon.uf.common.dataplugin.fssobs/src/com/raytheon/uf/common/dataplugin/fssobs/FSSObsRecord.java index 2a3d297364..0f5b29919e 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.fssobs/src/com/raytheon/uf/common/dataplugin/fssobs/FSSObsRecord.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.fssobs/src/com/raytheon/uf/common/dataplugin/fssobs/FSSObsRecord.java @@ -16,6 +16,7 @@ import javax.measure.unit.Unit; import javax.persistence.Column; import javax.persistence.Embedded; import javax.persistence.Entity; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.UniqueConstraint; @@ -26,6 +27,7 @@ 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; import com.raytheon.uf.common.dataplugin.persist.PersistablePluginDataObject; @@ -38,6 +40,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "fssobsseq") @Table(name = "fssobs", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GFERecord.java b/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GFERecord.java index 5c88a483f7..c661e3defb 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GFERecord.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GFERecord.java @@ -35,6 +35,7 @@ import javax.persistence.FetchType; import javax.persistence.JoinColumn; import javax.persistence.OneToMany; import javax.persistence.OrderBy; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.UniqueConstraint; @@ -74,6 +75,7 @@ import com.raytheon.uf.common.time.TimeRange; * 20071129 472 jkorman Added IDecoderGettable interface. * 06/17/08 #940 bphillip Implemented GFE Locking * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @author randerso @@ -83,6 +85,7 @@ import com.raytheon.uf.common.time.TimeRange; * */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "gfeseq") @Table(name = "gfe", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.goessounding/src/com/raytheon/uf/common/dataplugin/goessounding/GOESSounding.java b/edexOsgi/com.raytheon.uf.common.dataplugin.goessounding/src/com/raytheon/uf/common/dataplugin/goessounding/GOESSounding.java index a58f50db7e..ef3d38fd7f 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.goessounding/src/com/raytheon/uf/common/dataplugin/goessounding/GOESSounding.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.goessounding/src/com/raytheon/uf/common/dataplugin/goessounding/GOESSounding.java @@ -31,6 +31,7 @@ import javax.measure.unit.Unit; import javax.persistence.Column; import javax.persistence.Embedded; import javax.persistence.Entity; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.UniqueConstraint; @@ -40,10 +41,11 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import org.hibernate.annotations.Type; import org.hibernate.annotations.Index; +import org.hibernate.annotations.Type; 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; import com.raytheon.uf.common.dataplugin.persist.PersistablePluginDataObject; @@ -67,6 +69,7 @@ import com.vividsolutions.jts.geom.Geometry; * ------------ ---------- ----------- -------------------------- * 20080414 1077 jkorman Initial implementation. * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @@ -74,6 +77,7 @@ import com.vividsolutions.jts.geom.Geometry; * @version 1.0 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "goessoundingseq") @Table(name = "goessounding", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/GribRecord.java b/edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/GribRecord.java index 5177cec13b..746e3477c0 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/GribRecord.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/GribRecord.java @@ -30,6 +30,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.ManyToOne; import javax.persistence.PrimaryKeyJoinColumn; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.UniqueConstraint; @@ -38,10 +39,12 @@ 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.IPrecomputedRange; +import com.raytheon.uf.common.dataplugin.PluginDataObject; import com.raytheon.uf.common.dataplugin.annotations.DataURI; import com.raytheon.uf.common.dataplugin.persist.IHDFFilePathProvider; import com.raytheon.uf.common.dataplugin.persist.IPersistable; @@ -63,6 +66,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; * 4/7/09 1994 bphillip Initial Creation * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime * 04/08/13 1293 bkowal Removed references to hdffileid. + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @@ -70,6 +74,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; * @version 1 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "gribseq") @Table(name = "grib", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/src/com/raytheon/uf/common/dataplugin/grid/GridRecord.java b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/src/com/raytheon/uf/common/dataplugin/grid/GridRecord.java index 22e4d7ea05..34c12ef9ff 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/src/com/raytheon/uf/common/dataplugin/grid/GridRecord.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/src/com/raytheon/uf/common/dataplugin/grid/GridRecord.java @@ -25,12 +25,15 @@ import java.util.Map; import javax.persistence.Entity; import javax.persistence.ManyToOne; import javax.persistence.PrimaryKeyJoinColumn; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.UniqueConstraint; + 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.level.Level; import com.raytheon.uf.common.dataplugin.persist.IHDFFilePathProvider; @@ -57,6 +60,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; * ------------ ---------- ----------- -------------------------- * May 21, 2012 bsteffen Initial creation * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @@ -64,6 +68,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; * @version 1.0 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "gridseq") @Table(name = "grid", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.ldadhydro/src/com/raytheon/uf/common/dataplugin/ldadhydro/HydroLdadRecord.java b/edexOsgi/com.raytheon.uf.common.dataplugin.ldadhydro/src/com/raytheon/uf/common/dataplugin/ldadhydro/HydroLdadRecord.java index c971fc1f45..9d47861278 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.ldadhydro/src/com/raytheon/uf/common/dataplugin/ldadhydro/HydroLdadRecord.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.ldadhydro/src/com/raytheon/uf/common/dataplugin/ldadhydro/HydroLdadRecord.java @@ -35,6 +35,7 @@ import javax.measure.unit.Unit; import javax.persistence.Column; import javax.persistence.Embedded; import javax.persistence.Entity; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.UniqueConstraint; import javax.xml.bind.annotation.XmlAccessType; @@ -42,9 +43,11 @@ 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; import com.raytheon.uf.common.dataplugin.persist.PersistablePluginDataObject; @@ -67,6 +70,7 @@ import com.vividsolutions.jts.geom.Geometry; * ----------- ---------- ----------- -------------------------- * 9/30/09 vkorolev Initial creation * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @author vkorolev @@ -74,6 +78,7 @@ import com.vividsolutions.jts.geom.Geometry; */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "ldadhydroseq") @Table(name = "ldadhydro", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.ldadmesonet/src/com/raytheon/uf/common/dataplugin/ldadmesonet/MesonetLdadRecord.java b/edexOsgi/com.raytheon.uf.common.dataplugin.ldadmesonet/src/com/raytheon/uf/common/dataplugin/ldadmesonet/MesonetLdadRecord.java index c219a5c943..0c8a68a14e 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.ldadmesonet/src/com/raytheon/uf/common/dataplugin/ldadmesonet/MesonetLdadRecord.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.ldadmesonet/src/com/raytheon/uf/common/dataplugin/ldadmesonet/MesonetLdadRecord.java @@ -35,6 +35,7 @@ import javax.measure.unit.Unit; import javax.persistence.Column; import javax.persistence.Embedded; import javax.persistence.Entity; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.UniqueConstraint; @@ -43,9 +44,11 @@ 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; import com.raytheon.uf.common.dataplugin.persist.PersistablePluginDataObject; @@ -68,6 +71,7 @@ import com.vividsolutions.jts.geom.Geometry; * ----------- ---------- ----------- -------------------------- * 9/4/09 vkorolev Initial creation * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @author vkorolev @@ -75,6 +79,7 @@ import com.vividsolutions.jts.geom.Geometry; */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "ldadmesonetseq") @Table(name = "ldadmesonet", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.lsr/src/com/raytheon/uf/common/dataplugin/lsr/LocalStormReport.java b/edexOsgi/com.raytheon.uf.common.dataplugin.lsr/src/com/raytheon/uf/common/dataplugin/lsr/LocalStormReport.java index 0ba573f822..e22cd1a778 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.lsr/src/com/raytheon/uf/common/dataplugin/lsr/LocalStormReport.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.lsr/src/com/raytheon/uf/common/dataplugin/lsr/LocalStormReport.java @@ -34,6 +34,7 @@ import javax.measure.unit.Unit; import javax.persistence.Column; import javax.persistence.Embedded; import javax.persistence.Entity; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.UniqueConstraint; @@ -41,9 +42,11 @@ 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; import com.raytheon.uf.common.dataplugin.persist.PersistablePluginDataObject; @@ -65,6 +68,7 @@ import com.vividsolutions.jts.geom.Geometry; * ------------ ---------- ----------- -------------------------- * Oct 1, 2009 jkorman Initial creation * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @@ -72,6 +76,7 @@ import com.vividsolutions.jts.geom.Geometry; * @version 1.0 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "lsrseq") @Table(name = "lsr", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.npp.crimss/src/com/raytheon/uf/common/dataplugin/npp/crimss/CrimssRecord.java b/edexOsgi/com.raytheon.uf.common.dataplugin.npp.crimss/src/com/raytheon/uf/common/dataplugin/npp/crimss/CrimssRecord.java index 3011957631..7cc3ce4583 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.npp.crimss/src/com/raytheon/uf/common/dataplugin/npp/crimss/CrimssRecord.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.npp.crimss/src/com/raytheon/uf/common/dataplugin/npp/crimss/CrimssRecord.java @@ -20,12 +20,14 @@ package com.raytheon.uf.common.dataplugin.npp.crimss; 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; import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; @@ -39,6 +41,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * Dec 2, 2011 bsteffen Initial creation + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @@ -46,6 +49,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; * @version 1.0 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "crimssseq") @Table(name = "crimss", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) @DynamicSerialize @XmlRootElement diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.npp.nucaps/src/com/raytheon/uf/common/dataplugin/npp/nucaps/NucapsRecord.java b/edexOsgi/com.raytheon.uf.common.dataplugin.npp.nucaps/src/com/raytheon/uf/common/dataplugin/npp/nucaps/NucapsRecord.java index 4121190489..421c29efab 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.npp.nucaps/src/com/raytheon/uf/common/dataplugin/npp/nucaps/NucapsRecord.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.npp.nucaps/src/com/raytheon/uf/common/dataplugin/npp/nucaps/NucapsRecord.java @@ -20,12 +20,14 @@ package com.raytheon.uf.common.dataplugin.npp.nucaps; 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; import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; @@ -39,6 +41,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * Jan 15, 2013 mschenke Initial creation + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @@ -46,6 +49,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; * @version 1.0 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "nucapsseq") @Table(name = "nucaps", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) @DynamicSerialize @XmlRootElement diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.npp.sounding/src/com/raytheon/uf/common/dataplugin/npp/sounding/NPPSoundingRecord.java b/edexOsgi/com.raytheon.uf.common.dataplugin.npp.sounding/src/com/raytheon/uf/common/dataplugin/npp/sounding/NPPSoundingRecord.java index 40b0481ff8..5c72292193 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.npp.sounding/src/com/raytheon/uf/common/dataplugin/npp/sounding/NPPSoundingRecord.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.npp.sounding/src/com/raytheon/uf/common/dataplugin/npp/sounding/NPPSoundingRecord.java @@ -21,7 +21,7 @@ package com.raytheon.uf.common.dataplugin.npp.sounding; import javax.persistence.Column; import javax.persistence.Embedded; -import javax.persistence.Entity; +import javax.persistence.MappedSuperclass; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; @@ -44,13 +44,14 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * Jan 3, 2013 mschenke Initial creation + * Apr 12, 2013 1857 bgonzale Changed to MappedSuperclass. * * * * @author mschenke * @version 1.0 */ -@Entity +@MappedSuperclass @DynamicSerialize @XmlAccessorType(XmlAccessType.NONE) public abstract class NPPSoundingRecord extends PersistablePluginDataObject diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.npp.viirs/src/com/raytheon/uf/common/dataplugin/npp/viirs/VIIRSDataRecord.java b/edexOsgi/com.raytheon.uf.common.dataplugin.npp.viirs/src/com/raytheon/uf/common/dataplugin/npp/viirs/VIIRSDataRecord.java index efeafe9f36..2faeabe67f 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.npp.viirs/src/com/raytheon/uf/common/dataplugin/npp/viirs/VIIRSDataRecord.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.npp.viirs/src/com/raytheon/uf/common/dataplugin/npp/viirs/VIIRSDataRecord.java @@ -27,11 +27,14 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.ManyToOne; import javax.persistence.PrimaryKeyJoinColumn; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.UniqueConstraint; + 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; import com.raytheon.uf.common.geospatial.ISpatialEnabled; @@ -50,6 +53,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; * ------------ ---------- ----------- -------------------------- * Nov 30, 2011 mschenke Initial creation * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @@ -57,6 +61,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; * @version 1.0 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "viirsseq") @Table(name = "viirs", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.obs/src/com/raytheon/uf/common/dataplugin/obs/metar/MetarRecord.java b/edexOsgi/com.raytheon.uf.common.dataplugin.obs/src/com/raytheon/uf/common/dataplugin/obs/metar/MetarRecord.java index a603ddef88..5f6160f1d1 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.obs/src/com/raytheon/uf/common/dataplugin/obs/metar/MetarRecord.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.obs/src/com/raytheon/uf/common/dataplugin/obs/metar/MetarRecord.java @@ -42,6 +42,7 @@ import javax.measure.unit.Unit; import javax.persistence.Column; import javax.persistence.Embedded; import javax.persistence.Entity; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.UniqueConstraint; @@ -49,9 +50,11 @@ 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.obs.metar.util.SkyCover; import com.raytheon.uf.common.dataplugin.obs.metar.util.WeatherCondition; @@ -85,12 +88,14 @@ import com.raytheon.uf.common.time.util.TimeUtil; * 20090528 2225 jsanchez Implemented tempFromTenths and dewPointFromTenths. * 20090629 2538 jsanchez Made the sort public. * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @author bphillip * @version 1 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "obsseq") @Table(name = "obs", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.pirep/src/com/raytheon/uf/common/dataplugin/pirep/PirepRecord.java b/edexOsgi/com.raytheon.uf.common.dataplugin.pirep/src/com/raytheon/uf/common/dataplugin/pirep/PirepRecord.java index 39c055ee89..32171b6671 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.pirep/src/com/raytheon/uf/common/dataplugin/pirep/PirepRecord.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.pirep/src/com/raytheon/uf/common/dataplugin/pirep/PirepRecord.java @@ -39,6 +39,7 @@ import javax.persistence.Embedded; import javax.persistence.Entity; import javax.persistence.FetchType; import javax.persistence.OneToMany; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.UniqueConstraint; @@ -47,6 +48,7 @@ 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; @@ -77,6 +79,7 @@ import com.vividsolutions.jts.geom.Geometry; * 08/09/2012 1011 jkorman Added separate max icing level as well * as separated code to generate distinct max icing/turbulence levels. Removed * code that used "display" boolean to determine data access. + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @@ -84,6 +87,7 @@ import com.vividsolutions.jts.geom.Geometry; * @version 1.0 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "pirepseq") @Table(name = "pirep", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.poessounding/src/com/raytheon/uf/common/dataplugin/poessounding/POESSounding.java b/edexOsgi/com.raytheon.uf.common.dataplugin.poessounding/src/com/raytheon/uf/common/dataplugin/poessounding/POESSounding.java index 75a09c86bc..e559ae1336 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.poessounding/src/com/raytheon/uf/common/dataplugin/poessounding/POESSounding.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.poessounding/src/com/raytheon/uf/common/dataplugin/poessounding/POESSounding.java @@ -30,6 +30,7 @@ import javax.measure.unit.Unit; import javax.persistence.Column; import javax.persistence.Embedded; import javax.persistence.Entity; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.UniqueConstraint; @@ -37,9 +38,11 @@ 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; import com.raytheon.uf.common.geospatial.ISpatialEnabled; @@ -61,6 +64,7 @@ import com.vividsolutions.jts.geom.Geometry; * ------------ ---------- ----------- -------------------------- * 20080303 1026 jkorman Initial implementation. * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @@ -68,6 +72,7 @@ import com.vividsolutions.jts.geom.Geometry; * @version 1.0 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "poessoundingseq") @Table(name = "poessounding", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.preciprate/src/com/raytheon/uf/common/dataplugin/preciprate/PrecipRateRecord.java b/edexOsgi/com.raytheon.uf.common.dataplugin.preciprate/src/com/raytheon/uf/common/dataplugin/preciprate/PrecipRateRecord.java index c0b76fb48e..279e0eb64b 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.preciprate/src/com/raytheon/uf/common/dataplugin/preciprate/PrecipRateRecord.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.preciprate/src/com/raytheon/uf/common/dataplugin/preciprate/PrecipRateRecord.java @@ -27,6 +27,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.ManyToOne; import javax.persistence.PrimaryKeyJoinColumn; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.UniqueConstraint; @@ -38,10 +39,11 @@ import javax.xml.bind.annotation.XmlRootElement; import org.geotools.coverage.grid.GeneralGridEnvelope; import org.geotools.coverage.grid.GridGeometry2D; import org.geotools.geometry.GeneralEnvelope; -import org.opengis.referencing.crs.ProjectedCRS; 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; import com.raytheon.uf.common.dataplugin.radar.RadarStation; @@ -74,6 +76,7 @@ import com.raytheon.uf.common.status.UFStatus.Priority; * 01/25/10 3796 D. Hladky Initial release * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime * 04/08/13 1293 bkowal Removed references to hdffileid. + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @@ -81,6 +84,7 @@ import com.raytheon.uf.common.status.UFStatus.Priority; * @version 1 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "preciprateseq") @Table(name = "preciprate", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.profiler/src/com/raytheon/uf/common/dataplugin/profiler/ProfilerObs.java b/edexOsgi/com.raytheon.uf.common.dataplugin.profiler/src/com/raytheon/uf/common/dataplugin/profiler/ProfilerObs.java index 54e5ac1e46..d81e88c300 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.profiler/src/com/raytheon/uf/common/dataplugin/profiler/ProfilerObs.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.profiler/src/com/raytheon/uf/common/dataplugin/profiler/ProfilerObs.java @@ -35,6 +35,7 @@ import javax.measure.unit.Unit; import javax.persistence.Column; import javax.persistence.Embedded; import javax.persistence.Entity; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.UniqueConstraint; @@ -43,9 +44,11 @@ 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; import com.raytheon.uf.common.dataplugin.persist.PersistablePluginDataObject; @@ -71,6 +74,7 @@ import com.vividsolutions.jts.geom.Geometry; * and plotted Profiler plots. * 20090610 2489 jsanchez Updated the windSpeeed & windDirection. * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @@ -78,6 +82,7 @@ import com.vividsolutions.jts.geom.Geometry; * @version 1.0 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "profilerseq") @Table(name = "profiler", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.qc/src/com/raytheon/uf/common/dataplugin/qc/QCRecord.java b/edexOsgi/com.raytheon.uf.common.dataplugin.qc/src/com/raytheon/uf/common/dataplugin/qc/QCRecord.java index a80009e65b..9f79895832 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.qc/src/com/raytheon/uf/common/dataplugin/qc/QCRecord.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.qc/src/com/raytheon/uf/common/dataplugin/qc/QCRecord.java @@ -26,6 +26,7 @@ import javax.persistence.Column; import javax.persistence.Embeddable; import javax.persistence.Embedded; import javax.persistence.Entity; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.UniqueConstraint; @@ -33,6 +34,7 @@ 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; @@ -54,6 +56,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; * ------------ ---------- ----------- -------------------------- * 12/07/2009 3408 bphillip Initial creation * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @@ -61,6 +64,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; * @version 1.0 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "qcseq") @Table(name = "qc", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.qpf/src/com/raytheon/uf/common/dataplugin/qpf/QPFRecord.java b/edexOsgi/com.raytheon.uf.common.dataplugin.qpf/src/com/raytheon/uf/common/dataplugin/qpf/QPFRecord.java index 2f5188eb6d..6bb89f63d8 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.qpf/src/com/raytheon/uf/common/dataplugin/qpf/QPFRecord.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.qpf/src/com/raytheon/uf/common/dataplugin/qpf/QPFRecord.java @@ -23,6 +23,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.ManyToOne; import javax.persistence.PrimaryKeyJoinColumn; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.UniqueConstraint; @@ -34,10 +35,11 @@ import javax.xml.bind.annotation.XmlRootElement; import org.geotools.coverage.grid.GeneralGridEnvelope; import org.geotools.coverage.grid.GridGeometry2D; import org.geotools.geometry.GeneralEnvelope; -import org.opengis.referencing.crs.ProjectedCRS; 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; import com.raytheon.uf.common.dataplugin.radar.RadarStation; @@ -65,6 +67,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; * match Java conventions. * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime * 04/08/13 #1293 bkowal Removed references to hdffileid. + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @@ -72,6 +75,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; * @version 1 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "qpfseq") @Table(name = "qpf", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/RadarRecord.java b/edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/RadarRecord.java index 9532367f44..5652b83dcc 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/RadarRecord.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/RadarRecord.java @@ -37,6 +37,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.ManyToOne; import javax.persistence.PrimaryKeyJoinColumn; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.UniqueConstraint; @@ -44,12 +45,13 @@ 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 org.geotools.referencing.GeodeticCalculator; +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.IHDFFilePathProvider; import com.raytheon.uf.common.dataplugin.persist.PersistablePluginDataObject; @@ -124,12 +126,14 @@ import com.vividsolutions.jts.geom.Coordinate; * HDF5. * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime * Apr 08, 2013 1293 bkowal Removed references to hdffileid. + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @author bphillip * @version 1 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "radarseq") @Table(name = "radar", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/SatelliteRecord.java b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/SatelliteRecord.java index 754f616ae6..16e728ec96 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/SatelliteRecord.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/SatelliteRecord.java @@ -24,6 +24,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.ManyToOne; import javax.persistence.PrimaryKeyJoinColumn; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.UniqueConstraint; import javax.xml.bind.annotation.XmlAccessType; @@ -31,9 +32,11 @@ 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.PersistablePluginDataObject; import com.raytheon.uf.common.datastorage.DataStoreFactory; @@ -63,12 +66,14 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; * 03/25/2013 1823 dgilling Replace underscores with spaces in URI * constructor. * 04/08/2013 1293 bkowal Removed references to hdffileid. + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @author bphillip * @version 1 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "satelliteseq") @Table(name = "satellite", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.scan/src/com/raytheon/uf/common/dataplugin/scan/ScanRecord.java b/edexOsgi/com.raytheon.uf.common.dataplugin.scan/src/com/raytheon/uf/common/dataplugin/scan/ScanRecord.java index 3926ec872c..3268ef4dcd 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.scan/src/com/raytheon/uf/common/dataplugin/scan/ScanRecord.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.scan/src/com/raytheon/uf/common/dataplugin/scan/ScanRecord.java @@ -25,6 +25,7 @@ import java.util.Set; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.UniqueConstraint; @@ -37,6 +38,7 @@ 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; import com.raytheon.uf.common.dataplugin.scan.data.ModelData; @@ -69,6 +71,7 @@ import com.raytheon.uf.common.status.UFStatus.Priority; * Feb 28, 2013 1731 bsteffen Optimize construction of scan resource. * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime * Apr 8, 2013 1293 bkowal Removed references to hdffileid. + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @@ -77,6 +80,7 @@ import com.raytheon.uf.common.status.UFStatus.Priority; */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "scanseq") @Table(name = "scan", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.sfcobs/src/com/raytheon/uf/common/dataplugin/sfcobs/ObsCommon.java b/edexOsgi/com.raytheon.uf.common.dataplugin.sfcobs/src/com/raytheon/uf/common/dataplugin/sfcobs/ObsCommon.java index 0e198c21b3..f44871707d 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.sfcobs/src/com/raytheon/uf/common/dataplugin/sfcobs/ObsCommon.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.sfcobs/src/com/raytheon/uf/common/dataplugin/sfcobs/ObsCommon.java @@ -37,6 +37,7 @@ import javax.measure.unit.Unit; import javax.persistence.Column; import javax.persistence.Embedded; import javax.persistence.Entity; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.UniqueConstraint; @@ -49,6 +50,7 @@ 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; import com.raytheon.uf.common.geospatial.ISpatialEnabled; @@ -69,6 +71,7 @@ import com.vividsolutions.jts.geom.Geometry; * ------------ ---------- ----------- -------------------------- * Oct 1, 2009 jkorman Initial creation * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @@ -76,6 +79,7 @@ import com.vividsolutions.jts.geom.Geometry; * @version 1.0 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "sfcobsseq") @Table(name = "sfcobs", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.svrwx/src/com/raytheon/uf/common/dataplugin/svrwx/SvrWxRecord.java b/edexOsgi/com.raytheon.uf.common.dataplugin.svrwx/src/com/raytheon/uf/common/dataplugin/svrwx/SvrWxRecord.java index d39d17fc06..4a8a102ec7 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.svrwx/src/com/raytheon/uf/common/dataplugin/svrwx/SvrWxRecord.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.svrwx/src/com/raytheon/uf/common/dataplugin/svrwx/SvrWxRecord.java @@ -24,6 +24,7 @@ import java.util.Calendar; import javax.persistence.Column; import javax.persistence.Embedded; import javax.persistence.Entity; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.UniqueConstraint; @@ -31,9 +32,11 @@ 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; import com.raytheon.uf.common.geospatial.ISpatialEnabled; @@ -54,6 +57,7 @@ import com.vividsolutions.jts.geom.Geometry; * ------------ ---------- ----------- -------------------------- * Jan 4, 2010 jsanchez Initial creation * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @@ -61,6 +65,7 @@ import com.vividsolutions.jts.geom.Geometry; * @version 1.0 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "svrwxseq") @Table(name = "svrwx", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.tcg/src/com/raytheon/uf/common/dataplugin/tcg/TropicalCycloneGuidance.java b/edexOsgi/com.raytheon.uf.common.dataplugin.tcg/src/com/raytheon/uf/common/dataplugin/tcg/TropicalCycloneGuidance.java index b076b847f7..faf6b43b58 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.tcg/src/com/raytheon/uf/common/dataplugin/tcg/TropicalCycloneGuidance.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.tcg/src/com/raytheon/uf/common/dataplugin/tcg/TropicalCycloneGuidance.java @@ -24,6 +24,7 @@ import java.util.Calendar; import javax.persistence.Column; import javax.persistence.Embedded; import javax.persistence.Entity; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.UniqueConstraint; @@ -31,9 +32,11 @@ 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; import com.raytheon.uf.common.geospatial.ISpatialEnabled; @@ -54,6 +57,7 @@ import com.vividsolutions.jts.geom.Geometry; * ------------ ---------- ----------- -------------------------- * Oct 28, 2009 jsanchez Initial creation * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @@ -61,6 +65,7 @@ import com.vividsolutions.jts.geom.Geometry; * @version 1.0 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "tcgseq") @Table(name = "tcg", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.tcs/src/com/raytheon/uf/common/dataplugin/tcs/TropicalCycloneSummary.java b/edexOsgi/com.raytheon.uf.common.dataplugin.tcs/src/com/raytheon/uf/common/dataplugin/tcs/TropicalCycloneSummary.java index bd5004d068..f54c05b896 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.tcs/src/com/raytheon/uf/common/dataplugin/tcs/TropicalCycloneSummary.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.tcs/src/com/raytheon/uf/common/dataplugin/tcs/TropicalCycloneSummary.java @@ -25,6 +25,7 @@ import java.util.Calendar; import javax.persistence.Column; import javax.persistence.Embedded; import javax.persistence.Entity; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.UniqueConstraint; @@ -32,9 +33,11 @@ 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; import com.raytheon.uf.common.geospatial.ISpatialEnabled; @@ -55,6 +58,7 @@ import com.vividsolutions.jts.geom.Geometry; * ------------ ---------- ----------- -------------------------- * Nov 12, 2009 jsanchez Initial creation * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @@ -62,6 +66,7 @@ import com.vividsolutions.jts.geom.Geometry; * @version 1.0 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "tcsseq") @Table(name = "tcs", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.vaa/src/com/raytheon/uf/common/dataplugin/vaa/VAARecord.java b/edexOsgi/com.raytheon.uf.common.dataplugin.vaa/src/com/raytheon/uf/common/dataplugin/vaa/VAARecord.java index 0827c8242d..c3cb8a4c3c 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.vaa/src/com/raytheon/uf/common/dataplugin/vaa/VAARecord.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.vaa/src/com/raytheon/uf/common/dataplugin/vaa/VAARecord.java @@ -28,13 +28,14 @@ import javax.persistence.Embedded; import javax.persistence.Entity; import javax.persistence.FetchType; import javax.persistence.OneToMany; +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; @@ -50,22 +51,24 @@ import com.vividsolutions.jts.geom.Geometry; * * * 
- *
+ * 
  * SOFTWARE HISTORY
- *
+ * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Nov 4, 2009            jkorman     Initial creation
  * Apr 4, 2013        1846 bkowal      Added an index on refTime and forecastTime
- *
+ * Apr 12, 2013       1857 bgonzale    Added SequenceGenerator annotation.
+ * 
  *
- * + * * @author jkorman - * @version 1.0 + * @version 1.0 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "vaaseq") @Table(name = "vaa", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.vil/src/com/raytheon/uf/common/dataplugin/vil/VILRecord.java b/edexOsgi/com.raytheon.uf.common.dataplugin.vil/src/com/raytheon/uf/common/dataplugin/vil/VILRecord.java index e5a1b2bdd4..48da835a0a 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.vil/src/com/raytheon/uf/common/dataplugin/vil/VILRecord.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.vil/src/com/raytheon/uf/common/dataplugin/vil/VILRecord.java @@ -23,6 +23,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.ManyToOne; import javax.persistence.PrimaryKeyJoinColumn; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.UniqueConstraint; @@ -34,10 +35,11 @@ import javax.xml.bind.annotation.XmlRootElement; import org.geotools.coverage.grid.GeneralGridEnvelope; import org.geotools.coverage.grid.GridGeometry2D; import org.geotools.geometry.GeneralEnvelope; -import org.opengis.referencing.crs.ProjectedCRS; 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; import com.raytheon.uf.common.dataplugin.radar.RadarStation; @@ -62,6 +64,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; * 1/14/09 2027 D. Hladky Initial release * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime * 04/08/13 #1293 bkowal Removed references to hdffileid. + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @@ -69,6 +72,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; * @version 1 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "vilseq") @Table(name = "vil", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/AbstractWarningRecord.java b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/AbstractWarningRecord.java index 48fa857b8d..76ec98bf6c 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/AbstractWarningRecord.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/AbstractWarningRecord.java @@ -32,6 +32,7 @@ import javax.persistence.FetchType; import javax.persistence.Inheritance; import javax.persistence.InheritanceType; import javax.persistence.OneToMany; +import javax.persistence.SequenceGenerator; import javax.persistence.Transient; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; @@ -59,6 +60,7 @@ import com.vividsolutions.jts.geom.Geometry; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * 03/12/2007 1003 bwoodle initial creation + * 04/12/2013 1857 bgonzale Added SequenceGenerator annotation. * * * @@ -66,6 +68,7 @@ import com.vividsolutions.jts.geom.Geometry; * @version 1 */ @Entity +@SequenceGenerator(name = PluginDataObject.ID_GEN) @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) @XmlAccessorType(XmlAccessType.NONE) @DynamicSerialize diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/PracticeWarningRecord.java b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/PracticeWarningRecord.java index c55e0b5371..a9e1ca59d9 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/PracticeWarningRecord.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/PracticeWarningRecord.java @@ -23,13 +23,16 @@ package com.raytheon.uf.common.dataplugin.warning; import java.util.List; 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 org.hibernate.annotations.Index; +import com.raytheon.uf.common.dataplugin.PluginDataObject; import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; /** @@ -42,6 +45,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; * ------------ ---------- ----------- -------------------------- * 10/04/2011 10049 bgonzale initial creation * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @@ -49,6 +53,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; * @version 1 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "practicewarningseq") @Table(name = "practicewarning", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/WarningRecord.java b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/WarningRecord.java index 876d994a76..6f2acadde3 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/WarningRecord.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/WarningRecord.java @@ -25,13 +25,16 @@ import java.util.List; import java.util.Map; 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 org.hibernate.annotations.Index; +import com.raytheon.uf.common.dataplugin.PluginDataObject; import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; /** @@ -44,6 +47,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; * ------------ ---------- ----------- -------------------------- * 03/12/2007 1003 bwoodle initial creation * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @@ -52,6 +56,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; */ @Entity @XmlAccessorType(XmlAccessType.NONE) +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "warningseq") @Table(name = "warning", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/PluginDataObject.java b/edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/PluginDataObject.java index f2028b31c5..52526f4578 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/PluginDataObject.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/PluginDataObject.java @@ -26,12 +26,12 @@ import java.util.Map; import javax.persistence.Column; import javax.persistence.Embedded; -import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Inheritance; import javax.persistence.InheritanceType; +import javax.persistence.MappedSuperclass; import javax.persistence.Transient; import javax.xml.bind.JAXBException; import javax.xml.bind.annotation.XmlAccessType; @@ -72,11 +72,14 @@ import com.raytheon.uf.common.util.ConvertUtil; * 2/6/09 1990 bphillip Added database index on dataURI * 3/18/09 2105 jsanchez Added getter for id. * Removed unused getIdentfier(). + * Apr 12, 2013 1857 bgonzale Changed to MappedSuperclass, named generator, + * GenerationType SEQUENCE, moved Indexes to getter + * methods. * * * */ -@Entity +@MappedSuperclass @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) @XmlAccessorType(XmlAccessType.NONE) @DynamicSerialize @@ -85,10 +88,9 @@ public abstract class PluginDataObject extends PersistableDataObject implements private static final long serialVersionUID = 1L; - // @GenericGenerator(name = "generator", strategy = "hilo", parameters = { - // @Parameter(name = "max_lo", value = "1000") }) - // @GeneratedValue(generator = "generator") - @GeneratedValue(strategy = GenerationType.AUTO) + public static final String ID_GEN = "idgen"; + + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = ID_GEN) @Id protected int id; @@ -112,7 +114,6 @@ public abstract class PluginDataObject extends PersistableDataObject implements /** The timestamp denoting when this record was inserted into the database */ @Column(columnDefinition = "timestamp without time zone") - @Index(name = "insertTimeIndex") @XmlAttribute @DynamicSerializeElement protected Calendar insertTime; @@ -395,6 +396,7 @@ public abstract class PluginDataObject extends PersistableDataObject implements return dataTime; } + @Index(name = "dataURI_idx") public String getDataURI() { return this.dataURI; } @@ -403,6 +405,7 @@ public abstract class PluginDataObject extends PersistableDataObject implements return SerializationUtil.marshalToXml(this); } + @Index(name = "insertTimeIndex") public Calendar getInsertTime() { return insertTime; } diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/PersistablePluginDataObject.java b/edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/PersistablePluginDataObject.java index 9ba6f66839..e900aa46b0 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/PersistablePluginDataObject.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/PersistablePluginDataObject.java @@ -23,9 +23,7 @@ import java.util.Calendar; import java.util.Date; import java.util.TimeZone; -import javax.persistence.Entity; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; +import javax.persistence.MappedSuperclass; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; @@ -43,14 +41,14 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; * ------------ ---------- ----------- -------------------------- * Dec 16, 2008 chammack Initial creation * Apr 8, 2013 1293 bkowal Removed references to hdffileid. + * Apr 12, 2013 1857 bgonzale Changed to MappedSuperclass. * * * * @author chammack * @version 1.0 */ -@Entity -@Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) +@MappedSuperclass @XmlAccessorType(XmlAccessType.NONE) @DynamicSerialize public abstract class PersistablePluginDataObject extends PluginDataObject diff --git a/edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/DataTime.java b/edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/DataTime.java index 5d6de233ae..2e0f5b4faf 100644 --- a/edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/DataTime.java +++ b/edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/DataTime.java @@ -40,6 +40,7 @@ import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; import org.apache.commons.lang.builder.HashCodeBuilder; +import org.hibernate.annotations.Index; import org.hibernate.annotations.Type; import com.raytheon.uf.common.serialization.ISerializableObject; @@ -59,6 +60,7 @@ import com.raytheon.uf.common.time.util.TimeUtil; * ------------ ---------- ----------- -------------------------- * Jim Ramer Original Code * Jun 18, 2007 chammack Partial port to Java + * Apr 12, 2013 1857 bgonzale Added Index annotations to getter methods. * * * @@ -342,6 +344,7 @@ public class DataTime implements Comparable, Serializable, /** * @return the refTime */ + @Index(name = "refTimeIndex") public Date getRefTime() { return this.refTime; } @@ -358,6 +361,7 @@ public class DataTime implements Comparable, Serializable, /** * @return the fcstTime */ + @Index(name = "fcstTimeIndex") public int getFcstTime() { return fcstTime; } diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.mesowest/src/com/raytheon/uf/edex/plugin/mesowest/common/MESOWestRecord.java b/edexOsgi/com.raytheon.uf.edex.plugin.mesowest/src/com/raytheon/uf/edex/plugin/mesowest/common/MESOWestRecord.java index f5b9ff93be..4942f10055 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.mesowest/src/com/raytheon/uf/edex/plugin/mesowest/common/MESOWestRecord.java +++ b/edexOsgi/com.raytheon.uf.edex.plugin.mesowest/src/com/raytheon/uf/edex/plugin/mesowest/common/MESOWestRecord.java @@ -34,6 +34,7 @@ import javax.measure.unit.Unit; import javax.persistence.Column; import javax.persistence.Embedded; import javax.persistence.Entity; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.UniqueConstraint; import javax.xml.bind.annotation.XmlAccessType; @@ -55,19 +56,21 @@ import com.vividsolutions.jts.geom.Geometry; * * * 
- *
+ * 
  * SOFTWARE HISTORY
- *
+ * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Mar 3, 2009            jkorman     Initial creation
- *
+ * Apr 12, 2013       1857 bgonzale    Added SequenceGenerator annotation.
+ * 
  *
- * + * * @author jkorman - * @version 1.0 + * @version 1.0 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "mesowestseq") @Table(name = "mesowest", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) @XmlRootElement @XmlAccessorType(XmlAccessType.NONE) diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.scan/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.plugin.scan/META-INF/MANIFEST.MF index 8b6ba6eafc..ba07732958 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.scan/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.plugin.scan/META-INF/MANIFEST.MF @@ -23,5 +23,6 @@ Export-Package: com.raytheon.uf.edex.plugin.scan, Import-Package: com.raytheon.uf.common.localization, com.raytheon.uf.edex.dat.utils, com.raytheon.uf.edex.plugin.scan.common, + com.raytheon.uf.edex.menus, javax.measure.converter, javax.measure.unit diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.airmet/src/gov/noaa/nws/ncep/common/dataplugin/airmet/AirmetRecord.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.airmet/src/gov/noaa/nws/ncep/common/dataplugin/airmet/AirmetRecord.java index bd3fc6f37e..69393e230c 100644 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.airmet/src/gov/noaa/nws/ncep/common/dataplugin/airmet/AirmetRecord.java +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.airmet/src/gov/noaa/nws/ncep/common/dataplugin/airmet/AirmetRecord.java @@ -18,6 +18,7 @@ * 09/2011 Chin Chen changed to improve purge performance and * removed xml serialization as well * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * This code has been developed by the SIB for use in the AWIPS2 system. @@ -28,26 +29,27 @@ package gov.noaa.nws.ncep.common.dataplugin.airmet; import java.util.Calendar; import java.util.HashSet; import java.util.Set; -import com.raytheon.uf.common.dataplugin.PluginDataObject; -import com.raytheon.uf.common.dataplugin.IDecoderGettable; import javax.persistence.CascadeType; import javax.persistence.Column; - import javax.persistence.Entity; import javax.persistence.FetchType; import javax.persistence.JoinColumn; import javax.persistence.OneToMany; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.UniqueConstraint; 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.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "airmetseq") @Table(name = "airmet", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.atcf/src/gov/noaa/nws/ncep/common/dataplugin/atcf/AtcfRecord.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.atcf/src/gov/noaa/nws/ncep/common/dataplugin/atcf/AtcfRecord.java index 3158134b72..4b40c7f039 100644 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.atcf/src/gov/noaa/nws/ncep/common/dataplugin/atcf/AtcfRecord.java +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.atcf/src/gov/noaa/nws/ncep/common/dataplugin/atcf/AtcfRecord.java @@ -20,26 +20,28 @@ package gov.noaa.nws.ncep.common.dataplugin.atcf; +import gov.noaa.nws.ncep.common.tools.IDecoderConstantsN; + import java.util.Calendar; import javax.persistence.Column; 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.XmlElement; import javax.xml.bind.annotation.XmlRootElement; + import org.hibernate.annotations.Index; -import com.raytheon.uf.common.dataplugin.PluginDataObject; 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.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; -import gov.noaa.nws.ncep.common.tools.IDecoderConstantsN; - /** * AtcfRecord is the Data Access component for ATCF Automated Tropical Cyclone * Forecast. This contains getters and setters for the main parent table atcf. @@ -54,6 +56,7 @@ import gov.noaa.nws.ncep.common.tools.IDecoderConstantsN; * 06/23/10 208 F. J. Yen Initial Coding. * 03/10/12 606 G. Hull added reportType to URI * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @@ -61,6 +64,7 @@ import gov.noaa.nws.ncep.common.tools.IDecoderConstantsN; * @version 1.0 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "atcfseq") @Table(name = "atcf", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.aww/src/gov/noaa/nws/ncep/common/dataplugin/aww/AwwRecord.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.aww/src/gov/noaa/nws/ncep/common/dataplugin/aww/AwwRecord.java index bd0145c967..f17aabfc46 100644 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.aww/src/gov/noaa/nws/ncep/common/dataplugin/aww/AwwRecord.java +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.aww/src/gov/noaa/nws/ncep/common/dataplugin/aww/AwwRecord.java @@ -24,6 +24,7 @@ * 09/2011 Chin Chen changed to improve purge performance and * removed xml serialization as well * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * This code has been developed by the SIB for use in the AWIPS2 system. @@ -33,11 +34,7 @@ package gov.noaa.nws.ncep.common.dataplugin.aww; import java.util.Calendar; import java.util.HashSet; -import java.util.Iterator; import java.util.Set; -import gov.noaa.nws.ncep.common.dataplugin.aww.AwwUgc; -import com.raytheon.uf.common.dataplugin.PluginDataObject; -import com.raytheon.uf.common.dataplugin.IDecoderGettable; import javax.persistence.CascadeType; import javax.persistence.Column; @@ -45,22 +42,20 @@ import javax.persistence.Entity; import javax.persistence.FetchType; import javax.persistence.JoinColumn; import javax.persistence.OneToMany; +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 org.hibernate.annotations.OnDelete; -import org.hibernate.annotations.OnDeleteAction; +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.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "awwseq") @Table(name = "aww", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.convsigmet/src/gov/noaa/nws/ncep/common/dataplugin/convsigmet/ConvSigmetRecord.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.convsigmet/src/gov/noaa/nws/ncep/common/dataplugin/convsigmet/ConvSigmetRecord.java index 2693ff5bf6..6bc1f7332b 100644 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.convsigmet/src/gov/noaa/nws/ncep/common/dataplugin/convsigmet/ConvSigmetRecord.java +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.convsigmet/src/gov/noaa/nws/ncep/common/dataplugin/convsigmet/ConvSigmetRecord.java @@ -12,6 +12,7 @@ * 09/2011 Chin Chen changed to improve purge performance and * removed xml serialization as well * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * This code has been developed by the SIB for use in the AWIPS2 system. @@ -19,31 +20,32 @@ package gov.noaa.nws.ncep.common.dataplugin.convsigmet; +import gov.noaa.nws.ncep.common.tools.IDecoderConstantsN; + import java.util.Calendar; import java.util.HashSet; import java.util.Set; -import com.raytheon.uf.common.dataplugin.PluginDataObject; -import com.raytheon.uf.common.dataplugin.IDecoderGettable; - -import gov.noaa.nws.ncep.common.tools.IDecoderConstantsN; import javax.persistence.CascadeType; import javax.persistence.Column; - import javax.persistence.Entity; import javax.persistence.FetchType; import javax.persistence.JoinColumn; import javax.persistence.OneToMany; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.UniqueConstraint; 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.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "convsigmetseq") @Table(name = "convsigmet", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since @@ -56,8 +58,6 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; } ) @DynamicSerialize - - public class ConvSigmetRecord extends PluginDataObject{ /** diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.ffg/src/gov/noaa/nws/ncep/common/dataplugin/ffg/FfgRecord.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.ffg/src/gov/noaa/nws/ncep/common/dataplugin/ffg/FfgRecord.java index 5e7ee7070a..63b6de0d62 100644 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.ffg/src/gov/noaa/nws/ncep/common/dataplugin/ffg/FfgRecord.java +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.ffg/src/gov/noaa/nws/ncep/common/dataplugin/ffg/FfgRecord.java @@ -16,7 +16,8 @@ * 09/2011 Chin Chen changed to improve purge performance and * removed xml serialization as well * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime - * + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. + * * @author T.Lee * @version 1.0 @@ -27,24 +28,27 @@ package gov.noaa.nws.ncep.common.dataplugin.ffg; import java.util.Calendar; import java.util.HashSet; import java.util.Set; + import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.FetchType; import javax.persistence.JoinColumn; import javax.persistence.OneToMany; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.UniqueConstraint; -import com.raytheon.uf.common.dataplugin.annotations.DataURI; + import org.hibernate.annotations.Index; -import com.raytheon.uf.common.dataplugin.PluginDataObject; 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.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; -import gov.noaa.nws.ncep.common.dataplugin.ffg.FfgPrecip; @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "ffgseq") @Table(name = "ffg", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since @@ -57,7 +61,6 @@ import gov.noaa.nws.ncep.common.dataplugin.ffg.FfgPrecip; } ) @DynamicSerialize - public class FfgRecord extends PluginDataObject { private static final long serialVersionUID = 1L; diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.idft/src/gov/noaa/nws/ncep/common/dataplugin/idft/IdftRecord.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.idft/src/gov/noaa/nws/ncep/common/dataplugin/idft/IdftRecord.java index adc067b543..95df069a3f 100644 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.idft/src/gov/noaa/nws/ncep/common/dataplugin/idft/IdftRecord.java +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.idft/src/gov/noaa/nws/ncep/common/dataplugin/idft/IdftRecord.java @@ -14,6 +14,7 @@ * 12/08/09 100 F. J. Yen Modified for to11d6 from to11d3 * 05/27/10 100 F. J. Yen Refactored from to11dr3 for tolldr11 * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * * This code has been developed by the SIB for use in the AWIPS2 system. @@ -26,26 +27,30 @@ package gov.noaa.nws.ncep.common.dataplugin.idft; -import com.raytheon.uf.common.dataplugin.annotations.DataURI; -import com.raytheon.uf.common.dataplugin.PluginDataObject; -import com.raytheon.uf.common.dataplugin.IDecoderGettable; -import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; -import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; +import gov.noaa.nws.ncep.common.tools.IDecoderConstantsN; + +import java.util.Calendar; import javax.persistence.Column; 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.XmlElement; import javax.xml.bind.annotation.XmlRootElement; + import org.hibernate.annotations.Index; -import java.util.Calendar; -import gov.noaa.nws.ncep.common.tools.IDecoderConstantsN; +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.serialization.annotations.DynamicSerialize; +import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "idftseq") @Table(name = "idft", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.intlsigmet/src/gov/noaa/nws/ncep/common/dataplugin/intlsigmet/IntlSigmetRecord.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.intlsigmet/src/gov/noaa/nws/ncep/common/dataplugin/intlsigmet/IntlSigmetRecord.java index b19ff030ed..fd0ac74466 100644 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.intlsigmet/src/gov/noaa/nws/ncep/common/dataplugin/intlsigmet/IntlSigmetRecord.java +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.intlsigmet/src/gov/noaa/nws/ncep/common/dataplugin/intlsigmet/IntlSigmetRecord.java @@ -14,6 +14,7 @@ * 09/2011 Chin Chen changed to improve purge performance and * removed xml serialization as well * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * This code has been developed by the SIB for use in the AWIPS2 system. @@ -21,29 +22,32 @@ package gov.noaa.nws.ncep.common.dataplugin.intlsigmet; +import gov.noaa.nws.ncep.common.tools.IDecoderConstantsN; + import java.util.Calendar; import java.util.HashSet; import java.util.Set; -import com.raytheon.uf.common.dataplugin.PluginDataObject; -import com.raytheon.uf.common.dataplugin.IDecoderGettable; -import gov.noaa.nws.ncep.common.tools.IDecoderConstantsN; import javax.persistence.CascadeType; import javax.persistence.Column; - import javax.persistence.Entity; import javax.persistence.FetchType; import javax.persistence.JoinColumn; import javax.persistence.OneToMany; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.UniqueConstraint; 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.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "intlsigmetseq") @Table(name = "intlsigmet", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java index c25dccde9d..32eb85f5d1 100644 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java @@ -15,6 +15,7 @@ * 05/2010 144 L. Lin Migration to TO11DR11. * 09/2012 B. Hebbard Merge out RTS changes from OB12.9.1 * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @author tlee @@ -29,6 +30,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.ManyToOne; import javax.persistence.PrimaryKeyJoinColumn; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.UniqueConstraint; @@ -43,6 +45,7 @@ import org.hibernate.annotations.CacheConcurrencyStrategy; 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; import com.raytheon.uf.common.dataplugin.persist.PersistablePluginDataObject; @@ -51,6 +54,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "mcidasseq") @Table(name = "mcidas", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/src/gov/noaa/nws/ncep/common/dataplugin/ncairep/NcAirepRecord.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/src/gov/noaa/nws/ncep/common/dataplugin/ncairep/NcAirepRecord.java index d8e4b9a6e6..1ad4ff357f 100644 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/src/gov/noaa/nws/ncep/common/dataplugin/ncairep/NcAirepRecord.java +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/src/gov/noaa/nws/ncep/common/dataplugin/ncairep/NcAirepRecord.java @@ -25,6 +25,7 @@ import javax.measure.unit.Unit; import javax.persistence.Column; import javax.persistence.Embedded; import javax.persistence.Entity; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.UniqueConstraint; @@ -33,6 +34,7 @@ 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; @@ -66,6 +68,7 @@ import com.vividsolutions.jts.geom.Geometry; * buildMessageData(). * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime * 04/08/13 1293 bkowal Removed references to hdffileid. + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @author jkorman @@ -73,6 +76,7 @@ import com.vividsolutions.jts.geom.Geometry; */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "ncairepseq") @Table(name = "ncairep", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncccfp/src/gov/noaa/nws/ncep/common/dataplugin/ncccfp/NcccfpRecord.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.ncccfp/src/gov/noaa/nws/ncep/common/dataplugin/ncccfp/NcccfpRecord.java index 8ad3bfdd63..11e3479a9b 100644 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncccfp/src/gov/noaa/nws/ncep/common/dataplugin/ncccfp/NcccfpRecord.java +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.ncccfp/src/gov/noaa/nws/ncep/common/dataplugin/ncccfp/NcccfpRecord.java @@ -5,6 +5,7 @@ import java.util.Calendar; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.UniqueConstraint; import javax.xml.bind.annotation.XmlAccessType; @@ -12,6 +13,7 @@ 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; @@ -32,6 +34,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; * 10/05/2009 155 F. J. Yen From Raytheon's CCFP; mod for NC_CCFP * 26/05/2010 155 F. J. Yen Refactored to dataplugin for migration to to11dr11 * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @@ -39,6 +42,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; * @version 1 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "ncccfpseq") @Table(name = "ncccfp", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncgrib/src/gov/noaa/nws/ncep/common/dataplugin/ncgrib/NcgribRecord.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.ncgrib/src/gov/noaa/nws/ncep/common/dataplugin/ncgrib/NcgribRecord.java index 596b7d808b..be04ff8d8c 100644 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncgrib/src/gov/noaa/nws/ncep/common/dataplugin/ncgrib/NcgribRecord.java +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.ncgrib/src/gov/noaa/nws/ncep/common/dataplugin/ncgrib/NcgribRecord.java @@ -29,6 +29,7 @@ import javax.persistence.Entity; import javax.persistence.FetchType; import javax.persistence.ManyToOne; import javax.persistence.PrimaryKeyJoinColumn; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.UniqueConstraint; @@ -43,6 +44,7 @@ import org.hibernate.annotations.FetchMode; 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.IHDFFilePathProvider; import com.raytheon.uf.common.dataplugin.persist.PersistablePluginDataObject; @@ -65,6 +67,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; * 03/07/12 606 ghull Added eventName to URI for NcInventory updating. * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime * 04/08/13 1293 bkowal Removed references to hdffileid. + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @@ -72,6 +75,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; * @version 1 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "ncgribseq") @Table(name = "ncgrib", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncpafm/src/gov/noaa/nws/ncep/common/dataplugin/ncpafm/NcPafmRecord.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.ncpafm/src/gov/noaa/nws/ncep/common/dataplugin/ncpafm/NcPafmRecord.java index fcef3fd4b1..1f7e4e3794 100644 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncpafm/src/gov/noaa/nws/ncep/common/dataplugin/ncpafm/NcPafmRecord.java +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.ncpafm/src/gov/noaa/nws/ncep/common/dataplugin/ncpafm/NcPafmRecord.java @@ -27,6 +27,7 @@ import java.util.Date; import javax.persistence.Column; import javax.persistence.Embedded; import javax.persistence.Entity; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.UniqueConstraint; @@ -34,9 +35,11 @@ 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; import com.raytheon.uf.common.dataplugin.persist.PersistablePluginDataObject; @@ -68,6 +71,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; * 03 Feb 2012 606 G. Hull added reportType to the URI for inventory updating * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime * 08 Apr 2013 1293 bkowal Removed references to hdffileid. + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @@ -75,6 +79,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; * @version 1.0 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "ncpafmseq") @Table(name = "ncpafm", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncpirep/src/gov/noaa/nws/ncep/common/dataplugin/ncpirep/NcPirepRecord.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.ncpirep/src/gov/noaa/nws/ncep/common/dataplugin/ncpirep/NcPirepRecord.java index e77290f894..6859db1b94 100644 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncpirep/src/gov/noaa/nws/ncep/common/dataplugin/ncpirep/NcPirepRecord.java +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.ncpirep/src/gov/noaa/nws/ncep/common/dataplugin/ncpirep/NcPirepRecord.java @@ -25,6 +25,7 @@ import javax.measure.unit.Unit; import javax.persistence.Column; import javax.persistence.Embedded; import javax.persistence.Entity; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.UniqueConstraint; @@ -33,6 +34,7 @@ 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; @@ -64,12 +66,14 @@ import com.vividsolutions.jts.geom.Geometry; * 09/19/2011 286 Q.Zhou Changed reportType to string, * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime * 04/08/2013 1293 bkowal Removed references to hdffileid. + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @author jkorman * @version 1.0 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "ncpirepseq") @Table(name = "ncpirep", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncscat/src/gov/noaa/nws/ncep/common/dataplugin/ncscat/NcscatRecord.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.ncscat/src/gov/noaa/nws/ncep/common/dataplugin/ncscat/NcscatRecord.java index 66e048ce9e..a073a71dc7 100644 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncscat/src/gov/noaa/nws/ncep/common/dataplugin/ncscat/NcscatRecord.java +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.ncscat/src/gov/noaa/nws/ncep/common/dataplugin/ncscat/NcscatRecord.java @@ -9,6 +9,7 @@ * ------------ ---------- ----------- -------------------------- * 11/2009 Uma Josyula Initial creation * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * This code has been developed by the SIB for use in the AWIPS2 system. */ @@ -19,6 +20,7 @@ import java.util.Calendar; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.UniqueConstraint; @@ -32,12 +34,14 @@ import org.hibernate.annotations.CacheConcurrencyStrategy; 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; import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "ncscatseq") @Table(name = "ncscat", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncscd/src/gov/noaa/nws/ncep/common/dataplugin/ncscd/NcScdRecord.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.ncscd/src/gov/noaa/nws/ncep/common/dataplugin/ncscd/NcScdRecord.java index 7546daeb8e..eeb20361ab 100644 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.ncscd/src/gov/noaa/nws/ncep/common/dataplugin/ncscd/NcScdRecord.java +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.ncscd/src/gov/noaa/nws/ncep/common/dataplugin/ncscd/NcScdRecord.java @@ -19,6 +19,7 @@ * 09/2011 457 S. Gurung Renamed H5 to Nc and h5 to nc * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime * 04/2013 1293 bkowal Removed references to hdffileid. + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @author T.Lee @@ -42,6 +43,7 @@ import javax.measure.unit.Unit; import javax.persistence.Column; import javax.persistence.Embedded; import javax.persistence.Entity; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.UniqueConstraint; @@ -50,6 +52,7 @@ 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; @@ -64,6 +67,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "ncscdseq") @Table(name = "ncscd", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/NcTafRecord.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/NcTafRecord.java index 22b91ba6a4..1fff2cd079 100644 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/NcTafRecord.java +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/NcTafRecord.java @@ -22,6 +22,7 @@ import java.util.TreeSet; import javax.persistence.Column; import javax.persistence.Embedded; import javax.persistence.Entity; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.UniqueConstraint; @@ -67,6 +68,7 @@ import com.raytheon.uf.edex.decodertools.time.TimeTools; * Change startRefTime to nearest hour to get hourly refTimes * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime * 04/08/2013 1293 bkowal Removed references to hdffileid. + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * The java class defines the parameters in the postgres table and * the for HDF5 dataset for the upper air data. * @@ -14,6 +15,7 @@ * 10/2011 S. Gurung Replace slat/slon/selv with location of type SurfaceObsLocation * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime * 04/2013 1293 bkowal Removed references to hdffileid. + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @@ -33,13 +35,16 @@ import java.util.Set; import javax.persistence.Column; import javax.persistence.Embedded; import javax.persistence.Entity; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.UniqueConstraint; import javax.xml.bind.annotation.XmlElement; + 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; import com.raytheon.uf.common.dataplugin.persist.PersistablePluginDataObject; @@ -52,6 +57,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; import com.vividsolutions.jts.geom.Geometry; @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "ncuairseq") @Table(name = "ncuair", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.nonconvsigmet/src/gov/noaa/nws/ncep/common/dataplugin/nonconvsigmet/NonConvSigmetRecord.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.nonconvsigmet/src/gov/noaa/nws/ncep/common/dataplugin/nonconvsigmet/NonConvSigmetRecord.java index 721cbe94be..416dbfd4a1 100644 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.nonconvsigmet/src/gov/noaa/nws/ncep/common/dataplugin/nonconvsigmet/NonConvSigmetRecord.java +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.nonconvsigmet/src/gov/noaa/nws/ncep/common/dataplugin/nonconvsigmet/NonConvSigmetRecord.java @@ -11,37 +11,39 @@ * 09/2011 Chin Chen changed to improve purge performance and * removed xml serialization as well * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * This code has been developed by the SIB for use in the AWIPS2 system. */ package gov.noaa.nws.ncep.common.dataplugin.nonconvsigmet; +import gov.noaa.nws.ncep.common.tools.IDecoderConstantsN; + import java.util.Calendar; import java.util.HashSet; import java.util.Set; -import com.raytheon.uf.common.dataplugin.PluginDataObject; -import com.raytheon.uf.common.dataplugin.IDecoderGettable; - -import gov.noaa.nws.ncep.common.tools.IDecoderConstantsN; import javax.persistence.CascadeType; import javax.persistence.Column; - import javax.persistence.Entity; import javax.persistence.FetchType; import javax.persistence.JoinColumn; import javax.persistence.OneToMany; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.UniqueConstraint; 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.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "nonconvsigmetseq") @Table(name = "nonconvsigmet", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.ntrans/src/gov/noaa/nws/ncep/common/dataplugin/ntrans/NtransRecord.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.ntrans/src/gov/noaa/nws/ncep/common/dataplugin/ntrans/NtransRecord.java index 710d16b6a0..3e8618b399 100644 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.ntrans/src/gov/noaa/nws/ncep/common/dataplugin/ntrans/NtransRecord.java +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.ntrans/src/gov/noaa/nws/ncep/common/dataplugin/ntrans/NtransRecord.java @@ -3,13 +3,16 @@ * * This java class performs the mapping to the database table for NTRANS Metafiles * + * 
  * HISTORY
  *
  * Date     	Author		Description
  * ------------	----------	-----------	--------------------------
  * 02/2013		B. Hebbard	Initial creation
  * Apr 4, 2013        1846 bkowal      Added an index on refTime and forecastTime	
+ * Apr 12, 2013       1857 bgonzale    Added SequenceGenerator annotation.
  * 
+ *
* This code has been developed by the SIB for use in the AWIPS2 system. */ @@ -19,6 +22,7 @@ import java.util.Calendar; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.UniqueConstraint; @@ -32,12 +36,14 @@ import org.hibernate.annotations.CacheConcurrencyStrategy; 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; import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "ntransseq") @Table(name = "ntrans", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.sgwh/src/gov/noaa/nws/ncep/common/dataplugin/sgwh/SgwhRecord.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.sgwh/src/gov/noaa/nws/ncep/common/dataplugin/sgwh/SgwhRecord.java index 21dd3a1008..b6faca7d8a 100644 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.sgwh/src/gov/noaa/nws/ncep/common/dataplugin/sgwh/SgwhRecord.java +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.sgwh/src/gov/noaa/nws/ncep/common/dataplugin/sgwh/SgwhRecord.java @@ -12,6 +12,7 @@ * saving data to HDF5) * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime * Apr 8, 2013 1293 bkowal Removed references to hdffileid. + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @author chin chen @@ -28,9 +29,11 @@ import java.util.Date; import javax.persistence.Column; import javax.persistence.Embedded; import javax.persistence.Entity; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.UniqueConstraint; + import org.hibernate.annotations.Index; import com.raytheon.uf.common.dataplugin.IDecoderGettable; @@ -43,6 +46,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "sgwhseq") @Table(name = "sgwh", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.sgwhv/src/gov/noaa/nws/ncep/common/dataplugin/sgwhv/SgwhvRecord.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.sgwhv/src/gov/noaa/nws/ncep/common/dataplugin/sgwhv/SgwhvRecord.java index 5e37a0ecd6..4de1b5bb20 100644 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.sgwhv/src/gov/noaa/nws/ncep/common/dataplugin/sgwhv/SgwhvRecord.java +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.sgwhv/src/gov/noaa/nws/ncep/common/dataplugin/sgwhv/SgwhvRecord.java @@ -12,6 +12,7 @@ * saving data to HDF5) * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime * Apr 8, 2013 1293 bkowal Removed references to hdffileid. + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @author chin chen @@ -28,9 +29,11 @@ import java.util.Date; import javax.persistence.Column; import javax.persistence.Embedded; import javax.persistence.Entity; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.UniqueConstraint; + import org.hibernate.annotations.Index; import com.raytheon.uf.common.dataplugin.IDecoderGettable; @@ -43,6 +46,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "sgwhvseq") @Table(name = "sgwhv", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.solarimage/src/gov/noaa/nws/ncep/common/dataplugin/solarimage/SolarImageRecord.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.solarimage/src/gov/noaa/nws/ncep/common/dataplugin/solarimage/SolarImageRecord.java index 5e5c5b1829..0b758be2c9 100644 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.solarimage/src/gov/noaa/nws/ncep/common/dataplugin/solarimage/SolarImageRecord.java +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.solarimage/src/gov/noaa/nws/ncep/common/dataplugin/solarimage/SolarImageRecord.java @@ -2,6 +2,7 @@ package gov.noaa.nws.ncep.common.dataplugin.solarimage; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.UniqueConstraint; @@ -9,9 +10,11 @@ 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 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; import com.raytheon.uf.common.datastorage.IDataStore; @@ -19,8 +22,9 @@ import com.raytheon.uf.common.datastorage.records.ByteDataRecord; import com.raytheon.uf.common.datastorage.records.IDataRecord; import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; + /** - * Record implementation for solarimage plugin. + * Record implementation for solarimage plugin. * * 
  * SOFTWARE HISTORY
@@ -30,6 +34,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
  * 01/07/2013   865        qzhou              Added "Site" for Halpha.
  * 01/28/2013   865        qzhou              Changed float to double for intTime.
  * Apr 4, 2013        1846 bkowal      Added an index on refTime and forecastTime
+ * Apr 12, 2013 1857       bgonzale           Added SequenceGenerator annotation.
  *
* * @author sgurung, qzhou @@ -37,6 +42,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "solarimageseq") @Table(name = "solarimage", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.ssha/src/gov/noaa/nws/ncep/common/dataplugin/ssha/SshaRecord.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.ssha/src/gov/noaa/nws/ncep/common/dataplugin/ssha/SshaRecord.java index 8e8afd631b..08767a9a1d 100644 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.ssha/src/gov/noaa/nws/ncep/common/dataplugin/ssha/SshaRecord.java +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.ssha/src/gov/noaa/nws/ncep/common/dataplugin/ssha/SshaRecord.java @@ -12,6 +12,7 @@ * Sep 2011 Chin Chen Initial Coding (Following BufrsshaRecord to refactor for * saving data to HDF5) * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @author Chin Chen @@ -29,12 +30,15 @@ import java.util.Date; import javax.persistence.Column; import javax.persistence.Embedded; import javax.persistence.Entity; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.UniqueConstraint; + 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; import com.raytheon.uf.common.dataplugin.persist.PersistablePluginDataObject; @@ -44,6 +48,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "sshaseq") @Table(name = "ssha", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.stormtrack/src/gov/noaa/nws/ncep/common/dataplugin/stormtrack/StormTrackRecord.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.stormtrack/src/gov/noaa/nws/ncep/common/dataplugin/stormtrack/StormTrackRecord.java index 8e9fdc59f4..617bcc5d84 100644 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.stormtrack/src/gov/noaa/nws/ncep/common/dataplugin/stormtrack/StormTrackRecord.java +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.stormtrack/src/gov/noaa/nws/ncep/common/dataplugin/stormtrack/StormTrackRecord.java @@ -20,29 +20,31 @@ package gov.noaa.nws.ncep.common.dataplugin.stormtrack; +import gov.noaa.nws.ncep.common.tools.IDecoderConstantsN; + import java.util.Calendar; import javax.persistence.Column; 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.XmlElement; import javax.xml.bind.annotation.XmlRootElement; + import org.hibernate.annotations.Index; -import com.raytheon.uf.common.dataplugin.PluginDataObject; 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.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; -import gov.noaa.nws.ncep.common.tools.IDecoderConstantsN; - /** * StormTrackRecord is the Data Access component for Automated Tropical Cyclone - * Forecast (ATCF) and ensemble cyclone tracks. This class contains getters and + * Forecast (ATCF) and ensemble cyclone tracks. This class contains getters and * setters for the main parent table stormtrack. * * This code has been developed by the SIB for use in the AWIPS2 system. @@ -56,6 +58,7 @@ import gov.noaa.nws.ncep.common.tools.IDecoderConstantsN; * 07/2011 T. Lee ATCF and Ensemble storm tracks * 10/19/2011 858 Greg Hull remove forecastHr * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @@ -63,6 +66,7 @@ import gov.noaa.nws.ncep.common.tools.IDecoderConstantsN; * @version 1.0 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "stormtrackseq") @Table(name = "stormtrack", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.tcm/src/gov/noaa/nws/ncep/common/dataplugin/tcm/TcmRecord.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.tcm/src/gov/noaa/nws/ncep/common/dataplugin/tcm/TcmRecord.java index 917ad379e8..4de3636888 100644 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.tcm/src/gov/noaa/nws/ncep/common/dataplugin/tcm/TcmRecord.java +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.tcm/src/gov/noaa/nws/ncep/common/dataplugin/tcm/TcmRecord.java @@ -16,6 +16,7 @@ * removed xml serialization as well * 07/2012 #606 Greg Huoll added reportType to the dataURI * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @@ -25,29 +26,32 @@ package gov.noaa.nws.ncep.common.dataplugin.tcm; +import gov.noaa.nws.ncep.common.tools.IDecoderConstantsN; + import java.util.Calendar; import java.util.HashSet; import java.util.Set; + import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.FetchType; import javax.persistence.JoinColumn; import javax.persistence.OneToMany; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.UniqueConstraint; -import com.raytheon.uf.common.dataplugin.annotations.DataURI; import org.hibernate.annotations.Index; -import com.raytheon.uf.common.dataplugin.PluginDataObject; 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.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; -import gov.noaa.nws.ncep.common.dataplugin.tcm.TcmPositionWinds; -import gov.noaa.nws.ncep.common.tools.IDecoderConstantsN; @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "tcmseq") @Table(name = "tcm", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/ncep/gov.noaa.nws.ncep.common.dataplugin.wcp/src/gov/noaa/nws/ncep/common/dataplugin/wcp/WcpRecord.java b/ncep/gov.noaa.nws.ncep.common.dataplugin.wcp/src/gov/noaa/nws/ncep/common/dataplugin/wcp/WcpRecord.java index d9a8740794..7ee8f02d21 100644 --- a/ncep/gov.noaa.nws.ncep.common.dataplugin.wcp/src/gov/noaa/nws/ncep/common/dataplugin/wcp/WcpRecord.java +++ b/ncep/gov.noaa.nws.ncep.common.dataplugin.wcp/src/gov/noaa/nws/ncep/common/dataplugin/wcp/WcpRecord.java @@ -17,6 +17,7 @@ * 09/2011 Chin Chen changed to improve purge performance and * removed xml serialization as well * * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @author F. J. Yen, SIB @@ -28,7 +29,6 @@ package gov.noaa.nws.ncep.common.dataplugin.wcp; import java.util.Calendar; import java.util.HashSet; import java.util.Set; -import gov.noaa.nws.ncep.common.dataplugin.wcp.WcpSevrln; import javax.persistence.CascadeType; import javax.persistence.Column; @@ -36,17 +36,19 @@ import javax.persistence.Entity; import javax.persistence.FetchType; import javax.persistence.JoinColumn; import javax.persistence.OneToMany; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.UniqueConstraint; import org.hibernate.annotations.Index; -import com.raytheon.uf.common.dataplugin.PluginDataObject; 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.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "wcpseq") @Table(name = "wcp", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java b/ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java index 9c9bd91e7b..afc07bf0b9 100644 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java @@ -18,6 +18,7 @@ import java.util.Map; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.UniqueConstraint; @@ -33,6 +34,7 @@ import org.opengis.referencing.crs.ProjectedCRS; import org.opengis.referencing.operation.MathTransform; 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; import com.raytheon.uf.common.dataplugin.persist.PersistablePluginDataObject; @@ -53,27 +55,31 @@ import com.vividsolutions.jts.geom.Coordinate; /** * Decoder implementation for mosaic plugin * + * 
  * Date         Ticket#         Engineer    Description
  * ------------ ----------      ----------- --------------------------
  * 09/2009      143				L. Lin     	Initial creation
  * 11/2009      143             L. Lin      Add parameters sourceId and
  * 											trueElevationAngle in mosaic record.
  * 1/2011		143				T. Lee		Add resolution to key for AWC 1km NSSL
- *											Extracted prod name from mosaicInfo.txt
+ * 										Extracted prod name from mosaicInfo.txt
  * 6/2012       825             G. Hull     rm prodName from URI. Use prodCode where needed.
  * 09/2012						B. Hebbard  Merge out RTS changes from OB12.9.1
  * Apr 4, 2013        1846 bkowal      Added an index on refTime and forecastTime
+ * Apr 12, 2013 1857            bgonzale    Added SequenceGenerator annotation.
  * 
  * 
  *
* * This code has been developed by the SIB for use in the AWIPS2 system. + * * @author L. Lin * @version 1.0 */ @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "mosaicseq") @Table(name = "mosaic", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since diff --git a/ncep/gov.noaa.nws.ncep.edex.plugin.nctext/src/gov/noaa/nws/ncep/edex/plugin/nctext/common/NctextRecord.java b/ncep/gov.noaa.nws.ncep.edex.plugin.nctext/src/gov/noaa/nws/ncep/edex/plugin/nctext/common/NctextRecord.java index 938a908814..70586e85de 100644 --- a/ncep/gov.noaa.nws.ncep.edex.plugin.nctext/src/gov/noaa/nws/ncep/edex/plugin/nctext/common/NctextRecord.java +++ b/ncep/gov.noaa.nws.ncep.edex.plugin.nctext/src/gov/noaa/nws/ncep/edex/plugin/nctext/common/NctextRecord.java @@ -20,6 +20,7 @@ * 10/22/2009 191 Chin Chen Initial coding * 07/23/2010 191 Archana Added DataUri annotation to productType * Apr 4, 2013 1846 bkowal Added an index on refTime and forecastTime + * Apr 12, 2013 1857 bgonzale Added SequenceGenerator annotation. * * * @author Chin Chen @@ -28,8 +29,10 @@ package gov.noaa.nws.ncep.edex.plugin.nctext.common; import java.util.Calendar; + import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.SequenceGenerator; import javax.persistence.Table; import javax.persistence.Transient; import javax.persistence.UniqueConstraint; @@ -37,6 +40,7 @@ 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; @@ -44,9 +48,9 @@ import com.raytheon.uf.common.dataplugin.PluginDataObject; import com.raytheon.uf.common.dataplugin.annotations.DataURI; import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; -//import com.raytheon.uf.edex.wmo.message.WMOHeader; @Entity +@SequenceGenerator(initialValue = 1, name = PluginDataObject.ID_GEN, sequenceName = "nctextseq") @Table(name = "nctext", uniqueConstraints = { @UniqueConstraint(columnNames = { "dataURI" }) }) /* * Both refTime and forecastTime are included in the refTimeIndex since