[openmeetings] 19/27: [OPENMEETINGS-2756] build is fixed; code clean-up some dependencies are updated
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch jakarta-spring-6
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 6626e08887e0f13e0809bdd9d22da395712c19a5
Author: Maxim Solodovnik
AuthorDate: Thu Jul 27 19:03:39 2023 +0700
[OPENMEETINGS-2756] build is fixed; code clean-up some dependencies are
updated
---
.../java/org/apache/openmeetings/db/dao/user/UserDao.java | 1 -
.../web/admin/backup/BackupUploadResourceReference.java | 11 +--
.../openmeetings/web/admin/connection/ConnectionsPanel.java | 5 -
.../java/org/apache/openmeetings/web/common/MainPanel.java| 2 --
.../web/common/upload/UploadResourceReference.java| 2 +-
.../org/apache/openmeetings/web/pages/auth/SignInPage.java| 2 --
.../web/room/sidebar/RoomFileUploadResourceReference.java | 9 +++--
.../java/org/apache/openmeetings/web/user/MessageDialog.java | 2 --
pom.xml | 6 +++---
9 files changed, 20 insertions(+), 20 deletions(-)
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 aff76369c..9b2a51cc8 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
@@ -46,7 +46,6 @@ import java.util.Set;
import jakarta.persistence.EntityManager;
import jakarta.persistence.PersistenceContext;
-import jakarta.persistence.TypedQuery;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaQuery;
import jakarta.persistence.criteria.JoinType;
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupUploadResourceReference.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupUploadResourceReference.java
index 12a579554..0c7f86973 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupUploadResourceReference.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupUploadResourceReference.java
@@ -21,13 +21,14 @@ package org.apache.openmeetings.web.admin.backup;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.getApplicationName;
import static org.apache.openmeetings.web.util.ThreadHelper.startRunnable;
+import java.io.IOException;
import java.util.List;
import java.util.Optional;
import java.util.Timer;
import java.util.TimerTask;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.commons.fileupload2.FileItem;
+import org.apache.commons.fileupload2.core.FileItem;
import org.apache.openmeetings.backup.BackupImport;
import org.apache.openmeetings.db.entity.basic.Client;
import org.apache.openmeetings.db.entity.user.User;
@@ -88,7 +89,13 @@ public class BackupUploadResourceReference extends
UploadResourceReference {
log.error("Exception on panel backup download
", e);
sendError(c, uuid, e.getMessage() == null ?
"Unexpected error" : e.getMessage());
} finally {
- fileItems.forEach(FileItem::delete);
+ fileItems.forEach(fi -> {
+ try {
+ fi.delete();
+ } catch (IOException e) {
+ log.error("IOException while
deleting FileItem ", e);
+ }
+ });
timer.cancel();
}
sendProgress(c, uuid, lastProgress, 100);
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
index a48306326..6c313514c 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
@@ -44,7 +44,6 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.markup.repeater.RepeatingView;
import org.apache.wicket.model.ResourceModel;
-import org.apache.openmeetings.mediaserver.KurentoHandler;
import org.apache.openmeetings.mediaserver.StreamProcessor;
import
de.agilecoders.wicket.core.markup.html.bootstrap.button.BootstrapAjaxLink;
@@ -58,11 +57,7 @@ public class ConnectionsPanel extends AdminBasePanel {
@Inject
private ClientManager cm;
@Inject
- private
[openmeetings] 19/27: [OPENMEETINGS-2756] build is fixed; code clean-up some dependencies are updated
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch jakarta-spring-6
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 22ed168956ba4d2d0cf2c7c21f3649b3d30f1f66
Author: Maxim Solodovnik
AuthorDate: Thu Jul 27 19:03:39 2023 +0700
[OPENMEETINGS-2756] build is fixed; code clean-up some dependencies are
updated
---
.../java/org/apache/openmeetings/db/dao/user/UserDao.java | 1 -
.../web/admin/backup/BackupUploadResourceReference.java | 11 +--
.../openmeetings/web/admin/connection/ConnectionsPanel.java | 5 -
.../java/org/apache/openmeetings/web/common/MainPanel.java| 2 --
.../web/common/upload/UploadResourceReference.java| 2 +-
.../org/apache/openmeetings/web/pages/auth/SignInPage.java| 2 --
.../web/room/sidebar/RoomFileUploadResourceReference.java | 9 +++--
.../java/org/apache/openmeetings/web/user/MessageDialog.java | 2 --
pom.xml | 6 +++---
9 files changed, 20 insertions(+), 20 deletions(-)
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 aff76369c..9b2a51cc8 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
@@ -46,7 +46,6 @@ import java.util.Set;
import jakarta.persistence.EntityManager;
import jakarta.persistence.PersistenceContext;
-import jakarta.persistence.TypedQuery;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaQuery;
import jakarta.persistence.criteria.JoinType;
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupUploadResourceReference.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupUploadResourceReference.java
index 12a579554..0c7f86973 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupUploadResourceReference.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupUploadResourceReference.java
@@ -21,13 +21,14 @@ package org.apache.openmeetings.web.admin.backup;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.getApplicationName;
import static org.apache.openmeetings.web.util.ThreadHelper.startRunnable;
+import java.io.IOException;
import java.util.List;
import java.util.Optional;
import java.util.Timer;
import java.util.TimerTask;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.commons.fileupload2.FileItem;
+import org.apache.commons.fileupload2.core.FileItem;
import org.apache.openmeetings.backup.BackupImport;
import org.apache.openmeetings.db.entity.basic.Client;
import org.apache.openmeetings.db.entity.user.User;
@@ -88,7 +89,13 @@ public class BackupUploadResourceReference extends
UploadResourceReference {
log.error("Exception on panel backup download
", e);
sendError(c, uuid, e.getMessage() == null ?
"Unexpected error" : e.getMessage());
} finally {
- fileItems.forEach(FileItem::delete);
+ fileItems.forEach(fi -> {
+ try {
+ fi.delete();
+ } catch (IOException e) {
+ log.error("IOException while
deleting FileItem ", e);
+ }
+ });
timer.cancel();
}
sendProgress(c, uuid, lastProgress, 100);
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
index a48306326..6c313514c 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
@@ -44,7 +44,6 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.markup.repeater.RepeatingView;
import org.apache.wicket.model.ResourceModel;
-import org.apache.openmeetings.mediaserver.KurentoHandler;
import org.apache.openmeetings.mediaserver.StreamProcessor;
import
de.agilecoders.wicket.core.markup.html.bootstrap.button.BootstrapAjaxLink;
@@ -58,11 +57,7 @@ public class ConnectionsPanel extends AdminBasePanel {
@Inject
private ClientManager cm;
@Inject
- private
