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 88ad533 [OPENMEETINGS-2427] sonar should be more happy
88ad533 is described below
commit 88ad533983ae8acbc2de1117185b51e20dad628e
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Sat Sep 12 23:39:30 2020 +0700
[OPENMEETINGS-2427] sonar should be more happy
---
.../java/org/apache/openmeetings/core/remote/KurentoHandler.java | 9 +++------
.../main/java/org/apache/openmeetings/db/util/AuthLevelUtil.java | 8 ++++----
.../main/java/org/apache/openmeetings/backup/BackupImport.java | 4 +---
.../main/java/org/apache/openmeetings/web/app/Application.java | 4 +---
.../main/java/org/apache/openmeetings/web/app/WebSession.java | 4 +---
.../org/apache/openmeetings/web/common/UploadableImagePanel.java | 4 +---
.../org/apache/openmeetings/web/pages/install/InstallWizard.java | 4 +---
.../main/java/org/apache/openmeetings/web/room/RoomPanel.java | 4 +---
.../src/main/java/org/apache/openmeetings/web/room/raw-room.js | 2 +-
.../src/main/java/org/apache/openmeetings/web/room/raw-video.js | 2 +-
.../main/java/org/apache/openmeetings/web/room/wb/WbPanel.java | 5 ++---
.../org/apache/openmeetings/web/room/wb/WbWebSocketHelper.java | 3 ---
.../main/java/org/apache/openmeetings/web/room/wb/raw-wb-area.js | 8 ++++----
.../main/java/org/apache/openmeetings/web/user/chat/raw-chat.js | 4 ++--
14 files changed, 23 insertions(+), 42 deletions(-)
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 37e5730..42d6874 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
@@ -282,9 +282,7 @@ public class KurentoHandler {
KRoom getRoom(Long roomId) {
log.debug("Searching for room {}", roomId);
- KRoom room = rooms.get(roomId);
-
- if (room == null) {
+ KRoom room = rooms.computeIfAbsent(roomId, k -> {
log.debug("Room {} does not exist. Will create now!",
roomId);
Room r = roomDao.get(roomId);
Transaction t = beginTransaction();
@@ -292,9 +290,8 @@ public class KurentoHandler {
pipe.addTag(t, TAG_KUID, kuid);
pipe.addTag(t, TAG_ROOM, String.valueOf(roomId));
t.commit();
- room = new KRoom(streamProcessor, r, pipe, chunkDao);
- rooms.put(roomId, room);
- }
+ return new KRoom(streamProcessor, r, pipe, chunkDao);
+ });
log.debug("Room {} found!", roomId);
return room;
}
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/AuthLevelUtil.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/AuthLevelUtil.java
index 076da63..bd20559 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/AuthLevelUtil.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/AuthLevelUtil.java
@@ -50,11 +50,11 @@ public class AuthLevelUtil {
if (u == null) {
return result;
}
- if (hasAdminLevel(u.getRights())) {
- //admin user get superModerator level, no-one can kick
him/her
- result.add(Room.Right.SUPER_MODERATOR);
- } else if (r.isAppointment() && a != null &&
u.getId().equals(a.getOwner().getId())) {
+ if (//admin user get superModerator level, no-one can kick
him/her
+ hasAdminLevel(u.getRights())
// appointment owner is super moderator
+ || (r.isAppointment() && a != null &&
u.getId().equals(a.getOwner().getId())))
+ {
result.add(Room.Right.SUPER_MODERATOR);
}
if (result.isEmpty()) {
diff --git
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
index b8678e2..0a9c11a 100644
---
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
+++
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
@@ -917,9 +917,7 @@ public class BackupImport {
)
{
TreeMap<Long, T> items = new TreeMap<>();
- readList(baseDir, fileName, listNodeName, nodeName, clazz, f ->
{
- items.put(f.getId(), f);
- }, false);
+ readList(baseDir, fileName, listNodeName, nodeName, clazz, f ->
items.put(f.getId(), f), false);
FileTree<T> tree = new FileTree<>();
TreeMap<Long, T> remain = new TreeMap<>();
int counter = items.size(); //max iterations
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
index 78805e8..6504f6d 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
@@ -197,9 +197,7 @@ public class Application extends
AuthenticatedWebApplication implements IApplica
cfg.setClassLoader(getClass().getClassLoader());
hazelcast = Hazelcast.getOrCreateHazelcastInstance(cfg);
serverId = hazelcast.getName();
- hazelcast.getCluster().getMembers().forEach(m -> {
- cm.serverAdded(m.getAttribute(NAME_ATTR_KEY),
m.getAttribute(SERVER_URL_ATTR_KEY));
- });
+ hazelcast.getCluster().getMembers().forEach(m ->
cm.serverAdded(m.getAttribute(NAME_ATTR_KEY),
m.getAttribute(SERVER_URL_ATTR_KEY)));
hazelWsTopic = hazelcast.getTopic("default");
hazelWsTopic.addMessageListener(msg -> {
String mServerId =
msg.getPublishingMember().getAttribute(NAME_ATTR_KEY);
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
index b5ac160..5349aa9 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
@@ -206,9 +206,7 @@ public class WebSession extends
AbstractAuthenticatedWebSession implements IWebS
String url = cm.getServerUrl(r, baseUrl -> {
PageParameters params = new PageParameters();
IRequestParameters reqParams =
RequestCycle.get().getRequest().getQueryParameters();
- reqParams.getParameterNames().forEach(name -> {
- params.add(name,
reqParams.getParameterValue(name));
- });
+ reqParams.getParameterNames().forEach(name ->
params.add(name, reqParams.getParameterValue(name)));
return Application.urlForPage(HashPage.class
, params
, baseUrl);
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.java
index 358dd9c..412878d 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.java
@@ -117,9 +117,7 @@ public abstract class UploadableImagePanel extends
ImagePanel {
private void update(Optional<AjaxRequestTarget> target) {
update();
- target.ifPresent(t -> {
- t.add(profile, form);
- });
+ target.ifPresent(t -> t.add(profile, form));
}
public void process(Optional<AjaxRequestTarget> target) {
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
index f4962f5..3b0e936 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
@@ -792,9 +792,7 @@ public class InstallWizard extends BootstrapWizard {
desc.setDefaultModelObject(getString("install.wizard.install.started"));
RequestCycle.get().find(AjaxRequestTarget.class).ifPresent(target -> {
progressBar.restart(target).setModelObject(0);
- buttons.forEach(b -> {
- target.add(b.setEnabled(false));
- });
+ buttons.forEach(b ->
target.add(b.setEnabled(false)));
target.add(desc, container);
});
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
index a3e9750..ce40b7d 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
@@ -880,9 +880,7 @@ public class RoomPanel extends BasePanel {
private CharSequence createAddClientJs(Client c) {
JSONArray arr = new JSONArray();
- cm.listByRoom(r.getId()).stream().forEach(cl -> {
- arr.put(cl.toJson(c.getUid().equals(cl.getUid())));
- });
+ cm.listByRoom(r.getId()).stream().forEach(cl ->
arr.put(cl.toJson(c.getUid().equals(cl.getUid()))));
return new StringBuilder()
.append("Room.addClient(")
.append(arr.toString(new NullStringer()))
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-room.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-room.js
index 4d8a7c4..b072891 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-room.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-room.js
@@ -287,7 +287,7 @@ var Room = (function() {
if (predicate()) {
icon.show();
const on = onfunc()
- , disabled = disabledfunc();;
+ , disabled = disabledfunc();
if (disabled) {
icon.addClass('disabled');
} else {
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js
index 63421df..302146d 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js
@@ -424,7 +424,7 @@ var Video = (function() {
state.video.data(state.data);
}
if (hasVideo) {
- vc.removeClass('audio-only').css('background-image',
'');;
+ vc.removeClass('audio-only').css('background-image',
'');
vc.parents('.ui-dialog').removeClass('audio-only');
state.video.attr('poster', sd.user.pictureUri);
} else {
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
index d735747..80b165b 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
@@ -364,9 +364,8 @@ public class WbPanel extends AbstractWbPanel {
break;
case clearSlide:
{
- wbm.cleanSlide(roomId,
obj.getLong("wbId"), obj.getInt(ATTR_SLIDE), (wb, arr) -> {
- addUndo(wb.getId(), new
UndoObject(UndoObject.Type.remove, arr));
- });
+ wbm.cleanSlide(roomId,
obj.getLong("wbId"), obj.getInt(ATTR_SLIDE)
+ , (wb, arr) ->
addUndo(wb.getId(), new UndoObject(UndoObject.Type.remove, arr)));
}
break;
case save:
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbWebSocketHelper.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbWebSocketHelper.java
index 87bf4b2..af62dae 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbWebSocketHelper.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbWebSocketHelper.java
@@ -144,9 +144,6 @@ public class WbWebSocketHelper extends WebSocketHelper {
JSONObject f = new JSONObject(inFile.toString()); // deep copy
to ensure thread safety
switch (fi.getType()) {
case VIDEO:
- f.put(PARAM__SRC,
patchUrl(f.getString(PARAM__SRC), c));
- f.put(PARAM__POSTER,
patchUrl(f.getString(PARAM__POSTER), c));
- break;
case RECORDING:
f.put(PARAM__SRC,
patchUrl(f.getString(PARAM__SRC), c));
f.put(PARAM__POSTER,
patchUrl(f.getString(PARAM__POSTER), c));
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-area.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-area.js
index 6413eba..c7206b3 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-area.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-area.js
@@ -121,7 +121,7 @@ var DrawWbArea = function() {
}
function _getWbContent(wbId) {
return $('#' + __getWbContentId(wbId));
- };
+ }
function _renameTab(obj) {
_setTabName(_getWbTab(obj.wbId), obj.name);
}
@@ -168,10 +168,10 @@ var DrawWbArea = function() {
}
function __getWbTabId(id) {
return 'wb-tab-' + id;
- };
+ }
function __getWbContentId(id) {
return 'wb-content-' + id;
- };
+ }
function __initTab(elems) {
const links = elems.find('a');
if (role === PRESENTER) {
@@ -190,7 +190,7 @@ var DrawWbArea = function() {
_actionActivateWb($(this).data('wb-id'));
}
});
- };
+ }
self.getWb = function(id) {
return _getWbContent(id).data();
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/raw-chat.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/raw-chat.js
index c4a048a..d4f5163 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/raw-chat.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/raw-chat.js
@@ -30,7 +30,7 @@ var Chat = function() {
} else {
OmUtil.setCssVar(key, val);
}
- };
+ }
function __setCssWidth(val) {
__setCssVar('--chat-width', val)
}
@@ -200,7 +200,7 @@ var Chat = function() {
$('#chat .chat-toolbar .link-field').off().on('keypress',
function() {
if (event.keyCode === 13) {
$(this).parent().find('button').trigger('click');
- };
+ }
return event.keyCode !== 13;
});
inited = true;
