Skip to content

Commit

Permalink
presentation through redis part1
Browse files Browse the repository at this point in the history
  • Loading branch information
@antobinary
antobinary committed May 21, 2015
1 parent a0b30d3 commit d30c408
Show file tree
Hide file tree
Showing 10 changed files with 386 additions and 34 deletions.
1 change: 1 addition & 0 deletions ...uebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/Constants.java
View file
Expand Up @@ -93,4 +93,5 @@ public class Constants {
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";
}
4 changes: 2 additions & 2 deletions ...ton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/GetChatHistory.java
View file
Expand Up @@ -18,8 +18,6 @@ public GetChatHistory(String meetingId, String requesterId, String replyTo) {
this.meetingId = meetingId;
this.replyTo = replyTo;
this.requesterId = requesterId;
System.out.println("GetChatHistory constructor"+replyTo);
System.out.println("GetChatHistory requesterId"+requesterId);
}

public String toJson() {
Expand All @@ -28,6 +26,7 @@ public String toJson() {
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);
}
Expand All @@ -49,6 +48,7 @@ public static GetChatHistory fromJson(String message) {
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);
}
}
Expand Down
58 changes: 58 additions & 0 deletions ...pps/src/main/java/org/bigbluebutton/conference/service/messaging/GetPresentationInfo.java
View file
@@ -0,0 +1,58 @@
package org.bigbluebutton.conference.service.messaging;

import java.util.HashMap;

import com.google.gson.JsonObject;
import com.google.gson.JsonParser;

public class GetPresentationInfo implements IMessage {
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 GetPresentationInfo(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 GetPresentationInfo 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 GetPresentationInfo(meetingId, requesterId, replyTo);
}
}
}
}
return null;
}
}
69 changes: 69 additions & 0 deletions ...apps/src/main/java/org/bigbluebutton/conference/service/messaging/ResizeAndMoveSlide.java
View file
@@ -0,0 +1,69 @@
package org.bigbluebutton.conference.service.messaging;

import java.util.HashMap;

import com.google.gson.JsonObject;
import com.google.gson.JsonParser;

public class ResizeAndMoveSlide implements IMessage {
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 ResizeAndMoveSlide(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 ResizeAndMoveSlide 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 ResizeAndMoveSlide(meetingId, xOffset, yOffset, widthRatio, heightRatio);
}
}
}
}
return null;
}
}
80 changes: 80 additions & 0 deletions ...src/main/java/org/bigbluebutton/conference/service/messaging/SendConversionCompleted.java
View file
@@ -0,0 +1,80 @@
package org.bigbluebutton.conference.service.messaging;

import java.util.HashMap;

import com.google.gson.JsonObject;
import com.google.gson.JsonParser;

public class SendConversionCompleted implements IMessage {
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 SendConversionCompleted(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 SendConversionCompleted 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 SendConversionCompleted(messageKey, meetingId, code, presId, numPages, presName, presBaseUrl);
}
}
}
}
return null;
}
}
70 changes: 70 additions & 0 deletions ...ps/src/main/java/org/bigbluebutton/conference/service/messaging/SendConversionUpdate.java
View file
@@ -0,0 +1,70 @@
package org.bigbluebutton.conference.service.messaging;

import java.util.HashMap;

import com.google.gson.JsonObject;
import com.google.gson.JsonParser;

public class SendConversionUpdate implements IMessage {
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 SendConversionUpdate(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 SendConversionUpdate 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 SendConversionUpdate(messageKey, meetingId, code, presId, presName);
}
}
}
}
return null;
}
}

0 comments on commit d30c408

Please sign in to comment.