Copied: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java (from r1712910, openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java) URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java?p2=openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java&p1=openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java&r1=1712910&r2=1712911&rev=1712911&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingDao.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingDao.java Fri Nov 6 06:18:44 2015 @@ -36,8 +36,8 @@ import javax.persistence.TypedQuery; import org.apache.openmeetings.db.dao.user.UserDao; import org.apache.openmeetings.db.dto.record.RecordingContainerData; -import org.apache.openmeetings.db.entity.record.FlvRecording; -import org.apache.openmeetings.db.entity.record.FlvRecording.Status; +import org.apache.openmeetings.db.entity.record.Recording; +import org.apache.openmeetings.db.entity.record.Recording.Status; import org.apache.openmeetings.db.entity.user.Organisation_Users; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; @@ -49,35 +49,34 @@ import org.springframework.transaction.a * */ @Transactional -public class FlvRecordingDao { - - private static final Logger log = Red5LoggerFactory.getLogger(FlvRecordingDao.class, webAppRootKey); +public class RecordingDao { + private static final Logger log = Red5LoggerFactory.getLogger(RecordingDao.class, webAppRootKey); @PersistenceContext private EntityManager em; @Autowired private UserDao userDao; - public FlvRecording get(Long flvRecordingId) { + public Recording get(Long recordingId) { try { - TypedQuery<FlvRecording> query = em.createNamedQuery("getRecordingById", FlvRecording.class); - query.setParameter("id", flvRecordingId); + TypedQuery<Recording> query = em.createNamedQuery("getRecordingById", Recording.class); + query.setParameter("id", recordingId); - FlvRecording flvRecording = null; + Recording recording = null; try { - flvRecording = query.getSingleResult(); + recording = query.getSingleResult(); } catch (NoResultException ex) { } - return flvRecording; + return recording; } catch (Exception ex2) { - log.error("[getFlvRecordingById]: ", ex2); + log.error("[get]: ", ex2); } return null; } - public FlvRecording getRecordingByHash(String hash) { + public Recording getByHash(String hash) { try { - TypedQuery<FlvRecording> query = em.createNamedQuery("getRecordingByHash", FlvRecording.class); + TypedQuery<Recording> query = em.createNamedQuery("getRecordingByHash", Recording.class); query.setParameter("fileHash", hash); try { @@ -91,167 +90,116 @@ public class FlvRecordingDao { return null; } - public List<FlvRecording> getFlvRecordings() { - try { - return em.createQuery("SELECT c FROM FlvRecording c WHERE c.deleted = false", FlvRecording.class) - .getResultList(); - } catch (Exception ex2) { - log.error("[getFlvRecordings]: ", ex2); - } - return null; - } - - public List<FlvRecording> getFlvRecordingByExternalUserId(String externalUserId, String externalUserType) { + public List<Recording> getByExternalId(String externalId, String externalType) { try { - log.debug("getFlvRecordingByExternalUserId :externalUserId: {}; externalType: {}", externalUserId, externalUserType); + log.debug("getFByExternalId :externalId: {}; externalType: {}", externalId, externalType); - TypedQuery<FlvRecording> query = em.createNamedQuery("getRecordingsByExternalUser", FlvRecording.class); - query.setParameter("externalUserId", externalUserId); - query.setParameter("externalUserType", externalUserType); + TypedQuery<Recording> query = em.createNamedQuery("getRecordingsByExternalUser", Recording.class); + query.setParameter("externalId", externalId); + query.setParameter("externalType", externalType); - List<FlvRecording> flvRecordingList = query.getResultList(); + List<Recording> recordingList = query.getResultList(); - log.debug("getFlvRecordingByExternalUserId :: " + flvRecordingList.size()); + log.debug("getByExternalId :: " + recordingList.size()); - return flvRecordingList; + return recordingList; } catch (Exception ex2) { - log.error("[getFlvRecordingByExternalUserId]: ", ex2); + log.error("[getByExternalId]: ", ex2); } return null; } - public List<FlvRecording> getFlvRecordingByExternalRoomTypeAndCreator(String externalRoomType, Long insertedBy) { + public List<Recording> getByExternalTypeAndCreator(String externalType, Long insertedBy) { try { - log.debug("getFlvRecordingByExternalRoomType :externalRoomType: " + externalRoomType); + log.debug("getByExternalType :externalType: " + externalType); - String hql = "SELECT c FROM FlvRecording c, Room r WHERE c.room_id = r.rooms_id " - + "AND r.externalRoomType LIKE :externalRoomType AND c.insertedBy LIKE :insertedBy " - + "AND c.deleted = false"; - - TypedQuery<FlvRecording> query = em.createQuery(hql, FlvRecording.class); - query.setParameter("externalRoomType", externalRoomType); + TypedQuery<Recording> query = em.createNamedQuery("getRecordingsByExternalTypeAndOwner", Recording.class); + query.setParameter("externalType", externalType); query.setParameter("insertedBy", insertedBy); - query.setParameter("deleted", true); - List<FlvRecording> flvRecordingList = query.getResultList(); + List<Recording> recordingList = query.getResultList(); - log.debug("getFlvRecordingByExternalRoomType :: " + flvRecordingList.size()); + log.debug("getByExternalType :: " + recordingList.size()); - return flvRecordingList; + return recordingList; } catch (Exception ex2) { - log.error("[getFlvRecordingByExternalRoomType]: ", ex2); + log.error("[getByExternalType]: ", ex2); } return null; } - public List<FlvRecording> getAllFlvRecordings() { + public List<Recording> get() { try { - String hql = "SELECT c FROM FlvRecording c LEFT JOIN FETCH c.flvRecordingMetaData ORDER BY c.flvRecordingId"; - - TypedQuery<FlvRecording> query = em.createQuery(hql, FlvRecording.class); + TypedQuery<Recording> query = em.createNamedQuery("getRecordingsAll", Recording.class); return query.getResultList(); } catch (Exception ex2) { - log.error("[getAllFlvRecordings]: ", ex2); + log.error("[get]: ", ex2); } return null; } - public List<FlvRecording> getFlvRecordingByExternalRoomType(String externalRoomType) { - try { - - log.debug("getFlvRecordingByExternalRoomType :externalRoomType: " + externalRoomType); - - String hql = "SELECT c FROM FlvRecording c, Room r " + "WHERE c.room_id = r.rooms_id " - + "AND r.externalRoomType LIKE :externalRoomType " + "AND c.deleted <> :deleted "; - - TypedQuery<FlvRecording> query = em.createQuery(hql, FlvRecording.class); - query.setParameter("externalRoomType", externalRoomType); - query.setParameter("deleted", true); - - List<FlvRecording> flvRecordingList = query.getResultList(); + public List<Recording> getByExternalType(String externalType) { + log.debug("getByExternalType :externalType: " + externalType); - log.debug("getFlvRecordingByExternalRoomType :: " + flvRecordingList.size()); + TypedQuery<Recording> query = em.createNamedQuery("getRecordingsByExternalType", Recording.class); + query.setParameter("externalType", externalType); - return flvRecordingList; - } catch (Exception ex2) { - log.error("[getFlvRecordingByExternalRoomType]: ", ex2); - } - return null; + return query.getResultList(); } - public List<FlvRecording> getRecordingsByExternalType(String externalType) { - try { - log.debug("getRecordingsByExternalType :externalType: " + externalType); - - TypedQuery<FlvRecording> query = em.createNamedQuery("getRecordingsByExternalType", FlvRecording.class); - query.setParameter("externalType", externalType); - - return query.getResultList(); - } catch (Exception ex2) { - log.error("[getRecordingsByExternalType]: ", ex2); - } - return null; - } - - public List<FlvRecording> getFlvRecordingRootByPublic(Long orgId) { - TypedQuery<FlvRecording> q = em.createNamedQuery(orgId == null ? "getRecordingsPublic" : "getRecordingsByOrganization", FlvRecording.class); + public List<Recording> getRootByPublic(Long orgId) { + TypedQuery<Recording> q = em.createNamedQuery(orgId == null ? "getRecordingsPublic" : "getRecordingsByOrganization", Recording.class); if (orgId != null) { q.setParameter("organization_id", orgId); } return q.getResultList(); } - public List<FlvRecording> getFlvRecordingRootByOwner(Long ownerId) { - return em.createNamedQuery("getRecordingsByOwner", FlvRecording.class).setParameter("ownerId", ownerId).getResultList(); + public List<Recording> getRootByOwner(Long ownerId) { + return em.createNamedQuery("getRecordingsByOwner", Recording.class).setParameter("ownerId", ownerId).getResultList(); } - public List<FlvRecording> getFlvRecordingByRoomId(Long room_id) { + public List<Recording> getByRoomId(Long roomId) { try { + TypedQuery<Recording> query = em.createNamedQuery("getRecordingsByRoom", Recording.class); + query.setParameter("roomId", roomId); - String hql = "SELECT c FROM FlvRecording c " + "WHERE c.deleted <> :deleted " + "AND c.room_id = :room_id " - + "ORDER BY c.folder DESC, c.fileName "; - - TypedQuery<FlvRecording> query = em.createQuery(hql, FlvRecording.class); - query.setParameter("deleted", true); - query.setParameter("room_id", room_id); - - List<FlvRecording> flvRecordingList = query.getResultList(); + List<Recording> recordingList = query.getResultList(); - return flvRecordingList; + return recordingList; } catch (Exception ex2) { - log.error("[getFlvRecordingByOwner]: ", ex2); + log.error("[getByRoomId]: ", ex2); } return null; } - public List<FlvRecording> getFlvRecordingByParent(Long parentId) { - return em.createNamedQuery("getRecordingsByParent", FlvRecording.class).setParameter("parentId", parentId).getResultList(); + public List<Recording> getByParent(Long parentId) { + return em.createNamedQuery("getRecordingsByParent", Recording.class).setParameter("parentId", parentId).getResultList(); } - public void updateFlvRecordingEndTime(Long flvRecordingId, Date recordEnd, Long organization_id) { + public void updateEndTime(Long recordingId, Date recordEnd) { try { - FlvRecording fId = get(flvRecordingId); + Recording fId = get(recordingId); fId.setProgressPostProcessing(0); fId.setRecordEnd(recordEnd); - fId.setOrganization_id(organization_id); update(fId); } catch (Exception ex2) { - log.error("[updateFlvRecordingEndTime]: ", ex2); + log.error("[updateEndTime]: ", ex2); } } /** * @param fileExplorerItemId */ - public boolean delete(Long flvRecordingId) { + public boolean delete(Long id) { try { - FlvRecording f = get(flvRecordingId); + Recording f = get(id); return delete(f); } catch (Exception ex2) { log.error("[delete]: ", ex2); @@ -260,8 +208,8 @@ public class FlvRecordingDao { return false; } - public boolean delete(FlvRecording f) { - if (f == null || f.getFlvRecordingId() == 0) { + public boolean delete(Recording f) { + if (f == null || f.getId() == null) { return false; } f.setDeleted(true); @@ -269,9 +217,9 @@ public class FlvRecordingDao { return true; } - public FlvRecording update(FlvRecording f) { + public Recording update(Recording f) { try { - if (f.getFlvRecordingId() == 0) { + if (f.getId() == null) { f.setInserted(new Date()); em.persist(f); } else { @@ -295,16 +243,16 @@ public class FlvRecordingDao { .executeUpdate(); } - public RecordingContainerData getRecordingContainerData(long userId) { + public RecordingContainerData getContainerData(long userId) { try { RecordingContainerData containerData = new RecordingContainerData(); // User Home Recordings - List<FlvRecording> homeFlvRecordings = getFlvRecordingRootByOwner(userId); + List<Recording> homes = getRootByOwner(userId); long homeFileSize = 0; - for (FlvRecording homeFlvRecording : homeFlvRecordings) { - homeFileSize += getRecordingSize(homeFlvRecording); + for (Recording home : homes) { + homeFileSize += getSize(home); } containerData.setUserHomeSize(homeFileSize); @@ -314,10 +262,10 @@ public class FlvRecordingDao { //get all organizations the user can view for (Organisation_Users ou : userDao.get(userId).getOrganisation_users()) { - List<FlvRecording>publicFlvRecordings = getFlvRecordingRootByPublic(ou.getOrganisation().getOrganisation_id()); + List<Recording> publicRecordings = getRootByPublic(ou.getOrganisation().getId()); //get sizes - for (FlvRecording publicFlvRecording : publicFlvRecordings) { - publicFileSize += getRecordingSize(publicFlvRecording); + for (Recording r : publicRecordings) { + publicFileSize += getSize(r); } } containerData.setPublicFileSize(publicFileSize); @@ -329,7 +277,7 @@ public class FlvRecordingDao { return null; } - private long getRecordingSize(FlvRecording r) { + private long getSize(Recording r) { long size = 0; if (isRecordingExists(r.getFileHash())) { @@ -347,8 +295,8 @@ public class FlvRecordingDao { if (isRecordingExists(r.getFileHash() + OGG_EXTENSION)) { size += getOggRecording(r.getFileHash()).length(); } - for (FlvRecording flvRecording : getFlvRecordingByParent(r.getFlvRecordingId())) { - size += getRecordingSize(flvRecording); + for (Recording rec : getByParent(r.getId())) { + size += getSize(rec); } return size; }
Copied: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingLogDao.java (from r1712758, openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingLogDao.java) URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingLogDao.java?p2=openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingLogDao.java&p1=openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingLogDao.java&r1=1712758&r2=1712911&rev=1712911&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingLogDao.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingLogDao.java Fri Nov 6 06:18:44 2015 @@ -26,16 +26,16 @@ import java.util.List; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; -import org.apache.openmeetings.db.entity.record.FlvRecording; -import org.apache.openmeetings.db.entity.record.FlvRecordingLog; +import org.apache.openmeetings.db.entity.record.Recording; +import org.apache.openmeetings.db.entity.record.RecordingLog; import org.apache.openmeetings.util.process.ConverterProcessResult; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; import org.springframework.transaction.annotation.Transactional; @Transactional -public class FlvRecordingLogDao { - private static final Logger log = Red5LoggerFactory.getLogger(FlvRecordingDao.class, webAppRootKey); +public class RecordingLogDao { + private static final Logger log = Red5LoggerFactory.getLogger(RecordingLogDao.class, webAppRootKey); @PersistenceContext private EntityManager em; @@ -44,8 +44,8 @@ public class FlvRecordingLogDao { .setParameter("recId", recordingId).getSingleResult(); } - public List<FlvRecordingLog> getByRecordingId(Long recordingId) { - return em.createNamedQuery("getRecordingLogsByRecording", FlvRecordingLog.class) + public List<RecordingLog> getByRecordingId(Long recordingId) { + return em.createNamedQuery("getRecordingLogsByRecording", RecordingLog.class) .setParameter("recId", recordingId).getResultList(); } @@ -53,21 +53,21 @@ public class FlvRecordingLogDao { em.createNamedQuery("deleteErrorRecordingLogsByRecording").setParameter("recId", recordingId).executeUpdate(); } - public Long addFLVRecordingLog(String msgType, FlvRecording flvRecording, ConverterProcessResult returnMap) { + public Long add(String msgType, Recording recording, ConverterProcessResult returnMap) { try { - FlvRecordingLog flvRecordingLog = new FlvRecordingLog(); - flvRecordingLog.setInserted(new Date()); - flvRecordingLog.setExitValue(returnMap.getExitValue()); - flvRecordingLog.setFlvRecording(flvRecording); - flvRecordingLog.setFullMessage(returnMap.buildLogMessage()); - flvRecordingLog.setMsgType(msgType); + RecordingLog log = new RecordingLog(); + log.setInserted(new Date()); + log.setExitValue(returnMap.getExitValue()); + log.setRecording(recording); + log.setFullMessage(returnMap.buildLogMessage()); + log.setMsgType(msgType); - flvRecordingLog = em.merge(flvRecordingLog); - Long flvRecordingLogId = flvRecordingLog.getFlvRecordingLogId(); + log = em.merge(log); + Long logId = log.getId(); - return flvRecordingLogId; + return logId; } catch (Exception ex2) { - log.error("[addFLVRecordingLog]: ",ex2); + log.error("[add]: ",ex2); } return -1L; } Copied: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDataDao.java (from r1712758, openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingMetaDataDao.java) URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDataDao.java?p2=openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDataDao.java&p1=openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingMetaDataDao.java&r1=1712758&r2=1712911&rev=1712911&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingMetaDataDao.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDataDao.java Fri Nov 6 06:18:44 2015 @@ -28,47 +28,47 @@ import javax.persistence.NoResultExcepti import javax.persistence.PersistenceContext; import javax.persistence.TypedQuery; -import org.apache.openmeetings.db.entity.record.FlvRecordingMetaData; -import org.apache.openmeetings.db.entity.record.FlvRecordingMetaData.Status; +import org.apache.openmeetings.db.entity.record.RecordingMetaData; +import org.apache.openmeetings.db.entity.record.RecordingMetaData.Status; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; @Transactional -public class FlvRecordingMetaDataDao { - private static final Logger log = Red5LoggerFactory.getLogger(FlvRecordingMetaDataDao.class, webAppRootKey); +public class RecordingMetaDataDao { + private static final Logger log = Red5LoggerFactory.getLogger(RecordingMetaDataDao.class, webAppRootKey); @PersistenceContext private EntityManager em; @Autowired - private FlvRecordingDao flvRecordingDao; + private RecordingDao recordingDao; - public FlvRecordingMetaData get(Long flvRecordingMetaDataId) { + public RecordingMetaData get(Long id) { try { - TypedQuery<FlvRecordingMetaData> query = em.createNamedQuery("getMetaById", FlvRecordingMetaData.class); - query.setParameter("id", flvRecordingMetaDataId); + TypedQuery<RecordingMetaData> query = em.createNamedQuery("getMetaById", RecordingMetaData.class); + query.setParameter("id", id); - FlvRecordingMetaData flvRecordingMetaData = null; + RecordingMetaData metaData = null; try { - flvRecordingMetaData = query.getSingleResult(); + metaData = query.getSingleResult(); } catch (NoResultException ex) { } - return flvRecordingMetaData; + return metaData; } catch (Exception ex2) { log.error("[get]: ", ex2); } return null; } - public List<FlvRecordingMetaData> getByRecording(Long recordingId) { - return em.createNamedQuery("getMetaByRecording", FlvRecordingMetaData.class).setParameter("recordingId", recordingId).getResultList(); + public List<RecordingMetaData> getByRecording(Long recordingId) { + return em.createNamedQuery("getMetaByRecording", RecordingMetaData.class).setParameter("recordingId", recordingId).getResultList(); } - public List<FlvRecordingMetaData> getAudioMetaDataByRecording(Long flvRecordingId) { + public List<RecordingMetaData> getAudioMetaDataByRecording(Long recordingId) { try { - TypedQuery<FlvRecordingMetaData> query = em.createNamedQuery("getAudioMetaByRecording", FlvRecordingMetaData.class); - query.setParameter("recordingId", flvRecordingId); + TypedQuery<RecordingMetaData> query = em.createNamedQuery("getAudioMetaByRecording", RecordingMetaData.class); + query.setParameter("recordingId", recordingId); query.setParameter("none", Status.NONE); return query.getResultList(); @@ -78,15 +78,15 @@ public class FlvRecordingMetaDataDao { return null; } - public FlvRecordingMetaData getScreenMetaDataByRecording(Long flvRecordingId) { + public RecordingMetaData getScreenMetaDataByRecording(Long recordingId) { try { - TypedQuery<FlvRecordingMetaData> query = em.createNamedQuery("getScreenMetaByRecording", FlvRecordingMetaData.class); - query.setParameter("recordingId", flvRecordingId); + TypedQuery<RecordingMetaData> query = em.createNamedQuery("getScreenMetaByRecording", RecordingMetaData.class); + query.setParameter("recordingId", recordingId); - List<FlvRecordingMetaData> flvRecordingMetaDatas = query.getResultList(); + List<RecordingMetaData> metaDatas = query.getResultList(); - if (flvRecordingMetaDatas.size() > 0) { - return flvRecordingMetaDatas.get(0); + if (metaDatas.size() > 0) { + return metaDatas.get(0); } } catch (Exception ex2) { log.error("[getScreenMetaDataByRecording]: ", ex2); @@ -94,64 +94,64 @@ public class FlvRecordingMetaDataDao { return null; } - public Long addFlvRecordingMetaData(Long flvRecordingId, String freeTextUserName, Date recordStart, Boolean isAudioOnly, + public Long add(Long recordingId, String freeTextUserName, Date recordStart, Boolean isAudioOnly, Boolean isVideoOnly, Boolean isScreenData, String streamName, Integer interiewPodId) { try { - FlvRecordingMetaData flvRecordingMetaData = new FlvRecordingMetaData(); + RecordingMetaData metaData = new RecordingMetaData(); - flvRecordingMetaData.setDeleted(false); + metaData.setDeleted(false); - flvRecordingMetaData.setFlvRecording(flvRecordingDao.get(flvRecordingId)); - flvRecordingMetaData.setFreeTextUserName(freeTextUserName); - flvRecordingMetaData.setInserted(new Date()); + metaData.setRecording(recordingDao.get(recordingId)); + metaData.setFreeTextUserName(freeTextUserName); + metaData.setInserted(new Date()); - flvRecordingMetaData.setRecordStart(recordStart); + metaData.setRecordStart(recordStart); - flvRecordingMetaData.setAudioOnly(isAudioOnly); - flvRecordingMetaData.setVideoOnly(isVideoOnly); - flvRecordingMetaData.setScreenData(isScreenData); + metaData.setAudioOnly(isAudioOnly); + metaData.setVideoOnly(isVideoOnly); + metaData.setScreenData(isScreenData); - flvRecordingMetaData.setStreamName(streamName); + metaData.setStreamName(streamName); - flvRecordingMetaData.setInteriewPodId(interiewPodId); + metaData.setInteriewPodId(interiewPodId); - flvRecordingMetaData = em.merge(flvRecordingMetaData); - Long flvRecordingMetaDataId = flvRecordingMetaData.getFlvRecordingMetaDataId(); + metaData = em.merge(metaData); + Long metaDataId = metaData.getId(); - return flvRecordingMetaDataId; + return metaDataId; } catch (Exception ex2) { - log.error("[addFlvRecordingMetaData]: ", ex2); + log.error("[add]: ", ex2); } return null; } - public Long updateFlvRecordingMetaDataEndDate(Long metaId, Date recordEnd) { + public Long updateEndDate(Long metaId, Date recordEnd) { try { - FlvRecordingMetaData meta = get(metaId); + RecordingMetaData meta = get(metaId); meta.setRecordEnd(recordEnd); - log.debug("updateFlvRecordingMetaDataEndDate :: Start Date :" + meta.getRecordStart()); - log.debug("updateFlvRecordingMetaDataEndDate :: End Date :" + meta.getRecordEnd()); + log.debug("updateEndDate :: Start Date :" + meta.getRecordStart()); + log.debug("updateEndDate :: End Date :" + meta.getRecordEnd()); update(meta); return metaId; } catch (Exception ex2) { - log.error("[updateFlvRecordingMetaDataEndDate]: ", ex2); + log.error("[updateEndDate]: ", ex2); } return null; } - public Long update(FlvRecordingMetaData flvRecordingMetaData) { + public Long update(RecordingMetaData metaData) { try { - if (flvRecordingMetaData.getFlvRecordingMetaDataId() == 0) { - em.persist(flvRecordingMetaData); + if (metaData.getId() == 0) { + em.persist(metaData); } else { - if (!em.contains(flvRecordingMetaData)) { - em.merge(flvRecordingMetaData); + if (!em.contains(metaData)) { + em.merge(metaData); } } } catch (Exception ex2) { Copied: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDeltaDao.java (from r1712758, openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingMetaDeltaDao.java) URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDeltaDao.java?p2=openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDeltaDao.java&p1=openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingMetaDeltaDao.java&r1=1712758&r2=1712911&rev=1712911&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/FlvRecordingMetaDeltaDao.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDeltaDao.java Fri Nov 6 06:18:44 2015 @@ -18,14 +18,14 @@ */ package org.apache.openmeetings.db.dao.record; +import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; + import java.util.List; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; -import javax.persistence.TypedQuery; -import org.apache.openmeetings.db.entity.record.FlvRecordingMetaDelta; -import org.apache.openmeetings.util.OpenmeetingsVariables; +import org.apache.openmeetings.db.entity.record.RecordingMetaDelta; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; import org.springframework.transaction.annotation.Transactional; @@ -35,61 +35,45 @@ import org.springframework.transaction.a * */ @Transactional -public class FlvRecordingMetaDeltaDao { - - private static final Logger log = Red5LoggerFactory.getLogger(FlvRecordingMetaDeltaDao.class, - OpenmeetingsVariables.webAppRootKey); +public class RecordingMetaDeltaDao { + private static final Logger log = Red5LoggerFactory.getLogger(RecordingMetaDeltaDao.class, webAppRootKey); @PersistenceContext private EntityManager em; - public List<FlvRecordingMetaDelta> getFlvRecordingMetaDeltaByMetaId(Long flvRecordingMetaDataId) { - try { - - String hql = "SELECT c FROM FlvRecordingMetaDelta c " + - "WHERE c.flvRecordingMetaDataId = :flvRecordingMetaDataId"; - - TypedQuery<FlvRecordingMetaDelta> query = em.createQuery(hql, FlvRecordingMetaDelta.class); - query.setParameter("flvRecordingMetaDataId", flvRecordingMetaDataId); - - List<FlvRecordingMetaDelta> flvRecordingMetaDeltas = query.getResultList(); - - return flvRecordingMetaDeltas; - } catch (Exception ex2) { - log.error("[getFlvRecordingMetaDeltaByMetaId]: ",ex2); - } - return null; + public List<RecordingMetaDelta> getByMetaId(Long metaDataId) { + return em.createNamedQuery("getRecordingMetaDeltaByMetaDataId", RecordingMetaDelta.class).setParameter("metaDataId", metaDataId).getResultList(); } - public Long addFlvRecordingMetaDelta(FlvRecordingMetaDelta flvRecordingMetaDelta) { + public Long add(RecordingMetaDelta metaDelta) { try { - flvRecordingMetaDelta = em.merge(flvRecordingMetaDelta); - Long flvRecordingMetaDeltaId = flvRecordingMetaDelta.getFlvRecordingMetaDeltaId(); + metaDelta = em.merge(metaDelta); + Long metaDeltaId = metaDelta.getId(); - log.debug("flvRecordingMetaDeltaId "+flvRecordingMetaDeltaId); + log.debug("metaDeltaId "+metaDeltaId); - return flvRecordingMetaDeltaId; + return metaDeltaId; } catch (Exception ex2) { - log.error("[addFlvRecordingMetaDelta]: ",ex2); + log.error("[add]: ",ex2); } return null; } - public Long updateFlvRecordingMetaDelta(FlvRecordingMetaDelta flvRecordingMetaDelta) { + public Long update(RecordingMetaDelta metaDelta) { try { - if (flvRecordingMetaDelta.getFlvRecordingMetaDataId() == 0) { - em.persist(flvRecordingMetaDelta); - } else { - if (!em.contains(flvRecordingMetaDelta)) { - em.merge(flvRecordingMetaDelta); - } + if (metaDelta.getMetaDataId() == 0) { + em.persist(metaDelta); + } else { + if (!em.contains(metaDelta)) { + em.merge(metaDelta); + } } - return flvRecordingMetaDelta.getFlvRecordingMetaDataId(); + return metaDelta.getMetaDataId(); } catch (Exception ex2) { - log.error("[updateFlvRecordingMetaDelta]: ",ex2); + log.error("[update]: ",ex2); } return null; } Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java?rev=1712911&r1=1712910&r2=1712911&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/PollDao.java Fri Nov 6 06:18:44 2015 @@ -33,7 +33,7 @@ import org.apache.openmeetings.db.dao.us import org.apache.openmeetings.db.entity.room.Client; import org.apache.openmeetings.db.entity.room.PollType; import org.apache.openmeetings.db.entity.room.RoomPoll; -import org.apache.openmeetings.db.entity.room.RoomPollAnswers; +import org.apache.openmeetings.db.entity.room.RoomPollAnswer; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -180,7 +180,7 @@ public class PollDao { public boolean hasVoted(Long room_id, Long userid) { try { log.debug(" :: hasVoted :: " + room_id + ", " + userid); - TypedQuery<RoomPollAnswers> q = em.createNamedQuery("hasVoted", RoomPollAnswers.class); + TypedQuery<RoomPollAnswer> q = em.createNamedQuery("hasVoted", RoomPollAnswer.class); q.setParameter("room_id", room_id); q.setParameter("userid", userid); q.setParameter("archived", false); Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java?rev=1712911&r1=1712910&r2=1712911&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java Fri Nov 6 06:18:44 2015 @@ -35,6 +35,7 @@ import org.apache.openmeetings.db.dao.ID import org.apache.openmeetings.db.dao.basic.ConfigurationDao; import org.apache.openmeetings.db.dao.user.UserDao; import org.apache.openmeetings.db.entity.room.Room; +import org.apache.openmeetings.db.entity.room.Room.Type; import org.apache.openmeetings.db.util.TimezoneUtil; import org.apache.openmeetings.util.DaoHelper; import org.red5.logging.Red5LoggerFactory; @@ -54,7 +55,7 @@ public class RoomDao implements IDataPro @Autowired private SipDao sipDao; @Autowired - private UserDao usersDao; + private UserDao userDao; @Autowired private TimezoneUtil timezoneUtil; @@ -76,6 +77,10 @@ public class RoomDao implements IDataPro return kq.getResultList(); } + public List<Room> get(List<Long> ids) { + return em.createNamedQuery("getRoomsByIds", Room.class).setParameter("ids", ids).getResultList(); + } + public List<Room> get(int start, int count) { TypedQuery<Room> q = em.createNamedQuery("getNondeletedRooms", Room.class); q.setFirstResult(start); @@ -104,8 +109,8 @@ public class RoomDao implements IDataPro return em.createNamedQuery("getPublicRoomsOrdered", Room.class).getResultList(); } - public List<Room> getPublicRooms(Long typeId) { - return em.createNamedQuery("getPublicRooms", Room.class).setParameter("typeId", typeId).getResultList(); + public List<Room> getPublicRooms(Type type) { + return em.createNamedQuery("getPublicRooms", Room.class).setParameter("type", type).getResultList(); } public List<Long> getSipRooms(List<Long> ids) { @@ -124,7 +129,7 @@ public class RoomDao implements IDataPro //TODO generalize with AppointmentDao log.debug("getAppointedRoomsByUser : UserID - " + userId); - TimeZone timeZone = timezoneUtil.getTimeZone(usersDao.get(userId)); + TimeZone timeZone = timezoneUtil.getTimeZone(userDao.get(userId)); Calendar startCal = Calendar.getInstance(timeZone); startCal.set(Calendar.MINUTE, 0); @@ -138,13 +143,13 @@ public class RoomDao implements IDataPro return em.createNamedQuery("appointedRoomsInRangeByUser", Room.class) .setParameter("userId", userId) - .setParameter("starttime", startCal.getTime()) - .setParameter("endtime", endCal.getTime()) + .setParameter("start", startCal.getTime()) + .setParameter("end", endCal.getTime()) .getResultList(); } - public Long getRoomsCapacityByIds(List<Long> ids) { - return ids == null || ids.isEmpty() ? 0 + public long getRoomsCapacityByIds(List<Long> ids) { + return ids == null || ids.isEmpty() ? 0L : em.createNamedQuery("getRoomsCapacityByIds", Long.class).setParameter("ids", ids).getSingleResult(); } @@ -153,22 +158,22 @@ public class RoomDao implements IDataPro } private String getSipNumber(long roomId) { - if (isSipEnabled()) { - return cfgDao.getConfValue("red5sip.room_prefix", String.class, "400") + roomId; - } - return null; + if (isSipEnabled()) { + return cfgDao.getConfValue("red5sip.room_prefix", String.class, "400") + roomId; + } + return null; } public Room update(Room entity, Long userId) { - if (entity.getRooms_id() == null) { - entity.setStarttime(new Date()); + if (entity.getId() == null) { + entity.setInserted(new Date()); em.persist(entity); } else { - entity.setUpdatetime(new Date()); + entity.setUpdated(new Date()); } if (entity.isSipEnabled() && isSipEnabled()) { - String sipNumber = getSipNumber(entity.getRooms_id()); - if (!sipNumber.equals(entity.getConfno())) { + String sipNumber = getSipNumber(entity.getId()); + if (sipNumber != null && !sipNumber.equals(entity.getConfno())) { entity.setConfno(sipNumber); } sipDao.update(sipNumber, entity.getPin()); @@ -186,4 +191,50 @@ public class RoomDao implements IDataPro entity.setSipEnabled(false); update(entity, userId); } + + public Room getUserRoom(Long ownerId, Room.Type type, String name) { + log.debug("getRoomByOwnerAndTypeId : " + ownerId + " || " + type); + Room room = null; + List<Room> ll = em.createNamedQuery("getRoomByOwnerAndTypeId", Room.class).setParameter("ownerId", ownerId).setParameter("type", type).getResultList(); + if (ll.size() > 0) { + room = ll.get(0); + } + + if (room == null) { + log.debug("Could not find room " + ownerId + " || " + type); + + room = new Room(); + room.setName(name); + room.setType(type); + room.setComment("My Rooms of ownerId " + ownerId); + room.setNumberOfPartizipants(Room.Type.conference == type ? 25L : 150L); + room.setAllowUserQuestions(true); + room.setAllowFontStyles(true); + room.setOwnerId(ownerId); + room.setAllowRecording(true); + + room = update(room, ownerId); + if (room.getId() != null) { + return room; + } + return null; + } else { + return room; + } + } + + public Room getExternal(Type type, String externalType, Long externalId) { + log.debug("getExternal : " + externalId + " - " + externalType + " - " + type); + List<Room> ll = em.createNamedQuery("getRoomByExternalId", Room.class) + .setParameter("externalId", externalId) + .setParameter("externalType", externalType) + .setParameter("type", type) + .getResultList(); + if (ll.size() > 0) { + return ll.get(0); + } else { + log.error("Could not find room " + externalId); + return null; + } + } } Copied: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomModeratorDao.java (from r1712758, openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomModeratorsDao.java) URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomModeratorDao.java?p2=openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomModeratorDao.java&p1=openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomModeratorsDao.java&r1=1712758&r2=1712911&rev=1712911&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomModeratorsDao.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomModeratorDao.java Fri Nov 6 06:18:44 2015 @@ -29,7 +29,7 @@ import org.apache.openmeetings.db.entity import org.springframework.transaction.annotation.Transactional; @Transactional -public class RoomModeratorsDao { +public class RoomModeratorDao { @PersistenceContext private EntityManager em; Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomOrganisationDao.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomOrganisationDao.java?rev=1712911&r1=1712910&r2=1712911&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomOrganisationDao.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomOrganisationDao.java Fri Nov 6 06:18:44 2015 @@ -37,14 +37,25 @@ public class RoomOrganisationDao { } public RoomOrganisation update(RoomOrganisation entity, Long userId) { - if (entity.getRooms_organisation_id() == null) { - entity.setStarttime(new Date()); + if (entity.getId() == null) { + entity.setInserted(new Date()); em.persist(entity); } else { - entity.setUpdatetime(new Date()); + entity.setUpdated(new Date()); entity = em.merge(entity); } return entity; } + public RoomOrganisation get(long groupId, long roomId) { + List<RoomOrganisation> ll = em.createNamedQuery("getRoomGroupByGroupIdAndRoomId", RoomOrganisation.class) + .setParameter("roomId", roomId) + .setParameter("groupId", groupId) + .getResultList(); + + if (ll.size() > 0) { + return ll.get(0); + } + return null; + } } Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java?rev=1712911&r1=1712910&r2=1712911&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/LdapConfigDao.java Fri Nov 6 06:18:44 2015 @@ -78,7 +78,7 @@ public class LdapConfigDao implements ID log.debug("addLdapConfig :2: " + insertedby); ldapConfig = em.merge(ldapConfig); - Long ldapConfigId = ldapConfig.getLdapConfigId(); + Long ldapConfigId = ldapConfig.getId(); if (ldapConfigId > 0) { return ldapConfigId; @@ -99,7 +99,7 @@ public class LdapConfigDao implements ID ldapConfig.setInserted(new Date()); ldapConfig = em.merge(ldapConfig); - Long ldapConfigId = ldapConfig.getLdapConfigId(); + Long ldapConfigId = ldapConfig.getId(); if (ldapConfigId > 0) { return ldapConfigId; @@ -139,7 +139,7 @@ public class LdapConfigDao implements ID log.debug("updateLdapConfig :2: " + updatedby); ldapConfig = em.merge(ldapConfig); - ldapConfigId = ldapConfig.getLdapConfigId(); + ldapConfigId = ldapConfig.getId(); return ldapConfigId; @@ -190,7 +190,7 @@ public class LdapConfigDao implements ID LdapConfig ldapConfig = new LdapConfig(); ldapConfig.setName("local DB [internal]"); - ldapConfig.setLdapConfigId(-1); + ldapConfig.setId(-1L); List<LdapConfig> result = new ArrayList<LdapConfig>(); result.add(ldapConfig); @@ -234,7 +234,7 @@ public class LdapConfigDao implements ID public LdapConfig update(LdapConfig entity, Long userId) { try { - if (entity.getLdapConfigId() <= 0) { + if (entity.getId() <= 0) { entity.setInserted(new Date()); if (userId != null) { entity.setInsertedby(usersDao.get(userId)); @@ -256,7 +256,7 @@ public class LdapConfigDao implements ID } public void delete(LdapConfig entity, Long userId) { - if (entity.getLdapConfigId() >= 0) { + if (entity.getId() >= 0) { entity.setUpdated(new Date()); if (userId != null) { entity.setUpdatedby(usersDao.get(userId)); Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java?rev=1712911&r1=1712910&r2=1712911&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java Fri Nov 6 06:18:44 2015 @@ -20,18 +20,12 @@ package org.apache.openmeetings.db.dao.s import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; -import java.util.Calendar; import java.util.Date; -import java.util.Iterator; import java.util.List; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; import javax.persistence.TypedQuery; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Predicate; -import javax.persistence.criteria.Root; import org.apache.openmeetings.db.entity.room.Client; import org.apache.openmeetings.db.entity.server.Sessiondata; @@ -69,11 +63,10 @@ public class SessiondataDao { long thistime = new Date().getTime(); Sessiondata sessiondata = new Sessiondata(); - sessiondata.setSession_id(ManageCryptStyle.getInstanceOfCrypt() - .createPassPhrase(String.valueOf(thistime).toString())); - sessiondata.setRefresh_time(new Date()); - sessiondata.setStarttermin_time(new Date()); - sessiondata.setUser_id(null); + sessiondata.setSessionId(ManageCryptStyle.getInstanceOfCrypt().createPassPhrase(String.valueOf(thistime).toString())); + sessiondata.setRefreshed(new Date()); + sessiondata.setCreated(new Date()); + sessiondata.setUserId(null); sessiondata = em.merge(sessiondata); @@ -89,13 +82,7 @@ public class SessiondataDao { try { log.debug("updateUser User SID: " + SID); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery<Sessiondata> cq = cb.createQuery(Sessiondata.class); - Root<Sessiondata> c = cq.from(Sessiondata.class); - Predicate condition = cb.equal(c.get("session_id"), SID); - cq.where(condition); - - TypedQuery<Sessiondata> q = em.createQuery(cq); + TypedQuery<Sessiondata> q = em.createNamedQuery("getSessionById", Sessiondata.class).setParameter("sessionId", SID); List<Sessiondata> fullList = q.getResultList(); if (fullList.size() == 0) { @@ -119,8 +106,7 @@ public class SessiondataDao { */ public Long checkSession(String SID) { try { - TypedQuery<Sessiondata> query = em.createNamedQuery("getSessionById", Sessiondata.class); - query.setParameter("session_id", SID); + TypedQuery<Sessiondata> query = em.createNamedQuery("getSessionById", Sessiondata.class).setParameter("sessionId", SID); List<Sessiondata> sessions = query.getResultList(); Sessiondata sessiondata = null; @@ -134,11 +120,11 @@ public class SessiondataDao { // Checks if wether the Session or the User Object of that Session // is set yet - if (sessiondata == null || sessiondata.getUser_id() == null - || sessiondata.getUser_id().equals(new Long(0))) { + if (sessiondata == null || sessiondata.getUserId() == null + || sessiondata.getUserId().equals(new Long(0))) { return new Long(0); } else { - return sessiondata.getUser_id(); + return sessiondata.getUserId(); } } catch (Exception ex2) { log.error("[checkSession]: ", ex2); @@ -151,14 +137,13 @@ public class SessiondataDao { * the session is loggedin * * @param SID - * @param USER_ID + * @param userId */ - public Boolean updateUser(String SID, long USER_ID) { + public Boolean updateUser(String SID, long userId) { try { - log.debug("updateUser User: " + USER_ID + " || " + SID); + log.debug("updateUser User: " + userId + " || " + SID); - TypedQuery<Sessiondata> query = em.createNamedQuery("getSessionById", Sessiondata.class); - query.setParameter("session_id", SID); + TypedQuery<Sessiondata> query = em.createNamedQuery("getSessionById", Sessiondata.class).setParameter("sessionId", SID); List<Sessiondata> sessions = query.getResultList(); @@ -171,11 +156,11 @@ public class SessiondataDao { log.error("Could not find session to Update"); return false; } - log.debug("Found session to update: " + sessiondata.getSession_id() - + " userId: " + USER_ID); + log.debug("Found session to update: " + sessiondata.getSessionId() + + " userId: " + userId); - sessiondata.setRefresh_time(new Date()); - sessiondata.setUser_id(USER_ID); + sessiondata.setRefreshed(new Date()); + sessiondata.setUserId(userId); if (sessiondata.getId() == null) { em.persist(sessiondata); } else { @@ -190,11 +175,10 @@ public class SessiondataDao { return null; } - public boolean updateUser(String SID, long USER_ID, boolean storePermanent, Long language_id) { + public boolean updateUser(String SID, long userId, boolean permanent, Long languageId) { try { - log.debug("updateUser User: " + USER_ID + " || " + SID); - TypedQuery<Sessiondata> query = em.createNamedQuery("getSessionById", Sessiondata.class); - query.setParameter("session_id", SID); + log.debug("updateUser User: " + userId + " || " + SID); + TypedQuery<Sessiondata> query = em.createNamedQuery("getSessionById", Sessiondata.class).setParameter("sessionId", SID); List<Sessiondata> sessions = query.getResultList(); @@ -207,14 +191,12 @@ public class SessiondataDao { log.error("Could not find session to Update"); return false; } - log.debug("Found session to update: " + sessiondata.getSession_id() + " userId: " + USER_ID); + log.debug("Found session to update: " + sessiondata.getSessionId() + " userId: " + userId); - sessiondata.setRefresh_time(new Date()); - sessiondata.setUser_id(USER_ID); - if (storePermanent) { - sessiondata.setStorePermanent(storePermanent); - } - sessiondata.setLanguage_id(language_id); + sessiondata.setRefreshed(new Date()); + sessiondata.setUserId(userId); + sessiondata.setPermanent(permanent); + sessiondata.setLanguageId(languageId); if (sessiondata.getId() == null) { em.persist(sessiondata); } else { @@ -223,7 +205,6 @@ public class SessiondataDao { } } - // log.debug("session updated User: "+USER_ID); return true; } catch (Exception ex2) { log.error("[updateUser]: ", ex2); @@ -233,9 +214,8 @@ public class SessiondataDao { public Boolean updateUserOrg(String SID, Long organization_id) { try { - log.debug("updateUserOrg User: " + organization_id + " || " + SID); - TypedQuery<Sessiondata> query = em.createNamedQuery("getSessionById", Sessiondata.class); - query.setParameter("session_id", SID); + log.debug("updateUserGroup User: " + organization_id + " || " + SID); + TypedQuery<Sessiondata> query = em.createNamedQuery("getSessionById", Sessiondata.class).setParameter("sessionId", SID); List<Sessiondata> sessions = query.getResultList(); @@ -248,11 +228,11 @@ public class SessiondataDao { log.error("Could not find session to Update"); return false; } - log.debug("Found session to update: " + sessiondata.getSession_id() + log.debug("Found session to update: " + sessiondata.getSessionId() + " organisation_id: " + organization_id); - sessiondata.setRefresh_time(new Date()); - sessiondata.setOrganization_id(organization_id); + sessiondata.setRefreshed(new Date()); + sessiondata.setOrganizationId(organization_id); if (sessiondata.getId() == null) { em.persist(sessiondata); } else { @@ -267,11 +247,10 @@ public class SessiondataDao { return null; } - public Boolean updateUserWithoutSession(String SID, Long USER_ID) { + public Boolean updateUserWithoutSession(String SID, Long userId) { try { - log.debug("updateUser User: " + USER_ID + " || " + SID); - TypedQuery<Sessiondata> query = em.createNamedQuery("getSessionById", Sessiondata.class); - query.setParameter("session_id", SID); + log.debug("updateUser User: " + userId + " || " + SID); + TypedQuery<Sessiondata> query = em.createNamedQuery("getSessionById", Sessiondata.class).setParameter("sessionId", SID); List<Sessiondata> sessions = query.getResultList(); @@ -284,11 +263,11 @@ public class SessiondataDao { log.error("Could not find session to Update"); return false; } - log.debug("Found session to update: " + sessiondata.getSession_id() - + " userId: " + USER_ID); + log.debug("Found session to update: " + sessiondata.getSessionId() + + " userId: " + userId); - sessiondata.setRefresh_time(new Date()); - sessiondata.setUser_id(USER_ID); + sessiondata.setRefreshed(new Date()); + sessiondata.setUserId(userId); if (sessiondata.getId() == null) { em.persist(sessiondata); } else { @@ -307,13 +286,7 @@ public class SessiondataDao { try { log.debug("updateUser User SID: " + SID); - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery<Sessiondata> cq = cb.createQuery(Sessiondata.class); - Root<Sessiondata> c = cq.from(Sessiondata.class); - Predicate condition = cb.equal(c.get("session_id"), SID); - cq.where(condition); - - TypedQuery<Sessiondata> q = em.createQuery(cq); + TypedQuery<Sessiondata> q = em.createNamedQuery("getSessionById", Sessiondata.class).setParameter("sessionId", SID); List<Sessiondata> fullList = q.getResultList(); if (fullList.size() == 0) { @@ -323,8 +296,8 @@ public class SessiondataDao { // log.error("Found session to update: "+SID); } Sessiondata sd = fullList.get(0); - sd.setRefresh_time(new Date()); - sd.setSessionXml(sessionXml); + sd.setRefreshed(new Date()); + sd.setXml(sessionXml); if (sd.getId() == null) { em.persist(sd); @@ -347,13 +320,7 @@ public class SessiondataDao { */ private void updatesession(String SID) { try { - CriteriaBuilder cb = em.getCriteriaBuilder(); - CriteriaQuery<Sessiondata> cq = cb.createQuery(Sessiondata.class); - Root<Sessiondata> c = cq.from(Sessiondata.class); - Predicate condition = cb.equal(c.get("session_id"), SID); - cq.where(condition); - - TypedQuery<Sessiondata> q = em.createQuery(cq); + TypedQuery<Sessiondata> q = em.createNamedQuery("getSessionById", Sessiondata.class).setParameter("sessionId", SID); List<Sessiondata> fullList = q.getResultList(); if (fullList.size() == 0) { @@ -362,8 +329,7 @@ public class SessiondataDao { } else { // log.debug("Found session to updateSession: "); Sessiondata sd = fullList.iterator().next(); - // log.debug("Found session to updateSession sd "+sd.getUser_id()+" "+sd.getSession_id()); - sd.setRefresh_time(new Date()); + sd.setRefreshed(new Date()); if (sd.getId() == null) { em.persist(sd); @@ -384,10 +350,10 @@ public class SessiondataDao { * @param date * @return */ - private List<Sessiondata> getSessionToDelete(Date refresh_time) { + private List<Sessiondata> getSessionToDelete(Date refreshed) { try { TypedQuery<Sessiondata> query = em.createNamedQuery("getSessionToDelete", Sessiondata.class); - query.setParameter("refresh_time", refresh_time); + query.setParameter("refreshed", refreshed); return query.getResultList(); } catch (Exception ex2) { log.error("[getSessionToDelete]: ", ex2); @@ -399,15 +365,12 @@ public class SessiondataDao { * * */ - public void clearSessionTable() { + public void clearSessionTable(long timeout) { try { log.debug("****** clearSessionTable: "); - Calendar rightNow = Calendar.getInstance(); - rightNow.setTimeInMillis(rightNow.getTimeInMillis() - 1800000); - List<Sessiondata> l = this.getSessionToDelete(rightNow.getTime()); + List<Sessiondata> l = getSessionToDelete(new Date(System.currentTimeMillis() - timeout)); log.debug("clearSessionTable: " + l.size()); - for (Iterator<Sessiondata> it = l.iterator(); it.hasNext();) { - Sessiondata sData = it.next(); + for (Sessiondata sData : l) { sData = em.find(Sessiondata.class, sData.getId()); em.remove(sData); } @@ -417,11 +380,11 @@ public class SessiondataDao { } /** - * @param room_id + * @param roomId */ - public void clearSessionByRoomId(Long room_id) { + public void clearSessionByRoomId(Long roomId) { try { - for (Client rcl : sessionManager.getClientListByRoom(room_id)) { + for (Client rcl : sessionManager.getClientListByRoom(roomId)) { String aux = rcl.getSwfurl(); int init_pos = aux.indexOf("sid=") + 4; @@ -430,7 +393,7 @@ public class SessiondataDao { end_pos = aux.length(); String SID = aux.substring(init_pos, end_pos); - Sessiondata sData = this.getSessionByHash(SID); + Sessiondata sData = getSessionByHash(SID); sData = em.find(Sessiondata.class, sData.getId()); em.remove(sData); Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserManager.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserManager.java?rev=1712911&r1=1712910&r2=1712911&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserManager.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/IUserManager.java Fri Nov 6 06:18:44 2015 @@ -34,9 +34,16 @@ import org.apache.openmeetings.db.entity //FIXME HACK to bypass cross project compilation public interface IUserManager { + + Long registerUser(String login, String Userpass, String lastname, + String firstname, String email, Date age, String street, + String additionalname, String fax, String zip, long stateId, + String town, long languageId, String phone, boolean sendSMS, + boolean generateSipUserData, String jNameTimeZone, Boolean sendConfirmation); + Long registerUserInit(Set<Right> rights, String login, String password, String lastname, String firstname, String email, Date age, String street, - String additionalname, String fax, String zip, long states_id, + String additionalname, String fax, String zip, long stateId, String town, long language_id, boolean sendWelcomeMessage, List<Long> organisations, String phone, boolean sendSMS, Boolean sendConfirmation, TimeZone timezone, Boolean forceTimeZoneCheck, @@ -46,7 +53,7 @@ public interface IUserManager { Long registerUserNoEmail(String login, String Userpass, String lastname, String firstname, String email, Date age, String street, String additionalname, String fax, String zip, - long states_id, String town, long language_id, String phone, boolean sendSMS, + long stateId, String town, long language_id, String phone, boolean sendSMS, boolean generateSipUserData, String jNameTimeZone); Long getLanguage(Locale loc); Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/OrganisationDao.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/OrganisationDao.java?rev=1712911&r1=1712910&r2=1712911&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/OrganisationDao.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/OrganisationDao.java Fri Nov 6 06:18:44 2015 @@ -84,7 +84,7 @@ public class OrganisationDao implements } public Organisation update(Organisation entity, Long userId) { - if (entity.getOrganisation_id() == null) { + if (entity.getId() == null) { if (userId != null) { entity.setInsertedby(userId); } @@ -102,7 +102,7 @@ public class OrganisationDao implements public void delete(Organisation entity, Long userId) { em.createNamedQuery("deleteUsersFromOrganisation") - .setParameter("id", entity.getOrganisation_id()) + .setParameter("id", entity.getId()) .executeUpdate(); entity.setDeleted(true); Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/OrganisationUserDao.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/OrganisationUserDao.java?rev=1712911&r1=1712910&r2=1712911&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/OrganisationUserDao.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/OrganisationUserDao.java Fri Nov 6 06:18:44 2015 @@ -38,7 +38,7 @@ public class OrganisationUserDao impleme private EntityManager em; @Autowired private UserDao usersDao; - public final static String[] searchFields = {"user.lastname", "user.firstname", "user.login", "user.adresses.email"}; + public final static String[] searchFields = {"user.lastname", "user.firstname", "user.login", "user.address.email"}; public Organisation_Users get(long id) { TypedQuery<Organisation_Users> q = em.createNamedQuery("getOrganisationUsersById", Organisation_Users.class); @@ -114,7 +114,7 @@ public class OrganisationUserDao impleme } public Organisation_Users update(Organisation_Users entity, Long userId) { - if (entity.getOrganisation_users_id() == null) { + if (entity.getId() == null) { entity.setStarttime(new Date()); em.persist(entity); } else { @@ -127,7 +127,7 @@ public class OrganisationUserDao impleme private void updateUser(Organisation_Users entity, boolean delete, Long userId) { //entity has been detached need to re-fetch - User u = usersDao.get(entity.getUser().getUser_id()); + User u = usersDao.get(entity.getUser().getId()); int idx = u.getOrganisation_users().indexOf(entity); if (delete && idx > -1) { Organisation_Users ou = u.getOrganisation_users().remove(idx); @@ -139,7 +139,7 @@ public class OrganisationUserDao impleme } public void delete(Organisation_Users entity, Long userId) { - if (entity.getOrganisation_users_id() != null) { + if (entity.getId() != null) { updateUser(entity, true, userId); } } Copied: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java (from r1712812, openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessagesDao.java) URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java?p2=openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java&p1=openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessagesDao.java&r1=1712812&r2=1712911&rev=1712911&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessagesDao.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java Fri Nov 6 06:18:44 2015 @@ -41,8 +41,8 @@ import org.slf4j.Logger; import org.springframework.transaction.annotation.Transactional; @Transactional -public class PrivateMessagesDao implements IDataProviderDao<PrivateMessage> { - private static final Logger log = Red5LoggerFactory.getLogger(PrivateMessagesDao.class, webAppRootKey); +public class PrivateMessageDao implements IDataProviderDao<PrivateMessage> { + private static final Logger log = Red5LoggerFactory.getLogger(PrivateMessageDao.class, webAppRootKey); @PersistenceContext private EntityManager em; @@ -93,11 +93,11 @@ public class PrivateMessagesDao implemen } public PrivateMessage update(PrivateMessage entity, Long userId) { - if (entity.getId() < 1) { + if (entity.getId() == null) { entity.setInserted(new Date()); em.persist(entity); - } else { - entity = em.merge(entity); + } else { + entity = em.merge(entity); } return entity; } @@ -115,7 +115,7 @@ public class PrivateMessagesDao implemen .append("OR lower(m.from.firstname) LIKE :search ") .append("OR lower(m.from.lastname) LIKE :search ") .append("OR lower(m.from.login) LIKE :search ") - .append("OR lower(m.from.adresses.email) LIKE :search ") + .append("OR lower(m.from.address.email) LIKE :search ") .append(" ) "); } Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java?rev=1712911&r1=1712910&r2=1712911&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageFolderDao.java Fri Nov 6 06:18:44 2015 @@ -48,7 +48,7 @@ public class PrivateMessageFolderDao imp privateMessageFolder.setInserted(new Date()); privateMessageFolder = em.merge(privateMessageFolder); - Long privateMessageFolderId = privateMessageFolder.getPrivateMessageFolderId(); + Long privateMessageFolderId = privateMessageFolder.getId(); return privateMessageFolderId; } catch (Exception e) { @@ -57,39 +57,28 @@ public class PrivateMessageFolderDao imp return null; } - public Long addPrivateMessageFolderObj(PrivateMessageFolder privateMessageFolder) { - try { - privateMessageFolder.setInserted(new Date()); - - privateMessageFolder = em.merge(privateMessageFolder); - Long privateMessageFolderId = privateMessageFolder.getPrivateMessageFolderId(); - - return privateMessageFolderId; - } catch (Exception e) { - log.error("[addPrivateMessageFolder]",e); - } - return null; + public Long addPrivateMessageFolderObj(PrivateMessageFolder folder) { + folder.setInserted(new Date()); + + folder = em.merge(folder); + Long privateMessageFolderId = folder.getId(); + + return privateMessageFolderId; } - public PrivateMessageFolder get(long privateMessageFolderId) { - try { - String hql = "select c from PrivateMessageFolder c " + - "where c.privateMessageFolderId = :privateMessageFolderId "; + public PrivateMessageFolder get(long id) { + String hql = "select c from PrivateMessageFolder c where c.privateMessageFolderId = :id "; - TypedQuery<PrivateMessageFolder> query = em.createQuery(hql, PrivateMessageFolder.class); - query.setParameter("privateMessageFolderId", privateMessageFolderId); - - PrivateMessageFolder privateMessageFolder = null; - try { - privateMessageFolder = query.getSingleResult(); - } catch (NoResultException ex) { - } - - return privateMessageFolder; - } catch (Exception e) { - log.error("[getPrivateMessageFolderById]",e); + TypedQuery<PrivateMessageFolder> query = em.createQuery(hql, PrivateMessageFolder.class); + query.setParameter("id", id); + + PrivateMessageFolder folder = null; + try { + folder = query.getSingleResult(); + } catch (NoResultException ex) { } - return null; + + return folder; } public List<PrivateMessageFolder> get(int start, int count) { @@ -98,37 +87,34 @@ public class PrivateMessageFolderDao imp .getResultList(); } - public PrivateMessageFolder update(PrivateMessageFolder privateMessageFolder, Long userId) { - if (privateMessageFolder.getPrivateMessageFolderId() == 0) { - em.persist(privateMessageFolder); - } else { - if (!em.contains(privateMessageFolder)) { - privateMessageFolder = em.merge(privateMessageFolder); - } + public PrivateMessageFolder update(PrivateMessageFolder folder, Long userId) { + if (folder.getId() == 0) { + em.persist(folder); + } else { + if (!em.contains(folder)) { + folder = em.merge(folder); + } } - return privateMessageFolder; + return folder; } public List<PrivateMessageFolder> getPrivateMessageFolderByUserId(Long userId) { try { - String hql = "select c from PrivateMessageFolder c " + - "where c.userId = :userId "; + String hql = "select c from PrivateMessageFolder c where c.userId = :userId "; TypedQuery<PrivateMessageFolder> query = em.createQuery(hql, PrivateMessageFolder.class); query.setParameter("userId", userId); - List<PrivateMessageFolder> privateMessageFolders = query.getResultList(); - - return privateMessageFolders; + return query.getResultList(); } catch (Exception e) { log.error("[getPrivateMessageFolderByUserId]",e); } return null; } - public void delete(PrivateMessageFolder privateMessageFolder, Long userId) { - privateMessageFolder = em.find(PrivateMessageFolder.class, privateMessageFolder.getPrivateMessageFolderId()); - em.remove(privateMessageFolder); + public void delete(PrivateMessageFolder folder, Long userId) { + folder = em.find(PrivateMessageFolder.class, folder.getId()); + em.remove(folder); } public List<PrivateMessageFolder> get(String search, int start, int count, String order) { Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/StateDao.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/StateDao.java?rev=1712911&r1=1712910&r2=1712911&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/StateDao.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/StateDao.java Fri Nov 6 06:18:44 2015 @@ -46,35 +46,35 @@ public class StateDao { private EntityManager em; /** - * adds a new State to the states table with no short name and code + * adds a new State to the state table with no short name and code * * @param name * @return the id of the new state or null if an error occurred */ - public Long addState(String name) { - return addState(name, "", 0); + public Long add(String name) { + return add(name, "", 0); } /** - * adds a new State to the states table + * adds a new State to the state table * * @param name the name of the country * @param shortName the short name of the country * @param code the code of the country * @return the id of the new state or null if an error occurred */ - public Long addState(String name, String shortName, int code) { + public Long add(String name, String shortName, int code) { try { State st = new State(); st.setName(name); st.setShortName(shortName); st.setCode(code); - st.setStarttime(new Date()); + st.setInserted(new Date()); st.setDeleted(false); st = em.merge(st); - Long id = st.getState_id(); + Long id = st.getId(); log.debug("added id " + id); @@ -88,15 +88,13 @@ public class StateDao { /** * selects a state by its id * - * @param state_id + * @param id * @return the state-object or null */ - public State getStateById(long state_id) { + public State get(long id) { try { - TypedQuery<State> query = em - .createNamedQuery("getStateById", State.class); - query.setParameter("state_id", state_id); - query.setParameter("deleted", true); + TypedQuery<State> query = em.createNamedQuery("getStateById", State.class); + query.setParameter("id", id); List<State> ll = query.getResultList(); if (ll.size() > 0) { return ll.get(0); @@ -110,18 +108,16 @@ public class StateDao { /** * selects a state by its name * - * @param state_id + * @param name * @return the state-object or null */ - public State getStateByName(String name) { + public State get(String name) { try { if (name == null) { return null; } - TypedQuery<State> query = em - .createNamedQuery("getStateByName", State.class); + TypedQuery<State> query = em.createNamedQuery("getStateByName", State.class); query.setParameter("name", name.toLowerCase()); - query.setParameter("deleted", true); List<State> ll = query.getResultList(); if (ll.size() > 0) { return ll.get(0); @@ -137,11 +133,9 @@ public class StateDao { * * @return List of State Objects or null */ - public List<State> getStates() { + public List<State> get() { try { - TypedQuery<State> query = em - .createNamedQuery("getStates", State.class); - query.setParameter("deleted", true); + TypedQuery<State> query = em.createNamedQuery("getStates", State.class); List<State> ll = query.getResultList(); return ll; } catch (Exception ex2) { Copied: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java (from r1712812, openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactsDao.java) URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java?p2=openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java&p1=openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactsDao.java&r1=1712812&r2=1712911&rev=1712911&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactsDao.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java Fri Nov 6 06:18:44 2015 @@ -36,8 +36,8 @@ import org.springframework.beans.factory import org.springframework.transaction.annotation.Transactional; @Transactional -public class UserContactsDao { - private static final Logger log = Red5LoggerFactory.getLogger(UserContactsDao.class, webAppRootKey); +public class UserContactDao { + private static final Logger log = Red5LoggerFactory.getLogger(UserContactDao.class, webAppRootKey); @PersistenceContext private EntityManager em; @Autowired Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java?rev=1712911&r1=1712910&r2=1712911&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java Fri Nov 6 06:18:44 2015 @@ -71,7 +71,7 @@ import org.springframework.transaction.a public class UserDao implements IDataProviderDao<User> { private static final Logger log = Red5LoggerFactory.getLogger(UserDao.class, webAppRootKey); - public final static String[] searchFields = {"lastname", "firstname", "login", "adresses.email", "adresses.town"}; + public final static String[] searchFields = {"lastname", "firstname", "login", "address.email", "address.town"}; @PersistenceContext private EntityManager em; @@ -101,14 +101,14 @@ public class UserDao implements IDataPro User user = new User(); user.setSalutations_id(1L); // TODO: Fix default selection to be configurable user.setRights(getDefaultRights()); - user.setLanguage_id(cfgDao.getConfValue(CONFIG_DEFAULT_LANG_KEY, Long.class, "1")); + user.setLanguageId(cfgDao.getConfValue(CONFIG_DEFAULT_LANG_KEY, Long.class, "1")); user.setTimeZoneId(timezoneUtil.getTimeZone(currentUser).getID()); user.setForceTimeZoneCheck(false); user.setSendSMS(false); user.setAge(new Date()); - Address adresses = new Address(); - adresses.setStates(stateDao.getStateById(1L)); - user.setAdresses(adresses); + Address address = new Address(); + address.setState(stateDao.get(1L)); + user.setAddress(address); user.setShowContactData(false); user.setShowContactDataToContacts(false); @@ -207,7 +207,7 @@ public class UserDao implements IDataPro ou.setUser(u); } } - if (u.getUser_id() == null) { + if (u.getId() == null) { if (u.getRegdate() == null) { u.setRegdate(new Date()); } @@ -232,7 +232,7 @@ public class UserDao implements IDataPro User u = update(user, updatedBy); if (password != null && !password.isEmpty()) { //OpenJPA is not allowing to set fields not being fetched before - User u1 = get(u.getUser_id(), true); + User u1 = get(u.getId(), true); u1.updatePassword(cfgDao, password); update(u1, updatedBy); } @@ -240,7 +240,7 @@ public class UserDao implements IDataPro } public void delete(User u, Long userId) { - deleteUserID(u.getUser_id()); + deleteUserID(u.getId()); } public User get(long user_id) { @@ -283,19 +283,19 @@ public class UserDao implements IDataPro us.setDeleted(true); us.setUpdatetime(new Date()); us.setSipUser(null); - Address adr = us.getAdresses(); + Address adr = us.getAddress(); if (adr != null) { adr.setDeleted(true); } - if (us.getUser_id() == null) { + if (us.getId() == null) { em.persist(us); } else { if (!em.contains(us)) { em.merge(us); } } - return us.getUser_id(); + return us.getId(); } } catch (Exception ex2) { log.error("[deleteUserID]", ex2); @@ -337,7 +337,7 @@ public class UserDao implements IDataPro public boolean checkLogin(String login, Type type, Long domainId, Long id) { try { User u = getByLogin(login, type, domainId); - return u == null || u.getUser_id().equals(id); + return u == null || u.getId().equals(id); } catch (Exception e) { //exception is thrown in case of non-unique result return false; @@ -357,7 +357,7 @@ public class UserDao implements IDataPro log.debug("checkEmail: email = {}, id = {}", email, id); try { User u = getByEmail(email, type, domainId); - return u == null || u.getUser_id().equals(id); + return u == null || u.getId().equals(id); } catch (Exception e) { //exception is thrown in case of non-unique result return false; @@ -472,21 +472,21 @@ public class UserDao implements IDataPro User to = null; try { to = em.createNamedQuery("getContactByEmailAndUser", User.class) - .setParameter("email", email).setParameter("type", User.Type.contact).setParameter("ownerId", owner.getUser_id()).getSingleResult(); + .setParameter("email", email).setParameter("type", User.Type.contact).setParameter("ownerId", owner.getId()).getSingleResult(); } catch (Exception e) { //no-op } if (to == null) { to = new User(); to.setType(Type.contact); - String login = owner.getUser_id() + "_" + email; //UserId prefix is used to ensure unique login + String login = owner.getId() + "_" + email; //UserId prefix is used to ensure unique login to.setLogin(login.length() < getMinLoginLength(cfgDao) ? UUID.randomUUID().toString() : login); to.setFirstname(firstName); to.setLastname(lastName); - to.setLanguage_id(null == langId ? owner.getLanguage_id() : langId); - to.setOwnerId(owner.getUser_id()); - to.setAdresses(new Address()); - to.getAdresses().setEmail(email); + to.setLanguageId(null == langId ? owner.getLanguageId() : langId); + to.setOwnerId(owner.getId()); + to.setAddress(new Address()); + to.getAddress().setEmail(email); to.setTimeZoneId(null == tzId ? owner.getTimeZoneId() : tzId); } return to; @@ -530,8 +530,8 @@ public class UserDao implements IDataPro sb.append(" AND (LOWER(u.login) LIKE :search ") .append("OR LOWER(u.firstname) LIKE :search ") .append("OR LOWER(u.lastname) LIKE :search ") - .append("OR LOWER(u.adresses.email) LIKE :search ") - .append("OR LOWER(u.adresses.town) LIKE :search " + ") "); + .append("OR LOWER(u.address.email) LIKE :search ") + .append("OR LOWER(u.address.town) LIKE :search " + ") "); params.put("search", getStringParam(text)); } if (!count && !Strings.isEmpty(orderBy)) { @@ -610,7 +610,7 @@ public class UserDao implements IDataPro } User u = users.get(0); - if (!verifyPassword(u.getUser_id(), userpass)) { + if (!verifyPassword(u.getId(), userpass)) { throw new OmException(-11L); } // Check if activated @@ -623,15 +623,15 @@ public class UserDao implements IDataPro } u.setLastlogin(new Date()); - return update(u, u.getUser_id()); + return update(u, u.getId()); } - public Address getAddress(String street, String zip, String town, long states_id, String additionalname, String fax, String phone, String email) { + public Address getAddress(String street, String zip, String town, long stateId, String additionalname, String fax, String phone, String email) { Address a = new Address(); a.setStreet(street); a.setZip(zip); a.setTown(town); - a.setStates(stateDao.getStateById(states_id)); + a.setState(stateDao.get(stateId)); a.setAdditionalname(additionalname); a.setComment(""); a.setFax(fax); @@ -650,7 +650,7 @@ public class UserDao implements IDataPro u.setLogin(login); u.setLastname(lastname); u.setAge(age); - u.setAdresses(adress); + u.setAddress(adress); u.setSendSMS(sendSMS); u.setRights(rights); u.setLastlogin(new Date()); @@ -660,9 +660,9 @@ public class UserDao implements IDataPro u.setActivatehash(hash); u.setTimeZoneId(timezone.getID()); u.setForceTimeZoneCheck(forceTimeZoneCheck); - u.setExternalUserId(externalId); - u.setExternalUserType(externalType); - if (!Strings.isEmpty(u.getExternalUserType())) { + u.setExternalId(externalId); + u.setExternalType(externalType); + if (!Strings.isEmpty(u.getExternalType())) { u.setType(Type.external); } @@ -672,7 +672,7 @@ public class UserDao implements IDataPro u.setShowContactDataToContacts(showContactDataToContacts); // this is needed cause the language is not a needed data at registering - u.setLanguage_id(language_id != 0 ? language_id : null); + u.setLanguageId(language_id != 0 ? language_id : null); if (!Strings.isEmpty(userpass)) { u.updatePassword(cfgDao, userpass); } Modified: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/SearchResult.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/SearchResult.java?rev=1712911&r1=1712910&r2=1712911&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/SearchResult.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/SearchResult.java Fri Nov 6 06:18:44 2015 @@ -27,6 +27,8 @@ public class SearchResult<T> { private Collection<T> result; private Long errorId; + public SearchResult() {} + public String getObjectName() { return objectName; } Copied: openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/ServiceResult.java (from r1712758, openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/ErrorResult.java) URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/ServiceResult.java?p2=openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/ServiceResult.java&p1=openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/ErrorResult.java&r1=1712758&r2=1712911&rev=1712911&view=diff ============================================================================== --- openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/ErrorResult.java (original) +++ openmeetings/branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/basic/ServiceResult.java Fri Nov 6 06:18:44 2015 @@ -18,41 +18,63 @@ */ package org.apache.openmeetings.db.dto.basic; -public class ErrorResult { - - private Long errorId; - private String errmessage; - private String errortype; +import java.io.Serializable; - public ErrorResult(Long errorId, String errmessage, String errortype) { - super(); - this.errorId = errorId; - this.errmessage = errmessage; - this.errortype = errortype; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlType; + +@XmlRootElement +@XmlAccessorType(XmlAccessType.FIELD) +public class ServiceResult implements Serializable { + private static final long serialVersionUID = 1L; + private long code; + private String message; + private String type; + @XmlType(namespace="org.apache.openmeetings.db.dto.basic.type") + public enum Type { + ERROR + , SUCCESS } - public Long getErrorId() { - return errorId; + public ServiceResult() {} + + public ServiceResult(long code, String message, String type) { + super(); + this.code = code; + this.message = message; + this.type = type; } - public void setErrorId(Long errorId) { - this.errorId = errorId; + public ServiceResult(long code, String message, Type type) { + super(); + this.code = code; + this.message = message; + this.type = type.name(); + } + + public long getCode() { + return code; } - public String getErrmessage() { - return errmessage; + public void setCode(long code) { + this.code = code; } - public void setErrmessage(String errmessage) { - this.errmessage = errmessage; + public String getMessage() { + return message; } - public String getErrortype() { - return errortype; + public void setMessage(String message) { + this.message = message; } - public void setErrortype(String errortype) { - this.errortype = errortype; + public String getType() { + return type; } + public void setType(String type) { + this.type = type; + } }
