You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by se...@apache.org on 2011/12/18 14:52:39 UTC
svn commit: r1220406 [2/2] - in
/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data:
basic/ basic/dao/ calendar/daos/ conference/ conference/dao/ file/dao/
flvrecord/ flvrecord/converter/ record/dao/ user/ user/dao/
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/Emailmanagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/Emailmanagement.java?rev=1220406&r1=1220405&r2=1220406&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/Emailmanagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/Emailmanagement.java Sun Dec 18 13:52:37 2011
@@ -2,10 +2,11 @@ package org.openmeetings.app.data.user;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
+import javax.persistence.TypedQuery;
import org.openmeetings.app.data.basic.Configurationmanagement;
import org.openmeetings.app.data.basic.Fieldmanagment;
+import org.openmeetings.app.persistence.beans.adresses.Adresses;
import org.openmeetings.app.persistence.beans.lang.Fieldlanguagesvalues;
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
import org.openmeetings.app.templates.RegisterUserTemplate;
@@ -33,186 +34,6 @@ public class Emailmanagement {
@Autowired
private RegisterUserTemplate registerUserTemplate;
- private boolean checkUserLevel(int user_level) {
- if (user_level > 1) {
- return true;
- } else {
- return false;
- }
- }
-
- /**
- * Get a Mail-Object by its Mail-Id
- *
- * @param mail_id
- * @return
- */
- /*
- * public Emails getEmailById(long mail_id) { try { Object idf =
- * HibernateUtil.createSession(); EntityManager session =
- * HibernateUtil.getSession(); EntityTransaction tx =
- * session.getTransaction(); tx.begin(); Query query = session.createQuery(
- * "select c from Emails as c where c.mail_id = :mail_id AND deleted <> :deleted"
- * ); query.setParameter("mail_id", mail_id); query.setParameter("deleted",
- * "true"); List ll = query.getResultList(); tx.commit();
- * HibernateUtil.closeSession(idf); if (ll.size() > 0) { return (Emails)
- * ll.get(0); } } catch (HibernateException ex) { log.error("[getEmailById]"
- * ,ex); } catch (Exception ex2) { log.error("[getEmailById]" ,ex2); }
- * return null; }
- */
-
- /*
- * public List getemails(Long USER_ID) { try { Object idf =
- * HibernateUtil.createSession(); EntityManager session =
- * HibernateUtil.getSession(); EntityTransaction tx =
- * session.getTransaction(); tx.begin(); Query query = session
- * .createQuery("select c from emails as c where c.USER_ID = :USER_ID");
- * query.setParameter("USER_ID", USER_ID.longValue()); List lt =
- * query.getResultList(); tx.commit(); HibernateUtil.closeSession(idf);
- * return lt; } catch (HibernateException ex) { log.error("getemails",ex); }
- * catch (Exception ex2) { log.error("getemails",ex2); } return null; }
- */
-
- /*
- * public Adresses_Emails getAdresses_EmailsByMail(String email) { try {
- * String hql = "select c from Adresses_Emails as c " +
- * " where c.mail.email = :email "; Object idf =
- * HibernateUtil.createSession(); EntityManager session =
- * HibernateUtil.getSession(); EntityTransaction tx =
- * session.getTransaction(); tx.begin(); Query query =
- * session.createQuery(hql); query.setParameter("email", email);
- * Adresses_Emails e = (Adresses_Emails) query.getSingleResult();
- * tx.commit(); HibernateUtil.closeSession(idf); return e; } catch
- * (HibernateException ex) { log.error("getAdresses_EmailsByMail",ex); }
- * catch (Exception ex2) { log.error("getAdresses_EmailsByMail",ex2); }
- * return null; }
- */
-
- /**
- *
- * @param address
- * @return
- */
- // ---------------------------------------------------------------------------
- /*
- * public Adresses_Emails getAdresses_EmailsByAddress(Long address) {
- *
- * log.debug("Emailmanagement.getAdresses_EmailsByAddress");
- *
- * try { String hql = "select c from Adresses_Emails as c " +
- * " where c.adresses_id = :address "; Object idf =
- * HibernateUtil.createSession(); EntityManager session =
- * HibernateUtil.getSession(); EntityTransaction tx =
- * session.getTransaction(); tx.begin(); Query query =
- * session.createQuery(hql); query.setParameter("address", address);
- *
- * Adresses_Emails e = (Adresses_Emails) query.getSingleResult();
- * tx.commit(); HibernateUtil.closeSession(idf); return e; } catch
- * (HibernateException ex) { log.error("getAdresses_EmailsByAddress",ex); }
- * catch (Exception ex2) { log.error("getAdresses_EmailsByAddress",ex2); }
- *
- * return null; }
- */
- // ---------------------------------------------------------------------------
-
- /**
- * @author becherer
- */
- // --------------------------------------------------------------------------------
- /*
- * public void updateEmail(Emails mail){
- *
- * log.debug("Emailmanagement.updateEmail : " + mail.getEmail());
- *
- * try{ Object idf = HibernateUtil.createSession(); EntityManager session =
- * HibernateUtil.getSession(); EntityTransaction tx =
- * session.getTransaction(); tx.begin();
- *
- * session.mergeOrUpdate(mail); tx.commit();
- * HibernateUtil.closeSession(idf); }catch(Exception e){
- * log.error("Emailmanagement.updateEmail : Error updating email : " +
- * e.getMessage()); }
- *
- * }
- */
- // --------------------------------------------------------------------------------
-
- /*
- * public List getemailsCon(int CONTACT_ID) { try { Object idf =
- * HibernateUtil.createSession(); EntityManager session =
- * HibernateUtil.getSession(); EntityTransaction tx =
- * session.getTransaction(); tx.begin(); Query query = session
- * .createQuery("select c from emails as c where c.CONTACT_ID = :CONTACT_ID"
- * ); query.setParameter("CONTACT_ID", CONTACT_ID); List lt =
- * query.getResultList(); tx.commit(); HibernateUtil.closeSession(idf);
- * return lt; } catch (HibernateException ex) {
- * log.error("getemailsCon",ex); } catch (Exception ex2) {
- * log.error("getemailsCon",ex2); } return null; }
- */
-
- /**
- * Adds a mail with its connection to the adress table
- *
- * @param EMail
- * @param adresses_id
- * @param Username
- * @param Userpass
- * @param comment
- * @param sendWelcomeMail
- * @return the new mail_id or -1
- */
- /*
- * public Long registerEmail(String EMail, long adresses_id, String comment)
- * { Long mail_id = this.registerEmail(EMail, comment); if (mail_id != null)
- * { try {
- *
- * Adresses_Emails addr_emails = new Adresses_Emails();
- * addr_emails.setAdresses_id(adresses_id);
- * addr_emails.setMail(this.getEmailById(mail_id));
- * addr_emails.setStarttime(new Date()); addr_emails.setDeleted("false");
- *
- * Object idf = HibernateUtil.createSession(); EntityManager session =
- * HibernateUtil.getSession(); EntityTransaction tx =
- * session.getTransaction(); tx.begin(); long addr_emails_id = (Long)
- * session.merge(addr_emails); tx.commit(); HibernateUtil.closeSession(idf);
- * log.error("registerEmail addr_emails: " + addr_emails_id);
- *
- *
- * return mail_id; } catch (HibernateException ex) {
- * log.error("Error registerEmail: " ,ex); } catch (Exception ex2) {
- * log.error("Error registerEmail: " ,ex2); } } return null; }
- */
-
- /**
- * adds a mail-address to the mail table
- *
- * @param EMail
- * @param Username
- * @param Userpass
- * @param comment
- * @return
- */
- /*
- * public Long registerEmail(String EMail, String comment) { try { Emails
- * emails = new Emails(); emails.setEmail(EMail); emails.setStarttime(new
- * Date()); emails.setComment(comment); emails.setDeleted("false");
- *
- * Object idf = HibernateUtil.createSession(); EntityManager session =
- * HibernateUtil.getSession(); EntityTransaction tx =
- * session.getTransaction(); tx.begin(); long email_id = (Long)
- * session.merge(emails); tx.commit(); HibernateUtil.closeSession(idf);
- * log.error("registerEmail id: " + email_id);
- *
- * return email_id;
- *
- * } catch (HibernateException ex) { log.error("registerEmail: " ,ex); }
- * catch (Exception ex2) { log.error("registerEmail: " ,ex2); }
- *
- * return null;
- *
- * }
- */
-
/**
* sends a mail adress to the user with his account data
*
@@ -268,65 +89,10 @@ public class Emailmanagement {
public String addEmailCon(String EMail, int CONTACT_ID) {
String succ = "invalid email";
- // Emails emails = new Emails();
- // long time = CalenderI.getTimeStampMili();
- // emails.setEmail(EMail);
- // emails.setCONTACT_ID(CONTACT_ID);
- // emails.setStartdate(time);
- // emails.setUpdatedate(time);
- // try {
- // Object idf = HibernateUtil.createSession(); EntityManager session =
- // HibernateUtil.getSession();
- // EntityTransaction tx = session.getTransaction();
- // tx.begin();
- // session.merge(emails);
- // session.flush();
- // session.clear();
- // session.refresh(emails);
- // tx.commit();
- // HibernateUtil.closeSession(idf);
- // succ = "valid email";
- // } catch( HibernateException ex ) {
- // succ = "Error: "+ex;
- // } catch ( Exception ex2 ){
- // succ = "Error: "+ex2;
- // }
return succ;
}
/**
- * delete a Email-Object by a given Id
- *
- * @param mail_id
- */
- /*
- * public void deleteEMailByID(long mail_id) { try { Emails mail =
- * this.getEmailById(mail_id); Object idf = HibernateUtil.createSession();
- * EntityManager session = HibernateUtil.getSession(); EntityTransaction tx
- * = session.getTransaction(); tx.begin(); session.remove(mail);
- * tx.commit(); HibernateUtil.closeSession(idf); } catch (HibernateException
- * ex) { log.error("deleteEMailByID",ex); } catch (Exception ex2) {
- * log.error("deleteEMailByID",ex2); } }
- */
-
- // TODO: Change code sothat it doesn't usw HQL
- /*
- * public String deleteEMailByUserID(int USER_ID) { String result =
- * "Fehler im Bestellvorgang"; try { Object idf =
- * HibernateUtil.createSession(); EntityManager session =
- * HibernateUtil.getSession(); EntityTransaction tx =
- * session.getTransaction(); tx.begin(); String hqlDelete =
- * "delete emails where USER_ID = :USER_ID"; int deletedEntities =
- * session.createQuery(hqlDelete).setParameter( "USER_ID",
- * USER_ID).executeUpdate(); //session.flush();
- *
- * tx.commit(); HibernateUtil.closeSession(idf); result = "Erfolgreich" +
- * deletedEntities; } catch (HibernateException ex) {
- * log.error("deleteEMailByUserID",ex); } catch (Exception ex2) {
- * log.error("deleteEMailByUserID",ex2); } return result; }
- */
-
- /**
* Checks if a mail is already taken by someone else
*
* @param email
@@ -337,8 +103,8 @@ public class Emailmanagement {
if (email.length() == 0)
return true;
log.debug("checkUserMail: " + email);
- Query query = em
- .createQuery("select c from Adresses as c where c.email LIKE :email AND c.deleted <> :deleted");
+ TypedQuery<Adresses> query = em
+ .createQuery("select c from Adresses as c where c.email LIKE :email AND c.deleted <> :deleted", Adresses.class);
query.setParameter("email", email);
query.setParameter("deleted", "true");
int count = query.getResultList().size();
@@ -352,42 +118,4 @@ public class Emailmanagement {
}
return true;
}
-
- /**
- * update a Email-Object by a given id
- *
- * @param mail_id
- * @param user_id
- * @param email
- * @return
- */
- /*
- * public Emails updateUserEmail(long mail_id, Long user_id, String email) {
- * try { Emails mail = this.getEmailById(mail_id); mail.setEmail(email);
- * mail.setUpdatetime(new Date()); Object idf =
- * HibernateUtil.createSession(); EntityManager session =
- * HibernateUtil.getSession(); EntityTransaction tx =
- * session.getTransaction(); tx.begin(); session.persist(mail); tx.commit();
- * HibernateUtil.closeSession(idf); return mail; } catch (HibernateException
- * ex) { log.error("[updateUserEmail] "+ex); } catch (Exception ex2) {
- * log.error("[updateUserEmail] "+ex2); } return null; }
- */
-
- /*
- * public String updateContactEmail(int MAIL_ID, int Contact_ID, String
- * email) { String res = "Fehler beim Update"; try { // Object idf =
- * HibernateUtil.createSession(); EntityManager session =
- * HibernateUtil.getSession(); // EntityTransaction tx =
- * session.getTransaction(); // tx.begin(); // String hqlUpdate =
- * "update emails set email= :email, CONTACT_ID = :CONTACT_ID, updatedate = :updatedate where MAIL_ID= :MAIL_ID"
- * ; // int updatedEntities = session.createQuery( hqlUpdate ) //
- * .setParameter("email",email) // .setParameter( "CONTACT_ID", Contact_ID )
- * // .setParameter( "updatedate", CalenderI.getTimeStampMili() ) //
- * .setParameter( "MAIL_ID", MAIL_ID ) // .executeUpdate(); // res =
- * "Success"+updatedEntities; // tx.commit(); //
- * HibernateUtil.closeSession(idf); } catch (HibernateException ex) {
- * log.error("updateContactEmail",ex); } catch (Exception ex2) {
- * log.error("updateContactEmail",ex2); } return res; }
- */
-
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/Salutationmanagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/Salutationmanagement.java?rev=1220406&r1=1220405&r2=1220406&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/Salutationmanagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/Salutationmanagement.java Sun Dec 18 13:52:37 2011
@@ -1,7 +1,6 @@
package org.openmeetings.app.data.user;
import java.util.Date;
-import java.util.Iterator;
import java.util.List;
import javax.persistence.EntityManager;
@@ -71,8 +70,7 @@ public class Salutationmanagement {
CriteriaQuery<Salutations> select = cq.select(from);
TypedQuery<Salutations> q = em.createQuery(select);
List<Salutations> ll = q.getResultList();
- for (Iterator it4 = ll.iterator(); it4.hasNext();) {
- Salutations ti = (Salutations) it4.next();
+ for (Salutations ti : ll) {
ti.setLabel(fieldmanagment.getFieldByIdAndLanguage(
ti.getFieldvalues_id(), language_id));
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/Statemanagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/Statemanagement.java?rev=1220406&r1=1220405&r2=1220406&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/Statemanagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/Statemanagement.java Sun Dec 18 13:52:37 2011
@@ -5,7 +5,7 @@ import java.util.List;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
+import javax.persistence.TypedQuery;
import org.openmeetings.app.persistence.beans.adresses.States;
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
@@ -60,13 +60,13 @@ public class Statemanagement {
*/
public States getStateById(long state_id) {
try {
- Query query = em
- .createQuery("select c from States as c where c.state_id = :state_id AND c.deleted <> :deleted");
+ TypedQuery<States> query = em
+ .createQuery("select c from States as c where c.state_id = :state_id AND c.deleted <> :deleted", States.class);
query.setParameter("state_id", state_id);
query.setParameter("deleted", "true");
- List ll = query.getResultList();
+ List<States> ll = query.getResultList();
if (ll.size() > 0) {
- return (States) ll.get(0);
+ return ll.get(0);
}
} catch (Exception ex2) {
log.error("getStateById", ex2);
@@ -81,8 +81,8 @@ public class Statemanagement {
*/
public List<States> getStates() {
try {
- Query query = em
- .createQuery("select c from States as c where c.deleted <> :deleted");
+ TypedQuery<States> query = em
+ .createQuery("select c from States as c where c.deleted <> :deleted", States.class);
query.setParameter("deleted", "true");
List<States> ll = query.getResultList();
return ll;
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/Usermanagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/Usermanagement.java?rev=1220406&r1=1220405&r2=1220406&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/Usermanagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/Usermanagement.java Sun Dec 18 13:52:37 2011
@@ -10,7 +10,6 @@ import javax.persistence.EntityManager;
import javax.persistence.NoResultException;
import javax.persistence.NonUniqueResultException;
import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
import javax.persistence.TypedQuery;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
@@ -729,12 +728,12 @@ public class Usermanagement {
return new Long(1);
}
- Query query = em
- .createQuery("select c from Users as c where c.user_id = :user_id AND c.deleted <> 'true'");
+ TypedQuery<Users> query = em
+ .createQuery("select c from Users as c where c.user_id = :user_id AND c.deleted <> 'true'", Users.class);
query.setParameter("user_id", user_id);
Users us = null;
try {
- us = (Users) query.getSingleResult();
+ us = query.getSingleResult();
} catch (NoResultException e) {
// u=null}
}
@@ -760,12 +759,12 @@ public class Usermanagement {
return new Long(1);
}
- Query query = em
- .createQuery("select c from Users as c where c.user_id = :user_id AND c.deleted <> 'true'");
+ TypedQuery<Users> query = em
+ .createQuery("select c from Users as c where c.user_id = :user_id AND c.deleted <> 'true'", Users.class);
query.setParameter("user_id", user_id);
Users us = null;
try {
- us = (Users) query.getSingleResult();
+ us = query.getSingleResult();
} catch (NoResultException e) {
// u=null}
}
@@ -1696,12 +1695,12 @@ public class Usermanagement {
String hql = "SELECT u FROM Users as u "
+ " where u.activatehash = :activatehash"
+ " AND u.deleted <> :deleted";
- Query query = em.createQuery(hql);
+ TypedQuery<Users> query = em.createQuery(hql, Users.class);
query.setParameter("activatehash", hash);
query.setParameter("deleted", "true");
Users u = null;
try {
- u = (Users) query.getSingleResult();
+ u = query.getSingleResult();
} catch (NoResultException e) {
// u=null}
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/dao/PrivateMessageFolderDaoImpl.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/dao/PrivateMessageFolderDaoImpl.java?rev=1220406&r1=1220405&r2=1220406&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/dao/PrivateMessageFolderDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/dao/PrivateMessageFolderDaoImpl.java Sun Dec 18 13:52:37 2011
@@ -6,7 +6,7 @@ import java.util.List;
import javax.persistence.EntityManager;
import javax.persistence.NoResultException;
import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
+import javax.persistence.TypedQuery;
import org.openmeetings.app.persistence.beans.user.PrivateMessageFolder;
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
@@ -57,12 +57,12 @@ public class PrivateMessageFolderDaoImpl
String hql = "select c from PrivateMessageFolder c " +
"where c.privateMessageFolderId = :privateMessageFolderId ";
- Query query = em.createQuery(hql);
+ TypedQuery<PrivateMessageFolder> query = em.createQuery(hql, PrivateMessageFolder.class);
query.setParameter("privateMessageFolderId", privateMessageFolderId);
PrivateMessageFolder privateMessageFolder = null;
try {
- privateMessageFolder = (PrivateMessageFolder) query.getSingleResult();
+ privateMessageFolder = query.getSingleResult();
} catch (NoResultException ex) {
}
@@ -77,7 +77,7 @@ public class PrivateMessageFolderDaoImpl
try {
String hql = "select c from PrivateMessageFolder c ";
- Query query = em.createQuery(hql);
+ TypedQuery<PrivateMessageFolder> query = em.createQuery(hql, PrivateMessageFolder.class);
List<PrivateMessageFolder> privateMessageFolders = query.getResultList();
@@ -109,7 +109,7 @@ public class PrivateMessageFolderDaoImpl
String hql = "select c from PrivateMessageFolder c " +
"where c.userId = :userId ";
- Query query = em.createQuery(hql);
+ TypedQuery<PrivateMessageFolder> query = em.createQuery(hql, PrivateMessageFolder.class);
query.setParameter("userId", userId);
List<PrivateMessageFolder> privateMessageFolders = query.getResultList();
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/dao/PrivateMessagesDaoImpl.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/dao/PrivateMessagesDaoImpl.java?rev=1220406&r1=1220405&r2=1220406&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/dao/PrivateMessagesDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/dao/PrivateMessagesDaoImpl.java Sun Dec 18 13:52:37 2011
@@ -7,6 +7,7 @@ import javax.persistence.EntityManager;
import javax.persistence.NoResultException;
import javax.persistence.PersistenceContext;
import javax.persistence.Query;
+import javax.persistence.TypedQuery;
import org.apache.commons.lang.StringUtils;
import org.openmeetings.app.persistence.beans.rooms.Rooms;
@@ -72,7 +73,7 @@ public class PrivateMessagesDaoImpl {
String hql = "select c from PrivateMessages c ";
- Query query = em.createQuery(hql);
+ TypedQuery<PrivateMessages> query = em.createQuery(hql, PrivateMessages.class);
List<PrivateMessages> privateMessages = query.getResultList();
@@ -90,12 +91,12 @@ public class PrivateMessagesDaoImpl {
String hql = "select c from PrivateMessages c " +
"where c.privateMessageId = :privateMessageId ";
- Query query = em.createQuery(hql);
+ TypedQuery<PrivateMessages> query = em.createQuery(hql, PrivateMessages.class);
query.setParameter("privateMessageId", privateMessageId);
PrivateMessages privateMessage = null;
try {
- privateMessage = (PrivateMessages) query.getSingleResult();
+ privateMessage = query.getSingleResult();
} catch (NoResultException ex) {
}
@@ -143,15 +144,15 @@ public class PrivateMessagesDaoImpl {
hql += " ) ";
}
- Query query = em.createQuery(hql);
+ TypedQuery<Long> query = em.createQuery(hql, Long.class);
query.setParameter("toUserId", toUserId);
if (search.length() != 0) {
query.setParameter("search", StringUtils.lowerCase("%"+search+"%"));
}
query.setParameter("privateMessageFolderId", privateMessageFolderId);
- List ll = query.getResultList();
+ List<Long> ll = query.getResultList();
- return (Long)ll.get(0);
+ return ll.get(0);
} catch (Exception e) {
log.error("[countPrivateMessagesByUser]",e);
@@ -188,7 +189,7 @@ public class PrivateMessagesDaoImpl {
hql += " DESC";
}
- Query query = em.createQuery(hql);
+ TypedQuery<PrivateMessages> query = em.createQuery(hql, PrivateMessages.class);
query.setParameter("toUserId", toUserId);
query.setParameter("isTrash", false);
query.setParameter("privateMessageFolderId", privateMessageFolderId);
@@ -227,16 +228,16 @@ public class PrivateMessagesDaoImpl {
hql += " ) ";
}
- Query query = em.createQuery(hql);
+ TypedQuery<Long> query = em.createQuery(hql, Long.class);
query.setParameter("toUserId", toUserId);
query.setParameter("isTrash", false);
query.setParameter("privateMessageFolderId", privateMessageFolderId);
if (search.length() != 0) {
query.setParameter("search", StringUtils.lowerCase("%"+search+"%"));
}
- List ll = query.getResultList();
+ List<Long> ll = query.getResultList();
- return (Long)ll.get(0);
+ return ll.get(0);
} catch (Exception e) {
log.error("[countSendPrivateMessagesByUser]",e);
@@ -271,7 +272,7 @@ public class PrivateMessagesDaoImpl {
hql += " DESC";
}
- Query query = em.createQuery(hql);
+ TypedQuery<PrivateMessages> query = em.createQuery(hql, PrivateMessages.class);
if (search.length() != 0) {
query.setParameter("search", StringUtils.lowerCase("%"+search+"%"));
}
@@ -305,14 +306,14 @@ public class PrivateMessagesDaoImpl {
hql += " ) ";
}
- Query query = em.createQuery(hql);
+ TypedQuery<Long> query = em.createQuery(hql, Long.class);
query.setParameter("user_id", user_id);
if (search.length() != 0) {
query.setParameter("search", StringUtils.lowerCase("%"+search+"%"));
}
- List ll = query.getResultList();
+ List<Long> ll = query.getResultList();
- return (Long)ll.get(0);
+ return ll.get(0);
} catch (Exception e) {
log.error("[countTrashPrivateMessagesByUser]",e);
@@ -349,7 +350,7 @@ public class PrivateMessagesDaoImpl {
hql += " DESC";
}
- Query query = em.createQuery(hql);
+ TypedQuery<PrivateMessages> query = em.createQuery(hql, PrivateMessages.class);
query.setParameter("toUserId", toUserId);
query.setParameter("privateMessageFolderId", privateMessageFolderId);
if (search.length() != 0) {
@@ -386,15 +387,15 @@ public class PrivateMessagesDaoImpl {
hql += " ) ";
}
- Query query = em.createQuery(hql);
+ TypedQuery<Long> query = em.createQuery(hql, Long.class);
query.setParameter("toUserId", toUserId);
if (search.length() != 0) {
query.setParameter("search", StringUtils.lowerCase("%"+search+"%"));
}
query.setParameter("privateMessageFolderId", privateMessageFolderId);
- List ll = query.getResultList();
+ List<Long> ll = query.getResultList();
- return (Long)ll.get(0);
+ return ll.get(0);
} catch (Exception e) {
log.error("[countFolderPrivateMessagesByUser]",e);
@@ -434,7 +435,7 @@ public class PrivateMessagesDaoImpl {
log.debug("privateMessageFolderId "+privateMessageFolderId);
- Query query = em.createQuery(hql);
+ TypedQuery<PrivateMessages> query = em.createQuery(hql, PrivateMessages.class);
query.setParameter("toUserId", toUserId);
query.setParameter("isTrash", false);
query.setParameter("privateMessageFolderId", privateMessageFolderId);
@@ -467,16 +468,16 @@ public class PrivateMessagesDaoImpl {
int updatedEntities = query.executeUpdate();
//Refresh the Entities in the Cache as Hibernate will not do it!
+ //FIXME weird code
for (Long privateMessageId : privateMessageIds) {
String hqlSel = "select c from PrivateMessages c " +
"where c.privateMessageId = :privateMessageId ";
- Query querySel = em.createQuery(hqlSel);
+ TypedQuery<PrivateMessages> querySel = em.createQuery(hqlSel, PrivateMessages.class);
querySel.setParameter("privateMessageId", privateMessageId);
- PrivateMessages privateMessages = null;
try {
- privateMessages = (PrivateMessages) querySel.getSingleResult();
+ querySel.getSingleResult();
} catch (NoResultException ex) {
}
}
@@ -501,16 +502,16 @@ public class PrivateMessagesDaoImpl {
int updatedEntities = query.executeUpdate();
//Refresh the Entities in the Cache as Hibernate will not do it!
+ //FIXME weird code
for (Long privateMessageId : privateMessageIds) {
String hqlSel = "select c from PrivateMessages c " +
"where c.privateMessageId = :privateMessageId ";
- Query querySel = em.createQuery(hqlSel);
+ TypedQuery<PrivateMessages> querySel = em.createQuery(hqlSel, PrivateMessages.class);
querySel.setParameter("privateMessageId", privateMessageId);
- PrivateMessages privateMessages = null;
try {
- privateMessages = (PrivateMessages) querySel.getSingleResult();
+ querySel.getSingleResult();
} catch (NoResultException ex) {
}
}
@@ -534,16 +535,16 @@ public class PrivateMessagesDaoImpl {
int updatedEntities = query.executeUpdate();
//Refresh the Entities in the Cache as Hibernate will not do it!
+ //FIXME weird code
for (Long privateMessageId : privateMessageIds) {
String hqlSel = "select c from PrivateMessages c " +
"where c.privateMessageId = :privateMessageId ";
- Query querySel = em.createQuery(hqlSel);
+ TypedQuery<PrivateMessages> querySel = em.createQuery(hqlSel, PrivateMessages.class);
querySel.setParameter("privateMessageId", privateMessageId);
- PrivateMessages privateMessages = null;
try {
- privateMessages = (PrivateMessages) querySel.getSingleResult();
+ querySel.getSingleResult();
} catch (NoResultException ex) {
}
}
@@ -578,7 +579,7 @@ public class PrivateMessagesDaoImpl {
"where c.room.rooms_id = :roomId ";
- Query query = em.createQuery(hql);
+ TypedQuery<PrivateMessages> query = em.createQuery(hql, PrivateMessages.class);
query.setParameter("roomId", roomId);
List<PrivateMessages> ll = query.getResultList();
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/dao/UserContactsDaoImpl.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/dao/UserContactsDaoImpl.java?rev=1220406&r1=1220405&r2=1220406&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/dao/UserContactsDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/dao/UserContactsDaoImpl.java Sun Dec 18 13:52:37 2011
@@ -7,6 +7,7 @@ import javax.persistence.EntityManager;
import javax.persistence.NoResultException;
import javax.persistence.PersistenceContext;
import javax.persistence.Query;
+import javax.persistence.TypedQuery;
import org.openmeetings.app.data.user.Usermanagement;
import org.openmeetings.app.persistence.beans.user.UserContacts;
@@ -98,14 +99,14 @@ public class UserContactsDaoImpl {
String hql = "select count(c.userContactId) from UserContacts c " +
"where c.contact.user_id = :user_id AND c.owner.user_id = :ownerId ";
- Query query = em.createQuery(hql);
+ TypedQuery<Long> query = em.createQuery(hql, Long.class);
query.setParameter("user_id", user_id);
query.setParameter("ownerId", ownerId);
- List ll = query.getResultList();
+ List<Long> ll = query.getResultList();
- log.info("checkUserContacts"+(Long)ll.get(0));
+ log.info("checkUserContacts" + ll.get(0));
- return (Long)ll.get(0);
+ return ll.get(0);
} catch (Exception e) {
log.error("[checkUserContacts]",e);
@@ -119,7 +120,7 @@ public class UserContactsDaoImpl {
String hql = "select c from UserContacts c " +
"where c.hash like :hash ";
- Query query = em.createQuery(hql);
+ TypedQuery<UserContacts> query = em.createQuery(hql, UserContacts.class);
query.setParameter("hash", hash);
List<UserContacts> ll = query.getResultList();
@@ -142,7 +143,7 @@ public class UserContactsDaoImpl {
"AND c.pending = :pending " +
"AND c.contact.deleted <> 'true'";
- Query query = em.createQuery(hql);
+ TypedQuery<UserContacts> query = em.createQuery(hql, UserContacts.class);
query.setParameter("ownerId", ownerId);
query.setParameter("pending", pending);
List<UserContacts> ll = query.getResultList();
@@ -163,7 +164,7 @@ public class UserContactsDaoImpl {
"AND c.shareCalendar = :shareCalendar " +
"AND c.contact.deleted <> 'true'";
- Query query = em.createQuery(hql);
+ TypedQuery<UserContacts> query = em.createQuery(hql, UserContacts.class);
query.setParameter("contactId", contactId);
query.setParameter("shareCalendar", shareCalendar);
List<UserContacts> ll = query.getResultList();
@@ -184,7 +185,7 @@ public class UserContactsDaoImpl {
"AND c.pending = :pending " +
"AND c.contact.deleted <> 'true'";
- Query query = em.createQuery(hql);
+ TypedQuery<UserContacts> query = em.createQuery(hql, UserContacts.class);
query.setParameter("user_id", user_id);
query.setParameter("pending", pending);
List<UserContacts> ll = query.getResultList();
@@ -203,11 +204,11 @@ public class UserContactsDaoImpl {
String hql = "select c from UserContacts c " +
"where c.userContactId = :userContactId";
- Query query = em.createQuery(hql);
+ TypedQuery<UserContacts> query = em.createQuery(hql, UserContacts.class);
query.setParameter("userContactId", userContactId);
UserContacts userContacts = null;
try {
- userContacts = (UserContacts) query.getSingleResult();
+ userContacts = query.getSingleResult();
} catch (NoResultException ex) {
}
@@ -224,7 +225,7 @@ public class UserContactsDaoImpl {
String hql = "select c from UserContacts c ";
- Query query = em.createQuery(hql);
+ TypedQuery<UserContacts> query = em.createQuery(hql, UserContacts.class);
List<UserContacts> userContacts = query.getResultList();
return userContacts;
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/dao/UserSipDataDaoImpl.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/dao/UserSipDataDaoImpl.java?rev=1220406&r1=1220405&r2=1220406&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/dao/UserSipDataDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/dao/UserSipDataDaoImpl.java Sun Dec 18 13:52:37 2011
@@ -5,7 +5,7 @@ import java.util.Date;
import javax.persistence.EntityManager;
import javax.persistence.NoResultException;
import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
+import javax.persistence.TypedQuery;
import org.openmeetings.app.persistence.beans.user.UserSipData;
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
@@ -29,11 +29,11 @@ public class UserSipDataDaoImpl {
String hql = "select c from UserSipData as c where c.userSipDataId = :userSipDataId";
- Query query = em.createQuery(hql);
+ TypedQuery<UserSipData> query = em.createQuery(hql, UserSipData.class);
query.setParameter("userSipDataId", userSipDataId);
UserSipData userSipData = null;
try {
- userSipData = (UserSipData) query.getSingleResult();
+ userSipData = query.getSingleResult();
} catch (NoResultException ex) {
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/dao/UsersDaoImpl.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/dao/UsersDaoImpl.java?rev=1220406&r1=1220405&r2=1220406&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/dao/UsersDaoImpl.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/user/dao/UsersDaoImpl.java Sun Dec 18 13:52:37 2011
@@ -6,7 +6,6 @@ import java.util.List;
import javax.persistence.EntityManager;
import javax.persistence.NoResultException;
import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
import javax.persistence.TypedQuery;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
@@ -40,12 +39,12 @@ public class UsersDaoImpl {
public Users getUser(Long user_id) {
if (user_id != null && user_id > 0) {
try {
- Query query = em.createQuery("select c from Users as c where c.user_id = :user_id");
+ TypedQuery<Users> query = em.createQuery("select c from Users as c where c.user_id = :user_id", Users.class);
query.setParameter("user_id", user_id);
Users users = null;
try {
- users = (Users) query.getSingleResult();
+ users = query.getSingleResult();
} catch (NoResultException ex) {
}
return users;
@@ -110,10 +109,10 @@ public class UsersDaoImpl {
public Long selectMaxFromUsers() {
try {
// get all users
- Query query = em.createQuery("select count(c.user_id) from Users c where c.deleted = 'false'");
- List<?> ll = query.getResultList();
+ TypedQuery<Long> query = em.createQuery("select count(c.user_id) from Users c where c.deleted = 'false'", Long.class);
+ List<Long> ll = query.getResultList();
log.info("selectMaxFromUsers" + ll.get(0));
- return (Long) ll.get(0);
+ return ll.get(0);
} catch (Exception ex2) {
log.error("[selectMaxFromUsers] ", ex2);
}
@@ -191,15 +190,15 @@ public class UsersDaoImpl {
log.debug("Show HQL: " + hql);
- Query query = em.createQuery(hql);
+ TypedQuery<Long> query = em.createQuery(hql, Long.class);
// log.debug("id: "+folderId);
- List<?> ll = query.getResultList();
+ List<Long> ll = query.getResultList();
// log.error((Long)ll.get(0));
- Long i = (Long) ll.get(0);
+ Long i = ll.get(0);
- return new Long(i);
+ return i;
} catch (Exception ex2) {
log.error("[getAllUserMax]: ", ex2);
}
@@ -214,7 +213,7 @@ public class UsersDaoImpl {
*/
public boolean checkUserLogin(String DataValue) {
try {
- Query query = em.createQuery("select c from Users as c where c.login = :DataValue AND c.deleted <> :deleted");
+ TypedQuery<Users> query = em.createQuery("select c from Users as c where c.login = :DataValue AND c.deleted <> :deleted", Users.class);
query.setParameter("DataValue", DataValue);
query.setParameter("deleted", "true");
int count = query.getResultList().size();
@@ -232,12 +231,12 @@ public class UsersDaoImpl {
try {
String hql = "SELECT u FROM Users as u "
+ " where u.login = :login" + " AND u.deleted <> :deleted";
- Query query = em.createQuery(hql);
+ TypedQuery<Users> query = em.createQuery(hql, Users.class);
query.setParameter("login", login);
query.setParameter("deleted", "true");
Users us = null;
try {
- us = (Users) query.getSingleResult();
+ us = query.getSingleResult();
} catch (NoResultException ex) {
}
return us;
@@ -252,12 +251,12 @@ public class UsersDaoImpl {
String hql = "SELECT u FROM Users as u "
+ " where u.adresses.email = :email"
+ " AND u.deleted <> :deleted";
- Query query = em.createQuery(hql);
+ TypedQuery<Users> query = em.createQuery(hql, Users.class);
query.setParameter("email", email);
query.setParameter("deleted", "true");
Users us = null;
try {
- us = (Users) query.getSingleResult();
+ us = query.getSingleResult();
} catch (NoResultException ex) {
}
return us;
@@ -274,12 +273,12 @@ public class UsersDaoImpl {
String hql = "SELECT u FROM Users as u "
+ " where u.resethash = :resethash"
+ " AND u.deleted <> :deleted";
- Query query = em.createQuery(hql);
+ TypedQuery<Users> query = em.createQuery(hql, Users.class);
query.setParameter("resethash", hash);
query.setParameter("deleted", "true");
Users us = null;
try {
- us = (Users) query.getSingleResult();
+ us = query.getSingleResult();
} catch (NoResultException ex) {
}
if (us != null) {
@@ -326,11 +325,11 @@ public class UsersDaoImpl {
+ "OR lower(c.lastname) LIKE :search " + ")";
// get all users
- Query query = em.createQuery(hql);
+ TypedQuery<Long> query = em.createQuery(hql, Long.class);
query.setParameter("search", StringUtils.lowerCase(search));
- List<?> ll = query.getResultList();
+ List<Long> ll = query.getResultList();
log.info("selectMaxFromUsers" + ll.get(0));
- return (Long) ll.get(0);
+ return ll.get(0);
} catch (Exception ex2) {
log.error("[selectMaxFromUsers] ", ex2);
}