diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java b/bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java index 1de3e12fb7df3a8323e2107838df5713688128e3..681035083790bb8622656680f99c81d399ee46f3 100755 --- a/bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java +++ b/bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java @@ -351,29 +351,22 @@ public class MeetingService implements MessageListener { } public void setPublishRecording(List<String> idList, boolean publish) { - System.out.println("**** setPublishRecording"); - for (String id : idList) { if (publish) { - System.out.println("**** setPublishRecording - publish " + id); recordingService.changeState(id, Recording.STATE_PUBLISHED); } else { - System.out.println("**** setPublishRecording - unpublish " + id); recordingService.changeState(id, Recording.STATE_UNPUBLISHED); } } } public void deleteRecordings(List<String> idList) { - System.out.println("**** deleteRecordings"); for (String id : idList) { - System.out.println("**** deleteRecordings - deleteRecordings " + id); recordingService.changeState(id, Recording.STATE_DELETED); } } public void updateRecordings(List<String> idList, Map<String, String> metaParams) { - System.out.println("**** updateRecordings"); recordingService.updateMetaParams(idList, metaParams); } diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/api/RecordingService.java b/bbb-common-web/src/main/java/org/bigbluebutton/api/RecordingService.java index 39237e3cf17927c35265f5296ac45f9279fd8428..23a06e233f900cbe73a29151da03fe609d41ef49 100755 --- a/bbb-common-web/src/main/java/org/bigbluebutton/api/RecordingService.java +++ b/bbb-common-web/src/main/java/org/bigbluebutton/api/RecordingService.java @@ -37,7 +37,6 @@ import org.apache.commons.io.FileUtils; import org.bigbluebutton.api.domain.Recording; import org.bigbluebutton.api.domain.RecordingMetadata; import org.bigbluebutton.api.util.RecordingMetadataReaderHelper; -import org.bigbluebutton.api2.domain.RecMeta; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -465,7 +464,6 @@ public class RecordingService { } public void updateMetaParams(List<String> recordIDs, Map<String,String> metaParams) { - System.out.println("**** updateMetaParams"); // Define the directories used to lookup the recording List<String> states = new ArrayList<String>(); states.add(Recording.STATE_PUBLISHED); diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/api/util/RecordingMetadataReaderHelper.java b/bbb-common-web/src/main/java/org/bigbluebutton/api/util/RecordingMetadataReaderHelper.java index c1e7dca51cb3ec7d847642dc7fd55332ce574bda..bf267d1b132f2b509d24ff3fa8aef0d86654fb0f 100755 --- a/bbb-common-web/src/main/java/org/bigbluebutton/api/util/RecordingMetadataReaderHelper.java +++ b/bbb-common-web/src/main/java/org/bigbluebutton/api/util/RecordingMetadataReaderHelper.java @@ -1,21 +1,13 @@ package org.bigbluebutton.api.util; -import com.fasterxml.jackson.dataformat.xml.JacksonXmlModule; -import com.fasterxml.jackson.dataformat.xml.XmlMapper; import org.bigbluebutton.api.domain.RecordingMetadata; -import com.fasterxml.jackson.databind.SerializationFeature; - -import javax.xml.stream.*; import java.io.*; import java.util.ArrayList; - import org.bigbluebutton.api2.RecordingServiceGW; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import scala.Option; -import scala.Some; -import scala.None; public class RecordingMetadataReaderHelper { private static Logger log = LoggerFactory.getLogger(RecordingMetadataReaderHelper.class); diff --git a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/domain/Recording.scala b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/domain/Recording.scala index 41b1a0174766559c0f351120ddf918152b6a7988..af3e5e95552d3200b05e14741c3a0a54a34b06a0 100755 --- a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/domain/Recording.scala +++ b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/domain/Recording.scala @@ -183,8 +183,13 @@ case class RecMeta(id: String, meetingId: String, internalMeetingId: Option[ Str def setPublished(publish: Boolean): RecMeta = this.copy(published = publish) def getRecMeta():java.util.Map[String, String] = { meta match { - case Some(m) => m.asJava - case None => (scala.collection.immutable.Map[String, String]()).asJava + case Some(m) => + // Send back a mutable map. So convert the immutable map to mutable then convert + // to Java Map. + // https://stackoverflow.com/questions/5042878/how-can-i-convert-immutable-map-to-mutable-map-in-scala + val mutableMap = collection.mutable.Map() ++ m // convert to mutable map + mutableMap.asJava + case None => (collection.mutable.Map[String, String]()).asJava } } @@ -345,9 +350,9 @@ case class RecMetaPlayback(format: String, link: String, processingTime: Int, val buffer = new scala.xml.NodeBuffer val formatElem = <format>{format}</format> - val urlElem = <url>{link}</url> - val processTimeElem = <processingTime>{processingTime}</processingTime> - val lengthElem = <length>{duration}</length> + val urlElem = <link>{link}</link> + val processTimeElem = <processing_time>{processingTime}</processing_time> + val lengthElem = <duration>{duration}</duration> buffer += formatElem buffer += urlElem diff --git a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/util/RecMetaXmlHelper.scala b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/util/RecMetaXmlHelper.scala index 59c90128452cf1a2a98d91fd224de8e6927743c4..dda58baeb4b10e4c3fed3d9a9c7779e120a96493 100755 --- a/bbb-common-web/src/main/scala/org/bigbluebutton/api2/util/RecMetaXmlHelper.scala +++ b/bbb-common-web/src/main/scala/org/bigbluebutton/api2/util/RecMetaXmlHelper.scala @@ -30,19 +30,6 @@ class RecMetaXmlHelper extends RecordingServiceGW with LogHelper { } def saveRecordingMetadata(xml: File, metadata: RecordingMetadata): Unit = { - println("Saving metadata.xml to " + xml.getAbsolutePath) - println(" METADATAXML \n " + metadata.getRecMeta.toMetadataXml()) -/* - try { - scala.xml.XML.save(xml.getAbsolutePath, metadata.getRecMeta.toMetadataXml(), "UTF-8", true, null) - } catch { - case ioe: IOException => - logger.info("Failed to save metadataxml {}", xml.getAbsolutePath) - case ex: Exception => - logger.info("Exception while saving {}", xml.getAbsolutePath) - logger.info("Exception details: {}", ex.getMessage) - } -*/ try { val Encoding = "UTF-8" val pp = new PrettyPrinter(80, 2)