remove unnecessary logs; order getRecordings response by recordId, an…

…d metadata by meta key
bigbluebutton · Feb 3, 2016 · a64a9c5 · a64a9c5
1 parent dd928bf
commit a64a9c5
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 14 deletions.
diff --git a/...ebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy b/...ebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
@@ -1420,7 +1420,7 @@ class ApiController {
 
     // Everything is good so far. Translate the external meeting ids to an internal meeting ids.             
     ArrayList<String> internalMeetingIds = paramsProcessorUtil.convertToInternalMeetingId(externalMeetingIds);        
-	HashMap<String,Recording> recs = meetingService.getRecordings(internalMeetingIds);
+	Map<String,Recording> recs = meetingService.getRecordings(internalMeetingIds);
 	recs = meetingService.filterRecordingsByMetadata(recs, ParamsProcessorUtil.processMetaParam(params));
 
     if (recs.isEmpty()) {

diff --git a/bigbluebutton-web/src/groovy/org/bigbluebutton/api/RecordingServiceHelperImp.groovy b/bigbluebutton-web/src/groovy/org/bigbluebutton/api/RecordingServiceHelperImp.groovy
@@ -125,7 +125,6 @@ public class RecordingServiceHelperImp implements RecordingServiceHelper {
 		r.setDownloadSize(rec.download.size.text());
 		Map<String, String> meta = new HashMap<String, String>();		
 		rec.meta.children().each { anode ->
-				log.debug("metadata: "+anode.name()+" "+anode.text())
 				meta.put(anode.name().toString(), anode.text().toString());
 		}
 		r.setMetadata(meta);

diff --git a/bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java b/bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
@@ -28,6 +28,7 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.TreeMap;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
@@ -352,22 +353,18 @@ public Meeting getNotEndedMeetingWithId(String meetingId) {
 		return null;
 	} 
 
-	public HashMap<String,Recording> getRecordings(ArrayList<String> idList) {
+	public Map<String,Recording> getRecordings(ArrayList<String> idList) {
 		//TODO: this method shouldn't be used 
-		log.debug("starting to fetch recordings");
-		ArrayList<Recording> recsList = recordingService.getRecordings(idList);
-		log.debug("got all recordings, without ordering");
-		HashMap<String,Recording> recs= reorderRecordings(recsList);
-		log.debug("returning ordered recordings");
+		Map<String,Recording> recs= reorderRecordings(recordingService.getRecordings(idList));
 		return recs;
 	}
 
 	public Map<String, Recording> filterRecordingsByMetadata(Map<String, Recording> recordings, Map<String, String> metadataFilters) {
 		return recordingService.filterRecordingsByMetadata(recordings, metadataFilters);
 	}
 
-	public HashMap<String,Recording> reorderRecordings(ArrayList<Recording> olds){
-		HashMap<String,Recording> map= new HashMap<String, Recording>();
+	public Map<String,Recording> reorderRecordings(ArrayList<Recording> olds){
+		Map<String,Recording> map= new TreeMap<String, Recording>();
 		for (Recording r:olds) {
 			if (!map.containsKey(r.getId())) {
 				Map<String,String> meta= r.getMetadata();

diff --git a/bigbluebutton-web/src/java/org/bigbluebutton/api/RecordingService.java b/bigbluebutton-web/src/java/org/bigbluebutton/api/RecordingService.java
@@ -28,12 +28,12 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.TreeMap;
 
 import org.bigbluebutton.api.domain.Recording;
 import org.slf4j.Logger;
@@ -115,7 +115,7 @@ public boolean recordingMatchesMetadata(Recording recording, Map<String, String>
 	}
 
 	public Map<String, Recording> filterRecordingsByMetadata(Map<String, Recording> recordings, Map<String, String> metadataFilters) {
-		Map<String, Recording> resultRecordings = new HashMap<String, Recording>();
+		Map<String, Recording> resultRecordings = new TreeMap<String, Recording>();
 		for (Map.Entry<String, Recording> entry : recordings.entrySet()) {
 			if (recordingMatchesMetadata(entry.getValue(), metadataFilters))
 				resultRecordings.put(entry.getKey(), entry.getValue());

diff --git a/bigbluebutton-web/web-app/WEB-INF/freemarker/get-recordings.ftl b/bigbluebutton-web/web-app/WEB-INF/freemarker/get-recordings.ftl
@@ -15,7 +15,7 @@
       <endTime>${r.getEndTime()}</endTime>
       <#assign m = r.getMetadata()>
       <metadata>
-      <#list m?keys as prop>
+      <#list m?keys?sort as prop>
         <${prop}><![CDATA[${m[prop]}]]></${prop}>
       </#list>
       </metadata>
@@ -33,4 +33,4 @@
   </#list>
   </recordings>
 </response>
-</#compress>
+</#compress>