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 5acd933e6 [OPENMEETINGS-2783] sonar should be more happy
5acd933e6 is described below
commit 5acd933e6064b93d3c1fb89df2fa3e3b204af2b4
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Sat Jul 6 10:38:26 2024 +0700
[OPENMEETINGS-2783] sonar should be more happy
---
.../src/main/java/org/apache/openmeetings/web/room/RoomPanel.html | 8 ++++----
.../main/java/org/apache/openmeetings/web/room/VideoSettings.html | 4 ++--
.../main/java/org/apache/openmeetings/web/room/wb/WbPanel.html | 4 ++--
.../test/java/org/apache/openmeetings/web/db/dao/TestFileDao.java | 3 ++-
.../test/java/org/apache/openmeetings/web/pages/TestHashPage.java | 3 +--
.../java/org/apache/openmeetings/webservice/TestFileService.java | 3 ++-
6 files changed, 13 insertions(+), 12 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
index 4dd3b55d1..2bcefb29e 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.html
@@ -37,8 +37,8 @@
<div wicket:id="nickname" class="room-nickname-dialog"></div>
<div wicket:id="client-kicked"></div>
<div wicket:id="wait-moderator" class="wait-moder"></div>
- <div id="room-local-settings" class="modal fade" tabindex="-1"
role="dialog" data-bs-backdrop="static" aria-hidden="true">
- <div class="modal-dialog modal-sm" role="document">
+ <div id="room-local-settings" class="modal fade" tabindex="-1"
data-bs-backdrop="static" aria-hidden="true">
+ <div class="modal-dialog modal-sm">
<div class="modal-content">
<div class="modal-header">
<h5
class="modal-title"><wicket:message key="edit.settings"/></h5>
@@ -76,8 +76,8 @@
</div>
</div>
</div>
- <div id="disconnected-dlg" class="modal fade" tabindex="-1"
role="dialog" data-bs-backdrop="static" aria-hidden="true">
- <div class="modal-dialog modal-sm" role="document">
+ <div id="disconnected-dlg" class="modal fade" tabindex="-1"
data-bs-backdrop="static" aria-hidden="true">
+ <div class="modal-dialog modal-sm">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title"><wicket:message
key="204"/></h5>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.html
index 4b68f1c08..2ca4da265 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.html
@@ -20,8 +20,8 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-9.xsd";>
<wicket:panel>
- <div class="modal fade video" id="video-settings"
data-bs-backdrop="false" tabindex="-1" role="dialog"
aria-labelledby="video-settings-title" aria-hidden="true">
- <div class="modal-dialog" role="document">
+ <div class="modal fade video" id="video-settings"
data-bs-backdrop="false" tabindex="-1" aria-labelledby="video-settings-title"
aria-hidden="true">
+ <div class="modal-dialog">
<div class="modal-content">
<div class="modal-header p-0 px-2">
<h5 class="modal-title"
id="video-settings-title"><wicket:message key="51"/></h5>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html
index b3f7c0b96..066cd067d 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html
@@ -202,8 +202,8 @@
<div class="status"></div>
</div>
</div>
- <div id="wb-settings" class="wb-settings modal fade" tabindex="-1"
role="dialog" data-bs-backdrop="false" aria-hidden="true">
- <div class="modal-dialog modal-sm" role="document">
+ <div id="wb-settings" class="wb-settings modal fade" tabindex="-1"
data-bs-backdrop="false" aria-hidden="true">
+ <div class="modal-dialog modal-sm">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title"><wicket:message
key="4"/></h5>
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/db/dao/TestFileDao.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/db/dao/TestFileDao.java
index 2edb021fb..c497381cf 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/db/dao/TestFileDao.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/db/dao/TestFileDao.java
@@ -55,7 +55,8 @@ class TestFileDao extends AbstractOmServerTest {
f.setName("Arab external test");
f.setType(BaseFileItem.Type.IMAGE);
f.setInsertedBy(u.getId());
- f = fileDao.update(f);
+ fileDao.update(f);
+
List<FileItem> list1 =
fileDao.getExternal(UNIT_TEST_ARAB_EXT_TYPE);
assertNotNull(list1);
assertFalse(list1.isEmpty());
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 8cf579901..aee20a762 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
@@ -123,8 +123,7 @@ class TestHashPage extends AbstractWicketTesterTest {
i.setValidFrom(new Date(from.getTime() - (5 *
60 * 1000)));
i.setValidTo(to);
break;
- case ENDLESS:
- case ONE_TIME:
+ case ENDLESS, ONE_TIME:
default:
break;
}
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 3b827d0da..d926eacf5 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
@@ -98,7 +98,8 @@ class TestFileService extends AbstractWebServiceTest {
f.setName("Arab external test");
f.setType(BaseFileItem.Type.IMAGE);
f.setInsertedBy(u.getId());
- f = getBean(FileItemDao.class).update(f);
+ getBean(FileItemDao.class).update(f);
+
ServiceResult r = login();
Collection<? extends FileItemDTO> list = getClient(getFileUrl())
.path("/" +
UrlEncoder.PATH_INSTANCE.encode(UNIT_TEST_ARAB_EXT_TYPE, UTF_8))
