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 9d08f3880 [OPENMEETINGS-2823] some sonar issues are addressed
new 30bb0dc0a Merge branch 'master' of github.com:apache/openmeetings
9d08f3880 is described below
commit 9d08f3880cb27218addead244bcf4dc5dfb3819b
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Wed Jul 8 12:36:58 2026 +0700
[OPENMEETINGS-2823] some sonar issues are addressed
---
.../org/apache/openmeetings/core/util/ChatWebSocketHelper.java | 10 ++++------
.../apache/openmeetings/core/util/StrongPasswordValidator.java | 7 +++++--
.../apache/openmeetings/db/entity/user/AsteriskSipUser.java | 7 ++-----
.../main/java/org/apache/openmeetings/backup/BackupImport.java | 2 +-
.../main/java/org/apache/openmeetings/cli/OmHelpFormatter.java | 2 +-
.../main/java/org/apache/openmeetings/mediaserver/KStream.java | 2 +-
.../web/common/datetime/AbstractOmDateTimePicker.java | 3 +--
.../apache/openmeetings/web/user/profile/EditProfileForm.java | 2 +-
.../calendar/TestDatabaseStructureAppointment.java | 7 ++++---
.../test/java/org/apache/openmeetings/web/TestCalendar.java | 5 +++--
.../java/org/apache/openmeetings/web/backup/TestExport.java | 3 ++-
.../test/java/org/apache/openmeetings/ws/TestFileService.java | 4 ++--
.../java/org/apache/openmeetings/ws/TestWebConverters.java | 5 +++--
13 files changed, 30 insertions(+), 29 deletions(-)
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/ChatWebSocketHelper.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/ChatWebSocketHelper.java
index bbe8dc445..00d411d43 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/ChatWebSocketHelper.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/ChatWebSocketHelper.java
@@ -91,12 +91,10 @@ public class ChatWebSocketHelper {
public static boolean send(IClusterWsMessage msg) {
if (msg instanceof WsMessageChat chatMsg) {
- if (msg instanceof WsMessageChat2User userMsg) {
- sendUser(userMsg.getUserId(),
userMsg.getChatMessage(), userMsg.getMsg(), false);
- } else if (msg instanceof WsMessageChat2All allMsg) {
- sendAll(allMsg.getChatMessage(),
allMsg.getMsg(), false);
- } else {
- sendRoom(chatMsg.getChatMessage(),
chatMsg.getMsg(), false);
+ switch (msg) {
+ case WsMessageChat2User userMsg ->
sendUser(userMsg.getUserId(), userMsg.getChatMessage(), userMsg.getMsg(),
false);
+ case WsMessageChat2All allMsg ->
sendAll(allMsg.getChatMessage(), allMsg.getMsg(), false);
+ default -> sendRoom(chatMsg.getChatMessage(),
chatMsg.getMsg(), false);
}
return true;
}
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/StrongPasswordValidator.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/StrongPasswordValidator.java
index 292c19800..0a67495e7 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/StrongPasswordValidator.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/StrongPasswordValidator.java
@@ -25,6 +25,7 @@ import static
org.apache.openmeetings.util.OpenmeetingsVariables.isPwdCheckUpper
import java.util.Locale;
import java.util.Map;
+import java.util.regex.Pattern;
import org.apache.openmeetings.db.dao.label.LabelDao;
import org.apache.openmeetings.db.entity.user.User;
@@ -38,6 +39,8 @@ import org.slf4j.LoggerFactory;
public class StrongPasswordValidator implements IValidator<String> {
private static final long serialVersionUID = 1L;
private static final Logger log =
LoggerFactory.getLogger(StrongPasswordValidator.class);
+ private static Pattern DIGITS_PATTERN = Pattern.compile(".*\\d+.*");
+ private static Pattern SPECIAL_PATTERN =
Pattern.compile(".*[!@#$%^&*\\]\\[]+.*");
private final boolean web;
private User u;
@@ -51,11 +54,11 @@ public class StrongPasswordValidator implements
IValidator<String> {
}
private static boolean noDigit(String password) {
- return password == null || (isPwdCheckDigit() &&
!password.matches(".*\\d+.*"));
+ return password == null || (isPwdCheckDigit() &&
!DIGITS_PATTERN.matcher(password).matches());
}
private static boolean noSymbol(String password) {
- return password == null || (isPwdCheckSpecial() &&
!password.matches(".*[!@#$%^&*\\]\\[]+.*"));
+ return password == null || (isPwdCheckSpecial() &&
!SPECIAL_PATTERN.matcher(password).matches());
}
private static boolean noUpperCase(String password) {
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/AsteriskSipUser.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/AsteriskSipUser.java
index cfac3d2e7..a98abe120 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/AsteriskSipUser.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/AsteriskSipUser.java
@@ -33,7 +33,6 @@ import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.PrimaryKeyJoinColumn;
import jakarta.persistence.SecondaryTable;
-import jakarta.persistence.SecondaryTables;
import jakarta.persistence.Table;
import jakarta.xml.bind.annotation.XmlAccessType;
import jakarta.xml.bind.annotation.XmlAccessorType;
@@ -43,10 +42,8 @@ import jakarta.xml.bind.annotation.XmlTransient;
@Entity
@Table(name = "om_sipuser_auth")
-@SecondaryTables({
- @SecondaryTable(name = "om_sipuser_aor", pkJoinColumns =
@PrimaryKeyJoinColumn(name = "id")),
- @SecondaryTable(name = "om_sipuser_endpoint", pkJoinColumns =
@PrimaryKeyJoinColumn(name = "id"))
-})
+@SecondaryTable(name = "om_sipuser_aor", pkJoinColumns =
@PrimaryKeyJoinColumn(name = "id"))
+@SecondaryTable(name = "om_sipuser_endpoint", pkJoinColumns =
@PrimaryKeyJoinColumn(name = "id"))
@XmlRootElement(name = "asterisksipuser")
@XmlAccessorType(XmlAccessType.FIELD)
public class AsteriskSipUser implements Serializable {
diff --git
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
index 8786b1445..9a0355cf3 100644
---
a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
+++
b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java
@@ -680,7 +680,7 @@ public class BackupImport {
//add existent emails from database
final Set<String> userEmails = new HashSet<>();
final Set<UserKey> userLogins = new HashSet<>();
- userDao.getAllUsers().stream().forEach(u -> {
+ userDao.getAllUsers().forEach(u -> {
if (u.getAddress() != null &&
!Strings.isEmpty(u.getAddress().getEmail())) {
userEmails.add(u.getAddress().getEmail());
}
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 39cb6f2be..97cd1cc61 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
@@ -34,7 +34,7 @@ import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.string.Strings;
public class OmHelpFormatter extends HelpFormatter {
- final static String DELIMITER = "---------";
+ static final String DELIMITER = "---------";
private final OmTextHelpAppendable omAppendable;
private final String shift;
diff --git
a/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/KStream.java
b/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/KStream.java
index d13aaa6ec..1aec7c48d 100644
---
a/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/KStream.java
+++
b/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/KStream.java
@@ -332,7 +332,7 @@ public class KStream extends AbstractStream implements
ISipCallbacks {
// sender candidates
if (recv && !candidatesQueue.isEmpty()) {
log.trace("addIceCandidate iceCandidate reply
from not ready, uid: {}", uid);
-
candidatesQueue.stream().forEach(endpoint::addIceCandidate);
+
candidatesQueue.forEach(endpoint::addIceCandidate);
candidatesQueue.clear();
}
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/datetime/AbstractOmDateTimePicker.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/datetime/AbstractOmDateTimePicker.java
index 3bbdd8775..a0a5a15a6 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/datetime/AbstractOmDateTimePicker.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/datetime/AbstractOmDateTimePicker.java
@@ -42,7 +42,6 @@ public abstract class AbstractOmDateTimePicker<T extends
Serializable> extends F
private static final long serialVersionUID = 1L;
private static final ResourceReference FUNCJS = new
JavaScriptResourceReference(AbstractOmDateTimePicker.class,
"datepicker-functions.js");
private final HiddenField<T> date;
- private AbstractTempusDominusWithIcon<T> picker;
private String markupId;
AbstractOmDateTimePicker(String id, IModel<T> model) {
@@ -67,7 +66,7 @@ public abstract class AbstractOmDateTimePicker<T extends
Serializable> extends F
.withTodayIcon(FontAwesome7IconType.calendar_check_s)
.withClearIcon(FontAwesome7IconType.eraser_s)
.withCloseIcon(FontAwesome7IconType.xmark_s));
- picker = new AbstractTempusDominusWithIcon<>("picker", new
Model<>(), patch(config)) {
+ AbstractTempusDominusWithIcon<T> picker = new
AbstractTempusDominusWithIcon<>("picker", new Model<>(), patch(config)) {
private static final long serialVersionUID = 1L;
@Override
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 5bc142a46..3a67cebdd 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
@@ -188,7 +188,7 @@ public class EditProfileForm extends Form<User> {
if (enabled) {
toggleOtp.add(newOkCancelDangerConfirm(this,
getString("otp.disable.confirm")));
} else {
-
toggleOtp.getBehaviors(ConfirmationBehavior.class).stream().forEach(b ->
toggleOtp.remove(b));
+
toggleOtp.getBehaviors(ConfirmationBehavior.class).forEach(b ->
toggleOtp.remove(b));
}
toggleOtp.setLabel(new ResourceModel(enabled ? "otp.disable" :
"otp.enable"));
toggleOtp.setIconType(enabled ?
FontAwesome7IconType.square_check_r : FontAwesome7IconType.square_r);
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 e7939962b..76d9b7231 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
@@ -22,6 +22,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import java.time.LocalDate;
import java.time.LocalDateTime;
+import java.time.Month;
import java.util.Date;
import java.util.List;
import java.util.TimeZone;
@@ -37,7 +38,7 @@ class TestDatabaseStructureAppointment extends
AbstractOmServerTest {
}
private static Date getDate(int hour, int minute) {
- return CalendarHelper.getDate(LocalDateTime.of(2008, 8, 17,
hour, minute), getTzId());
+ return CalendarHelper.getDate(LocalDateTime.of(2008,
Month.AUGUST, 17, hour, minute), getTzId());
}
private void createAppointment(int startHour, int startMinute, int
endHour, int endMinute) {
@@ -47,8 +48,8 @@ class TestDatabaseStructureAppointment extends
AbstractOmServerTest {
@Test
void testAddingGroup() throws Exception {
- Date date = CalendarHelper.getDate(LocalDate.of(2008, 8, 17),
getTzId());
- Date date2 = CalendarHelper.getDate(LocalDate.of(2008, 8, 18),
getTzId());
+ Date date = CalendarHelper.getDate(LocalDate.of(2008,
Month.AUGUST, 17), getTzId());
+ Date date2 = CalendarHelper.getDate(LocalDate.of(2008,
Month.AUGUST, 18), getTzId());
createAppointment(12, 28, 23, 15);
createAppointment(1, 1, 3, 52);
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 0c6ee2a38..1013cdb6c 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
@@ -25,6 +25,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.time.LocalDateTime;
+import java.time.Month;
import java.util.List;
import org.apache.openmeetings.db.entity.calendar.Appointment;
@@ -57,8 +58,8 @@ class TestCalendar extends AbstractWicketTesterTest {
User u = userDao.getByLogin(REGULAR_USERNAME,
User.Type.USER, null);
//test create month
tester.getRequest().setParameter("allDay",
String.valueOf(false));
- tester.getRequest().setParameter("startDate",
LocalDateTime.of(2017, 11, 13, 13,
13).atOffset(UTC).format(ISO_OFFSET_DATE_TIME));
- tester.getRequest().setParameter("endDate",
LocalDateTime.of(2017, 11, 13, 13,
13).atOffset(UTC).format(ISO_OFFSET_DATE_TIME));
+ tester.getRequest().setParameter("startDate",
LocalDateTime.of(2017, Month.NOVEMBER, 13, 13,
13).atOffset(UTC).format(ISO_OFFSET_DATE_TIME));
+ tester.getRequest().setParameter("endDate",
LocalDateTime.of(2017, Month.NOVEMBER, 13, 13,
13).atOffset(UTC).format(ISO_OFFSET_DATE_TIME));
tester.getRequest().setParameter("viewName",
CalendarView.dayGridMonth.name());
tester.executeBehavior((AbstractAjaxBehavior)cal.get("form:calendar").getBehaviorById(0));
//select-event
FormTester appTester =
tester.newFormTester(PATH_APPOINTMENT_DLG_FRM);
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/backup/TestExport.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/backup/TestExport.java
index b5a80a356..3bd71f960 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/backup/TestExport.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/backup/TestExport.java
@@ -29,6 +29,7 @@ import java.io.StringWriter;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.time.LocalDate;
+import java.time.Month;
import jakarta.inject.Inject;
import jakarta.xml.bind.JAXBContext;
@@ -58,7 +59,7 @@ class TestExport extends AbstractOmServerTest {
@Test
void exportUser() throws Exception {
User u = createUser();
- u.setAge(LocalDate.of(1977, 11, 13));
+ u.setAge(LocalDate.of(1977, Month.NOVEMBER, 13));
Group g = groupDao.get(1L);
u.addGroup(g);
Class<User> eClazz = User.class;
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/ws/TestFileService.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/ws/TestFileService.java
index ce383b640..3883144ab 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/ws/TestFileService.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/ws/TestFileService.java
@@ -196,7 +196,7 @@ class TestFileService extends AbstractWebServiceTest {
accessRoomByParentGranted(groupFolder.getId(), 5, u.getLogin(),
createPass());
FileItem roomFolder = prepareGetParent(admin, "Room5", fi ->
fi.setRoomId(5L));
- accessRoomByParentDenied(groupFolder.getId(), 4,
ADMIN_USERNAME, USER_PASS);
- accessRoomByParentGranted(groupFolder.getId(), 5, u.getLogin(),
createPass());
+ accessRoomByParentDenied(roomFolder.getId(), 4, ADMIN_USERNAME,
USER_PASS);
+ accessRoomByParentGranted(roomFolder.getId(), 5, u.getLogin(),
createPass());
}
}
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/ws/TestWebConverters.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/ws/TestWebConverters.java
index 19cbe7964..ed3f4765a 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/ws/TestWebConverters.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/ws/TestWebConverters.java
@@ -21,6 +21,7 @@ package org.apache.openmeetings.ws;
import static org.junit.jupiter.api.Assertions.assertEquals;
import java.time.LocalDate;
+import java.time.Month;
import java.time.ZoneId;
import java.time.ZonedDateTime;
import java.util.Calendar;
@@ -38,7 +39,7 @@ class TestWebConverters {
void testDateConverter() {
assertEquals(null, DateParamConverter.get(null), "Null date
should be parsed");
assertEquals(
- Date.from(LocalDate.of(2017, 01,
15).atStartOfDay(ZoneId.systemDefault()).toInstant())
+ Date.from(LocalDate.of(2017, Month.JANUARY,
15).atStartOfDay(ZoneId.systemDefault()).toInstant())
, DateParamConverter.get("2017-01-15")
, "Date should be parsed");
assertEquals(
@@ -52,7 +53,7 @@ class TestWebConverters {
CalendarParamConverter c = new CalendarParamConverter();
assertEquals(null, c.fromString(null), "Null calendar should be
parsed");
Calendar cal = Calendar.getInstance();
- cal.setTime(Date.from(LocalDate.of(2017, 01,
15).atStartOfDay(ZoneId.systemDefault()).toInstant()));
+ cal.setTime(Date.from(LocalDate.of(2017, Month.JANUARY,
15).atStartOfDay(ZoneId.systemDefault()).toInstant()));
assertEquals(cal, c.fromString("2017-01-15"), "Calendar should
be parsed");
}
