Repository: openmeetings Updated Branches: refs/heads/master ee970f39a -> 0b780b708
[OPENMEETINGS-1714] more issues are fixed Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/0b780b70 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/0b780b70 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/0b780b70 Branch: refs/heads/master Commit: 0b780b708b94269dc663c9994eb661ce54152c87 Parents: ee970f3 Author: Maxim Solodovnik <[email protected]> Authored: Sat Sep 30 18:34:45 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Sat Sep 30 18:34:45 2017 +0700 ---------------------------------------------------------------------- .../web/room/activities/ActivitiesPanel.java | 115 +++++++++---------- .../web/room/sidebar/RoomClientPanel.java | 2 +- .../apache/openmeetings/web/room/wb/wb-area.js | 1 - .../web/user/calendar/CalendarPanel.java | 8 +- .../apache/openmeetings/web/user/chat/Chat.java | 4 +- .../apache/openmeetings/web/user/chat/chat.js | 56 ++++----- .../openmeetings/web/user/rooms/RoomsPanel.java | 2 +- .../web/util/ExtendedClientProperties.java | 13 ++- .../web/util/UserChoiceProvider.java | 2 +- .../openmeetings/webservice/FileWebService.java | 3 +- .../util/AppointmentMessageBodyReader.java | 2 +- pom.xml | 2 +- 12 files changed, 104 insertions(+), 106 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0b780b70/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java index 1143ff3..86eb83a 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java @@ -80,67 +80,66 @@ public class ActivitiesPanel extends Panel { try { String id = getRequest().getRequestParameters().getParameterValue(PARAM_ID).toString(); long roomId = getRequest().getRequestParameters().getParameterValue(PARAM_ROOM_ID).toLong(); - assert(room.getRoom().getId().equals(roomId)); Action action = Action.valueOf(getRequest().getRequestParameters().getParameterValue(ACTION).toString()); Activity a = activities.get(id); - if (a != null) { - switch (action) { - case close: - remove(id, target); - break; - case decline: - if (room.getClient().hasRight(Right.moderator)) { - sendRoom(new TextRoomMessage(room.getRoom().getId(), getUserId(), RoomMessage.Type.activityRemove, id)); - } - break; - case accept: - Client client = getOnlineClient(a.getUid()); - if (room.getClient().hasRight(Right.moderator) && client != null && client.getRoom() != null && roomId == client.getRoom().getId()) { - switch (a.getType()) { - case reqRightModerator: - sendRoom(new TextRoomMessage(room.getRoom().getId(), getUserId(), RoomMessage.Type.activityRemove, id)); - room.allowRight(client, Right.moderator); - break; - case reqRightAv: - sendRoom(new TextRoomMessage(room.getRoom().getId(), getUserId(), RoomMessage.Type.activityRemove, id)); - room.allowRight(client, Right.audio, Right.video); - break; - case reqRightPresenter: - sendRoom(new TextRoomMessage(room.getRoom().getId(), getUserId(), RoomMessage.Type.activityRemove, id)); - room.allowRight(client, Right.presenter); - break; - case reqRightWb: - sendRoom(new TextRoomMessage(room.getRoom().getId(), getUserId(), RoomMessage.Type.activityRemove, id)); - room.allowRight(client, Right.whiteBoard); - break; - case reqRightShare: - sendRoom(new TextRoomMessage(room.getRoom().getId(), getUserId(), RoomMessage.Type.activityRemove, id)); - room.allowRight(client, Right.share); - break; - case reqRightRemote: - sendRoom(new TextRoomMessage(room.getRoom().getId(), getUserId(), RoomMessage.Type.activityRemove, id)); - room.allowRight(client, Right.remoteControl); - break; - case reqRightA: - sendRoom(new TextRoomMessage(room.getRoom().getId(), getUserId(), RoomMessage.Type.activityRemove, id)); - room.allowRight(client, Right.audio); - break; - case reqRightMute: - sendRoom(new TextRoomMessage(room.getRoom().getId(), getUserId(), RoomMessage.Type.activityRemove, id)); - room.allowRight(client, Right.mute); - break; - case reqRightExclusive: - sendRoom(new TextRoomMessage(room.getRoom().getId(), getUserId(), RoomMessage.Type.activityRemove, id)); - room.allowRight(client, Right.exclusive); - break; - default: - break; - } - } - break; - } - } else { + if (a == null || !room.getRoom().getId().equals(roomId)) { log.error("It seems like we are being hacked!!!!"); + return; + } + switch (action) { + case close: + remove(id, target); + break; + case decline: + if (room.getClient().hasRight(Right.moderator)) { + sendRoom(new TextRoomMessage(room.getRoom().getId(), getUserId(), RoomMessage.Type.activityRemove, id)); + } + break; + case accept: + Client client = getOnlineClient(a.getUid()); + if (room.getClient().hasRight(Right.moderator) && client != null && client.getRoom() != null && roomId == client.getRoom().getId()) { + switch (a.getType()) { + case reqRightModerator: + sendRoom(new TextRoomMessage(room.getRoom().getId(), getUserId(), RoomMessage.Type.activityRemove, id)); + room.allowRight(client, Right.moderator); + break; + case reqRightAv: + sendRoom(new TextRoomMessage(room.getRoom().getId(), getUserId(), RoomMessage.Type.activityRemove, id)); + room.allowRight(client, Right.audio, Right.video); + break; + case reqRightPresenter: + sendRoom(new TextRoomMessage(room.getRoom().getId(), getUserId(), RoomMessage.Type.activityRemove, id)); + room.allowRight(client, Right.presenter); + break; + case reqRightWb: + sendRoom(new TextRoomMessage(room.getRoom().getId(), getUserId(), RoomMessage.Type.activityRemove, id)); + room.allowRight(client, Right.whiteBoard); + break; + case reqRightShare: + sendRoom(new TextRoomMessage(room.getRoom().getId(), getUserId(), RoomMessage.Type.activityRemove, id)); + room.allowRight(client, Right.share); + break; + case reqRightRemote: + sendRoom(new TextRoomMessage(room.getRoom().getId(), getUserId(), RoomMessage.Type.activityRemove, id)); + room.allowRight(client, Right.remoteControl); + break; + case reqRightA: + sendRoom(new TextRoomMessage(room.getRoom().getId(), getUserId(), RoomMessage.Type.activityRemove, id)); + room.allowRight(client, Right.audio); + break; + case reqRightMute: + sendRoom(new TextRoomMessage(room.getRoom().getId(), getUserId(), RoomMessage.Type.activityRemove, id)); + room.allowRight(client, Right.mute); + break; + case reqRightExclusive: + sendRoom(new TextRoomMessage(room.getRoom().getId(), getUserId(), RoomMessage.Type.activityRemove, id)); + room.allowRight(client, Right.exclusive); + break; + default: + break; + } + } + break; } } catch (Exception e) { log.error("Unexpected exception while processing activity action", e); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0b780b70/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java index acabf1e..8dec794 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java @@ -89,7 +89,7 @@ public class RoomClientPanel extends Panel { protected void onInitialize() { super.onInitialize(); Client c = (Client)getDefaultModelObject(); - String status = null, statusTitle = null; + String status, statusTitle; if (c.hasRight(Right.moderator)) { status = "status-mod"; statusTitle = "679"; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0b780b70/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-area.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-area.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-area.js index ee3919c..19498df 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-area.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-area.js @@ -289,7 +289,6 @@ $(function() { eval(m.func); } } catch (err) { - console.log(err); //no-op } }); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0b780b70/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java index 7ff247f..d732b50 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java @@ -173,11 +173,11 @@ public class CalendarPanel extends UserBasePanel { days.put(0, Application.getString("466")); shortDays.put(0, Application.getString("459")); for (int i = 0; i < 12; i++) { - monthes.put(i, Application.getString("" + (469 + i))); - shortMonthes.put(i, Application.getString("" + (1556 + i))); + monthes.put(i, Application.getString(String.valueOf(469 + i))); + shortMonthes.put(i, Application.getString(String.valueOf(1556 + i))); if (i + 1 < 7) { - days.put(i + 1, Application.getString("" + (460 + i))); - shortDays.put(i + 1, Application.getString("" + (453 + i))); + days.put(i + 1, Application.getString(String.valueOf(460 + i))); + shortDays.put(i + 1, Application.getString(String.valueOf(453 + i))); } } options.set("monthNames", monthes.toString()); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0b780b70/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java index a1035c4..acfed84 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java @@ -147,7 +147,7 @@ public class Chat extends Panel { StringBuilder sb = new StringBuilder(); sb.append(String.format("Chat.addTab('%1$s%2$d', '%3$s %2$d');", ID_ROOM_PREFIX, r.getId(), Application.getString("406"))); List<ChatMessage> list = getBean(ChatDao.class).getRoom(r.getId(), 0, 30, !r.isChatModerated() || isModerator(getUserId(), r.getId())); - if (list.size() > 0) { + if (!list.isEmpty()) { sb.append("Chat.addMessage(").append(getMessage(list).toString()).append(");"); } return sb; @@ -171,7 +171,7 @@ public class Chat extends Panel { } list.addAll(dao.getUserRecent(getUserId(), Date.from(Instant.now().minus(Duration.ofHours(1L))), 0, 30)); StringBuilder sb = new StringBuilder(getReinit()); - if (list.size() > 0) { + if (!list.isEmpty()) { sb.append("Chat.addMessage(").append(getMessage(list).toString()).append(");"); } response.render(OnDomReadyHeaderItem.forScript(sb.toString())); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0b780b70/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js index 9564175..9264f50 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js @@ -1,6 +1,6 @@ /* Licensed under the Apache License, Version 2.0 (the "License") http://www.apache.org/licenses/LICENSE-2.0 */ var Chat = function() { - var chatTabs + let chatTabs , tabTemplate = "<li><a href='#{href}'>#{label}</a></li>" , msgTemplate = "<div class='clear' id='chat-msg-id-#{id}'><img class='profile' src='#{imgSrc}'/><span class='from' data-user-id='#{userId}'>#{from}</span><span class='date align-right'>#{sent}</span>#{msg}</div>" , acceptTemplate = "<div class='tick om-icon align-right clickable' data-msgid='#{msgid}' data-roomid='#{roomid}' onclick='var e=$(this);chatActivity('accept',e.data(\"roomid\"),e.data(\"msgid\"));e.parent().remove();'></div>" @@ -36,11 +36,11 @@ var Chat = function() { } } function _save() { - var _s = JSON.stringify(s); + let _s = JSON.stringify(s); localStorage.setItem('openmeetings', _s); } function _updateBtn(a) { - var muted = s.chat.muted === true; + let muted = s.chat.muted === true; a.removeClass('sound' + (muted ? '' : '-mute')).addClass('sound' + (muted ? '-mute' : '')) .attr('title', a.data(muted ? 'sound-enabled' : 'sound-muted')); } @@ -49,27 +49,27 @@ var Chat = function() { chatActivity('typing_stop', $('.room.box').data('room-id')); } function initToolbar() { - var emtBtn = $('#emoticons'); + let emtBtn = $('#emoticons'); emtBtn.html(''); emtBtn.append(' ' + emoticon.emoticonize(':)') + ' <b class="caret"></b>'); - var emots = [].concat.apply([], [emoticon.threeCharEmoticons, emoticon.twoCharEmoticons]); - for (var ei in emoticon.specialEmoticons) { + let emots = [].concat.apply([], [emoticon.threeCharEmoticons, emoticon.twoCharEmoticons]); + for (let ei in emoticon.specialEmoticons) { emots.push(ei); } - var emotMenuList = $('#emotMenuList'); + let emotMenuList = $('#emotMenuList'); emotMenuList.html(''); - var rowSize = 20; - var row = $('<tr></tr>'); - for (var i = 0; i < emots.length; ++i) { + let rowSize = 20; + let row = $('<tr></tr>'); + for (let i = 0; i < emots.length; ++i) { row.append('<td><div class="emt" onclick="Chat.emtClick(\'' + emots[i] + '\');">' + emoticon.emoticonize(emots[i]) + '</div></td>'); - if (i != 0 && i % rowSize == 0) { + if (i !== 0 && i % rowSize === 0) { emotMenuList.append(row); row = $('<tr></tr>'); } } _load(); - var a = $('#chat .audio'); + let a = $('#chat .audio'); _updateBtn(a); $('#chat .chat-btn').hover(function(){ $(this).addClass('ui-state-hover') }, function(){ $(this).removeClass('ui-state-hover') }); a.click(function() { @@ -99,7 +99,7 @@ var Chat = function() { }); // close icon: removing the tab on click chatTabs.delegate("span.ui-icon-close", "click", function() { - var panelId = $(this).closest("li").remove().attr("aria-controls"); + let panelId = $(this).closest("li").remove().attr("aria-controls"); $("#" + panelId).remove(); chatTabs.tabs("refresh"); }); @@ -115,7 +115,7 @@ var Chat = function() { } }); $('#chatMessage').off().on('input propertychange paste', function () { - var room = $('.room.box'); + let room = $('.room.box'); if (room.length) { if (!!typingTimer) { clearTimeout(typingTimer); @@ -141,10 +141,10 @@ var Chat = function() { return; } if (!label) { - label = id == "chatTab-all" ? allPrefix : roomPrefix + id.substr(9); + label = id === "chatTab-all" ? allPrefix : roomPrefix + id.substr(9); } - var li = $(tabTemplate.replace(/#\{href\}/g, "#" + id).replace(/#\{label\}/g, label)); - if (id.indexOf("chatTab-r") != 0) { + let li = $(tabTemplate.replace(/#\{href\}/g, "#" + id).replace(/#\{label\}/g, label)); + if (id.indexOf("chatTab-r") !== 0) { li.append(closeBlock); } chatTabs.find(".ui-tabs-nav").append(li); @@ -153,11 +153,11 @@ var Chat = function() { activateTab(id); } , addMessage: function(m) { - if ($('#chat').length > 0 && m && m.type == "chat") { + if ($('#chat').length > 0 && m && m.type === "chat") { if (isClosed()) { $('#chatPopup .control.block').addClass('ui-state-highlight'); if ($('#chatPanel').is(':visible') && s.chat.muted !== true) { - var playPromise = audio.play(); + let playPromise = audio.play(); // In browsers that donât yet support this functionality, // playPromise wonât be defined. @@ -170,18 +170,18 @@ var Chat = function() { } } } - var msg, cm; + let msg, cm; while (!!(cm = m.msg.pop())) { - var area = $('#' + cm.scope); + let area = $('#' + cm.scope); msg = $(msgTemplate.replace(/#\{id\}/g, cm.id) .replace(/#\{userId\}/g, cm.from.id) .replace(/#\{imgSrc\}/g, !!cm.from.img ? cm.from.img : './profile/' + cm.from.id + '?anticache=' + Date.now()) .replace(/#\{from\}/g, cm.from.name) .replace(/#\{sent\}/g, cm.sent) .replace(/#\{msg\}/g, emoticon.emoticonize(!!cm.message ? cm.message : ""))); - var date = msg.children('.date'); + let date = msg.children('.date'); date.after(infoTemplate.replace(/#\{userId\}/g, cm.from.id)); - if ("full" == cm.actions) { + if ("full" === cm.actions) { date.after(addTemplate.replace(/#\{userId\}/g, cm.from.id)); date.after(messageTemplate.replace(/#\{userId\}/g, cm.from.id)); date.after(inviteTemplate.replace(/#\{userId\}/g, cm.from.id)); @@ -193,10 +193,10 @@ var Chat = function() { this.addTab(cm.scope, cm.scopeName); area = $('#' + cm.scope); } - if (m.mode == "accept") { + if (m.mode === "accept") { $('#chat-msg-id-' + cm.id).remove(); } - var btm = area.scrollTop() + area.innerHeight() >= area[0].scrollHeight; + let btm = area.scrollTop() + area.innerHeight() >= area[0].scrollHeight; area.append(msg); if (btm) { area.animate({ @@ -232,7 +232,7 @@ var Chat = function() { } } , emtClick: function(emoticon) { - var editor = $('#chatMessage .wysiwyg-editor'); + let editor = $('#chatMessage .wysiwyg-editor'); editor.html(editor.html() + ' ' + emoticon + ' '); } }; @@ -244,14 +244,14 @@ $(function() { if (msg instanceof Blob) { return; //ping } - var m = jQuery.parseJSON(msg); + let m = jQuery.parseJSON(msg); if (m) { switch(m.type) { case "chat": Chat.addMessage(m); break; case "typing": - if (typeof typingActivity == "function") { + if (typeof typingActivity === "function") { typingActivity(m.uid, m.active); } break; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0b780b70/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java index 88393b5..16ae095 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java @@ -74,7 +74,7 @@ public class RoomsPanel extends UserPanel { }); // Users in this Room - add(details.setOutputMarkupId(true).setVisible(rooms.size() > 0)); + add(details.setOutputMarkupId(true).setVisible(!rooms.isEmpty())); details.add(new Label("roomId", roomID)); details.add(new Label("roomName", roomName)); details.add(new Label("roomComment", roomComment)); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0b780b70/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ExtendedClientProperties.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ExtendedClientProperties.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ExtendedClientProperties.java index a59cbbf..8403859 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ExtendedClientProperties.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ExtendedClientProperties.java @@ -54,7 +54,7 @@ public class ExtendedClientProperties extends ClientProperties { public JSONObject getSettings() { try { - return Strings.isEmpty(settings) ? new JSONObject() : new JSONObject(settings.toString()); + return Strings.isEmpty(settings) ? new JSONObject() : new JSONObject(settings); } catch (Exception e) { //can throw, no op } @@ -63,17 +63,18 @@ public class ExtendedClientProperties extends ClientProperties { private static StringBuilder cleanUrl(String _url) { StringBuilder sb = new StringBuilder(); - int semi = _url.indexOf(';'); + String url = _url; + int semi = url.indexOf(';'); if (semi > -1) { - _url = _url.substring(0, semi); + url = url.substring(0, semi); } for (String tail : new String[]{HASH_MAPPING, SIGNIN_MAPPING, NOTINIT_MAPPING}) { - if (_url.endsWith(tail)) { - _url = _url.substring(0, _url.length() - tail.length()); + if (url.endsWith(tail)) { + url = url.substring(0, url.length() - tail.length()); break; } } - return sb.append(_url); + return sb.append(url); } @Override http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0b780b70/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java index e755c2f..cd3ac9b 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java @@ -108,7 +108,7 @@ public class UserChoiceProvider extends RestrictiveChoiceProvider<User> { @Override public User fromId(String id) { - User u = null; + User u; if (newContacts.containsKey(id)) { u = newContacts.get(id); } else { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0b780b70/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java ---------------------------------------------------------------------- diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java index 470a0cc..e65b0fd 100644 --- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java +++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/FileWebService.java @@ -23,7 +23,6 @@ import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKe import static org.apache.openmeetings.webservice.Constants.TNS; import java.io.InputStream; -import java.util.ArrayList; import java.util.List; import java.util.Set; @@ -279,7 +278,7 @@ public class FileWebService extends BaseWebService { log.debug("getRoomByParent " + parentId); FileItemDao dao = getFileDao(); - List<FileItem> list = new ArrayList<>(); + List<FileItem> list; if (parentId < 0) { if (parentId == -1) { list = dao.getByOwner(userId); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0b780b70/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/util/AppointmentMessageBodyReader.java ---------------------------------------------------------------------- diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/util/AppointmentMessageBodyReader.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/util/AppointmentMessageBodyReader.java index 0d90f56..76128ab 100644 --- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/util/AppointmentMessageBodyReader.java +++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/util/AppointmentMessageBodyReader.java @@ -50,7 +50,7 @@ public class AppointmentMessageBodyReader implements MessageBodyReader<Appointme throws IOException, WebApplicationException { BufferedReader br = new BufferedReader(new InputStreamReader(entityStream, UTF_8)); - String line = null; + String line; StringBuilder sb = new StringBuilder(); while ((line = br.readLine()) != null) { sb.append(line).append(System.lineSeparator()); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0b780b70/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 3bfe152..a13f2b7 100644 --- a/pom.xml +++ b/pom.xml @@ -60,7 +60,7 @@ <!-- URL of the ASF SonarQube server --> <sonar.host.url>https://builds.apache.org/analysis</sonar.host.url> <!-- Exclude all generated code --> - <sonar.exclusions>file:**/generated-sources/**, file:**/fabric.js, file:**/cssemoticons.js, file:**/uuid.js</sonar.exclusions> + <sonar.exclusions>file:**/generated-sources/**, file:**/fabric.js, file:**/cssemoticons.js, file:**/uuid.js, file:**/fileinput*.js</sonar.exclusions> <db_user></db_user> <db_pass></db_pass> </properties>
