[jira] [Commented] (OPENMEETINGS-2783) (8.0.0) Sonar issues need to be addressed
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2783?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17822470#comment-17822470 ] ASF subversion and git services commented on OPENMEETINGS-2783: --- Commit 74936b8b2bf2f73cad89fefc01a63e96970a010a in openmeetings's branch refs/heads/master from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=74936b8b2 ] [OPENMEETINGS-2783] some issues are addressed > (8.0.0) Sonar issues need to be addressed > - > > Key: OPENMEETINGS-2783 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2783 > Project: Openmeetings > Issue Type: Task > Components: Builds >Affects Versions: 8.0.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 8.0.0 > > > Sonar issues need to be addressed -- This message was sent by Atlassian Jira (v8.20.10#820010)
(openmeetings) branch master updated: [OPENMEETINGS-2783] some issues are addressed
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 74936b8b2 [OPENMEETINGS-2783] some issues are addressed
74936b8b2 is described below
commit 74936b8b2bf2f73cad89fefc01a63e96970a010a
Author: Maxim Solodovnik
AuthorDate: Fri Mar 1 16:23:22 2024 +0700
[OPENMEETINGS-2783] some issues are addressed
---
.../java/org/apache/openmeetings/core/ldap/LdapLoginManager.java | 4 ++--
.../java/org/apache/openmeetings/mediaserver/KTestStream.java | 2 +-
.../org/apache/openmeetings/mediaserver/TestStreamProcessor.java | 2 +-
.../java/org/apache/openmeetings/web/admin/users/UserForm.java| 2 +-
.../src/main/java/org/apache/openmeetings/web/pages/HashPage.java | 8
.../java/org/apache/openmeetings/web/pages/auth/SignInDialog.java | 4 ++--
.../apache/openmeetings/web/user/dashboard/StartWidgetView.java | 4 ++--
.../apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java | 6 +++---
.../openmeetings/web/user/profile/MessagesContactsPanel.java | 2 +-
9 files changed, 17 insertions(+), 17 deletions(-)
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManager.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManager.java
index 5baa5f2d7..a1b4d6ad0 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManager.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManager.java
@@ -352,7 +352,7 @@ public class LdapLoginManager {
conn = new LdapNetworkConnection(options.host,
options.port, options.secure);
}
- private User updatePic(User inUser, InputStream is, StoredFile
sf) {
+ private User updatePic(User inUser, InputStream is) {
User u = inUser;
Path tempImage = null;
try {
@@ -383,7 +383,7 @@ public class LdapLoginManager {
InputStream is = new
ByteArrayInputStream(val.getBytes());
StoredFile sf = new
StoredFile("picture", is);
if (sf.isImage()) {
- u = updatePic(inUser,
is, sf);
+ u = updatePic(inUser,
is);
} else {
u.setPictureUri(val.getString());
}
diff --git
a/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/KTestStream.java
b/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/KTestStream.java
index 3875c590a..8cad9f011 100644
---
a/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/KTestStream.java
+++
b/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/KTestStream.java
@@ -259,7 +259,7 @@ public class KTestStream extends AbstractStream {
releasePlayer();
releaseRecorder();
if (remove) {
- processor.release(this, true);
+ processor.release(this);
}
}
}
diff --git
a/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/TestStreamProcessor.java
b/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/TestStreamProcessor.java
index 42ce6fd1e..99800faa4 100644
---
a/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/TestStreamProcessor.java
+++
b/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/TestStreamProcessor.java
@@ -102,7 +102,7 @@ class TestStreamProcessor {
}
}
- public void release(AbstractStream stream, boolean releaseStream) {
+ public void release(AbstractStream stream) {
streamByUid.remove(stream.getUid());
}
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 2f38131f2..be1278515 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
@@ -339,7 +339,7 @@ public class UserForm extends AdminBaseForm {
}
}
domainId.setChoices(ids);
- domainId.setChoiceRenderer(new LambdaChoiceRenderer<>(id ->
values.get(id), String::valueOf));
+
[jira] [Commented] (OPENMEETINGS-2783) (8.0.0) Sonar issues need to be addressed
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2783?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17822464#comment-17822464 ] ASF subversion and git services commented on OPENMEETINGS-2783: --- Commit 5a81c2964f3bfaa64593a202f68c62dcb579a247 in openmeetings's branch refs/heads/master from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=5a81c2964 ] [OPENMEETINGS-2783] some issues are addressed > (8.0.0) Sonar issues need to be addressed > - > > Key: OPENMEETINGS-2783 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2783 > Project: Openmeetings > Issue Type: Task > Components: Builds >Affects Versions: 8.0.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 8.0.0 > > > Sonar issues need to be addressed -- This message was sent by Atlassian Jira (v8.20.10#820010)
(openmeetings) branch master updated: [OPENMEETINGS-2783] some issues are addressed
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
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 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{
}
List result = new
ArrayList<>(labelCache.containsKey(l) ? labelCache.get(l) : new
ArrayList());
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 {
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
