You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/10/20 16:56:19 UTC
openmeetings git commit: [OPENMEETINGS-1723] code clean-up
Repository: openmeetings
Updated Branches:
refs/heads/master 8c85876c0 -> be71e177a
[OPENMEETINGS-1723] code clean-up
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/be71e177
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/be71e177
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/be71e177
Branch: refs/heads/master
Commit: be71e177a03f62a396f5b557b884f8d5c9ad9996
Parents: 8c85876
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Fri Oct 20 23:56:11 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Fri Oct 20 23:56:11 2017 +0700
----------------------------------------------------------------------
.../core/converter/RecordingConverter.java | 2 +-
.../db/dao/record/RecordingMetaDataDao.java | 22 +++++++-------------
2 files changed, 8 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/be71e177/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/RecordingConverter.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/RecordingConverter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/RecordingConverter.java
index 5e62535..0ff2511 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/RecordingConverter.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/RecordingConverter.java
@@ -66,7 +66,7 @@ public class RecordingConverter extends BaseConverter implements IRecordingConve
List<File> waveFiles = new ArrayList<>();
File streamFolder = getStreamFolder(r);
- RecordingMetaData screenMetaData = metaDataDao.getScreenMetaDataByRecording(r.getId());
+ RecordingMetaData screenMetaData = metaDataDao.getScreenByRecording(r.getId());
if (screenMetaData == null) {
throw new ConversionException("screenMetaData is Null recordingId " + r.getId());
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/be71e177/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDataDao.java
----------------------------------------------------------------------
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDataDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDataDao.java
index 6c0dc66..2a84d43 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDataDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDataDao.java
@@ -25,7 +25,6 @@ import java.util.List;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
-import javax.persistence.TypedQuery;
import org.apache.openmeetings.db.entity.record.RecordingMetaData;
import org.apache.openmeetings.db.entity.record.RecordingMetaData.Status;
@@ -61,18 +60,11 @@ public class RecordingMetaDataDao {
.getResultList();
}
- public RecordingMetaData getScreenMetaDataByRecording(Long recordingId) {
- try {
- TypedQuery<RecordingMetaData> query = em.createNamedQuery("getScreenMetaByRecording", RecordingMetaData.class);
- query.setParameter("recordingId", recordingId);
-
- List<RecordingMetaData> metaDatas = query.getResultList();
-
- return metaDatas.isEmpty() ? null : metaDatas.get(0);
- } catch (Exception ex2) {
- log.error("[getScreenMetaDataByRecording]: ", ex2);
- }
- return null;
+ public RecordingMetaData getScreenByRecording(Long recordingId) {
+ List<RecordingMetaData> list = em.createNamedQuery("getScreenMetaByRecording", RecordingMetaData.class)
+ .setParameter("recordingId", recordingId)
+ .getResultList();
+ return list.isEmpty() ? null : list.get(0);
}
public Long add(Long recordingId, Date recordStart, boolean isAudioOnly,
@@ -101,8 +93,8 @@ public class RecordingMetaDataDao {
if (meta != null) {
meta.setRecordEnd(recordEnd);
- log.debug("updateEndDate :: Start Date :" + meta.getRecordStart());
- log.debug("updateEndDate :: End Date :" + meta.getRecordEnd());
+ log.debug("updateEndDate :: Start Date : {}", meta.getRecordStart());
+ log.debug("updateEndDate :: End Date : {}", meta.getRecordEnd());
update(meta);
}
return metaId;