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 04ca310 [OPENMEETINGS-2427] sonar should be more happy
04ca310 is described below
commit 04ca31004358ac3221253e55ef90967787d327d1
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Sun Sep 13 15:32:24 2020 +0700
[OPENMEETINGS-2427] sonar should be more happy
---
.../openmeetings/db/entity/room/Invitation.java | 4 +--
.../org/apache/openmeetings/db/util/DaoHelper.java | 2 +-
.../openmeetings/db/entity/file/FileItemTest.java | 2 +-
.../apache/openmeetings/backup/BackupImport.java | 2 +-
.../org/apache/openmeetings/cli/CleanupHelper.java | 11 ++----
.../util/crypt/SCryptImplementation.java | 24 ++++++-------
.../openmeetings/util/crypt/AbstractCryptTest.java | 2 +-
.../openmeetings/web/admin/rooms/RoomForm.java | 2 +-
.../openmeetings/web/app/WhiteboardManager.java | 42 +++++++++++-----------
.../apache/openmeetings/web/room/raw-nettest.js | 2 +-
.../apache/openmeetings/web/room/sidebar/upload.js | 6 ++--
.../src/main/webapp/css/raw-nettest.css | 2 --
openmeetings-web/src/main/webapp/css/raw-room.css | 2 --
.../apache/openmeetings/user/TestUserGroup.java | 2 +-
.../openmeetings/webservice/TestFileService.java | 2 +-
.../webservice/util/RateLimitRequestFilter.java | 7 ++--
16 files changed, 52 insertions(+), 62 deletions(-)
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java
index 99766f6..9dba47f 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Invitation.java
@@ -56,8 +56,8 @@ public class Invitation extends HistoricalEntity {
public static final String BY_ALL = " FROM Invitation i WHERE i.deleted
= false";
public static final String BY_GROUP = BY_ALL + " AND i.invitedBy.id IN "
+ "(SELECT gu1.user.id FROM GroupUser gu1 WHERE
gu1.group.id IN "
- + " (SELECT gu.group.id FROM GroupUser gu
WHERE gu.moderator = true AND gu.user.id = :userId)"
- + ")";
+ + " (SELECT gu.group.id FROM GroupUser gu WHERE
gu.moderator = true AND gu.user.id = :userId)"
+ + ") ";
public static final String BY_USER = BY_ALL + " AND i.invitedBy.id =
:userId";
public enum MessageType {
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/DaoHelper.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/DaoHelper.java
index bb61045..c0b44f6 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/DaoHelper.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/DaoHelper.java
@@ -146,6 +146,6 @@ public class DaoHelper {
}
public static <T> T single(List<T> l) {
- return l.size() > 0 ? l.get(0) : null;
+ return l.isEmpty() ? null : l.get(0);
}
}
diff --git
a/openmeetings-db/src/test/java/org/apache/openmeetings/db/entity/file/FileItemTest.java
b/openmeetings-db/src/test/java/org/apache/openmeetings/db/entity/file/FileItemTest.java
index dd5b51a..5a27308 100644
---
a/openmeetings-db/src/test/java/org/apache/openmeetings/db/entity/file/FileItemTest.java
+++
b/openmeetings-db/src/test/java/org/apache/openmeetings/db/entity/file/FileItemTest.java
@@ -32,7 +32,7 @@ import org.mockito.MockedStatic;
import org.mockito.junit.jupiter.MockitoExtension;
@ExtendWith(MockitoExtension.class)
-public class FileItemTest {
+class FileItemTest {
private FileItem fileItem;
@BeforeEach
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 0a9c11a..fced538 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
@@ -496,7 +496,7 @@ public class BackupImport {
static BackupVersion getVersion(File base) {
List<BackupVersion> list = new ArrayList<>(1);
- readList(base, "version.xml", VERSION_LIST_NODE, VERSION_NODE,
BackupVersion.class, v -> list.add(v), true);
+ readList(base, "version.xml", VERSION_LIST_NODE, VERSION_NODE,
BackupVersion.class, list::add, true);
return list.isEmpty() ? new BackupVersion() : list.get(0);
}
diff --git
a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/CleanupHelper.java
b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/CleanupHelper.java
index aff6e3f..76fe052 100644
---
a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/CleanupHelper.java
+++
b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/CleanupHelper.java
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.cli;
+import static java.util.Collections.addAll;
import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_MP4;
import java.io.File;
@@ -107,9 +108,9 @@ public class CleanupHelper {
String hash = f.getName().substring(0,
f.getName().length() - EXTENSION_MP4.length() - 1);
Recording item = recordDao.getByHash(hash);
if (item == null) {
- add(invalid, hash);
+ addAll(invalid, list(hash));
} else if (item.isDeleted()) {
- add(deleted, hash);
+ addAll(deleted, list(hash));
}
}
for (Recording item : recordDao.get()) {
@@ -142,12 +143,6 @@ public class CleanupHelper {
return list(hibernateDir, (dir, name) -> name.startsWith(hash));
}
- private static void add(List<File> list, final String hash) {
- for (File f : list(hash)) {
- list.add(f);
- }
- }
-
private static long getUserIdByProfile(String name) {
long result = -1;
if (name.startsWith(OmFileHelper.PROFILES_PREFIX)) {
diff --git
a/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/SCryptImplementation.java
b/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/SCryptImplementation.java
index 960cdf5..7be9b6f 100644
---
a/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/SCryptImplementation.java
+++
b/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/SCryptImplementation.java
@@ -30,20 +30,18 @@ import org.slf4j.LoggerFactory;
public class SCryptImplementation implements ICrypt {
private static final Logger log =
LoggerFactory.getLogger(SCryptImplementation.class);
- private static final ThreadLocal<SecureRandom> rnd = new
ThreadLocal<>() {
- @Override
- protected SecureRandom initialValue() {
- SecureRandom sr;
- try {
- sr = SecureRandom.getInstance(SECURE_RND_ALG);
- } catch (NoSuchAlgorithmException e) {
- log.error("Failed to get instance of
SecureRandom {}", SECURE_RND_ALG);
- sr = new SecureRandom();
- }
- return sr;
- }
- };
private static final String SECURE_RND_ALG = "SHA1PRNG";
+ private static final ThreadLocal<SecureRandom> rnd
+ = ThreadLocal.withInitial(() -> {
+ SecureRandom sr;
+ try {
+ sr =
SecureRandom.getInstance(SECURE_RND_ALG);
+ } catch (NoSuchAlgorithmException e) {
+ log.error("Failed to get instance of
SecureRandom {}", SECURE_RND_ALG);
+ sr = new SecureRandom();
+ }
+ return sr;
+ });
private static final int COST = 1024 * 16;
private static final int KEY_LENGTH = 512;
private static final int SALT_LENGTH = 200;
diff --git
a/openmeetings-util/src/test/java/org/apache/openmeetings/util/crypt/AbstractCryptTest.java
b/openmeetings-util/src/test/java/org/apache/openmeetings/util/crypt/AbstractCryptTest.java
index 64197d3..c87ec6a 100644
---
a/openmeetings-util/src/test/java/org/apache/openmeetings/util/crypt/AbstractCryptTest.java
+++
b/openmeetings-util/src/test/java/org/apache/openmeetings/util/crypt/AbstractCryptTest.java
@@ -31,7 +31,7 @@ import java.util.Random;
import org.apache.commons.text.RandomStringGenerator;
import org.junit.jupiter.api.Test;
-public abstract class AbstractCryptTest {
+abstract class AbstractCryptTest {
protected static ICrypt crypt;
@Test
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
index d859bc6..f700310 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
@@ -205,7 +205,7 @@ public class RoomForm extends AdminBaseForm<Room> {
public RoomGroup fromId(String inId) {
Long id = Long.valueOf(inId);
- if (!orgList.stream().filter(g ->
g.getId().equals(id)).findFirst().isPresent()) {
+ if (!orgList.stream().anyMatch(g ->
g.getId().equals(id))) {
return null; // seems to be hacked
}
Group g = groupDao.get(id);
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WhiteboardManager.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WhiteboardManager.java
index 8deaf90..9ab90cd 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WhiteboardManager.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WhiteboardManager.java
@@ -142,28 +142,30 @@ public class WhiteboardManager implements
IWhiteboardManager {
public Map<Long, List<BaseFileItem>> get(Room r, Long langId) {
Map<Long, List<BaseFileItem>> result = new HashMap<>();
- if (!contains(r.getId()) && r.getFiles() != null &&
!r.getFiles().isEmpty()) {
- if (map().tryLock(r.getId())) {
- try {
- TreeMap<Long, List<BaseFileItem>> files
= new TreeMap<>();
- for (RoomFile rf : r.getFiles()) {
- List<BaseFileItem> bfl =
files.get(rf.getWbIdx());
- if (bfl == null) {
-
files.put(rf.getWbIdx(), new ArrayList<>());
- bfl =
files.get(rf.getWbIdx());
- }
- bfl.add(rf.getFile());
- }
- Whiteboards wbs =
getOrCreate(r.getId(), null);
- for (Map.Entry<Long,
List<BaseFileItem>> e : files.entrySet()) {
- Whiteboard wb = add(wbs,
langId);
- wbs.setActiveWb(wb.getId());
- result.put(wb.getId(),
e.getValue());
+ if (!contains(r.getId())
+ && r.getFiles() != null
+ && !r.getFiles().isEmpty()
+ && map().tryLock(r.getId()))
+ {
+ try {
+ TreeMap<Long, List<BaseFileItem>> files = new
TreeMap<>();
+ for (RoomFile rf : r.getFiles()) {
+ List<BaseFileItem> bfl =
files.get(rf.getWbIdx());
+ if (bfl == null) {
+ files.put(rf.getWbIdx(), new
ArrayList<>());
+ bfl = files.get(rf.getWbIdx());
}
- update(wbs);
- } finally {
- map().unlock(r.getId());
+ bfl.add(rf.getFile());
+ }
+ Whiteboards wbs = getOrCreate(r.getId(), null);
+ for (Map.Entry<Long, List<BaseFileItem>> e :
files.entrySet()) {
+ Whiteboard wb = add(wbs, langId);
+ wbs.setActiveWb(wb.getId());
+ result.put(wb.getId(), e.getValue());
}
+ update(wbs);
+ } finally {
+ map().unlock(r.getId());
}
}
return result;
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-nettest.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-nettest.js
index 871bdb8..5ae15a4 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-nettest.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-nettest.js
@@ -2,7 +2,7 @@
var NetTest = (function() {
const self = {}, PINGS = 10, LIMIT = 2000, URL =
'./services/networktest/'
, DELAY = 3000, KB = 1024, MB = KB * KB;
- let output, lbls, net, tests, testName, testLabel, testNext, bulk =
true;
+ let output, lbls, tests, testName, testLabel, testNext, bulk = true;
const average = (array) => array.reduce((a, b) => a + b) / array.length;
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/upload.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/upload.js
index d378dc6..a5b2fcc 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/upload.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/upload.js
@@ -47,9 +47,9 @@ var Upload = (function() {
.text(form.data('upload-lbl'));
form.parents('.modal-content').find('.modal-footer').prepend(uploadBtn);
uploadBtn.click(function() {
- const form = $('#room-upload-form');
+ const cform = $('#room-upload-form');
$.ajax({
- url: form.attr('action')
+ url: cform.attr('action')
, type: 'POST'
, data: new
FormData($('#room-upload-form')[0])
, processData: false
@@ -57,7 +57,7 @@ var Upload = (function() {
}).done(function(data) {
curUid = data.uuid;
uploadBtn.attr('disabled', 'disabled');
- form.hide();
+ cform.hide();
progress.removeClass('d-none');
Wicket.Event.subscribe('/websocket/message', _onWsMessage);
}).fail(function(e) {
diff --git a/openmeetings-web/src/main/webapp/css/raw-nettest.css
b/openmeetings-web/src/main/webapp/css/raw-nettest.css
index 20c119a..3360489 100644
--- a/openmeetings-web/src/main/webapp/css/raw-nettest.css
+++ b/openmeetings-web/src/main/webapp/css/raw-nettest.css
@@ -54,8 +54,6 @@
margin-top: 20px;
overflow: auto;
}
-.nettest output {
-}
.nettest output .module {
color: #6b0df7;
padding: 0 5px;
diff --git a/openmeetings-web/src/main/webapp/css/raw-room.css
b/openmeetings-web/src/main/webapp/css/raw-room.css
index 2ffa913..24fd529 100644
--- a/openmeetings-web/src/main/webapp/css/raw-room.css
+++ b/openmeetings-web/src/main/webapp/css/raw-room.css
@@ -624,8 +624,6 @@ html[dir="rtl"] .room-block .sb-wb .sidebar {
background-position: center;
background-size: 64px;
}
-.pod-area .pod {
-}
.pod-area .pod .user-video.ui-dialog
, .pod-area .pod-big .user-video.ui-dialog
{
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/user/TestUserGroup.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/user/TestUserGroup.java
index eb5a9e5..d201a8b 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/user/TestUserGroup.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/user/TestUserGroup.java
@@ -107,7 +107,7 @@ class TestUserGroup extends AbstractJUnitDefaults {
@Test
@Tag("org.apache.openmeetings.test.HeavyTests")
- public void add10kUsers() throws Exception {
+ void add10kUsers() throws Exception {
List<Group> groups = groupDao.get(GROUP_NAME, 0, 1, null);
Group g = null;
if (groups == null || groups.isEmpty()) {
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestFileService.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestFileService.java
index c2e0494..6968093 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestFileService.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestFileService.java
@@ -39,7 +39,7 @@ class TestFileService extends AbstractWebServiceTest {
@Test
@Tag("org.apache.openmeetings.test.NonJenkinsTests")
- public void addFileTest() throws IOException {
+ void addFileTest() throws IOException {
File img = null;
try {
img = File.createTempFile("omtest", ".jpg");
diff --git
a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/util/RateLimitRequestFilter.java
b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/util/RateLimitRequestFilter.java
index 023af45..89d51ae 100644
---
a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/util/RateLimitRequestFilter.java
+++
b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/util/RateLimitRequestFilter.java
@@ -28,20 +28,19 @@ import javax.ws.rs.core.Context;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
-import org.apache.cxf.interceptor.Fault;
import org.apache.openmeetings.webservice.NetTestWebService;
import org.apache.openmeetings.webservice.NetTestWebService.TestType;
@RateLimited
public class RateLimitRequestFilter implements ContainerRequestFilter {
- private final static String ATTR_LAST_ACCESS_TIME = "LAST_ACCESS_TIME";
- private final static long ALLOWED_TIME = 3000;
+ private static final String ATTR_LAST_ACCESS_TIME = "LAST_ACCESS_TIME";
+ private static final long ALLOWED_TIME = 3000;
@Context
private HttpServletRequest request;
@Override
- public void filter(ContainerRequestContext context) throws Fault {
+ public void filter(ContainerRequestContext context) {
HttpSession session = request.getSession(false);
if (session == null) {
context.abortWith(Response.status(Status.FORBIDDEN).build());
