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 9674a78 [OPENMEETINGS-2427] sonar should be more happy
9674a78 is described below
commit 9674a786286b1e8f3fc7f956790bc79a2ed942e0
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Wed Sep 9 20:45:14 2020 +0700
[OPENMEETINGS-2427] sonar should be more happy
---
.../openmeetings/core/remote/StreamProcessor.java | 20 ++++++++----------
.../core/remote/TestStreamProcessor.java | 2 +-
.../org/apache/openmeetings/TestConnection.java | 2 +-
.../openmeetings/core/mail/TestMailSending.java | 2 +-
.../core/remote/TestNotConnectedMocked.java | 2 +-
.../core/remote/TestRecordingFlowMocked.java | 2 +-
.../core/remote/TestRoomFlowMocked.java | 2 +-
.../core/remote/TestSetupFlowMocked.java | 2 +-
.../java/org/apache/openmeetings/gui/TestGui.java | 2 +-
.../openmeetings/rdc/TestKeyCodesNumber.java | 2 +-
.../openmeetings/rdc/TestReadKeyCodesNumber.java | 2 +-
.../apache/openmeetings/db/dao/room/RoomDao.java | 11 ++++++----
.../apache/openmeetings/db/dao/room/SipDao.java | 4 ++--
.../openmeetings/db/dto/room/Whiteboard.java | 4 ++--
.../apache/openmeetings/db/dto/user/OAuthUser.java | 8 ++++----
.../openmeetings/db/entity/file/FileItem.java | 5 -----
.../openmeetings/db/entity/record/Recording.java | 5 -----
.../apache/openmeetings/db/entity/room/Room.java | 9 +++++---
.../openmeetings/db/dto/user/TestOAuthUser.java | 2 +-
.../openmeetings/db/util/TestAuthLevelUtil.java | 2 +-
.../openmeetings/db/util/TestLocaleHelper.java | 2 +-
.../apache/openmeetings/backup/BackupExport.java | 2 +-
.../apache/openmeetings/backup/BackupImport.java | 3 ++-
.../installation/ImportInitvalues.java | 24 +++++++++++-----------
.../openmeetings/backup/TestBackupVersion.java | 2 +-
.../service/calendar/caldav/IcalUtils.java | 2 +-
.../openmeetings/util/OpenmeetingsVariables.java | 1 +
.../openmeetings/util/TestCalendarPatterns.java | 2 +-
.../apache/openmeetings/util/TestStoredFile.java | 2 +-
.../org/apache/openmeetings/util/TestVersion.java | 2 +-
.../apache/openmeetings/util/crypt/TestSCrypt.java | 2 +-
.../openmeetings/web/admin/backup/BackupPanel.java | 3 ++-
.../apache/openmeetings/web/pages/BasePage.java | 2 +-
.../web/room/RoomPreviewResourceReference.java | 3 ++-
.../web/room/RoomResourceReference.java | 3 ++-
.../web/room/sidebar/UploadDialog.java | 18 ++++++++--------
.../apache/openmeetings/web/room/wb/WbPanel.java | 2 +-
.../web/user/calendar/AppointmentDialog.java | 4 ++--
.../org/apache/openmeetings/backup/TestExport.java | 2 +-
.../org/apache/openmeetings/backup/TestImport.java | 2 +-
.../openmeetings/backup/TestImportCalendar.java | 2 +-
.../openmeetings/backup/TestImportConfig.java | 2 +-
.../apache/openmeetings/backup/TestImportOld.java | 2 +-
.../apache/openmeetings/backup/TestImportRoom.java | 2 +-
.../apache/openmeetings/backup/TestImportUser.java | 2 +-
.../calendar/TestAppointmentAddAppointment.java | 2 +-
.../calendar/TestAppointmentSchedulerTask.java | 2 +-
.../calendar/TestDatabaseStructureAppointment.java | 2 +-
...TestDatabaseStructureGetAppointmentByRange.java | 2 +-
.../TestDatabaseStructureGetUserStart.java | 2 +-
.../TestDatabaseStructureMeetingMember.java | 2 +-
.../openmeetings/calendar/TestGetAppointment.java | 2 +-
.../openmeetings/calendar/TestOmCalendar.java | 2 +-
.../openmeetings/calendar/TestSendIcalMessage.java | 2 +-
.../org/apache/openmeetings/cli/TestAdmin.java | 2 +-
.../org/apache/openmeetings/cli/TestPatcher.java | 2 +-
.../org/apache/openmeetings/config/TestConfig.java | 2 +-
.../openmeetings/core/file/TestFileProcessor.java | 2 +-
.../apache/openmeetings/db/dao/TestRoomDao.java | 2 +-
.../apache/openmeetings/domain/TestAddGroup.java | 2 +-
.../domain/TestUserGroupAggregation.java | 2 +-
.../openmeetings/invitiation/TestInvitation.java | 2 +-
.../org/apache/openmeetings/ldap/TestLdap.java | 2 +-
.../service/mail/template/TestEmailTemplate.java | 2 +-
.../mail/template/subject/TestSubjTemplate.java | 2 +-
.../openmeetings/service/quartz/TestJob.java | 2 +-
.../apache/openmeetings/smoke/TestSmokeBasic.java | 2 +-
.../apache/openmeetings/user/TestUserContact.java | 2 +-
.../apache/openmeetings/user/TestUserCount.java | 2 +-
.../apache/openmeetings/user/TestUserGroup.java | 2 +-
.../org/apache/openmeetings/userdata/TestAuth.java | 2 +-
.../apache/openmeetings/userdata/TestLogin.java | 2 +-
.../org/apache/openmeetings/util/TestDateTime.java | 2 +-
.../apache/openmeetings/util/TestStoredFile.java | 2 +-
.../org/apache/openmeetings/web/TestCalendar.java | 2 +-
.../org/apache/openmeetings/web/TestMainAreas.java | 2 +-
.../org/apache/openmeetings/web/TestMainMenu.java | 2 +-
.../web/app/TestOmAuthenticationStrategy.java | 2 +-
.../web/app/TestUserManagerMocked.java | 2 +-
.../openmeetings/web/app/TestWebSession.java | 2 +-
.../openmeetings/web/pages/TestHashPage.java | 2 +-
.../openmeetings/web/pages/auth/TestLoginUI.java | 2 +-
.../webservice/TestCalendarService.java | 2 +-
.../openmeetings/webservice/TestErrorService.java | 2 +-
.../openmeetings/webservice/TestFileService.java | 2 +-
.../openmeetings/webservice/TestGroupService.java | 2 +-
.../openmeetings/webservice/TestInfoService.java | 2 +-
.../webservice/TestRecordingService.java | 2 +-
.../openmeetings/webservice/TestRoomService.java | 2 +-
.../openmeetings/webservice/TestUserService.java | 2 +-
.../openmeetings/webservice/TestWbService.java | 2 +-
.../openmeetings/webservice/TestWebConverters.java | 2 +-
.../openmeetings/webservice/TestBaseService.java | 2 +-
93 files changed, 139 insertions(+), 140 deletions(-)
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/StreamProcessor.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/StreamProcessor.java
index 62b9264..7abacce 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/StreamProcessor.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/StreamProcessor.java
@@ -190,10 +190,7 @@ public class StreamProcessor implements IStreamProcessor {
}
} catch (KurentoServerException e) {
sender.release(this);
- WebSocketHelper.sendClient(c, newKurentoMsg()
- .put("id", "broadcastStopped")
- .put("uid", sd.getUid())
- );
+ WebSocketHelper.sendClient(c, newStoppedMsg(sd));
sendError(c, "Failed to start broadcast: " +
e.getMessage());
log.error("Failed to start broadcast", e);
}
@@ -393,10 +390,7 @@ public class StreamProcessor implements IStreamProcessor {
KStream sender = getByUid(uid);
sender.pauseSharing();
kHandler.sendShareUpdated(sd);
- WebSocketHelper.sendRoomOthers(c.getRoomId(),
c.getUid(), newKurentoMsg()
- .put("id", "broadcastStopped")
- .put("uid", sd.getUid())
- );
+ WebSocketHelper.sendRoomOthers(c.getRoomId(),
c.getUid(), newStoppedMsg(sd));
} else {
stopSharing(c, uid);
}
@@ -500,9 +494,7 @@ public class StreamProcessor implements IStreamProcessor {
AbstractStream s = getByUid(sd.getUid());
if (s != null) {
s.release(this);
- WebSocketHelper.sendRoomOthers(c.getRoomId(),
c.getUid(), newKurentoMsg()
- .put("id", "broadcastStopped")
- .put("uid", sd.getUid()));
+ WebSocketHelper.sendRoomOthers(c.getRoomId(),
c.getUid(), newStoppedMsg(sd));
}
}
if (c.getRoomId() != null) {
@@ -578,4 +570,10 @@ public class StreamProcessor implements IStreamProcessor {
release(e.getValue(), true);
}
}
+
+ private static JSONObject newStoppedMsg(StreamDesc sd) {
+ return newKurentoMsg()
+ .put("id", "broadcastStopped")
+ .put("uid", sd.getUid());
+ }
}
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/TestStreamProcessor.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/TestStreamProcessor.java
index 74904ad..c93c92b 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/TestStreamProcessor.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/TestStreamProcessor.java
@@ -41,7 +41,7 @@ import org.springframework.stereotype.Component;
import com.github.openjson.JSONObject;
@Component
-public class TestStreamProcessor implements IStreamProcessor {
+class TestStreamProcessor implements IStreamProcessor {
private final Map<String, KTestStream> streamByUid = new
ConcurrentHashMap<>();
@Autowired
diff --git
a/openmeetings-core/src/test/java/org/apache/openmeetings/TestConnection.java
b/openmeetings-core/src/test/java/org/apache/openmeetings/TestConnection.java
index 0c71ae1..b3174f1 100644
---
a/openmeetings-core/src/test/java/org/apache/openmeetings/TestConnection.java
+++
b/openmeetings-core/src/test/java/org/apache/openmeetings/TestConnection.java
@@ -20,7 +20,7 @@ package org.apache.openmeetings;
import org.junit.jupiter.api.Test;
-public class TestConnection {
+class TestConnection {
@Test
void testNoop() {
diff --git
a/openmeetings-core/src/test/java/org/apache/openmeetings/core/mail/TestMailSending.java
b/openmeetings-core/src/test/java/org/apache/openmeetings/core/mail/TestMailSending.java
index 701a955..e2572e9 100644
---
a/openmeetings-core/src/test/java/org/apache/openmeetings/core/mail/TestMailSending.java
+++
b/openmeetings-core/src/test/java/org/apache/openmeetings/core/mail/TestMailSending.java
@@ -40,7 +40,7 @@ import org.slf4j.LoggerFactory;
* @author swagner
*
*/
-public class TestMailSending {
+class TestMailSending {
private static final Logger log =
LoggerFactory.getLogger(TestMailSending.class);
//Example GMail email server data
diff --git
a/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/TestNotConnectedMocked.java
b/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/TestNotConnectedMocked.java
index 202c68c..1a7a0fc 100644
---
a/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/TestNotConnectedMocked.java
+++
b/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/TestNotConnectedMocked.java
@@ -26,7 +26,7 @@ import org.junit.jupiter.api.Test;
import com.github.openjson.JSONObject;
-public class TestNotConnectedMocked extends BaseMockedTest {
+class TestNotConnectedMocked extends BaseMockedTest {
@Test
void testNotConnected() {
handler.onMessage(null, MSG_BASE);
diff --git
a/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/TestRecordingFlowMocked.java
b/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/TestRecordingFlowMocked.java
index 2554245..cdb24f8 100644
---
a/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/TestRecordingFlowMocked.java
+++
b/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/TestRecordingFlowMocked.java
@@ -47,7 +47,7 @@ import org.mockito.Mock;
import com.github.openjson.JSONObject;
-public class TestRecordingFlowMocked extends BaseMockedTest {
+class TestRecordingFlowMocked extends BaseMockedTest {
private static final Long USER_ID = 1L;
private static final Long ROOM_ID = 5L;
@Mock
diff --git
a/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/TestRoomFlowMocked.java
b/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/TestRoomFlowMocked.java
index 956c16a..066e342 100644
---
a/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/TestRoomFlowMocked.java
+++
b/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/TestRoomFlowMocked.java
@@ -42,7 +42,7 @@ import org.mockito.Mock;
import com.github.openjson.JSONObject;
-public class TestRoomFlowMocked extends BaseMockedTest {
+class TestRoomFlowMocked extends BaseMockedTest {
private static final Long USER_ID = 1L;
private static final Long ROOM_ID = 5L;
@Mock
diff --git
a/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/TestSetupFlowMocked.java
b/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/TestSetupFlowMocked.java
index 478b15d..be0d630 100644
---
a/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/TestSetupFlowMocked.java
+++
b/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/TestSetupFlowMocked.java
@@ -34,7 +34,7 @@ import org.kurento.client.Transaction;
import com.github.openjson.JSONObject;
-public class TestSetupFlowMocked extends BaseMockedTest {
+class TestSetupFlowMocked extends BaseMockedTest {
@Override
@BeforeEach
public void setup() {
diff --git
a/openmeetings-core/src/test/java/org/apache/openmeetings/gui/TestGui.java
b/openmeetings-core/src/test/java/org/apache/openmeetings/gui/TestGui.java
index 25f0691..6ba9653 100644
--- a/openmeetings-core/src/test/java/org/apache/openmeetings/gui/TestGui.java
+++ b/openmeetings-core/src/test/java/org/apache/openmeetings/gui/TestGui.java
@@ -21,7 +21,7 @@ package org.apache.openmeetings.gui;
import org.junit.jupiter.api.Test;
-public class TestGui {
+class TestGui {
@Test
void testNoop() {
diff --git
a/openmeetings-core/src/test/java/org/apache/openmeetings/rdc/TestKeyCodesNumber.java
b/openmeetings-core/src/test/java/org/apache/openmeetings/rdc/TestKeyCodesNumber.java
index 4e7497e..68a8763 100644
---
a/openmeetings-core/src/test/java/org/apache/openmeetings/rdc/TestKeyCodesNumber.java
+++
b/openmeetings-core/src/test/java/org/apache/openmeetings/rdc/TestKeyCodesNumber.java
@@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class TestKeyCodesNumber {
+class TestKeyCodesNumber {
private static final Logger log =
LoggerFactory.getLogger(TestKeyCodesNumber.class);
@Test
diff --git
a/openmeetings-core/src/test/java/org/apache/openmeetings/rdc/TestReadKeyCodesNumber.java
b/openmeetings-core/src/test/java/org/apache/openmeetings/rdc/TestReadKeyCodesNumber.java
index b618fb9..59192b3 100644
---
a/openmeetings-core/src/test/java/org/apache/openmeetings/rdc/TestReadKeyCodesNumber.java
+++
b/openmeetings-core/src/test/java/org/apache/openmeetings/rdc/TestReadKeyCodesNumber.java
@@ -22,7 +22,7 @@ import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class TestReadKeyCodesNumber {
+class TestReadKeyCodesNumber {
private static final Logger log =
LoggerFactory.getLogger(TestReadKeyCodesNumber.class);
@Test
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
index 6bc2d46..1f57e55 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomDao.java
@@ -61,6 +61,9 @@ import
org.springframework.transaction.annotation.Transactional;
public class RoomDao implements IGroupAdminDataProviderDao<Room> {
private static final Logger log =
LoggerFactory.getLogger(RoomDao.class);
private static final String[] searchFields = {"name"};
+ public static final String GRP_MODERATORS = "roomModerators";
+ public static final String GRP_GROUPS = "roomGroups";
+ public static final String GRP_FILES = "roomFiles";
@PersistenceContext
private EntityManager em;
@@ -78,7 +81,7 @@ public class RoomDao implements
IGroupAdminDataProviderDao<Room> {
r = single(fillLazy(em
, oem ->
oem.createNamedQuery("getRoomById", Room.class)
.setParameter("id", id)
- , "roomModerators", "roomGroups",
"roomFiles"));
+ , GRP_MODERATORS, GRP_GROUPS,
GRP_FILES));
} else {
log.info("[get]: No room id given");
}
@@ -90,7 +93,7 @@ public class RoomDao implements
IGroupAdminDataProviderDao<Room> {
if (!Strings.isEmpty(tag)) {
r = single(fillLazy(em
, oem ->
oem.createNamedQuery("getRoomByTag", Room.class).setParameter("tag", tag)
- , "roomModerators", "roomGroups",
"roomFiles"));
+ , GRP_MODERATORS, GRP_GROUPS,
GRP_FILES));
} else {
log.info("[get]: No room tag given");
}
@@ -100,7 +103,7 @@ public class RoomDao implements
IGroupAdminDataProviderDao<Room> {
public List<Room> get() {
return fillLazy(em
, oem -> oem.createNamedQuery("getBackupRooms",
Room.class)
- , "roomModerators", "roomGroups", "roomFiles");
+ , GRP_MODERATORS, GRP_GROUPS, GRP_FILES);
}
public List<Room> get(List<Long> ids) {
@@ -265,7 +268,7 @@ public class RoomDao implements
IGroupAdminDataProviderDao<Room> {
.setParameter("externalId", externalId)
.setParameter("externalType",
externalType)
.setParameter("type", type)
- , "roomGroups"));
+ , GRP_GROUPS));
}
public List<Room> getRecent(Long userId) {
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/SipDao.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/SipDao.java
index caaf97b..900ce29 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/SipDao.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/SipDao.java
@@ -86,7 +86,7 @@ public class SipDao {
}
return (r instanceof ManagerError) ? null : r;
} catch (Exception e) {
- log.error("Error while executing ManagerAction: " +
action, e);
+ log.error("Error while executing ManagerAction: {}",
action, e);
} finally {
try {
con.logoff();
@@ -111,7 +111,7 @@ public class SipDao {
}
return (r == null || r.getResponse() instanceof
ManagerError) ? null : r;
} catch (Exception e) {
- log.error("Error while executing EventGeneratingAction:
" + action, e);
+ log.error("Error while executing EventGeneratingAction:
{}", action, e);
} finally {
try {
con.logoff();
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java
index 7893062..25e6b50 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java
@@ -34,7 +34,7 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import org.apache.openmeetings.db.entity.file.FileItem;
+import org.apache.openmeetings.db.entity.file.BaseFileItem;
import org.apache.openmeetings.util.NullStringer;
import org.apache.wicket.util.string.Strings;
import org.slf4j.Logger;
@@ -137,7 +137,7 @@ public class Whiteboard implements Serializable {
JSONArray arr = new JSONArray();
roomItems.entrySet().removeIf(e -> {
JSONObject o = new JSONObject(e.getValue());
- boolean match =
!FileItem.Type.PRESENTATION.name().equals(o.optString(ATTR_FILE_TYPE)) &&
o.optInt(ATTR_SLIDE, -1) == slide;
+ boolean match =
!BaseFileItem.Type.PRESENTATION.name().equals(o.optString(ATTR_FILE_TYPE)) &&
o.optInt(ATTR_SLIDE, -1) == slide;
if (match) {
arr.put(e);
}
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/OAuthUser.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/OAuthUser.java
index 318ef31..be6b07f 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/OAuthUser.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/user/OAuthUser.java
@@ -75,10 +75,10 @@ public class OAuthUser implements Serializable {
*/
public OAuthUser(Map<String, String> umap) {
Map<String, String> data = new HashMap<>();
- data.put(PARAM_LOGIN, umap.get("login"));
- data.put(PARAM_EMAIL, umap.get("email"));
- data.put(PARAM_FNAME, umap.get("firstname"));
- data.put(PARAM_LNAME, umap.get("lastname"));
+ data.put(PARAM_LOGIN, umap.get(PARAM_LOGIN));
+ data.put(PARAM_EMAIL, umap.get(PARAM_EMAIL));
+ data.put(PARAM_FNAME, umap.get(PARAM_FNAME));
+ data.put(PARAM_LNAME, umap.get(PARAM_LNAME));
userData = Collections.unmodifiableMap(data);
}
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java
index 46fd0fd..a9a317c 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/FileItem.java
@@ -61,11 +61,6 @@ public class FileItem extends BaseFileItem {
private String externalId;
@Override
- public Long getId() {
- return super.getId();
- }
-
- @Override
@XmlElement(name = "fileExplorerItemId")
@XmlJavaTypeAdapter(LongAdapter.class)
public void setId(Long id) {
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java
index f5cc2fc..4a42930 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java
@@ -151,11 +151,6 @@ public class Recording extends BaseFileItem {
private boolean notified = false;
@Override
- public Long getId() {
- return super.getId();
- }
-
- @Override
@XmlElement(name = "flvRecordingId")
@XmlJavaTypeAdapter(LongAdapter.class)
public void setId(Long id) {
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
index cfed2c5..72663a7 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/Room.java
@@ -19,6 +19,9 @@
package org.apache.openmeetings.db.entity.room;
import static org.apache.openmeetings.db.bind.Constants.ROOM_NODE;
+import static org.apache.openmeetings.db.dao.room.RoomDao.GRP_FILES;
+import static org.apache.openmeetings.db.dao.room.RoomDao.GRP_GROUPS;
+import static org.apache.openmeetings.db.dao.room.RoomDao.GRP_MODERATORS;
import java.util.ArrayList;
import java.util.HashSet;
@@ -66,9 +69,9 @@ import org.apache.openmeetings.db.entity.user.Group;
@Entity
@FetchGroups({
- @FetchGroup(name = "roomModerators", attributes = {
@FetchAttribute(name = "moderators") })
- , @FetchGroup(name = "roomGroups", attributes = { @FetchAttribute(name
= "groups") })
- , @FetchGroup(name = "roomFiles", attributes = { @FetchAttribute(name =
"files") })
+ @FetchGroup(name = GRP_MODERATORS, attributes = { @FetchAttribute(name
= "moderators") })
+ , @FetchGroup(name = GRP_GROUPS, attributes = { @FetchAttribute(name =
"groups") })
+ , @FetchGroup(name = GRP_FILES, attributes = { @FetchAttribute(name =
"files") })
})
@NamedQuery(name = "getNondeletedRooms", query = "SELECT r FROM Room r WHERE
r.deleted = false")
@NamedQuery(name = "getPublicRooms", query = "SELECT r from Room r WHERE
r.ispublic = true and r.deleted = false and r.type = :type")
diff --git
a/openmeetings-db/src/test/java/org/apache/openmeetings/db/dto/user/TestOAuthUser.java
b/openmeetings-db/src/test/java/org/apache/openmeetings/db/dto/user/TestOAuthUser.java
index adae9ed..5fe3d94 100644
---
a/openmeetings-db/src/test/java/org/apache/openmeetings/db/dto/user/TestOAuthUser.java
+++
b/openmeetings-db/src/test/java/org/apache/openmeetings/db/dto/user/TestOAuthUser.java
@@ -33,7 +33,7 @@ import org.apache.openmeetings.db.entity.server.OAuthServer;
import org.apache.wicket.util.string.Strings;
import org.junit.jupiter.api.Test;
-public class TestOAuthUser {
+class TestOAuthUser {
@Test
void firstLevel() {
OAuthServer server = new OAuthServer()
diff --git
a/openmeetings-db/src/test/java/org/apache/openmeetings/db/util/TestAuthLevelUtil.java
b/openmeetings-db/src/test/java/org/apache/openmeetings/db/util/TestAuthLevelUtil.java
index 85ee587..c841de5 100644
---
a/openmeetings-db/src/test/java/org/apache/openmeetings/db/util/TestAuthLevelUtil.java
+++
b/openmeetings-db/src/test/java/org/apache/openmeetings/db/util/TestAuthLevelUtil.java
@@ -29,7 +29,7 @@ import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.db.entity.user.User;
import org.junit.jupiter.api.Test;
-public class TestAuthLevelUtil {
+class TestAuthLevelUtil {
@Test
void testNull() {
assertTrue(getRoomRight(null, null, null, 0).isEmpty(), "Result
should be empty");
diff --git
a/openmeetings-db/src/test/java/org/apache/openmeetings/db/util/TestLocaleHelper.java
b/openmeetings-db/src/test/java/org/apache/openmeetings/db/util/TestLocaleHelper.java
index e82c466..602463e 100644
---
a/openmeetings-db/src/test/java/org/apache/openmeetings/db/util/TestLocaleHelper.java
+++
b/openmeetings-db/src/test/java/org/apache/openmeetings/db/util/TestLocaleHelper.java
@@ -29,7 +29,7 @@ import java.util.List;
import org.junit.jupiter.api.Test;
-public class TestLocaleHelper {
+class TestLocaleHelper {
private static final String COUNTRY_IT_LC = "it";
private static final String COUNTRY_IT = "IT";
private static final String COUNTRY_ITALY = "Italy";
diff --git
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
index 3162d76..07803b5 100644
---
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
+++
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupExport.java
@@ -404,7 +404,7 @@ public class BackupExport {
marshaller.marshal(t, sw);
sw.write("\n");
} catch (Exception e) {
- log.debug("Exception While
writing node of type: " + t.getClass(), e);
+ log.debug("Exception While
writing node of type: {}", t.getClass(), e);
}
}
}
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 ebc04e5..b8678e2 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
@@ -166,6 +166,7 @@ import java.util.zip.ZipInputStream;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.Unmarshaller;
import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamReader;
import javax.xml.transform.stream.StreamSource;
@@ -1164,7 +1165,7 @@ public class BackupImport {
StreamSource xmlSource = new StreamSource(xml);
XMLStreamReader xsr =
xif.createXMLStreamReader(xmlSource);
boolean listNodeFound = false;
- while (xsr.getEventType() !=
XMLStreamReader.END_DOCUMENT) {
+ while (xsr.getEventType() !=
XMLStreamConstants.END_DOCUMENT) {
if (xsr.isStartElement()) {
if (!listNodeFound &&
listNodeName.equals(xsr.getLocalName())) {
listNodeFound = true;
diff --git
a/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
b/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
index dcef308..a0ae9a9 100644
---
a/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
+++
b/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
@@ -370,18 +370,18 @@ public class ImportInitvalues {
addCfg(list, CONFIG_KEYCODE_ARRANGE_RESIZE, "Ctrl+Shift+KeyA",
Configuration.Type.HOTKEY
, "A hot key code to arrange video windows
bottom-to-top with resize to 120x90", VER_5_0_0);
final String cspMore = ", more info:
https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy";;
- addCfg(list, CONFIG_CSP_FONT, DEFAULT_CSP_FONT,
Configuration.Type.STRING, String.format("Value for 'font-src' directive of
'Content-Security-Policy' header (default: %s)"
- + cspMore, DEFAULT_CSP_FONT), VER_5_0_0);
- addCfg(list, CONFIG_CSP_FRAME, SELF.getValue(),
Configuration.Type.STRING, String.format("Value for 'frame-src' directive of
'Content-Security-Policy' header (default: %s)"
- + cspMore, SELF), VER_5_0_0);
- addCfg(list, CONFIG_CSP_IMAGE, DEFAULT_CSP_DATA,
Configuration.Type.STRING, String.format("Value for 'image-src' directive of
'Content-Security-Policy' header (default: %s)"
- + cspMore, DEFAULT_CSP_DATA), VER_5_0_0);
- addCfg(list, CONFIG_CSP_MEDIA, DEFAULT_CSP_DATA,
Configuration.Type.STRING, String.format("Value for 'media-src' directive of
'Content-Security-Policy' header (default: %s)"
- + cspMore, DEFAULT_CSP_DATA), VER_5_0_0);
- addCfg(list, CONFIG_CSP_SCRIPT, STRICT_DYNAMIC.getValue(),
Configuration.Type.STRING, String.format("Value for 'script-src' directive of
'Content-Security-Policy' header (default: %s)"
- + cspMore, STRICT_DYNAMIC), VER_5_0_0);
- addCfg(list, CONFIG_CSP_STYLE, DEFAULT_CSP_STYLE,
Configuration.Type.STRING, String.format("Value for 'style-src' directive of
'Content-Security-Policy' header (default: %s)"
- + cspMore, DEFAULT_CSP_STYLE), VER_5_0_0);
+ addCfg(list, CONFIG_CSP_FONT, DEFAULT_CSP_FONT,
Configuration.Type.STRING, "Value for 'font-src' directive of
'Content-Security-Policy' header (default: "
+ + DEFAULT_CSP_FONT + ")" + cspMore, VER_5_0_0);
+ addCfg(list, CONFIG_CSP_FRAME, SELF.getValue(),
Configuration.Type.STRING, "Value for 'frame-src' directive of
'Content-Security-Policy' header (default: "
+ + SELF + ")" + cspMore, VER_5_0_0);
+ addCfg(list, CONFIG_CSP_IMAGE, DEFAULT_CSP_DATA,
Configuration.Type.STRING, "Value for 'image-src' directive of
'Content-Security-Policy' header (default: "
+ + DEFAULT_CSP_DATA + ")" + cspMore, VER_5_0_0);
+ addCfg(list, CONFIG_CSP_MEDIA, DEFAULT_CSP_DATA,
Configuration.Type.STRING, "Value for 'media-src' directive of
'Content-Security-Policy' header (default: "
+ + DEFAULT_CSP_DATA + ")" + cspMore, VER_5_0_0);
+ addCfg(list, CONFIG_CSP_SCRIPT, STRICT_DYNAMIC.getValue(),
Configuration.Type.STRING, "Value for 'script-src' directive of
'Content-Security-Policy' header (default: "
+ + STRICT_DYNAMIC + ")" + cspMore, VER_5_0_0);
+ addCfg(list, CONFIG_CSP_STYLE, DEFAULT_CSP_STYLE,
Configuration.Type.STRING, "Value for 'style-src' directive of
'Content-Security-Policy' header (default: "
+ + DEFAULT_CSP_STYLE + ")" + cspMore, VER_5_0_0);
addCfg(list, CONFIG_SMTP_SSL, String.valueOf(false),
Configuration.Type.BOOL, "Enable SSL", VER_5_0_0);
addCfg(list, CONFIG_CSP_ENABLED, String.valueOf(true),
Configuration.Type.BOOL, "Whether or not CSP secure headers are enabled",
VER_5_0_0);
return list;
diff --git
a/openmeetings-install/src/test/java/org/apache/openmeetings/backup/TestBackupVersion.java
b/openmeetings-install/src/test/java/org/apache/openmeetings/backup/TestBackupVersion.java
index 4ec5caf..eb49a2b 100644
---
a/openmeetings-install/src/test/java/org/apache/openmeetings/backup/TestBackupVersion.java
+++
b/openmeetings-install/src/test/java/org/apache/openmeetings/backup/TestBackupVersion.java
@@ -24,7 +24,7 @@ import static
org.junit.jupiter.api.Assertions.assertNotEquals;
import org.junit.jupiter.api.Test;
-public class TestBackupVersion {
+class TestBackupVersion {
@Test
void testGet() {
BackupVersion bv = BackupVersion.get();
diff --git
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/IcalUtils.java
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/IcalUtils.java
index b881a43..f34c217 100644
---
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/IcalUtils.java
+++
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/IcalUtils.java
@@ -395,7 +395,7 @@ public class IcalUtils {
}
Calendar icsCalendar = new Calendar();
- icsCalendar.getProperties().add(new ProdId("-//Events
Calendar//Apache Openmeetings//EN"));
+ icsCalendar.getProperties().add(new ProdId(PROD_ID));
icsCalendar.getProperties().add(Version.VERSION_2_0);
icsCalendar.getProperties().add(CalScale.GREGORIAN);
icsCalendar.getComponents().add(timeZone.getVTimeZone());
diff --git
a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java
b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java
index 31467bf..4ce4e33 100644
---
a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java
+++
b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java
@@ -26,6 +26,7 @@ import com.github.openjson.JSONObject;
public class OpenmeetingsVariables {
public static final String ATTR_CLASS = "class";
public static final String ATTR_TITLE = "title";
+ public static final String ATTR_DISABLED = "disabled";
public static final String PARAM_USER_ID = "userId";
public static final String PARAM_STATUS = "status";
public static final String PARAM_SRC = "src";
diff --git
a/openmeetings-util/src/test/java/org/apache/openmeetings/util/TestCalendarPatterns.java
b/openmeetings-util/src/test/java/org/apache/openmeetings/util/TestCalendarPatterns.java
index a5d9782..e420966 100644
---
a/openmeetings-util/src/test/java/org/apache/openmeetings/util/TestCalendarPatterns.java
+++
b/openmeetings-util/src/test/java/org/apache/openmeetings/util/TestCalendarPatterns.java
@@ -24,7 +24,7 @@ import java.util.Date;
import org.junit.jupiter.api.Test;
-public class TestCalendarPatterns {
+class TestCalendarPatterns {
@Test
void backupDateParseTest() {
diff --git
a/openmeetings-util/src/test/java/org/apache/openmeetings/util/TestStoredFile.java
b/openmeetings-util/src/test/java/org/apache/openmeetings/util/TestStoredFile.java
index 37397d4..8e8614e 100644
---
a/openmeetings-util/src/test/java/org/apache/openmeetings/util/TestStoredFile.java
+++
b/openmeetings-util/src/test/java/org/apache/openmeetings/util/TestStoredFile.java
@@ -26,7 +26,7 @@ import java.io.InputStream;
import org.junit.jupiter.api.Test;
-public class TestStoredFile {
+class TestStoredFile {
@Test
void testAudio() {
final String[] exts = {"aif", "aifc", "aiff", "au", "mp3",
"flac", "wav"}; //TODO enlarge
diff --git
a/openmeetings-util/src/test/java/org/apache/openmeetings/util/TestVersion.java
b/openmeetings-util/src/test/java/org/apache/openmeetings/util/TestVersion.java
index ddc250d..bffb226 100644
---
a/openmeetings-util/src/test/java/org/apache/openmeetings/util/TestVersion.java
+++
b/openmeetings-util/src/test/java/org/apache/openmeetings/util/TestVersion.java
@@ -27,7 +27,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import org.junit.jupiter.api.Test;
-public class TestVersion {
+class TestVersion {
@Test
void testVersion() {
assertNotNull(getVersion());
diff --git
a/openmeetings-util/src/test/java/org/apache/openmeetings/util/crypt/TestSCrypt.java
b/openmeetings-util/src/test/java/org/apache/openmeetings/util/crypt/TestSCrypt.java
index ee5702f..84cc4d2 100644
---
a/openmeetings-util/src/test/java/org/apache/openmeetings/util/crypt/TestSCrypt.java
+++
b/openmeetings-util/src/test/java/org/apache/openmeetings/util/crypt/TestSCrypt.java
@@ -24,7 +24,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
-public class TestSCrypt extends AbstractCryptTest {
+class TestSCrypt extends AbstractCryptTest {
private static final String TEST_PASS = "12345";
private static final String MD5_HASH =
"827ccb0eea8a706c4c34a16891f84e7b";
private static final String SHA_HASH =
"1000:3C2Sm1yw8NoyEBg8KaJfJMye9GaM8uKDNfUNyPWSbwNI2amKAK10KIrPOQeOV7uLkGCT1Fl5gabBRGjLRSBzi7S8LgaVetiEuCL0d8oVPYT1xtgrmEzx/dIyd7hVaGbol388FVW2Ei7ZxIce8DIOtKmMfrxqoNEZa+ERRAzBGLE=:lbveBdEopW7QuU2jcgv4UeuA1m0eDwfIz+KjWgciF/8TWdLi7utCiy+wm3X2pp0WRffqKEs+wwBh6iJbF2WNPIH06YaB68Q1h34wpxjBdziqAbUiGt2nZiPdKghNNX5j4L0Jp1gGRWpXOrg7V1NqYV6pLmwa+SipQs7MJGCCf+HAcwYW3HNIcp2Rbu9IzH7/t7oJo+FCgL4i1rYVHxrbHhAZCA9hr+dKM6u3S/Ef+EsZfSxCOX2BIRkoqHF4ZlLpwCIf6gmq3m7jenAjz
[...]
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java
index 7885201..305f4a4 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java
@@ -19,6 +19,7 @@
package org.apache.openmeetings.web.admin.backup;
import static java.time.Duration.ZERO;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.ATTR_DISABLED;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.getMaxUploadSize;
import java.io.File;
@@ -256,7 +257,7 @@ public class BackupPanel extends AdminBasePanel {
private void updateButtons(IPartialPageRequestHandler target,
boolean enabled) {
download.setEnabled(enabled);
- upload.add(enabled ?
AttributeModifier.remove("disabled") : AttributeModifier.append("disabled",
"disabled"));
+ upload.add(enabled ?
AttributeModifier.remove(ATTR_DISABLED) :
AttributeModifier.append(ATTR_DISABLED, ATTR_DISABLED));
fileUploadField.setEnabled(enabled);
target.add(download, upload);
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
index 9f33150..f3d47e1 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
@@ -94,7 +94,7 @@ public abstract class BasePage extends
AsyncUrlFragmentAwarePage {
add(new Label("pageTitle", appName));
add(header = new HeaderPanel("header", appName));
add(loader.setVisible(isMainPage()).setOutputMarkupPlaceholderTag(true).setOutputMarkupId(true));
- add(new HeaderResponseContainer("customCSS",
CUSTOM_CSS_FILTER));
+ add(new HeaderResponseContainer(CUSTOM_CSS_FILTER,
CUSTOM_CSS_FILTER));
}
public abstract boolean isRtl();
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPreviewResourceReference.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPreviewResourceReference.java
index b0bbae9..60704e7 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPreviewResourceReference.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPreviewResourceReference.java
@@ -23,6 +23,7 @@ import static
org.apache.openmeetings.util.OmFileHelper.PNG_MIME_TYPE;
import java.io.File;
+import org.apache.openmeetings.db.entity.file.BaseFileItem;
import org.apache.openmeetings.db.entity.file.FileItem;
import org.apache.wicket.request.resource.IResource.Attributes;
@@ -46,7 +47,7 @@ public class RoomPreviewResourceReference extends
RoomResourceReference {
@Override
protected FileItem getFileItem(Attributes attr) {
FileItem f = super.getFileItem(attr);
- if (f != null && FileItem.Type.VIDEO == f.getType()) {
+ if (f != null && BaseFileItem.Type.VIDEO == f.getType()) {
return f;
}
return null;
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java
index 1e81778..e59b390 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java
@@ -34,6 +34,7 @@ import org.apache.openmeetings.db.dao.user.GroupUserDao;
import org.apache.openmeetings.db.dto.room.Whiteboard;
import org.apache.openmeetings.db.dto.room.Whiteboards;
import org.apache.openmeetings.db.entity.basic.Client;
+import org.apache.openmeetings.db.entity.file.BaseFileItem;
import org.apache.openmeetings.db.entity.file.FileItem;
import org.apache.openmeetings.web.app.ClientManager;
import org.apache.openmeetings.web.app.WebSession;
@@ -140,7 +141,7 @@ public class RoomResourceReference extends
FileItemResourceReference<FileItem> {
@Override
protected File getFile(FileItem f, Attributes attr) {
- String ext = f.getType() == FileItem.Type.PRESENTATION
+ String ext = f.getType() == BaseFileItem.Type.PRESENTATION
?
attr.getParameters().get(ATTR_SLIDE).toString() : null;
return getFile(f, ext);
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
index b2b23fe..270e763 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
@@ -26,7 +26,7 @@ import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.OmModalCloseButton;
import org.apache.openmeetings.web.room.RoomPanel;
import org.apache.openmeetings.web.util.upload.BootstrapFileUploadBehavior;
-import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.AttributeModifier;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
@@ -64,14 +64,14 @@ public class UploadDialog extends Modal<String> {
setCloseOnEscapeKey(false);
setBackdrop(Backdrop.STATIC);
- add(form.add(AttributeAppender.append("data-max-size",
getMaxUploadSize()))
-
.add(AttributeAppender.append("data-max-size-lbl",
Bytes.bytes(getMaxUploadSize()).toString(WebSession.get().getLocale())))
-
.add(AttributeAppender.append("data-upload-lbl", getString("593")))
-
.add(AttributeAppender.append("data-max-upload-lbl", getString("1491")))
- .add(AttributeAppender.append("action", "" +
urlFor(new RoomFileUploadResourceReference(), new PageParameters())))
+ add(form.add(AttributeModifier.append("data-max-size",
getMaxUploadSize()))
+
.add(AttributeModifier.append("data-max-size-lbl",
Bytes.bytes(getMaxUploadSize()).toString(WebSession.get().getLocale())))
+
.add(AttributeModifier.append("data-upload-lbl", getString("593")))
+
.add(AttributeModifier.append("data-max-upload-lbl", getString("1491")))
+ .add(AttributeModifier.append("action", "" +
urlFor(new RoomFileUploadResourceReference(), new PageParameters())))
.setOutputMarkupId(true)
.setOutputMarkupPlaceholderTag(true));
- form.add(new
WebMarkupContainer("sid").add(AttributeAppender.append("value",
room.getClient().getSid())).setMarkupId("room-upload-sid").setOutputMarkupId(true));
+ form.add(new
WebMarkupContainer("sid").add(AttributeModifier.append("value",
room.getClient().getSid())).setMarkupId("room-upload-sid").setOutputMarkupId(true));
form.add(lastSelected.setMarkupId("room-upload-last-selected").setOutputMarkupId(true));
add(BootstrapFileUploadBehavior.INSTANCE);
addButton(OmModalCloseButton.of("85"));
@@ -81,9 +81,9 @@ public class UploadDialog extends Modal<String> {
@Override
public Modal<String> show(IPartialPageRequestHandler handler) {
- lastSelected.add(AttributeAppender.replace("value",
roomFiles.getLastSelected().getId()));
+ lastSelected.add(AttributeModifier.replace("value",
roomFiles.getLastSelected().getId()));
handler.add(form.setVisible(true));
- handler.appendJavaScript(String.format("Upload.bindUpload();"));
+ handler.appendJavaScript("Upload.bindUpload();");
return super.show(handler);
}
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 661ec92..d735747 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
@@ -539,7 +539,7 @@ public class WbPanel extends AbstractWbPanel {
.put("uid", wuid)
.put(ATTR_SLIDE,
wb.getSlide())
;
- if (FileItem.Type.VIDEO == fi.getType()
|| FileItem.Type.RECORDING == fi.getType()) {
+ if (BaseFileItem.Type.VIDEO ==
fi.getType() || BaseFileItem.Type.RECORDING == fi.getType()) {
file.put(ATTR_OMTYPE, "Video");
file.put(PARAM_STATUS, new
JSONObject()
.put("paused",
true)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
index 66aa337..2d7fbad 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
@@ -58,11 +58,11 @@ import org.apache.openmeetings.web.user.OmWysiwygToolbar;
import org.apache.openmeetings.web.user.rooms.RoomEnterBehavior;
import org.apache.openmeetings.web.util.RoomTypeDropDown;
import org.apache.openmeetings.web.util.UserMultiChoice;
+import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormChoiceComponentUpdatingBehavior;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.ajax.markup.html.form.AjaxCheckBox;
-import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
@@ -223,7 +223,7 @@ public class AppointmentDialog extends Modal<Appointment> {
}
});
enterRoom.setOutputMarkupId(true).setOutputMarkupPlaceholderTag(true);
- enterRoom.add(AttributeAppender.append("data-dismiss",
"modal"));
+ enterRoom.add(AttributeModifier.append("data-dismiss",
"modal"));
delete = new BootstrapAjaxLink<>("button", null,
Buttons.Type.Outline_Danger, new ResourceModel("80")) {
private static final long serialVersionUID = 1L;
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestExport.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestExport.java
index 0e4c9bf..cc50355 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestExport.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestExport.java
@@ -35,7 +35,7 @@ import org.junit.jupiter.api.Test;
import com.sun.xml.bind.marshaller.CharacterEscapeHandler;
-public class TestExport extends AbstractJUnitDefaults {
+class TestExport extends AbstractJUnitDefaults {
@Test
void exportMain() throws Exception {
BackupExport.main(new String[] {File.createTempFile("gereral",
"cfg").getCanonicalPath()});
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestImport.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestImport.java
index e4dde56..835e19e 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestImport.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestImport.java
@@ -33,7 +33,7 @@ import org.apache.openmeetings.db.entity.server.LdapConfig;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
-public class TestImport extends AbstractTestImport {
+class TestImport extends AbstractTestImport {
@Autowired
private LdapConfigDao ldapDao;
@Autowired
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestImportCalendar.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestImportCalendar.java
index 515b6ff..ba445a3 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestImportCalendar.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestImportCalendar.java
@@ -27,7 +27,7 @@ import org.apache.openmeetings.db.dao.calendar.OmCalendarDao;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
-public class TestImportCalendar extends AbstractTestImport {
+class TestImportCalendar extends AbstractTestImport {
@Autowired
private OmCalendarDao calendarDao;
@Autowired
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestImportConfig.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestImportConfig.java
index 9cc855b..5f7d1fe 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestImportConfig.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestImportConfig.java
@@ -29,7 +29,7 @@ import java.io.File;
import org.apache.openmeetings.db.entity.basic.Configuration;
import org.junit.jupiter.api.Test;
-public class TestImportConfig extends AbstractTestImport {
+class TestImportConfig extends AbstractTestImport {
@Test
void importConfigsNoKeyDeleted() throws Exception {
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestImportOld.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestImportOld.java
index 3a43614..511cca0 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestImportOld.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestImportOld.java
@@ -37,7 +37,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-public class TestImportOld extends AbstractTestImport {
+class TestImportOld extends AbstractTestImport {
private static final Logger log =
LoggerFactory.getLogger(TestImportOld.class);
@Autowired
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestImportRoom.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestImportRoom.java
index d7e15db..591088a 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestImportRoom.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestImportRoom.java
@@ -26,7 +26,7 @@ import org.apache.openmeetings.db.dao.room.RoomDao;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
-public class TestImportRoom extends AbstractTestImport {
+class TestImportRoom extends AbstractTestImport {
@Autowired
private RoomDao roomDao;
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestImportUser.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestImportUser.java
index 965e27d..a6c479e 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestImportUser.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestImportUser.java
@@ -31,7 +31,7 @@ import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
-public class TestImportUser extends AbstractTestImport {
+class TestImportUser extends AbstractTestImport {
@Autowired
private LdapConfigDao ldapDao;
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestAppointmentAddAppointment.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestAppointmentAddAppointment.java
index aefd44a..5819d14 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestAppointmentAddAppointment.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestAppointmentAddAppointment.java
@@ -45,7 +45,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-public class TestAppointmentAddAppointment extends AbstractWicketTester {
+class TestAppointmentAddAppointment extends AbstractWicketTester {
private static final Logger log =
LoggerFactory.getLogger(TestAppointmentAddAppointment.class);
@Autowired
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestAppointmentSchedulerTask.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestAppointmentSchedulerTask.java
index c1ec96a..642c15f 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestAppointmentSchedulerTask.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestAppointmentSchedulerTask.java
@@ -31,7 +31,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-public class TestAppointmentSchedulerTask extends AbstractJUnitDefaults {
+class TestAppointmentSchedulerTask extends AbstractJUnitDefaults {
private static final Logger log =
LoggerFactory.getLogger(TestAppointmentSchedulerTask.class);
@Autowired
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureAppointment.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureAppointment.java
index 751821f..a5993c2 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureAppointment.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureAppointment.java
@@ -30,7 +30,7 @@ import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class TestDatabaseStructureAppointment extends AbstractJUnitDefaults {
+class TestDatabaseStructureAppointment extends AbstractJUnitDefaults {
private static final Logger log =
LoggerFactory.getLogger(TestDatabaseStructureAppointment.class);
@Test
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureGetAppointmentByRange.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureGetAppointmentByRange.java
index 040f41d..cf58b10 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureGetAppointmentByRange.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureGetAppointmentByRange.java
@@ -30,7 +30,7 @@ import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class TestDatabaseStructureGetAppointmentByRange extends
AbstractJUnitDefaults {
+class TestDatabaseStructureGetAppointmentByRange extends AbstractJUnitDefaults
{
private static final Logger log =
LoggerFactory.getLogger(TestDatabaseStructureGetAppointmentByRange.class);
@Test
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureGetUserStart.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureGetUserStart.java
index c6f0d84..9898299 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureGetUserStart.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureGetUserStart.java
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class TestDatabaseStructureGetUserStart extends AbstractJUnitDefaults {
+class TestDatabaseStructureGetUserStart extends AbstractJUnitDefaults {
private static final Logger log =
LoggerFactory.getLogger(TestDatabaseStructureGetUserStart.class);
@Test
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureMeetingMember.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureMeetingMember.java
index 3f29aaa..25e4d16 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureMeetingMember.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureMeetingMember.java
@@ -21,7 +21,7 @@ package org.apache.openmeetings.calendar;
import org.apache.openmeetings.AbstractJUnitDefaults;
import org.junit.jupiter.api.Test;
-public class TestDatabaseStructureMeetingMember extends AbstractJUnitDefaults {
+class TestDatabaseStructureMeetingMember extends AbstractJUnitDefaults {
@Test
void testUpdateMeetingMember(){
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestGetAppointment.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestGetAppointment.java
index 7458f7d..511b803 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestGetAppointment.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestGetAppointment.java
@@ -32,7 +32,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-public class TestGetAppointment extends AbstractJUnitDefaults {
+class TestGetAppointment extends AbstractJUnitDefaults {
private static final Logger log =
LoggerFactory.getLogger(TestGetAppointment.class);
@Autowired
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestOmCalendar.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestOmCalendar.java
index 28f86e3..9b1483f 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestOmCalendar.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestOmCalendar.java
@@ -28,7 +28,7 @@ import org.apache.openmeetings.db.entity.user.User;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
-public class TestOmCalendar extends AbstractJUnitDefaults {
+class TestOmCalendar extends AbstractJUnitDefaults {
@Autowired
private OmCalendarDao calendarDao;
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestSendIcalMessage.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestSendIcalMessage.java
index fa5ca3d..4a979dc 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestSendIcalMessage.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestSendIcalMessage.java
@@ -66,7 +66,7 @@ import net.fortuna.ical4j.model.property.ProdId;
import net.fortuna.ical4j.model.property.Uid;
import net.fortuna.ical4j.model.property.Version;
-public class TestSendIcalMessage extends AbstractJUnitDefaults {
+class TestSendIcalMessage extends AbstractJUnitDefaults {
private static final Logger log =
LoggerFactory.getLogger(TestSendIcalMessage.class);
@Autowired
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/cli/TestAdmin.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/cli/TestAdmin.java
index 9b0bf4d..38bcf05 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/cli/TestAdmin.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/cli/TestAdmin.java
@@ -48,7 +48,7 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-public class TestAdmin {
+class TestAdmin {
private File tempFolder;
@BeforeEach
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/cli/TestPatcher.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/cli/TestPatcher.java
index b729af5..149583f 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/cli/TestPatcher.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/cli/TestPatcher.java
@@ -36,7 +36,7 @@ import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
-public class TestPatcher {
+class TestPatcher {
private static final String HOST = "myhost";
private static final String PORT = "6666";
private static final String DB = "mydb";
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/config/TestConfig.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/config/TestConfig.java
index b03fe9d..9e45fbb 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/config/TestConfig.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/config/TestConfig.java
@@ -30,7 +30,7 @@ import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class TestConfig extends AbstractJUnitDefaults {
+class TestConfig extends AbstractJUnitDefaults {
private static final Logger log =
LoggerFactory.getLogger(TestConfig.class);
@Test
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/core/file/TestFileProcessor.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/core/file/TestFileProcessor.java
index 1741a56..5a0545f 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/core/file/TestFileProcessor.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/core/file/TestFileProcessor.java
@@ -37,7 +37,7 @@ import org.apache.openmeetings.util.process.ProcessResultList;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
-public class TestFileProcessor extends AbstractJUnitDefaults {
+class TestFileProcessor extends AbstractJUnitDefaults {
private static final String FILE_NAME = "test_name";
@Autowired
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/db/dao/TestRoomDao.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/db/dao/TestRoomDao.java
index 6a17eea..30e02be 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/db/dao/TestRoomDao.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/db/dao/TestRoomDao.java
@@ -36,7 +36,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-public class TestRoomDao extends AbstractJUnitDefaults {
+class TestRoomDao extends AbstractJUnitDefaults {
private static final Logger log =
LoggerFactory.getLogger(TestRoomDao.class);
@Autowired
protected RoomDao roomDao;
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/domain/TestAddGroup.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/domain/TestAddGroup.java
index 3477c18..03d1726 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/domain/TestAddGroup.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/domain/TestAddGroup.java
@@ -27,7 +27,7 @@ import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class TestAddGroup extends AbstractJUnitDefaults {
+class TestAddGroup extends AbstractJUnitDefaults {
private static final Logger log =
LoggerFactory.getLogger(TestAddGroup.class);
@Test
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/domain/TestUserGroupAggregation.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/domain/TestUserGroupAggregation.java
index 1ce3727..576757e 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/domain/TestUserGroupAggregation.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/domain/TestUserGroupAggregation.java
@@ -28,7 +28,7 @@ import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class TestUserGroupAggregation extends AbstractJUnitDefaults {
+class TestUserGroupAggregation extends AbstractJUnitDefaults {
private static final Logger log =
LoggerFactory.getLogger(TestUserGroupAggregation.class);
@Test
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/invitiation/TestInvitation.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/invitiation/TestInvitation.java
index 6d4ef15..37194be 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/invitiation/TestInvitation.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/invitiation/TestInvitation.java
@@ -32,7 +32,7 @@ import org.apache.openmeetings.service.room.InvitationManager;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
-public class TestInvitation extends AbstractWicketTester {
+class TestInvitation extends AbstractWicketTester {
@Autowired
private InvitationManager invitationManager;
@Autowired
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/ldap/TestLdap.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/ldap/TestLdap.java
index 5c3f6e6..fe1296d 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/ldap/TestLdap.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/ldap/TestLdap.java
@@ -71,7 +71,7 @@ import org.springframework.beans.factory.annotation.Autowired;
})
@CreateLdapServer(transports = { @CreateTransport(protocol = "LDAP", address =
"localhost")})
@ApplyLdifFiles({"schema/users.ldif"})
-public class TestLdap extends AbstractWicketTester {
+class TestLdap extends AbstractWicketTester {
private static final String CFG_SEARCH_BIND =
UUID.randomUUID().toString();
private static final String BAD_PASSWORD = "bad password";
private static final String USER1 = "ldaptest1";
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/service/mail/template/TestEmailTemplate.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/service/mail/template/TestEmailTemplate.java
index 8cbd9f4..7c5f332 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/service/mail/template/TestEmailTemplate.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/service/mail/template/TestEmailTemplate.java
@@ -26,7 +26,7 @@ import org.apache.openmeetings.db.entity.user.UserContact;
import org.apache.wicket.util.string.Strings;
import org.junit.jupiter.api.Test;
-public class TestEmailTemplate extends AbstractWicketTester {
+class TestEmailTemplate extends AbstractWicketTester {
private static void checkTemplate(String eml) {
assertFalse(Strings.isEmpty(eml), "Body should be not empty");
}
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/service/mail/template/subject/TestSubjTemplate.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/service/mail/template/subject/TestSubjTemplate.java
index 5560657..3cc8e26 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/service/mail/template/subject/TestSubjTemplate.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/service/mail/template/subject/TestSubjTemplate.java
@@ -36,7 +36,7 @@ import org.apache.openmeetings.db.entity.user.User;
import org.apache.wicket.util.string.Strings;
import org.junit.jupiter.api.Test;
-public class TestSubjTemplate extends AbstractWicketTester {
+class TestSubjTemplate extends AbstractWicketTester {
private static void checkTemplate(SubjectEmailTemplate t) {
assertNotNull(t, "Template should be created");
assertFalse(Strings.isEmpty(t.getSubject()), "Subject should be
not empty");
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/service/quartz/TestJob.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/service/quartz/TestJob.java
index 12c31fc..01be361 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/service/quartz/TestJob.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/service/quartz/TestJob.java
@@ -28,7 +28,7 @@ import
org.apache.openmeetings.service.quartz.scheduler.ReminderJob;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
-public class TestJob extends AbstractWicketTester {
+class TestJob extends AbstractWicketTester {
@Autowired
private CleanupJob cleanJob;
@Autowired
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/smoke/TestSmokeBasic.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/smoke/TestSmokeBasic.java
index d187dcb..361b090 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/smoke/TestSmokeBasic.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/smoke/TestSmokeBasic.java
@@ -23,7 +23,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import org.apache.openmeetings.AbstractJUnitDefaults;
import org.junit.jupiter.api.Test;
-public class TestSmokeBasic extends AbstractJUnitDefaults {
+class TestSmokeBasic extends AbstractJUnitDefaults {
@Test
void createErrorValueAndTest() {
assertNotNull(userDao.get(1L));
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/user/TestUserContact.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/user/TestUserContact.java
index 0a6b51e..6aeb394 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/user/TestUserContact.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/user/TestUserContact.java
@@ -33,7 +33,7 @@ import org.apache.openmeetings.AbstractWicketTester;
import org.apache.openmeetings.db.entity.user.User;
import org.junit.jupiter.api.Test;
-public class TestUserContact extends AbstractWicketTester {
+class TestUserContact extends AbstractWicketTester {
@Test
void testGetUser() {
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/user/TestUserCount.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/user/TestUserCount.java
index 786ccdb..75c9abd 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/user/TestUserCount.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/user/TestUserCount.java
@@ -25,7 +25,7 @@ import org.apache.openmeetings.AbstractWicketTester;
import org.apache.openmeetings.db.entity.user.User;
import org.junit.jupiter.api.Test;
-public class TestUserCount extends AbstractWicketTester {
+class TestUserCount extends AbstractWicketTester {
@Test
void testCountSearchUsers() throws Exception {
User u = createUser();
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 a10fd8a..eb5a9e5 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
@@ -36,7 +36,7 @@ import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
-public class TestUserGroup extends AbstractJUnitDefaults {
+class TestUserGroup extends AbstractJUnitDefaults {
public static final String GROUP_NAME = "Test Group";
@Autowired
private GroupUserDao groupUserDao;
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/userdata/TestAuth.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/userdata/TestAuth.java
index 434db4a..15a4808 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/userdata/TestAuth.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/userdata/TestAuth.java
@@ -28,7 +28,7 @@ import org.apache.openmeetings.db.entity.server.Sessiondata;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
-public class TestAuth extends AbstractJUnitDefaults {
+class TestAuth extends AbstractJUnitDefaults {
@Autowired
private SessiondataDao sessionDao;
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/userdata/TestLogin.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/userdata/TestLogin.java
index 321b6b2..7a6e834 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/userdata/TestLogin.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/userdata/TestLogin.java
@@ -25,7 +25,7 @@ import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.util.OmException;
import org.junit.jupiter.api.Test;
-public class TestLogin extends AbstractJUnitDefaults {
+class TestLogin extends AbstractJUnitDefaults {
@Test
void testTestLogin() throws OmException {
User us = userDao.login(adminUsername, userpass);
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/util/TestDateTime.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/util/TestDateTime.java
index 4c9691a..8ba8566 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/util/TestDateTime.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/util/TestDateTime.java
@@ -32,7 +32,7 @@ import java.util.Locale;
import org.apache.openmeetings.web.common.AbstractOmDateTimePicker;
import org.junit.jupiter.api.Test;
-public class TestDateTime {
+class TestDateTime {
@Test
void test1() throws Exception {
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/util/TestStoredFile.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/util/TestStoredFile.java
index 5419172..ff343c3 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/util/TestStoredFile.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/util/TestStoredFile.java
@@ -28,7 +28,7 @@ import java.io.IOException;
import org.apache.openmeetings.AbstractJUnitDefaults;
import org.junit.jupiter.api.Test;
-public class TestStoredFile extends AbstractJUnitDefaults {
+class TestStoredFile extends AbstractJUnitDefaults {
@Test
void testPng() throws FileNotFoundException, IOException {
File f = getDefaultProfilePicture();
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestCalendar.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestCalendar.java
index c5ece6b..80e4e33 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestCalendar.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestCalendar.java
@@ -38,7 +38,7 @@ import com.googlecode.wicket.jquery.ui.calendar.CalendarView;
import de.agilecoders.wicket.core.markup.html.bootstrap.navbar.Navbar;
-public class TestCalendar extends AbstractWicketTester {
+class TestCalendar extends AbstractWicketTester {
private static final String PATH_APPOINTMENT_DLG =
String.format("%s:appointment", PATH_CHILD);
private static final String PATH_APPOINTMENT_DLG_FRM =
String.format("%s:appForm", PATH_APPOINTMENT_DLG);
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestMainAreas.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestMainAreas.java
index 33648a4..81905a8 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestMainAreas.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestMainAreas.java
@@ -71,7 +71,7 @@ import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class TestMainAreas extends AbstractWicketTester {
+class TestMainAreas extends AbstractWicketTester {
private static final Logger log =
LoggerFactory.getLogger(TestMainAreas.class);
@Test
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestMainMenu.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestMainMenu.java
index 6c4d270..25fbf09 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestMainMenu.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestMainMenu.java
@@ -42,7 +42,7 @@ import org.junit.jupiter.api.Test;
import de.agilecoders.wicket.core.markup.html.bootstrap.navbar.Navbar;
-public class TestMainMenu extends AbstractWicketTester {
+class TestMainMenu extends AbstractWicketTester {
private void checkMenuItem(int idx1, int idx2, Class<? extends
BasePanel> clazz) throws OmException {
testArea(adminUsername, p -> {
Navbar menu = (Navbar)p.get(PATH_MENU);
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestOmAuthenticationStrategy.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestOmAuthenticationStrategy.java
index 1f61639..ba0e5c9 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestOmAuthenticationStrategy.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestOmAuthenticationStrategy.java
@@ -28,7 +28,7 @@ import org.apache.openmeetings.AbstractWicketTester;
import org.apache.openmeetings.db.entity.user.User;
import org.junit.jupiter.api.Test;
-public class TestOmAuthenticationStrategy extends AbstractWicketTester {
+class TestOmAuthenticationStrategy extends AbstractWicketTester {
@Test
void test() {
OmAuthenticationStrategy s = new OmAuthenticationStrategy();
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestUserManagerMocked.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestUserManagerMocked.java
index ce74dde..ce19e5b 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestUserManagerMocked.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestUserManagerMocked.java
@@ -49,7 +49,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
import org.mockito.stubbing.Answer;
@ExtendWith(MockitoExtension.class)
-public class TestUserManagerMocked {
+class TestUserManagerMocked {
@Mock
private GroupDao groupDao;
@Mock
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestWebSession.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestWebSession.java
index 83ae666..bfa1208 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestWebSession.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestWebSession.java
@@ -27,7 +27,7 @@ import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.util.OmException;
import org.junit.jupiter.api.Test;
-public class TestWebSession extends AbstractWicketTester {
+class TestWebSession extends AbstractWicketTester {
@Test
void testLogin() throws OmException {
WebSession ws = WebSession.get();
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/TestHashPage.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/TestHashPage.java
index ea5038f..92e5195 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/TestHashPage.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/TestHashPage.java
@@ -54,7 +54,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import de.agilecoders.wicket.core.markup.html.bootstrap.dialog.Modal;
-public class TestHashPage extends AbstractWicketTester {
+class TestHashPage extends AbstractWicketTester {
private static final Logger log =
LoggerFactory.getLogger(TestHashPage.class);
@Autowired
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/auth/TestLoginUI.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/auth/TestLoginUI.java
index f7f3a4b..1dfcd8e 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/auth/TestLoginUI.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/auth/TestLoginUI.java
@@ -47,7 +47,7 @@ import
org.apache.wicket.request.resource.IResource.Attributes;
import org.apache.wicket.util.tester.FormTester;
import org.junit.jupiter.api.Test;
-public class TestLoginUI extends AbstractWicketTester {
+class TestLoginUI extends AbstractWicketTester {
private final static String PATH_REGISTER = "register:form";
private void checkLogin(String login, String pass) {
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestCalendarService.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestCalendarService.java
index b10a285..18fdafa 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestCalendarService.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestCalendarService.java
@@ -57,7 +57,7 @@ import org.junit.jupiter.api.Test;
import com.github.openjson.JSONArray;
import com.github.openjson.JSONObject;
-public class TestCalendarService extends AbstractWebServiceTest {
+class TestCalendarService extends AbstractWebServiceTest {
public static final String CALENDAR_SERVICE_MOUNT = "calendar";
private void actualTest(Room r) throws Exception {
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestErrorService.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestErrorService.java
index a7a2acd..2b4f875 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestErrorService.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestErrorService.java
@@ -31,7 +31,7 @@ import org.apache.openmeetings.db.dao.label.LabelDao;
import org.apache.openmeetings.db.dto.basic.ServiceResult;
import org.junit.jupiter.api.Test;
-public class TestErrorService extends AbstractWebServiceTest {
+class TestErrorService extends AbstractWebServiceTest {
public static final String ERROR_SERVICE_MOUNT = "error";
@Test
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 008e2ca..c2e0494 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
@@ -35,7 +35,7 @@ import org.apache.openmeetings.db.entity.file.BaseFileItem;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
-public class TestFileService extends AbstractWebServiceTest {
+class TestFileService extends AbstractWebServiceTest {
@Test
@Tag("org.apache.openmeetings.test.NonJenkinsTests")
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestGroupService.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestGroupService.java
index ef5b0a5..820c4a3 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestGroupService.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestGroupService.java
@@ -37,7 +37,7 @@ import org.apache.openmeetings.db.entity.room.Room;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
-public class TestGroupService extends AbstractWebServiceTest {
+class TestGroupService extends AbstractWebServiceTest {
public static final String GROUP_SERVICE_MOUNT = "group";
@Test
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestInfoService.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestInfoService.java
index c9d24e4..2d7906e 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestInfoService.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestInfoService.java
@@ -23,7 +23,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import org.apache.openmeetings.db.dto.basic.Info;
import org.junit.jupiter.api.Test;
-public class TestInfoService extends AbstractWebServiceTest {
+class TestInfoService extends AbstractWebServiceTest {
private static final String INFO_SERVICE_MOUNT = "info";
@Test
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestRecordingService.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestRecordingService.java
index 01d6f53..142cd76 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestRecordingService.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestRecordingService.java
@@ -34,7 +34,7 @@ import org.apache.openmeetings.db.entity.record.Recording;
import org.apache.openmeetings.db.entity.user.User;
import org.junit.jupiter.api.Test;
-public class TestRecordingService extends AbstractWebServiceTest {
+class TestRecordingService extends AbstractWebServiceTest {
public static final String RECORD_SERVICE_MOUNT = "record";
private User getExternalUser() throws Exception {
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestRoomService.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestRoomService.java
index d412b27..03a8312 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestRoomService.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestRoomService.java
@@ -40,7 +40,7 @@ import
org.apache.openmeetings.db.entity.room.Invitation.Valid;
import org.apache.openmeetings.db.entity.room.Room;
import org.junit.jupiter.api.Test;
-public class TestRoomService extends AbstractWebServiceTest {
+class TestRoomService extends AbstractWebServiceTest {
private static final long CAPACITY = 666L;
@Test
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestUserService.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestUserService.java
index 435dafb..6d6476e 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestUserService.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestUserService.java
@@ -51,7 +51,7 @@ import org.apache.openmeetings.web.app.WebSession;
import org.apache.wicket.util.string.StringValue;
import org.junit.jupiter.api.Test;
-public class TestUserService extends AbstractWebServiceTest {
+class TestUserService extends AbstractWebServiceTest {
private static final String DUMMY_PICTURE_URL =
"https://openmeetings.apache.org/images/logo.png";;
@Test
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestWbService.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestWbService.java
index 8551bc2..fc38c02 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestWbService.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestWbService.java
@@ -28,7 +28,7 @@ import org.apache.openmeetings.db.dto.room.RoomDTO;
import org.apache.openmeetings.db.entity.room.Room;
import org.junit.jupiter.api.Test;
-public class TestWbService extends AbstractWebServiceTest {
+class TestWbService extends AbstractWebServiceTest {
private static final long CAPACITY = 666L;
private static final String WB_SERVICE_MOUNT = "wb";
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestWebConverters.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestWebConverters.java
index ba907ca..7617386 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestWebConverters.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestWebConverters.java
@@ -33,7 +33,7 @@ import org.junit.jupiter.api.Test;
import com.github.openjson.JSONObject;
-public class TestWebConverters {
+class TestWebConverters {
@Test
void testDateConverter() {
assertEquals(null, DateParamConverter.get(null), "Null date
should be parsed");
diff --git
a/openmeetings-webservice/src/test/java/org/apache/openmeetings/webservice/TestBaseService.java
b/openmeetings-webservice/src/test/java/org/apache/openmeetings/webservice/TestBaseService.java
index cbefb8a..b34ad22 100644
---
a/openmeetings-webservice/src/test/java/org/apache/openmeetings/webservice/TestBaseService.java
+++
b/openmeetings-webservice/src/test/java/org/apache/openmeetings/webservice/TestBaseService.java
@@ -32,7 +32,7 @@ import org.junit.jupiter.api.Test;
import com.sun.star.uno.RuntimeException;
-public class TestBaseService {
+class TestBaseService {
private static void checkException(Runnable r) {
try {
r.run();
![https://openmeetings.apache.org/images/logo.png"](https://openmeetings.apache.org/images/logo.png"){kind=link}