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 63cc1dcad [OPENMEETINGS-2783] sonar should be more happy
63cc1dcad is described below
commit 63cc1dcadd519aec6dcede7bc1710caf39dd5a03
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Wed Jul 3 23:16:08 2024 +0700
[OPENMEETINGS-2783] sonar should be more happy
---
.../openmeetings/db/dto/user/TestOAuthUser.java | 77 +++++++++++-----------
.../mediaserver/TestRecordingFlowMocked.java | 2 +-
.../mediaserver/TestRoomFlowMocked.java | 2 +-
.../openmeetings/calendar/TestSendIcalMessage.java | 2 +-
.../org/apache/openmeetings/config/TestConfig.java | 6 +-
.../domain/TestUserGroupAggregation.java | 2 +-
.../openmeetings/web/pages/auth/TestLoginUI.java | 2 +-
7 files changed, 47 insertions(+), 46 deletions(-)
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 3a5bdb052..a32409dfe 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
@@ -97,44 +97,45 @@ class TestOAuthUser {
.addMapping(PARAM_LOGIN, "id")
.addMapping(PARAM_EMAIL, "email")
.addMapping(PARAM_FNAME, "display-name");
- OAuthUser user = new OAuthUser("{\n" +
- " \"ocs\": {\n" +
- " \"meta\": {\n" +
- " \"status\": \"ok\",\n" +
- " \"statuscode\": 200,\n" +
- " \"message\": \"OK\"\n" +
- " },\n" +
- " \"data\": {\n" +
- " \"storageLocation\": \"xxxxx\",\n"
+
- " \"id\": \"xxxxx\",\n" +
- " \"lastLogin\": 1584799957000,\n" +
- " \"backend\": \"Database\",\n" +
- " \"subadmin\": [],\n" +
- " \"quota\": {\n" +
- " \"free\": 183035547648,\n" +
- " \"used\": 10244,\n" +
- " \"total\": 183035557892,\n" +
- " \"relative\": 0,\n" +
- " \"quota\": -3\n" +
- " },\n" +
- " \"email\": \"[email protected]\",\n" +
- " \"phone\": \"\",\n" +
- " \"address\": \"\",\n" +
- " \"website\": \"\",\n" +
- " \"twitter\": \"\",\n" +
- " \"groups\": [\n" +
- " \"xxxxxx\"\n" +
- " ],\n" +
- " \"language\": \"en\",\n" +
- " \"locale\": \"\",\n" +
- " \"backendCapabilities\": {\n" +
- " \"setDisplayName\": true,\n" +
- " \"setPassword\": true\n" +
- " },\n" +
- " \"display-name\": \"xxxxx\"\n" +
- " }\n" +
- " }\n" +
- "}", server);
+ OAuthUser user = new OAuthUser("""
+ {
+ "ocs": {
+ "meta": {
+ "status": "ok",
+ "statuscode": 200,
+ "message": "OK"
+ },
+ "data": {
+ "storageLocation": "xxxxx",
+ "id": "xxxxx",
+ "lastLogin": 1584799957000,
+ "backend": "Database",
+ "subadmin": [],
+ "quota": {
+ "free": 183035547648,
+ "used": 10244,
+ "total": 183035557892,
+ "relative": 0,
+ "quota": -3
+ },
+ "email": "[email protected]",
+ "phone": "",
+ "address": "",
+ "website": "",
+ "twitter": "",
+ "groups": [
+ "xxxxxx"
+ ],
+ "language": "en",
+ "locale": "",
+ "backendCapabilities": {
+ "setDisplayName": true,
+ "setPassword": true
+ },
+ "display-name": "xxxxx"
+ }
+ }
+ }""", server);
assertEquals("xxxxx", user.getLogin(), "Login should be
correct");
}
diff --git
a/openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/TestRecordingFlowMocked.java
b/openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/TestRecordingFlowMocked.java
index 319eb1d25..15348eb78 100644
---
a/openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/TestRecordingFlowMocked.java
+++
b/openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/TestRecordingFlowMocked.java
@@ -76,7 +76,7 @@ class TestRecordingFlowMocked extends BaseMockedTest {
u.setLastname("lastname");
doReturn(u).when(userDao).get(USER_ID);
doReturn(true).when(handler).isConnected();
-
when(recDao.update(any(Recording.class))).thenAnswer((invocation) -> {
+ when(recDao.update(any(Recording.class))).thenAnswer(invocation
-> {
Object[] args = invocation.getArguments();
Recording r = (Recording) args[0];
r.setId(1L);
diff --git
a/openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/TestRoomFlowMocked.java
b/openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/TestRoomFlowMocked.java
index df30d4151..ccaeb5405 100644
---
a/openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/TestRoomFlowMocked.java
+++
b/openmeetings-mediaserver/src/test/java/org/apache/openmeetings/mediaserver/TestRoomFlowMocked.java
@@ -68,7 +68,7 @@ class TestRoomFlowMocked extends BaseMockedTest {
u.setLastname("lastname");
lenient().doReturn(u).when(userDao).get(USER_ID);
doReturn(true).when(handler).isConnected();
-
lenient().when(recDao.update(any(Recording.class))).thenAnswer((invocation) ->
{
+
lenient().when(recDao.update(any(Recording.class))).thenAnswer(invocation -> {
Object[] args = invocation.getArguments();
Recording r = (Recording) args[0];
r.setId(1L);
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 7b402f609..de0bfdf98 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
@@ -78,7 +78,7 @@ class TestSendIcalMessage extends AbstractOmServerTest {
.addAttendee(email, username, invitor)
.build();
- log.debug("ICS: {}", handler.toString());
+ log.debug("ICS: {}", handler);
assertNotNull(handler.toString(), "Valid ICS should be
created");
sendIcalMessage(handler.toByteArray());
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 67711e434..033898db9 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
@@ -50,10 +50,10 @@ class TestConfig extends AbstractOmServerTest {
List<Configuration> list = cfgDao.get(4, 6);
for (Configuration conf : list) {
- log.error("conf.getKey() " + conf.getKey());
- log.error("conf.getUser() " + conf.getUser());
+ log.error("conf.getKey() = {}", conf.getKey());
+ log.error("conf.getUser() = {}",
conf.getUser());
if (conf.getUser() != null) {
- log.error("conf.getUsers() " +
conf.getUser().getLogin());
+ log.error("conf.getUser().getLogin() =
{}", conf.getUser().getLogin());
}
}
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 c15b7cad1..a73ac407c 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
@@ -39,7 +39,7 @@ class TestUserGroupAggregation extends AbstractOmServerTest {
assertTrue(u.getGroupUsers().size() > 0, "Default user must
belong to at least one group");
for (GroupUser orgUserObj : u.getGroupUsers()) {
- log.error("testitNow: group Id: '" +
orgUserObj.getGroup().getId() + "'; name: '" + orgUserObj.getGroup().getName()
+ "'");
+ log.error("testitNow: group Id: '{}'; name: '{}'",
orgUserObj.getGroup().getId(), orgUserObj.getGroup().getName());
}
}
}
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 9bccde6c8..fc9400a61 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
@@ -48,7 +48,7 @@ import org.apache.wicket.util.tester.FormTester;
import org.junit.jupiter.api.Test;
class TestLoginUI extends AbstractWicketTesterTest {
- private final static String PATH_REGISTER = "register:form";
+ private static final String PATH_REGISTER = "register:form";
private void checkLogin(String login, String pass) {
FormTester formTester = tester.newFormTester("signin:signin");
