svn commit: r1445464 - in /openmeetings/trunk/singlewebapp/src/org/apache/openmeetings: data/logs/ConferenceLogTypeDao.java persistence/beans/logs/ConferenceLogType.java

[sebawagner]

Author: sebawagner
Date: Wed Feb 13 02:56:37 2013
New Revision: 1445464

URL: http://svn.apache.org/r1445464
Log:
Clean up and re-factor to NamedQuery in ConferenceLogTypeDao

Modified:
    
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/logs/ConferenceLogTypeDao.java
    
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/logs/ConferenceLogType.java

Modified: 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/logs/ConferenceLogTypeDao.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/logs/ConferenceLogTypeDao.java?rev=1445464&r1=1445463&r2=1445464&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/logs/ConferenceLogTypeDao.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/logs/ConferenceLogTypeDao.java
 Wed Feb 13 02:56:37 2013
@@ -40,41 +40,30 @@ public class ConferenceLogTypeDao {
 
        public Long addConferenceLogType(String eventType) {
                try {
-                       
                        ConferenceLogType confLogType = new ConferenceLogType();
                        confLogType.setEventType(eventType);
                        confLogType.setInserted(new Date());
-                       
                        confLogType = em.merge(confLogType);
-                       Long appointment_id = 
confLogType.getConferenceLogTypeId();
-
-                       return appointment_id;
+                       return confLogType.getConferenceLogTypeId();
                } catch (Exception ex2) {
-                       log.error("[addConferenceLogType]: ",ex2);
+                       log.error("[addConferenceLogType]: ", ex2);
                }
                return null;
        }
        
        public ConferenceLogType getConferenceLogTypeByEventName(String 
eventType) {
                try {
-                       
-                       String hql = "select a from ConferenceLogType a " +
-                                       "WHERE a.eventType = :eventType ";
-                                       
-                       TypedQuery<ConferenceLogType> query = 
em.createQuery(hql, ConferenceLogType.class);
+                       TypedQuery<ConferenceLogType> query = 
em.createNamedQuery("getConferenceLogTypeByEventName", ConferenceLogType.class);
                        query.setParameter("eventType",eventType);
                        
                        //Seems like this does throw an error sometimes cause 
it does not return a unique Result
                        //ConferenceLogType confLogType = (ConferenceLogType) 
query.getSingleResult();
                        List<ConferenceLogType> confLogTypes = 
query.getResultList();
-                       ConferenceLogType confLogType = null;
                        if (confLogTypes != null && confLogTypes.size() > 0) {
-                               confLogType = confLogTypes.get(0);
+                               return confLogTypes.get(0);
                        }
-                       
-                       return confLogType;
                } catch (Exception ex2) {
-                       log.error("[getConferenceLogTypeByEventName]: " + ex2);
+                       log.error("[getConferenceLogTypeByEventName]: ", ex2);
                }
                return null;
        }

Modified: 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/logs/ConferenceLogType.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/logs/ConferenceLogType.java?rev=1445464&r1=1445463&r2=1445464&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/logs/ConferenceLogType.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/logs/ConferenceLogType.java
 Wed Feb 13 02:56:37 2013
@@ -26,11 +26,15 @@ import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
 import javax.persistence.Table;
 
-
-
 @Entity
+@NamedQueries({
+       @NamedQuery(name = "getConferenceLogTypeByEventName", query = "select a 
from ConferenceLogType a " +
+                                       "WHERE a.eventType = :eventType")
+})
 @Table(name = "conferencelogtype")
 public class ConferenceLogType implements Serializable {
        private static final long serialVersionUID = 4388958579350356294L;