You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2022/05/06 11:28:29 UTC
[openmeetings] branch master updated (d9a8c24cb -> 3358df553)
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
from d9a8c24cb [OPENMEETINGS-2703] Sonar should be more happy
new f41a28583 [OPENMEETINGS-2675] wicketstuff
new 3358df553 [OPENMEETINGS-2703] Sonar should be more happy
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/openmeetings/db/entity/file/BaseFileItem.java | 5 +----
.../java/org/apache/openmeetings/backup/BackupVersion.java | 5 +----
.../apache/openmeetings/backup/converter/WbConverter.java | 6 ++++--
.../apache/openmeetings/util/crypt/SCryptImplementation.java | 5 +----
.../java/org/apache/openmeetings/web/app/ClientManager.java | 10 +++++-----
.../org/apache/openmeetings/web/common/GeneralUserForm.java | 3 ---
.../apache/openmeetings/web/common/tree/FileTreePanel.java | 6 ++++++
.../apache/openmeetings/web/pages/install/InstallWizard.java | 2 +-
.../openmeetings/web/pages/install/InstallWizardPage.java | 2 +-
.../apache/openmeetings/web/room/menu/SipDialerDialog.java | 5 +++++
.../java/org/apache/openmeetings/web/room/wb/WbPanel.java | 7 +++----
.../apache/openmeetings/webservice/CalendarWebService.java | 5 +----
.../org/apache/openmeetings/webservice/RoomWebService.java | 12 ++++++------
.../openmeetings/webservice/util/AllowOriginProvider.java | 6 +-----
pom.xml | 4 ++--
15 files changed, 38 insertions(+), 45 deletions(-)
[openmeetings] 01/02: [OPENMEETINGS-2675] wicketstuff
Posted by so...@apache.org.
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
commit f41a2858325d97e00d973cd2ad48495e269db505
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Fri May 6 18:26:58 2022 +0700
[OPENMEETINGS-2675] wicketstuff
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2d1a04252..a9d136f4e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,9 +80,9 @@
<swagger-plugin.version>2.1.6</swagger-plugin.version>
<!-- dependency versions -->
<junit.version>5.8.2</junit.version>
- <wicket.version>9.9.1</wicket.version>
+ <wicket.version>9.10.0</wicket.version>
<wicket-jquery-ui.version>9.8.0</wicket-jquery-ui.version>
- <wicketstuff.version>9.9.1</wicketstuff.version>
+ <wicketstuff.version>9.10.0</wicketstuff.version>
<wicket-bootstrap.version>6.0.0-M6</wicket-bootstrap.version>
<font-awesome.version>6.1.0</font-awesome.version>
<spring.version>5.3.19</spring.version>
[openmeetings] 02/02: [OPENMEETINGS-2703] Sonar should be more happy
Posted by so...@apache.org.
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
commit 3358df5532ab81a042f002c33ece24f16ea0e6a2
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Fri May 6 18:28:20 2022 +0700
[OPENMEETINGS-2703] Sonar should be more happy
---
.../org/apache/openmeetings/db/entity/file/BaseFileItem.java | 5 +----
.../java/org/apache/openmeetings/backup/BackupVersion.java | 5 +----
.../apache/openmeetings/backup/converter/WbConverter.java | 6 ++++--
.../apache/openmeetings/util/crypt/SCryptImplementation.java | 5 +----
.../java/org/apache/openmeetings/web/app/ClientManager.java | 10 +++++-----
.../org/apache/openmeetings/web/common/GeneralUserForm.java | 3 ---
.../apache/openmeetings/web/common/tree/FileTreePanel.java | 6 ++++++
.../apache/openmeetings/web/pages/install/InstallWizard.java | 2 +-
.../openmeetings/web/pages/install/InstallWizardPage.java | 2 +-
.../apache/openmeetings/web/room/menu/SipDialerDialog.java | 5 +++++
.../java/org/apache/openmeetings/web/room/wb/WbPanel.java | 7 +++----
.../apache/openmeetings/webservice/CalendarWebService.java | 5 +----
.../org/apache/openmeetings/webservice/RoomWebService.java | 12 ++++++------
.../openmeetings/webservice/util/AllowOriginProvider.java | 6 +-----
14 files changed, 36 insertions(+), 43 deletions(-)
diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/BaseFileItem.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/BaseFileItem.java
index d5de5aaa7..85035e83f 100644
--- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/BaseFileItem.java
+++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/file/BaseFileItem.java
@@ -397,10 +397,7 @@ public abstract class BaseFileItem extends HistoricalEntity {
} else if (!hash.equals(other.hash)) {
return false;
}
- if (type != other.type) {
- return false;
- }
- return true;
+ return type == other.type;
}
private class OriginalFilter implements FileFilter {
diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupVersion.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupVersion.java
index 07debe760..3e33e12e4 100644
--- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupVersion.java
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupVersion.java
@@ -145,10 +145,7 @@ public class BackupVersion implements Serializable, Comparable<BackupVersion> {
if (micro != other.micro) {
return false;
}
- if (minor != other.minor) {
- return false;
- }
- return true;
+ return minor == other.minor;
}
@Override
diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/converter/WbConverter.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/converter/WbConverter.java
index 0ab1da633..c0d212425 100644
--- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/converter/WbConverter.java
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/converter/WbConverter.java
@@ -69,8 +69,10 @@ public class WbConverter {
}
private static void add(Whiteboard wb, JSONObject o) {
- String uid = randomUUID().toString();
- wb.put(uid, o.put("uid", uid));
+ if (o != null) {
+ String uid = randomUUID().toString();
+ wb.put(uid, o.put("uid", uid));
+ }
}
private static JSONObject init(Whiteboard wb, List<?> props) {
diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/SCryptImplementation.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/SCryptImplementation.java
index 542eef92b..4d2a3a0b3 100644
--- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/SCryptImplementation.java
+++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/crypt/SCryptImplementation.java
@@ -103,10 +103,7 @@ public class SCryptImplementation implements ICrypt {
@Override
public boolean fallback(String str, String hash) {
- if (SHA256Implementation.verify(str, hash)) {
- return true;
- }
- return false;
+ return SHA256Implementation.verify(str, hash);
}
@Override
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/ClientManager.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/ClientManager.java
index 2f51ea420..7dc4ba8bd 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/ClientManager.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/ClientManager.java
@@ -216,12 +216,12 @@ public class ClientManager implements IClientManager {
}
public void serverAdded(String serverId, String url) {
- if (!onlineServers.containsKey(serverId)) {
+ onlineServers.computeIfAbsent(serverId, id -> {
ServerInfo si = new ServerInfo(url);
- servers().put(serverId, si);
- log.debug("Cluster:: server with id '{}' was added", serverId);
- onlineServers.put(serverId, si);
- }
+ servers().put(id, si);
+ log.debug("Cluster:: server with id '{}' was added", id);
+ return si;
+ });
}
public void serverRemoved(String serverId) {
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
index 75c1811a1..33cf6bac6 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
@@ -140,9 +140,6 @@ public class GeneralUserForm extends Form<User> {
}
public void updateModelObject(User u, boolean isAdminForm) {
- /*bday.getConfig()
- .withDate(u.getAge() == null ? LocalDate.now() : u.getAge())
- .withMaxDate(LocalDate.now());*/
grpUsers.clear();
grpUsers.addAll(u.getGroupUsers());
if (isAdminForm) {
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
index 21aea8032..31c6a9c0d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
@@ -508,6 +508,12 @@ public abstract class FileTreePanel extends Panel {
}
}
+ /**
+ * This method can be overridden to provide more buttons
+ *
+ * @param markupId - markup id for buttons
+ * @return the list of additional buttons
+ */
protected List<AbstractLink> newOtherButtons(String markupId) {
return List.of();
}
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 46ae43e06..355376efc 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
@@ -125,7 +125,7 @@ public class InstallWizard extends BootstrapWizard {
private ImportInitvalues initvalues;
//onInit, applyState
- public InstallWizard(String id, String title) {
+ public InstallWizard(String id) {
super(id);
setOutputMarkupPlaceholderTag(true);
setOutputMarkupId(true);
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizardPage.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizardPage.java
index 4e29e6308..86b062053 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizardPage.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizardPage.java
@@ -37,7 +37,7 @@ public class InstallWizardPage extends BaseNotInitedPage {
@Override
protected void onInitialize() {
super.onInitialize();
- final InstallWizard wizard = new InstallWizard("wizard", getString("install.wizard.installation"));
+ final InstallWizard wizard = new InstallWizard("wizard");
add(wizard.setEnabled(false));
// This code is required to detect time zone offset
add(new AjaxClientInfoBehavior() {
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/SipDialerDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/SipDialerDialog.java
index 5dab90433..4cb0944f1 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/SipDialerDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/SipDialerDialog.java
@@ -103,6 +103,11 @@ public class SipDialerDialog extends Modal<String> {
target.add(feedback);
}
+ /**
+ * handler for "Call" button
+ *
+ * @param target - {@link AjaxRequestTarget} to perform additional actions(s) if any
+ */
protected void onSubmit(AjaxRequestTarget target) {
sipDao.joinToConfCall(number.getModelObject(), room.getRoom());
}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
index 7a9ac2fd8..b4b27c64b 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
@@ -578,10 +578,9 @@ public class WbPanel extends AbstractWbPanel {
if (wbId == null) {
return;
}
- if (!undoList.containsKey(wbId)) {
- undoList.put(wbId, new LimitedLinkedList<>());
- }
- undoList.get(wbId).push(u);
+ undoList
+ .computeIfAbsent(wbId, id -> new LimitedLinkedList<>())
+ .push(u);
}
private UndoObject getUndo(Long wbId) {
diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
index 4e67a9bf5..772b2c89b 100644
--- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
+++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/CalendarWebService.java
@@ -376,10 +376,7 @@ public class CalendarWebService extends BaseWebService {
return true;
// fine
}
- if (AuthLevelUtil.hasUserLevel(rights) && a.isOwner(sd.getUserId())) {
- return true;
- }
- return false;
+ return AuthLevelUtil.hasUserLevel(rights) && a.isOwner(sd.getUserId());
}, sd -> {
if (a == null) {
throw new InternalServiceException("Bad id");
diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
index d0d03643e..e808df60c 100644
--- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
+++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
@@ -68,12 +68,12 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.tags.Tag;
/**
* RoomService contains methods to manipulate rooms and create invitation hash
@@ -122,8 +122,8 @@ public class RoomWebService extends BaseWebService {
@Operation(
description = "Returns an Object of Type RoomsList which contains a list of\n"
+ " ROOM-Objects. Every ROOM-Object contains a Roomtype and all informations\n"
- + " about that ROOM. The List of current-users in the room is Null if you get\n"
- + " them via SOAP. The Roomtype can be 'conference', 'presentation' or 'interview'.",
+ + " about that ROOM. The List of current-users in the room is Null if you get\n"
+ + " them via SOAP. The Roomtype can be 'conference', 'presentation' or 'interview'.",
responses = {
@ApiResponse(responseCode = "200", description = "list of public rooms",
content = @Content(schema = @Schema(implementation = RoomDTOListWrapper.class))),
@@ -210,8 +210,8 @@ public class RoomWebService extends BaseWebService {
@Path("/{type}/{externaltype}/{externalid}")
@Operation(
description = "Checks if a room with this exteralId + externalType does exist,\n"
- + " if yes it returns the room id if not, it will create the room and then\n"
- + " return the room id of the newly created room",
+ + " if yes it returns the room id if not, it will create the room and then\n"
+ + " return the room id of the newly created room",
responses = {
@ApiResponse(responseCode = "200", description = "id of the room or error code",
content = @Content(schema = @Schema(implementation = RoomDTOWrapper.class))),
diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/util/AllowOriginProvider.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/util/AllowOriginProvider.java
index ed632f840..a2005c826 100644
--- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/util/AllowOriginProvider.java
+++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/util/AllowOriginProvider.java
@@ -39,11 +39,7 @@ public class AllowOriginProvider extends AbstractOutDatabindingInterceptor {
final String allowOrigin = getRestAllowOrigin();
if (!Strings.isEmpty(allowOrigin)) {
@SuppressWarnings("unchecked")
- Map<String, List<String>> headers = (Map<String, List<String>>)outMessage.get(Message.PROTOCOL_HEADERS);
- if (headers == null) {
- headers = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
- outMessage.put(Message.PROTOCOL_HEADERS, headers);
- }
+ Map<String, List<String>> headers = (Map<String, List<String>>)outMessage.computeIfAbsent(Message.PROTOCOL_HEADERS, key -> new TreeMap<>(String.CASE_INSENSITIVE_ORDER));
headers.put("Access-Control-Allow-Origin", List.of(allowOrigin));
}
}