This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 56a8f5e [OPENMEETINGS-1856] sonar should be more happy
56a8f5e is described below
commit 56a8f5e5c5e230a8da89b8071608cc2592974c3e
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Fri Nov 9 16:45:56 2018 +0700
[OPENMEETINGS-1856] sonar should be more happy
---
.../core/converter/InterviewConverter.java | 42 ++--
.../openmeetings/core/remote/KurentoHandler.java | 220 +++++++++++----------
.../openmeetings/util/OMContextListener.java | 1 +
.../openmeetings/web/admin/groups/GroupForm.java | 6 +-
.../openmeetings/web/room/menu/PollsSubMenu.java | 4 +-
.../openmeetings/web/room/raw-video-manager.js | 2 +-
.../openmeetings/webservice/NetTestWebService.java | 3 -
7 files changed, 142 insertions(+), 136 deletions(-)
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java
index 2cd9151..1d12e99 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java
@@ -178,28 +178,28 @@ public class InterviewConverter extends BaseConverter
implements IRecordingConve
private Date processParts(Long roomId, List<RecordingChunk> chunks,
ProcessResultList logs, int N, List<PodPart> parts, Date pStart) throws
IOException {
for (RecordingChunk chunk : chunks) {
File chunkStream = getRecordingChunk(roomId,
chunk.getStreamName());
- if (chunkStream.exists()) {
- String path = chunkStream.getCanonicalPath();
- /* CHECK FILE:
- * ffmpeg -i
rec_316_stream_567_2013_08_28_11_51_45.webm -v error -f null file.null
- */
- String[] args = new String[]
{getPathToFFMPEG(), "-y"
- , "-i", path
- , "-v", "error"
- , "-f", "null"
- , "file.null"};
- ProcessResult res =
ProcessHelper.executeScript(String.format("Check chunk pod video_%s_%s", N,
parts.size()), args, true);
- logs.add(res);
- if (!res.isWarn()) {
- long diff = diff(chunk.isAudioOnly() ?
chunk.getEnd() : chunk.getStart(), pStart);
- PodPart.add(parts, diff);
- if (!chunk.isAudioOnly()) {
- parts.add(new PodPart(path,
diff(chunk.getEnd(), chunk.getStart())));
- }
- pStart = chunk.getEnd();
- }
- } else {
+ if (!chunkStream.exists()) {
log.debug("Chunk stream doesn't exist: {}",
chunkStream);
+ continue;
+ }
+ String path = chunkStream.getCanonicalPath();
+ /* CHECK FILE:
+ * ffmpeg -i
rec_316_stream_567_2013_08_28_11_51_45.webm -v error -f null file.null
+ */
+ String[] args = new String[] {getPathToFFMPEG(), "-y"
+ , "-i", path
+ , "-v", "error"
+ , "-f", "null"
+ , "file.null"};
+ ProcessResult res =
ProcessHelper.executeScript(String.format("Check chunk pod video_%s_%s", N,
parts.size()), args, true);
+ logs.add(res);
+ if (!res.isWarn()) {
+ long diff = diff(chunk.isAudioOnly() ?
chunk.getEnd() : chunk.getStart(), pStart);
+ PodPart.add(parts, diff);
+ if (!chunk.isAudioOnly()) {
+ parts.add(new PodPart(path,
diff(chunk.getEnd(), chunk.getStart())));
+ }
+ pStart = chunk.getEnd();
}
}
return pStart;
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KurentoHandler.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KurentoHandler.java
index bf2fdde..e171e3c 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KurentoHandler.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KurentoHandler.java
@@ -169,6 +169,118 @@ public class KurentoHandler {
return pipe;
}
+ private void onTestMessage(IWsClient _c, final String cmdId, JSONObject
msg) {
+ KTestStream user = getTestByUid(_c.getUid());
+ switch (cmdId) {
+ case "wannaRecord":
+ WebSocketHelper.sendClient(_c,
newTestKurentoMsg()
+ .put("id", "canRecord")
+ .put(PARAM_ICE,
getTurnServers(true))
+ );
+ break;
+ case "record":
+ user = new KTestStream(this, _c, msg,
createTestPipeline());
+ testsByUid.put(_c.getUid(), user);
+ break;
+ case "iceCandidate":
+ JSONObject candidate =
msg.getJSONObject(PARAM_CANDIDATE);
+ if (user != null) {
+ IceCandidate cand = new
IceCandidate(candidate.getString(PARAM_CANDIDATE),
+
candidate.getString("sdpMid"), candidate.getInt("sdpMLineIndex"));
+ user.addCandidate(cand);
+ }
+ break;
+ case "wannaPlay":
+ WebSocketHelper.sendClient(_c,
newTestKurentoMsg()
+ .put("id", "canPlay")
+ .put(PARAM_ICE,
getTurnServers(true))
+ );
+ break;
+ case "play":
+ if (user != null) {
+ user.play(this, _c, msg,
createTestPipeline());
+ }
+ break;
+ }
+ }
+
+ private void onMessage(Client c, final String cmdId, JSONObject msg) {
+ final String uid = msg.optString("uid");
+ KStream sender;
+ StreamDesc sd;
+ log.debug("Incoming message from user with ID '{}': {}",
c.getUserId(), msg);
+ switch (cmdId) {
+ case "devicesAltered":
+ if (!msg.getBoolean("audio") &&
c.hasActivity(Activity.AUDIO)) {
+ c.remove(Activity.AUDIO);
+ }
+ if (!msg.getBoolean("video") &&
c.hasActivity(Activity.VIDEO)) {
+ c.remove(Activity.VIDEO);
+ }
+ c.getStream(uid).setActivities();
+ WebSocketHelper.sendRoom(new
TextRoomMessage(c.getRoomId(), cm.update(c), RoomMessage.Type.rightUpdated,
c.getUid()));
+ break;
+ case "toggleActivity":
+ toggleActivity(c,
Activity.valueOf(msg.getString("activity")));
+ break;
+ case "broadcastStarted":
+ sd = c.getStream(uid);
+ sender = getByUid(uid);
+ if (sender == null) {
+ KRoom room = getRoom(c.getRoomId());
+ sender = room.join(sd);
+ }
+ sender.startBroadcast(this, sd,
msg.getString("sdpOffer"));
+ if (StreamType.SCREEN == sd.getType() &&
sd.hasActivity(Activity.RECORD) && !isRecording(c.getRoomId())) {
+ startRecording(c);
+ }
+ break;
+ case "onIceCandidate":
+ sender = getByUid(uid);
+ if (sender != null) {
+ JSONObject candidate =
msg.getJSONObject(PARAM_CANDIDATE);
+ IceCandidate cand = new IceCandidate(
+
candidate.getString(PARAM_CANDIDATE)
+ ,
candidate.getString("sdpMid")
+ ,
candidate.getInt("sdpMLineIndex"));
+ sender.addCandidate(cand,
msg.getString("luid"));
+ }
+ break;
+ case "addListener":
+ sender = getByUid(msg.getString("sender"));
+ if (sender != null) {
+ sender.addListener(this, c.getSid(),
c.getUid(), msg.getString("sdpOffer"));
+ }
+ break;
+ case "wannaShare":
+ if (screenShareAllowed(c)) {
+ startSharing(c, msg, Activity.SCREEN);
+ }
+ break;
+ case "wannaRecord":
+ if (recordingAllowed(c)) {
+ Room r = c.getRoom();
+ if (Room.Type.interview == r.getType())
{
+ log.warn("This shouldn't be
called for interview room");
+ break;
+ }
+ if (isSharing(r.getId())) {
+ startRecording(c);
+ } else {
+ startSharing(c, msg,
Activity.RECORD);
+ }
+ }
+ break;
+ case "stopSharing":
+ sender = getByUid(uid);
+ sd = stopSharing(c.getSid(), uid);
+ if (sender != null && sd != null) {
+ sender.stopBroadcast(this);
+ }
+ break;
+ }
+ }
+
public void onMessage(IWsClient _c, JSONObject msg) {
if (client == null) {
sendError(_c, "Multimedia server is inaccessible");
@@ -176,119 +288,15 @@ public class KurentoHandler {
}
final String cmdId = msg.getString("id");
if (MODE_TEST.equals(msg.optString(TAG_MODE))) {
- KTestStream user = getTestByUid(_c.getUid());
- switch (cmdId) {
- case "wannaRecord":
- WebSocketHelper.sendClient(_c,
newTestKurentoMsg()
- .put("id", "canRecord")
- .put(PARAM_ICE,
getTurnServers(true))
- );
- break;
- case "record":
- user = new KTestStream(this, _c, msg,
createTestPipeline());
- testsByUid.put(_c.getUid(), user);
- break;
- case "iceCandidate":
- JSONObject candidate =
msg.getJSONObject(PARAM_CANDIDATE);
- if (user != null) {
- IceCandidate cand = new
IceCandidate(candidate.getString(PARAM_CANDIDATE),
-
candidate.getString("sdpMid"), candidate.getInt("sdpMLineIndex"));
- user.addCandidate(cand);
- }
- break;
- case "wannaPlay":
- WebSocketHelper.sendClient(_c,
newTestKurentoMsg()
- .put("id", "canPlay")
- .put(PARAM_ICE,
getTurnServers(true))
- );
- break;
- case "play":
- if (user != null) {
- user.play(this, _c, msg,
createTestPipeline());
- }
- break;
- }
+ onTestMessage(_c, cmdId, msg);
} else {
- final String uid = msg.optString("uid");
final Client c = (Client)_c;
if (c == null || c.getRoomId() == null) {
log.warn("Incoming message from invalid user");
return;
}
- KStream sender;
- StreamDesc sd;
- log.debug("Incoming message from user with ID '{}':
{}", c.getUserId(), msg);
- switch (cmdId) {
- case "devicesAltered":
- if (!msg.getBoolean("audio") &&
c.hasActivity(Activity.AUDIO)) {
- c.remove(Activity.AUDIO);
- }
- if (!msg.getBoolean("video") &&
c.hasActivity(Activity.VIDEO)) {
- c.remove(Activity.VIDEO);
- }
- c.getStream(uid).setActivities();
- WebSocketHelper.sendRoom(new
TextRoomMessage(c.getRoomId(), cm.update(c), RoomMessage.Type.rightUpdated,
c.getUid()));
- break;
- case "toggleActivity":
- toggleActivity(c,
Activity.valueOf(msg.getString("activity")));
- break;
- case "broadcastStarted":
- sd = c.getStream(uid);
- sender = getByUid(uid);
- if (sender == null) {
- KRoom room =
getRoom(c.getRoomId());
- sender = room.join(sd);
- }
- sender.startBroadcast(this, sd,
msg.getString("sdpOffer"));
- if (StreamType.SCREEN == sd.getType()
&& sd.hasActivity(Activity.RECORD) && !isRecording(c.getRoomId())) {
- startRecording(c);
- }
- break;
- case "onIceCandidate":
- sender = getByUid(uid);
- if (sender != null) {
- JSONObject candidate =
msg.getJSONObject(PARAM_CANDIDATE);
- IceCandidate cand = new
IceCandidate(
-
candidate.getString(PARAM_CANDIDATE)
- ,
candidate.getString("sdpMid")
- ,
candidate.getInt("sdpMLineIndex"));
- sender.addCandidate(cand,
msg.getString("luid"));
- }
- break;
- case "addListener":
- sender =
getByUid(msg.getString("sender"));
- if (sender != null) {
- sender.addListener(this,
c.getSid(), c.getUid(), msg.getString("sdpOffer"));
- }
- break;
- case "wannaShare":
- if (screenShareAllowed(c)) {
- startSharing(c, msg,
Activity.SCREEN);
- }
- break;
- case "wannaRecord":
- if (recordingAllowed(c)) {
- Room r = c.getRoom();
- if (Room.Type.interview ==
r.getType()) {
- log.warn("This
shouldn't be called for interview room");
- break;
- }
- if (isSharing(r.getId())) {
- startRecording(c);
- } else {
- startSharing(c, msg,
Activity.RECORD);
- }
- }
- break;
- case "stopSharing":
- sender = getByUid(uid);
- sd = stopSharing(c.getSid(), uid);
- if (sender != null && sd != null) {
- sender.stopBroadcast(this);
- }
- break;
- }
+ onMessage(c, cmdId, msg);
}
}
diff --git
a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OMContextListener.java
b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OMContextListener.java
index a662c0b..bb2b8bb 100644
---
a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OMContextListener.java
+++
b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OMContextListener.java
@@ -67,5 +67,6 @@ public class OMContextListener implements
ServletContextListener {
@Override
public void contextDestroyed(ServletContextEvent arg0) {
+ //no-op by default
}
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java
index 614e645..aa31dd8 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java
@@ -78,9 +78,9 @@ public class GroupForm extends AdminBaseForm<Group> {
@Override
protected void deleteImage() throws Exception {
Long groupId = GroupForm.this.getModelObject().getId();
- File logo = new File(getGroupLogoDir(),
String.format("logo%s.png", groupId));
- if (groupId != null && logo.exists()) {
- logo.delete();
+ File flogo = new File(getGroupLogoDir(),
String.format("logo%s.png", groupId));
+ if (groupId != null && flogo.exists()) {
+ flogo.delete();
}
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/PollsSubMenu.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/PollsSubMenu.java
index 91783cc..2dacf9b 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/PollsSubMenu.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/PollsSubMenu.java
@@ -76,8 +76,8 @@ public class PollsSubMenu implements Serializable {
if (ACTION_CLOSE.equals(action)) {
qpollManager.close(c);
} else if (PARAM_VOTE.equals(action)) {
- boolean vote =
mp.getRequest().getRequestParameters().getParameterValue(PARAM_VOTE).toBoolean();
- qpollManager.vote(c, vote);
+ final boolean curVote =
mp.getRequest().getRequestParameters().getParameterValue(PARAM_VOTE).toBoolean();
+ qpollManager.vote(c, curVote);
}
} catch (Exception e) {
log.error("Unexpected exception while toggle
'quickPollAction'", e);
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video-manager.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video-manager.js
index d58a32a..d2d6ddd 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video-manager.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video-manager.js
@@ -27,7 +27,6 @@ var VideoManager = (function() {
OmUtil.log(uid + ' receiving video');
}
function _onKMessage(m) {
- OmUtil.info('Received message: ' + msg);
switch (m.id) {
case 'clientLeave':
$(VID_SEL + ' div[data-client-uid="' + m.uid +
'"]').each(function() {
@@ -79,6 +78,7 @@ var VideoManager = (function() {
return;
}
if ('kurento' === m.type && 'test' !== m.mode) {
+ OmUtil.info('Received message: ' + msg);
_onKMessage(m);
} else if ('mic' === m.type) {
switch (m.id) {
diff --git
a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/NetTestWebService.java
b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/NetTestWebService.java
index 5b23efa..bf601fd 100644
---
a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/NetTestWebService.java
+++
b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/NetTestWebService.java
@@ -53,9 +53,6 @@ public class NetTestWebService {
private static final int JITTER_PACKET_SIZE = 1024;
private static final int MAX_UPLOAD_SIZE = 16 * 1024 * 1024;
- public NetTestWebService() {
- }
-
@GET
@Produces(MediaType.APPLICATION_OCTET_STREAM)
@Path("/")
