BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- remove unused imports

Browse Source
This commit is contained in:
Richard Alam 2017-11-28 10:54:58 -08:00
parent 10ae91649e
commit 35277b7447
14 changed files with 10 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bbb-common-web/src/main/java/org/bigbluebutton/api/ClientConfigService.java
View File

@ -34,17 +34,13 @@ public class ClientConfigService {
private Map<String, String> configs = new HashMap<String, String>();
public void init() {
configs = getAllConfigs();
configs = helper.getPreBuiltConfigs(configDir);
}
public String getConfig(String id) {
return configs.get(id);
}
private Map<String, String> getAllConfigs(){
return helper.getPreBuiltConfigs(configDir);
}
public void setConfigDir(String dir) {
configDir = dir;
}

34
bbb-common-web/src/main/java/org/bigbluebutton/api/messaging/MessagingService.java
View File

@ -18,13 +18,7 @@
package org.bigbluebutton.api.messaging;
import org.bigbluebutton.presentation.messages.IDocConversionMsg;
import org.bigbluebutton.web.services.turn.StunServer;
import org.bigbluebutton.web.services.turn.TurnEntry;
import java.util.Map;
import java.util.Set;
public interface MessagingService {
void recordMeetingInfo(String meetingId, Map<String, String> info);
@ -32,32 +26,4 @@ public interface MessagingService {
void recordBreakoutInfo(String meetingId, Map<String, String> breakoutInfo);
void addBreakoutRoom(String parentId, String breakoutId);
/*
void send(String channel, String message);
void publishRecording(String recordId, String meetingId, String externalMeetingId, String format, boolean publish);
void deleteRecording(String recordId, String meetingId, String externalMeetingId, String format);
void createMeeting(String meetingID, String externalMeetingID,
String parentMeetingID, String meetingName, Boolean recorded,
String voiceBridge, Integer duration, Boolean autoStartRecording,
Boolean allowStartStopRecording, Boolean webcamsOnlyForModerator,
String moderatorPass, String viewerPass, Long createTime,
String createDate, Boolean isBreakout, Integer sequence,
Map<String, String> metadata, String guestPolicy);
void registerUser(String meetingID, String internalUserId, String fullname, String role,
String externUserID, String authToken, String avatarURL, Boolean guest, Boolean authed);
void destroyMeeting(String meetingID);
void endMeeting(String meetingId);
void sendKeepAlive(String system, Long timestamp);
void sendStunTurnInfo(String meetingId, String internalUserId, Set<StunServer> stuns, Set<TurnEntry> turns);
void sendDocConversionMsg(IDocConversionMsg msg);
*/
}

2
bbb-common-web/src/main/java/org/bigbluebutton/api/messaging/ReceivedMessageHandler.java
View File

@ -1,13 +1,11 @@
package org.bigbluebutton.api.messaging;
import java.util.Set;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
import java.util.concurrent.LinkedBlockingQueue;
import org.bigbluebutton.api.IReceivedOldMessageHandler;
import org.bigbluebutton.api.messaging.messages.IMessage;
import org.bigbluebutton.api2.bus.OldMessageReceivedGW;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
bbb-common-web/src/main/java/org/bigbluebutton/api2/RecordingServiceGW.java
View File

@ -2,10 +2,8 @@ package org.bigbluebutton.api2;
import org.bigbluebutton.api.domain.RecordingMetadata;
import scala.Option;
import java.io.File;
import java.util.ArrayList;
import java.util.Map;
public interface RecordingServiceGW {

1
bbb-common-web/src/main/java/org/bigbluebutton/presentation/DocumentConversionServiceImp.java
View File

@ -20,7 +20,6 @@
package org.bigbluebutton.presentation;
import com.google.gson.Gson;
import org.bigbluebutton.api.messaging.MessagingService;
import org.bigbluebutton.api2.IBbbWebApiGWApp;
import org.bigbluebutton.presentation.imp.ImageToSwfSlidesGenerationService;
import org.bigbluebutton.presentation.imp.OfficeToPdfConversionService;

2
bbb-common-web/src/main/java/org/bigbluebutton/presentation/SupportedFileTypes.java
View File

@ -26,8 +26,6 @@ import java.util.List;
@SuppressWarnings("serial")
public final class SupportedFileTypes {
// Set as private to prevent instantiation
private SupportedFileTypes() {}
private static final List<String> SUPPORTED_FILE_LIST = new ArrayList<String>(15) {
{

1
bbb-common-web/src/main/java/org/bigbluebutton/presentation/Util.java
View File

@ -22,7 +22,6 @@ package org.bigbluebutton.presentation;
import java.io.File;
public final class Util {
private Util() {}
public static void deleteDirectory(File directory) {
/**

2
bbb-common-web/src/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala
View File

@ -6,7 +6,7 @@ import akka.event.Logging
import org.bigbluebutton.api.messaging.converters.messages._
import org.bigbluebutton.api2.bus._
import org.bigbluebutton.api2.endpoint.redis.{AppsRedisSubscriberActor, MessageSender, RedisPublisher}
import org.bigbluebutton.api2.meeting.{MeetingsManagerActor, OldMeetingMsgHdlrActor, RegisterUser}
import org.bigbluebutton.api2.meeting.{OldMeetingMsgHdlrActor, RegisterUser}
import org.bigbluebutton.common.messages.SendStunTurnInfoReplyMessage
import org.bigbluebutton.common2.domain._
import org.bigbluebutton.presentation.messages._

2
bbb-common-web/src/main/scala/org/bigbluebutton/api2/MsgBuilder.scala
View File

@ -92,7 +92,7 @@ object MsgBuilder {
}
def generatePresentationPages(presId: String, numPages: Int, presBaseUrl: String): scala.collection.immutable.Map[String, PageVO] = {
var pages = new scala.collection.mutable.HashMap[String, PageVO]
val pages = new scala.collection.mutable.HashMap[String, PageVO]
for (i <- 1 to numPages) {
val id = presId + "/" + i
val num = i

44
bbb-common-web/src/main/scala/org/bigbluebutton/api2/RecordingServiceGW2x.scala
View File

@ -1,44 +0,0 @@
package org.bigbluebutton.api2
import java.io.File
import java.util
import java.util.{ArrayList, HashSet, Iterator, List, Map, Set}
import scala.collection.JavaConversions._
class RecordingServiceGW2x {
def getRecordings2x1(idList: ArrayList[String], states: ArrayList[String],
metadataFilters: Map[String, String],
allDirectories: Map[String, ArrayList[File]]): String = {
val allDirs = allDirectories map (ad => ad._1 -> ad._2.toVector)
getRecordings2xImp(idList.toVector, states.toVector, mapAsScalaMap(metadataFilters).toMap, allDirs.toMap)
}
private def getRecordings2xImp(idList: Vector[String], states: Vector[String],
metafilters: collection.immutable.Map[String, String],
allDirectories: collection.immutable.Map[String, Vector[File]]): String = {
"FOO"
}
private def getRecordingsMeta(idList: Vector[String], allDirectories: collection.immutable.Map[String, Vector[File]]) = {
var newIdList = Vector[String]()
if (idList.isEmpty) {
allDirectories.values.foreach { entry =>
newIdList :+ getAllRecordingIds(entry)
}
}
}
private def getAllRecordingIds(recs: Vector[File]): collection.mutable.Set[String] = {
var ids: Set[String] = collection.mutable.Set[String]()
recs foreach (r => ids += r.getName)
ids
}
}

1
bbb-common-web/src/main/scala/org/bigbluebutton/api2/domain/Recording.scala
View File

@ -1,7 +1,6 @@
package org.bigbluebutton.api2.domain
import scala.collection.JavaConverters._
import java.util.Map
import scala.xml.{Elem, NodeSeq}

2
bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/OldMeetingMsgHdlrActor.scala
View File

@ -7,8 +7,6 @@ import org.bigbluebutton.api.messaging.messages._
import org.bigbluebutton.api2.bus.OldMessageReceivedGW
import org.bigbluebutton.common2.msgs._
import collection.JavaConverters._
object OldMeetingMsgHdlrActor {
def props(olgMsgGW: OldMessageReceivedGW): Props =

10
bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/RunningMeeting.scala
View File

@ -1,6 +1,6 @@
package org.bigbluebutton.api2.meeting
import org.bigbluebutton.api2.domain.{RegisteredUsers, Users, UsersCustomData}
//import org.bigbluebutton.api2.domain.{RegisteredUsers, Users, UsersCustomData}
import org.bigbluebutton.common2.domain.DefaultProps
object RunningMeeting {
@ -8,8 +8,10 @@ object RunningMeeting {
}
class RunningMeeting(val meetingId: String, val defaultProps: DefaultProps) {
private val users = new Users
private val registeredUsers = new RegisteredUsers
private val usersCustomData = new UsersCustomData
// Not used for now. For future when migrating meeting info in akka.
// private val users = new Users
// private val registeredUsers = new RegisteredUsers
// private val usersCustomData = new UsersCustomData
// private val usersCustomData = new UsersCustomData
}

1
bbb-common-web/src/main/scala/org/bigbluebutton/api2/util/LogHelper.scala
View File

@ -1,6 +1,5 @@
package org.bigbluebutton.api2.util
import org.slf4j.Logger
import org.slf4j.LoggerFactory
/**