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 5a81c2964 [OPENMEETINGS-2783] some issues are addressed
5a81c2964 is described below
commit 5a81c2964f3bfaa64593a202f68c62dcb579a247
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Fri Mar 1 16:04:09 2024 +0700
[OPENMEETINGS-2783] some issues are addressed
---
.../apache/openmeetings/core/converter/ImageConverter.java | 10 +++++++---
.../org/apache/openmeetings/db/dao/label/LabelDao.java | 5 +++--
.../java/org/apache/openmeetings/db/dao/user/UserDao.java | 14 +++++++-------
.../apache/openmeetings/mediaserver/KurentoHandler.java | 3 +--
.../service/mail/template/InvitationTemplate.html | 6 +-----
.../service/mail/template/RegisterUserTemplate.html | 4 +---
.../service/mail/template/ResetPasswordTemplate.html | 6 +-----
.../mail/template/subject/InvitedAppointmentTemplate.java | 2 +-
.../apache/openmeetings/web/pages/auth/SignInDialog.java | 4 +++-
.../openmeetings/web/pages/install/InstallWizard.java | 2 +-
.../org/apache/openmeetings/web/db/dao/TestMessageDao.java | 2 +-
11 files changed, 27 insertions(+), 31 deletions(-)
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/ImageConverter.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/ImageConverter.java
index ce92aad1d..02f374d7e 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/ImageConverter.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/ImageConverter.java
@@ -33,7 +33,9 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.nio.file.DirectoryStream;
import java.nio.file.Files;
+import java.nio.file.Path;
import java.util.List;
import java.util.Optional;
import java.util.function.DoubleConsumer;
@@ -93,10 +95,12 @@ public class ImageConverter extends BaseConverter {
ProcessResultList returnMap = new ProcessResultList();
// User Profile Update
- Files.newDirectoryStream(
+ try (DirectoryStream<Path> dirStream = Files.newDirectoryStream(
getUploadProfilesUserDir(userId).toPath()
- , fi -> fi.toString().endsWith(EXTENSION_PNG))
- .forEach(path ->
FileUtils.deleteQuietly(path.toFile()));
+ , fi -> fi.toString().endsWith(EXTENSION_PNG)))
+ {
+ dirStream.forEach(path ->
FileUtils.deleteQuietly(path.toFile()));
+ }
File destinationFile =
OmFileHelper.getNewFile(getUploadProfilesUserDir(userId), PROFILE_FILE_NAME,
EXTENSION_PNG);
returnMap.add(resize(file, destinationFile, 250, 250, true));
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 aabe63062..3b211292f 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
@@ -193,8 +193,9 @@ public class LabelDao implements
IDataProviderDao<StringLabel>{
}
List<StringLabel> result = new
ArrayList<>(labelCache.containsKey(l) ? labelCache.get(l) : new
ArrayList<StringLabel>());
if (!Strings.isEmpty(search)) {
- result = result.stream().filter(o -> o != null &&
(o.getKey().contains(search) || o.getValue().contains(search)))
- .collect(Collectors.toList());
+ result = result.stream()
+ .filter(o -> o != null &&
(o.getKey().contains(search) || o.getValue().contains(search)))
+ .toList();
}
return result;
}
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
index 64212363e..8341562a4 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java
@@ -434,8 +434,8 @@ public class UserDao implements
IGroupAdminDataProviderDao<User> {
return !Strings.isEmpty(login) && login.length() >=
getMinLoginLength();
}
- public User getByLogin(String _login, Type type, Long domainId) {
- String login = _login == null ? null :
_login.trim().toLowerCase(Locale.ROOT);
+ public User getByLogin(String inLogin, Type type, Long domainId) {
+ String login = inLogin == null ? null :
inLogin.trim().toLowerCase(Locale.ROOT);
return single(fillLazy(em
, oem -> oem.createNamedQuery("getUserByLogin",
User.class)
.setParameter("login", login)
@@ -448,8 +448,8 @@ public class UserDao implements
IGroupAdminDataProviderDao<User> {
return getByEmail(email, User.Type.USER, null);
}
- public User getByEmail(String _email, User.Type type, Long domainId) {
- String email = _email == null ? null :
_email.trim().toLowerCase(Locale.ROOT);
+ public User getByEmail(String inEmail, User.Type type, Long domainId) {
+ String email = inEmail == null ? null :
inEmail.trim().toLowerCase(Locale.ROOT);
return single(fillLazy(em
, oem -> oem.createNamedQuery("getUserByEmail",
User.class)
.setParameter(PARAM_EMAIL, email)
@@ -598,13 +598,13 @@ public class UserDao implements
IGroupAdminDataProviderDao<User> {
/**
* login logic
*
- * @param _userOrEmail - login or email of the user being tested
+ * @param inUserOrEmail - login or email of the user being tested
* @param userpass - password of the user being tested
* @return User object in case of successful login
* @throws OmException in case of any issue
*/
- public User login(String _userOrEmail, String userpass) throws
OmException {
- String userOrEmail = _userOrEmail == null ? null :
_userOrEmail.trim().toLowerCase(Locale.ROOT);
+ public User login(String inUserOrEmail, String userpass) throws
OmException {
+ String userOrEmail = inUserOrEmail == null ? null :
inUserOrEmail.trim().toLowerCase(Locale.ROOT);
List<User> users = em.createNamedQuery("getUserByLoginOrEmail",
User.class)
.setParameter("userOrEmail", userOrEmail)
.setParameter("type", Type.USER)
diff --git
a/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/KurentoHandler.java
b/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/KurentoHandler.java
index d3989f7fe..6cbc29a75 100644
---
a/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/KurentoHandler.java
+++
b/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/KurentoHandler.java
@@ -317,8 +317,7 @@ public class KurentoHandler {
return rooms.computeIfAbsent(roomId, k -> {
log.debug("Room {} does not exist. Will create now!",
roomId);
Room r = roomDao.get(roomId);
- KRoom kRoom = new KRoom(r);
- return kRoom;
+ return new KRoom(r);
});
}
diff --git
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/InvitationTemplate.html
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/InvitationTemplate.html
index 6f1f93ea2..c5d69d489 100644
---
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/InvitationTemplate.html
+++
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/InvitationTemplate.html
@@ -21,11 +21,7 @@
<html xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-9.xsd";>
<wicket:extend>
- <h2>
- <strong>
- <span wicket:id="titleLbl"></span>
- </strong>
- </h2>
+ <h2 wicket:id="titleLbl"></h2>
<span wicket:id="userLbl"></span> <span wicket:id="user"></span><br />
<span wicket:id="messageLbl"></span> <span wicket:id="message"></span>
<br /><br />
diff --git
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.html
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.html
index 8707592a8..7fca3edb8 100644
---
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.html
+++
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.html
@@ -21,9 +21,7 @@
<html xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-9.xsd";>
<wicket:extend>
- <h2>
- <span wicket:id="registrationLbl"></span>
- </h2>
+ <h2 wicket:id="registrationLbl"></h2>
<strong>
<wicket:message key="507" />
</strong>
diff --git
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.html
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.html
index 92baebd97..8685e55d9 100644
---
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.html
+++
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/ResetPasswordTemplate.html
@@ -21,11 +21,7 @@
<html xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-9.xsd";>
<wicket:extend>
- <h2>
- <strong>
- <span wicket:id="reset-header"></span>
- </strong>
- </h2>
+ <h2 wicket:id="reset-header"></h2>
<p>
<wicket:message key="514" />
</p>
diff --git
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/InvitedAppointmentTemplate.java
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/InvitedAppointmentTemplate.java
index ac4823e81..358af85fe 100644
---
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/InvitedAppointmentTemplate.java
+++
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/InvitedAppointmentTemplate.java
@@ -28,7 +28,7 @@ public abstract class InvitedAppointmentTemplate extends
AppointmentTemplate {
private static final long serialVersionUID = 1L;
protected final String invitorName;
- public InvitedAppointmentTemplate(Locale locale, Appointment a,
TimeZone tz, String invitorName) {
+ protected InvitedAppointmentTemplate(Locale locale, Appointment a,
TimeZone tz, String invitorName) {
super(locale, a, tz);
this.invitorName = invitorName;
}
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 962bd8d2d..51b94b59e 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
@@ -26,6 +26,7 @@ import static
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_
import static org.apache.openmeetings.util.OpenmeetingsVariables.isOtpEnabled;
import java.util.List;
+import java.util.Random;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.dao.server.LdapConfigDao;
@@ -83,6 +84,7 @@ import jakarta.inject.Inject;
public class SignInDialog extends Modal<String> {
private static final long serialVersionUID = 1L;
private static final Logger log =
LoggerFactory.getLogger(SignInDialog.class);
+ private static final Random rnd = new Random();
private final PasswordTextField passField = new
PasswordTextField("pass", Model.of(""));
private final RequiredTextField<String> loginField = new
RequiredTextField<>("login", Model.of(""));
private boolean rememberMe = false;
@@ -319,7 +321,7 @@ public class SignInDialog extends Modal<String> {
public static void penalty() {
// add random timeout
try {
- Thread.sleep(6 + (long)(10 * Math.random() * 1000));
+ Thread.sleep(6 + rnd.nextLong(10 * 1000));
} catch (InterruptedException e) {
log.error("Unexpected exception while sleeping", e);
Thread.currentThread().interrupt();
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 c544135d6..1a931e1c7 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
@@ -278,7 +278,7 @@ public class InstallWizard extends BootstrapWizard {
private final Form<ConnectionProperties> form = new
Form<>("form", new CompoundPropertyModel<>(getProps(null))) {
private static final long serialVersionUID = 1L;
private final DropDownChoice<DbType> db = new
DropDownChoice<>("dbType", List.of(DbType.values())
- , new LambdaChoiceRenderer<>(db ->
getString("install.wizard.db.step." + db.dbName() + ".name"), DbType::name));
+ , new LambdaChoiceRenderer<>(dtb ->
getString("install.wizard.db.step." + dtb.dbName() + ".name"), DbType::name));
@Override
protected void onInitialize() {
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/db/dao/TestMessageDao.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/db/dao/TestMessageDao.java
index 35625acd0..73f908bbc 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/db/dao/TestMessageDao.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/db/dao/TestMessageDao.java
@@ -29,7 +29,7 @@ import org.apache.openmeetings.db.entity.user.User;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
-public class TestMessageDao extends AbstractOmServerTest {
+class TestMessageDao extends AbstractOmServerTest {
@Autowired
private PrivateMessageFolderDao msgFolderDao;
