[Hyperic-hq-discuss] hq r7339 - in trunk/src/org/hyperic/hq: appdef/server/session events/server/session

[<jt...@hy...>]

Author: jtravis
Date: 2007-12-20 13:33:35 -0800 (Thu, 20 Dec 2007)
New Revision: 7339
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=7339

Modified:
   trunk/src/org/hyperic/hq/appdef/server/session/CPropManagerEJBImpl.java
   trunk/src/org/hyperic/hq/events/server/session/TriggerTrackerEJBImpl.java
Log:
HHQ-1423.  Remove database-dependent ID generation code, and ask the Util class to create a new ID for us

Modified: trunk/src/org/hyperic/hq/appdef/server/session/CPropManagerEJBImpl.java
===================================================================
--- trunk/src/org/hyperic/hq/appdef/server/session/CPropManagerEJBImpl.java	2007-12-20 21:32:30 UTC (rev 7338)
+++ trunk/src/org/hyperic/hq/appdef/server/session/CPropManagerEJBImpl.java	2007-12-20 21:33:35 UTC (rev 7339)
@@ -42,6 +42,7 @@
 import org.hibernate.dialect.Dialect;
 import org.hyperic.dao.DAOFactory;
 import org.hyperic.hibernate.Util;
+import org.hyperic.hq.appdef.Cprop;
 import org.hyperic.hq.appdef.CpropKey;
 import org.hyperic.hq.appdef.shared.AppdefEntityConstants;
 import org.hyperic.hq.appdef.shared.AppdefEntityID;
@@ -279,23 +280,15 @@
             
             // Optionally add new values
             if(val != null){
-                Dialect dialect = Util.getDialect();
                 String[] chunks = chunk(val, CHUNKSIZE);
-                StringBuffer sql = new StringBuffer()
-                    .append("INSERT INTO ")
-                    .append(CPROP_TABLE);
+                StringBuffer sql = new StringBuffer("INSERT INTO " + 
+                                                    CPROP_TABLE);
 
-                // if the dialect supports sequences, then
-                // use sequence generator
-                if (dialect.supportsSequences()) {
-                    sql.append(" (id,keyid,appdef_id,value_idx,PROPVALUE) VALUES (")
-                        .append(dialect.getSelectSequenceNextValString(CPROP_SEQUENCE))
-                        .append(", ?, ?, ?, ?)");
-                } else {
-                    // assume sequence is generated in the db layer
-                    sql.append(" (keyid,appdef_id,value_idx,PROPVALUE) VALUES ")
-                        .append("(?, ?, ?, ?)");
-                }
+                Cprop nprop = new Cprop();
+                sql.append(" (id,keyid,appdef_id,value_idx,PROPVALUE) VALUES (")
+                   .append(Util.generateId("org.hyperic.hq.appdef.Cprop", nprop))
+                   .append(", ?, ?, ?, ?)");
+                
                 addStmt = conn.prepareStatement(sql.toString());
                 addStmt.setInt(1, keyId);
                 addStmt.setInt(2, aID.getID());

Modified: trunk/src/org/hyperic/hq/events/server/session/TriggerTrackerEJBImpl.java
===================================================================
--- trunk/src/org/hyperic/hq/events/server/session/TriggerTrackerEJBImpl.java	2007-12-20 21:32:30 UTC (rev 7338)
+++ trunk/src/org/hyperic/hq/events/server/session/TriggerTrackerEJBImpl.java	2007-12-20 21:33:35 UTC (rev 7339)
@@ -36,6 +36,7 @@
 import javax.ejb.SessionContext;
 import javax.naming.NamingException;
 
+import org.hyperic.hibernate.Util;
 import org.hyperic.hq.common.SystemException;
 import org.hyperic.hq.events.shared.TriggerTrackerLocal;
 import org.hyperic.hq.events.shared.TriggerTrackerUtil;
@@ -109,24 +110,16 @@
                 strBuf.append("UPDATE ")
                       .append(TAB_FIRED_TRIGGER)
                       .append(" SET timestamp = ? WHERE trigger_id = ?");
-            }
-            else {
+            } else {
                 // Insert
-                if (DBUtil.isOracle(conn)) {
-                    strBuf.append("INSERT INTO ")
-                        .append(TAB_FIRED_TRIGGER)
-                        .append(" (id, timestamp, trigger_id) VALUES")
-                        .append(" (EAM_FIRED_TRIGGER_ID_SEQ.nextval,?,?)");
-                } else if (DBUtil.isMySQL(conn)) {
-                    strBuf.append("INSERT INTO ")
-                        .append(TAB_FIRED_TRIGGER)
-                        .append(" (id, timestamp, trigger_id) VALUES")
-                        .append(" (nextseqval('EAM_FIRED_TRIGGER_ID_SEQ'),?,?)");
-                } else {
-                    strBuf.append("INSERT INTO ")
-                        .append(TAB_FIRED_TRIGGER)
-                        .append(" (timestamp, trigger_id) VALUES (?,?)");
-                }
+                Integer newId = 
+                    Util.generateId("org.hyperic.hq.events.server.session.FiredTrigger",
+                                    new FiredTrigger());
+                
+                strBuf.append("INSERT INTO ")
+                      .append(TAB_FIRED_TRIGGER)
+                      .append(" (id, timestamp, trigger_id) VALUES")
+                      .append(" (" + newId + ",?,?)");
             }
 
             // Now add the Trigger to Event relationship
@@ -153,7 +146,7 @@
         }
 
         return true;
-    } // end fire        
+    } // end fire (really?)
     
     /**
      * Removes any record of this trigger having fired