You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2020/09/09 04:33:35 UTC
[openmeetings] branch master updated: [OPENMEETINGS-2427] sonar
should be more happy
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 ca8f5d0 [OPENMEETINGS-2427] sonar should be more happy
ca8f5d0 is described below
commit ca8f5d0d76e02e8cfdcef305bf276450da791b5f
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Wed Sep 9 11:31:11 2020 +0700
[OPENMEETINGS-2427] sonar should be more happy
---
.../core/converter/InterviewConverter.java | 38 ++++++------
.../org/apache/openmeetings/TestConnection.java | 2 +-
.../openmeetings/core/mail/TestMailSending.java | 3 +-
.../core/remote/TestNotConnectedMocked.java | 12 ++--
.../core/remote/TestRecordingFlowMocked.java | 2 +-
.../core/remote/TestRoomFlowMocked.java | 12 ++--
.../core/remote/TestSetupFlowMocked.java | 10 ++--
.../java/org/apache/openmeetings/gui/TestGui.java | 2 +-
.../openmeetings/rdc/TestKeyCodesNumber.java | 2 +-
.../openmeetings/rdc/TestReadKeyCodesNumber.java | 4 +-
.../apache/openmeetings/db/dao/label/LabelDao.java | 2 +-
.../db/entity/calendar/Appointment.java | 58 +++++++++---------
.../db/entity/calendar/OmCalendar.java | 14 ++---
.../openmeetings/db/dto/user/TestOAuthUser.java | 10 ++--
.../openmeetings/db/entity/file/FileItemTest.java | 14 ++---
.../openmeetings/db/util/TestAuthLevelUtil.java | 8 +--
.../openmeetings/db/util/TestLocaleHelper.java | 2 +-
.../apache/openmeetings/cli/OmHelpFormatter.java | 4 +-
.../openmeetings/backup/TestBackupVersion.java | 6 +-
.../service/room/InvitationManager.java | 6 +-
.../apache/openmeetings/util/mail/IcalHandler.java | 8 +--
.../openmeetings/util/TestCalendarPatterns.java | 2 +-
.../apache/openmeetings/util/TestStoredFile.java | 10 ++--
.../org/apache/openmeetings/util/TestVersion.java | 8 +--
.../openmeetings/util/crypt/AbstractCryptTest.java | 4 +-
.../apache/openmeetings/util/crypt/TestSCrypt.java | 2 +-
.../web/admin/AdminUserChoiceProvider.java | 4 +-
.../openmeetings/web/admin/labels/LangForm.java | 2 +-
.../openmeetings/web/admin/oauth/OAuthForm.java | 4 +-
.../openmeetings/web/admin/rooms/RoomForm.java | 14 ++---
.../openmeetings/web/admin/users/UserForm.java | 2 +-
.../apache/openmeetings/web/app/Application.java | 4 +-
.../openmeetings/web/app/QuickPollManager.java | 2 +-
.../apache/openmeetings/web/app/WebSession.java | 8 +--
.../openmeetings/web/common/GeneralUserForm.java | 4 +-
.../openmeetings/web/common/InvitationDialog.java | 7 ++-
.../openmeetings/web/common/InvitationForm.java | 4 +-
.../openmeetings/web/common/LanguageDropDown.java | 2 +-
.../apache/openmeetings/web/common/MainPanel.java | 4 +-
.../openmeetings/web/common/OmWebSocketPanel.java | 6 +-
.../web/common/PagedEntityListPanel.java | 2 +-
.../web/common/PagingNavigatorPanel.java | 2 +-
.../web/common/UploadableImagePanel.java | 2 +-
.../web/common/tree/OmTreeProvider.java | 22 +++----
.../web/pages/auth/RegisterDialog.java | 12 ++--
.../web/pages/auth/ResetPasswordDialog.java | 4 +-
.../openmeetings/web/pages/auth/SignInDialog.java | 6 +-
.../openmeetings/web/pages/auth/SignInPage.java | 6 +-
.../web/pages/install/InstallWizard.java | 12 ++--
.../apache/openmeetings/web/room/RoomPanel.java | 24 ++++----
.../web/room/menu/RoomInvitationForm.java | 4 +-
.../web/room/poll/PollResultsDialog.java | 10 ++--
.../web/room/wb/WbWebSocketHelper.java | 24 ++++----
.../web/user/InviteUserToRoomDialog.java | 4 +-
.../openmeetings/web/user/MessageDialog.java | 4 +-
.../web/user/calendar/AppointmentDialog.java | 10 ++--
.../web/user/dashboard/MyRoomsWidget.java | 3 +-
.../web/user/dashboard/RecentRoomsWidget.java | 3 +-
.../openmeetings/web/user/dashboard/RssWidget.java | 3 +-
.../web/user/dashboard/StartWidget.java | 3 +-
.../web/user/dashboard/WelcomeWidget.java | 3 +-
.../web/user/dashboard/admin/AdminWidget.java | 3 +-
.../web/user/profile/EditProfileForm.java | 2 +-
.../user/record/RecordingResourceReference.java | 6 +-
.../openmeetings/web/user/record/VideoInfo.java | 6 +-
.../web/util/ExtendedClientProperties.java | 8 +--
.../web/util/GroupLogoResourceReference.java | 4 +-
.../web/util/RestrictiveChoiceProvider.java | 4 +-
.../org/apache/openmeetings/backup/TestExport.java | 4 +-
.../org/apache/openmeetings/backup/TestImport.java | 18 +++---
.../openmeetings/backup/TestImportCalendar.java | 6 +-
.../openmeetings/backup/TestImportConfig.java | 6 +-
.../apache/openmeetings/backup/TestImportOld.java | 4 +-
.../apache/openmeetings/backup/TestImportRoom.java | 4 +-
.../apache/openmeetings/backup/TestImportUser.java | 8 +--
.../calendar/TestAppointmentAddAppointment.java | 4 +-
.../calendar/TestAppointmentSchedulerTask.java | 6 +-
.../calendar/TestDatabaseStructureAppointment.java | 2 +-
...TestDatabaseStructureGetAppointmentByRange.java | 2 +-
.../TestDatabaseStructureGetUserStart.java | 2 +-
.../TestDatabaseStructureMeetingMember.java | 2 +-
.../openmeetings/calendar/TestGetAppointment.java | 4 +-
.../openmeetings/calendar/TestOmCalendar.java | 2 +-
.../openmeetings/calendar/TestSendIcalMessage.java | 2 +-
.../org/apache/openmeetings/cli/TestAdmin.java | 12 ++--
.../org/apache/openmeetings/cli/TestPatcher.java | 2 +-
.../org/apache/openmeetings/config/TestConfig.java | 4 +-
.../openmeetings/core/file/TestFileProcessor.java | 2 +-
.../apache/openmeetings/db/dao/TestRoomDao.java | 4 +-
.../apache/openmeetings/domain/TestAddGroup.java | 2 +-
.../domain/TestUserGroupAggregation.java | 2 +-
.../openmeetings/invitiation/TestInvitation.java | 2 +-
.../org/apache/openmeetings/ldap/TestLdap.java | 8 +--
.../service/mail/template/TestEmailTemplate.java | 4 +-
.../mail/template/subject/TestSubjTemplate.java | 4 +-
.../openmeetings/service/quartz/TestJob.java | 6 +-
.../apache/openmeetings/smoke/TestSmokeBasic.java | 2 +-
.../apache/openmeetings/user/TestUserContact.java | 10 ++--
.../apache/openmeetings/user/TestUserCount.java | 8 +--
.../apache/openmeetings/user/TestUserGroup.java | 8 +--
.../org/apache/openmeetings/userdata/TestAuth.java | 8 +--
.../apache/openmeetings/userdata/TestLogin.java | 2 +-
.../org/apache/openmeetings/util/TestDateTime.java | 6 +-
.../apache/openmeetings/util/TestStoredFile.java | 2 +-
.../org/apache/openmeetings/web/TestCalendar.java | 2 +-
.../org/apache/openmeetings/web/TestMainAreas.java | 70 +++++++++++-----------
.../org/apache/openmeetings/web/TestMainMenu.java | 32 +++++-----
.../web/app/TestOmAuthenticationStrategy.java | 2 +-
.../web/app/TestUserManagerMocked.java | 2 +-
.../openmeetings/web/app/TestWebSession.java | 2 +-
.../openmeetings/web/pages/TestHashPage.java | 12 ++--
.../openmeetings/web/pages/auth/TestLoginUI.java | 16 ++---
.../web/pages/install/TestInstall.java | 2 +-
.../webservice/TestCalendarService.java | 16 ++---
.../openmeetings/webservice/TestErrorService.java | 6 +-
.../openmeetings/webservice/TestFileService.java | 2 +-
.../openmeetings/webservice/TestGroupService.java | 10 ++--
.../openmeetings/webservice/TestInfoService.java | 2 +-
.../webservice/TestRecordingService.java | 2 +-
.../openmeetings/webservice/TestRoomService.java | 12 ++--
.../openmeetings/webservice/TestUserService.java | 12 ++--
.../openmeetings/webservice/TestWbService.java | 6 +-
.../openmeetings/webservice/TestWebConverters.java | 6 +-
.../openmeetings/webservice/GroupWebService.java | 4 +-
.../openmeetings/webservice/NetTestWebService.java | 6 +-
.../openmeetings/webservice/TestBaseService.java | 8 +--
126 files changed, 454 insertions(+), 460 deletions(-)
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java
index 6289ea4..7e17d93 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java
@@ -89,13 +89,13 @@ public class InterviewConverter extends BaseConverter implements IRecordingConve
, LinkedHashMap::new
, Collectors.collectingAndThen(Collectors.toList(), l -> l.stream().sorted(Comparator.comparing(RecordingChunk::getStart)).collect(Collectors.toList()))));
List<String> pods = new ArrayList<>();
- int N = pods.size();
+ int numPods = pods.size();
for (Entry<String, List<RecordingChunk>> e : cunksBySid.entrySet()) {
Date pStart = r.getRecordStart();
List<PodPart> parts = new ArrayList<>();
- pStart = processParts(r.getRoomId(), e.getValue(), logs, N, parts, pStart);
+ pStart = processParts(r.getRoomId(), e.getValue(), logs, numPods, parts, pStart);
if (!parts.isEmpty()) {
- String podX = new File(streamFolder, String.format("rec_%s_pod_%s.%s", r.getId(), N, EXTENSION_MP4)).getCanonicalPath();
+ String podX = new File(streamFolder, String.format("rec_%s_pod_%s.%s", r.getId(), numPods, EXTENSION_MP4)).getCanonicalPath();
long diff = diff(r.getRecordEnd(), pStart);
PodPart.add(parts, diff);
/* create continuous pod
@@ -135,16 +135,16 @@ public class InterviewConverter extends BaseConverter implements IRecordingConve
args.add(concat.insert(0, videos).append("concat=n=").append(parts.size()).append(":v=1:a=0").toString());
args.add("-an");
args.add(podX);
- ProcessResult res = ProcessHelper.executeScript(String.format("Full video pod_%s", N), args.toArray(new String[0]), true);
+ ProcessResult res = ProcessHelper.executeScript(String.format("Full video pod_%s", numPods), args.toArray(new String[0]), true);
logs.add(res);
if (res.isWarn()) {
throw new ConversionException("Fail to create pod");
}
pods.add(podX);
- N = pods.size();
+ numPods = pods.size();
}
}
- if (N == 0) {
+ if (numPods == 0) {
ProcessResult res = new ProcessResult();
res.setProcess("CheckStreamFilesExists");
res.setError("No valid pods found");
@@ -152,14 +152,14 @@ public class InterviewConverter extends BaseConverter implements IRecordingConve
logs.add(res);
return;
}
- double ratio = Math.sqrt(N / Math.sqrt(2));
- int w = ratio < 1 ? N : (int)Math.round(ratio);
- w = Math.max(w, (int)Math.round(1. * N / w));
+ double ratio = Math.sqrt(numPods / Math.sqrt(2));
+ int w = ratio < 1 ? numPods : (int)Math.round(ratio);
+ w = Math.max(w, (int)Math.round(1. * numPods / w));
r.setWidth(w * width);
- r.setHeight((N / w) * height);
+ r.setHeight((numPods / w) * height);
- String mp4path = convertToMp4(r, getFinalArgs(N, pods, wav, w), logs);
+ String mp4path = convertToMp4(r, getFinalArgs(numPods, pods, wav, w), logs);
finalizeRec(r, mp4path, logs);
} catch (Exception err) {
@@ -175,7 +175,7 @@ public class InterviewConverter extends BaseConverter implements IRecordingConve
}
}
- private Date processParts(Long roomId, List<RecordingChunk> chunks, ProcessResultList logs, int N, List<PodPart> parts, Date pStart) throws IOException {
+ private Date processParts(Long roomId, List<RecordingChunk> chunks, ProcessResultList logs, int numPods, List<PodPart> parts, Date pStart) throws IOException {
for (RecordingChunk chunk : chunks) {
File chunkStream = getRecordingChunk(roomId, chunk.getStreamName());
if (!chunkStream.exists()) {
@@ -191,7 +191,7 @@ public class InterviewConverter extends BaseConverter implements IRecordingConve
, "-v", "error"
, "-f", "null"
, "file.null"};
- ProcessResult res = ProcessHelper.executeScript(String.format("Check chunk pod video_%s_%s", N, parts.size()), args, true);
+ ProcessResult res = ProcessHelper.executeScript(String.format("Check chunk pod video_%s_%s", numPods, parts.size()), args, true);
logs.add(res);
if (!res.isWarn()) {
long diff = diff(chunk.isAudioOnly() ? chunk.getEnd() : chunk.getStart(), pStart);
@@ -205,9 +205,9 @@ public class InterviewConverter extends BaseConverter implements IRecordingConve
return pStart;
}
- private static List<String> getFinalArgs(int N, List<String> pods, File wav, int w) throws IOException {
+ private static List<String> getFinalArgs(int numPods, List<String> pods, File wav, int w) throws IOException {
List<String> args = new ArrayList<>();
- if (N == 1) {
+ if (numPods == 1) {
args.add("-i");
args.add(pods.get(0));
args.add("-i");
@@ -222,13 +222,13 @@ public class InterviewConverter extends BaseConverter implements IRecordingConve
*/
StringBuilder cols = new StringBuilder();
StringBuilder rows = new StringBuilder();
- for (int i = 0, j = 0; i < N; ++i) {
+ for (int i = 0, j = 0; i < numPods; ++i) {
args.add("-i");
args.add(pods.get(i));
cols.append('[').append(i).append(":v]");
if (i != 0 && (i + 1) % w == 0) {
cols.append("hstack=inputs=").append(w);
- if (j == 0 && i == N - 1) {
+ if (j == 0 && i == numPods - 1) {
cols.append("[v]");
} else {
cols.append("[c").append(j).append("];");
@@ -236,7 +236,7 @@ public class InterviewConverter extends BaseConverter implements IRecordingConve
rows.append("[c").append(j).append(']');
j++;
}
- if (i == N - 1) {
+ if (i == numPods - 1) {
if (j > 1) {
rows.append("vstack=inputs=").append(j).append("[v]");
} else {
@@ -252,7 +252,7 @@ public class InterviewConverter extends BaseConverter implements IRecordingConve
args.add("[v]");
}
args.add("-map");
- args.add(String.format("%s:a", N));
+ args.add(String.format("%s:a", numPods));
args.add("-qmax"); args.add("1");
args.add("-qmin"); args.add("1");
return args;
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 ba0eba8..0c71ae1 100644
--- a/openmeetings-core/src/test/java/org/apache/openmeetings/TestConnection.java
+++ b/openmeetings-core/src/test/java/org/apache/openmeetings/TestConnection.java
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test;
public class TestConnection {
@Test
- public void testNoop() {
+ void testNoop() {
//no-op
}
}
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 1c91968..701a955 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
@@ -52,14 +52,13 @@ public class TestMailSending {
private boolean mailTls = true;
/**
- * @Test
*
* It does not make a lot of send to test this in every test suite, it is more for manual testing.
* Handy to check your server and the JavaMail setting properties
*
*/
@Test
- public void doTestSendEmail() {
+ void doTestSendEmail() {
try {
Transport.send(getMimeMessage());
} catch (Exception err) {
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 05d89a3..202c68c 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
@@ -28,32 +28,32 @@ import com.github.openjson.JSONObject;
public class TestNotConnectedMocked extends BaseMockedTest {
@Test
- public void testNotConnected() {
+ void testNotConnected() {
handler.onMessage(null, MSG_BASE);
}
@Test
- public void testRecordingAllowed() {
+ void testRecordingAllowed() {
assertFalse(streamProcessor.recordingAllowed(null));
}
@Test
- public void testStartRecording() {
+ void testStartRecording() {
streamProcessor.startRecording(null);
}
@Test
- public void testStopRecording() {
+ void testStopRecording() {
streamProcessor.stopRecording(null);
}
@Test
- public void testIsRecording() {
+ void testIsRecording() {
assertFalse(streamProcessor.isRecording(null));
}
@Test
- public void testGetRecordingUser() {
+ void testGetRecordingUser() {
assertEquals(new JSONObject().toString(), handler.getRecordingUser(null).toString());
}
}
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 5e418f0..2554245 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
@@ -111,7 +111,7 @@ public class TestRecordingFlowMocked extends BaseMockedTest {
}
@Test
- public void testRecordingFlow() {
+ void testRecordingFlow() {
runWrapped(() -> {
try {
// start recording and simulate broadcast starting
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 26fac73..956c16a 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
@@ -74,7 +74,7 @@ public class TestRoomFlowMocked extends BaseMockedTest {
}
@Test
- public void testNoClient() {
+ void testNoClient() {
runWrapped(() -> {
handler.onMessage(null, MSG_BASE.put("id", "aa"));
});
@@ -85,14 +85,14 @@ public class TestRoomFlowMocked extends BaseMockedTest {
}
@Test
- public void testNoRoom() {
+ void testNoRoom() {
runWrapped(() -> {
handler.onMessage(getClient(), MSG_BASE.put("id", "aa"));
});
}
@Test
- public void testRecordingAllowed() {
+ void testRecordingAllowed() {
runWrapped(() -> {
Client c = getClient();
assertFalse(streamProcessor.recordingAllowed(c));
@@ -115,7 +115,7 @@ public class TestRoomFlowMocked extends BaseMockedTest {
}
@Test
- public void testWannaRecord1() throws Exception {
+ void testWannaRecord1() throws Exception {
JSONObject msg = new JSONObject(MSG_BASE.toString()).put("id", "wannaRecord");
handler.onMessage(getClientWithRoom(), msg);
}
@@ -128,7 +128,7 @@ public class TestRoomFlowMocked extends BaseMockedTest {
}
@Test
- public void testWannaRecord2() throws Exception {
+ void testWannaRecord2() throws Exception {
runWrapped(() -> {
JSONObject msg = new JSONObject(MSG_BASE.toString()).put("id", "wannaRecord");
Client c = getClientFull();
@@ -139,7 +139,7 @@ public class TestRoomFlowMocked extends BaseMockedTest {
}
@Test
- public void testRecordRecord() throws Exception {
+ void testRecordRecord() throws Exception {
runWrapped(() -> {
JSONObject msg = new JSONObject(MSG_BASE.toString())
.put("id", "wannaRecord")
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 923e8a6..478b15d 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
@@ -44,7 +44,7 @@ public class TestSetupFlowMocked extends BaseMockedTest {
}
@Test
- public void testMsgTestWannaRecord() throws Exception {
+ void testMsgTestWannaRecord() throws Exception {
runWrapped(() -> {
JSONObject msg = new JSONObject(MSG_BASE.toString()).put("id", "wannaRecord");
WsClient c = new WsClient("sessionId", 0);
@@ -53,7 +53,7 @@ public class TestSetupFlowMocked extends BaseMockedTest {
}
@Test
- public void testMsgTestRecord1() throws Exception {
+ void testMsgTestRecord1() throws Exception {
runWrapped(() -> {
doReturn(mock(MediaPipeline.class)).when(client).createMediaPipeline(any(Transaction.class));
@@ -83,7 +83,7 @@ public class TestSetupFlowMocked extends BaseMockedTest {
}
@Test
- public void testMsgTestIceCandidate() throws Exception {
+ void testMsgTestIceCandidate() throws Exception {
runWrapped(() -> {
JSONObject msg = new JSONObject(MSG_BASE.toString())
.put("id", "iceCandidate")
@@ -94,7 +94,7 @@ public class TestSetupFlowMocked extends BaseMockedTest {
}
@Test
- public void testMsgTestWannaPlay() throws Exception {
+ void testMsgTestWannaPlay() throws Exception {
runWrapped(() -> {
JSONObject msg = new JSONObject(MSG_BASE.toString()).put("id", "wannaPlay");
WsClient c = new WsClient("sessionId", 0);
@@ -103,7 +103,7 @@ public class TestSetupFlowMocked extends BaseMockedTest {
}
@Test
- public void testMsgTestPlay() throws Exception {
+ void testMsgTestPlay() throws Exception {
runWrapped(() -> {
JSONObject msg = new JSONObject(MSG_BASE.toString()).put("id", "play");
WsClient c = new WsClient("sessionId", 0);
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 7c27196..25f0691 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
@@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test;
public class TestGui {
@Test
- public void testNoop() {
+ void testNoop() {
// no-op
}
}
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 f8e8e95..4e7497e 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
@@ -28,7 +28,7 @@ public class TestKeyCodesNumber {
private static final Logger log = LoggerFactory.getLogger(TestKeyCodesNumber.class);
@Test
- public void testKeyCodes() {
+ void testKeyCodes() {
try {
for (int i = 1; i < 600; i++) {
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 29d3c07..b618fb9 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
@@ -26,7 +26,7 @@ public class TestReadKeyCodesNumber {
private static final Logger log = LoggerFactory.getLogger(TestReadKeyCodesNumber.class);
@Test
- public void testTestKeyCodesNumber() {
+ void testTestKeyCodesNumber() {
try {
this.testKeyCodes();
@@ -37,7 +37,7 @@ public class TestReadKeyCodesNumber {
}
@Test
- public void testKeyCodes() {
+ void testKeyCodes() {
try {
} catch (Exception err) {
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
index 8929616..fceec2d 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java
@@ -95,7 +95,7 @@ public class LabelDao implements IDataProviderDao<StringLabel>{
}
languages.put(id + 1, new OmLanguage(l));
storeLanguages();
- labelCache.put(l, new ArrayList<StringLabel>());
+ labelCache.put(l, new ArrayList<>());
}
public static String getString(String key, long langId) {
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java
index 37d8dd0..e605cc0 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/Appointment.java
@@ -68,34 +68,34 @@ import org.apache.openmeetings.db.entity.user.User;
@NamedQuery(name="appointmentsInRange",
query="SELECT a FROM Appointment a "
+ "WHERE a.deleted = false "
- + " AND ( "
- + " (a.start BETWEEN :start AND :end) "
- + " OR (a.end BETWEEN :start AND :end) "
- + " OR (a.start < :start AND a.end > :end) "
- + " )"
- + " AND a.owner.id = :userId"
+ + " AND ( "
+ + " (a.start BETWEEN :start AND :end) "
+ + " OR (a.end BETWEEN :start AND :end) "
+ + " OR (a.start < :start AND a.end > :end) "
+ + " )"
+ + " AND a.owner.id = :userId"
)
@NamedQuery(name="joinedAppointmentsInRange",
query="SELECT a FROM MeetingMember mm INNER JOIN mm.appointment a "
+ "WHERE mm.deleted = false AND mm.user.id <> a.owner.id AND mm.user.id = :userId "
- + " AND a.id NOT IN (SELECT a.id FROM Appointment a WHERE a.owner.id = :userId)"
- + " AND mm.connectedEvent = false " //connectedEvent is set for the MeetingMember if event is created from "Private Messages", it is weird
- + " AND ( "
- + " (a.start BETWEEN :start AND :end) "
- + " OR (a.end BETWEEN :start AND :end) "
- + " OR (a.start < :start AND a.end > :end) "
- + " )"
+ + " AND a.id NOT IN (SELECT a.id FROM Appointment a WHERE a.owner.id = :userId)"
+ + " AND mm.connectedEvent = false " //connectedEvent is set for the MeetingMember if event is created from "Private Messages", it is weird
+ + " AND ( "
+ + " (a.start BETWEEN :start AND :end) "
+ + " OR (a.end BETWEEN :start AND :end) "
+ + " OR (a.start < :start AND a.end > :end) "
+ + " )"
)
@NamedQuery(name="appointmentsInRangeRemind",
query="SELECT a FROM Appointment a "
//only ReminderType simple mail is concerned!
+ "WHERE a.deleted = false AND a.reminderEmailSend = false"
- + " AND (a.reminder <> :none) "
- + " AND ( "
- + " (a.start BETWEEN :start AND :end) "
- + " OR (a.end BETWEEN :start AND :end) "
- + " OR (a.start < :start AND a.end > :end) "
- + " )"
+ + " AND (a.reminder <> :none) "
+ + " AND ( "
+ + " (a.start BETWEEN :start AND :end) "
+ + " OR (a.end BETWEEN :start AND :end) "
+ + " OR (a.start < :start AND a.end > :end) "
+ + " )"
)
@NamedQuery(name="getAppointmentByRoomId", query="SELECT a FROM Appointment a WHERE a.room.id = :roomId")
@NamedQuery(name="getAppointmentByOwnerRoomId", query="SELECT a FROM Appointment a WHERE a.deleted = false AND a.owner.id = :userId AND a.room.id = :roomId")
@@ -103,20 +103,20 @@ import org.apache.openmeetings.db.entity.user.User;
@NamedQuery(name="appointmentsInRangeByUser",
query="SELECT a FROM MeetingMember mm, IN(mm.appointment) a "
+ "WHERE mm.deleted = false AND mm.user.id <> a.owner.id AND mm.user.id = :userId "
- + " AND ( "
- + " (a.start BETWEEN :start AND :end) "
- + " OR (a.end BETWEEN :start AND :end) "
- + " OR (a.start < :start AND a.end > :end) "
- + " )"
+ + " AND ( "
+ + " (a.start BETWEEN :start AND :end) "
+ + " OR (a.end BETWEEN :start AND :end) "
+ + " OR (a.start < :start AND a.end > :end) "
+ + " )"
)
@NamedQuery(name="appointedRoomsInRangeByUser",
query="SELECT a.room FROM MeetingMember mm, IN(mm.appointment) a "
+ "WHERE mm.deleted = false AND mm.user.id <> a.owner.id AND mm.user.id = :userId "
- + " AND ( "
- + " (a.start BETWEEN :start AND :end) "
- + " OR (a.end BETWEEN :start AND :end) "
- + " OR (a.start < :start AND a.end > :end) "
- + " )"
+ + " AND ( "
+ + " (a.start BETWEEN :start AND :end) "
+ + " OR (a.end BETWEEN :start AND :end) "
+ + " OR (a.start < :start AND a.end > :end) "
+ + " )"
)
@NamedQuery(name="getNextAppointment", query="SELECT a FROM Appointment a WHERE a.deleted = false AND a.start > :start AND a.owner.id = :userId")
@NamedQuery(name="getAppointmentsByTitle", query="SELECT a FROM Appointment a WHERE a.deleted = false AND a.title LIKE :title AND a.owner.id = :userId")
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/OmCalendar.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/OmCalendar.java
index f4ef19b..c82dabe 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/OmCalendar.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/calendar/OmCalendar.java
@@ -47,19 +47,19 @@ import org.apache.openmeetings.db.entity.user.User;
@NamedQuery(name = "getCalendars", query = "SELECT c FROM OmCalendar c WHERE c.deleted = false ORDER BY c.id")
@NamedQuery(name = "getCalendarbyUser", query = "SELECT c FROM OmCalendar c"
+ " WHERE c.deleted = false AND c.owner.id = :userId AND c.syncType <> OmCalendar$SyncType.GOOGLE_CALENDAR "
- + "ORDER BY c.id")
+ + " ORDER BY c.id")
// OpenJPA has trouble with referencing Subclasses, thus java $ symbol is used
// Comes from the OpenJPA Mailing List.
@NamedQuery(name = "getGoogleCalendars", query = "SELECT c FROM OmCalendar c WHERE c.deleted = false AND c.owner.id = :userId "
+ "AND c.syncType = OmCalendar$SyncType.GOOGLE_CALENDAR ORDER BY c.id")
@NamedQuery(name = "getAppointmentsbyCalendarinRange", query = "SELECT a FROM Appointment a "
+ "WHERE a.deleted = false "
- + " AND ( "
- + " (a.start BETWEEN :start AND :end) "
- + " OR (a.end BETWEEN :start AND :end) "
- + " OR (a.start < :start AND a.end > :end) "
- + " )"
- + " AND a.owner.id = :userId AND a.calendar.id = :calId ")
+ + " AND ( "
+ + " (a.start BETWEEN :start AND :end) "
+ + " OR (a.end BETWEEN :start AND :end) "
+ + " OR (a.start < :start AND a.end > :end) "
+ + " )"
+ + " AND a.owner.id = :userId AND a.calendar.id = :calId")
@NamedQuery(name = "getCalendarbyId", query = "SELECT c FROM OmCalendar c WHERE c.deleted = false AND c.id = :calId")
@XmlRootElement(name = CALENDAR_NODE)
public class OmCalendar extends HistoricalEntity {
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 a5979dd..adae9ed 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
@@ -35,7 +35,7 @@ import org.junit.jupiter.api.Test;
public class TestOAuthUser {
@Test
- public void firstLevel() {
+ void firstLevel() {
OAuthServer server = new OAuthServer()
.addMapping(PARAM_LOGIN, "id")
.addMapping(PARAM_EMAIL, "email")
@@ -52,7 +52,7 @@ public class TestOAuthUser {
}
@Test
- public void secondLevel() {
+ void secondLevel() {
OAuthServer server = new OAuthServer()
.addMapping(PARAM_LOGIN, "uid")
.addMapping(PARAM_EMAIL, "email")
@@ -76,7 +76,7 @@ public class TestOAuthUser {
}
@Test
- public void secondLevel1() {
+ void secondLevel1() {
OAuthServer server = new OAuthServer()
.addMapping(PARAM_LOGIN, "username")
.addMapping(PARAM_EMAIL, "email")
@@ -93,7 +93,7 @@ public class TestOAuthUser {
}
@Test
- public void thirdLevel() {
+ void thirdLevel() {
OAuthServer server = new OAuthServer()
.addMapping(PARAM_LOGIN, "id")
.addMapping(PARAM_EMAIL, "email")
@@ -140,7 +140,7 @@ public class TestOAuthUser {
}
@Test
- public void map() {
+ void map() {
Map<String, String> umap = new HashMap<>();
umap.put("login", "abc");
umap.put("email", "abc@local");
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 cc443c2..dd5b51a 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
@@ -41,7 +41,7 @@ public class FileItemTest {
}
@Test
- public void testGetFileShouldReturnFirstSlideWithPDF() {
+ void testGetFileShouldReturnFirstSlideWithPDF() {
// Setup file
fileItem.setDeleted(false);
fileItem.setHash("6594186e-c6bb-49d5-9f66-829e45599aaa");
@@ -55,7 +55,7 @@ public class FileItemTest {
}
@Test
- public void testGetOriginalWithPDFWithOriginalName() {
+ void testGetOriginalWithPDFWithOriginalName() {
// Setup file
fileItem.setDeleted(false);
fileItem.setHash("6594186e-c6bb-49d5-9f66-829e45599aaa");
@@ -69,7 +69,7 @@ public class FileItemTest {
}
@Test
- public void testGetOriginalWithPDFWithChangedName() {
+ void testGetOriginalWithPDFWithChangedName() {
// Setup file
fileItem.setDeleted(false);
fileItem.setHash("6594186e-c6bb-49d5-9f66-829e45599aaa");
@@ -90,7 +90,7 @@ public class FileItemTest {
}
@Test
- public void testGetOriginalWithDOCXWithOriginalName() {
+ void testGetOriginalWithDOCXWithOriginalName() {
// Setup file
fileItem.setDeleted(false);
fileItem.setHash("d44ab2c5-fd5d-4903-8fa7-292286d72a5f");
@@ -106,7 +106,7 @@ public class FileItemTest {
}
@Test
- public void testGetOriginalWithDOCXWithChangedName() {
+ void testGetOriginalWithDOCXWithChangedName() {
// Setup file
fileItem.setDeleted(false);
fileItem.setHash("d44ab2c5-fd5d-4903-8fa7-292286d72a5f");
@@ -121,7 +121,7 @@ public class FileItemTest {
}
@Test
- public void testGetFileShouldReturnFirstSlideWithDOCX() {
+ void testGetFileShouldReturnFirstSlideWithDOCX() {
// Setup file
fileItem.setDeleted(false);
fileItem.setHash("d44ab2c5-fd5d-4903-8fa7-292286d72a5f");
@@ -135,7 +135,7 @@ public class FileItemTest {
}
@Test
- public void testGetFileShouldReturnPDFWhenRequested() {
+ void testGetFileShouldReturnPDFWhenRequested() {
// Setup file
fileItem.setDeleted(false);
fileItem.setHash("d44ab2c5-fd5d-4903-8fa7-292286d72a5f");
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 76cb868..85ee587 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
@@ -31,12 +31,12 @@ import org.junit.jupiter.api.Test;
public class TestAuthLevelUtil {
@Test
- public void testNull() {
+ void testNull() {
assertTrue(getRoomRight(null, null, null, 0).isEmpty(), "Result should be empty");
}
@Test
- public void testAdmin() {
+ void testAdmin() {
User u = new User();
u.setRights(Set.of(User.Right.ADMIN));
Set<Room.Right> rights = getRoomRight(u, new Room(), null, 0);
@@ -45,7 +45,7 @@ public class TestAuthLevelUtil {
}
@Test
- public void testAppointmentOwner() {
+ void testAppointmentOwner() {
User u = new User();
u.setId(666L);
Room r = new Room();
@@ -59,7 +59,7 @@ public class TestAuthLevelUtil {
}
@Test
- public void testConference() {
+ void testConference() {
User u = new User();
Room r = new Room();
Set<Room.Right> rights = getRoomRight(u, r, null, 0);
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 1c9bc4c..e82c466 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
@@ -35,7 +35,7 @@ public class TestLocaleHelper {
private static final String COUNTRY_ITALY = "Italy";
@Test
- public void testCountry() {
+ void testCountry() {
List<String> list = getCountries();
assertNotNull(list, "Country list shouldn't be null");
assertFalse(list.isEmpty(), "Country list shouldn't be empty");
diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OmHelpFormatter.java b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OmHelpFormatter.java
index dcef51b..591f219 100644
--- a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OmHelpFormatter.java
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OmHelpFormatter.java
@@ -54,9 +54,9 @@ public class OmHelpFormatter extends HelpFormatter {
final String lpadParam = createPadding(leftPad + 2);
List<OmOption> reqOptions = getReqOptions(opts);
Map<String, List<OmOption>> map = new LinkedHashMap<>(reqOptions.size());
- map.put(GENERAL_OPTION_GROUP, new ArrayList<OmOption>());
+ map.put(GENERAL_OPTION_GROUP, new ArrayList<>());
for (OmOption o : reqOptions) {
- map.put(o.getOpt(), new ArrayList<OmOption>());
+ map.put(o.getOpt(), new ArrayList<>());
}
for (Option option : opts.getOptions()) {
OmOption o = (OmOption)option;
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 0b02724..4ec5caf 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
@@ -26,13 +26,13 @@ import org.junit.jupiter.api.Test;
public class TestBackupVersion {
@Test
- public void testGet() {
+ void testGet() {
BackupVersion bv = BackupVersion.get();
assertNotEquals(0, bv.getMajor(), "Major should be set");
}
@Test
- public void testEquals() {
+ void testEquals() {
assertEquals(BackupVersion.get(), BackupVersion.get());
assertNotEquals(BackupVersion.get(), null);
assertNotEquals(BackupVersion.get("3.2.1"), BackupVersion.get("3.2.0"));
@@ -41,7 +41,7 @@ public class TestBackupVersion {
}
@Test
- public void testCompare() {
+ void testCompare() {
assertEquals(0, BackupVersion.get().compareTo(BackupVersion.get()));
assertEquals(1, BackupVersion.get().compareTo(null));
assertEquals(1, BackupVersion.get("3.2.1").compareTo(BackupVersion.get("3.2.0")));
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
index 444bd90..4f8d2e3 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
@@ -182,13 +182,13 @@ public class InvitationManager implements IInvitationManager {
}
@Override
- public Invitation getInvitation(Invitation _invitation, User inveetee, Room room
+ public Invitation getInvitation(Invitation inInvitation, User inveetee, Room room
, boolean isPasswordProtected, String invitationpass, Valid valid,
User createdBy, Long languageId, Date gmtTimeStart, Date gmtTimeEnd
, Appointment appointment) {
- Invitation invitation = _invitation;
- if (null == _invitation) {
+ Invitation invitation = inInvitation;
+ if (null == inInvitation) {
invitation = new Invitation();
invitation.setHash(randomUUID().toString());
}
diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java
index bbae47b..3ede26f 100644
--- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java
+++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java
@@ -189,14 +189,14 @@ public class IcalHandler {
/**
* Write iCal to File
*
- * @param _filerPath
+ * @param inFilerPath
* - path to '*.ics' file
* @throws Exception
* - in case of error during writing to the file
*/
- public void writeDataToFile(String _filerPath) throws Exception {
- String filerPath = _filerPath.endsWith(".ics") ? _filerPath
- : String.format("%s.ics", _filerPath);
+ public void writeDataToFile(String inFilerPath) throws Exception {
+ String filerPath = inFilerPath.endsWith(".ics") ? inFilerPath
+ : String.format("%s.ics", inFilerPath);
try (FileOutputStream fout = new FileOutputStream(filerPath)) {
CalendarOutputter outputter = new CalendarOutputter();
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 472244a..a5d9782 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
@@ -27,7 +27,7 @@ import org.junit.jupiter.api.Test;
public class TestCalendarPatterns {
@Test
- public void backupDateParseTest() {
+ void backupDateParseTest() {
Date d = CalendarPatterns.parseImportDate("1360832400000");
assertNotNull(d, "Date parsed should not be NULL");
}
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 c5bba27..37397d4 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
@@ -28,7 +28,7 @@ import org.junit.jupiter.api.Test;
public class TestStoredFile {
@Test
- public void testAudio() {
+ void testAudio() {
final String[] exts = {"aif", "aifc", "aiff", "au", "mp3", "flac", "wav"}; //TODO enlarge
for (String ext : exts) {
StoredFile sf = new StoredFile("test", ext, (InputStream)null);
@@ -38,7 +38,7 @@ public class TestStoredFile {
}
@Test
- public void testVideo() {
+ void testVideo() {
final String[] exts = {"avi", "mov", "flv", "mp4"}; //TODO enlarge
for (String ext : exts) {
StoredFile sf = new StoredFile("test", ext, (InputStream)null);
@@ -48,7 +48,7 @@ public class TestStoredFile {
}
@Test
- public void testImage() {
+ void testImage() {
final String[] exts = {"png", "gif", "svg", "dpx", "exr",
"pcd", // PhotoCD
"pcds", // PhotoCD
@@ -67,7 +67,7 @@ public class TestStoredFile {
}
@Test
- public void testOffice() {
+ void testOffice() {
final String[] exts = {
"ppt", "odp", "odt", "sxw", "wpd", "doc", "rtf", "txt", "ods", "sxc", "xls", "sxi", "pptx", "docx", "xlsx"
};
@@ -87,7 +87,7 @@ public class TestStoredFile {
}
@Test
- public void testOffice1() throws IOException {
+ void testOffice1() throws IOException {
for (String path : new String[] {"/ODFtest.odt", "/ODFtest.ods"}) {
fileOfficeTest(path);
}
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 e18e79f..ddc250d 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
@@ -29,22 +29,22 @@ import org.junit.jupiter.api.Test;
public class TestVersion {
@Test
- public void testVersion() {
+ void testVersion() {
assertNotNull(getVersion());
}
@Test
- public void testBuildDate() {
+ void testBuildDate() {
assertNotNull(getBuildDate());
}
@Test
- public void testRevision() {
+ void testRevision() {
assertNotNull(getRevision());
}
@Test
- public void testLogVersion() {
+ void testLogVersion() {
logOMStarted();
assertTrue(true);
}
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 67d877e..64197d3 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
@@ -35,7 +35,7 @@ public abstract class AbstractCryptTest {
protected static ICrypt crypt;
@Test
- public void nulltest() {
+ void nulltest() {
String hash = crypt.hash(null);
assertNull(hash, "Hash for null should be null");
@@ -63,7 +63,7 @@ public abstract class AbstractCryptTest {
}
@Test
- public void test() {
+ void test() {
for (String str : get(64)) {
String h1 = crypt.hash(str);
assertNotNull(h1, "Hash should not be null");
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 1033020..ee5702f 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
@@ -35,7 +35,7 @@ public class TestSCrypt extends AbstractCryptTest {
}
@Test
- public void fallbackTest() {
+ void fallbackTest() {
assertFalse(crypt.verify(TEST_PASS, MD5_HASH), "MD5 is not valid hash");
assertFalse(crypt.verify(TEST_PASS, SHA_HASH), "SHA256 is not valid hash");
assertFalse(crypt.fallback(TEST_PASS, MD5_HASH), "MD5 is valid fallback");
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminUserChoiceProvider.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminUserChoiceProvider.java
index 2c02831..37816b8 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminUserChoiceProvider.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminUserChoiceProvider.java
@@ -52,9 +52,9 @@ public abstract class AdminUserChoiceProvider extends ChoiceProvider<User> {
}
@Override
- public Collection<User> toChoices(Collection<String> _ids) {
+ public Collection<User> toChoices(Collection<String> inIds) {
List<Long> ids = new ArrayList<>();
- for (String id : _ids) {
+ for (String id : inIds) {
ids.add(Long.valueOf(id));
}
return new ArrayList<>(userDao.get(ids));
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangForm.java
index 662a4d4..15fbe1c 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangForm.java
@@ -57,7 +57,7 @@ public class LangForm extends Form<Void> {
setOutputMarkupId(true);
languages = new DropDownChoice<>("language"
- , new PropertyModel<Map.Entry<Long, Locale>>(langPanel, "language")
+ , new PropertyModel<>(langPanel, "language")
, getLanguages()
, new ChoiceRenderer<Map.Entry<Long, Locale>>() {
private static final long serialVersionUID = 1L;
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
index 6027e9d..7ad488a 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
@@ -105,11 +105,11 @@ public class OAuthForm extends AdminBaseForm<OAuthServer> {
add(new RequiredTextField<String>("clientSecret").setLabel(Model.of("client_secret")));
add(redirectUriText = (TextField<String>) new TextField<>("redirectUri", Model.of("")).setLabel(new ResourceModel("1587")));
add(new RequiredTextField<String>("requestKeyUrl").setLabel(new ResourceModel("1578")));
- add(new DropDownChoice<>("requestTokenMethod", List.of(RequestTokenMethod.values()), new ChoiceRenderer<RequestTokenMethod>("name", "name")));
+ add(new DropDownChoice<>("requestTokenMethod", List.of(RequestTokenMethod.values()), new ChoiceRenderer<>("name", "name")));
add(new RequiredTextField<String>("requestTokenUrl").setLabel(new ResourceModel("1579")));
add(new RequiredTextField<String>("requestTokenAttributes").setLabel(new ResourceModel("1586")));
add(new RequiredTextField<String>("requestInfoUrl").setLabel(new ResourceModel("1580")));
- add(new DropDownChoice<>("requestInfoMethod", List.of(RequestInfoMethod.values()), new ChoiceRenderer<RequestInfoMethod>("name", "name")));
+ add(new DropDownChoice<>("requestInfoMethod", List.of(RequestInfoMethod.values()), new ChoiceRenderer<>("name", "name")));
Form<Void> mappingForm = new Form<>("mappingForm");
final TextField<String> omAttr = new TextField<>("omAttr", Model.of(""));
final TextField<String> oauthAttr = new TextField<>("oauthAttr", Model.of(""));
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 9706455..d859bc6 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
@@ -117,7 +117,7 @@ public class RoomForm extends AdminBaseForm<Room> {
}
};
private IModel<User> moderator2add = Model.of((User)null);
- private IModel<Collection<BaseFileItem>> files2add = new CollectionModel<>(new ArrayList<BaseFileItem>());
+ private IModel<Collection<BaseFileItem>> files2add = new CollectionModel<>(new ArrayList<>());
private IModel<Long> wbIdx = Model.of(0L);
@SpringBean
private GroupDao groupDao;
@@ -202,8 +202,8 @@ public class RoomForm extends AdminBaseForm<Room> {
}
@Override
- public RoomGroup fromId(String _id) {
- Long id = Long.valueOf(_id);
+ public RoomGroup fromId(String inId) {
+ Long id = Long.valueOf(inId);
if (!orgList.stream().filter(g -> g.getId().equals(id)).findFirst().isPresent()) {
return null; // seems to be hacked
@@ -286,7 +286,7 @@ public class RoomForm extends AdminBaseForm<Room> {
boolean found = false;
if (u != null) {
if (r.getModerators() == null) {
- r.setModerators(new ArrayList<RoomModerator>());
+ r.setModerators(new ArrayList<>());
}
for (RoomModerator rm : r.getModerators()) {
if (rm.getUser().getId().equals(u.getId())) {
@@ -323,7 +323,7 @@ public class RoomForm extends AdminBaseForm<Room> {
};
del.setIconType(FontAwesome5IconType.times_s)
.add(newOkCancelDangerConfirm(this, getString("833")));
- item.add(new CheckBox("superModerator", new PropertyModel<Boolean>(moderator, "superModerator")))
+ item.add(new CheckBox("superModerator", new PropertyModel<>(moderator, "superModerator")))
.add(new Label("userId", String.valueOf(moderator.getUser().getId())))
.add(name)
.add(new Label("email", moderator.getUser().getAddress().getEmail()))
@@ -398,8 +398,8 @@ public class RoomForm extends AdminBaseForm<Room> {
public void onClick(AjaxRequestTarget target) {
Room r = RoomForm.this.getModelObject();
for (Iterator<RoomFile> iter = r.getFiles().iterator(); iter.hasNext();) {
- RoomFile _rf = iter.next();
- if (_rf.getFile().getId().equals(rf.getFile().getId())) {
+ RoomFile curRf = iter.next();
+ if (curRf.getFile().getId().equals(rf.getFile().getId())) {
iter.remove();
break;
}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
index 8629113..251156b 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
@@ -91,7 +91,7 @@ public class UserForm extends AdminBaseForm<User> {
private GeneralUserForm generalForm;
private final RequiredTextField<String> login = new RequiredTextField<>("login");
private StrongPasswordValidator passValidator;
- private final PasswordTextField password = new PasswordTextField("password", new Model<String>());
+ private final PasswordTextField password = new PasswordTextField("password", new Model<>());
private final Modal<String> warning;
private final DropDownChoice<Long> domainId = new DropDownChoice<>("domainId");
private final PasswordDialog adminPass;
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
index be17a30..78805e8 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
@@ -451,11 +451,11 @@ public class Application extends AuthenticatedWebApplication implements IApplica
return getString(key, getLocale(languageId));
}
- public static String getString(String key, final Locale loc, String... _params) {
+ public static String getString(String key, final Locale loc, String... inParams) {
if (!exists()) {
ThreadContext.setApplication(org.apache.wicket.Application.get(appName));
}
- String[] params = _params;
+ String[] params = inParams;
if ((params == null || params.length == 0) && STRINGS_WITH_APP.contains(key)) {
params = new String[]{getApplicationName()};
}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/QuickPollManager.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/QuickPollManager.java
index 8332362..8bc1995 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/QuickPollManager.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/QuickPollManager.java
@@ -58,7 +58,7 @@ public class QuickPollManager {
log.debug("Starting quick poll, room: {}", roomId);
IMap<Long, Map<Long, Boolean>> polls = map();
polls.lock(roomId);
- polls.putIfAbsent(roomId, new ConcurrentHashMap<Long, Boolean>());
+ polls.putIfAbsent(roomId, new ConcurrentHashMap<>());
polls.unlock(roomId);
WebSocketHelper.sendRoom(new TextRoomMessage(roomId, c, Type.QUICK_POLL_UPDATED, c.getUid()));
}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
index 0760d63..b5ac160 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
@@ -490,7 +490,7 @@ public class WebSession extends AbstractAuthenticatedWebSession implements IWebS
}
public String getClientTZCode() {
- TimeZone _zone = browserTz;
+ TimeZone curZone = browserTz;
if (browserTz == null) {
try {
browserTz = getClientInfo().getProperties().getTimeZone();
@@ -503,15 +503,15 @@ public class WebSession extends AbstractAuthenticatedWebSession implements IWebS
}
}
}
- _zone = browserTz;
+ curZone = browserTz;
} catch (Exception e) {
//no-op
}
if (browserTz == null) {
- _zone = Calendar.getInstance(getLocale()).getTimeZone();
+ curZone = Calendar.getInstance(getLocale()).getTimeZone();
}
}
- return _zone == null ? null : _zone.getID();
+ return curZone == null ? null : curZone.getID();
}
public static TimeZone getClientTimeZone() {
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
index 394354d..c8d6488 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
@@ -127,8 +127,8 @@ public class GeneralUserForm extends Form<User> {
}
@Override
- public GroupUser fromId(String _id) {
- Long id = Long.parseLong(_id);
+ public GroupUser fromId(String inId) {
+ Long id = Long.parseLong(inId);
User u = GeneralUserForm.this.getModelObject();
Group g = groupDao.get(id);
GroupUser gu = new GroupUser(g, u);
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationDialog.java
index 44e756d..4fb042d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationDialog.java
@@ -32,14 +32,15 @@ public class InvitationDialog extends Modal<Invitation> {
private BootstrapAjaxButton send;
private final InvitationForm form;
- public InvitationDialog(String id, final InvitationForm _form) {
- super(id, _form.getModel());
- add(form = _form);
+ public InvitationDialog(String id, final InvitationForm form) {
+ super(id, form.getModel());
+ this.form = form;
}
@Override
protected void onInitialize() {
header(new ResourceModel("213"));
+ add(form);
addButton(send = new BootstrapAjaxButton("button", new ResourceModel("218"), form, Buttons.Type.Outline_Primary) {
private static final long serialVersionUID = 1L;
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java
index c729c70..33ef7f0 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java
@@ -75,7 +75,7 @@ public abstract class InvitationForm extends Form<Invitation> {
protected final TextField<String> subject = new TextField<>("subject", Model.of((String)null));
protected final TextArea<String> message = new TextArea<>("message", Model.of((String)null));
protected final TextField<String> url = new TextField<>("url", Model.of((String)null));
- protected final UserMultiChoice recipients = new UserMultiChoice("recipients", new CollectionModel<>(new ArrayList<User>()));
+ protected final UserMultiChoice recipients = new UserMultiChoice("recipients", new CollectionModel<>(new ArrayList<>()));
protected InvitationDialog dialog;
@SpringBean
private InvitationDao inviteDao;
@@ -206,7 +206,7 @@ public abstract class InvitationForm extends Form<Invitation> {
lang.setModelObject(u.getLanguageId());
url.setModelObject(null);
setModelObject(i);
- recipients.setModelObject(new ArrayList<User>());
+ recipients.setModelObject(new ArrayList<>());
recipients.setEnabled(true);
passwd.setEnabled(false);
final boolean isPeriod = i.getValid() == Valid.PERIOD;
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/LanguageDropDown.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/LanguageDropDown.java
index e7f45dd..8dd688c 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/LanguageDropDown.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/LanguageDropDown.java
@@ -33,7 +33,7 @@ public class LanguageDropDown extends DropDownChoice<Long> {
private final List<Long> languages = new ArrayList<>();
public LanguageDropDown(String id, IModel<Long> model) {
- super(id, model, new ArrayList<Long>());
+ super(id, model, new ArrayList<>());
internalInit();
}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
index 2cc9ec4..a350ea8 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
@@ -120,9 +120,9 @@ public class MainPanel extends Panel {
this(id, null);
}
- public MainPanel(String id, BasePanel _panel) {
+ public MainPanel(String id, BasePanel panel) {
super(id);
- this.panel = _panel;
+ this.panel = panel;
setAuto(true);
setOutputMarkupId(true);
setOutputMarkupPlaceholderTag(true);
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmWebSocketPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmWebSocketPanel.java
index 2b758cc..247b852 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmWebSocketPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmWebSocketPanel.java
@@ -114,11 +114,11 @@ public abstract class OmWebSocketPanel extends Panel {
break;
case "mic":
{
- IWsClient _c = getWsClient();
- if (!(_c instanceof Client)) {
+ IWsClient curClient = getWsClient();
+ if (!(curClient instanceof Client)) {
break;
}
- Client c = (Client)_c;
+ Client c = (Client)curClient;
if (c.getRoomId() == null) {
break;
}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagedEntityListPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagedEntityListPanel.java
index fb82c81..fe84631 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagedEntityListPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagedEntityListPanel.java
@@ -56,7 +56,7 @@ public abstract class PagedEntityListPanel extends Panel {
final SearchableDataProvider<? extends IDataProviderEntity> dp = dataView.getDataProvider();
Form<Void> searchForm = new Form<>("searchForm");
add(searchForm.setOutputMarkupId(true));
- searchForm.add(new TextField<>("searchText", new PropertyModel<String>(dp, "search")).setOutputMarkupId(true));
+ searchForm.add(new TextField<>("searchText", new PropertyModel<>(dp, "search")).setOutputMarkupId(true));
BootstrapAjaxButton b = new BootstrapAjaxButton("search", new ResourceModel("714"), searchForm, Buttons.Type.Outline_Primary) {
private static final long serialVersionUID = 1L;
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagingNavigatorPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagingNavigatorPanel.java
index e0bce8e..f6e32af 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagingNavigatorPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagingNavigatorPanel.java
@@ -52,7 +52,7 @@ public abstract class PagingNavigatorPanel extends Panel {
dataView.setItemsPerPage(entitiesPerPage);
final Form<Void> f = new Form<>("pagingForm");
f.add(new OmPagingNavigator("navigator", dataView).setOutputMarkupId(true))
- .add(new DropDownChoice<>("entitiesPerPage", new PropertyModel<Integer>(this, "entitiesPerPage"), numbers)
+ .add(new DropDownChoice<>("entitiesPerPage", new PropertyModel<>(this, "entitiesPerPage"), numbers)
.add(new AjaxFormComponentUpdatingBehavior("change") {
private static final long serialVersionUID = 1L;
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.java
index 42a72d5..358dd9c 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.java
@@ -47,7 +47,7 @@ import de.agilecoders.wicket.extensions.markup.html.bootstrap.icon.FontAwesome5I
public abstract class UploadableImagePanel extends ImagePanel {
private static final long serialVersionUID = 1L;
private static final Logger log = LoggerFactory.getLogger(UploadableImagePanel.class);
- private final FileUploadField fileUploadField = new FileUploadField("image", new ListModel<FileUpload>());
+ private final FileUploadField fileUploadField = new FileUploadField("image", new ListModel<>());
private final Form<Void> form = new Form<>("form");
private final boolean delayed;
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/OmTreeProvider.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/OmTreeProvider.java
index 3bf8814..3f49d40 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/OmTreeProvider.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/OmTreeProvider.java
@@ -139,31 +139,31 @@ public class OmTreeProvider implements ITreeProvider<BaseFileItem> {
List<BaseFileItem> list = new ArrayList<>();
if (node instanceof Recording) {
Recording rec = (Recording)node;
- List<Recording> _list;
+ List<Recording> recList;
if (id == null) {
if (node.getOwnerId() == null) {
- _list = recDao.getRootByPublic(rec.getGroupId());
+ recList = recDao.getRootByPublic(rec.getGroupId());
} else {
- _list = recDao.getRootByOwner(node.getOwnerId());
+ recList = recDao.getRootByOwner(node.getOwnerId());
}
} else {
- _list = recDao.getByParent(id);
+ recList = recDao.getByParent(id);
}
- list.addAll(_list);
+ list.addAll(recList);
} else {
- List<FileItem> _list;
+ List<FileItem> fileList;
if (id == null) {
if (node.getRoomId() != null) {
- _list = fileDao.getByRoom(node.getRoomId());
+ fileList = fileDao.getByRoom(node.getRoomId());
} else if (node.getGroupId() != null) {
- _list = fileDao.getByGroup(node.getGroupId(), roomId == null ? VIDEO_TYPES : null);
+ fileList = fileDao.getByGroup(node.getGroupId(), roomId == null ? VIDEO_TYPES : null);
} else {
- _list = fileDao.getByOwner(node.getOwnerId());
+ fileList = fileDao.getByOwner(node.getOwnerId());
}
} else {
- _list = fileDao.getByParent(id, roomId == null ? VIDEO_TYPES : null);
+ fileList = fileDao.getByParent(id, roomId == null ? VIDEO_TYPES : null);
}
- list.addAll(_list);
+ list.addAll(fileList);
}
if (node.isReadOnly()) {
for (BaseFileItem f : list) {
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
index 890c76c..e171c91 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
@@ -167,12 +167,12 @@ public class RegisterDialog extends Modal<String> {
protected void onInitialize() {
super.onInitialize();
add(feedback.setOutputMarkupId(true));
- add(firstNameField = new RequiredTextField<>("firstName", new PropertyModel<String>(RegisterDialog.this, "firstName")));
- add(lastNameField = new RequiredTextField<>("lastName", new PropertyModel<String>(RegisterDialog.this, "lastName")));
- add(loginField = new RequiredTextField<>("login", new PropertyModel<String>(RegisterDialog.this, "login")));
- add(passwordField = new PasswordTextField("password", new PropertyModel<String>(RegisterDialog.this, "password")));
- add(confirmPassword = new PasswordTextField("confirmPassword", new Model<String>()).setResetPassword(true));
- add(emailField = new RequiredTextField<>("email", new PropertyModel<String>(RegisterDialog.this, "email")) {
+ add(firstNameField = new RequiredTextField<>("firstName", new PropertyModel<>(RegisterDialog.this, "firstName")));
+ add(lastNameField = new RequiredTextField<>("lastName", new PropertyModel<>(RegisterDialog.this, "lastName")));
+ add(loginField = new RequiredTextField<>("login", new PropertyModel<>(RegisterDialog.this, "login")));
+ add(passwordField = new PasswordTextField("password", new PropertyModel<>(RegisterDialog.this, "password")));
+ add(confirmPassword = new PasswordTextField("confirmPassword", new Model<>()).setResetPassword(true));
+ add(emailField = new RequiredTextField<>("email", new PropertyModel<>(RegisterDialog.this, "email")) {
private static final long serialVersionUID = 1L;
@Override
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
index 917cc54..07a60ff 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
@@ -83,10 +83,10 @@ public class ResetPasswordDialog extends Modal<String> {
add(feedback.setOutputMarkupId(true));
add(login = new TextField<>("login", Model.of(user.getLogin())));
login.setOutputMarkupId(true);
- add(password = new PasswordTextField("password", new Model<String>()));
+ add(password = new PasswordTextField("password", new Model<>()));
password.setLabel(new ResourceModel("328")).setOutputMarkupId(true);
password.setRequired(false).add(new StrongPasswordValidator(user));
- add(confirmPassword = new PasswordTextField("confirmPassword", new Model<String>()));
+ add(confirmPassword = new PasswordTextField("confirmPassword", new Model<>()));
confirmPassword.setLabel(new ResourceModel("116")).setOutputMarkupId(true);
add(new AjaxButton("submit") { // FAKE button so "submit-on-enter" works as expected
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
index 59d5c86..0bb98d2 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
@@ -156,9 +156,9 @@ public class SignInDialog extends Modal<String> {
int selectedLdap = cfgDao.getInt(CONFIG_DEFAULT_LDAP_ID, 0);
domain = ldaps.get(selectedLdap < ldaps.size() && selectedLdap > 0 ? selectedLdap : 0);
credentials.add(new WebMarkupContainer("ldap")
- .add(new DropDownChoice<>("domain", new PropertyModel<LdapConfig>(SignInDialog.this, "domain")
- , ldaps, new ChoiceRenderer<LdapConfig>("name", "id"))).setVisible(showLdap));
- credentials.add(new CheckBox("rememberMe", new PropertyModel<Boolean>(SignInDialog.this, "rememberMe")).setOutputMarkupId(true));
+ .add(new DropDownChoice<>("domain", new PropertyModel<>(SignInDialog.this, "domain")
+ , ldaps, new ChoiceRenderer<>("name", "id"))).setVisible(showLdap));
+ credentials.add(new CheckBox("rememberMe", new PropertyModel<>(SignInDialog.this, "rememberMe")).setOutputMarkupId(true));
AjaxButton ab = new AjaxButton("submit") { //FAKE button so "submit-on-enter" works as expected
private static final long serialVersionUID = 1L;
};
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
index 6ab4e61..0e794e6 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
@@ -278,8 +278,8 @@ public class SignInPage extends BaseInitedPage {
return result;
}
- private void prepareConnection(URLConnection _connection) {
- if (!(_connection instanceof HttpsURLConnection)) {
+ private void prepareConnection(URLConnection inConnection) {
+ if (!(inConnection instanceof HttpsURLConnection)) {
return;
}
if (!cfgDao.getBool(CONFIG_IGNORE_BAD_SSL, false)) {
@@ -302,7 +302,7 @@ public class SignInPage extends BaseInitedPage {
}
}};
try {
- HttpsURLConnection connection = (HttpsURLConnection)_connection;
+ HttpsURLConnection connection = (HttpsURLConnection)inConnection;
SSLContext sslContext = SSLContext.getInstance("SSL");
sslContext.init(null, trustAllCerts, new java.security.SecureRandom());
SSLSocketFactory sslSocketFactory = sslContext.getSocketFactory();
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
index ea6a345..f4962f5 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
@@ -685,11 +685,11 @@ public class InstallWizard extends BootstrapWizard {
return installStep;
}
- private String getToolPath(String _path, String app) {
+ private String getToolPath(String inPath, String app) {
StringBuilder path = new StringBuilder();
- if (!Strings.isEmpty(_path)) {
- path.append(_path);
- if (!_path.endsWith(File.separator)) {
+ if (!Strings.isEmpty(inPath)) {
+ path.append(inPath);
+ if (!inPath.endsWith(File.separator)) {
path.append(File.separator);
}
}
@@ -860,7 +860,7 @@ public class InstallWizard extends BootstrapWizard {
WizardDropDown(String id) {
super(id);
propModel = model.bind(id);
- setModel(new PropertyModel<T>(this, "option"));
+ setModel(new PropertyModel<>(this, "option"));
}
@Override
@@ -909,7 +909,7 @@ public class InstallWizard extends BootstrapWizard {
SelectOptionDropDown(String id) {
super(id);
- setChoiceRenderer(new ChoiceRenderer<SelectOption>("value", "key"));
+ setChoiceRenderer(new ChoiceRenderer<>("value", "key"));
}
@Override
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
index f6a4649..a3e9750 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
@@ -428,8 +428,8 @@ public class RoomPanel extends BasePanel {
@Override
public void onEvent(IEvent<?> event) {
- Client _c = getClient();
- if (_c != null && event.getPayload() instanceof WebSocketPushPayload) {
+ Client curClient = getClient();
+ if (curClient != null && event.getPayload() instanceof WebSocketPushPayload) {
WebSocketPushPayload wsEvent = (WebSocketPushPayload) event.getPayload();
if (wsEvent.getMessage() instanceof RoomMessage) {
RoomMessage m = (RoomMessage)wsEvent.getMessage();
@@ -456,7 +456,7 @@ public class RoomPanel extends BasePanel {
log.error("Not existing user in rightUpdated {} !!!!", uid);
return;
}
- boolean self = _c.getUid().equals(c.getUid());
+ boolean self = curClient.getUid().equals(c.getUid());
StringBuilder sb = new StringBuilder("Room.updateClient(")
.append(c.toJson(self).toString(new NullStringer()))
.append(");")
@@ -478,8 +478,8 @@ public class RoomPanel extends BasePanel {
log.error("Not existing user in rightUpdated {} !!!!", uid);
return;
}
- boolean self = _c.getUid().equals(c.getUid());
- if (self || _c.hasRight(Room.Right.MODERATOR) || !r.isHidden(RoomElement.USER_COUNT)) {
+ boolean self = curClient.getUid().equals(c.getUid());
+ if (self || curClient.hasRight(Room.Right.MODERATOR) || !r.isHidden(RoomElement.USER_COUNT)) {
handler.appendJavaScript(String.format("Room.addClient([%s]);"
, c.toJson(self).toString(new NullStringer())));
}
@@ -526,18 +526,18 @@ public class RoomPanel extends BasePanel {
sidebar.removeActivity(((TextRoomMessage)m).getText(), handler);
break;
case HAVE_QUESTION:
- if (_c.hasRight(Room.Right.MODERATOR) || getUserId().equals(m.getUserId())) {
+ if (curClient.hasRight(Room.Right.MODERATOR) || getUserId().equals(m.getUserId())) {
sidebar.addActivity(new Activity((TextRoomMessage)m, Activity.Type.haveQuestion), handler);
}
break;
case KICK:
{
String uid = ((TextRoomMessage)m).getText();
- if (_c.getUid().equals(uid)) {
+ if (curClient.getUid().equals(uid)) {
handler.add(room.setVisible(false));
getMainPanel().getChat().toggle(handler, false);
clientKicked.show(handler);
- cm.exitRoom(_c);
+ cm.exitRoom(curClient);
}
}
break;
@@ -549,7 +549,7 @@ public class RoomPanel extends BasePanel {
log.error("Not existing user in mute {} !!!!", obj);
return;
}
- if (!_c.getUid().equals(c.getUid())) {
+ if (!curClient.getUid().equals(c.getUid())) {
handler.appendJavaScript(String.format("if (typeof(VideoManager) !== 'undefined') {VideoManager.mute('%s', %s);}", obj.getString("uid"), obj.getBoolean("mute")));
}
}
@@ -582,7 +582,7 @@ public class RoomPanel extends BasePanel {
case MODERATOR_IN_ROOM: {
if (!r.isModerated() || !r.isWaitModerator()) {
log.warn("Something weird: `moderatorInRoom` in wrong room {}", r);
- } else if (!_c.hasRight(Room.Right.MODERATOR)) {
+ } else if (!curClient.hasRight(Room.Right.MODERATOR)) {
boolean moderInRoom = Boolean.TRUE.equals(Boolean.valueOf(((TextRoomMessage)m).getText()));
log.warn("!! moderatorInRoom: {}", moderInRoom);
if (room.isVisible() != moderInRoom) {
@@ -614,8 +614,8 @@ public class RoomPanel extends BasePanel {
}
private void updateInterviewRecordingButtons(IPartialPageRequestHandler handler) {
- Client _c = getClient();
- if (interview && _c.hasRight(Right.MODERATOR)) {
+ Client curClient = getClient();
+ if (interview && curClient.hasRight(Right.MODERATOR)) {
if (streamProcessor.isRecording(r.getId())) {
handler.appendJavaScript("if (typeof(WbArea) === 'object') {WbArea.setRecStarted(true);}");
} else if (streamProcessor.recordingAllowed(getClient())) {
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.java
index 08228cf..f59cba3 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.java
@@ -57,7 +57,7 @@ public class RoomInvitationForm extends InvitationForm {
private final Long roomId;
private final WebMarkupContainer groupContainer = new WebMarkupContainer("groupContainer");
final Select2MultiChoice<Group> groups = new Select2MultiChoice<>("groups"
- , new CollectionModel<>(new ArrayList<Group>())
+ , new CollectionModel<>(new ArrayList<>())
, new GroupChoiceProvider());
final WebMarkupContainer sipContainer = new WebMarkupContainer("sip-container");
@SpringBean
@@ -131,7 +131,7 @@ public class RoomInvitationForm extends InvitationForm {
if (i.getRoom() != null) {
target.add(sipContainer.replace(new Label("room.confno", i.getRoom().getConfno())).setVisible(i.getRoom().isSipEnabled()));
}
- groups.setModelObject(new ArrayList<Group>());
+ groups.setModelObject(new ArrayList<>());
groups.setEnabled(false);
rdi.setModelObject(InviteeType.user);
}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
index c5cf96a..7074c5e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
@@ -87,9 +87,9 @@ public class PollResultsDialog extends Modal<RoomPoll> {
@SpringBean
private UserDao userDao;
- public PollResultsDialog(String id, CreatePollDialog createPoll, Long _roomId) {
+ public PollResultsDialog(String id, CreatePollDialog createPoll, Long roomId) {
super(id);
- this.roomId = _roomId;
+ this.roomId = roomId;
this.createPoll = createPoll;
}
@@ -202,8 +202,8 @@ public class PollResultsDialog extends Modal<RoomPoll> {
}
}
- private static String removeMinified(String _name) {
- String name = _name;
+ private static String removeMinified(String inName) {
+ String name = inName;
int idxOfExtension = name.lastIndexOf('.');
if (idxOfExtension > -1) {
String extension = name.substring(idxOfExtension);
@@ -295,7 +295,7 @@ public class PollResultsDialog extends Modal<RoomPoll> {
@Override
protected void onInitialize() {
super.onInitialize();
- add((select = new DropDownChoice<>("polls", Model.of((RoomPoll)null), new ArrayList<RoomPoll>(), new ChoiceRenderer<RoomPoll>() {
+ add((select = new DropDownChoice<>("polls", Model.of((RoomPoll)null), new ArrayList<>(), new ChoiceRenderer<RoomPoll>() {
private static final long serialVersionUID = 1L;
@Override
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbWebSocketHelper.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbWebSocketHelper.java
index e337371..87bf4b2 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbWebSocketHelper.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbWebSocketHelper.java
@@ -44,17 +44,17 @@ public class WbWebSocketHelper extends WebSocketHelper {
public static final String PARAM_OBJ = "obj";
private static final String PARAM__POSTER = "_poster";
- public static boolean send(IClusterWsMessage _m) {
- if (_m instanceof WsMessageWb) {
- WsMessageWb m = (WsMessageWb)_m;
+ public static boolean send(IClusterWsMessage inMsg) {
+ if (inMsg instanceof WsMessageWb) {
+ WsMessageWb m = (WsMessageWb)inMsg;
if (m.getUid() == null) {
sendWbAll(m.getRoomId(), m.getMeth(), m.getObj(), false);
} else {
sendWbOthers(m.getRoomId(), m.getMeth(), m.getObj(), m.getUid(), false);
}
return true;
- } else if (_m instanceof WsMessageWbFile) {
- WsMessageWbFile m = (WsMessageWbFile)_m;
+ } else if (inMsg instanceof WsMessageWbFile) {
+ WsMessageWbFile m = (WsMessageWbFile)inMsg;
sendWbFile(m.getRoomId(), m.getWbId(), m.getRoomUid(), m.getFile(), m.getFileItem(), false);
return true;
}
@@ -97,13 +97,13 @@ public class WbWebSocketHelper extends WebSocketHelper {
return rc.getUrlRenderer().renderContextRelativeUrl(rc.mapUrlFor(handler).toString());
}
- public static JSONObject addFileUrl(String ruid, JSONObject _file, BaseFileItem fi, Client c) {
- JSONObject file = new JSONObject(_file.toString(new NullStringer()));
+ public static JSONObject addFileUrl(String ruid, JSONObject inFile, BaseFileItem fi, Client c) {
+ JSONObject file = new JSONObject(inFile.toString(new NullStringer()));
final FileSystemResourceReference ref;
final PageParameters pp = new PageParameters()
.add("id", fi.getId())
.add("ruid", ruid)
- .add("wuid", _file.optString("uid"));
+ .add("wuid", inFile.optString("uid"));
if (c != null) {
pp.add("uid", c.getUid());
}
@@ -140,8 +140,8 @@ public class WbWebSocketHelper extends WebSocketHelper {
return String.format("%s&uid=%s", url, c.getUid());
}
- private static JSONObject patchUrls(BaseFileItem fi, Client c, JSONObject _f) {
- JSONObject f = new JSONObject(_f.toString()); // deep copy to ensure thread safety
+ private static JSONObject patchUrls(BaseFileItem fi, Client c, JSONObject inFile) {
+ JSONObject f = new JSONObject(inFile.toString()); // deep copy to ensure thread safety
switch (fi.getType()) {
case VIDEO:
f.put(PARAM__SRC, patchUrl(f.getString(PARAM__SRC), c));
@@ -165,13 +165,13 @@ public class WbWebSocketHelper extends WebSocketHelper {
if (publish) {
publish(new WsMessageWbFile(roomId, wbId, ruid, file, fi));
}
- final JSONObject _f = addFileUrl(ruid, file, fi, null);
+ final JSONObject f = addFileUrl(ruid, file, fi, null);
WebSocketHelper.sendRoom(
roomId
, new JSONObject().put("type", "wb")
, null
, (o, c) -> o.put("func", WbAction.createObj.name())
- .put("param", getObjWbJson(wbId, patchUrls(fi, c, _f))));
+ .put("param", getObjWbJson(wbId, patchUrls(fi, c, f))));
}
private static void sendWb(Long roomId, WbAction meth, JSONObject obj, Predicate<Client> check) {
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserToRoomDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserToRoomDialog.java
index 4dba760..942efb5 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserToRoomDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserToRoomDialog.java
@@ -69,8 +69,8 @@ public class InviteUserToRoomDialog extends Modal<String> {
header(new ResourceModel("1131"));
addButton(OmModalCloseButton.of());
- add(publicRooms = new InviteRoomListPanel("publicRooms", new ArrayList<Room>(), getString("1135")));
- add(privateRooms = new InviteRoomListPanel("privateRooms", new ArrayList<Room>(), getString("1135")));
+ add(publicRooms = new InviteRoomListPanel("publicRooms", new ArrayList<>(), getString("1135")));
+ add(privateRooms = new InviteRoomListPanel("privateRooms", new ArrayList<>(), getString("1135")));
add(inviteMsg);
super.onInitialize();
}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java
index b72f77b..f7996b9 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java
@@ -89,7 +89,7 @@ public class MessageDialog extends Modal<PrivateMessage> {
private final OmDateTimePicker start = new OmDateTimePicker("start", Model.of(LocalDateTime.now()));
private final OmDateTimePicker end = new OmDateTimePicker("end", Model.of(LocalDateTime.now()));
private boolean isPrivate = false;
- private final IModel<Collection<User>> modelTo = new CollectionModel<>(new ArrayList<User>());
+ private final IModel<Collection<User>> modelTo = new CollectionModel<>(new ArrayList<>());
@SpringBean
private RoomDao roomDao;
@SpringBean
@@ -242,7 +242,7 @@ public class MessageDialog extends Modal<PrivateMessage> {
LocalDateTime now = ZonedDateTime.now(getZoneId()).toLocalDateTime();
start.setModelObject(now);
end.setModelObject(now.plus(1, ChronoUnit.HOURS));
- modelTo.setObject(new ArrayList<User>());
+ modelTo.setObject(new ArrayList<>());
PrivateMessage p = new PrivateMessage();
p.setFrom(userDao.get(getUserId()));
p.setOwner(p.getFrom());
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 e10c8f9..66aa337 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
@@ -109,9 +109,9 @@ public class AppointmentDialog extends Modal<Appointment> {
private final WebMarkupContainer sipContainer = new WebMarkupContainer("sip-container");
private final RadioGroup<InviteeType> rdi = new RadioGroup<>("inviteeType", Model.of(InviteeType.user));
private final Select2MultiChoice<Group> groups = new Select2MultiChoice<>("groups"
- , new CollectionModel<Group>(new ArrayList<>())
+ , new CollectionModel<>(new ArrayList<>())
, new GroupChoiceProvider());
- private final UserMultiChoice attendees = new UserMultiChoice("attendees", new CollectionModel<User>(new ArrayList<>()));
+ private final UserMultiChoice attendees = new UserMultiChoice("attendees", new CollectionModel<>(new ArrayList<>()));
private enum InviteeType {
user
, group
@@ -289,7 +289,7 @@ public class AppointmentDialog extends Modal<Appointment> {
"groom"
, Model.of(new Room())
, getRoomList()
- , new ChoiceRenderer<Room>("name", "id"));
+ , new ChoiceRenderer<>("name", "id"));
private DropDownChoice<OmCalendar> cals = new DropDownChoice<>(
"calendar",
new LoadableDetachableModel<List<? extends OmCalendar>>() {
@@ -304,7 +304,7 @@ public class AppointmentDialog extends Modal<Appointment> {
return apptManager.getCalendars(getUserId());
}
},
- new ChoiceRenderer<OmCalendar>("title", "id")
+ new ChoiceRenderer<>("title", "id")
);
private final WebMarkupContainer groupContainer = new WebMarkupContainer("groupContainer");
@@ -412,7 +412,7 @@ public class AppointmentDialog extends Modal<Appointment> {
add(new WysiwygEditor("description", toolbar));
//room
- add(new AjaxCheckBox("createRoom", new PropertyModel<Boolean>(this, "createRoom")) {
+ add(new AjaxCheckBox("createRoom", new PropertyModel<>(this, "createRoom")) {
private static final long serialVersionUID = 1L;
@Override
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidget.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidget.java
index 06041ec..4562fcb 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidget.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/MyRoomsWidget.java
@@ -21,7 +21,6 @@ package org.apache.openmeetings.web.user.dashboard;
import org.apache.openmeetings.web.app.Application;
import org.apache.wicket.model.Model;
import org.wicketstuff.dashboard.AbstractWidget;
-import org.wicketstuff.dashboard.Widget;
import org.wicketstuff.dashboard.WidgetLocation;
import org.wicketstuff.dashboard.web.WidgetView;
@@ -44,6 +43,6 @@ public class MyRoomsWidget extends AbstractWidget {
@Override
public WidgetView createView(String viewId) {
- return new MyRoomsWidgetView(viewId, new Model<Widget>(this));
+ return new MyRoomsWidgetView(viewId, new Model<>(this));
}
}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RecentRoomsWidget.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RecentRoomsWidget.java
index f7353b1..a42da35 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RecentRoomsWidget.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RecentRoomsWidget.java
@@ -21,7 +21,6 @@ package org.apache.openmeetings.web.user.dashboard;
import org.apache.openmeetings.web.app.Application;
import org.apache.wicket.model.Model;
import org.wicketstuff.dashboard.AbstractWidget;
-import org.wicketstuff.dashboard.Widget;
import org.wicketstuff.dashboard.WidgetLocation;
import org.wicketstuff.dashboard.web.WidgetView;
@@ -44,6 +43,6 @@ public class RecentRoomsWidget extends AbstractWidget {
@Override
public WidgetView createView(String viewId) {
- return new RecentRoomsWidgetView(viewId, new Model<Widget>(this));
+ return new RecentRoomsWidgetView(viewId, new Model<>(this));
}
}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidget.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidget.java
index 052e90e..99b6df7 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidget.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/RssWidget.java
@@ -21,7 +21,6 @@ package org.apache.openmeetings.web.user.dashboard;
import org.apache.openmeetings.web.app.Application;
import org.apache.wicket.model.Model;
import org.wicketstuff.dashboard.AbstractWidget;
-import org.wicketstuff.dashboard.Widget;
import org.wicketstuff.dashboard.WidgetLocation;
import org.wicketstuff.dashboard.web.WidgetView;
@@ -44,6 +43,6 @@ public class RssWidget extends AbstractWidget {
@Override
public WidgetView createView(String viewId) {
- return new RssWidgetView(viewId, new Model<Widget>(this));
+ return new RssWidgetView(viewId, new Model<>(this));
}
}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidget.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidget.java
index 85d702a..da8f200 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidget.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidget.java
@@ -21,7 +21,6 @@ package org.apache.openmeetings.web.user.dashboard;
import org.apache.openmeetings.web.app.Application;
import org.apache.wicket.model.Model;
import org.wicketstuff.dashboard.AbstractWidget;
-import org.wicketstuff.dashboard.Widget;
import org.wicketstuff.dashboard.WidgetLocation;
import org.wicketstuff.dashboard.web.WidgetView;
@@ -43,6 +42,6 @@ public class StartWidget extends AbstractWidget {
@Override
public WidgetView createView(String viewId) {
- return new StartWidgetView(viewId, new Model<Widget>(this));
+ return new StartWidgetView(viewId, new Model<>(this));
}
}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidget.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidget.java
index 22dd4fb..c9977be 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidget.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidget.java
@@ -21,7 +21,6 @@ package org.apache.openmeetings.web.user.dashboard;
import org.apache.openmeetings.web.app.Application;
import org.apache.wicket.model.Model;
import org.wicketstuff.dashboard.AbstractWidget;
-import org.wicketstuff.dashboard.Widget;
import org.wicketstuff.dashboard.WidgetLocation;
import org.wicketstuff.dashboard.web.WidgetView;
@@ -43,6 +42,6 @@ public class WelcomeWidget extends AbstractWidget {
@Override
public WidgetView createView(String viewId) {
- return new WelcomeWidgetView(viewId, new Model<Widget>(this));
+ return new WelcomeWidgetView(viewId, new Model<>(this));
}
}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidget.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidget.java
index 10985e3..92015a4 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidget.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidget.java
@@ -21,7 +21,6 @@ package org.apache.openmeetings.web.user.dashboard.admin;
import org.apache.openmeetings.web.app.Application;
import org.apache.wicket.model.Model;
import org.wicketstuff.dashboard.AbstractWidget;
-import org.wicketstuff.dashboard.Widget;
import org.wicketstuff.dashboard.WidgetLocation;
import org.wicketstuff.dashboard.web.WidgetView;
@@ -44,6 +43,6 @@ public class AdminWidget extends AbstractWidget {
@Override
public WidgetView createView(String viewId) {
- return new AdminWidgetView(viewId, new Model<Widget>(this));
+ return new AdminWidgetView(viewId, new Model<>(this));
}
}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/EditProfileForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/EditProfileForm.java
index 64548e4..053f5ed 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/EditProfileForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/EditProfileForm.java
@@ -54,7 +54,7 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.button.Buttons;
public class EditProfileForm extends Form<User> {
private static final long serialVersionUID = 1L;
private static final Logger log = LoggerFactory.getLogger(EditProfileForm.class);
- private final PasswordTextField passwd = new PasswordTextField("passwd", new Model<String>());
+ private final PasswordTextField passwd = new PasswordTextField("passwd", new Model<>());
private final GeneralUserForm userForm;
private final ChangePasswordDialog chPwdDlg;
private boolean checkPassword;
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingResourceReference.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingResourceReference.java
index b39faca..c43b5dc 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingResourceReference.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingResourceReference.java
@@ -70,17 +70,17 @@ public abstract class RecordingResourceReference extends FileItemResourceReferen
@Override
protected Recording getFileItem(Attributes attributes) {
PageParameters params = attributes.getParameters();
- StringValue _id = params.get("id");
+ StringValue inId = params.get("id");
String ruid = params.get("ruid").toString();
String uid = params.get("uid").toString();
Long id = null;
try {
- id = _id.toOptionalLong();
+ id = inId.toOptionalLong();
} catch (Exception e) {
//no-op expected
}
WebSession ws = WebSession.get();
- if (id == null && ws.signIn(_id.toString(), true)) {
+ if (id == null && ws.signIn(inId.toString(), true)) {
id = getRecordingId();
}
if (id != null && ws.isSignedIn()) {
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java
index e6887c7..62e6448 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java
@@ -53,9 +53,9 @@ public class VideoInfo extends Panel {
setDefaultModel(rm);
}
- public VideoInfo update(AjaxRequestTarget target, BaseFileItem _r) {
- if (_r instanceof Recording) {
- Recording r = (Recording)_r;
+ public VideoInfo update(AjaxRequestTarget target, BaseFileItem file) {
+ if (file instanceof Recording) {
+ Recording r = (Recording)file;
rm.setObject(r);
try {
String name = null;
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ExtendedClientProperties.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ExtendedClientProperties.java
index 1abe912..35543f1 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ExtendedClientProperties.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/ExtendedClientProperties.java
@@ -62,9 +62,9 @@ public class ExtendedClientProperties extends ClientProperties {
return new JSONObject();
}
- private static StringBuilder cleanUrl(String _url) {
+ private static StringBuilder cleanUrl(String inUrl) {
StringBuilder sb = new StringBuilder();
- String url = _url;
+ String url = inUrl;
int semi = url.indexOf(';');
if (semi > -1) {
url = url.substring(0, semi);
@@ -81,8 +81,8 @@ public class ExtendedClientProperties extends ClientProperties {
@Override
public void read(IRequestParameters parameters) {
super.read(parameters);
- String _url = parameters.getParameterValue("codebase").toString(OpenmeetingsVariables.getBaseUrl());
- StringBuilder sb = cleanUrl(_url);
+ String url = parameters.getParameterValue("codebase").toString(OpenmeetingsVariables.getBaseUrl());
+ StringBuilder sb = cleanUrl(url);
if (sb.charAt(sb.length() - 1) != '/') {
sb.append('/');
}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/GroupLogoResourceReference.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/GroupLogoResourceReference.java
index 8d33d1d..060c838 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/GroupLogoResourceReference.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/GroupLogoResourceReference.java
@@ -75,9 +75,9 @@ public class GroupLogoResourceReference extends FileSystemResourceReference {
WebSession ws = WebSession.get();
if (ws.isSignedIn()) {
PageParameters params = attrs.getParameters();
- StringValue _id = params.get("id");
+ StringValue inId = params.get("id");
try {
- id = _id.toOptionalLong();
+ id = inId.toOptionalLong();
} catch (Exception e) {
//no-op expected
}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RestrictiveChoiceProvider.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RestrictiveChoiceProvider.java
index 7de33ab..e5c9695 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RestrictiveChoiceProvider.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RestrictiveChoiceProvider.java
@@ -40,9 +40,9 @@ public abstract class RestrictiveChoiceProvider<T> extends ChoiceProvider<T> {
}
@Override
- public final Collection<T> toChoices(Collection<String> _ids) {
+ public final Collection<T> toChoices(Collection<String> inIds) {
Collection<T> c = new ArrayList<>();
- for (String id : _ids) {
+ for (String id : inIds) {
if (ids.contains(id)) {
T e = fromId(id);
if (e != null) {
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 0e8ea74..0e4c9bf 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
@@ -37,12 +37,12 @@ import com.sun.xml.bind.marshaller.CharacterEscapeHandler;
public class TestExport extends AbstractJUnitDefaults {
@Test
- public void exportMain() throws Exception {
+ void exportMain() throws Exception {
BackupExport.main(new String[] {File.createTempFile("gereral", "cfg").getCanonicalPath()});
}
@Test
- public void exportUser() throws Exception {
+ void exportUser() throws Exception {
User u = createUser();
u.setAge(LocalDate.of(1977, 11, 13));
Group g = groupDao.get(1L);
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 640673d..e4dde56 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
@@ -46,14 +46,14 @@ public class TestImport extends AbstractTestImport {
private PrivateMessageFolderDao msgFolderDao;
@Test
- public void importVersionNE() throws Exception {
+ void importVersionNE() throws Exception {
File configs = new File(getClass().getClassLoader().getResource("org/apache/openmeetings/backup/config/skip/configs.xml").toURI());
BackupVersion ver = BackupImport.getVersion(configs.getParentFile());
assertEquals(new BackupVersion(), ver);
}
@Test
- public void importVersion() throws Exception {
+ void importVersion() throws Exception {
File version = new File(getClass().getClassLoader().getResource("org/apache/openmeetings/backup/version/version.xml").toURI());
BackupVersion ver = BackupImport.getVersion(version.getParentFile());
assertEquals(5, ver.getMajor(), "major");
@@ -61,7 +61,7 @@ public class TestImport extends AbstractTestImport {
assertEquals(0, ver.getMicro(), "micro");
}
@Test
- public void importGroups() throws Exception {
+ void importGroups() throws Exception {
long grpCount = groupDao.count();
File groups = new File(getClass().getClassLoader().getResource("org/apache/openmeetings/backup/group/organizations.xml").toURI());
backupImport.importGroups(groups.getParentFile());
@@ -69,7 +69,7 @@ public class TestImport extends AbstractTestImport {
}
@Test
- public void importLdaps() throws Exception {
+ void importLdaps() throws Exception {
Configuration def = cfgDao.get(CONFIG_DEFAULT_LDAP_ID);
if (def != null) {
def.setValueN(null);
@@ -84,7 +84,7 @@ public class TestImport extends AbstractTestImport {
}
@Test
- public void importOauths() throws Exception {
+ void importOauths() throws Exception {
long oauthCount = oauthDao.count();
File oauths = new File(getClass().getClassLoader().getResource("org/apache/openmeetings/backup/oauth/oauth2servers.xml").toURI());
backupImport.importOauth(oauths.getParentFile());
@@ -92,7 +92,7 @@ public class TestImport extends AbstractTestImport {
}
@Test
- public void importChatSkip() throws Exception {
+ void importChatSkip() throws Exception {
long chatCount = chatDao.get(0, Integer.MAX_VALUE).size();
File chats = new File(getClass().getClassLoader().getResource("org/apache/openmeetings/backup/chat/skip/chat_messages.xml").toURI());
backupImport.importChat(chats.getParentFile());
@@ -100,7 +100,7 @@ public class TestImport extends AbstractTestImport {
}
@Test
- public void importChat() throws Exception {
+ void importChat() throws Exception {
long chatCount = chatDao.get(0, Integer.MAX_VALUE).size();
File chats = new File(getClass().getClassLoader().getResource("org/apache/openmeetings/backup/chat/chat_messages.xml").toURI());
backupImport.importChat(chats.getParentFile());
@@ -108,7 +108,7 @@ public class TestImport extends AbstractTestImport {
}
@Test
- public void importRecordings() throws Exception {
+ void importRecordings() throws Exception {
long recCount = recDao.get().size();
File recs = new File(getClass().getClassLoader().getResource("org/apache/openmeetings/backup/file/flvRecordings.xml").toURI());
backupImport.importRecordings(recs.getParentFile());
@@ -116,7 +116,7 @@ public class TestImport extends AbstractTestImport {
}
@Test
- public void importMsgFolders() throws Exception {
+ void importMsgFolders() throws Exception {
long fldrCount = msgFolderDao.get(0, Integer.MAX_VALUE).size();
File fldrs = new File(getClass().getClassLoader().getResource("org/apache/openmeetings/backup/msg/privateMessageFolder.xml").toURI());
backupImport.importPrivateMsgFolders(fldrs.getParentFile());
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 934d433..515b6ff 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
@@ -34,7 +34,7 @@ public class TestImportCalendar extends AbstractTestImport {
private MeetingMemberDao meetingMemberDao;
@Test
- public void importCalendars() throws Exception {
+ void importCalendars() throws Exception {
long calCount = calendarDao.get().size();
File cals = new File(getClass().getClassLoader().getResource("org/apache/openmeetings/backup/calendar/calendars.xml").toURI());
backupImport.importCalendars(cals.getParentFile());
@@ -42,7 +42,7 @@ public class TestImportCalendar extends AbstractTestImport {
}
@Test
- public void importAppointmentsSkip() throws Exception {
+ void importAppointmentsSkip() throws Exception {
long appCount = appointmentDao.get().size();
File apps = new File(getClass().getClassLoader().getResource("org/apache/openmeetings/backup/calendar/skip/appointements.xml").toURI());
backupImport.importAppointments(apps.getParentFile());
@@ -50,7 +50,7 @@ public class TestImportCalendar extends AbstractTestImport {
}
@Test
- public void importAppointments() throws Exception {
+ void importAppointments() throws Exception {
long appCount = appointmentDao.get().size();
File apps = new File(getClass().getClassLoader().getResource("org/apache/openmeetings/backup/calendar/appointements.xml").toURI());
backupImport.importAppointments(apps.getParentFile());
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 87e2554..9cc855b 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
@@ -32,7 +32,7 @@ import org.junit.jupiter.api.Test;
public class TestImportConfig extends AbstractTestImport {
@Test
- public void importConfigsNoKeyDeleted() throws Exception {
+ void importConfigsNoKeyDeleted() throws Exception {
long configsCount = cfgDao.count();
File configs = new File(getClass().getClassLoader().getResource("org/apache/openmeetings/backup/config/skip/configs.xml").toURI());
backupImport.importConfigs(configs.getParentFile());
@@ -40,7 +40,7 @@ public class TestImportConfig extends AbstractTestImport {
}
@Test
- public void importConfigsBool() throws Exception {
+ void importConfigsBool() throws Exception {
cfgDao.get(CONFIG_REGISTER_FRONTEND, CONFIG_REGISTER_SOAP, CONFIG_REGISTER_OAUTH, CONFIG_REPLY_TO_ORGANIZER).forEach(cfg -> {
cfg.setValueB(cfg.getKey().equals(CONFIG_REPLY_TO_ORGANIZER));
cfgDao.update(cfg, null);
@@ -61,7 +61,7 @@ public class TestImportConfig extends AbstractTestImport {
}
@Test
- public void importConfigs() throws Exception {
+ void importConfigs() throws Exception {
File configs = new File(getClass().getClassLoader().getResource("org/apache/openmeetings/backup/config/configs.xml").toURI());
backupImport.importConfigs(configs.getParentFile());
}
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 3de3172..3a43614 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
@@ -48,7 +48,7 @@ public class TestImportOld extends AbstractTestImport {
private FileItemDao fileDao;
@Test
- public void importOldVersions() {
+ void importOldVersions() {
String backupsDir = System.getProperty("backups.dir", ".");
File backupsHome = new File(backupsDir);
@@ -98,7 +98,7 @@ public class TestImportOld extends AbstractTestImport {
* @throws Exception
*/
@Test
- public void importJira2423() throws Exception {
+ void importJira2423() throws Exception {
try (InputStream is = getClass().getClassLoader().getResourceAsStream("org/apache/openmeetings/backup/jira2423/backup_2423.zip")) {
backupImport.performImport(is, new ProgressHolder());
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 4882a14..d7e15db 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
@@ -31,7 +31,7 @@ public class TestImportRoom extends AbstractTestImport {
private RoomDao roomDao;
@Test
- public void importRooms() throws Exception {
+ void importRooms() throws Exception {
long roomsCount = roomDao.count();
File rooms = new File(getClass().getClassLoader().getResource("org/apache/openmeetings/backup/room/rooms.xml").toURI());
backupImport.importRooms(rooms.getParentFile());
@@ -39,7 +39,7 @@ public class TestImportRoom extends AbstractTestImport {
}
@Test
- public void importRoomGroups() throws Exception {
+ void importRoomGroups() throws Exception {
//TODO need to check it somehow
File rooms = new File(getClass().getClassLoader().getResource("org/apache/openmeetings/backup/room/rooms.xml").toURI());
backupImport.importRoomGroups(rooms.getParentFile());
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 1075983..965e27d 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
@@ -36,7 +36,7 @@ public class TestImportUser extends AbstractTestImport {
private LdapConfigDao ldapDao;
@Test
- public void importUserNE() throws Exception {
+ void importUserNE() throws Exception {
Assertions.assertThrows(BackupException.class, () -> {
File configs = new File(getClass().getClassLoader().getResource("org/apache/openmeetings/backup/config/skip/configs.xml").toURI());
backupImport.importUsers(configs.getParentFile());
@@ -44,7 +44,7 @@ public class TestImportUser extends AbstractTestImport {
}
@Test
- public void importUsers() throws Exception {
+ void importUsers() throws Exception {
long userCount = userDao.count();
File users = new File(getClass().getClassLoader().getResource("org/apache/openmeetings/backup/user/users.xml").toURI());
backupImport.importUsers(users.getParentFile());
@@ -54,7 +54,7 @@ public class TestImportUser extends AbstractTestImport {
}
@Test
- public void importNoLoginDeleted() throws Exception {
+ void importNoLoginDeleted() throws Exception {
long userCount = userDao.count();
File users = new File(getClass().getClassLoader().getResource("org/apache/openmeetings/backup/user/skip/users.xml").toURI());
backupImport.importUsers(users.getParentFile());
@@ -62,7 +62,7 @@ public class TestImportUser extends AbstractTestImport {
}
@Test
- public void importLdap() throws Exception {
+ void importLdap() throws Exception {
final String login = "omLdap2294";
// OPENMEETINGS-2294
//clean-up
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 c86609a..aefd44a 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
@@ -80,7 +80,7 @@ public class TestAppointmentAddAppointment extends AbstractWicketTester {
}
@Test
- public void saveAppointment() throws Exception {
+ void saveAppointment() throws Exception {
log.debug("- saveAppointment");
Calendar start = Calendar.getInstance();
@@ -146,7 +146,7 @@ public class TestAppointmentAddAppointment extends AbstractWicketTester {
}
@Test
- public void testCreate() {
+ void testCreate() {
Appointment a = new Appointment();
a.setTitle("Test title");
setTime(a);
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 9c9c9d3..c1ec96a 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
@@ -38,7 +38,7 @@ public class TestAppointmentSchedulerTask extends AbstractJUnitDefaults {
private AppointmentLogic appointmentLogic;
@Test
- public void noBaseUrl() {
+ void noBaseUrl() {
final String origBaseUrl = getBaseUrl();
try {
for (String url : new String[] {null, ""}) {
@@ -51,7 +51,7 @@ public class TestAppointmentSchedulerTask extends AbstractJUnitDefaults {
}
@Test
- public void turnedOff() {
+ void turnedOff() {
final Configuration origCfg = cfgDao.get(CONFIG_APPOINTMENT_REMINDER_MINUTES);
try {
Configuration cfg = cfgDao.get(origCfg.getId());
@@ -64,7 +64,7 @@ public class TestAppointmentSchedulerTask extends AbstractJUnitDefaults {
}
@Test
- public void doIt() {
+ void doIt() {
log.debug("- 1 MeetingReminderJob.execute");
try {
appointmentLogic.doScheduledMeetingReminder();
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 11dcbaf..751821f 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
@@ -34,7 +34,7 @@ public class TestDatabaseStructureAppointment extends AbstractJUnitDefaults {
private static final Logger log = LoggerFactory.getLogger(TestDatabaseStructureAppointment.class);
@Test
- public void testAddingGroup() {
+ void testAddingGroup() {
try {
Calendar cal = Calendar.getInstance();
cal.set(2008, 9, 2);
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 6ee31b5..040f41d 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
@@ -34,7 +34,7 @@ public class TestDatabaseStructureGetAppointmentByRange extends AbstractJUnitDef
private static final Logger log = LoggerFactory.getLogger(TestDatabaseStructureGetAppointmentByRange.class);
@Test
- public void test() {
+ void test() {
log.debug("Test started");
Long userId = 1L;
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 7a79ca3..c6f0d84 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
@@ -27,7 +27,7 @@ public class TestDatabaseStructureGetUserStart extends AbstractJUnitDefaults {
private static final Logger log = LoggerFactory.getLogger(TestDatabaseStructureGetUserStart.class);
@Test
- public void testAddingGroup() {
+ void testAddingGroup() {
try {
userDao.get(1L);
} catch (Exception err) {
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 f962ff7..3f29aaa 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
@@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test;
public class TestDatabaseStructureMeetingMember extends AbstractJUnitDefaults {
@Test
- public void testUpdateMeetingMember(){
+ void testUpdateMeetingMember(){
//TODO add test
}
}
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 2989eef..7458f7d 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
@@ -39,7 +39,7 @@ public class TestGetAppointment extends AbstractJUnitDefaults {
private RoomDao roomDao;
@Test
- public void getAppoinment() {
+ void getAppoinment() {
log.debug("getAppoinment enter");
Long userId = 1L;
@@ -58,7 +58,7 @@ public class TestGetAppointment extends AbstractJUnitDefaults {
}
@Test
- public void testGetByRoom() {
+ void testGetByRoom() {
Date start = new Date();
Appointment a = createAppointment(getAppointment(userDao.get(1L), roomDao.get(5L), start, new Date(start.getTime() + ONE_HOUR)));
Appointment a1 = appointmentDao.getByRoom(1L, 5L);
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 ba14bab..28f86e3 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
@@ -33,7 +33,7 @@ public class TestOmCalendar extends AbstractJUnitDefaults {
private OmCalendarDao calendarDao;
@Test
- public void saveCalendar() {
+ void saveCalendar() {
OmCalendar calendar = new OmCalendar();
Long userId = 1L;
User owner = userDao.get(userId);
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 d57b9bc..fa5ca3d 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
@@ -160,7 +160,7 @@ public class TestSendIcalMessage extends AbstractJUnitDefaults {
}
@Test
- public void sendInvitionIcalLink() {
+ void sendInvitionIcalLink() {
try {
String email = "hans@webbase-design.de";
String username = "shans";
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 22397f2..9b0bf4d 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
@@ -85,23 +85,23 @@ public class TestAdmin {
}
@Test
- public void testNoArgs() throws Exception {
+ void testNoArgs() throws Exception {
checkError();
}
@Test
- public void testBadArgs() throws Exception {
+ void testBadArgs() throws Exception {
checkError("aaaa");
}
@Test
- public void testUsage() throws Exception {
+ void testUsage() throws Exception {
new Admin().process("-h");
assertTrue(true);
}
@Test
- public void testInstallParamConflict() throws Exception {
+ void testInstallParamConflict() throws Exception {
checkError("-v", "-i", "-file", "aaa", "-user", "bbb");
checkError("-i", "-file", "aaa", "-email", "bbb");
checkError("-i", "-file", "aaa", "-group", "bbb");
@@ -121,7 +121,7 @@ public class TestAdmin {
}
@Test
- public void testInstallBackup() throws Exception {
+ void testInstallBackup() throws Exception {
String tempDB = Files.createTempFile("omtempdb", null).toFile().getCanonicalPath();
Admin a = new Admin();
performInstall(a, "--db-name", tempDB);
@@ -132,7 +132,7 @@ public class TestAdmin {
}
@Test
- public void testFilesNoDb() throws Exception {
+ void testFilesNoDb() throws Exception {
//clean-up report
new Admin().process("-f");
}
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 ab6c750..b729af5 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
@@ -49,7 +49,7 @@ public class TestPatcher {
}
@Test
- public void test() throws Exception {
+ void test() throws Exception {
for (DbType dbType : DbType.values()) {
ConnectionProperties props = ConnectionPropertiesPatcher.patch(dbType, HOST, PORT, DB, USER, PASS);
assertEquals(dbType, props.getDbType(), "DB type should match");
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 69eb0ac..b03fe9d 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
@@ -34,7 +34,7 @@ public class TestConfig extends AbstractJUnitDefaults {
private static final Logger log = LoggerFactory.getLogger(TestConfig.class);
@Test
- public void getConfigKey() {
+ void getConfigKey() {
System.err.println("THIS");
Configuration smtp_server = cfgDao.get(CONFIG_SMTP_SERVER);
@@ -45,7 +45,7 @@ public class TestConfig extends AbstractJUnitDefaults {
}
@Test
- public void getConfigs() {
+ void getConfigs() {
try {
List<Configuration> list = cfgDao.get(4, 6);
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 3670c99..1741a56 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
@@ -44,7 +44,7 @@ public class TestFileProcessor extends AbstractJUnitDefaults {
protected FileProcessor processor;
@Test
- public void testProcessPng() throws Exception {
+ void testProcessPng() throws Exception {
for (String ext : new String[] {null, "txt", "jpg"}) {
FileItem f = new FileItemDTO()
.setName(String.format(FILE_NAME_FMT, FILE_NAME, ext))
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 1553a83..6a17eea 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
@@ -42,7 +42,7 @@ public class TestRoomDao extends AbstractJUnitDefaults {
protected RoomDao roomDao;
@Test
- public void testMicStatusHidden() throws Exception {
+ void testMicStatusHidden() throws Exception {
Room r = roomDao.get(1);
assertNotNull(r, "Room must exist");
assertTrue(r.isHidden(RoomElement.MICROPHONE_STATUS), "Default interview room should have mic status hidden");
@@ -65,7 +65,7 @@ public class TestRoomDao extends AbstractJUnitDefaults {
}
@Test
- public void testPublicRooms() {
+ void testPublicRooms() {
for (Room.Type type : Room.Type.values()) {
for (Room r : roomDao.getPublicRooms(type)) {
assertEquals(type, r.getType(), "Room type should be " + type);
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 4b4a780..3477c18 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
@@ -31,7 +31,7 @@ public class TestAddGroup extends AbstractJUnitDefaults {
private static final Logger log = LoggerFactory.getLogger(TestAddGroup.class);
@Test
- public void testAddingGroup() {
+ void testAddingGroup() {
Group o = new Group();
o.setName("default");
o = groupDao.update(o, null);
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 41fec3e..1ce3727 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
@@ -32,7 +32,7 @@ public class TestUserGroupAggregation extends AbstractJUnitDefaults {
private static final Logger log = LoggerFactory.getLogger(TestUserGroupAggregation.class);
@Test
- public void testitNow() {
+ void testitNow() {
User u = userDao.get(1L);
assertNotNull(u.getGroupUsers(), "Group list for default user must not be null");
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 7eedb06..6d4ef15 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
@@ -39,7 +39,7 @@ public class TestInvitation extends AbstractWicketTester {
private RoomDao roomDao;
@Test
- public void testSendInvitationLink() throws Exception {
+ void testSendInvitationLink() throws Exception {
User us = userDao.getByLogin(adminUsername, User.Type.USER, null);
LocalDateTime from = LocalDateTime.now().plusDays(1).withHour(12).withMinute(0).withSecond(0);
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 7daee77..5c3f6e6 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
@@ -130,7 +130,7 @@ public class TestLdap extends AbstractWicketTester {
}
@Test
- public void testSbndSessionLogin() throws OmException {
+ void testSbndSessionLogin() throws OmException {
LdapConfig cfg = CFG_MAP.get(CFG_SEARCH_BIND);
assertTrue(WebSession.get().signIn(USER1, userpass, User.Type.LDAP, cfg.getId()), "Login should be successful");
//do login second time
@@ -141,7 +141,7 @@ public class TestLdap extends AbstractWicketTester {
}
@Test
- public void testPhoto1() throws OmException {
+ void testPhoto1() throws OmException {
LdapConfig cfg = CFG_MAP.get(CFG_SEARCH_BIND);
assertTrue(WebSession.get().signIn(USER2, userpass, User.Type.LDAP, cfg.getId()), "Login should be successful");
User u = userDao.getByLogin(USER2, User.Type.LDAP, cfg.getId());
@@ -150,7 +150,7 @@ public class TestLdap extends AbstractWicketTester {
}
@Test
- public void testPhoto2() throws OmException {
+ void testPhoto2() throws OmException {
LdapConfig cfg = CFG_MAP.get(CFG_SEARCH_BIND);
assertTrue(WebSession.get().signIn(USER3, userpass, User.Type.LDAP, cfg.getId()), "Login should be successful");
User u = userDao.getByLogin(USER3, User.Type.LDAP, cfg.getId());
@@ -159,7 +159,7 @@ public class TestLdap extends AbstractWicketTester {
}
@Test
- public void testSbndSessionLoginBadPassword() {
+ void testSbndSessionLoginBadPassword() {
LdapConfig cfg = CFG_MAP.get(CFG_SEARCH_BIND);
assertThrows(OmException.class, () -> WebSession.get().signIn(USER1, BAD_PASSWORD, User.Type.LDAP, cfg.getId()));
}
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 9006739..8cbd9f4 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
@@ -32,14 +32,14 @@ public class TestEmailTemplate extends AbstractWicketTester {
}
@Test
- public void testNullLocale() {
+ void testNullLocale() {
User u = new User();
u.setLanguageId(666L);
checkTemplate(InvitationTemplate.getEmail(u, "testuser", "email", "message"));
}
@Test
- public void testTemplateGeneration() {
+ void testTemplateGeneration() {
User u = new User();
u.setLanguageId(rnd.nextInt(30));
UserContact uc = new UserContact();
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 7f90b00..5560657 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
@@ -44,7 +44,7 @@ public class TestSubjTemplate extends AbstractWicketTester {
}
@Test
- public void testTemplateGeneration() {
+ void testTemplateGeneration() {
Appointment a = getAppointment();
String[] ids = TimeZone.getAvailableIDs();
Recording rec = new Recording();
@@ -76,7 +76,7 @@ public class TestSubjTemplate extends AbstractWicketTester {
}
@Test
- public void testError() {
+ void testError() {
InvitedAppointmentTemplate t = new InvitedAppointmentTemplate(Locale.CHINA, new Appointment(), TimeZone.getDefault(), "TEST") {
private static final long serialVersionUID = 1L;
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 ef08ecb..12c31fc 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
@@ -35,7 +35,7 @@ public class TestJob extends AbstractWicketTester {
private ReminderJob reminderJob;
@Test
- public void testNotInited() {
+ void testNotInited() {
try {
setInitComplete(false);
cleanJob.cleanExpiredRecordings();
@@ -65,12 +65,12 @@ public class TestJob extends AbstractWicketTester {
}
@Test
- public void testRssDisabled() {
+ void testRssDisabled() {
testRss(false, () -> reminderJob.loadRss());
}
@Test
- public void testRssEnabled() {
+ void testRssEnabled() {
testRss(true, () -> reminderJob.loadRss());
}
}
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 46065a8..d187dcb 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
@@ -25,7 +25,7 @@ import org.junit.jupiter.api.Test;
public class TestSmokeBasic extends AbstractJUnitDefaults {
@Test
- public void createErrorValueAndTest() {
+ 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 bb569ff..0a6b51e 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
@@ -36,12 +36,12 @@ import org.junit.jupiter.api.Test;
public class TestUserContact extends AbstractWicketTester {
@Test
- public void testGetUser() {
+ void testGetUser() {
assertNull(userDao.get(Long.MAX_VALUE), "Null should be returned in case User does not exist");
}
@Test
- public void createUserWithGroup() throws Exception {
+ void createUserWithGroup() throws Exception {
String uuid = randomUUID().toString();
User u = getUser(uuid);
u.addGroup(groupDao.get(1L));
@@ -55,14 +55,14 @@ public class TestUserContact extends AbstractWicketTester {
}
@Test
- public void testCreateUser() throws Exception {
+ void testCreateUser() throws Exception {
String uuid = randomUUID().toString();
User u = createUser(uuid);
assertTrue(userDao.verifyPassword(u.getId(), createPass()), "Password should be set as expected");
}
@Test
- public void testCreateUserWithSip() throws Exception {
+ void testCreateUserWithSip() throws Exception {
boolean sipEnabled = isSipEnabled();
try {
setSipEnabled(true);
@@ -76,7 +76,7 @@ public class TestUserContact extends AbstractWicketTester {
}
@Test
- public void addContactByOwner() throws Exception {
+ void addContactByOwner() throws Exception {
login(null, null);
List<User> users = userDao.getAllUsers();
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 4685fab..786ccdb 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
@@ -27,27 +27,27 @@ import org.junit.jupiter.api.Test;
public class TestUserCount extends AbstractWicketTester {
@Test
- public void testCountSearchUsers() throws Exception {
+ void testCountSearchUsers() throws Exception {
User u = createUser();
assertTrue(userDao.count(u.getFirstname()) == 1, "Account of search users should be one");
}
@Test
- public void testCountFilteredUsers() throws Exception {
+ void testCountFilteredUsers() throws Exception {
User u = createUser();
User contact = createUserContact(u.getId());
assertTrue(userDao.count(contact.getFirstname(), true, u.getId()) == 1, "Account of filtered user should be one");
}
@Test
- public void testCountUnfilteredUsers() throws Exception {
+ void testCountUnfilteredUsers() throws Exception {
User u = createUser();
createUserContact(u.getId());
assertTrue(userDao.count("firstname", false, getUserId()) > 1, "Account of unfiltered should be more then one");
}
@Test
- public void testCountAllUsers() {
+ void testCountAllUsers() {
assertTrue(userDao.count() > 0, "Account of users should be positive");
}
}
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 5e12087..a10fd8a 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
@@ -52,7 +52,7 @@ public class TestUserGroup extends AbstractJUnitDefaults {
}
@Test
- public void getUsersByGroupId() {
+ void getUsersByGroupId() {
User u = getValidUser();
Long groupId = u.getGroupUsers().get(0).getGroup().getId();
List<GroupUser> ul = groupUserDao.get(groupId, 0, 9999);
@@ -63,7 +63,7 @@ public class TestUserGroup extends AbstractJUnitDefaults {
}
@Test
- public void addGroup() {
+ void addGroup() {
Group g = new Group();
g.setName(GROUP_NAME);
Long groupId = groupDao.update(g, null).getId(); //inserted by not checked
@@ -74,7 +74,7 @@ public class TestUserGroup extends AbstractJUnitDefaults {
}
@Test
- public void addUserWithoutGroup() throws Exception {
+ void addUserWithoutGroup() throws Exception {
String uuid = randomUUID().toString();
User u = getUser(uuid);
u = userDao.update(u, null);
@@ -91,7 +91,7 @@ public class TestUserGroup extends AbstractJUnitDefaults {
@Test
- public void addLdapUserWithoutGroup() throws Exception {
+ void addLdapUserWithoutGroup() throws Exception {
User u1 = getUser();
u1.setType(User.Type.LDAP);
u1.setDomainId(1L);
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 be166aa..434db4a 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
@@ -33,25 +33,25 @@ public class TestAuth extends AbstractJUnitDefaults {
private SessiondataDao sessionDao;
@Test
- public void test() {
+ void test() {
Sessiondata sd = sessionDao.create(1L, 1L);
assertNotNull(sd);
sessionDao.clearSessionTable(-1L);
}
@Test
- public void testNotExistent() {
+ void testNotExistent() {
Sessiondata sd = sessionDao.check(randomUUID().toString());
assertNotNull(sd);
}
@Test
- public void testFind1() {
+ void testFind1() {
assertNull(sessionDao.find(null));
}
@Test
- public void testFind2() {
+ void testFind2() {
assertNull(sessionDao.find(randomUUID().toString()));
}
}
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 f87fb63..321b6b2 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
@@ -27,7 +27,7 @@ import org.junit.jupiter.api.Test;
public class TestLogin extends AbstractJUnitDefaults {
@Test
- public void testTestLogin() throws OmException {
+ void testTestLogin() throws OmException {
User us = userDao.login(adminUsername, userpass);
assertNotNull(us, "User is unable to login");
}
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 a5f5c32..4c9691a 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
@@ -35,7 +35,7 @@ import org.junit.jupiter.api.Test;
public class TestDateTime {
@Test
- public void test1() throws Exception {
+ void test1() throws Exception {
final String dateStr = "19-11-29 07:05";
final String pattern = "y-MM-dd HH:mm";
final Locale loc = new Locale.Builder()
@@ -55,7 +55,7 @@ public class TestDateTime {
}
@Test
- public void test2() throws Exception {
+ void test2() throws Exception {
final String dateStr = "2020-05-12, 6:43 a.m.";
final String jsDateStr = "2020-05-12, 6:43 AM";
final String pattern = "y-MM-dd, h:mm a";
@@ -76,7 +76,7 @@ public class TestDateTime {
}
@Test
- public void test3() throws Exception {
+ void test3() throws Exception {
final Locale loc = new Locale.Builder()
.setLanguage("fr")
.setRegion("CA")
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 d04de7a..5419172 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
@@ -30,7 +30,7 @@ import org.junit.jupiter.api.Test;
public class TestStoredFile extends AbstractJUnitDefaults {
@Test
- public void testPng() throws FileNotFoundException, IOException {
+ void testPng() throws FileNotFoundException, IOException {
File f = getDefaultProfilePicture();
for (String ext : new String[] {null, "txt", "jpg"}) {
StoredFile sf = new StoredFile("test image", ext, f);
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 7d21da0..c5ece6b 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
@@ -43,7 +43,7 @@ public class TestCalendar extends AbstractWicketTester {
private static final String PATH_APPOINTMENT_DLG_FRM = String.format("%s:appForm", PATH_APPOINTMENT_DLG);
@Test
- public void testEventCreate() throws OmException {
+ void testEventCreate() throws OmException {
testArea(regularUsername, p -> {
Navbar menu = (Navbar)p.get(PATH_MENU);
assertNotNull(menu);
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 2451096..33648a4 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
@@ -75,7 +75,7 @@ public class TestMainAreas extends AbstractWicketTester {
private static final Logger log = LoggerFactory.getLogger(TestMainAreas.class);
@Test
- public void testDashboard() throws OmException {
+ void testDashboard() throws OmException {
testArea(regularUsername, p -> {
tester.assertComponent(PATH_CHILD, OmDashboardPanel.class);
});
@@ -115,147 +115,147 @@ public class TestMainAreas extends AbstractWicketTester {
}
@Test
- public void testCalendar() throws OmException {
+ void testCalendar() throws OmException {
checkArea(AreaKeys.user, TYPE_CALENDAR, CalendarPanel.class, regularUsername);
}
@Test
- public void testRecordings() throws OmException {
+ void testRecordings() throws OmException {
checkArea(AreaKeys.user, TYPE_RECORDINGS, RecordingsPanel.class, regularUsername);
}
@Test
- public void testRoomsPublic() throws OmException {
+ void testRoomsPublic() throws OmException {
checkArea(AreaKeys.rooms, TYPE_PUBLIC, RoomsSelectorPanel.class, regularUsername);
}
@Test
- public void testRoomsGroup() throws OmException {
+ void testRoomsGroup() throws OmException {
checkArea(AreaKeys.rooms, TYPE_GROUP, RoomsSelectorPanel.class, regularUsername);
}
@Test
- public void testRoomsMy() throws OmException {
+ void testRoomsMy() throws OmException {
checkArea(AreaKeys.rooms, TYPE_MY, RoomsSelectorPanel.class, regularUsername);
}
@Test
- public void testProfileMessages() throws OmException {
+ void testProfileMessages() throws OmException {
checkArea(AreaKeys.profile, TYPE_MESSAGES, MessagesContactsPanel.class, regularUsername);
}
@Test
- public void testProfileEdit() throws OmException {
+ void testProfileEdit() throws OmException {
checkArea(AreaKeys.profile, TYPE_EDIT, EditProfilePanel.class, regularUsername);
}
@Test
- public void testNonExistent() throws OmException {
+ void testNonExistent() throws OmException {
checkArea(AreaKeys.profile, "bla", OmDashboardPanel.class, regularUsername);
}
@Test
- public void testAdminUsers() throws OmException {
+ void testAdminUsers() throws OmException {
checkArea(AreaKeys.admin, TYPE_USER, UsersPanel.class, adminUsername, groupAdminUsername);
}
@Test
- public void testAdminUsers1() throws OmException {
+ void testAdminUsers1() throws OmException {
checkUnauthArea(AreaKeys.admin, TYPE_USER, regularUsername);
}
@Test
- public void testAdminConnections() throws OmException {
+ void testAdminConnections() throws OmException {
checkArea(AreaKeys.admin, TYPE_CONNECTION, ConnectionsPanel.class, adminUsername);
}
@Test
- public void testAdminConnections1() throws OmException {
+ void testAdminConnections1() throws OmException {
checkUnauthArea(AreaKeys.admin, TYPE_CONNECTION, groupAdminUsername, regularUsername);
}
@Test
- public void testAdminGroups() throws OmException {
+ void testAdminGroups() throws OmException {
checkArea(AreaKeys.admin, TYPE_GROUP, GroupsPanel.class, adminUsername, groupAdminUsername);
}
@Test
- public void testAdminGroups1() throws OmException {
+ void testAdminGroups1() throws OmException {
checkUnauthArea(AreaKeys.admin, TYPE_GROUP, regularUsername);
}
@Test
- public void testAdminRooms() throws OmException {
+ void testAdminRooms() throws OmException {
checkArea(AreaKeys.admin, TYPE_ROOM, RoomsPanel.class, adminUsername, groupAdminUsername);
}
@Test
- public void testAdminRooms1() throws OmException {
+ void testAdminRooms1() throws OmException {
checkUnauthArea(AreaKeys.admin, TYPE_ROOM, regularUsername);
}
@Test
- public void testAdminConfigs() throws OmException {
+ void testAdminConfigs() throws OmException {
checkArea(AreaKeys.admin, TYPE_CONFIG, ConfigsPanel.class, adminUsername);
}
@Test
- public void testAdminConfigs1() throws OmException {
+ void testAdminConfigs1() throws OmException {
checkUnauthArea(AreaKeys.admin, TYPE_CONFIG, groupAdminUsername, regularUsername);
}
@Test
- public void testAdminLang() throws OmException {
+ void testAdminLang() throws OmException {
checkArea(AreaKeys.admin, TYPE_LANG, LangPanel.class, adminUsername);
}
@Test
- public void testAdminLang1() throws OmException {
+ void testAdminLang1() throws OmException {
checkUnauthArea(AreaKeys.admin, TYPE_LANG, groupAdminUsername, regularUsername);
}
@Test
- public void testAdminLdap() throws OmException {
+ void testAdminLdap() throws OmException {
checkArea(AreaKeys.admin, TYPE_LDAP, LdapsPanel.class, adminUsername);
}
@Test
- public void testAdminLdap1() throws OmException {
+ void testAdminLdap1() throws OmException {
checkUnauthArea(AreaKeys.admin, TYPE_LDAP, groupAdminUsername, regularUsername);
}
@Test
- public void testAdminOauth() throws OmException {
+ void testAdminOauth() throws OmException {
checkArea(AreaKeys.admin, TYPE_OAUTH2, OAuthPanel.class, adminUsername);
}
@Test
- public void testAdminOauth1() throws OmException {
+ void testAdminOauth1() throws OmException {
checkUnauthArea(AreaKeys.admin, TYPE_OAUTH2, groupAdminUsername, regularUsername);
}
@Test
- public void testAdminBackup() throws OmException {
+ void testAdminBackup() throws OmException {
checkArea(AreaKeys.admin, TYPE_BACKUP, BackupPanel.class, adminUsername);
}
@Test
- public void testAdminBackup1() throws OmException {
+ void testAdminBackup1() throws OmException {
checkUnauthArea(AreaKeys.admin, TYPE_BACKUP, groupAdminUsername, regularUsername);
}
@Test
- public void testAdminEmail() throws OmException {
+ void testAdminEmail() throws OmException {
checkArea(AreaKeys.admin, TYPE_EMAIL, EmailPanel.class, adminUsername);
}
@Test
- public void testAdminEmail1() throws OmException {
+ void testAdminEmail1() throws OmException {
checkUnauthArea(AreaKeys.admin, TYPE_EMAIL, groupAdminUsername, regularUsername);
}
@Test
- public void testAdminBad() throws OmException {
+ void testAdminBad() throws OmException {
checkArea(AreaKeys.admin, "BAD", OmDashboardPanel.class, adminUsername);
}
@@ -268,30 +268,30 @@ public class TestMainAreas extends AbstractWicketTester {
}
@Test
- public void testRoom5() throws OmException {
+ void testRoom5() throws OmException {
// public presentation room
testRoom(5L);
}
@Test
- public void testRoom1() throws OmException {
+ void testRoom1() throws OmException {
//public interview room
testRoom(1L);
}
@Test
- public void testRoomBad() throws OmException {
+ void testRoomBad() throws OmException {
checkArea(AreaKeys.room, "BAD", OmDashboardPanel.class, adminUsername);
}
@Test
- public void testInstallNotAccessible() {
+ void testInstallNotAccessible() {
tester.startPage(InstallWizardPage.class);
tester.assertRenderedPage(SignInPage.class);
}
@Test
- public void testUnavailNotAccessible() {
+ void testUnavailNotAccessible() {
tester.startPage(NotInitedPage.class);
tester.assertRenderedPage(SignInPage.class);
}
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 686c6b3..6c4d270 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
@@ -54,82 +54,82 @@ public class TestMainMenu extends AbstractWicketTester {
}
@Test
- public void testDahboard() throws OmException {
+ void testDahboard() throws OmException {
checkMenuItem(0, 0, OmDashboardPanel.class);
}
@Test
- public void testCalendar() throws OmException {
+ void testCalendar() throws OmException {
checkMenuItem(0, 1, CalendarPanel.class);
}
@Test
- public void testRoomPublic() throws OmException {
+ void testRoomPublic() throws OmException {
checkMenuItem(1, 0, RoomsSelectorPanel.class);
}
@Test
- public void testRoomGroup() throws OmException {
+ void testRoomGroup() throws OmException {
checkMenuItem(1, 1, RoomsSelectorPanel.class);
}
@Test
- public void testRoomMy() throws OmException {
+ void testRoomMy() throws OmException {
checkMenuItem(1, 2, RoomsSelectorPanel.class);
}
@Test
- public void testRecordings() throws OmException {
+ void testRecordings() throws OmException {
checkMenuItem(2, 0, RecordingsPanel.class);
}
@Test
- public void testAdminUsers() throws OmException {
+ void testAdminUsers() throws OmException {
checkMenuItem(4, 0, UsersPanel.class);
}
@Test
- public void testAdminConnections() throws OmException {
+ void testAdminConnections() throws OmException {
checkMenuItem(4, 1, ConnectionsPanel.class);
}
@Test
- public void testAdminGroups() throws OmException {
+ void testAdminGroups() throws OmException {
checkMenuItem(4, 2, GroupsPanel.class);
}
@Test
- public void testAdminRooms() throws OmException {
+ void testAdminRooms() throws OmException {
checkMenuItem(4, 3, RoomsPanel.class);
}
@Test
- public void testAdminConfigs() throws OmException {
+ void testAdminConfigs() throws OmException {
checkMenuItem(4, 4, ConfigsPanel.class);
}
@Test
- public void testAdminLabels() throws OmException {
+ void testAdminLabels() throws OmException {
checkMenuItem(4, 5, LangPanel.class);
}
@Test
- public void testAdminLaps() throws OmException {
+ void testAdminLaps() throws OmException {
checkMenuItem(4, 6, LdapsPanel.class);
}
@Test
- public void testAdminOauth() throws OmException {
+ void testAdminOauth() throws OmException {
checkMenuItem(4, 7, OAuthPanel.class);
}
@Test
- public void testAdminBackup() throws OmException {
+ void testAdminBackup() throws OmException {
checkMenuItem(4, 8, BackupPanel.class);
}
@Test
- public void testAdminEmail() throws OmException {
+ void testAdminEmail() throws OmException {
checkMenuItem(4, 9, EmailPanel.class);
}
}
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 cd2c524..1f61639 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
@@ -30,7 +30,7 @@ import org.junit.jupiter.api.Test;
public class TestOmAuthenticationStrategy extends AbstractWicketTester {
@Test
- public void test() {
+ void test() {
OmAuthenticationStrategy s = new OmAuthenticationStrategy();
s.save(null, null, User.Type.OAUTH, null);
assertNull(s.load(), "Wasn't saved, should not be loaded");
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 ceaa67a..ce74dde 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
@@ -62,7 +62,7 @@ public class TestUserManagerMocked {
private UserManager userManager;
@Test
- public void oauthTest() throws NoSuchAlgorithmException, IOException {
+ void oauthTest() throws NoSuchAlgorithmException, IOException {
setCryptClassName(SCryptImplementation.class.getCanonicalName());
doReturn(true).when(userDao).validLogin(anyString());
doReturn(true).when(userDao).checkEmail(anyString(), eq(Type.OAUTH), any(Long.class), nullable(Long.class));
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 94bb910..83ae666 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
@@ -29,7 +29,7 @@ import org.junit.jupiter.api.Test;
public class TestWebSession extends AbstractWicketTester {
@Test
- public void testLogin() throws OmException {
+ void testLogin() throws OmException {
WebSession ws = WebSession.get();
assertFalse(ws.isSignedIn(), "Should not be signed in");
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 f6a83f5..ea5038f 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
@@ -146,37 +146,37 @@ public class TestHashPage extends AbstractWicketTester {
}
@Test
- public void testNoParams() {
+ void testNoParams() {
log.debug("No params");
checkAccessDenied(null);
}
@Test
- public void testBadParam() {
+ void testBadParam() {
log.debug("bad params");
checkAccessDenied(new PageParameters().add("aaa", "bbb").add(HashPage.LANG, 777));
}
@Test
- public void testBadSecure() {
+ void testBadSecure() {
log.debug("bad secure");
checkAccessDenied(new PageParameters().add(HASH, "bbb").add(HashPage.LANG, 3));
}
@Test
- public void testBadInvitation() {
+ void testBadInvitation() {
log.debug("bad invitation");
checkAccessDenied(new PageParameters().add(INVITATION_HASH, "bbb").add(HashPage.LANG, 5));
}
@Test
- public void testValidOneTimeRoom() {
+ void testValidOneTimeRoom() {
Invitation i = get(1L, 2L, null, null, Valid.ONE_TIME, null, null, null);
checkMainPanel(new PageParameters().add(INVITATION_HASH, i.getHash()), RoomPanel.class);
}
@Test
- public void testValidOneTimeRecording() {
+ void testValidOneTimeRecording() {
// panel-recording
Recording rec = new Recording();
rec.setOwnerId(1L);
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 92487d1..f7f3a4b 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
@@ -63,7 +63,7 @@ public class TestLoginUI extends AbstractWicketTester {
}
@Test
- public void testValidLogin() {
+ void testValidLogin() {
tester.startPage(MainPage.class);
tester.assertRenderedPage(SignInPage.class);
@@ -71,7 +71,7 @@ public class TestLoginUI extends AbstractWicketTester {
}
@Test
- public void testEmptyLogin() {
+ void testEmptyLogin() {
tester.startPage(SignInPage.class);
tester.assertRenderedPage(SignInPage.class);
@@ -91,14 +91,14 @@ public class TestLoginUI extends AbstractWicketTester {
}
@Test
- public void testEmptyRegister() {
+ void testEmptyRegister() {
FormTester formTester = showRegister();
formTester.submit("submit");
assertTrue(countErrors(tester) > 7, "There should be at least 8 errors");
}
@Test
- public void testRegister() throws ReflectiveOperationException, SecurityException {
+ void testRegister() throws ReflectiveOperationException, SecurityException {
tester.startPage(SignInPage.class);
tester.assertRenderedPage(SignInPage.class);
@@ -120,14 +120,14 @@ public class TestLoginUI extends AbstractWicketTester {
}
@Test
- public void testEmptyForget() {
+ void testEmptyForget() {
FormTester formTester = showForget();
formTester.submit("submit");
checkErrors(2);
}
@Test
- public void testForget() throws SecurityException, ReflectiveOperationException {
+ void testForget() throws SecurityException, ReflectiveOperationException {
tester.startPage(SignInPage.class);
tester.assertRenderedPage(SignInPage.class);
@@ -135,7 +135,7 @@ public class TestLoginUI extends AbstractWicketTester {
}
@Test
- public void testReset() {
+ void testReset() {
tester.startPage(ResetPage.class, new PageParameters().add(ResetPage.RESET_PARAM, randomUUID().toString()));
tester.assertRenderedPage(SignInPage.class);
}
@@ -183,7 +183,7 @@ public class TestLoginUI extends AbstractWicketTester {
// complex test
@Test
- public void testCompleteRegister() throws ReflectiveOperationException, SecurityException {
+ void testCompleteRegister() throws ReflectiveOperationException, SecurityException {
// set activation properties
List<Configuration> cfgs = cfgDao.get(CONFIG_EMAIL_AT_REGISTER, CONFIG_EMAIL_VERIFICATION);
for (Configuration c : cfgs) {
diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/install/TestInstall.java b/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/install/TestInstall.java
index 7ac4f34..cab2612 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/install/TestInstall.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/install/TestInstall.java
@@ -121,7 +121,7 @@ public class TestInstall {
}
@Test
- public void testInstall() {
+ void testInstall() {
InstallWizardPage page = tester.startPage(InstallWizardPage.class);
tester.assertRenderedPage(InstallWizardPage.class);
InstallWizard wiz = (InstallWizard)page.get(WIZARD_PATH);
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 e50f5ff..b10a285 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
@@ -77,12 +77,12 @@ public class TestCalendarService extends AbstractWebServiceTest {
}
@Test
- public void testGetByAppRoom() throws Exception {
+ void testGetByAppRoom() throws Exception {
actualTest(null);
}
@Test
- public void testGetByPublicRoom() throws Exception {
+ void testGetByPublicRoom() throws Exception {
actualTest(getBean(RoomDao.class).get(5L)); //default public presentation room
}
@@ -145,12 +145,12 @@ public class TestCalendarService extends AbstractWebServiceTest {
}
@Test
- public void testCreate() throws Exception {
+ void testCreate() throws Exception {
createApp("test");
}
@Test
- public void testDelete() {
+ void testDelete() {
ServiceResult sr = login();
Response resp = getClient(getCalendarUrl())
.path("/" + Long.MAX_VALUE) //non-existent ID
@@ -161,7 +161,7 @@ public class TestCalendarService extends AbstractWebServiceTest {
}
@Test
- public void testCreateWithOmMm() throws Exception {
+ void testCreateWithOmMm() throws Exception {
JSONObject o = createAppointment("test")
.put("meetingMembers", new JSONArray()
.put(new JSONObject().put("user", new JSONObject()
@@ -219,7 +219,7 @@ public class TestCalendarService extends AbstractWebServiceTest {
}
@Test
- public void testCreateWithGuests() throws Exception {
+ void testCreateWithGuests() throws Exception {
String sid = loginNewUser();
AppointmentDTO dto = createEventWithGuests(sid);
@@ -243,7 +243,7 @@ public class TestCalendarService extends AbstractWebServiceTest {
}
@Test
- public void testCreateWithGuestsCleanOne() throws Exception {
+ void testCreateWithGuestsCleanOne() throws Exception {
String sid = loginNewUser();
AppointmentDTO dto = createEventWithGuests(sid);
List<MeetingMemberDTO> initialList = new ArrayList<>(dto.getMeetingMembers());
@@ -275,7 +275,7 @@ public class TestCalendarService extends AbstractWebServiceTest {
}
@Test
- public void testGetByTitle() throws Exception {
+ void testGetByTitle() throws Exception {
String title = "title" + randomUUID().toString();
String sid = createApp(title);
@SuppressWarnings("unchecked")
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 ca4ee51..a7a2acd 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
@@ -35,7 +35,7 @@ public class TestErrorService extends AbstractWebServiceTest {
public static final String ERROR_SERVICE_MOUNT = "error";
@Test
- public void getTestBadKey() {
+ void getTestBadKey() {
Locale[] locales = Locale.getAvailableLocales();
ServiceResult sr = getClient(getErrorUrl())
.path(String.format("/%s/%s", randomUUID().toString(), LabelDao.getLanguage(locales[rnd.nextInt(locales.length)], 1L)))
@@ -45,7 +45,7 @@ public class TestErrorService extends AbstractWebServiceTest {
}
@Test
- public void getTest() {
+ void getTest() {
Locale[] locales = Locale.getAvailableLocales();
ServiceResult sr = getClient(getErrorUrl())
.path(String.format("/%s/%s", "error.unknown", LabelDao.getLanguage(locales[rnd.nextInt(locales.length)], 1L)))
@@ -55,7 +55,7 @@ public class TestErrorService extends AbstractWebServiceTest {
}
@Test
- public void reportTest() {
+ void reportTest() {
// null report
Response resp = getClient(getErrorUrl())
.path("/report")
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 e106ada..008e2ca 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
@@ -61,7 +61,7 @@ public class TestFileService extends AbstractWebServiceTest {
}
@Test
- public void testGetRoom() {
+ void testGetRoom() {
ServiceResult r = login();
FileExplorerObject fo = getClient(getFileUrl())
.path("/room/5")
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 ea394ec..ef5b0a5 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
@@ -41,7 +41,7 @@ public class TestGroupService extends AbstractWebServiceTest {
public static final String GROUP_SERVICE_MOUNT = "group";
@Test
- public void list() {
+ void list() {
ServiceResult r = login();
Collection<? extends GroupDTO> groups = getClient(getGroupUrl())
.path("/")
@@ -51,7 +51,7 @@ public class TestGroupService extends AbstractWebServiceTest {
}
@Test
- public void putTest() {
+ void putTest() {
ServiceResult r = login();
Response resp = getClient(getGroupUrl())
.path("/")
@@ -71,7 +71,7 @@ public class TestGroupService extends AbstractWebServiceTest {
}
@Test
- public void addRemoveTest() {
+ void addRemoveTest() {
ServiceResult r = login(adminUsername, userpass);
Long groupId = createGroup(r.getMessage(), "Test Group");
//delete group created
@@ -87,7 +87,7 @@ public class TestGroupService extends AbstractWebServiceTest {
}
@Test
- public void addRoomErrTest() {
+ void addRoomErrTest() {
ServiceResult sr = login();
RoomDTO rdto = new RoomDTO();
rdto.setName("Group WS Room");
@@ -95,7 +95,7 @@ public class TestGroupService extends AbstractWebServiceTest {
}
@Test
- public void addRoomTest() {
+ void addRoomTest() {
//create new group
ServiceResult sr = login();
Long groupId = createGroup(sr.getMessage(), "Group WS");
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 c80d2bc..c9d24e4 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
@@ -27,7 +27,7 @@ public class TestInfoService extends AbstractWebServiceTest {
private static final String INFO_SERVICE_MOUNT = "info";
@Test
- public void infoTest() {
+ void infoTest() {
Info info = getClient(getInfoUrl()).path("/version").get(Info.class);
assertNotNull(info, "Valid info should be returned");
assertNotNull(info.getBuildDate(), "Valid BuildDate should be returned");
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 74fffc1..01d6f53 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
@@ -47,7 +47,7 @@ public class TestRecordingService extends AbstractWebServiceTest {
}
@Test
- public void testExternal() throws Exception {
+ void testExternal() throws Exception {
User u = getExternalUser();
Recording r = new Recording();
r.setInsertedBy(u.getId());
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 760a366..d412b27 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
@@ -44,7 +44,7 @@ public class TestRoomService extends AbstractWebServiceTest {
private static final long CAPACITY = 666L;
@Test
- public void testExternal() {
+ void testExternal() {
ServiceResult sr = login();
String extId = randomUUID().toString();
Room.Type type = Room.Type.PRESENTATION;
@@ -70,7 +70,7 @@ public class TestRoomService extends AbstractWebServiceTest {
}
@Test
- public void testCreate1() {
+ void testCreate1() {
String extId = randomUUID().toString();
Room.Type type = Room.Type.PRESENTATION;
String name = "Unit Test Ext Room1";
@@ -87,7 +87,7 @@ public class TestRoomService extends AbstractWebServiceTest {
}
@Test
- public void testCreate2() {
+ void testCreate2() {
Room.Type type = Room.Type.PRESENTATION;
String name = "Unit Test Ext Room2";
String comment = "Unit Test Ext Room Comments2";
@@ -101,7 +101,7 @@ public class TestRoomService extends AbstractWebServiceTest {
}
@Test
- public void testCreateWithFiles1() {
+ void testCreateWithFiles1() {
Room.Type type = Room.Type.PRESENTATION;
String name = "Unit Test Ext Room3";
String comment = "Unit Test Ext Room Comments3";
@@ -119,7 +119,7 @@ public class TestRoomService extends AbstractWebServiceTest {
}
@Test
- public void testCreateWithFiles2() throws IOException {
+ void testCreateWithFiles2() throws IOException {
//lets create real file
CallResult<FileItemDTO> fileCall = createVerifiedFile(getDefaultProfilePicture(), "img.png", BaseFileItem.Type.IMAGE);
@@ -141,7 +141,7 @@ public class TestRoomService extends AbstractWebServiceTest {
}
@Test
- public void testHash() {
+ void testHash() {
List<Room> rooms = getBean(RoomDao.class).get(0, 100);
assertFalse(rooms.isEmpty(), "Room list should not be empty");
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 f89024a..435dafb 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
@@ -55,14 +55,14 @@ public class TestUserService extends AbstractWebServiceTest {
private static final String DUMMY_PICTURE_URL = "https://openmeetings.apache.org/images/logo.png";
@Test
- public void invalidLoginTest() {
+ void invalidLoginTest() {
ServiceResult r = loginNoCheck("invalid-user", "bad pass");
assertNotNull(r, "Valid ServiceResult should be returned");
assertEquals(Type.ERROR.name(), r.getType(), "Login should NOT be successful");
}
@Test
- public void loginTest() {
+ void loginTest() {
ServiceResult r = login();
assertNotNull(r, "Valid ServiceResult should be returned");
}
@@ -96,7 +96,7 @@ public class TestUserService extends AbstractWebServiceTest {
}
@Test
- public void hashTestNoAuth() {
+ void hashTestNoAuth() {
getHash("aa", true);
}
@@ -117,7 +117,7 @@ public class TestUserService extends AbstractWebServiceTest {
}
@Test
- public void hashTest() throws OmException {
+ void hashTest() throws OmException {
ensureApplication(-1L); // to ensure WebSession is attached
WebSession ws = WebSession.get();
assertTrue(ws.signIn(adminUsername, userpass, User.Type.USER, null));
@@ -128,7 +128,7 @@ public class TestUserService extends AbstractWebServiceTest {
}
@Test
- public void addUserTest() {
+ void addUserTest() {
String[] tzList = TimeZone.getAvailableIDs();
String tz = TimeZone.getTimeZone(tzList[rnd.nextInt(tzList.length)]).getID();
ServiceResult r = login();
@@ -157,7 +157,7 @@ public class TestUserService extends AbstractWebServiceTest {
}
@Test
- public void list() {
+ void list() {
ServiceResult r = login();
Collection<? extends UserDTO> users = getClient(getUserUrl())
.path("/")
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 42ffd33..8551bc2 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
@@ -62,7 +62,7 @@ public class TestWbService extends AbstractWebServiceTest {
}
@Test
- public void testReset() {
+ void testReset() {
doTest((room, sid) -> {
ServiceResult res = getClient(getWbUrl())
.path("/resetwb/" + room.getId())
@@ -73,7 +73,7 @@ public class TestWbService extends AbstractWebServiceTest {
}
@Test
- public void testCleanAll() {
+ void testCleanAll() {
doTest((room, sid) -> {
ServiceResult res = getClient(getWbUrl())
.path("/cleanwb/" + room.getId() + "/" + 0)
@@ -84,7 +84,7 @@ public class TestWbService extends AbstractWebServiceTest {
}
@Test
- public void testCleanSlide() {
+ void testCleanSlide() {
doTest((room, sid) -> {
ServiceResult res = getClient(getWbUrl())
.path("/cleanslide/" + room.getId() + "/" + 0 + "/" + 0)
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 acc77b2..ba907ca 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
@@ -35,7 +35,7 @@ import com.github.openjson.JSONObject;
public class TestWebConverters {
@Test
- public void testDateConverter() {
+ void testDateConverter() {
assertEquals(null, DateParamConverter.get(null), "Null date should be parsed");
assertEquals(
Date.from(LocalDate.of(2017, 01, 15).atStartOfDay(ZoneId.systemDefault()).toInstant())
@@ -48,7 +48,7 @@ public class TestWebConverters {
}
@Test
- public void testCalendarConverter() {
+ void testCalendarConverter() {
CalendarParamConverter c = new CalendarParamConverter();
assertEquals(null, c.fromString(null), "Null calendar should be parsed");
Calendar cal = Calendar.getInstance();
@@ -57,7 +57,7 @@ public class TestWebConverters {
}
@Test
- public void testUserConverter() {
+ void testUserConverter() {
assertEquals(null, UserDTO.get((JSONObject)null), "Null UserDTO should be parsed");
}
}
diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java
index 1f21354..ab858d5 100644
--- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java
+++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java
@@ -195,7 +195,7 @@ public class GroupWebService extends BaseWebService {
Room r = roomDao.get(roomid);
if (r != null) {
if (r.getGroups() == null) {
- r.setGroups(new ArrayList<RoomGroup>());
+ r.setGroups(new ArrayList<>());
}
boolean found = false;
for (RoomGroup ro : r.getGroups()) {
@@ -245,7 +245,7 @@ public class GroupWebService extends BaseWebService {
SearchResult<User> result = new SearchResult<>();
result.setObjectName(User.class.getName());
result.setRecords(groupUserDao.count(id));
- result.setResult(new ArrayList<User>());
+ result.setResult(new ArrayList<>());
String order = isAlphanumeric(orderby) ? orderby : "id";
for (GroupUser ou : groupUserDao.get(id, null, start, max, order + " " + (asc ? "ASC" : "DESC"))) {
result.getResult().add(ou.getUser());
diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/NetTestWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/NetTestWebService.java
index 67da389..5c61c7c 100644
--- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/NetTestWebService.java
+++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/NetTestWebService.java
@@ -56,10 +56,10 @@ public class NetTestWebService {
@GET
@Produces(MediaType.APPLICATION_OCTET_STREAM)
@Path("/")
- public Response get(@QueryParam("type") String type, @QueryParam("size") int _size) {
+ public Response get(@QueryParam("type") String type, @QueryParam("size") int inSize) {
final int size;
TestType testType = getTypeByString(type);
- log.debug("Network test:: get, {}, {}", testType, _size);
+ log.debug("Network test:: get, {}, {}", testType, inSize);
// choose data to send
switch (testType) {
@@ -70,7 +70,7 @@ public class NetTestWebService {
size = JITTER_PACKET_SIZE;
break;
default:
- size = _size;
+ size = inSize;
break;
}
ResponseBuilder response = Response.ok().type(MediaType.APPLICATION_OCTET_STREAM).entity(new InputStream() {
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 df15e32..cbefb8a 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
@@ -43,7 +43,7 @@ public class TestBaseService {
}
@Test
- public void testCheck() {
+ void testCheck() {
Sessiondata sd = new BaseWebService() {}.check(null);
assertNotNull(sd, "NOT null Sessiondata should be returned");
assertNull(sd.getUserId(), "UserId should be null");
@@ -55,17 +55,17 @@ public class TestBaseService {
}
@Test
- public void testGetRights1() {
+ void testGetRights1() {
checkRights(new BaseWebService() {}.getRights(1L));
}
@Test
- public void testGetRights2() {
+ void testGetRights2() {
checkRights(new BaseWebService() {}.getRights(""));
}
@Test
- public void testPerformCall() {
+ void testPerformCall() {
checkException(() -> new BaseWebService() {}.performCall("", sd -> true
, sd -> { throw new RuntimeException("test"); }));
}