diff --git a/bbb-common-message/README b/bbb-common-message/README.md
similarity index 100%
rename from bbb-common-message/README
rename to bbb-common-message/README.md
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/MessagingConstants.java b/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/MessagingConstants.java
deleted file mode 100755
index 96f8d341c32043faace471141b3b02158a24bdc4..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/MessagingConstants.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
-* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
-*
-* Copyright (c) 2014 BigBlueButton Inc. and by respective authors (see below).
-*
-* This program is free software; you can redistribute it and/or modify it under the
-* terms of the GNU Lesser General Public License as published by the Free Software
-* Foundation; either version 3.0 of the License, or (at your option) any later
-* version.
-*
-* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
-* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public License along
-* with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
-*
-*/
-package org.bigbluebutton.common.messages;
-
-public class MessagingConstants {
-
- public static final String FROM_BBB_APPS_CHANNEL = "bigbluebutton:from-bbb-apps";
- public static final String FROM_BBB_APPS_PATTERN = FROM_BBB_APPS_CHANNEL + ":*";
- public static final String FROM_SYSTEM_CHANNEL = FROM_BBB_APPS_CHANNEL + ":system";
- public static final String FROM_MEETING_CHANNEL = FROM_BBB_APPS_CHANNEL + ":meeting";
- public static final String FROM_PRESENTATION_CHANNEL = FROM_BBB_APPS_CHANNEL + ":presentation";
- public static final String FROM_POLLING_CHANNEL = FROM_BBB_APPS_CHANNEL + ":polling";
- public static final String FROM_USERS_CHANNEL = FROM_BBB_APPS_CHANNEL + ":users";
- public static final String FROM_CHAT_CHANNEL = FROM_BBB_APPS_CHANNEL + ":chat";
- public static final String FROM_WHITEBOARD_CHANNEL = FROM_BBB_APPS_CHANNEL + ":whiteboard";
-
- public static final String TO_BBB_APPS_CHANNEL = "bigbluebutton:to-bbb-apps";
- public static final String TO_BBB_APPS_PATTERN = TO_BBB_APPS_CHANNEL + ":*";
- public static final String TO_MEETING_CHANNEL = TO_BBB_APPS_CHANNEL + ":meeting";
- public static final String TO_SYSTEM_CHANNEL = TO_BBB_APPS_CHANNEL + ":system";
- public static final String TO_PRESENTATION_CHANNEL = TO_BBB_APPS_CHANNEL + ":presentation";
- public static final String TO_POLLING_CHANNEL = TO_BBB_APPS_CHANNEL + ":polling";
- public static final String TO_USERS_CHANNEL = TO_BBB_APPS_CHANNEL + ":users";
- public static final String TO_CHAT_CHANNEL = TO_BBB_APPS_CHANNEL + ":chat";
- public static final String TO_VOICE_CHANNEL = TO_BBB_APPS_CHANNEL + ":voice";
- public static final String TO_WHITEBOARD_CHANNEL = TO_BBB_APPS_CHANNEL + ":whiteboard";
-
- public static final String TO_VOICE_CONF_CHANNEL = "bigbluebutton:to-voice-conf";
- public static final String TO_VOICE_CONF_PATTERN = TO_VOICE_CONF_CHANNEL + ":*";
- public static final String TO_VOICE_CONF_SYSTEM_CHAN = TO_VOICE_CONF_CHANNEL + ":system";
- public static final String FROM_VOICE_CONF_CHANNEL = "bigbluebutton:from-voice-conf";
- public static final String FROM_VOICE_CONF_PATTERN = FROM_VOICE_CONF_CHANNEL + ":*";
- public static final String FROM_VOICE_CONF_SYSTEM_CHAN = FROM_VOICE_CONF_CHANNEL + ":system";
-
- public static final String DESTROY_MEETING_REQUEST_EVENT = "DestroyMeetingRequestEvent";
- public static final String CREATE_MEETING_REQUEST_EVENT = "CreateMeetingRequestEvent";
- public static final String END_MEETING_REQUEST_EVENT = "EndMeetingRequestEvent";
- public static final String MEETING_STARTED_EVENT = "meeting_created_message";
- public static final String MEETING_ENDED_EVENT = "meeting_ended_event";
- public static final String MEETING_DESTROYED_EVENT = "meeting_destroyed_event";
- public static final String USER_JOINED_EVENT = "UserJoinedEvent";
- public static final String USER_LEFT_EVENT = "UserLeftEvent";
- public static final String USER_LEFT_VOICE_REQUEST = "user_left_voice_request";
- public static final String USER_STATUS_CHANGE_EVENT = "UserStatusChangeEvent";
- public static final String SEND_POLLS_EVENT = "SendPollsEvent";
- public static final String RECORD_STATUS_EVENT = "RecordStatusEvent";
- public static final String SEND_PUBLIC_CHAT_MESSAGE_REQUEST = "send_public_chat_message_request";
- public static final String SEND_PRIVATE_CHAT_MESSAGE_REQUEST = "send_private_chat_message_request";
- public static final String MUTE_USER_REQUEST = "mute_user_request";
-}
diff --git a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Util.java b/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Util.java
deleted file mode 100755
index 33bcdc405990bbee3b26d500494c016197e4890e..0000000000000000000000000000000000000000
--- a/bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Util.java
+++ /dev/null
@@ -1,425 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-
-public class Util {
- public Map<String, Boolean> extractPermission(JsonObject vu) {
- if (vu.has(Constants.PERM_DISABLE_CAM) && vu.has(Constants.PERM_DISABLE_MIC)
- && vu.has(Constants.PERM_DISABLE_PRIVCHAT) && vu.has(Constants.PERM_DISABLE_PUBCHAT)
- && vu.has(Constants.PERM_LOCKED_LAYOUT) && vu.has(Constants.PERM_LOCK_ON_JOIN)
- && vu.has(Constants.PERM_LOCK_ON_JOIN_CONFIG)){
-
- Map<String, Boolean> vuMap = new HashMap<String, Boolean>();
- Boolean disableCam = vu.get(Constants.PERM_DISABLE_CAM).getAsBoolean();
- Boolean disableMic = vu.get(Constants.PERM_DISABLE_MIC).getAsBoolean();
- Boolean disablePrivChat = vu.get(Constants.PERM_DISABLE_PRIVCHAT).getAsBoolean();
- Boolean disablePubChat = vu.get(Constants.PERM_DISABLE_PUBCHAT).getAsBoolean();
- Boolean lockedLayout = vu.get(Constants.PERM_LOCKED_LAYOUT).getAsBoolean();
- Boolean lockOnJoin = vu.get(Constants.PERM_LOCK_ON_JOIN).getAsBoolean();
- Boolean lockOnJoinConfig = vu.get(Constants.PERM_LOCK_ON_JOIN_CONFIG).getAsBoolean();
-
- vuMap.put(Constants.PERM_DISABLE_CAM, disableCam);
- vuMap.put(Constants.PERM_DISABLE_MIC, disableMic);
- vuMap.put(Constants.PERM_DISABLE_PRIVCHAT, disablePrivChat);
- vuMap.put(Constants.PERM_DISABLE_PUBCHAT, disablePubChat);
- vuMap.put(Constants.PERM_LOCKED_LAYOUT, lockedLayout);
- vuMap.put(Constants.PERM_LOCK_ON_JOIN, lockOnJoin);
- vuMap.put(Constants.PERM_LOCK_ON_JOIN_CONFIG, lockOnJoinConfig);
-
- return vuMap;
- }
- return null;
- }
-
- public Map<String, Object> extractVoiceUser(JsonObject vu) {
- if (vu.has(Constants.TALKING) && vu.has(Constants.LOCKED)
- && vu.has(Constants.MUTED) && vu.has(Constants.JOINED)
- && vu.has(Constants.CALLERNAME) && vu.has(Constants.CALLERNUM)
- && vu.has(Constants.WEB_USERID) && vu.has(Constants.USER_ID)){
-
- Map<String, Object> vuMap = new HashMap<String, Object>();
- Boolean talking = vu.get(Constants.TALKING).getAsBoolean();
- Boolean voiceLocked = vu.get(Constants.LOCKED).getAsBoolean();
- Boolean muted = vu.get(Constants.MUTED).getAsBoolean();
- Boolean joined = vu.get(Constants.JOINED).getAsBoolean();
- String callername = vu.get(Constants.CALLERNAME).getAsString();
- String callernum = vu.get(Constants.CALLERNUM).getAsString();
- String webUserId = vu.get(Constants.WEB_USERID).getAsString();
- String voiceUserId = vu.get(Constants.USER_ID).getAsString();
-
- vuMap.put("talking", talking);
- vuMap.put("locked", voiceLocked);
- vuMap.put("muted", muted);
- vuMap.put("joined", joined);
- vuMap.put("callerName", callername);
- vuMap.put("callerNum", callernum);
- vuMap.put("webUserId", webUserId);
- vuMap.put("userId", voiceUserId);
-
- return vuMap;
- }
- return null;
- }
-
- public Map<String, Object> extractUser(JsonObject user) {
- if (user.has(Constants.USER_ID) && user.has(Constants.NAME)
- && user.has(Constants.HAS_STREAM) && user.has(Constants.LISTENONLY)
- && user.has(Constants.RAISE_HAND) && user.has(Constants.PHONE_USER)
- && user.has(Constants.PRESENTER) && user.has(Constants.LOCKED)
- && user.has(Constants.EXTERN_USERID) && user.has(Constants.ROLE)
- && user.has(Constants.VOICEUSER)){
-
- Map<String, Object> userMap = new HashMap<String, Object>();
-
- String userid = user.get(Constants.USER_ID).getAsString();
- String username = user.get(Constants.NAME).getAsString();
- Boolean hasStream = user.get(Constants.HAS_STREAM).getAsBoolean();
- Boolean listenOnly = user.get(Constants.LISTENONLY).getAsBoolean();
- Boolean raiseHand = user.get(Constants.RAISE_HAND).getAsBoolean();
- Boolean phoneUser = user.get(Constants.PHONE_USER).getAsBoolean();
- Boolean presenter = user.get(Constants.PRESENTER).getAsBoolean();
- Boolean locked = user.get(Constants.LOCKED).getAsBoolean();
- String extUserId = user.get(Constants.EXTERN_USERID).getAsString();
- String role = user.get(Constants.ROLE).getAsString();
-
- userMap.put("userId", userid);
- userMap.put("name", username);
- userMap.put("listenOnly", listenOnly);
- userMap.put("hasStream", hasStream);
- userMap.put("raiseHand", raiseHand);
- userMap.put("externUserID", extUserId);
- userMap.put("phoneUser", phoneUser);
- userMap.put("locked", locked);
- userMap.put("role", role);
- userMap.put("presenter", presenter);
-
- JsonObject vu = (JsonObject) user.get(Constants.VOICEUSER);
-
- Map<String, Object> vuMap = extractVoiceUser(vu);
- if (vuMap != null) {
- userMap.put("voiceUser", vuMap);
- return userMap;
- }
- }
-
- return null;
-
- }
-
- public ArrayList<Map<String, Object>> extractChatHistory(JsonArray history) {
- ArrayList<Map<String, Object>> collection = new ArrayList<Map<String, Object>>();
- Iterator<JsonElement> historyIter = history.iterator();
- while (historyIter.hasNext()){
- JsonElement chat = historyIter.next();
- Map<String, Object> chatMap = extractChat((JsonObject)chat);
- if (chatMap != null) {
- collection.add(chatMap);
- }
- }
- return collection;
- }
-
- private Map<String, Object> extractChat(JsonObject chat) {
-
- if (chat.has(Constants.FROM_COLOR)
- && chat.has(Constants.MESSAGE)
- && chat.has(Constants.TO_USERNAME)
- && chat.has(Constants.FROM_TZ_OFFSET)
- && chat.has(Constants.FROM_COLOR)
- && chat.has(Constants.TO_USERID)
- && chat.has(Constants.FROM_USERID)
- && chat.has(Constants.FROM_TIME)
- && chat.has(Constants.FROM_USERNAME)){
-
- Map<String, Object> chatMap = new HashMap<String, Object>();
-
- chatMap.put(ChatKeyUtil.CHAT_TYPE, chat.get(Constants.CHAT_TYPE).getAsString());
- chatMap.put(ChatKeyUtil.MESSAGE, chat.get(Constants.MESSAGE).getAsString());
- chatMap.put(ChatKeyUtil.TO_USERNAME, chat.get(Constants.TO_USERNAME).getAsString());
- chatMap.put(ChatKeyUtil.FROM_TZ_OFFSET, chat.get(Constants.FROM_TZ_OFFSET).getAsString());
- chatMap.put(ChatKeyUtil.FROM_COLOR, chat.get(Constants.FROM_COLOR).getAsString());
- chatMap.put(ChatKeyUtil.TO_USERID, chat.get(Constants.TO_USERID).getAsString());
- chatMap.put(ChatKeyUtil.FROM_USERID, chat.get(Constants.FROM_USERID).getAsString());
- chatMap.put(ChatKeyUtil.FROM_TIME, chat.get(Constants.FROM_TIME).getAsString());
- chatMap.put(ChatKeyUtil.FROM_USERNAME, chat.get(Constants.FROM_USERNAME).getAsString());
-
- return chatMap;
- }
- return null;
- }
-
- public ArrayList<Map<String, Object>> extractUsers(JsonArray users) {
- ArrayList<Map<String, Object>> collection = new ArrayList<Map<String, Object>>();
-
- Iterator<JsonElement> usersIter = users.iterator();
- while (usersIter.hasNext()){
- JsonElement user = usersIter.next();
- Map<String, Object> userMap = extractUser((JsonObject)user);
- if (userMap != null) {
- collection.add(userMap);
- }
- }
-
- return collection;
-
- }
-
- public ArrayList<String> extractUserids(JsonArray users) {
- ArrayList<String> collection = new ArrayList<String>();
-
- Iterator<JsonElement> usersIter = users.iterator();
- while (usersIter.hasNext()){
- JsonElement user = usersIter.next();
- collection.add(user.getAsString());
- }
-
- return collection;
-
- }
-
- public Map<String, Object> extractAnnotation(JsonObject annotationElement) {
- //NON-TEXT SHAPE
- if (annotationElement.has(Constants.ID)
- && annotationElement.has("transparency")
- && annotationElement.has("color")
- && annotationElement.has("status")
- && annotationElement.has("whiteboardId")
- && annotationElement.has("type")
- && annotationElement.has("thickness")
- && annotationElement.has("points")){
-
- Map<String, Object> finalAnnotation = new HashMap<String, Object>();
-
- boolean transparency = annotationElement.get("transparency").getAsBoolean();
- String id = annotationElement.get(Constants.ID).getAsString();
- int color = annotationElement.get("color").getAsInt();
- String status = annotationElement.get(Constants.STATUS).getAsString();
- String whiteboardId = annotationElement.get("whiteboardId").getAsString();
- int thickness = annotationElement.get("thickness").getAsInt();
- String type = annotationElement.get("type").getAsString();
-
- JsonArray pointsJsonArray = annotationElement.get("points").getAsJsonArray();
-
- ArrayList<Float> pointsArray = new ArrayList<Float>();
- Iterator<JsonElement> pointIter = pointsJsonArray.iterator();
- while (pointIter.hasNext()){
- JsonElement p = pointIter.next();
- Float pf = p.getAsFloat();
- if (pf != null) {
- pointsArray.add(pf);
- }
- }
-
- finalAnnotation.put("transparency", transparency);
- finalAnnotation.put(Constants.ID, id);
- finalAnnotation.put("color", color);
- finalAnnotation.put("status", status);
- finalAnnotation.put("whiteboardId", whiteboardId);
- finalAnnotation.put("thickness", thickness);
- finalAnnotation.put("points", pointsArray);
- finalAnnotation.put("type", type);
-
- return finalAnnotation;
- }
-
- // TEXT SHAPE
- else if (annotationElement.has(Constants.ID)
- && annotationElement.has("text")
- && annotationElement.has("fontColor")
- && annotationElement.has("status")
- && annotationElement.has("textBoxWidth")
- && annotationElement.has("fontSize")
- && annotationElement.has("type")
- && annotationElement.has("calcedFontSize")
- && annotationElement.has("textBoxHeight")
- && annotationElement.has("calcedFontSize")
- && annotationElement.has("whiteboardId")
- && annotationElement.has("dataPoints")
- && annotationElement.has("x")
- && annotationElement.has("y")){
-
- Map<String, Object> finalAnnotation = new HashMap<String, Object>();
-
- String text = annotationElement.get("text").getAsString();
- int fontColor = annotationElement.get("fontColor").getAsInt();
- String status = annotationElement.get(Constants.STATUS).getAsString();
- Float textBoxWidth = annotationElement.get("textBoxWidth").getAsFloat();
- int fontSize = annotationElement.get("fontSize").getAsInt();
- String type = annotationElement.get("type").getAsString();
- Float calcedFontSize = annotationElement.get("calcedFontSize").getAsFloat();
- Float textBoxHeight = annotationElement.get("textBoxHeight").getAsFloat();
- String id = annotationElement.get(Constants.ID).getAsString();
- String whiteboardId = annotationElement.get("whiteboardId").getAsString();
- Float x = annotationElement.get("x").getAsFloat();
- Float y = annotationElement.get("y").getAsFloat();
- String dataPoints = annotationElement.get("dataPoints").getAsString();
-
- finalAnnotation.put("text", text);
- finalAnnotation.put("fontColor", fontColor);
- finalAnnotation.put(Constants.STATUS, status);
- finalAnnotation.put("textBoxWidth", textBoxWidth);
- finalAnnotation.put("fontSize", fontSize);
- finalAnnotation.put("type", type);
- finalAnnotation.put("calcedFontSize", calcedFontSize);
- finalAnnotation.put("textBoxHeight", textBoxHeight);
- finalAnnotation.put(Constants.ID, id);
- finalAnnotation.put("whiteboardId", whiteboardId);
- finalAnnotation.put("x", x);
- finalAnnotation.put("y", y);
- finalAnnotation.put("dataPoints", dataPoints);
-
- return finalAnnotation;
- }
- return null;
- }
-
- public Map<String, Object> extractCurrentPresenter(JsonObject vu) {
- if (vu.has(Constants.USER_ID) && vu.has(Constants.NAME)
- && vu.has(Constants.ASSIGNED_BY)){
-
- Map<String, Object> vuMap = new HashMap<String, Object>();
- String presenterUserId = vu.get(Constants.USER_ID).getAsString();
- String presenterName = vu.get(Constants.NAME).getAsString();
- String assignedBy = vu.get(Constants.ASSIGNED_BY).getAsString();
-
- vuMap.put("userId", presenterUserId);
- vuMap.put("name", presenterName);
- vuMap.put("assignedBy", assignedBy);
-
- return vuMap;
- }
- return null;
- }
-
-
- public ArrayList<Map<String, Object>> extractPresentationPages(JsonArray pagesArray) {
- ArrayList<Map<String, Object>> pages = new ArrayList<Map<String, Object>>();
-
- Iterator<JsonElement> pagesIter = pagesArray.iterator();
- while (pagesIter.hasNext()){
- JsonObject pageObj = (JsonObject)pagesIter.next();
- if (pageObj.has("id") && pageObj.has("num")
- && pageObj.has("thumb_uri") && pageObj.has("swf_uri")
- && pageObj.has("txt_uri") && pageObj.has("png_uri")
- && pageObj.has("current") && pageObj.has("x_offset")
- && pageObj.has("y_offset") && pageObj.has("width_ratio")
- && pageObj.has("height_ratio")) {
-
- Map<String, Object> page = new HashMap<String, Object>();
-
- String pageId = pageObj.get("id").getAsString();
- Integer pageNum = pageObj.get("num").getAsInt();
- String pageThumbUri = pageObj.get("thumb_uri").getAsString();
- String pageSwfUri = pageObj.get("swf_uri").getAsString();
- String pageTxtUri = pageObj.get("txt_uri").getAsString();
- String pagePngUri = pageObj.get("png_uri").getAsString();
-
- Boolean currentPage = pageObj.get("current").getAsBoolean();
- Double xOffset = pageObj.get("x_offset").getAsDouble();
- Double yOffset = pageObj.get("y_offset").getAsDouble();
- Double widthRatio = pageObj.get("width_ratio").getAsDouble();
- Double heightRatio = pageObj.get("height_ratio").getAsDouble();
-
- page.put("id", pageId);
- page.put("num", pageNum);
- page.put("thumbUri", pageThumbUri);
- page.put("swfUri", pageSwfUri);
- page.put("txtUri", pageTxtUri);
- page.put("pngUri", pagePngUri);
- page.put("current", currentPage);
- page.put("xOffset", xOffset);
- page.put("yOffset", yOffset);
- page.put("widthRatio", widthRatio);
- page.put("heightRatio", heightRatio);
-
- pages.add(page);
- }
- }
-
- return pages;
- }
-
- public ArrayList<Map<String, Object>> extractPresentations(JsonArray presArray) {
- ArrayList<Map<String, Object>> presentations = new ArrayList<Map<String, Object>>();
-
- Iterator<JsonElement> presentationsIter = presArray.iterator();
- while (presentationsIter.hasNext()){
- JsonObject presObj = (JsonObject)presentationsIter.next();
- if (presObj.has(Constants.ID) && presObj.has(Constants.NAME)
- && presObj.has(Constants.CURRENT) && presObj.has(Constants.PAGES)) {
- Map<String, Object> pres = new HashMap<String, Object>();
-
- String presId = presObj.get(Constants.ID).getAsString();
- String presName = presObj.get(Constants.NAME).getAsString();
- Boolean currentPres = presObj.get(Constants.CURRENT).getAsBoolean();
-
- pres.put("id", presId);
- pres.put("name", presName);
- pres.put("current", currentPres);
-
- JsonArray pagesJsonArray = presObj.get(Constants.PAGES).getAsJsonArray();
-
- ArrayList<Map<String, Object>> pages = extractPresentationPages(pagesJsonArray);
- // store the pages in the presentation
- pres.put(Constants.PAGES, pages);
-
- // add this presentation into our presentations list
- presentations.add(pres);
- }
- }
- return presentations;
- }
-
- public ArrayList<Map<String, Object>> extractShapes(JsonArray shapes) {
- ArrayList<Map<String, Object>> collection = new ArrayList<Map<String, Object>>();
-
- Iterator<JsonElement> shapesIter = shapes.iterator();
- while (shapesIter.hasNext()){
- JsonElement shape = shapesIter.next();
-
- Map<String, Object> shapeMap = extractOuterAnnotation((JsonObject)shape);
-
- if (shapeMap != null) {
- collection.add(shapeMap);
- }
- }
- return collection;
- }
-
- public Map<String, Object> extractOuterAnnotation(JsonObject annotationElement) {
-
- if (annotationElement.has(Constants.ID)
- && annotationElement.has("shape")
- && annotationElement.has("status")
- && annotationElement.has("shape_type")){
-
- Map<String, Object> finalAnnotation = new HashMap<String, Object>();
-
- String id = annotationElement.get(Constants.ID).getAsString();
- String status = annotationElement.get("status").getAsString();
- String type = annotationElement.get("shape_type").getAsString();
-
- finalAnnotation.put(Constants.ID, id);
- finalAnnotation.put("type", type);
- finalAnnotation.put("status", status);
- finalAnnotation.put("status", status);
-
- JsonElement shape = annotationElement.get("shape");
- Map<String, Object> shapesMap = extractAnnotation((JsonObject)shape);
-
- if (shapesMap != null) {
- finalAnnotation.put("shapes", shapesMap);
- }
-
- return finalAnnotation;
- }
-
- return null;
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/AssignPresenterRequestMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/AssignPresenterRequestMessage.java
deleted file mode 100755
index 055e2723dabd93ec65ddba131dedc1d1f609db36..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/AssignPresenterRequestMessage.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class AssignPresenterRequestMessage implements IPublishedMessage {
- public static final String ASSIGN_PRESENTER_REQUEST = "assign_presenter_request_message";
- public final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String newPresenterId;
- public final String newPresenterName;
- public final String assignedBy;
-
- public AssignPresenterRequestMessage(String meetingID, String newPresenterId, String newPresenterName, String assignedBy) {
- this.meetingId = meetingID;
- this.newPresenterId = newPresenterId;
- this.newPresenterName = newPresenterName;
- this.assignedBy = assignedBy;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.NEW_PRESENTER_ID, newPresenterId);
- payload.put(Constants.NEW_PRESENTER_NAME, newPresenterName);
- payload.put(Constants.ASSIGNED_BY, assignedBy);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(ASSIGN_PRESENTER_REQUEST, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static AssignPresenterRequestMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (ASSIGN_PRESENTER_REQUEST.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USER_ID)
- && payload.has(Constants.NEW_PRESENTER_ID)
- && payload.has(Constants.NEW_PRESENTER_NAME)
- && payload.has(Constants.ASSIGNED_BY)) {
- String meetingId = payload.get(Constants.MEETING_ID).getAsString();
- String newPresenterId = payload.get(Constants.USER_ID).getAsString();
- String newPresenterName = payload.get(Constants.NEW_PRESENTER_NAME).getAsString();
- String assignedBy = payload.get(Constants.ASSIGNED_BY).getAsString();
-
- return new AssignPresenterRequestMessage(meetingId, newPresenterId, newPresenterName, assignedBy);
- }
- }
- }
- }
- System.out.println("Failed to parse DisconnectUserMessage");
- return null;
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/BbbAppsIsAliveMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/BbbAppsIsAliveMessage.java
deleted file mode 100755
index aebe68c3f8006476e1a8113464736f4d551e2f35..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/BbbAppsIsAliveMessage.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class BbbAppsIsAliveMessage implements ISubscribedMessage {
- public static final String BBB_APPS_IS_ALIVE = "bbb_apps_is_alive_message";
- public static final String VERSION = "0.0.1";
-
- public static final String TIMESTAMP = "timestamp";
- public static final String STARTED_ON = "started_on";
-
- public final Long timestamp;
- public final Long startedOn;
-
- public BbbAppsIsAliveMessage(Long startedOn, Long timestamp) {
- this.startedOn = startedOn;
- this.timestamp = timestamp;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(TIMESTAMP, timestamp);
- payload.put(STARTED_ON, timestamp);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(BBB_APPS_IS_ALIVE, VERSION, null);
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static BbbAppsIsAliveMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (BBB_APPS_IS_ALIVE.equals(messageName)) {
-
- if (payload.has(TIMESTAMP) && payload.has(STARTED_ON)) {
- Long timestamp = payload.get(TIMESTAMP).getAsLong();
- Long startedOn = payload.get(STARTED_ON).getAsLong();
- return new BbbAppsIsAliveMessage(startedOn, timestamp);
- }
- }
- }
- }
- return null;
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/BroadcastLayoutMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/BroadcastLayoutMessage.java
deleted file mode 100755
index 1aaf863f5c4661004a100b422b55d3bc6361e7bd..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/BroadcastLayoutMessage.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-
-public class BroadcastLayoutMessage implements ISubscribedMessage {
- public static final String BROADCAST_LAYOUT = "broadcast_layout_message";
- public static final String VERSION = "0.0.1";
-
- public static final String SET_BY_USERID = "set_by_userid";
- public static final String LAYOUT = "layout";
- public static final String LOCKED = "locked";
- public static final String USERS = "users";
-
- public final String meetingId;
- public final String setByUserid;
- public final String layout;
- public final Boolean locked;
- public final ArrayList<String> users;
-
- public BroadcastLayoutMessage(String meetingId, String setByUserid, String layout, Boolean locked, ArrayList<String> users) {
- this.meetingId = meetingId;
- this.setByUserid = setByUserid;
- this.layout = layout;
- this.locked = locked;
- this.users = users;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(SET_BY_USERID, setByUserid);
- payload.put(LAYOUT, layout);
- payload.put(LOCKED, locked);
- payload.put(USERS, users);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(BROADCAST_LAYOUT, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static BroadcastLayoutMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (BROADCAST_LAYOUT.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(LOCKED)
- && payload.has(SET_BY_USERID)
- && payload.has(USERS)
- && payload.has(LAYOUT)) {
- String id = payload.get(Constants.MEETING_ID).getAsString();
- String setByUserid = payload.get(SET_BY_USERID).getAsString();
- String layout = payload.get(LAYOUT).getAsString();
- Boolean locked = payload.get(LOCKED).getAsBoolean();
- JsonArray usersArr = (JsonArray) payload.get(USERS);
-
- Util util = new Util();
-
- ArrayList<String> users = util.extractUserids(usersArr);
- return new BroadcastLayoutMessage(id, setByUserid, layout, locked, users);
- }
- }
- }
- }
- return null;
-
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/BroadcastLayoutRequestMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/BroadcastLayoutRequestMessage.java
deleted file mode 100755
index 2aaa198ccecf720cab39cc0c73dd8c76f9a79182..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/BroadcastLayoutRequestMessage.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-
-public class BroadcastLayoutRequestMessage implements ISubscribedMessage {
- public static final String BROADCAST_LAYOUT_REQUEST = "broadcast_layout_request_message";
- public static final String VERSION = "0.0.1";
-
- public final static String LAYOUT = "layout";
-
- public final String meetingId;
- public final String userId;
- public final String layout;
-
- public BroadcastLayoutRequestMessage(String meetingId, String userId, String layout) {
- this.meetingId = meetingId;
- this.userId = userId;
- this.layout = layout;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.USER_ID, userId);
- payload.put(LAYOUT, layout);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(BROADCAST_LAYOUT_REQUEST, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static BroadcastLayoutRequestMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (BROADCAST_LAYOUT_REQUEST.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USER_ID)
- && payload.has(LAYOUT)) {
- String id = payload.get(Constants.MEETING_ID).getAsString();
- String userid = payload.get(Constants.USER_ID).getAsString();
- String layout = payload.get(LAYOUT).getAsString();
- return new BroadcastLayoutRequestMessage(id, userid, layout);
- }
- }
- }
- }
- return null;
-
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/ClearWhiteboardReplyMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/ClearWhiteboardReplyMessage.java
deleted file mode 100755
index aa09e043323b54a9a9361d53414e13bcc39989a8..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/ClearWhiteboardReplyMessage.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class ClearWhiteboardReplyMessage implements ISubscribedMessage {
-
- public static final String WHITEBOARD_CLEARED_MESSAGE = "whiteboard_cleared_message";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String whiteboardId;
- public final String requesterId;
-
-
- public ClearWhiteboardReplyMessage(String meetingId, String requesterId, String whiteboardId) {
- this.meetingId = meetingId;
- this.whiteboardId = whiteboardId;
- this.requesterId = requesterId;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.WHITEBOARD_ID, whiteboardId);
- payload.put(Constants.REQUESTER_ID, requesterId);
-
- System.out.println("ClearWhiteboardReplyMessage toJson");
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(WHITEBOARD_CLEARED_MESSAGE, VERSION, null);
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static ClearWhiteboardReplyMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (WHITEBOARD_CLEARED_MESSAGE.equals(messageName)) {
- System.out.println("4"+payload.toString());
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.WHITEBOARD_ID)
- && payload.has(Constants.REQUESTER_ID)) {
- String meetingId = payload.get(Constants.MEETING_ID).getAsString();
- String whiteboardId = payload.get(Constants.WHITEBOARD_ID).getAsString();
- String requesterId = payload.get(Constants.REQUESTER_ID).getAsString();
-
- System.out.println("ClearWhiteboardReplyMessage fromJson");
- return new ClearWhiteboardReplyMessage(meetingId, requesterId, whiteboardId);
- }
- }
- }
- }
- return null;
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/ClearWhiteboardRequestMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/ClearWhiteboardRequestMessage.java
deleted file mode 100755
index 508c56b96a3ff894e960403cea13dc7fd4467ee8..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/ClearWhiteboardRequestMessage.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class ClearWhiteboardRequestMessage implements ISubscribedMessage {
- public static final String CLEAR_WHITEBOARD_REQUEST = "clear_whiteboard_request";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String whiteboardId;
- public final String requesterId;
-
-
- public ClearWhiteboardRequestMessage(String meetingId, String requesterId, String whiteboardId) {
- this.meetingId = meetingId;
- this.whiteboardId = whiteboardId;
- this.requesterId = requesterId;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.WHITEBOARD_ID, whiteboardId);
- payload.put(Constants.REQUESTER_ID, requesterId);
-
- System.out.println("ClearWhiteboardRequestMessage toJson");
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(CLEAR_WHITEBOARD_REQUEST, VERSION, null);
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static ClearWhiteboardRequestMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (CLEAR_WHITEBOARD_REQUEST.equals(messageName)) {
- System.out.println("4"+payload.toString());
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.WHITEBOARD_ID)
- && payload.has(Constants.REQUESTER_ID)) {
- String meetingId = payload.get(Constants.MEETING_ID).getAsString();
- String whiteboardId = payload.get(Constants.WHITEBOARD_ID).getAsString();
- String requesterId = payload.get(Constants.REQUESTER_ID).getAsString();
-
- System.out.println("ClearWhiteboardRequestMessage fromJson");
- return new ClearWhiteboardRequestMessage(meetingId, requesterId, whiteboardId);
- }
- }
- }
- }
- return null;
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/Constants.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/Constants.java
deleted file mode 100755
index 381453eb9d56739e58603da90ff65efa04b28709..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/Constants.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-public class Constants {
- public static final String NAME = "name";
- public static final String HEADER = "header";
- public static final String PAYLOAD = "payload";
- public static final String MEETING_ID = "meeting_id";
- public static final String EXTERNAL_MEETING_ID = "external_meeting_id";
- public static final String TIMESTAMP = "timestamp";
- public static final String USER_ID = "userid";
- public static final String RECORDED = "recorded";
- public static final String MEETING_NAME = "meeting_name";
- public static final String MEETING_MUTED = "meetingMuted";
- public static final String VOICE_CONF = "voice_conf";
- public static final String DURATION = "duration";
- public static final String AUTH_TOKEN = "auth_token";
- public static final String ROLE = "role";
- public static final String EXT_USER_ID = "external_user_id";
- public static final String EXTERN_USERID = "extern_userid";
- public static final String REQUESTER_ID = "requester_id";
- public static final String REPLY_TO = "reply_to";
- public static final String LOWERED_BY = "lowered_by";
- public static final String STREAM = "stream";
- public static final String LOCKED = "locked";
- public static final String SETTINGS = "settings";
- public static final String LOCK = "lock";
- public static final String EXCEPT_USERS = "except_users";
- public static final String STATUS = "status";
- public static final String VALUE = "value";
- public static final String NEW_PRESENTER_ID = "new_presenter_id";
- public static final String NEW_PRESENTER_NAME = "new_presenter_name";
- public static final String ASSIGNED_BY = "assigned_by";
- public static final String RECORDING = "recording";
- public static final String AUTO_START_RECORDING = "auto_start_recording";
- public static final String ALLOW_START_STOP_RECORDING = "allow_start_stop_recording";
- public static final String LAYOUT_ID = "layout_id";
- public static final String LISTENONLY = "listenOnly";
- public static final String LISTEN_ONLY = "listen_only";
- public static final String POLL = "poll";
- public static final String POLL_ID = "poll_id";
- public static final String FORCE = "force";
- public static final String RESPONSE = "response";
- public static final String PRESENTATION_ID = "presentation_id";
- public static final String X_OFFSET = "x_offset";
- public static final String Y_OFFSET = "y_offset";
- public static final String WIDTH_RATIO = "width_ratio";
- public static final String HEIGHT_RATIO = "height_ratio";
- public static final String PAGE = "page";
- public static final String SHARE = "share";
- public static final String PRESENTATIONS = "presentations";
- public static final String MESSAGE_KEY = "message_key";
- public static final String CODE = "code";
- public static final String PRESENTATION_NAME = "presentation_name";
- public static final String NUM_PAGES = "num_pages";
- public static final String MAX_NUM_PAGES = "max_num_pages";
- public static final String PAGES_COMPLETED = "pages_completed";
- public static final String MUTE = "mute";
- public static final String CALLER_ID_NUM = "caller_id_num";
- public static final String CALLER_ID_NAME = "caller_id_name";
- public static final String CALLERNUM = "callernum";
- public static final String CALLERNAME = "callername";
- public static final String TALKING = "talking";
- public static final String USER = "user";
- public static final String MUTED = "muted";
- public static final String VOICE_USER = "voice_user";
- public static final String VOICEUSER = "voiceUser";
- public static final String RECORDING_FILE = "recording_file";
- public static final String ANNOTATION = "annotation";
- public static final String WHITEBOARD_ID = "whiteboard_id";
- public static final String ENABLE = "enable";
- public static final String PRESENTER = "presenter";
- public static final String USERS = "users";
- public static final String RAISE_HAND = "raise_hand";
- public static final String HAS_STREAM = "has_stream";
- public static final String WEBCAM_STREAM = "webcam_stream";
- public static final String PHONE_USER = "phone_user";
- public static final String PERMISSIONS = "permissions";
- public static final String VALID = "valid";
- public static final String CHAT_HISTORY = "chat_history";
- public static final String MESSAGE = "message";
- public static final String SET_BY_USER_ID = "set_by_user_id";
- public static final String POLLS = "polls";
- public static final String REASON = "reason";
- public static final String RESPONDER = "responder";
- public static final String PRESENTATION_INFO = "presentation_info";
- public static final String SHAPES = "shapes";
- public static final String SHAPE = "shape";
- public static final String SHAPE_ID = "shape_id";
- public static final String PRESENTATION = "presentation";
- public static final String ID = "id";
- public static final String CURRENT = "current";
- public static final String PAGES = "pages";
- public static final String WEB_USER_ID = "web_user_id";
- public static final String WEB_USERID = "web_userid";
- public static final String JOINED = "joined";
- public static final String X_PERCENT = "x_percent";
- public static final String Y_PERCENT = "y_percent";
- public static final String KEEP_ALIVE_ID = "keep_alive_id";
- public static final String INTERNAL_USER_ID = "internal_user_id";
- public static final String MODERATOR_PASS = "moderator_pass";
- public static final String VIEWER_PASS = "viewer_pass";
- public static final String CREATE_TIME = "create_time";
- public static final String CREATE_DATE = "create_date";
- public static final String PRESENTATION_BASE_URL = "presentation_base_url";
- public static final String DISABLE_CAMERA = "disable_camera";
- public static final String LOCK_ON_JOIN_CONFIGURABLE = "lock_on_join_configurable";
- public static final String DISABLE_MICROPHONE = "disable_microphone";
- public static final String DISABLE_PRIVATE_CHAT = "disable_private_chat";
- public static final String DISABLE_PUBLIC_CHAT = "disable_public_chat";
- public static final String LOCK_ON_JOIN = "lock_on_join";
- public static final String LOCKED_LAYOUT = "locked_layout";
- public static final String CHAT_TYPE = "chat_type";
- public static final String TO_USERNAME = "to_username";
- public static final String FROM_USERNAME = "from_username";
- public static final String FROM_USERID = "from_userid";
- public static final String FROM_TZ_OFFSET = "from_tz_offset";
- public static final String FROM_COLOR = "from_color";
- public static final String TO_USERID = "to_userid";
- public static final String FROM_TIME = "from_time";
- public static final String PERM_DISABLE_CAM = "disableCam";
- public static final String PERM_DISABLE_MIC = "disableMic";
- public static final String PERM_DISABLE_PRIVCHAT = "disablePrivChat";
- public static final String PERM_DISABLE_PUBCHAT = "disablePubChat";
- public static final String PERM_LOCKED_LAYOUT = "lockedLayout";
- public static final String PERM_LOCK_ON_JOIN = "lockOnJoin";
- public static final String PERM_LOCK_ON_JOIN_CONFIG = "lockOnJoinConfigurable";
- public static final String ENABLED = "enabled";
-}
-
-
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/CreateMeetingMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/CreateMeetingMessage.java
deleted file mode 100755
index 461c0d283f53a09ee8293729e963397e8e3ffb37..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/CreateMeetingMessage.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-public class CreateMeetingMessage implements IPublishedMessage {
- public static final String CREATE_MEETING_REQUEST_EVENT = "create_meeting_request";
- public static final String VERSION = "0.0.1";
-
- public final String id;
- public final String externalId;
- public final String name;
- public final Boolean record;
- public final String voiceBridge;
- public final Long duration;
- public final Boolean autoStartRecording;
- public final Boolean allowStartStopRecording;
- public final String moderatorPass;
- public final String viewerPass;
- public final Long createTime;
- public final String createDate;
-
- public CreateMeetingMessage(String id, String externalId, String name, Boolean record, String voiceBridge,
- Long duration, Boolean autoStartRecording,
- Boolean allowStartStopRecording, String moderatorPass,
- String viewerPass, Long createTime, String createDate) {
- this.id = id;
- this.externalId = externalId;
- this.name = name;
- this.record = record;
- this.voiceBridge = voiceBridge;
- this.duration = duration;
- this.autoStartRecording = autoStartRecording;
- this.allowStartStopRecording = allowStartStopRecording;
- this.moderatorPass = moderatorPass;
- this.viewerPass = viewerPass;
- this.createTime = createTime;
- this.createDate = createDate;
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/DestroyMeetingMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/DestroyMeetingMessage.java
deleted file mode 100755
index 4e040e4f4b85f92a0e62144247a8e7d30d3c9b31..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/DestroyMeetingMessage.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-public class DestroyMeetingMessage implements IPublishedMessage {
- public static final String DESTROY_MEETING_REQUEST_EVENT = "destroy_meeting_request_event";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
-
- public DestroyMeetingMessage(String meetingId) {
- this.meetingId = meetingId;
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/DisconnectAllUsersMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/DisconnectAllUsersMessage.java
deleted file mode 100755
index c997063445e7adefa9ae517c0332d65a70a34df8..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/DisconnectAllUsersMessage.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class DisconnectAllUsersMessage implements IPublishedMessage {
- public static final String DISCONNECT_All_USERS = "disconnect_all_users_message";
- public final String VERSION = "0.0.1";
-
- public final String meetingId;
-
- public DisconnectAllUsersMessage(String meetingID) {
- this.meetingId = meetingID;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(DISCONNECT_All_USERS, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
- public static DisconnectAllUsersMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (DISCONNECT_All_USERS.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)) {
- String meetingId = payload.get(Constants.MEETING_ID).getAsString();
-
- return new DisconnectAllUsersMessage(meetingId);
- }
- }
- }
- }
- System.out.println("Failed to parse DisconnectAllUsersMessage");
- return null;
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/DisconnectUserMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/DisconnectUserMessage.java
deleted file mode 100755
index 23b0f1109aaa0ea6cc56a6dcfb52f8aa5492152d..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/DisconnectUserMessage.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class DisconnectUserMessage implements IPublishedMessage {
- public static final String DISCONNECT_USER = "disconnect_user_message";
- public final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String userId;
-
- public DisconnectUserMessage(String meetingID, String userId) {
- this.meetingId = meetingID;
- this.userId = userId;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(DISCONNECT_USER, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
- public static DisconnectUserMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (DISCONNECT_USER.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USER_ID)) {
- String meetingId = payload.get(Constants.MEETING_ID).getAsString();
- String userId = payload.get(Constants.USER_ID).getAsString();
-
- return new DisconnectUserMessage(meetingId, userId);
- }
- }
- }
- }
- System.out.println("Failed to parse DisconnectUserMessage");
- return null;
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/EjectUserFromMeetingRequestMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/EjectUserFromMeetingRequestMessage.java
deleted file mode 100755
index 3476aec1383c8e4b3985e5156c4a779c3e28f2f4..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/EjectUserFromMeetingRequestMessage.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-
-public class EjectUserFromMeetingRequestMessage implements ISubscribedMessage {
- public static final String EJECT_USER_FROM_MEETING_REQUEST = "eject_user_from_meeting_request_message";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String userId;
- public final String ejectedBy;
-
- private static final String EJECTED_BY = "ejected_by";
-
- public EjectUserFromMeetingRequestMessage(String meetingId, String userId, String ejectedBy) {
- this.meetingId = meetingId;
- this.userId = userId;
- this.ejectedBy = ejectedBy;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.USER_ID, userId);
- payload.put(EJECTED_BY, ejectedBy);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(EJECT_USER_FROM_MEETING_REQUEST, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static EjectUserFromMeetingRequestMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (EJECT_USER_FROM_MEETING_REQUEST.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USER_ID)
- && payload.has(EJECTED_BY)) {
- String id = payload.get(Constants.MEETING_ID).getAsString();
- String userid = payload.get(Constants.USER_ID).getAsString();
- String ejectedBy = payload.get(EJECTED_BY).getAsString();
- return new EjectUserFromMeetingRequestMessage(id, userid, ejectedBy);
- }
- }
- }
- }
- return null;
-
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/EjectUserFromVoiceRequestMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/EjectUserFromVoiceRequestMessage.java
deleted file mode 100755
index e3715ad2cde8df773c1924f8a4ce4a77b078a4bd..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/EjectUserFromVoiceRequestMessage.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-
-public class EjectUserFromVoiceRequestMessage implements ISubscribedMessage {
- public static final String EJECT_USER_FROM_VOICE_REQUEST = "eject_user_from_voice_request_message";
- public static final String VERSION = "0.0.1";
-
- public static final String MEETING_ID = "meeting_id";
- public static final String REQUESTER_ID = "requester_id";
- public static final String USER_ID = "user_id";
-
- public final String meetingId;
- public final String requesterId;
- public final String userId;
-
- public EjectUserFromVoiceRequestMessage(String meetingId, String requesterId, String userId) {
- this.meetingId = meetingId;
- this.requesterId = requesterId;
- this.userId = userId;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(MEETING_ID, meetingId);
- payload.put(REQUESTER_ID, requesterId);
- payload.put(USER_ID, userId);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(EJECT_USER_FROM_VOICE_REQUEST, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static EjectUserFromVoiceRequestMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (EJECT_USER_FROM_VOICE_REQUEST.equals(messageName)) {
- if (payload.has(MEETING_ID)
- && payload.has(REQUESTER_ID)
- && payload.has(USER_ID)) {
- String id = payload.get(MEETING_ID).getAsString();
- String requesterId = payload.get(REQUESTER_ID).getAsString();
- String userId = payload.get(USER_ID).getAsString();
- return new EjectUserFromVoiceRequestMessage(id, requesterId, userId);
- }
- }
- }
- }
- return null;
-
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/EnableWhiteboardRequestMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/EnableWhiteboardRequestMessage.java
deleted file mode 100755
index 03780c212fdebd8bb35f7a359b2de7243b36e655..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/EnableWhiteboardRequestMessage.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class EnableWhiteboardRequestMessage implements ISubscribedMessage {
- public static final String ENABLE_WHITEBOARD_REQUEST = "enable_whiteboard_request";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String requesterId;
- public final boolean enable;
-
-
- public EnableWhiteboardRequestMessage(String meetingId,
- String requesterId, boolean enable) {
- this.meetingId = meetingId;
- this.requesterId = requesterId;
- this.enable = enable;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.REQUESTER_ID, requesterId);
- payload.put(Constants.ENABLE, enable);
-
- System.out.println("EnableWhiteboardRequestMessage toJson");
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(ENABLE_WHITEBOARD_REQUEST, VERSION, null);
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static EnableWhiteboardRequestMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (ENABLE_WHITEBOARD_REQUEST.equals(messageName)) {
- System.out.println("4"+payload.toString());
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.ENABLE)
- && payload.has(Constants.REQUESTER_ID)) {
- String meetingId = payload.get(Constants.MEETING_ID).getAsString();
- String requesterId = payload.get(Constants.REQUESTER_ID).getAsString();
- boolean enable = payload.get(Constants.ENABLE).getAsBoolean();
-
- System.out.println("EnableWhiteboardRequestMessage fromJson");
- return new EnableWhiteboardRequestMessage(meetingId, requesterId, enable);
- }
- }
- }
- }
- return null;
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/EndMeetingMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/EndMeetingMessage.java
deleted file mode 100755
index f2aa8d2df994d598410c46f3f10c7c32770a2b7b..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/EndMeetingMessage.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-public class EndMeetingMessage implements IPublishedMessage {
- public static final String END_MEETING_REQUEST_EVENT = "end_meeting_request_event";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
-
- public EndMeetingMessage(String meetingId) {
- this.meetingId = meetingId;
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/GetAllMeetingsRequest.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/GetAllMeetingsRequest.java
deleted file mode 100755
index f4d321f3579930e37d90550e44a0c4b5228debf9..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/GetAllMeetingsRequest.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-public class GetAllMeetingsRequest implements IPublishedMessage {
- public static final String GET_ALL_MEETINGS_REQUEST_EVENT = "get_all_meetings_request";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
-
- public GetAllMeetingsRequest(String meetingId) {
- this.meetingId = meetingId;
- }
-}
\ No newline at end of file
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/GetChatHistory.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/GetChatHistory.java
deleted file mode 100755
index ff252757fbf71c609fba6e64782f04bdc4787d83..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/GetChatHistory.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class GetChatHistory implements IPublishedMessage {
- public static final String GET_CHAT_HISTORY_REQUEST = "get_chat_history_request";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String replyTo;
- public final String requesterId;
-
-
- public GetChatHistory(String meetingId, String requesterId, String replyTo) {
- this.meetingId = meetingId;
- this.replyTo = replyTo;
- this.requesterId = requesterId;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.REPLY_TO, replyTo);
- payload.put(Constants.REQUESTER_ID, requesterId);
-
- System.out.println("GetChatHistory toJson");
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(GET_CHAT_HISTORY_REQUEST, VERSION, null);
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static GetChatHistory fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (GET_CHAT_HISTORY_REQUEST.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.REPLY_TO)
- && payload.has(Constants.REQUESTER_ID)) {
- String meetingId = payload.get(Constants.MEETING_ID).getAsString();
- String replyTo = payload.get(Constants.REPLY_TO).getAsString();
- String requesterId = payload.get(Constants.REQUESTER_ID).getAsString();
- System.out.println("GetChatHistory fromJson");
- return new GetChatHistory(meetingId, replyTo, requesterId);
- }
- }
- }
- }
- return null;
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/GetChatHistoryReplyMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/GetChatHistoryReplyMessage.java
deleted file mode 100755
index be53843ae108a41750a84c39216fb781a4c134af..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/GetChatHistoryReplyMessage.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class GetChatHistoryReplyMessage implements ISubscribedMessage {
- public static final String GET_CHAT_HISTORY_REPLY = "get_chat_history_reply";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String requesterId;
- public final ArrayList<Map<String, Object>> chatHistory;
-
-
- public GetChatHistoryReplyMessage(String meetingId, String requesterId, ArrayList<Map<String, Object>> chatHistory) {
- this.meetingId = meetingId;
- this.chatHistory = chatHistory;
- this.requesterId = requesterId;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.CHAT_HISTORY, chatHistory);
- payload.put(Constants.REQUESTER_ID, requesterId);
-
- System.out.println("GetChatHistoryReplyMessage toJson");
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(GET_CHAT_HISTORY_REPLY, VERSION, null);
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static GetChatHistoryReplyMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (GET_CHAT_HISTORY_REPLY.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.CHAT_HISTORY)
- && payload.has(Constants.REQUESTER_ID)) {
- String meetingId = payload.get(Constants.MEETING_ID).getAsString();
- String requesterId = payload.get(Constants.REQUESTER_ID).getAsString();
-
- JsonArray history = (JsonArray) payload.get(Constants.CHAT_HISTORY);
-
- Util util = new Util();
-
- ArrayList<Map<String, Object>> chatHistory = util.extractChatHistory(history);
- System.out.println("GetChatHistoryReplyMessage fromJson");
- return new GetChatHistoryReplyMessage(meetingId, requesterId, chatHistory);
- }
- }
- }
- }
- return null;
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/GetChatHistoryRequestMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/GetChatHistoryRequestMessage.java
deleted file mode 100755
index b48162f145f1963c477aed8f3693d105b62ed102..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/GetChatHistoryRequestMessage.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-public class GetChatHistoryRequestMessage implements IPublishedMessage {
- public static final String GET_CHAT_HISTORY_REQUEST = "get_chat_history_request";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String replyTo;
- public final String requesterId;
-
-
- public GetChatHistoryRequestMessage(String meetingId, String requesterId, String replyTo) {
- this.meetingId = meetingId;
- this.replyTo = replyTo;
- this.requesterId = requesterId;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.REPLY_TO, replyTo);
- payload.put(Constants.REQUESTER_ID, requesterId);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(GET_CHAT_HISTORY_REQUEST, VERSION, null);
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static GetChatHistoryRequestMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (GET_CHAT_HISTORY_REQUEST.equals(messageName)) {
- System.out.println("4"+payload.toString());
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.REPLY_TO)
- && payload.has(Constants.REQUESTER_ID)) {
- String meetingId = payload.get(Constants.MEETING_ID).getAsString();
- String replyTo = payload.get(Constants.REPLY_TO).getAsString();
- String requesterId = payload.get(Constants.REQUESTER_ID).getAsString();
-
- System.out.println("GetChatHistory fromJson");
- return new GetChatHistoryRequestMessage(meetingId, replyTo, requesterId);
- }
- }
- }
- }
- return null;
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/GetCurrentLayoutReplyMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/GetCurrentLayoutReplyMessage.java
deleted file mode 100755
index d14fe7cc197d8cb7463716affe0a8fb9c20171a2..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/GetCurrentLayoutReplyMessage.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-
-public class GetCurrentLayoutReplyMessage implements ISubscribedMessage {
- public static final String GET_CURRENT_LAYOUT_REPLY = "get_current_layout_reply_message";
- public static final String VERSION = "0.0.1";
-
- public static final String SET_BY_USERID = "set_by_userid";
- public static final String REQUESTED_BY_USERID = "requested_by_userid";
- public static final String LAYOUT = "layout";
- public static final String LOCKED = "locked";
-
- public final String meetingId;
- public final String requestedByUserid;
- public final String setByUserid;
- public final String layout;
- public final Boolean locked;
-
- public GetCurrentLayoutReplyMessage(String meetingId, String requestedByUserid, String setByUserid, String layout, Boolean locked) {
- this.meetingId = meetingId;
- this.requestedByUserid = requestedByUserid;
- this.setByUserid = setByUserid;
- this.layout = layout;
- this.locked = locked;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(REQUESTED_BY_USERID, requestedByUserid);
- payload.put(SET_BY_USERID, setByUserid);
- payload.put(LAYOUT, layout);
- payload.put(LOCKED, locked);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(GET_CURRENT_LAYOUT_REPLY, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static GetCurrentLayoutReplyMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (GET_CURRENT_LAYOUT_REPLY.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(REQUESTED_BY_USERID)
- && payload.has(SET_BY_USERID)
- && payload.has(LOCKED)
- && payload.has(LAYOUT)) {
- String id = payload.get(Constants.MEETING_ID).getAsString();
- String requestedByUserid = payload.get(REQUESTED_BY_USERID).getAsString();
- String setByUserid = payload.get(SET_BY_USERID).getAsString();
- String layout = payload.get(LAYOUT).getAsString();
- Boolean locked = payload.get(LOCKED).getAsBoolean();
- return new GetCurrentLayoutReplyMessage(id, requestedByUserid, setByUserid, layout, locked);
- }
- }
- }
- }
- return null;
-
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/GetCurrentLayoutRequestMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/GetCurrentLayoutRequestMessage.java
deleted file mode 100755
index c63028ea21884cc2f82de27f92885559798cea00..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/GetCurrentLayoutRequestMessage.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-
-public class GetCurrentLayoutRequestMessage implements ISubscribedMessage {
- public static final String GET_CURRENT_LAYOUT_REQUEST = "get_current_layout_request_message";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String userId;
-
-
- public GetCurrentLayoutRequestMessage(String meetingId, String userId) {
- this.meetingId = meetingId;
- this.userId = userId;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.USER_ID, userId);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(GET_CURRENT_LAYOUT_REQUEST, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static GetCurrentLayoutRequestMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (GET_CURRENT_LAYOUT_REQUEST.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USER_ID)) {
- String id = payload.get(Constants.MEETING_ID).getAsString();
- String userid = payload.get(Constants.USER_ID).getAsString();
- return new GetCurrentLayoutRequestMessage(id, userid);
- }
- }
- }
- }
- return null;
-
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/GetLockSettingsMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/GetLockSettingsMessage.java
deleted file mode 100755
index 0c59fbe6b3ac121904f8d7c424c4ec95b29a1ae1..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/GetLockSettingsMessage.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class GetLockSettingsMessage implements IPublishedMessage {
- public static final String GET_LOCK_SETTINGS = "get_lock_settings";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String userId;
-
-
- public GetLockSettingsMessage(String meetingId, String userId) {
- this.meetingId = meetingId;
- this.userId = userId;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.USER_ID, userId);
-
- System.out.println("GetLockSettings toJson");
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(GET_LOCK_SETTINGS, VERSION, null);
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static GetLockSettingsMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (GET_LOCK_SETTINGS.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USER_ID)) {
- String meetingId = payload.get(Constants.MEETING_ID).getAsString();
- String userId = payload.get(Constants.USER_ID).getAsString();
- System.out.println("GetLockSettings fromJson");
- return new GetLockSettingsMessage(meetingId, userId);
- }
- }
- }
- }
- return null;
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/GetPresentationInfoMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/GetPresentationInfoMessage.java
deleted file mode 100755
index 57aea21d01be58425acdecec8d3a09f48859da83..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/GetPresentationInfoMessage.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class GetPresentationInfoMessage implements IPublishedMessage {
- public static final String GET_PRESENTATION_INFO = "get_presentation_info";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String requesterId;
- public final String replyTo;
-
- public GetPresentationInfoMessage(String meetingId, String requesterId, String replyTo) {
- this.meetingId = meetingId;
- this.requesterId = requesterId;
- this.replyTo = replyTo;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.REQUESTER_ID, requesterId);
- payload.put(Constants.REPLY_TO, replyTo);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(GET_PRESENTATION_INFO, VERSION, null);
- System.out.println("GetPresentationInfo toJson");
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static GetPresentationInfoMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (GET_PRESENTATION_INFO.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.REQUESTER_ID)
- && payload.has(Constants.REPLY_TO)) {
- String meetingId = payload.get(Constants.MEETING_ID).getAsString();
- String requesterId = payload.get(Constants.REQUESTER_ID).getAsString();
- String replyTo = payload.get(Constants.REPLY_TO).getAsString();
- System.out.println("GetPresentationInfo fromJson");
- return new GetPresentationInfoMessage(meetingId, requesterId, replyTo);
- }
- }
- }
- }
- return null;
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/GetPresentationInfoReplyMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/GetPresentationInfoReplyMessage.java
deleted file mode 100755
index a420f5aaf1b2903d72cfe621f5da498938c90d61..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/GetPresentationInfoReplyMessage.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class GetPresentationInfoReplyMessage implements IPublishedMessage {
- public static final String GET_PRESENTATION_INFO_REPLY = "get_presentation_info_reply";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String requesterId;
- public final Map<String, Object> presenter;
- public final ArrayList<Map<String, Object>> presentations;
-
- public GetPresentationInfoReplyMessage(String meetingId, String requesterId,
- Map<String, Object> presenter, ArrayList<Map<String, Object>> presentations) {
- this.meetingId = meetingId;
- this.requesterId = requesterId;
- this.presenter = presenter;
- this.presentations = presentations;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.REQUESTER_ID, requesterId);
- payload.put(Constants.PRESENTER, presenter);
- payload.put(Constants.PRESENTATIONS, presentations);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(GET_PRESENTATION_INFO_REPLY, VERSION, null);
- System.out.println("GetPresentationInfo toJson");
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static GetPresentationInfoReplyMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (GET_PRESENTATION_INFO_REPLY.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.REQUESTER_ID)
- && payload.has(Constants.PRESENTER)
- && payload.has(Constants.PRESENTATIONS)) {
- String meetingId = payload.get(Constants.MEETING_ID).getAsString();
- String requesterId = payload.get(Constants.REQUESTER_ID).getAsString();
- JsonObject presenterJsonObject = payload.get(Constants.PRESENTER).getAsJsonObject();
-
- Util util = new Util();
- Map<String, Object> presenter = util.extractCurrentPresenter(presenterJsonObject);
-
- JsonArray presentationsJsonArray = payload.get(Constants.PRESENTATIONS).getAsJsonArray();
- ArrayList<Map<String, Object>> presentations = util.extractPresentations(presentationsJsonArray);
-
- return new GetPresentationInfoReplyMessage(meetingId, requesterId, presenter, presentations);
- }
- }
- }
- }
- return null;
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/GetRecordingStatusReplyMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/GetRecordingStatusReplyMessage.java
deleted file mode 100755
index 319143f28d90ff814f39b499eb1e667c89b5ec03..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/GetRecordingStatusReplyMessage.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-
-public class GetRecordingStatusReplyMessage implements ISubscribedMessage {
- public static final String Get_RECORDING_STATUS_REPLY = "get_recording_status_reply";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String userId;
- public final Boolean recording;
-
- public GetRecordingStatusReplyMessage(String meetingId, String userId, Boolean recording) {
- this.meetingId = meetingId;
- this.userId = userId;
- this.recording = recording;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.USER_ID, userId);
- payload.put(Constants.RECORDING, recording);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(Get_RECORDING_STATUS_REPLY, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static GetRecordingStatusReplyMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (Get_RECORDING_STATUS_REPLY.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USER_ID)
- && payload.has(Constants.RECORDING)) {
- String id = payload.get(Constants.MEETING_ID).getAsString();
- String userid = payload.get(Constants.USER_ID).getAsString();
- Boolean recording = payload.get(Constants.RECORDING).getAsBoolean();
- return new GetRecordingStatusReplyMessage(id, userid, recording);
- }
- }
- }
- }
- return null;
-
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/GetRecordingStatusRequestMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/GetRecordingStatusRequestMessage.java
deleted file mode 100755
index ead0ae5b00c392d0f4f73b35e70c180367d8e05d..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/GetRecordingStatusRequestMessage.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-
-public class GetRecordingStatusRequestMessage implements ISubscribedMessage {
- public static final String GET_RECORDING_STATUS_REQUEST = "get_recording_status_request_message";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String userId;
-
- public GetRecordingStatusRequestMessage(String meetingId, String userId) {
- this.meetingId = meetingId;
- this.userId = userId;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.USER_ID, userId);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(GET_RECORDING_STATUS_REQUEST, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static GetRecordingStatusRequestMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (GET_RECORDING_STATUS_REQUEST.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USER_ID)) {
- String id = payload.get(Constants.MEETING_ID).getAsString();
- String userid = payload.get(Constants.USER_ID).getAsString();
- return new GetRecordingStatusRequestMessage(id, userid);
- }
- }
- }
- }
- return null;
-
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/GetSlideInfoMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/GetSlideInfoMessage.java
deleted file mode 100755
index 53b3a0756c863d93186f60dd7f48c10549387073..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/GetSlideInfoMessage.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class GetSlideInfoMessage implements IPublishedMessage {
- public static final String GET_SLIDE_INFO = "get_slide_info";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String requesterId;
- public final String replyTo;
-
- public GetSlideInfoMessage(String meetingId, String requesterId, String replyTo){
- this.meetingId = meetingId;
- this.requesterId = requesterId;
- this.replyTo = replyTo;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.REQUESTER_ID, requesterId);
- payload.put(Constants.REPLY_TO, replyTo);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(GET_SLIDE_INFO, VERSION, null);
- System.out.println("GetSlideInfo toJson");
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static GetSlideInfoMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (GET_SLIDE_INFO.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.REQUESTER_ID)
- && payload.has(Constants.REPLY_TO)) {
- String meetingId = payload.get(Constants.MEETING_ID).getAsString();
- String requesterId = payload.get(Constants.REQUESTER_ID).getAsString();
- String replyTo = payload.get(Constants.REPLY_TO).getAsString();
-
- System.out.println("GetSlideInfo fromJson");
- return new GetSlideInfoMessage(meetingId, requesterId, replyTo);
- }
- }
- }
- }
- return null;
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/GetUsersReplyMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/GetUsersReplyMessage.java
deleted file mode 100755
index 23e5601f88789641afb8e92666786400dadd2dcd..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/GetUsersReplyMessage.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class GetUsersReplyMessage implements ISubscribedMessage {
- public static final String GET_USERS_REPLY = "get_users_reply";
- public final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String requesterId;
- public final ArrayList<Map<String, Object>> users;
-
- public GetUsersReplyMessage(String meetingID, String requesterId, ArrayList<Map<String, Object>> users) {
- this.meetingId = meetingID;
- this.requesterId = requesterId;
- this.users = users;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
-
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(GET_USERS_REPLY, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
- public static GetUsersReplyMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (GET_USERS_REPLY.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.REQUESTER_ID)
- && payload.has(Constants.USERS)) {
- String meetingID = payload.get(Constants.MEETING_ID).getAsString();
- String requesterId = payload.get(Constants.REQUESTER_ID).getAsString();
-
- JsonArray users = (JsonArray) payload.get(Constants.USERS);
-
- Util util = new Util();
- ArrayList<Map<String, Object>> usersList = util.extractUsers(users);
-
- if (usersList != null) {
- return new GetUsersReplyMessage(meetingID, requesterId, usersList);
- }
- }
- }
- }
- }
- System.out.println("Failed to parse GetUsersReplyMessage");
- return null;
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/GetUsersRequestMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/GetUsersRequestMessage.java
deleted file mode 100755
index cdffd7635c1f8e615d0d70cebf206ca022b9f9a5..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/GetUsersRequestMessage.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class GetUsersRequestMessage implements IPublishedMessage {
- public static final String GET_USERS_REQUEST = "get_users_request_message";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String requesterId;
-
-
- public GetUsersRequestMessage(String meetingId, String requesterId) {
- this.meetingId = meetingId;
- this.requesterId = requesterId;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.REQUESTER_ID, requesterId);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(GET_USERS_REQUEST, VERSION, null);
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static GetUsersRequestMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (GET_USERS_REQUEST.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.REQUESTER_ID)) {
- String meetingId = payload.get(Constants.MEETING_ID).getAsString();
- String requesterId = payload.get(Constants.REQUESTER_ID).getAsString();
- System.out.println("GetChatHistory fromJson");
- return new GetUsersRequestMessage(meetingId, requesterId);
- }
- }
- }
- }
- return null;
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/GetWhiteboardShapesReplyMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/GetWhiteboardShapesReplyMessage.java
deleted file mode 100755
index 87cc49efe714caf88eccb36c9e173a6688e71cb3..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/GetWhiteboardShapesReplyMessage.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class GetWhiteboardShapesReplyMessage implements ISubscribedMessage {
- public static final String GET_WHITEBOARD_SHAPES_REPLY = "get_whiteboard_shapes_reply";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String requesterId;
- public final String whiteboardId;
- public final ArrayList<Map<String, Object>> shapes;
-
-
- public GetWhiteboardShapesReplyMessage(String meetingId, String requesterId,
- String whiteboardId, ArrayList<Map<String, Object>> shapes) {
- this.meetingId = meetingId;
- this.whiteboardId = whiteboardId;
- this.requesterId = requesterId;
- this.shapes = shapes;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.SHAPES, shapes);
- payload.put(Constants.WHITEBOARD_ID, whiteboardId);
- payload.put(Constants.REQUESTER_ID, requesterId);
-
- System.out.println("GetWhiteboardShapesReplyMessage toJson");
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(GET_WHITEBOARD_SHAPES_REPLY, VERSION, null);
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static GetWhiteboardShapesReplyMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (GET_WHITEBOARD_SHAPES_REPLY.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.WHITEBOARD_ID)
- && payload.has(Constants.SHAPES)
- && payload.has(Constants.REQUESTER_ID)) {
- String meetingId = payload.get(Constants.MEETING_ID).getAsString();
- String requesterId = payload.get(Constants.REQUESTER_ID).getAsString();
- String whiteboardId = payload.get(Constants.WHITEBOARD_ID).getAsString();
-
- JsonArray shapes = (JsonArray) payload.get(Constants.SHAPES);
-
- Util util = new Util();
-
- ArrayList<Map<String, Object>> shapesList = util.extractShapes(shapes);
- System.out.println("GetWhiteboardShapesReplyMessage fromJson" + shapesList.toString());
- return new GetWhiteboardShapesReplyMessage(meetingId, requesterId,
- whiteboardId, shapesList);
- }
- }
- }
- }
- return null;
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/GoToSlideMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/GoToSlideMessage.java
deleted file mode 100755
index 16925c3a67f2e0ba1c498fa1e778aa9d9e46c5ca..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/GoToSlideMessage.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class GoToSlideMessage implements IPublishedMessage {
- public static final String GO_TO_SLIDE = "go_to_slide";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String page;
-
- public GoToSlideMessage(String meetingId, String page){
- this.meetingId = meetingId;
- this.page = page;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.PAGE, page);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(GO_TO_SLIDE, VERSION, null);
- System.out.println("GoToSlide toJson");
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static GoToSlideMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (GO_TO_SLIDE.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.PAGE)) {
- String meetingId = payload.get(Constants.MEETING_ID).getAsString();
- String page = payload.get(Constants.PAGE).getAsString();
-
- System.out.println("GoToSlide fromJson");
- return new GoToSlideMessage(meetingId, page);
- }
- }
- }
- }
- return null;
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/IPublishedMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/IPublishedMessage.java
deleted file mode 100755
index 649f3958767fa9bfd01edaf594b3b77645d9ddbd..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/IPublishedMessage.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-public interface IPublishedMessage {
-
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/ISubscribedMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/ISubscribedMessage.java
deleted file mode 100755
index 2a40912aee44fe223b24721d1f6d0b6ac3d2d23f..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/ISubscribedMessage.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-public interface ISubscribedMessage {
-
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/InitAudioSettingsMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/InitAudioSettingsMessage.java
deleted file mode 100755
index d87523b9e49d4307715ac8e321935820cf41acf1..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/InitAudioSettingsMessage.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class InitAudioSettingsMessage implements ISubscribedMessage {
- public static final String INIT_AUDIO_SETTING = "init_audio_settings_message";
- public final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String userId;
- public final Boolean muted;
-
- public InitAudioSettingsMessage(String meetingID, String userId, Boolean muted) {
- this.meetingId = meetingID;
- this.userId = userId;
- this.muted = muted;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
-
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(INIT_AUDIO_SETTING, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
- public static InitAudioSettingsMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (INIT_AUDIO_SETTING.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USER_ID)
- && payload.has(Constants.MUTED)) {
- String meetingID = payload.get(Constants.MEETING_ID).getAsString();
- String userId = payload.get(Constants.USER_ID).getAsString();
- Boolean muted = payload.get(Constants.MUTED).getAsBoolean();
-
- return new InitAudioSettingsMessage(meetingID, userId, muted);
- }
- }
- }
- }
- System.out.println("Failed to parse NewPermissionsSettingMessage");
- return null;
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/InitPermissionsSettingMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/InitPermissionsSettingMessage.java
deleted file mode 100755
index 7a1364006ea1ddf36a92319c4d40ded59cbd9ace..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/InitPermissionsSettingMessage.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class InitPermissionsSettingMessage implements ISubscribedMessage {
- public static final String INIT_PERMISSIONS_SETTING = "init_permission_settings_message";
- public final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final Map<String, Boolean> permissions;
-
- public InitPermissionsSettingMessage(String meetingID, Map<String, Boolean> permissions) {
- this.meetingId = meetingID;
- this.permissions = permissions;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
-
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(INIT_PERMISSIONS_SETTING, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
- public static InitPermissionsSettingMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (INIT_PERMISSIONS_SETTING.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USERS)
- && payload.has(Constants.PERMISSIONS)) {
- String meetingID = payload.get(Constants.MEETING_ID).getAsString();
-
- JsonObject permissions = (JsonObject) payload.get(Constants.PERMISSIONS);
-
- Util util = new Util();
- Map<String, Boolean> permissionsMap = util.extractPermission(permissions);
-
- if (permissionsMap != null) {
- return new InitPermissionsSettingMessage(meetingID, permissionsMap);
- }
- }
- }
- }
- }
- System.out.println("Failed to parse NewPermissionsSettingMessage");
- return null;
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/IsMeetingMutedReplyMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/IsMeetingMutedReplyMessage.java
deleted file mode 100755
index 51188c6dc5513e0da8d8e03d436555a12c1ee6c0..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/IsMeetingMutedReplyMessage.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-
-public class IsMeetingMutedReplyMessage implements ISubscribedMessage {
- public static final String IS_MEETING_MUTED_REPLY = "is_meeting_muted_reply_message";
- public static final String VERSION = "0.0.1";
-
- public static final String MEETING_ID = "meeting_id";
- public static final String REQUESTER_ID = "requester_id";
- public static final String MUTED = "muted";
-
- public final String meetingId;
- public final String requesterId;
- public final Boolean muted;
-
- public IsMeetingMutedReplyMessage(String meetingId, String requesterId, Boolean muted) {
- this.meetingId = meetingId;
- this.requesterId = requesterId;
- this.muted = muted;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(MEETING_ID, meetingId);
- payload.put(REQUESTER_ID, requesterId);
- payload.put(MUTED, muted);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(IS_MEETING_MUTED_REPLY, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static IsMeetingMutedReplyMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (IS_MEETING_MUTED_REPLY.equals(messageName)) {
- if (payload.has(MEETING_ID)
- && payload.has(REQUESTER_ID)
- && payload.has(MUTED)) {
- String id = payload.get(MEETING_ID).getAsString();
- String requesterId = payload.get(REQUESTER_ID).getAsString();
- Boolean muted = payload.get(MUTED).getAsBoolean();
- return new IsMeetingMutedReplyMessage(id, requesterId, muted);
- }
- }
- }
- }
- return null;
-
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/IsMeetingMutedRequestMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/IsMeetingMutedRequestMessage.java
deleted file mode 100755
index dcb391b8040914c923bc808f450733b877150fb3..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/IsMeetingMutedRequestMessage.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-
-public class IsMeetingMutedRequestMessage implements ISubscribedMessage {
- public static final String IS_MEETING_MUTED_REQUEST = "is_meeting_muted_request_message";
- public static final String VERSION = "0.0.1";
-
- public static final String MEETING_ID = "meeting_id";
- public static final String REQUESTER_ID = "requester_id";
-
- public final String meetingId;
- public final String requesterId;
-
- public IsMeetingMutedRequestMessage(String meetingId, String requesterId) {
- this.meetingId = meetingId;
- this.requesterId = requesterId;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(MEETING_ID, meetingId);
- payload.put(REQUESTER_ID, requesterId);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(IS_MEETING_MUTED_REQUEST, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static IsMeetingMutedRequestMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (IS_MEETING_MUTED_REQUEST.equals(messageName)) {
- if (payload.has(MEETING_ID)
- && payload.has(REQUESTER_ID)) {
- String id = payload.get(MEETING_ID).getAsString();
- String requesterId = payload.get(REQUESTER_ID).getAsString();
- return new IsMeetingMutedRequestMessage(id, requesterId);
- }
- }
- }
- }
- return null;
-
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/IsWhiteboardEnabledReplyMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/IsWhiteboardEnabledReplyMessage.java
deleted file mode 100755
index a597086b0f601aa66f4c231661222831fabce81e..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/IsWhiteboardEnabledReplyMessage.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class IsWhiteboardEnabledReplyMessage implements ISubscribedMessage {
-
- public static final String IS_WHITEBOARD_ENABLED_REPLY = "whiteboard_enabled_message";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String requesterId;
- public final boolean enabled;
-
-
- public IsWhiteboardEnabledReplyMessage(String meetingId, String requesterId, boolean enabled) {
- this.meetingId = meetingId;
- this.requesterId = requesterId;
- this.enabled = enabled;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.REQUESTER_ID, requesterId);
- payload.put(Constants.ENABLED, enabled);
-
- System.out.println("IsWhiteboardEnabledReplyMessage toJson");
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(IS_WHITEBOARD_ENABLED_REPLY, VERSION, null);
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static IsWhiteboardEnabledReplyMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (IS_WHITEBOARD_ENABLED_REPLY.equals(messageName)) {
- System.out.println("4"+payload.toString());
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.REQUESTER_ID)
- && payload.has(Constants.ENABLED)) {
- String meetingId = payload.get(Constants.MEETING_ID).getAsString();
- String requesterId = payload.get(Constants.REQUESTER_ID).getAsString();
- boolean enabled = payload.get(Constants.ENABLED).getAsBoolean();
-
- System.out.println("IsWhiteboardEnabledReplyMessage fromJson");
- return new IsWhiteboardEnabledReplyMessage(meetingId, requesterId, enabled);
- }
- }
- }
- }
- return null;
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/IsWhiteboardEnabledRequestMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/IsWhiteboardEnabledRequestMessage.java
deleted file mode 100755
index f5319bb489c05642a1427e0c3b36eedc87642d2f..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/IsWhiteboardEnabledRequestMessage.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class IsWhiteboardEnabledRequestMessage implements ISubscribedMessage {
- public static final String IS_WHITEBOARD_ENABLED_REQUEST = "is_whiteboard_enabled";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String requesterId;
- public final String replyTo;
-
-
- public IsWhiteboardEnabledRequestMessage(String meetingId,
- String requesterId, String replyTo) {
- this.meetingId = meetingId;
- this.requesterId = requesterId;
- this.replyTo = replyTo;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.REQUESTER_ID, requesterId);
- payload.put(Constants.REPLY_TO, replyTo);
-
- System.out.println("IsWhiteboardEnabledRequestMessage toJson");
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(IS_WHITEBOARD_ENABLED_REQUEST, VERSION, null);
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static IsWhiteboardEnabledRequestMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (IS_WHITEBOARD_ENABLED_REQUEST.equals(messageName)) {
- System.out.println("4"+payload.toString());
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.REPLY_TO)
- && payload.has(Constants.REQUESTER_ID)) {
- String meetingId = payload.get(Constants.MEETING_ID).getAsString();
- String requesterId = payload.get(Constants.REQUESTER_ID).getAsString();
- String replyTo = payload.get(Constants.REPLY_TO).getAsString();
-
- System.out.println("IsWhiteboardEnabledRequestMessage fromJson");
- return new IsWhiteboardEnabledRequestMessage(meetingId, requesterId, replyTo);
- }
- }
- }
- }
- return null;
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/KeepAliveMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/KeepAliveMessage.java
deleted file mode 100755
index 059211e811c4f430d66d5d49bf90c8f0e64d2a5b..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/KeepAliveMessage.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-public class KeepAliveMessage implements IPublishedMessage {
- public static final String KEEP_ALIVE_REQUEST = "keep_alive_request";
- public static final String VERSION = "0.0.1";
-
- public final String keepAliveId;
-
- public KeepAliveMessage(String keepAliveId) {
- this.keepAliveId = keepAliveId;
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/LockLayoutMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/LockLayoutMessage.java
deleted file mode 100755
index 1ceb05bf93c37f1c2d2ef4b2289a6a2ae18ddd1a..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/LockLayoutMessage.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-
-public class LockLayoutMessage implements ISubscribedMessage {
- public static final String LOCK_LAYOUT = "lock_layout_message";
- public static final String VERSION = "0.0.1";
-
- public static final String SET_BY_USERID = "set_by_userid";
- public static final String LOCKED = "locked";
- public static final String USERS = "users";
-
- public final String meetingId;
- public final String setByUserid;
- public final Boolean locked;
- public final ArrayList<String> users;
-
- public LockLayoutMessage(String meetingId, String setByUserid, Boolean locked, ArrayList<String> users) {
- this.meetingId = meetingId;
- this.setByUserid = setByUserid;
- this.locked = locked;
- this.users = users;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(SET_BY_USERID, setByUserid);
- payload.put(LOCKED, locked);
- payload.put(USERS, users);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(LOCK_LAYOUT, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static LockLayoutMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (LOCK_LAYOUT.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(LOCKED)
- && payload.has(SET_BY_USERID)
- && payload.has(USERS)) {
- String id = payload.get(Constants.MEETING_ID).getAsString();
- String setByUserid = payload.get(SET_BY_USERID).getAsString();
- Boolean locked = payload.get(LOCKED).getAsBoolean();
- JsonArray usersArr = (JsonArray) payload.get(USERS);
-
- Util util = new Util();
-
- ArrayList<String> users = util.extractUserids(usersArr);
- return new LockLayoutMessage(id, setByUserid, locked, users);
- }
- }
- }
- }
- return null;
-
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/LockLayoutRequestMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/LockLayoutRequestMessage.java
deleted file mode 100755
index ab2dff2fb2b8200a31afc7e4d57ed89e617ae989..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/LockLayoutRequestMessage.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-
-public class LockLayoutRequestMessage implements ISubscribedMessage {
- public static final String LOCK_LAYOUT_REQUEST = "lock_layout_request_message";
- public static final String VERSION = "0.0.1";
-
- public final static String LAYOUT = "layout";
- public final static String LOCK = "lock";
- public final static String VIEWERS_ONLY = "viewers_only";
-
- public final String meetingId;
- public final String userId;
- public final Boolean lock;
- public final Boolean viewersOnly;
-
-
- public final String layout;
-
- public LockLayoutRequestMessage(String meetingId, String userId, Boolean lock, Boolean viewersOnly, String layout) {
- this.meetingId = meetingId;
- this.userId = userId;
- this.lock = lock;
- this.viewersOnly = viewersOnly;
- this.layout = layout;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.USER_ID, userId);
- payload.put(LOCK, lock);
- payload.put(VIEWERS_ONLY, viewersOnly);
- payload.put(LAYOUT, layout);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(LOCK_LAYOUT_REQUEST, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static LockLayoutRequestMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (LOCK_LAYOUT_REQUEST.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USER_ID)
- && payload.has(LOCK)
- && payload.has(VIEWERS_ONLY)
- && payload.has(LAYOUT)) {
- String id = payload.get(Constants.MEETING_ID).getAsString();
- String userid = payload.get(Constants.USER_ID).getAsString();
- Boolean lock = payload.get(LOCK).getAsBoolean();
- Boolean viewersOnly = payload.get(VIEWERS_ONLY).getAsBoolean();
- String layout = payload.get(LAYOUT).getAsString();
- return new LockLayoutRequestMessage(id, userid, lock, viewersOnly, layout);
- }
- }
- }
- }
- return null;
-
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/LockMuteUserRequestMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/LockMuteUserRequestMessage.java
deleted file mode 100755
index 7276ead27f29827d8cf5da7c1886b34ed2dc0727..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/LockMuteUserRequestMessage.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-
-public class LockMuteUserRequestMessage implements ISubscribedMessage {
- public static final String LOCK_MUTE_USER_REQUEST = "lock_mute_user_request_message";
- public static final String VERSION = "0.0.1";
-
- public static final String MEETING_ID = "meeting_id";
- public static final String REQUESTER_ID = "requester_id";
- public static final String USER_ID = "user_id";
- public static final String LOCK = "lock";
-
- public final String meetingId;
- public final String requesterId;
- public final String userId;
- public final Boolean lock;
-
- public LockMuteUserRequestMessage(String meetingId, String requesterId, String userId, Boolean lock) {
- this.meetingId = meetingId;
- this.requesterId = requesterId;
- this.userId = userId;
- this.lock = lock;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(MEETING_ID, meetingId);
- payload.put(REQUESTER_ID, requesterId);
- payload.put(USER_ID, userId);
- payload.put(LOCK, lock);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(LOCK_MUTE_USER_REQUEST, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static LockMuteUserRequestMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (LOCK_MUTE_USER_REQUEST.equals(messageName)) {
- if (payload.has(MEETING_ID)
- && payload.has(REQUESTER_ID)
- && payload.has(USER_ID)
- && payload.has(LOCK)) {
- String id = payload.get(MEETING_ID).getAsString();
- String requesterId = payload.get(REQUESTER_ID).getAsString();
- String userId = payload.get(USER_ID).getAsString();
- Boolean lock = payload.get(LOCK).getAsBoolean();
- return new LockMuteUserRequestMessage(id, requesterId, userId, lock);
- }
- }
- }
- }
- return null;
-
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/LockUserMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/LockUserMessage.java
deleted file mode 100755
index eb212fc31a6011a15ca72a29d685efb236a01be9..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/LockUserMessage.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class LockUserMessage implements IPublishedMessage {
- public static final String LOCK_USER = "lock_user";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String requesterId;
- public final boolean lock;
- public final String internalUserId;
-
-
- public LockUserMessage(String meetingId, String requesterId, boolean lock, String internalUserId) {
- this.meetingId = meetingId;
- this.requesterId = requesterId;
- this.lock = lock;
- this.internalUserId = internalUserId;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.REQUESTER_ID, requesterId);
- payload.put(Constants.LOCK, lock);
- payload.put(Constants.INTERNAL_USER_ID, internalUserId);
-
- System.out.println("LockUser toJson");
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(LOCK_USER, VERSION, null);
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static LockUserMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (LOCK_USER.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.REQUESTER_ID)
- && payload.has(Constants.LOCK)
- && payload.has(Constants.INTERNAL_USER_ID)) {
- String meetingId = payload.get(Constants.MEETING_ID).getAsString();
- String requesterId = payload.get(Constants.REQUESTER_ID).getAsString();
- boolean lock = payload.get(Constants.LOCK).getAsBoolean();
- String internalUserId = payload.get(Constants.INTERNAL_USER_ID).getAsString();
-
- System.out.println("LockUser fromJson");
- return new LockUserMessage(meetingId, requesterId, lock, internalUserId);
- }
- }
- }
- }
- return null;
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/MeetingEndedMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/MeetingEndedMessage.java
deleted file mode 100755
index aa75aedac731c154085231b69a48afec4bde5609..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/MeetingEndedMessage.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class MeetingEndedMessage implements ISubscribedMessage {
- public static final String MEETING_ENDED = "meeting_ended_message";
- public final String VERSION = "0.0.1";
-
- public final String meetingId;
-
- public MeetingEndedMessage(String meetingID) {
- this.meetingId = meetingID;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(MEETING_ENDED, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
- public static MeetingEndedMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (MEETING_ENDED.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)) {
- String meetingId = payload.get(Constants.MEETING_ID).getAsString();
-
- return new MeetingEndedMessage(meetingId);
- }
- }
- }
- }
- System.out.println("Failed to parse MeetingEndedMessage");
- return null;
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/MeetingHasEndedMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/MeetingHasEndedMessage.java
deleted file mode 100755
index 01adde025762f26f1ef8f7622228d06057868779..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/MeetingHasEndedMessage.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class MeetingHasEndedMessage implements ISubscribedMessage {
- public static final String MEETING_HAS_ENDED = "meeting_has_ended_message";
- public final String VERSION = "0.0.1";
-
- public final String meetingId;
-
- public MeetingHasEndedMessage(String meetingID) {
- this.meetingId = meetingID;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(MEETING_HAS_ENDED, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
- public static MeetingHasEndedMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (MEETING_HAS_ENDED.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)) {
- String meetingId = payload.get(Constants.MEETING_ID).getAsString();
-
- return new MeetingHasEndedMessage(meetingId);
- }
- }
- }
- }
- System.out.println("Failed to parse MeetingHasEndedMessage");
- return null;
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/MeetingMutedMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/MeetingMutedMessage.java
deleted file mode 100755
index a895d770a2dbb6f35554e98ebe92572ebf07ee44..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/MeetingMutedMessage.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class MeetingMutedMessage implements ISubscribedMessage {
- public static final String MEETING_MUTED = "meeting_muted_message";
- public final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final Boolean muted;
-
- public MeetingMutedMessage(String meetingID, Boolean muted) {
- this.meetingId = meetingID;
- this.muted = muted;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
-
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(MEETING_MUTED, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static MeetingMutedMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (MEETING_MUTED.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.MEETING_MUTED)) {
- String meetingID = payload.get(Constants.MEETING_ID).getAsString();
- Boolean muted = payload.get(Constants.MEETING_MUTED).getAsBoolean();
-
- return new MeetingMutedMessage(meetingID, muted);
- }
- }
- }
- }
- System.out.println("Failed to parse MeetingMutedMessage");
- return null;
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/MeetingStateMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/MeetingStateMessage.java
deleted file mode 100755
index 6903b531eb2b12fd7190c17b75ba3de179a83dcb..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/MeetingStateMessage.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class MeetingStateMessage implements ISubscribedMessage {
- public static final String MEETING_STATE = "meeting_state_message";
- public final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String userId;
- public final Map<String, Boolean> permissions;
- public final Boolean muted;
-
- public MeetingStateMessage(String meetingID, String userId, Map<String, Boolean> permissions, Boolean muted) {
- this.meetingId = meetingID;
- this.userId = userId;
- this.permissions = permissions;
- this.muted = muted;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
-
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(MEETING_STATE, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
- public static MeetingStateMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (MEETING_STATE.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USER_ID)
- && payload.has(Constants.PERMISSIONS)
- && payload.has(Constants.MEETING_MUTED)) {
- String meetingID = payload.get(Constants.MEETING_ID).getAsString();
- String userId = payload.get(Constants.USER_ID).getAsString();
- Boolean muted = payload.get(Constants.MEETING_MUTED).getAsBoolean();
- JsonObject premissions = (JsonObject) payload.get(Constants.PERMISSIONS);
-
- Util util = new Util();
- Map<String, Boolean> premissionsMap = util.extractPermission(premissions);
-
- if (premissionsMap != null) {
- return new MeetingStateMessage(meetingID, userId, premissionsMap, muted);
- }
- }
- }
- }
- }
- System.out.println("Failed to parse UserJoinedMessage");
- return null;
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/MessageBuilder.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/MessageBuilder.java
deleted file mode 100755
index b9cf94ac416dbd71ecb017e2ecb84248d6484678..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/MessageBuilder.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.concurrent.TimeUnit;
-
-import com.google.gson.Gson;
-
-public class MessageBuilder {
- public final static String VERSION = "version";
-
- public static long generateTimestamp() {
- return TimeUnit.NANOSECONDS.toMillis(System.nanoTime());
- }
-
- public static java.util.HashMap<String, Object> buildHeader(String name, String version, String replyTo) {
- java.util.HashMap<String, Object> header = new java.util.HashMap<String, Object>();
- header.put(Constants.NAME, name);
- header.put(VERSION, version);
- header.put(Constants.TIMESTAMP, generateTimestamp());
- if (replyTo != null && replyTo != "")
- header.put(Constants.REPLY_TO, replyTo);
-
- return header;
- }
-
-
- public static String buildJson(java.util.HashMap<String, Object> header,
- java.util.HashMap<String, Object> payload) {
-
- java.util.HashMap<String, java.util.HashMap<String, Object>> message = new java.util.HashMap<String, java.util.HashMap<String, Object>>();
- message.put(Constants.HEADER, header);
- message.put(Constants.PAYLOAD, payload);
-
- Gson gson = new Gson();
- return gson.toJson(message);
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/MessageFromJsonConverter.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/MessageFromJsonConverter.java
deleted file mode 100755
index e2a905c27b2a2eaa9060d9c671ca7a3ef9c2e862..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/MessageFromJsonConverter.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class MessageFromJsonConverter {
-
- public static IPublishedMessage convert(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- switch (messageName) {
- case CreateMeetingMessage.CREATE_MEETING_REQUEST_EVENT:
- return processCreateMeeting(payload);
- case DestroyMeetingMessage.DESTROY_MEETING_REQUEST_EVENT:
- return processDestroyMeeting(payload);
- case EndMeetingMessage.END_MEETING_REQUEST_EVENT:
- return processEndMeetingMessage(payload);
- case KeepAliveMessage.KEEP_ALIVE_REQUEST:
- return processKeepAlive(payload);
- case RegisterUserMessage.REGISTER_USER:
- System.out.println("Registering a user");
- return RegisterUserMessage.fromJson(message);
- case ValidateAuthTokenMessage.VALIDATE_AUTH_TOKEN:
- System.out.println("Process ValidateAuthTokenMessage.VALIDATE_AUTH_TOKEN");
- return processValidateAuthTokenMessage(header, payload);
- // return ValidateAuthTokenMessage.fromJson(message);
- case UserConnectedToGlobalAudio.USER_CONNECTED_TO_GLOBAL_AUDIO:
- return UserConnectedToGlobalAudio.fromJson(message);
- case UserDisconnectedFromGlobalAudio.USER_DISCONNECTED_FROM_GLOBAL_AUDIO:
- return UserDisconnectedFromGlobalAudio.fromJson(message);
- case GetAllMeetingsRequest.GET_ALL_MEETINGS_REQUEST_EVENT:
- return new GetAllMeetingsRequest("the_string_is_not_used_anywhere");
- }
- }
- }
- return null;
- }
-
- private static IPublishedMessage processValidateAuthTokenMessage(JsonObject header, JsonObject payload) {
- String id = payload.get(Constants.MEETING_ID).getAsString();
- String userid = payload.get(Constants.USER_ID).getAsString();
- String authToken = payload.get(Constants.AUTH_TOKEN).getAsString();
- String replyTo = header.get(Constants.REPLY_TO).getAsString();
- String sessionId = "tobeimplemented";
- return new ValidateAuthTokenMessage(id, userid, authToken, replyTo,
- sessionId);
- }
-
- private static IPublishedMessage processCreateMeeting(JsonObject payload) {
- String id = payload.get(Constants.MEETING_ID).getAsString();
- String externalId = payload.get(Constants.EXTERNAL_MEETING_ID).getAsString();
- String name = payload.get(Constants.NAME).getAsString();
- Boolean record = payload.get(Constants.RECORDED).getAsBoolean();
- String voiceBridge = payload.get(Constants.VOICE_CONF).getAsString();
- Long duration = payload.get(Constants.DURATION).getAsLong();
- Boolean autoStartRecording = payload.get(Constants.AUTO_START_RECORDING).getAsBoolean();
- Boolean allowStartStopRecording = payload.get(Constants.ALLOW_START_STOP_RECORDING).getAsBoolean();
- String moderatorPassword = payload.get(Constants.MODERATOR_PASS).getAsString();
- String viewerPassword = payload.get(Constants.VIEWER_PASS).getAsString();
- Long createTime = payload.get(Constants.CREATE_TIME).getAsLong();
- String createDate = payload.get(Constants.CREATE_DATE).getAsString();
-
- return new CreateMeetingMessage(id, externalId, name, record, voiceBridge,
- duration, autoStartRecording, allowStartStopRecording,
- moderatorPassword, viewerPassword, createTime, createDate);
- }
-
- private static IPublishedMessage processDestroyMeeting(JsonObject payload) {
- String id = payload.get(Constants.MEETING_ID).getAsString();
- return new DestroyMeetingMessage(id);
- }
-
- private static IPublishedMessage processEndMeetingMessage(JsonObject payload) {
- String id = payload.get(Constants.MEETING_ID).getAsString();
- return new EndMeetingMessage(id);
- }
-
- private static IPublishedMessage processKeepAlive(JsonObject payload) {
- String id = payload.get(Constants.KEEP_ALIVE_ID).getAsString();
- return new KeepAliveMessage(id);
- }
-
- //private static IMessage processGetAllMeetings(JsonObject)
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/MessagingService.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/MessagingService.java
deleted file mode 100755
index 03bb500abd4e4b38360d8c98ca0f0423d67f2d39..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/MessagingService.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
-* BigBlueButton open source conferencing system - http://www.bigbluebutton.org/
-*
-* Copyright (c) 2012 BigBlueButton Inc. and by respective authors (see below).
-*
-* This program is free software; you can redistribute it and/or modify it under the
-* terms of the GNU Lesser General Public License as published by the Free Software
-* Foundation; either version 3.0 of the License, or (at your option) any later
-* version.
-*
-* BigBlueButton is distributed in the hope that it will be useful, but WITHOUT ANY
-* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public License along
-* with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
-*
-*/
-package org.bigbluebutton.common.messages;
-
-import redis.clients.jedis.Jedis;
-
-public interface MessagingService {
- public void send(String channel, String message);
- public Jedis createRedisClient();
- public void dropRedisClient(Jedis jedis);
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/MuteAllExceptPresenterRequestMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/MuteAllExceptPresenterRequestMessage.java
deleted file mode 100755
index 7fed738b3358cf8f653f343cabe242745ce75822..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/MuteAllExceptPresenterRequestMessage.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-
-public class MuteAllExceptPresenterRequestMessage implements ISubscribedMessage {
- public static final String MUTE_ALL_EXCEPT_PRESENTER_REQUEST = "mute_all_except_presenter_request_message";
- public static final String VERSION = "0.0.1";
-
- public static final String MEETING_ID = "meeting_id";
- public static final String REQUESTER_ID = "requester_id";
- public static final String MUTE = "mute";
-
- public final String meetingId;
- public final String requesterId;
- public final Boolean mute;
-
- public MuteAllExceptPresenterRequestMessage(String meetingId, String requesterId, Boolean mute) {
- this.meetingId = meetingId;
- this.requesterId = requesterId;
- this.mute = mute;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(MEETING_ID, meetingId);
- payload.put(REQUESTER_ID, requesterId);
- payload.put(MUTE, mute);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(MUTE_ALL_EXCEPT_PRESENTER_REQUEST, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static MuteAllExceptPresenterRequestMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (MUTE_ALL_EXCEPT_PRESENTER_REQUEST.equals(messageName)) {
- if (payload.has(MEETING_ID)
- && payload.has(REQUESTER_ID)
- && payload.has(MUTE)) {
- String id = payload.get(MEETING_ID).getAsString();
- String requesterId = payload.get(REQUESTER_ID).getAsString();
- Boolean mute = payload.get(MUTE).getAsBoolean();
- return new MuteAllExceptPresenterRequestMessage(id, requesterId, mute);
- }
- }
- }
- }
- return null;
-
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/MuteAllRequestMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/MuteAllRequestMessage.java
deleted file mode 100755
index 4e0c4b9b0ca7dead1a2665cb92c71385ff25fc89..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/MuteAllRequestMessage.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-
-public class MuteAllRequestMessage implements ISubscribedMessage {
- public static final String MUTE_ALL_REQUEST = "mute_all_request_message";
- public static final String VERSION = "0.0.1";
-
- public static final String MEETING_ID = "meeting_id";
- public static final String REQUESTER_ID = "requester_id";
- public static final String MUTE = "mute";
-
- public final String meetingId;
- public final String requesterId;
- public final Boolean mute;
-
- public MuteAllRequestMessage(String meetingId, String requesterId, Boolean mute) {
- this.meetingId = meetingId;
- this.requesterId = requesterId;
- this.mute = mute;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(MEETING_ID, meetingId);
- payload.put(REQUESTER_ID, requesterId);
- payload.put(MUTE, mute);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(MUTE_ALL_REQUEST, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static MuteAllRequestMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (MUTE_ALL_REQUEST.equals(messageName)) {
- if (payload.has(MEETING_ID)
- && payload.has(REQUESTER_ID)
- && payload.has(MUTE)) {
- String id = payload.get(MEETING_ID).getAsString();
- String requesterId = payload.get(REQUESTER_ID).getAsString();
- Boolean mute = payload.get(MUTE).getAsBoolean();
- return new MuteAllRequestMessage(id, requesterId, mute);
- }
- }
- }
- }
- return null;
-
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/MuteUserRequestMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/MuteUserRequestMessage.java
deleted file mode 100755
index 776b3cc0c829a3334e94f56d3757bb122f23fed7..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/MuteUserRequestMessage.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-
-public class MuteUserRequestMessage implements ISubscribedMessage {
- public static final String MUTE_USER_REQUEST = "mute_user_request_message";
- public static final String VERSION = "0.0.1";
-
- public static final String MEETING_ID = "meeting_id";
- public static final String REQUESTER_ID = "requester_id";
- public static final String USER_ID = "user_id";
- public static final String MUTE = "mute";
-
- public final String meetingId;
- public final String requesterId;
- public final String userId;
- public final Boolean mute;
-
- public MuteUserRequestMessage(String meetingId, String requesterId, String userId, Boolean mute) {
- this.meetingId = meetingId;
- this.requesterId = requesterId;
- this.userId = userId;
- this.mute = mute;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(MEETING_ID, meetingId);
- payload.put(REQUESTER_ID, requesterId);
- payload.put(USER_ID, userId);
- payload.put(MUTE, mute);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(MUTE_USER_REQUEST, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static MuteUserRequestMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (MUTE_USER_REQUEST.equals(messageName)) {
- if (payload.has(MEETING_ID)
- && payload.has(REQUESTER_ID)
- && payload.has(USER_ID)
- && payload.has(MUTE)) {
- String id = payload.get(MEETING_ID).getAsString();
- String requesterId = payload.get(REQUESTER_ID).getAsString();
- String userId = payload.get(USER_ID).getAsString();
- Boolean mute = payload.get(MUTE).getAsBoolean();
- return new MuteUserRequestMessage(id, requesterId, userId, mute);
- }
- }
- }
- }
- return null;
-
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/MuteVoiceUserRequestMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/MuteVoiceUserRequestMessage.java
deleted file mode 100755
index 16a9574952d4b31e580e8951d98db9eebf34ca7b..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/MuteVoiceUserRequestMessage.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-
-public class MuteVoiceUserRequestMessage implements ISubscribedMessage {
- public static final String MUTE_USER_REQUEST = "mute_user_request_message";
- public static final String VERSION = "0.0.1";
-
- public static final String MEETING_ID = "meeting_id";
- public static final String REQUESTER_ID = "requester_id";
- public static final String USER_ID = "user_id";
- public static final String MUTE = "mute";
-
- public final String meetingId;
- public final String requesterId;
- public final String userId;
- public final Boolean mute;
-
- public MuteVoiceUserRequestMessage(String meetingId, String requesterId, String userId, Boolean mute) {
- this.meetingId = meetingId;
- this.requesterId = requesterId;
- this.userId = userId;
- this.mute = mute;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(MEETING_ID, meetingId);
- payload.put(REQUESTER_ID, requesterId);
- payload.put(USER_ID, userId);
- payload.put(MUTE, mute);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(MUTE_USER_REQUEST, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static MuteVoiceUserRequestMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (MUTE_USER_REQUEST.equals(messageName)) {
- if (payload.has(MEETING_ID)
- && payload.has(REQUESTER_ID)
- && payload.has(USER_ID)
- && payload.has(MUTE)) {
- String id = payload.get(MEETING_ID).getAsString();
- String requesterId = payload.get(REQUESTER_ID).getAsString();
- String userId = payload.get(USER_ID).getAsString();
- Boolean mute = payload.get(MUTE).getAsBoolean();
- return new MuteVoiceUserRequestMessage(id, requesterId, userId, mute);
- }
- }
- }
- }
- return null;
-
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/NewPermissionsSettingMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/NewPermissionsSettingMessage.java
deleted file mode 100755
index c773ae225f0bf280654267f8038a2fd96dda7da8..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/NewPermissionsSettingMessage.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class NewPermissionsSettingMessage implements ISubscribedMessage {
- public static final String NEW_PERMISSIONS_SETTING = "new_permission_settings";
- public final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final ArrayList<Map<String, Object>> users;
- public final Map<String, Boolean> permissions;
-
- public NewPermissionsSettingMessage(String meetingID, Map<String, Boolean> permissions, ArrayList<Map<String, Object>> users) {
- this.meetingId = meetingID;
- this.users = users;
- this.permissions = permissions;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
-
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(NEW_PERMISSIONS_SETTING, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
- public static NewPermissionsSettingMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (NEW_PERMISSIONS_SETTING.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USERS)
- && payload.has(Constants.PERMISSIONS)) {
- String meetingID = payload.get(Constants.MEETING_ID).getAsString();
-
- JsonObject permissions = (JsonObject) payload.get(Constants.PERMISSIONS);
-
- Util util = new Util();
- Map<String, Boolean> permissionsMap = util.extractPermission(permissions);
-
- JsonArray users = (JsonArray) payload.get(Constants.USERS);
-
- ArrayList<Map<String, Object>> usersList = util.extractUsers(users);
-
- if (usersList != null && permissionsMap != null) {
- return new NewPermissionsSettingMessage(meetingID, permissionsMap, usersList);
- }
- }
- }
- }
- }
- System.out.println("Failed to parse NewPermissionsSettingMessage");
- return null;
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/PresentationRemovedMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/PresentationRemovedMessage.java
deleted file mode 100755
index 411a653cf1a733a0698093f6b068f1b7548ac963..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/PresentationRemovedMessage.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class PresentationRemovedMessage implements ISubscribedMessage {
- public static final String PRESENTATION_REMOVED = "presentation_removed_message";
- public final String VERSION = "0.0.1";
-
- public static final String PRESENTATION_ID = "presentation_id";
- public static final String MEETING_ID = "meeting_id";
-
- public final String meetingId;
- public final String presentationId;
-
- public PresentationRemovedMessage(String meetingId, String presentationId) {
- this.meetingId = meetingId;
- this.presentationId = presentationId;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(MEETING_ID, meetingId);
- payload.put(PRESENTATION_ID, presentationId);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(PRESENTATION_REMOVED, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static PresentationRemovedMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (PRESENTATION_REMOVED.equals(messageName)) {
- if (payload.has(MEETING_ID)
- && payload.has(PRESENTATION_ID)) {
- String meetingId = payload.get(MEETING_ID).getAsString();
- String presentationId = payload.get(MEETING_ID).getAsString();
- return new PresentationRemovedMessage(meetingId, presentationId);
- }
- }
- }
- }
- System.out.println("Failed to parse PesentationRemovedMessage");
- return null;
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/PresenterAssignedMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/PresenterAssignedMessage.java
deleted file mode 100755
index 38a8f2dc72860c2858ff47d867e6ad064bf5f622..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/PresenterAssignedMessage.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class PresenterAssignedMessage implements ISubscribedMessage {
- public static final String PRESENTER_ASSIGNED = "presenter_assigned_message";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String newPresenterId;
- public final String newPresenterName;
- public final String assignedBy;
-
- public PresenterAssignedMessage(String meetingId, String newPresenterId, String newPresenterName,
- String assignedBy) {
- this.meetingId = meetingId;
- this.newPresenterId = newPresenterId;
- this.newPresenterName = newPresenterName;
- this.assignedBy = assignedBy;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.NEW_PRESENTER_ID, newPresenterId);
- payload.put(Constants.NEW_PRESENTER_NAME, newPresenterName);
- payload.put(Constants.ASSIGNED_BY, assignedBy);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(PRESENTER_ASSIGNED, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static PresenterAssignedMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (PRESENTER_ASSIGNED.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.NEW_PRESENTER_ID)
- && payload.has(Constants.NEW_PRESENTER_NAME)
- && payload.has(Constants.ASSIGNED_BY)) {
- String id = payload.get(Constants.MEETING_ID).getAsString();
- String presenterId = payload.get(Constants.NEW_PRESENTER_ID).getAsString();
- String presenterName = payload.get(Constants.NEW_PRESENTER_NAME).getAsString();
- String assignedBy = payload.get(Constants.ASSIGNED_BY).getAsString();
- return new PresenterAssignedMessage(id, presenterId, presenterName, assignedBy);
- }
- }
- }
- }
- return null;
-
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/RecordingStatusChangedMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/RecordingStatusChangedMessage.java
deleted file mode 100755
index a6f7b4a4432c9d7e9076fdcf0068926671f23225..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/RecordingStatusChangedMessage.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-
-public class RecordingStatusChangedMessage implements ISubscribedMessage {
- public static final String RECORDING_STATUS_CHANGED = "recording_status_changed_message";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String userId;
- public final Boolean recording;
-
- public RecordingStatusChangedMessage(String meetingId, String userId, Boolean recording) {
- this.meetingId = meetingId;
- this.userId = userId;
- this.recording = recording;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.USER_ID, userId);
- payload.put(Constants.RECORDING, recording);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(RECORDING_STATUS_CHANGED, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static RecordingStatusChangedMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (RECORDING_STATUS_CHANGED.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USER_ID)
- && payload.has(Constants.RECORDING)) {
- String id = payload.get(Constants.MEETING_ID).getAsString();
- String userid = payload.get(Constants.USER_ID).getAsString();
- Boolean recording = payload.get(Constants.RECORDING).getAsBoolean();
- return new RecordingStatusChangedMessage(id, userid, recording);
- }
- }
- }
- }
- return null;
-
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/RegisterUserMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/RegisterUserMessage.java
deleted file mode 100755
index 29a72e5e0bb00b5adb5f985be7bb281ba5e3b60a..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/RegisterUserMessage.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class RegisterUserMessage implements IPublishedMessage {
- public static final String REGISTER_USER = "register_user_request";
- public final String VERSION = "0.0.1";
-
- public final String meetingID;
- public final String internalUserId;
- public final String fullname;
- public final String role;
- public final String externUserID;
- public final String authToken;
-
- public RegisterUserMessage(String meetingID, String internalUserId, String fullname, String role, String externUserID, String authToken) {
- this.meetingID = meetingID;
- this.internalUserId = internalUserId;
- this.fullname = fullname;
- this.role = role;
- this.externUserID = externUserID;
- this.authToken = authToken;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
-
- payload.put(Constants.MEETING_ID, meetingID);
- payload.put(Constants.INTERNAL_USER_ID, internalUserId);
- payload.put(Constants.NAME, fullname);
- payload.put(Constants.ROLE, role);
- payload.put(Constants.EXT_USER_ID, externUserID);
- payload.put(Constants.AUTH_TOKEN, authToken);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(REGISTER_USER, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
- public static RegisterUserMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (REGISTER_USER.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.NAME)
- && payload.has(Constants.ROLE)
- && payload.has(Constants.EXT_USER_ID)
- && payload.has(Constants.AUTH_TOKEN)) {
-
- String meetingID = payload.get(Constants.MEETING_ID).getAsString();
- String fullname = payload.get(Constants.NAME).getAsString();
- String role = payload.get(Constants.ROLE).getAsString();
- String externUserID = payload.get(Constants.EXT_USER_ID).getAsString();
- String authToken = payload.get(Constants.AUTH_TOKEN).getAsString();
-
- //use externalUserId twice - once for external, once for internal
- return new RegisterUserMessage(meetingID, externUserID, fullname, role, externUserID, authToken);
- }
- }
- }
- }
- System.out.println("Failed to parse RegisterUserMessage");
- return null;
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/RemovePresentationMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/RemovePresentationMessage.java
deleted file mode 100755
index 4353a7eebc30e4d961351060257aba66460315bd..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/RemovePresentationMessage.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class RemovePresentationMessage implements IPublishedMessage {
- public static final String REMOVE_PRESENTATION = "remove_presentation";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String presentationId;
-
- public RemovePresentationMessage(String meetingId, String presentationId){
- this.meetingId = meetingId;
- this.presentationId = presentationId;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.PRESENTATION_ID, presentationId);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(REMOVE_PRESENTATION, VERSION, null);
- System.out.println("RemovePresentation toJson");
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static RemovePresentationMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (REMOVE_PRESENTATION.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.PRESENTATION_ID)) {
- String meetingId = payload.get(Constants.MEETING_ID).getAsString();
- String presentationId = payload.get(Constants.PRESENTATION_ID).getAsString();
-
- System.out.println("RemovePresentation fromJson");
- return new RemovePresentationMessage(meetingId, presentationId);
- }
- }
- }
- }
- return null;
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/RequestWhiteboardAnnotationHistoryRequestMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/RequestWhiteboardAnnotationHistoryRequestMessage.java
deleted file mode 100755
index 6668f0370a50b68cc9090837eb42f6d8a03ead89..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/RequestWhiteboardAnnotationHistoryRequestMessage.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class RequestWhiteboardAnnotationHistoryRequestMessage implements ISubscribedMessage {
- public static final String REQUEST_WHITEBOARD_ANNOTATION_HISTORY_REQUEST = "request_whiteboard_annotation_history_request";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String whiteboardId;
- public final String requesterId;
- public final String replyTo;
-
-
- public RequestWhiteboardAnnotationHistoryRequestMessage(String meetingId,
- String requesterId, String whiteboardId, String replyTo) {
- this.meetingId = meetingId;
- this.whiteboardId = whiteboardId;
- this.requesterId = requesterId;
- this.replyTo = replyTo;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.WHITEBOARD_ID, whiteboardId);
- payload.put(Constants.REQUESTER_ID, requesterId);
- payload.put(Constants.REPLY_TO, replyTo);
-
- System.out.println("RequestWhiteboardAnnotationHistoryRequestMessage toJson");
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(REQUEST_WHITEBOARD_ANNOTATION_HISTORY_REQUEST, VERSION, null);
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static RequestWhiteboardAnnotationHistoryRequestMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (REQUEST_WHITEBOARD_ANNOTATION_HISTORY_REQUEST.equals(messageName)) {
- System.out.println("4"+payload.toString());
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.WHITEBOARD_ID)
- && payload.has(Constants.REPLY_TO)
- && payload.has(Constants.REQUESTER_ID)) {
- String meetingId = payload.get(Constants.MEETING_ID).getAsString();
- String whiteboardId = payload.get(Constants.WHITEBOARD_ID).getAsString();
- String requesterId = payload.get(Constants.REQUESTER_ID).getAsString();
- String replyTo = payload.get(Constants.REPLY_TO).getAsString();
-
- System.out.println("RequestWhiteboardAnnotationHistoryRequestMessage fromJson");
- return new RequestWhiteboardAnnotationHistoryRequestMessage(meetingId, requesterId, whiteboardId, replyTo);
- }
- }
- }
- }
- return null;
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/ResizeAndMoveSlideMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/ResizeAndMoveSlideMessage.java
deleted file mode 100755
index ab7f5d745466f4d40fa140cf31a546d1c8d4c2d3..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/ResizeAndMoveSlideMessage.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class ResizeAndMoveSlideMessage implements IPublishedMessage {
- public static final String RESIZE_AND_MOVE_SLIDE = "resize_and_move_slide";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final double xOffset;
- public final double yOffset;
- public final double widthRatio;
- public final double heightRatio;
-
- public ResizeAndMoveSlideMessage(String meetingId, double xOffset, double yOffset,
- double widthRatio, double heightRatio) {
- this.meetingId = meetingId;
- this.xOffset = xOffset;
- this.yOffset = yOffset;
- this.heightRatio = heightRatio;
- this.widthRatio = widthRatio;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.X_OFFSET, xOffset);
- payload.put(Constants.Y_OFFSET, yOffset);
- payload.put(Constants.HEIGHT_RATIO, heightRatio);
- payload.put(Constants.WIDTH_RATIO, widthRatio);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(RESIZE_AND_MOVE_SLIDE, VERSION, null);
- System.out.println("ResizeAndMoveSlide toJson");
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static ResizeAndMoveSlideMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (RESIZE_AND_MOVE_SLIDE.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.X_OFFSET)
- && payload.has(Constants.Y_OFFSET)
- && payload.has(Constants.HEIGHT_RATIO)
- && payload.has(Constants.WIDTH_RATIO)) {
- String meetingId = payload.get(Constants.MEETING_ID).getAsString();
- double xOffset = payload.get(Constants.X_OFFSET).getAsDouble();
- double yOffset = payload.get(Constants.Y_OFFSET).getAsDouble();
- double heightRatio = payload.get(Constants.HEIGHT_RATIO).getAsDouble();
- double widthRatio = payload.get(Constants.WIDTH_RATIO).getAsDouble();
- System.out.println("ResizeAndMoveSlide fromJson");
- return new ResizeAndMoveSlideMessage(meetingId, xOffset, yOffset, widthRatio, heightRatio);
- }
- }
- }
- }
- return null;
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/SendConversionCompletedMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/SendConversionCompletedMessage.java
deleted file mode 100755
index 76fbbe3d31567265a98d250830e86d80b7d57b0b..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/SendConversionCompletedMessage.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class SendConversionCompletedMessage implements IPublishedMessage {
- public static final String SEND_CONVERSION_COMPLETED = "send_conversion_completed";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String messageKey;
- public final String code;
- public final String presId;
- public final int numPages;
- public final String presName;
- public final String presBaseUrl;
-
- public SendConversionCompletedMessage(String messageKey, String meetingId, String code,
- String presId, int numPages, String presName, String presBaseUrl) {
- this.meetingId = meetingId;
- this.messageKey = messageKey;
- this.code = code;
- this.presId = presId;
- this.numPages = numPages;
- this.presName = presName;
- this.presBaseUrl = presBaseUrl;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.MESSAGE_KEY, messageKey);
- payload.put(Constants.CODE, code);
- payload.put(Constants.PRESENTATION_ID, presId);
- payload.put(Constants.NUM_PAGES, numPages);
- payload.put(Constants.PRESENTATION_NAME, presName);
- payload.put(Constants.PRESENTATION_BASE_URL, presBaseUrl);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(SEND_CONVERSION_COMPLETED, VERSION, null);
- System.out.println("SendConversionCompleted toJson");
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static SendConversionCompletedMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (SEND_CONVERSION_COMPLETED.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.MESSAGE_KEY)
- && payload.has(Constants.CODE)
- && payload.has(Constants.PRESENTATION_ID)
- && payload.has(Constants.NUM_PAGES)
- && payload.has(Constants.PRESENTATION_NAME)
- && payload.has(Constants.PRESENTATION_BASE_URL)) {
- String meetingId = payload.get(Constants.MEETING_ID).getAsString();
- String messageKey = payload.get(Constants.MESSAGE_KEY).getAsString();
- String code = payload.get(Constants.CODE).getAsString();
- String presId = payload.get(Constants.PRESENTATION_ID).getAsString();
- int numPages = payload.get(Constants.NUM_PAGES).getAsInt();
- String presName = payload.get(Constants.PRESENTATION_NAME).getAsString();
- String presBaseUrl = payload.get(Constants.PRESENTATION_BASE_URL).getAsString();
-
- System.out.println("SendConversionCompleted fromJson");
- return new SendConversionCompletedMessage(messageKey, meetingId, code, presId, numPages, presName, presBaseUrl);
- }
- }
- }
- }
- return null;
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/SendConversionUpdateMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/SendConversionUpdateMessage.java
deleted file mode 100755
index b0e8f87e53ce43f8477293a6c382562558852cfc..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/SendConversionUpdateMessage.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class SendConversionUpdateMessage implements IPublishedMessage {
- public static final String SEND_CONVERSION_UPDATE = "send_conversion_update";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String messageKey;
- public final String code;
- public final String presId;
- public final String presName;
-
-
- public SendConversionUpdateMessage(String messageKey, String meetingId,
- String code, String presId, String presName) {
- this.meetingId = meetingId;
- this.messageKey = messageKey;
- this.code = code;
- this.presId = presId;
- this.presName = presName;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.MESSAGE_KEY, messageKey);
- payload.put(Constants.CODE, code);
- payload.put(Constants.PRESENTATION_ID, presId);
- payload.put(Constants.PRESENTATION_NAME, presName);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(SEND_CONVERSION_UPDATE, VERSION, null);
- System.out.println("SendConversionUpdate toJson");
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static SendConversionUpdateMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (SEND_CONVERSION_UPDATE.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.MESSAGE_KEY)
- && payload.has(Constants.CODE)
- && payload.has(Constants.PRESENTATION_NAME)
- && payload.has(Constants.PRESENTATION_ID)) {
- String meetingId = payload.get(Constants.MEETING_ID).getAsString();
- String code = payload.get(Constants.CODE).getAsString();
- String messageKey = payload.get(Constants.MESSAGE_KEY).getAsString();
- String presId = payload.get(Constants.PRESENTATION_ID).getAsString();
- String presName = payload.get(Constants.PRESENTATION_NAME).getAsString();
- System.out.println("SendConversionUpdate fromJson");
- return new SendConversionUpdateMessage(messageKey, meetingId, code, presId, presName);
- }
- }
- }
- }
- return null;
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/SendCursorUpdateMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/SendCursorUpdateMessage.java
deleted file mode 100755
index c81e8e3ec3a42f27a7e53a449812c94e73c5dcc8..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/SendCursorUpdateMessage.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class SendCursorUpdateMessage implements IPublishedMessage {
- public static final String SEND_CURSOR_UPDATE = "send_cursor_update";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final double xPercent;
- public final double yPercent;
-
- public SendCursorUpdateMessage(String meetingId, double xPercent, double yPercent){
- this.meetingId = meetingId;
- this.xPercent = xPercent;
- this.yPercent = yPercent;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.X_PERCENT, xPercent);
- payload.put(Constants.Y_PERCENT, yPercent);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(SEND_CURSOR_UPDATE, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static SendCursorUpdateMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (SEND_CURSOR_UPDATE.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.X_PERCENT)
- && payload.has(Constants.Y_PERCENT)) {
- String meetingId = payload.get(Constants.MEETING_ID).getAsString();
- double xPercent = payload.get(Constants.X_PERCENT).getAsDouble();
- double yPercent = payload.get(Constants.Y_PERCENT).getAsDouble();
-
- return new SendCursorUpdateMessage(meetingId, xPercent, yPercent);
- }
- }
- }
- }
- return null;
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/SendLockSettingsMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/SendLockSettingsMessage.java
deleted file mode 100755
index 78764b59d437c4ef2e2ee13f3343e1163e088127..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/SendLockSettingsMessage.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class SendLockSettingsMessage implements IPublishedMessage {
- public static final String SEND_LOCK_SETTINGS = "send_lock_settings";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String userId;
- public final Map<String, Boolean> newSettings;
-
-
- public SendLockSettingsMessage(String meetingId, String userId, Map<String, Boolean> newSettings) {
- this.meetingId = meetingId;
- this.userId = userId;
- this.newSettings = newSettings;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
-
- Map<String, Boolean> settingsMap = new HashMap<String, Boolean>();
-
- settingsMap.put(Constants.DISABLE_CAMERA, newSettings.get("disableCam"));
- settingsMap.put(Constants.DISABLE_MICROPHONE, newSettings.get("disableMic"));
- settingsMap.put(Constants.DISABLE_PRIVATE_CHAT, newSettings.get("disablePrivateChat"));
- settingsMap.put(Constants.DISABLE_PUBLIC_CHAT, newSettings.get("disablePublicChat"));
- settingsMap.put(Constants.LOCKED_LAYOUT, newSettings.get("lockedLayout"));
- settingsMap.put(Constants.LOCK_ON_JOIN, newSettings.get("lockOnJoin"));
- settingsMap.put(Constants.LOCK_ON_JOIN_CONFIGURABLE, newSettings.get("lockOnJoinConfigurable"));
-
-
-// System.out.println("\n\n" + newSettings.toString() + "\n\n");
-// settingsMap.put(Constants.DISABLE_CAMERA, newSettings.get(Constants.DISABLE_CAMERA));
-// settingsMap.put(Constants.DISABLE_MICROPHONE, newSettings.get(Constants.DISABLE_MICROPHONE));
-// settingsMap.put(Constants.DISABLE_PRIVATE_CHAT, newSettings.get(Constants.DISABLE_PRIVATE_CHAT));
-// settingsMap.put(Constants.DISABLE_PUBLIC_CHAT, newSettings.get(Constants.DISABLE_PUBLIC_CHAT));
-// settingsMap.put(Constants.LOCKED_LAYOUT, newSettings.get(Constants.LOCKED_LAYOUT));
-// settingsMap.put(Constants.LOCK_ON_JOIN, newSettings.get(Constants.LOCK_ON_JOIN));
-// settingsMap.put(Constants.LOCK_ON_JOIN_CONFIGURABLE, newSettings.get(Constants.LOCK_ON_JOIN_CONFIGURABLE));
-
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.USER_ID, userId);
- payload.put(Constants.SETTINGS, settingsMap);
-
- System.out.println("SendLockSettings toJson");
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(SEND_LOCK_SETTINGS, VERSION, null);
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static SendLockSettingsMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (SEND_LOCK_SETTINGS.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USER_ID)
- && payload.has(Constants.SETTINGS)) {
-
- JsonObject settingsObj = (JsonObject) payload.get(Constants.SETTINGS).getAsJsonObject();
- if (settingsObj.has(Constants.DISABLE_CAMERA)
- && settingsObj.has(Constants.DISABLE_CAMERA)
- && settingsObj.has(Constants.DISABLE_MICROPHONE)
- && settingsObj.has(Constants.DISABLE_PRIVATE_CHAT)
- && settingsObj.has(Constants.DISABLE_PUBLIC_CHAT)
- && settingsObj.has(Constants.LOCKED_LAYOUT)
- && settingsObj.has(Constants.LOCK_ON_JOIN)
- && settingsObj.has(Constants.LOCK_ON_JOIN_CONFIGURABLE)) {
-
- Map<String, Boolean> settingsMap = new HashMap<String, Boolean>();
-
-// settingsMap.put(Constants.DISABLE_CAMERA, settingsObj.get(Constants.DISABLE_CAMERA).getAsBoolean());
-// settingsMap.put(Constants.DISABLE_MICROPHONE, settingsObj.get(Constants.DISABLE_MICROPHONE).getAsBoolean());
-// settingsMap.put(Constants.DISABLE_PRIVATE_CHAT, settingsObj.get(Constants.DISABLE_PRIVATE_CHAT).getAsBoolean());
-// settingsMap.put(Constants.DISABLE_PUBLIC_CHAT, settingsObj.get(Constants.DISABLE_PUBLIC_CHAT).getAsBoolean());
-// settingsMap.put(Constants.LOCKED_LAYOUT, settingsObj.get(Constants.LOCKED_LAYOUT).getAsBoolean());
-// settingsMap.put(Constants.LOCK_ON_JOIN, settingsObj.get(Constants.LOCK_ON_JOIN).getAsBoolean());
-// settingsMap.put(Constants.LOCK_ON_JOIN_CONFIGURABLE, settingsObj.get(Constants.LOCK_ON_JOIN_CONFIGURABLE).getAsBoolean());
-
- settingsMap.put("disableCam", settingsObj.get(Constants.DISABLE_CAMERA).getAsBoolean());
- settingsMap.put("disableMic", settingsObj.get(Constants.DISABLE_MICROPHONE).getAsBoolean());
- settingsMap.put("disablePrivateChat", settingsObj.get(Constants.DISABLE_PRIVATE_CHAT).getAsBoolean());
- settingsMap.put("disablePublicChat", settingsObj.get(Constants.DISABLE_PUBLIC_CHAT).getAsBoolean());
- settingsMap.put("lockedLayout", settingsObj.get(Constants.LOCKED_LAYOUT).getAsBoolean());
- settingsMap.put("lockOnJoin", settingsObj.get(Constants.LOCK_ON_JOIN).getAsBoolean());
- settingsMap.put("lockOnJoinConfigurable", settingsObj.get(Constants.LOCK_ON_JOIN_CONFIGURABLE).getAsBoolean());
-
- String meetingId = payload.get(Constants.MEETING_ID).getAsString();
- String userId = payload.get(Constants.USER_ID).getAsString();
-
- System.out.println("SendLockSettings fromJson");
- return new SendLockSettingsMessage(meetingId, userId, settingsMap);
- }
- }
- }
- }
- }
- return null;
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/SendPageCountErrorMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/SendPageCountErrorMessage.java
deleted file mode 100755
index 55979780ef14ff3f067641e920ba1cf705d60cbe..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/SendPageCountErrorMessage.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class SendPageCountErrorMessage implements IPublishedMessage {
- public static final String SEND_PAGE_COUNT_ERROR = "send_page_count_error";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String messageKey;
- public final String code;
- public final String presId;
- public final int numberOfPages;
- public final int maxNumberPages;
- public final String presName;
-
- public SendPageCountErrorMessage(String messageKey, String meetingId,
- String code, String presId, int numberOfPages, int maxNumberPages,
- String presName) {
- this.meetingId = meetingId;
- this.messageKey = messageKey;
- this.code = code;
- this.presId = presId;
- this.numberOfPages = numberOfPages;
- this.maxNumberPages = maxNumberPages;
- this.presName = presName;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.MESSAGE_KEY, messageKey);
- payload.put(Constants.CODE, code);
- payload.put(Constants.PRESENTATION_ID, presId);
- payload.put(Constants.NUM_PAGES, numberOfPages);
- payload.put(Constants.MAX_NUM_PAGES, maxNumberPages);
- payload.put(Constants.PRESENTATION_NAME, presName);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(SEND_PAGE_COUNT_ERROR, VERSION, null);
- System.out.println("SendPageCountError toJson");
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static SendPageCountErrorMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (SEND_PAGE_COUNT_ERROR.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.MESSAGE_KEY)
- && payload.has(Constants.CODE)
- && payload.has(Constants.PRESENTATION_ID)
- && payload.has(Constants.MAX_NUM_PAGES)
- && payload.has(Constants.NUM_PAGES)
- && payload.has(Constants.PRESENTATION_NAME)) {
- String meetingId = payload.get(Constants.MEETING_ID).getAsString();
- String messageKey = payload.get(Constants.MESSAGE_KEY).getAsString();
- String code = payload.get(Constants.CODE).getAsString();
- String presId = payload.get(Constants.PRESENTATION_ID).getAsString();
- int numberOfPages = payload.get(Constants.NUM_PAGES).getAsInt();
- int maxNumberPages = payload.get(Constants.MAX_NUM_PAGES).getAsInt();
- String presName = payload.get(Constants.PRESENTATION_NAME).getAsString();
-
- System.out.println("SendPageCountError fromJson");
- return new SendPageCountErrorMessage(messageKey, meetingId, code, presId, numberOfPages, maxNumberPages, presName);
- }
- }
- }
- }
- return null;
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/SendPrivateChatMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/SendPrivateChatMessage.java
deleted file mode 100755
index dab93397940b3d497498df6a714bba9c3e33403b..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/SendPrivateChatMessage.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.bigbluebutton.red5.service.ChatKeyUtil;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class SendPrivateChatMessage implements IPublishedMessage {
- public static final String SEND_PRIVATE_CHAT_MESSAGE = "send_private_chat_message";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String requesterId;
- public final Map<String, String> messageInfo;
-
- public SendPrivateChatMessage(String meetingId, String requesterId,
- Map<String, String> message) {
- this.meetingId = meetingId;
- this.requesterId = requesterId;
- this.messageInfo = message;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
-
- Map<String, String> message = new HashMap<String, String>();
-
- message.put(ChatKeyUtil.CHAT_TYPE, messageInfo.get(ChatKeyUtil.CHAT_TYPE));
- message.put(ChatKeyUtil.MESSAGE, messageInfo.get(ChatKeyUtil.MESSAGE));
- message.put(ChatKeyUtil.TO_USERNAME, messageInfo.get(ChatKeyUtil.TO_USERNAME));
- message.put(ChatKeyUtil.FROM_TZ_OFFSET, messageInfo.get(ChatKeyUtil.FROM_TZ_OFFSET));
- message.put(ChatKeyUtil.FROM_COLOR, messageInfo.get(ChatKeyUtil.FROM_COLOR));
- message.put(ChatKeyUtil.TO_USERID, messageInfo.get(ChatKeyUtil.TO_USERID));
- message.put(ChatKeyUtil.FROM_USERID, messageInfo.get(ChatKeyUtil.FROM_USERID));
- message.put(ChatKeyUtil.FROM_TIME, messageInfo.get(ChatKeyUtil.FROM_TIME));
- message.put(ChatKeyUtil.FROM_USERNAME, messageInfo.get(ChatKeyUtil.FROM_USERNAME));
-
- payload.put(Constants.MESSAGE, message);
- payload.put(Constants.MEETING_ID, meetingId);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(SEND_PRIVATE_CHAT_MESSAGE, VERSION, null);
-
- System.out.println("SendPrivateChatMessage toJson");
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static SendPrivateChatMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (SEND_PRIVATE_CHAT_MESSAGE.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.MESSAGE)) {
- String meetingId = payload.get(Constants.MEETING_ID).getAsString();
-
- JsonObject msgObj = (JsonObject) payload.get(Constants.MESSAGE).getAsJsonObject();
- Map<String, String> messageInfo = new HashMap<String, String>();
-
- if (msgObj.has(ChatKeyUtil.CHAT_TYPE)
- && msgObj.has(ChatKeyUtil.MESSAGE)
- && msgObj.has(ChatKeyUtil.TO_USERNAME)
- && msgObj.has(ChatKeyUtil.FROM_TZ_OFFSET)
- && msgObj.has(ChatKeyUtil.FROM_COLOR)
- && msgObj.has(ChatKeyUtil.TO_USERID)
- && msgObj.has(ChatKeyUtil.FROM_USERID)
- && msgObj.has(ChatKeyUtil.FROM_TIME)
- && msgObj.has(ChatKeyUtil.FROM_USERNAME)){
- messageInfo.put(ChatKeyUtil.CHAT_TYPE, msgObj.get(ChatKeyUtil.CHAT_TYPE).getAsString());
- messageInfo.put(ChatKeyUtil.MESSAGE, msgObj.get(ChatKeyUtil.MESSAGE).getAsString());
- messageInfo.put(ChatKeyUtil.TO_USERNAME, msgObj.get(ChatKeyUtil.TO_USERNAME).getAsString());
- messageInfo.put(ChatKeyUtil.FROM_TZ_OFFSET, msgObj.get(ChatKeyUtil.FROM_TZ_OFFSET).getAsString());
- messageInfo.put(ChatKeyUtil.FROM_COLOR, msgObj.get(ChatKeyUtil.FROM_COLOR).getAsString());
- messageInfo.put(ChatKeyUtil.TO_USERID, msgObj.get(ChatKeyUtil.TO_USERID).getAsString());
- messageInfo.put(ChatKeyUtil.FROM_USERID, msgObj.get(ChatKeyUtil.FROM_USERID).getAsString());
- messageInfo.put(ChatKeyUtil.FROM_TIME, msgObj.get(ChatKeyUtil.FROM_TIME).getAsString());
- messageInfo.put(ChatKeyUtil.FROM_USERNAME, msgObj.get(ChatKeyUtil.FROM_USERNAME).getAsString());
-
- String requesterId = messageInfo.get(ChatKeyUtil.FROM_USERID);
- System.out.println("SendPrivateChatMessage fromJson");
- return new SendPrivateChatMessage(meetingId, requesterId, messageInfo);
- } else if (msgObj.has(Constants.CHAT_TYPE)
- && msgObj.has(Constants.MESSAGE)
- && msgObj.has(Constants.TO_USERNAME)
- && msgObj.has(Constants.FROM_TZ_OFFSET)
- && msgObj.has(Constants.FROM_COLOR)
- && msgObj.has(Constants.TO_USERID)
- && msgObj.has(Constants.FROM_USERID)
- && msgObj.has(Constants.FROM_TIME)
- && msgObj.has(Constants.FROM_USERNAME)){
- messageInfo.put(ChatKeyUtil.CHAT_TYPE, msgObj.get(Constants.CHAT_TYPE).getAsString());
- messageInfo.put(ChatKeyUtil.MESSAGE, msgObj.get(Constants.MESSAGE).getAsString());
- messageInfo.put(ChatKeyUtil.TO_USERNAME, msgObj.get(Constants.TO_USERNAME).getAsString());
- messageInfo.put(ChatKeyUtil.FROM_TZ_OFFSET, msgObj.get(Constants.FROM_TZ_OFFSET).getAsString());
- messageInfo.put(ChatKeyUtil.FROM_COLOR, msgObj.get(Constants.FROM_COLOR).getAsString());
- messageInfo.put(ChatKeyUtil.TO_USERID, msgObj.get(Constants.TO_USERID).getAsString());
- messageInfo.put(ChatKeyUtil.FROM_USERID, msgObj.get(Constants.FROM_USERID).getAsString());
- messageInfo.put(ChatKeyUtil.FROM_TIME, msgObj.get(Constants.FROM_TIME).getAsString());
- messageInfo.put(ChatKeyUtil.FROM_USERNAME, msgObj.get(Constants.FROM_USERNAME).getAsString());
-
- String requesterId = messageInfo.get(ChatKeyUtil.FROM_USERID);
- System.out.println("sendPrivateChatMessage fromJson");
- return new SendPrivateChatMessage(meetingId, requesterId, messageInfo);
- }
- }
- }
- }
- }
- return null;
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/SendPublicChatMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/SendPublicChatMessage.java
deleted file mode 100755
index ac36757ef892419fa1a0602951e31bd01a9675a9..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/SendPublicChatMessage.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.bigbluebutton.red5.service.ChatKeyUtil;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class SendPublicChatMessage implements IPublishedMessage {
- public static final String SEND_PUBLIC_CHAT_MESSAGE = "send_public_chat_message";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String requesterId;
- public final Map<String, String> messageInfo;
-
- public SendPublicChatMessage(String meetingId, String requesterId,
- Map<String, String> message) {
- this.meetingId = meetingId;
- this.requesterId = requesterId;
- this.messageInfo = message;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
-
- Map<String, String> message = new HashMap<String, String>();
-
- message.put(ChatKeyUtil.CHAT_TYPE, messageInfo.get(ChatKeyUtil.CHAT_TYPE));
- message.put(ChatKeyUtil.MESSAGE, messageInfo.get(ChatKeyUtil.MESSAGE));
- message.put(ChatKeyUtil.TO_USERNAME, messageInfo.get(ChatKeyUtil.TO_USERNAME));
- message.put(ChatKeyUtil.FROM_TZ_OFFSET, messageInfo.get(ChatKeyUtil.FROM_TZ_OFFSET));
- message.put(ChatKeyUtil.FROM_COLOR, messageInfo.get(ChatKeyUtil.FROM_COLOR));
- message.put(ChatKeyUtil.TO_USERID, messageInfo.get(ChatKeyUtil.TO_USERID));
- message.put(ChatKeyUtil.FROM_USERID, messageInfo.get(ChatKeyUtil.FROM_USERID));
- message.put(ChatKeyUtil.FROM_TIME, messageInfo.get(ChatKeyUtil.FROM_TIME));
- message.put(ChatKeyUtil.FROM_USERNAME, messageInfo.get(ChatKeyUtil.FROM_USERNAME));
-
- payload.put(Constants.MESSAGE, message);
- payload.put(Constants.MEETING_ID, meetingId);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(SEND_PUBLIC_CHAT_MESSAGE, VERSION, null);
-
- System.out.println("sendPublicChatMessage toJson");
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static SendPublicChatMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (SEND_PUBLIC_CHAT_MESSAGE.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.MESSAGE)) {
- String meetingId = payload.get(Constants.MEETING_ID).getAsString();
-
- JsonObject msgObj = (JsonObject) payload.get(Constants.MESSAGE).getAsJsonObject();
- Map<String, String> messageInfo = new HashMap<String, String>();
-
- if (msgObj.has(ChatKeyUtil.CHAT_TYPE)
- && msgObj.has(ChatKeyUtil.MESSAGE)
- && msgObj.has(ChatKeyUtil.TO_USERNAME)
- && msgObj.has(ChatKeyUtil.FROM_TZ_OFFSET)
- && msgObj.has(ChatKeyUtil.FROM_COLOR)
- && msgObj.has(ChatKeyUtil.TO_USERID)
- && msgObj.has(ChatKeyUtil.FROM_USERID)
- && msgObj.has(ChatKeyUtil.FROM_TIME)
- && msgObj.has(ChatKeyUtil.FROM_USERNAME)){
- messageInfo.put(ChatKeyUtil.CHAT_TYPE, msgObj.get(ChatKeyUtil.CHAT_TYPE).getAsString());
- messageInfo.put(ChatKeyUtil.MESSAGE, msgObj.get(ChatKeyUtil.MESSAGE).getAsString());
- messageInfo.put(ChatKeyUtil.TO_USERNAME, msgObj.get(ChatKeyUtil.TO_USERNAME).getAsString());
- messageInfo.put(ChatKeyUtil.FROM_TZ_OFFSET, msgObj.get(ChatKeyUtil.FROM_TZ_OFFSET).getAsString());
- messageInfo.put(ChatKeyUtil.FROM_COLOR, msgObj.get(ChatKeyUtil.FROM_COLOR).getAsString());
- messageInfo.put(ChatKeyUtil.TO_USERID, msgObj.get(ChatKeyUtil.TO_USERID).getAsString());
- messageInfo.put(ChatKeyUtil.FROM_USERID, msgObj.get(ChatKeyUtil.FROM_USERID).getAsString());
- messageInfo.put(ChatKeyUtil.FROM_TIME, msgObj.get(ChatKeyUtil.FROM_TIME).getAsString());
- messageInfo.put(ChatKeyUtil.FROM_USERNAME, msgObj.get(ChatKeyUtil.FROM_USERNAME).getAsString());
-
- String requesterId = messageInfo.get(ChatKeyUtil.FROM_USERID);
- System.out.println("sendPublicChatMessage fromJson");
- return new SendPublicChatMessage(meetingId, requesterId, messageInfo);
- } else if (msgObj.has(Constants.CHAT_TYPE)
- && msgObj.has(Constants.MESSAGE)
- && msgObj.has(Constants.TO_USERNAME)
- && msgObj.has(Constants.FROM_TZ_OFFSET)
- && msgObj.has(Constants.FROM_COLOR)
- && msgObj.has(Constants.TO_USERID)
- && msgObj.has(Constants.FROM_USERID)
- && msgObj.has(Constants.FROM_TIME)
- && msgObj.has(Constants.FROM_USERNAME)){
- messageInfo.put(ChatKeyUtil.CHAT_TYPE, msgObj.get(Constants.CHAT_TYPE).getAsString());
- messageInfo.put(ChatKeyUtil.MESSAGE, msgObj.get(Constants.MESSAGE).getAsString());
- messageInfo.put(ChatKeyUtil.TO_USERNAME, msgObj.get(Constants.TO_USERNAME).getAsString());
- messageInfo.put(ChatKeyUtil.FROM_TZ_OFFSET, msgObj.get(Constants.FROM_TZ_OFFSET).getAsString());
- messageInfo.put(ChatKeyUtil.FROM_COLOR, msgObj.get(Constants.FROM_COLOR).getAsString());
- messageInfo.put(ChatKeyUtil.TO_USERID, msgObj.get(Constants.TO_USERID).getAsString());
- messageInfo.put(ChatKeyUtil.FROM_USERID, msgObj.get(Constants.FROM_USERID).getAsString());
- messageInfo.put(ChatKeyUtil.FROM_TIME, msgObj.get(Constants.FROM_TIME).getAsString());
- messageInfo.put(ChatKeyUtil.FROM_USERNAME, msgObj.get(Constants.FROM_USERNAME).getAsString());
-
- String requesterId = messageInfo.get(ChatKeyUtil.FROM_USERID);
- System.out.println("sendPublicChatMessage fromJson");
- return new SendPublicChatMessage(meetingId, requesterId, messageInfo);
- }
- }
- }
- }
- }
- return null;
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/SendSlideGeneratedMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/SendSlideGeneratedMessage.java
deleted file mode 100755
index fadb8dbf8300621402104e3707609ae91a0d5f79..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/SendSlideGeneratedMessage.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class SendSlideGeneratedMessage implements IPublishedMessage {
- public static final String SEND_SLIDE_GENERATED = "send_slide_generated";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String messageKey;
- public final String code;
- public final String presId;
- public final int numberOfPages;
- public final int pagesCompleted;
- public final String presName;
-
- public SendSlideGeneratedMessage(String messageKey, String meetingId,
- String code, String presId, int numberOfPages, int pagesCompleted,
- String presName) {
- this.meetingId = meetingId;
- this.messageKey = messageKey;
- this.code = code;
- this.presId = presId;
- this.numberOfPages = numberOfPages;
- this.pagesCompleted = pagesCompleted;
- this.presName = presName;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.MESSAGE_KEY, messageKey);
- payload.put(Constants.CODE, code);
- payload.put(Constants.PRESENTATION_ID, presId);
- payload.put(Constants.NUM_PAGES, numberOfPages);
- payload.put(Constants.PAGES_COMPLETED, pagesCompleted);
- payload.put(Constants.PRESENTATION_NAME, presName);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(SEND_SLIDE_GENERATED, VERSION, null);
- System.out.println("SendSlideGenerated toJson");
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static SendSlideGeneratedMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (SEND_SLIDE_GENERATED.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.MESSAGE_KEY)
- && payload.has(Constants.CODE)
- && payload.has(Constants.PRESENTATION_ID)
- && payload.has(Constants.PAGES_COMPLETED)
- && payload.has(Constants.NUM_PAGES)
- && payload.has(Constants.PRESENTATION_NAME)) {
- String meetingId = payload.get(Constants.MEETING_ID).getAsString();
- String messageKey = payload.get(Constants.MESSAGE_KEY).getAsString();
- String code = payload.get(Constants.CODE).getAsString();
- String presId = payload.get(Constants.PRESENTATION_ID).getAsString();
- int numberOfPages = payload.get(Constants.NUM_PAGES).getAsInt();
- int pagesCompleted = payload.get(Constants.PAGES_COMPLETED).getAsInt();
- String presName = payload.get(Constants.PRESENTATION_NAME).getAsString();
-
- System.out.println("SendSlideGenerated fromJson");
- return new SendSlideGeneratedMessage(messageKey, meetingId, code, presId, numberOfPages, pagesCompleted, presName);
- }
- }
- }
- }
- return null;
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/SendWhiteboardAnnotationReplyMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/SendWhiteboardAnnotationReplyMessage.java
deleted file mode 100755
index b55f5c2839737449576a998efcab06c25d885dc6..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/SendWhiteboardAnnotationReplyMessage.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-import java.util.Map;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class SendWhiteboardAnnotationReplyMessage implements ISubscribedMessage {
- public static final String SEND_WHITEBOARD_ANNOTATION_REPLY = "send_whiteboard_shape_message";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String requesterId;
- public final String whiteboardId;
- public final Map<String, Object> shape;
-
-
- public SendWhiteboardAnnotationReplyMessage(String meetingId, String requesterId,
- String whiteboardId, Map<String, Object> shape) {
- this.meetingId = meetingId;
- this.whiteboardId = whiteboardId;
- this.requesterId = requesterId;
- this.shape = shape;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.SHAPE, shape);
- payload.put(Constants.WHITEBOARD_ID, whiteboardId);
- payload.put(Constants.REQUESTER_ID, requesterId);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(SEND_WHITEBOARD_ANNOTATION_REPLY, VERSION, null);
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static SendWhiteboardAnnotationReplyMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (SEND_WHITEBOARD_ANNOTATION_REPLY.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.WHITEBOARD_ID)
- && payload.has(Constants.SHAPE)
- && payload.has(Constants.REQUESTER_ID)) {
- String meetingId = payload.get(Constants.MEETING_ID).getAsString();
- String requesterId = payload.get(Constants.REQUESTER_ID).getAsString();
- String whiteboardId = payload.get(Constants.WHITEBOARD_ID).getAsString();
-
- JsonObject shape = (JsonObject) payload.get(Constants.SHAPE);
-
- Util util = new Util();
- Map<String, Object> annotation = util.extractOuterAnnotation(shape);
-
-
- System.out.println("SendWhiteboardAnnotationReplyMessage fromJson");
- return new SendWhiteboardAnnotationReplyMessage(meetingId, requesterId,
- whiteboardId, annotation);
- }
- }
- }
- }
- return null;
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/SendWhiteboardAnnotationRequestMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/SendWhiteboardAnnotationRequestMessage.java
deleted file mode 100755
index 566b0d9ff420a49ab23e5b64f548ef44c87c0972..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/SendWhiteboardAnnotationRequestMessage.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class SendWhiteboardAnnotationRequestMessage implements ISubscribedMessage {
- public static final String SEND_WHITEBOARD_ANNOTATION_REQUEST = "send_whiteboard_annotation_request";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String requesterId;
- public final Map<String, Object> annotation;
-
-
- public SendWhiteboardAnnotationRequestMessage(String meetingId,
- String requesterId, Map<String, Object> annotation) {
- this.meetingId = meetingId;
- this.requesterId = requesterId;
- this.annotation = annotation;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.REQUESTER_ID, requesterId);
- payload.put(Constants.ANNOTATION, annotation);
-
- System.out.println("SendWhiteboardAnnotationRequestMessage toJson");
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(SEND_WHITEBOARD_ANNOTATION_REQUEST, VERSION, null);
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static SendWhiteboardAnnotationRequestMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (SEND_WHITEBOARD_ANNOTATION_REQUEST.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.ANNOTATION)
- && payload.has(Constants.REQUESTER_ID)) {
- String meetingId = payload.get(Constants.MEETING_ID).getAsString();
- String requesterId = payload.get(Constants.REQUESTER_ID).getAsString();
-
- JsonObject annotationElement = (JsonObject) payload.get(Constants.ANNOTATION);
-
- Util util = new Util();
- Map<String, Object> annotation = util.extractAnnotation(annotationElement);
-
- System.out.println("SendWhiteboardAnnotationRequestMessage fromJson");
- return new SendWhiteboardAnnotationRequestMessage(meetingId, requesterId, annotation);
- }
- }
- }
- }
- return null;
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/SetRecordingStatusRequestMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/SetRecordingStatusRequestMessage.java
deleted file mode 100755
index 5fdd73ad6ff33ab11770ad10f187ca537797ea4d..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/SetRecordingStatusRequestMessage.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-
-public class SetRecordingStatusRequestMessage implements ISubscribedMessage {
- public static final String SET_RECORDING_STATUS_REQUEST = "set_recording_status_request_message";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String userId;
- public final Boolean recording;
-
- public SetRecordingStatusRequestMessage(String meetingId, String userId, Boolean recording) {
- this.meetingId = meetingId;
- this.userId = userId;
- this.recording = recording;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.USER_ID, userId);
- payload.put(Constants.RECORDING, recording);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(SET_RECORDING_STATUS_REQUEST, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static SetRecordingStatusRequestMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (SET_RECORDING_STATUS_REQUEST.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USER_ID)
- && payload.has(Constants.RECORDING)) {
- String id = payload.get(Constants.MEETING_ID).getAsString();
- String userid = payload.get(Constants.USER_ID).getAsString();
- Boolean recording = payload.get(Constants.RECORDING).getAsBoolean();
- return new SetRecordingStatusRequestMessage(id, userid, recording);
- }
- }
- }
- }
- return null;
-
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/SetUserStatusRequestMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/SetUserStatusRequestMessage.java
deleted file mode 100755
index e338a1b41a8185a61e496c803651db1822636e58..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/SetUserStatusRequestMessage.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-
-public class SetUserStatusRequestMessage implements ISubscribedMessage {
- public static final String SET_USER_STATUS_REQUEST = "set_user_status_request_message";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String userId;
- public final String status;
- public final String value;
-
- public SetUserStatusRequestMessage(String meetingId, String userId, String status, String value) {
- this.meetingId = meetingId;
- this.userId = userId;
- this.status = status;
- this.value = value;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.USER_ID, userId);
- payload.put(Constants.STATUS, status);
- payload.put(Constants.VALUE, value);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(SET_USER_STATUS_REQUEST, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static SetUserStatusRequestMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (SET_USER_STATUS_REQUEST.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USER_ID)
- && payload.has(Constants.STATUS)
- && payload.has(Constants.VALUE)) {
- String id = payload.get(Constants.MEETING_ID).getAsString();
- String userid = payload.get(Constants.USER_ID).getAsString();
- String status = payload.get(Constants.STATUS).getAsString();
- String value = payload.get(Constants.VALUE).getAsString();
- return new SetUserStatusRequestMessage(id, userid, status, value);
- }
- }
- }
- }
- return null;
-
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/SharePresentationMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/SharePresentationMessage.java
deleted file mode 100755
index a8fd2d97237b6ceb3d9dc850109f8a3f69672f0f..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/SharePresentationMessage.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class SharePresentationMessage implements IPublishedMessage {
- public static final String SHARE_PRESENTATION = "share_presentation";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String presentationId;
- public final boolean share;
-
- public SharePresentationMessage(String meetingId, String presentationId,
- boolean share){
- this.meetingId = meetingId;
- this.presentationId = presentationId;
- this.share = share;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.PRESENTATION_ID, presentationId);
- payload.put(Constants.SHARE, share);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(SHARE_PRESENTATION, VERSION, null);
- System.out.println("SharePresentation toJson");
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static SharePresentationMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (SHARE_PRESENTATION.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.PRESENTATION_ID)
- && payload.has(Constants.SHARE)) {
- String meetingId = payload.get(Constants.MEETING_ID).getAsString();
- String presentationId = payload.get(Constants.PRESENTATION_ID).getAsString();
- boolean share = payload.get(Constants.SHARE).getAsBoolean();
-
- System.out.println("SharePresentation fromJson");
- return new SharePresentationMessage(meetingId, presentationId, share);
- }
- }
- }
- }
- return null;
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UndoWhiteboardReplyMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UndoWhiteboardReplyMessage.java
deleted file mode 100755
index 5ce7ba9d3fca9aac20f81abb438c944c7cf3a2ab..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UndoWhiteboardReplyMessage.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class UndoWhiteboardReplyMessage implements ISubscribedMessage {
-
- // the name of this event should be undo_whiteboard_reply (as it corresponds
- // to undo_whiteboard_request which entered bbb-apps)
- // However, on the clients we use undo_whiteboard_request for both request and reply
- //
- // The only difference is shapeId here. Plus this message is on channel FROM_WHITEBOARD_CHANNEL
- public static final String UNDO_WHITEBOARD_REPLY = "undo_whiteboard_request";//see note above
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String whiteboardId;
- public final String requesterId;
- public final String shapeId;
-
-
- public UndoWhiteboardReplyMessage(String meetingId, String requesterId, String whiteboardId, String shapeId) {
- this.meetingId = meetingId;
- this.whiteboardId = whiteboardId;
- this.requesterId = requesterId;
- this.shapeId = shapeId;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.WHITEBOARD_ID, whiteboardId);
- payload.put(Constants.REQUESTER_ID, requesterId);
- payload.put(Constants.SHAPE_ID, shapeId);
-
- System.out.println("UndoWhiteboardReplyMessage toJson");
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(UNDO_WHITEBOARD_REPLY, VERSION, null);
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static UndoWhiteboardReplyMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (UNDO_WHITEBOARD_REPLY.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.WHITEBOARD_ID)
- && payload.has(Constants.SHAPE_ID)
- && payload.has(Constants.REQUESTER_ID)) {
- String meetingId = payload.get(Constants.MEETING_ID).getAsString();
- String whiteboardId = payload.get(Constants.WHITEBOARD_ID).getAsString();
- String shapeId = payload.get(Constants.SHAPE_ID).getAsString();
- String requesterId = payload.get(Constants.REQUESTER_ID).getAsString();
-
- System.out.println("UndoWhiteboardReplyMessage fromJson");
- return new UndoWhiteboardReplyMessage(meetingId, requesterId, whiteboardId, shapeId);
- }
- }
- }
- }
- return null;
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UndoWhiteboardRequest.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UndoWhiteboardRequest.java
deleted file mode 100755
index 5b0e2b1712d672077eb360f1605dd3209f19ff1e..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UndoWhiteboardRequest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class UndoWhiteboardRequest implements ISubscribedMessage {
- public static final String UNDO_WHITEBOARD_REQUEST = "undo_whiteboard_request";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String whiteboardId;
- public final String requesterId;
-
-
- public UndoWhiteboardRequest(String meetingId, String requesterId, String whiteboardId) {
- this.meetingId = meetingId;
- this.whiteboardId = whiteboardId;
- this.requesterId = requesterId;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.WHITEBOARD_ID, whiteboardId);
- payload.put(Constants.REQUESTER_ID, requesterId);
-
- System.out.println("UndoWhiteboardRequest toJson");
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(UNDO_WHITEBOARD_REQUEST, VERSION, null);
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static UndoWhiteboardRequest fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (UNDO_WHITEBOARD_REQUEST.equals(messageName)) {
- System.out.println("4"+payload.toString());
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.WHITEBOARD_ID)
- && payload.has(Constants.REQUESTER_ID)) {
- String meetingId = payload.get(Constants.MEETING_ID).getAsString();
- String whiteboardId = payload.get(Constants.WHITEBOARD_ID).getAsString();
- String requesterId = payload.get(Constants.REQUESTER_ID).getAsString();
-
- System.out.println("UndoWhiteboardRequest fromJson");
- return new UndoWhiteboardRequest(meetingId, requesterId, whiteboardId);
- }
- }
- }
- }
- return null;
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UserConnectedToGlobalAudio.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UserConnectedToGlobalAudio.java
deleted file mode 100755
index a58cec926e7a41e2fb900a2f65da147768099760..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UserConnectedToGlobalAudio.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class UserConnectedToGlobalAudio implements IPublishedMessage {
- public static final String USER_CONNECTED_TO_GLOBAL_AUDIO = "user_connected_to_global_audio";
- public static final String VERSION = "0.0.1";
-
- public final String voiceConf;
- public final String name;
- public final String userid;
-
-
-
- public UserConnectedToGlobalAudio(String voiceConf, String userid, String name) {
- this.voiceConf = voiceConf;
- this.userid = userid;
- this.name = name;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.VOICE_CONF, voiceConf);
- payload.put(Constants.USER_ID, userid);
- payload.put(Constants.NAME, name);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(USER_CONNECTED_TO_GLOBAL_AUDIO, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static UserConnectedToGlobalAudio fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (USER_CONNECTED_TO_GLOBAL_AUDIO.equals(messageName)) {
- if (payload.has(Constants.VOICE_CONF)
- && payload.has(Constants.USER_ID)
- && payload.has(Constants.NAME)) {
- String voiceConf = payload.get(Constants.VOICE_CONF).getAsString();
- String userid = payload.get(Constants.USER_ID).getAsString();
- String name = payload.get(Constants.NAME).getAsString();
- return new UserConnectedToGlobalAudio(voiceConf, userid, name);
- }
- }
- }
- }
- return null;
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UserDisconnectedFromGlobalAudio.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UserDisconnectedFromGlobalAudio.java
deleted file mode 100755
index 95218e27874ba44d2a1cd851befd5dbfb3000997..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UserDisconnectedFromGlobalAudio.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class UserDisconnectedFromGlobalAudio implements IPublishedMessage {
- public static final String USER_DISCONNECTED_FROM_GLOBAL_AUDIO = "user_disconnected_from_global_audio";
- public static final String VERSION = "0.0.1";
-
- public final String voiceConf;
- public final String name;
- public final String userid;
-
- public UserDisconnectedFromGlobalAudio(String voiceConf, String userid, String name) {
- this.voiceConf = voiceConf;
- this.userid = userid;
- this.name = name;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.VOICE_CONF, voiceConf);
- payload.put(Constants.USER_ID, userid);
- payload.put(Constants.NAME, name);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(USER_DISCONNECTED_FROM_GLOBAL_AUDIO, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static UserDisconnectedFromGlobalAudio fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (USER_DISCONNECTED_FROM_GLOBAL_AUDIO.equals(messageName)) {
- if (payload.has(Constants.VOICE_CONF)
- && payload.has(Constants.USER_ID)
- && payload.has(Constants.NAME)) {
- String voiceConf = payload.get(Constants.VOICE_CONF).getAsString();
- String userid = payload.get(Constants.USER_ID).getAsString();
- String name = payload.get(Constants.NAME).getAsString();
- return new UserDisconnectedFromGlobalAudio(voiceConf, userid, name);
- }
- }
- }
- }
- return null;
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UserJoinedMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UserJoinedMessage.java
deleted file mode 100755
index b5e23c88069c58f7546efed8b37cb9f283c33465..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UserJoinedMessage.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class UserJoinedMessage implements ISubscribedMessage {
- public static final String USER_JOINED = "user_joined_message";
- public final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final Map<String, Object> user;
-
- public UserJoinedMessage(String meetingID, Map<String, Object> user) {
- this.meetingId = meetingID;
- this.user = user;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
-
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(USER_JOINED, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
- public static UserJoinedMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (USER_JOINED.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USER)) {
- String meetingID = payload.get(Constants.MEETING_ID).getAsString();
-
- JsonObject user = (JsonObject) payload.get(Constants.USER);
-
- Util util = new Util();
- Map<String, Object> userMap = util.extractUser(user);
-
- if (userMap != null) {
- return new UserJoinedMessage(meetingID, userMap);
- }
- }
- }
- }
- }
- System.out.println("Failed to parse UserJoinedMessage");
- return null;
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UserJoinedVoiceMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UserJoinedVoiceMessage.java
deleted file mode 100755
index 9231fb66c4a90517515b7ba62b88e06d8b9de983..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UserJoinedVoiceMessage.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-
-public class UserJoinedVoiceMessage implements ISubscribedMessage {
- public static final String USER_JOINED_VOICE = "user_joined_voice_message";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final Map<String, Object> user;
- public final String voiceConf;
-
- public UserJoinedVoiceMessage(String meetingId, Map<String, Object> user, String voiceConf) {
- this.meetingId = meetingId;
- this.user = user;
- this.voiceConf = voiceConf;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.USER, user);
- payload.put(Constants.VOICE_CONF, voiceConf);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(USER_JOINED_VOICE, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static UserJoinedVoiceMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (USER_JOINED_VOICE.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USER)) {
- String id = payload.get(Constants.MEETING_ID).getAsString();
- String voiceConf = payload.get(Constants.VOICE_CONF).getAsString();
-
- JsonObject user = (JsonObject) payload.get(Constants.USER);
-
- Util util = new Util();
- Map<String, Object> userMap = util.extractUser(user);
-
- if (userMap != null) {
- return new UserJoinedVoiceMessage(id, userMap, voiceConf);
- }
- }
- }
- }
- }
- return null;
-
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UserLeavingMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UserLeavingMessage.java
deleted file mode 100755
index 447e49f703628bf139ae3240d053bf7fff5f4c28..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UserLeavingMessage.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class UserLeavingMessage implements ISubscribedMessage {
- public static final String USER_LEAVING = "user_leaving_request";
- public final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String userId;
-
- public UserLeavingMessage(String meetingID, String internalUserId) {
- this.meetingId = meetingID;
- this.userId = internalUserId;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.USER_ID, userId);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(USER_LEAVING, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
- public static UserLeavingMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (USER_LEAVING.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USER_ID)) {
- String meetingID = payload.get(Constants.MEETING_ID).getAsString();
- String userid = payload.get(Constants.USER_ID).getAsString();
- return new UserLeavingMessage(meetingID, userid);
- }
- }
- }
- }
- System.out.println("Failed to parse UserLeavingMessage");
- return null;
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UserLeftMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UserLeftMessage.java
deleted file mode 100755
index 82548118a31366cc8a638e6c45cf4b5b5294f444..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UserLeftMessage.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class UserLeftMessage implements ISubscribedMessage {
- public static final String USER_LEFT = "user_left_message";
- public final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final Map<String, Object> user;
-
- public UserLeftMessage(String meetingID, Map<String, Object> user) {
- this.meetingId = meetingID;
- this.user = user;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
-
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(USER_LEFT, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
- public static UserLeftMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (USER_LEFT.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USER)) {
- String meetingID = payload.get(Constants.MEETING_ID).getAsString();
-
- JsonObject user = (JsonObject) payload.get(Constants.USER);
-
- Util util = new Util();
- Map<String, Object> userMap = util.extractUser(user);
-
- if (userMap != null) {
- return new UserLeftMessage(meetingID, userMap);
- }
- }
- }
- }
- }
- System.out.println("Failed to parse UserLeftMessage");
- return null;
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UserLeftVoiceMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UserLeftVoiceMessage.java
deleted file mode 100755
index 8e647a6bbf5217e9e16141aeb833e2377c8ae892..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UserLeftVoiceMessage.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-
-public class UserLeftVoiceMessage implements ISubscribedMessage {
- public static final String USER_LEFT_VOICE = "user_left_voice_message";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final Map<String, Object> user;
- public final String voiceConf;
-
- public UserLeftVoiceMessage(String meetingId, Map<String, Object> user, String voiceConf) {
- this.meetingId = meetingId;
- this.user = user;
- this.voiceConf = voiceConf;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.USER, user);
- payload.put(Constants.VOICE_CONF, voiceConf);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(USER_LEFT_VOICE, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static UserLeftVoiceMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (USER_LEFT_VOICE.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USER)) {
- String id = payload.get(Constants.MEETING_ID).getAsString();
- String voiceConf = payload.get(Constants.VOICE_CONF).getAsString();
-
- JsonObject user = (JsonObject) payload.get(Constants.USER);
-
- Util util = new Util();
- Map<String, Object> userMap = util.extractUser(user);
-
- if (userMap != null) {
- return new UserLeftVoiceMessage(id, userMap, voiceConf);
- }
- }
- }
- }
- }
- return null;
-
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UserListeningOnlyMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UserListeningOnlyMessage.java
deleted file mode 100755
index 5f352b2645f222b0e0bfc716a48e1efdfbd7da16..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UserListeningOnlyMessage.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-
-public class UserListeningOnlyMessage implements ISubscribedMessage {
- public static final String USER_LISTENING_ONLY = "user_listening_only";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String userId;
- public final Boolean listenOnly;
-
- public UserListeningOnlyMessage(String meetingId, String userId, Boolean listenOnly) {
- this.meetingId = meetingId;
- this.userId = userId;
- this.listenOnly = listenOnly;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.USER_ID, userId);
- payload.put(Constants.LISTEN_ONLY, listenOnly);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(USER_LISTENING_ONLY, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static UserListeningOnlyMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (USER_LISTENING_ONLY.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USER_ID)
- && payload.has(Constants.LISTEN_ONLY)) {
- String id = payload.get(Constants.MEETING_ID).getAsString();
- String userid = payload.get(Constants.USER_ID).getAsString();
- Boolean listenOnly = payload.get(Constants.LISTEN_ONLY).getAsBoolean();
- return new UserListeningOnlyMessage(id, userid, listenOnly);
- }
- }
- }
- }
- return null;
-
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UserLockedMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UserLockedMessage.java
deleted file mode 100755
index c9c6aa8f3b06d4210c211687701e294ac54fbb32..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UserLockedMessage.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-
-public class UserLockedMessage implements ISubscribedMessage {
- public static final String USER_LOCKED = "user_locked_message";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String userId;
- public final Boolean locked;
-
- public UserLockedMessage(String meetingId, String userId, Boolean locked) {
- this.meetingId = meetingId;
- this.userId = userId;
- this.locked = locked;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.USER_ID, userId);
- payload.put(Constants.LOCKED, locked);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(USER_LOCKED, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static UserLockedMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (USER_LOCKED.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USER_ID)
- && payload.has(Constants.LOCKED)) {
- String id = payload.get(Constants.MEETING_ID).getAsString();
- String userid = payload.get(Constants.USER_ID).getAsString();
- Boolean locked = payload.get(Constants.LOCKED).getAsBoolean();
- return new UserLockedMessage(id, userid, locked);
- }
- }
- }
- }
- return null;
-
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UserLoweredHandMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UserLoweredHandMessage.java
deleted file mode 100755
index fbc44a432fcc7a099766d87a6228e5be75561cbd..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UserLoweredHandMessage.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-
-public class UserLoweredHandMessage implements ISubscribedMessage {
- public static final String USER_LOWERED_HAND = "user_lowered_hand_message";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String userId;
- public final Boolean raisedHand;
- public final String loweredBy;
-
- public UserLoweredHandMessage(String meetingId, String userId, Boolean raisedHand, String loweredBy) {
- this.meetingId = meetingId;
- this.userId = userId;
- this.raisedHand = raisedHand;
- this.loweredBy = loweredBy;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.USER_ID, userId);
- payload.put(Constants.RAISE_HAND, raisedHand);
- payload.put(Constants.LOWERED_BY, loweredBy);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(USER_LOWERED_HAND, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static UserLoweredHandMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (USER_LOWERED_HAND.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USER_ID)
- && payload.has(Constants.RAISE_HAND)
- && payload.has(Constants.LOWERED_BY)) {
- String id = payload.get(Constants.MEETING_ID).getAsString();
- String userid = payload.get(Constants.USER_ID).getAsString();
- Boolean raisedHand = payload.get(Constants.RAISE_HAND).getAsBoolean();
- String loweredBy = payload.get(Constants.LOWERED_BY).getAsString();
- return new UserLoweredHandMessage(id, userid, raisedHand, loweredBy);
- }
- }
- }
- }
- return null;
-
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UserRaisedHandMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UserRaisedHandMessage.java
deleted file mode 100755
index 5c2e5501afb07f99b20b5272cd901ac6e280044e..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UserRaisedHandMessage.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-
-public class UserRaisedHandMessage implements ISubscribedMessage {
- public static final String USER_RAISED_HAND = "user_raised_hand_message";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String userId;
- public final Boolean raisedHand;
-
- public UserRaisedHandMessage(String meetingId, String userId, Boolean raisedHand) {
- this.meetingId = meetingId;
- this.userId = userId;
- this.raisedHand = raisedHand;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.USER_ID, userId);
- payload.put(Constants.RAISE_HAND, raisedHand);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(USER_RAISED_HAND, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static UserRaisedHandMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (USER_RAISED_HAND.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USER_ID)
- && payload.has(Constants.RAISE_HAND)) {
- String id = payload.get(Constants.MEETING_ID).getAsString();
- String userid = payload.get(Constants.USER_ID).getAsString();
- Boolean raisedHand = payload.get(Constants.RAISE_HAND).getAsBoolean();
- return new UserRaisedHandMessage(id, userid, raisedHand);
- }
- }
- }
- }
- return null;
-
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UserShareWebcamRequestMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UserShareWebcamRequestMessage.java
deleted file mode 100755
index 225580e1aa4fd6b60eefeeb2e93d680ee8e2d8a7..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UserShareWebcamRequestMessage.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-
-public class UserShareWebcamRequestMessage implements ISubscribedMessage {
- public static final String USER_SHARE_WEBCAM_REQUEST = "user_share_webcam_request_message";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String userId;
- public final String stream;
-
- public UserShareWebcamRequestMessage(String meetingId, String userId, String stream) {
- this.meetingId = meetingId;
- this.userId = userId;
- this.stream = stream;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.USER_ID, userId);
- payload.put(Constants.STREAM, stream);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(USER_SHARE_WEBCAM_REQUEST, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static UserShareWebcamRequestMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (USER_SHARE_WEBCAM_REQUEST.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USER_ID)
- && payload.has(Constants.STREAM)) {
- String id = payload.get(Constants.MEETING_ID).getAsString();
- String userid = payload.get(Constants.USER_ID).getAsString();
- String stream = payload.get(Constants.STREAM).getAsString();
- return new UserShareWebcamRequestMessage(id, userid, stream);
- }
- }
- }
- }
- return null;
-
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UserSharedWebcamMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UserSharedWebcamMessage.java
deleted file mode 100755
index 5789b3942de756f162c4afaeb39a7a7f1f98c859..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UserSharedWebcamMessage.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-
-public class UserSharedWebcamMessage implements ISubscribedMessage {
- public static final String USER_SHARED_WEBCAM = "user_shared_webcam_message";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String userId;
- public final String stream;
-
- public UserSharedWebcamMessage(String meetingId, String userId, String stream) {
- this.meetingId = meetingId;
- this.userId = userId;
- this.stream = stream;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.USER_ID, userId);
- payload.put(Constants.STREAM, stream);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(USER_SHARED_WEBCAM, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static UserSharedWebcamMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (USER_SHARED_WEBCAM.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USER_ID)
- && payload.has(Constants.STREAM)) {
- String id = payload.get(Constants.MEETING_ID).getAsString();
- String userid = payload.get(Constants.USER_ID).getAsString();
- String stream = payload.get(Constants.STREAM).getAsString();
- return new UserSharedWebcamMessage(id, userid, stream);
- }
- }
- }
- }
- return null;
-
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UserStatusChangedMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UserStatusChangedMessage.java
deleted file mode 100755
index f643e72eb4ca697e05be0bdfc27a3f5be1f89ee7..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UserStatusChangedMessage.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-
-public class UserStatusChangedMessage implements ISubscribedMessage {
- public static final String USER_STATUS_CHANGED = "user_status_changed_message";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String userId;
- public final String status;
- public final String value;
-
- public UserStatusChangedMessage(String meetingId, String userId, String status,
- String value) {
- this.meetingId = meetingId;
- this.userId = userId;
- this.status = status;
- this.value = value;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.USER_ID, userId);
- payload.put(Constants.STATUS, status);
- payload.put(Constants.VALUE, value);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(USER_STATUS_CHANGED, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static UserStatusChangedMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (USER_STATUS_CHANGED.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USER_ID)
- && payload.has(Constants.STATUS)
- && payload.has(Constants.VALUE)) {
- String id = payload.get(Constants.MEETING_ID).getAsString();
- String userid = payload.get(Constants.USER_ID).getAsString();
- String status = payload.get(Constants.STATUS).getAsString();
- String value = payload.get(Constants.VALUE).getAsString();
- return new UserStatusChangedMessage(id, userid, status, value);
- }
- }
- }
- }
- return null;
-
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UserUnshareWebcamRequestMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UserUnshareWebcamRequestMessage.java
deleted file mode 100755
index 051b91db0204ae731bfa25c7d96418237fd57b53..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UserUnshareWebcamRequestMessage.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-
-public class UserUnshareWebcamRequestMessage implements ISubscribedMessage {
- public static final String USER_UNSHARE_WEBCAM_REQUEST = "user_unshare_webcam_request_message";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String userId;
- public final String stream;
-
- public UserUnshareWebcamRequestMessage(String meetingId, String userId, String stream) {
- this.meetingId = meetingId;
- this.userId = userId;
- this.stream = stream;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.USER_ID, userId);
- payload.put(Constants.STREAM, stream);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(USER_UNSHARE_WEBCAM_REQUEST, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static UserUnshareWebcamRequestMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (USER_UNSHARE_WEBCAM_REQUEST.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USER_ID)
- && payload.has(Constants.STREAM)) {
- String id = payload.get(Constants.MEETING_ID).getAsString();
- String userid = payload.get(Constants.USER_ID).getAsString();
- String stream = payload.get(Constants.STREAM).getAsString();
- return new UserUnshareWebcamRequestMessage(id, userid, stream);
- }
- }
- }
- }
- return null;
-
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UserUnsharedWebcamMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UserUnsharedWebcamMessage.java
deleted file mode 100755
index 8ae89d0348e8981781f284fd6e2d13cd121f2baf..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UserUnsharedWebcamMessage.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-
-public class UserUnsharedWebcamMessage implements ISubscribedMessage {
- public static final String USER_UNSHARED_WEBCAM = "user_unshared_webcam_message";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String userId;
- public final String stream;
-
- public UserUnsharedWebcamMessage(String meetingId, String userId, String stream) {
- this.meetingId = meetingId;
- this.userId = userId;
- this.stream = stream;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.USER_ID, userId);
- payload.put(Constants.STREAM, stream);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(USER_UNSHARED_WEBCAM, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static UserUnsharedWebcamMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (USER_UNSHARED_WEBCAM.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USER_ID)
- && payload.has(Constants.STREAM)) {
- String id = payload.get(Constants.MEETING_ID).getAsString();
- String userid = payload.get(Constants.USER_ID).getAsString();
- String stream = payload.get(Constants.STREAM).getAsString();
- return new UserUnsharedWebcamMessage(id, userid, stream);
- }
- }
- }
- }
- return null;
-
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UserVoiceMutedMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UserVoiceMutedMessage.java
deleted file mode 100755
index a9942670717d4b2f77811489b56feee430472fe9..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UserVoiceMutedMessage.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-
-public class UserVoiceMutedMessage implements ISubscribedMessage {
- public static final String USER_VOICE_MUTED = "user_voice_muted_message";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final Map<String, Object> user;
- public final String voiceConf;
-
- public UserVoiceMutedMessage(String meetingId, Map<String, Object> user, String voiceConf) {
- this.meetingId = meetingId;
- this.user = user;
- this.voiceConf = voiceConf;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.USER, user);
- payload.put(Constants.VOICE_CONF, voiceConf);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(USER_VOICE_MUTED, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static UserVoiceMutedMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (USER_VOICE_MUTED.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USER)) {
- String id = payload.get(Constants.MEETING_ID).getAsString();
- String voiceConf = payload.get(Constants.VOICE_CONF).getAsString();
-
- JsonObject user = (JsonObject) payload.get(Constants.USER);
-
- Util util = new Util();
- Map<String, Object> userMap = util.extractUser(user);
-
- if (userMap != null) {
- return new UserVoiceMutedMessage(id, userMap, voiceConf);
- }
- }
- }
- }
- }
- return null;
-
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UserVoiceTalkingMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UserVoiceTalkingMessage.java
deleted file mode 100755
index 2445d97e71dd90e8c661782a1c42d46bb1d92b8b..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/UserVoiceTalkingMessage.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-
-public class UserVoiceTalkingMessage implements ISubscribedMessage {
- public static final String USER_VOICE_TALKING = "user_voice_talking_message";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final Map<String, Object> user;
- public final String voiceConf;
-
- public UserVoiceTalkingMessage(String meetingId, Map<String, Object> user, String voiceConf) {
- this.meetingId = meetingId;
- this.user = user;
- this.voiceConf = voiceConf;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.USER, user);
- payload.put(Constants.VOICE_CONF, voiceConf);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(USER_VOICE_TALKING, VERSION, null);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static UserVoiceTalkingMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (USER_VOICE_TALKING.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USER)) {
- String id = payload.get(Constants.MEETING_ID).getAsString();
- String voiceConf = payload.get(Constants.VOICE_CONF).getAsString();
-
- JsonObject user = (JsonObject) payload.get(Constants.USER);
-
- Util util = new Util();
- Map<String, Object> userMap = util.extractUser(user);
-
- if (userMap != null) {
- return new UserVoiceTalkingMessage(id, userMap, voiceConf);
- }
- }
- }
- }
- }
- return null;
-
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/ValidateAuthTokenMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/ValidateAuthTokenMessage.java
deleted file mode 100755
index 5edce96fd2bb459ce70e177ae9cd6652375b4cc8..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/ValidateAuthTokenMessage.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class ValidateAuthTokenMessage implements IPublishedMessage {
- public static final String VALIDATE_AUTH_TOKEN = "validate_auth_token";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String userId;
- public final String token;
- public final String replyTo;
- public final String sessionId;
-
- public ValidateAuthTokenMessage(String meetingId, String userId, String token, String replyTo, String sessionId) {
- this.meetingId = meetingId;
- this.userId = userId;
- this.token = token;
- this.replyTo = replyTo;
- this.sessionId = sessionId;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.MEETING_ID, meetingId);
- payload.put(Constants.USER_ID, userId);
- payload.put(Constants.AUTH_TOKEN, token);
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(VALIDATE_AUTH_TOKEN, VERSION, replyTo);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static ValidateAuthTokenMessage fromJson(String message) {
- System.out.println("Process ValidateAuthTokenMessage.fromJson");
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- System.out.println("Process ValidateAuthTokenMessage.fromJson 1");
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- System.out.println("Process ValidateAuthTokenMessage.fromJson 2");
- String messageName = header.get("name").getAsString();
- if (VALIDATE_AUTH_TOKEN.equals(messageName)) {
- System.out.println("Process ValidateAuthTokenMessage.fromJson 3");
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USER_ID)
- && payload.has(Constants.AUTH_TOKEN)
- && header.has(Constants.REPLY_TO)) {
- System.out.println("Process ValidateAuthTokenMessage.fromJson 4");
- String id = payload.get(Constants.MEETING_ID).getAsString();
- String userid = payload.get(Constants.USER_ID).getAsString();
- String authToken = payload.get(Constants.AUTH_TOKEN).getAsString();
- String replyTo = header.get(Constants.REPLY_TO).getAsString();
- String sessionId = "tobeimplemented";
- return new ValidateAuthTokenMessage(id, userid, authToken, replyTo,
- sessionId);
- }
- }
- }
- }
- System.out.println("Process ValidateAuthTokenMessage.fromJson 0000");
- return null;
-
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/ValidateAuthTokenReplyMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/ValidateAuthTokenReplyMessage.java
deleted file mode 100755
index 01b16000e9583f5f919075396bf3030682cccbc6..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/ValidateAuthTokenReplyMessage.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class ValidateAuthTokenReplyMessage implements ISubscribedMessage {
- public static final String VALIDATE_AUTH_TOKEN_REPLY = "validate_auth_token_reply";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String userId;
- public final String token;
- public final String replyTo;
- public final Boolean valid;
-
- public ValidateAuthTokenReplyMessage(String meetingId, String userId, String token,
- Boolean valid, String replyTo) {
- this.meetingId = meetingId;
- this.userId = userId;
- this.token = token;
- this.replyTo = replyTo;
- this.valid = valid;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.REPLY_TO, replyTo);
- payload.put(Constants.VALID, valid);
- payload.put(Constants.USER_ID, userId);
- payload.put(Constants.AUTH_TOKEN, token);
- payload.put(Constants.MEETING_ID, meetingId);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(VALIDATE_AUTH_TOKEN_REPLY, VERSION, replyTo);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static ValidateAuthTokenReplyMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (VALIDATE_AUTH_TOKEN_REPLY.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USER_ID)
- && payload.has(Constants.AUTH_TOKEN)
- && payload.has(Constants.VALID)
- && payload.has(Constants.REPLY_TO)) {
- String id = payload.get(Constants.MEETING_ID).getAsString();
- String userid = payload.get(Constants.USER_ID).getAsString();
- String authToken = payload.get(Constants.AUTH_TOKEN).getAsString();
- String replyTo = payload.get(Constants.REPLY_TO).getAsString();
- Boolean valid = payload.get(Constants.VALID).getAsBoolean();
- return new ValidateAuthTokenReplyMessage(id, userid, authToken, valid, replyTo);
- }
- }
- }
- }
- return null;
-
- }
-}
diff --git a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/ValidateAuthTokenTimeoutMessage.java b/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/ValidateAuthTokenTimeoutMessage.java
deleted file mode 100755
index f8fdd31f545a1f40519db844ce4a54f0b839d721..0000000000000000000000000000000000000000
--- a/bigbluebutton-apps/src/main/java/org/bigbluebutton/common/messages/ValidateAuthTokenTimeoutMessage.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package org.bigbluebutton.common.messages;
-
-import java.util.HashMap;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-
-public class ValidateAuthTokenTimeoutMessage implements ISubscribedMessage {
- public static final String VALIDATE_AUTH_TOKEN_TIMEOUT = "validate_auth_token_timeout";
- public static final String VERSION = "0.0.1";
-
- public final String meetingId;
- public final String userId;
- public final String token;
- public final String replyTo;
- public final Boolean valid;
-
- public ValidateAuthTokenTimeoutMessage(String meetingId, String userId, String token,
- Boolean valid, String replyTo) {
- this.meetingId = meetingId;
- this.userId = userId;
- this.token = token;
- this.replyTo = replyTo;
- this.valid = valid;
- }
-
- public String toJson() {
- HashMap<String, Object> payload = new HashMap<String, Object>();
- payload.put(Constants.REPLY_TO, replyTo);
- payload.put(Constants.VALID, valid);
- payload.put(Constants.USER_ID, userId);
- payload.put(Constants.AUTH_TOKEN, token);
- payload.put(Constants.MEETING_ID, meetingId);
-
- java.util.HashMap<String, Object> header = MessageBuilder.buildHeader(VALIDATE_AUTH_TOKEN_TIMEOUT, VERSION, replyTo);
-
- return MessageBuilder.buildJson(header, payload);
- }
-
- public static ValidateAuthTokenTimeoutMessage fromJson(String message) {
- JsonParser parser = new JsonParser();
- JsonObject obj = (JsonObject) parser.parse(message);
-
- if (obj.has("header") && obj.has("payload")) {
- JsonObject header = (JsonObject) obj.get("header");
- JsonObject payload = (JsonObject) obj.get("payload");
-
- if (header.has("name")) {
- String messageName = header.get("name").getAsString();
- if (VALIDATE_AUTH_TOKEN_TIMEOUT.equals(messageName)) {
- if (payload.has(Constants.MEETING_ID)
- && payload.has(Constants.USER_ID)
- && payload.has(Constants.AUTH_TOKEN)
- && payload.has(Constants.VALID)
- && payload.has(Constants.REPLY_TO)) {
- String id = payload.get(Constants.MEETING_ID).getAsString();
- String userid = payload.get(Constants.USER_ID).getAsString();
- String authToken = payload.get(Constants.AUTH_TOKEN).getAsString();
- String replyTo = payload.get(Constants.REPLY_TO).getAsString();
- Boolean valid = payload.get(Constants.VALID).getAsBoolean();
- return new ValidateAuthTokenTimeoutMessage(id, userid, authToken, valid, replyTo);
- }
- }
- }
- }
- return null;
-
- }
-}