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 2023/07/28 02:32:33 UTC
[openmeetings] branch master updated: no jira: code clean-up
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 103072649 no jira: code clean-up
103072649 is described below
commit 1030726490d03e2f1ededfb85e4864c9e035b222
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Fri Jul 28 09:32:22 2023 +0700
no jira: code clean-up
---
.../java/org/apache/openmeetings/web/admin/backup/BackupPanel.java | 3 ---
.../web/admin/backup/BackupUploadResourceReference.java | 3 ---
.../apache/openmeetings/web/admin/connection/ConnectionsPanel.java | 6 ------
.../src/main/java/org/apache/openmeetings/web/common/MainPanel.java | 3 ---
.../java/org/apache/openmeetings/web/pages/auth/SignInPage.java | 4 +---
.../java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java | 3 ---
.../main/java/org/apache/openmeetings/web/user/MessageDialog.java | 3 ---
.../apache/openmeetings/web/user/calendar/AppointmentDialog.java | 3 ---
.../org/apache/openmeetings/web/user/calendar/CalendarDialog.java | 3 ---
.../org/apache/openmeetings/web/user/calendar/CalendarPanel.java | 3 ---
.../openmeetings/web/user/record/RecordingResourceReference.java | 3 ---
.../java/org/apache/openmeetings/web/user/record/VideoInfo.java | 3 ---
12 files changed, 1 insertion(+), 39 deletions(-)
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java
index 62041df81..bf6cb90c9 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java
@@ -27,7 +27,6 @@ import java.util.Date;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.openmeetings.backup.BackupExport;
-import org.apache.openmeetings.backup.BackupImport;
import org.apache.openmeetings.util.CalendarPatterns;
import org.apache.openmeetings.util.OmFileHelper;
import org.apache.openmeetings.web.admin.AdminBasePanel;
@@ -74,8 +73,6 @@ public class BackupPanel extends AdminBasePanel {
@SpringBean
private BackupExport backupExport;
- @SpringBean
- private BackupImport backupImport;
public BackupPanel(String id) {
super(id);
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 6378749a1..d73acaf98 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
@@ -29,7 +29,6 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.commons.fileupload.FileItem;
import org.apache.openmeetings.backup.BackupImport;
-import org.apache.openmeetings.db.dao.file.FileItemDao;
import org.apache.openmeetings.db.entity.basic.Client;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.web.common.upload.UploadResourceReference;
@@ -43,8 +42,6 @@ public class BackupUploadResourceReference extends UploadResourceReference {
private static final long serialVersionUID = 1L;
private static final Logger log = LoggerFactory.getLogger(BackupUploadResourceReference.class);
- @SpringBean
- private FileItemDao fileDao;
@SpringBean
private BackupImport backupImport;
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 1d3cf99db..f62eeb9be 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
@@ -28,7 +28,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.stream.Stream;
-import org.apache.openmeetings.db.dao.user.IUserManager;
import org.apache.openmeetings.db.entity.IDataProviderEntity;
import org.apache.openmeetings.db.entity.basic.Client;
import org.apache.openmeetings.web.admin.AdminBasePanel;
@@ -46,7 +45,6 @@ import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.markup.repeater.RepeatingView;
import org.apache.wicket.model.ResourceModel;
import org.apache.wicket.spring.injection.annot.SpringBean;
-import org.apache.openmeetings.mediaserver.KurentoHandler;
import org.apache.openmeetings.mediaserver.StreamProcessor;
import de.agilecoders.wicket.core.markup.html.bootstrap.button.BootstrapAjaxLink;
@@ -58,11 +56,7 @@ public class ConnectionsPanel extends AdminBasePanel {
@SpringBean
private ClientManager cm;
@SpringBean
- private KurentoHandler kHandler;
- @SpringBean
private StreamProcessor streamProcessor;
- @SpringBean
- private IUserManager userManager;
public ConnectionsPanel(String id) {
super(id);
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
index 9c590c7cf..cf848ecbe 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
@@ -35,7 +35,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Set;
-import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.dao.room.RoomDao;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.basic.Client;
@@ -109,8 +108,6 @@ public class MainPanel extends Panel {
@SpringBean
private ClientManager cm;
@SpringBean
- private ConfigurationDao cfgDao;
- @SpringBean
private UserDao userDao;
@SpringBean
private RoomDao roomDao;
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
index 71130f459..1746a0698 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
@@ -23,7 +23,6 @@ import static org.apache.openmeetings.util.OpenmeetingsVariables.isAllowRegister
import java.io.IOException;
import java.security.NoSuchAlgorithmException;
-import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.dao.server.OAuth2Dao;
import org.apache.openmeetings.db.entity.server.OAuthServer;
import org.apache.openmeetings.db.entity.user.User;
@@ -109,8 +108,7 @@ public class SignInPage extends BaseInitedPage {
};
RegisterDialog r = new RegisterDialog("register");
private final OtpDialog otpDialog = new OtpDialog("otpDialog", Model.of());
- @SpringBean
- private ConfigurationDao cfgDao;
+
@SpringBean
private UserManager userManager;
@SpringBean
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
index 480d85da6..15274466e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
@@ -39,7 +39,6 @@ import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.spring.injection.annot.SpringBean;
import org.apache.wicket.util.string.Strings;
-import org.apache.openmeetings.mediaserver.StreamProcessor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -63,8 +62,6 @@ public class RoomSidebar extends Panel {
@SpringBean
private ClientManager cm;
- @SpringBean
- private StreamProcessor streamProcessor;
public RoomSidebar(String id, final RoomPanel room) {
super(id);
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java
index 239bf5449..a8e036268 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java
@@ -36,7 +36,6 @@ import java.util.Date;
import java.util.List;
import org.apache.openmeetings.core.mail.MailHandler;
-import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
import org.apache.openmeetings.db.dao.room.RoomDao;
import org.apache.openmeetings.db.dao.user.PrivateMessageDao;
@@ -95,8 +94,6 @@ public class MessageDialog extends Modal<PrivateMessage> {
@SpringBean
private UserDao userDao;
@SpringBean
- private ConfigurationDao cfgDao;
- @SpringBean
private AppointmentDao apptDao;
@SpringBean
private PrivateMessageDao msgDao;
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
index 0011e765f..b0354dc9a 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
@@ -33,7 +33,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Set;
-import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
import org.apache.openmeetings.db.dao.room.RoomDao;
import org.apache.openmeetings.db.dao.user.GroupUserDao;
@@ -127,8 +126,6 @@ public class AppointmentDialog extends Modal<Appointment> {
private GroupUserDao groupUserDao;
@SpringBean
private AppointmentManager apptManager;
- @SpringBean
- private ConfigurationDao cfgDao;
public AppointmentDialog(String id, CalendarPanel calendarPanel, CompoundPropertyModel<Appointment> model) {
super(id, model);
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.java
index 4f830b54a..58f1ca298 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.java
@@ -26,7 +26,6 @@ import java.util.List;
import org.apache.http.auth.UsernamePasswordCredentials;
import org.apache.http.client.HttpClient;
import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.calendar.Appointment;
import org.apache.openmeetings.db.entity.calendar.OmCalendar;
@@ -77,8 +76,6 @@ public class CalendarDialog extends Modal<OmCalendar> {
@SpringBean
private UserDao userDao;
@SpringBean
- private AppointmentDao apptDao;
- @SpringBean
private AppointmentManager apptManager;
public enum DIALOG_TYPE {
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
index 65536d1ad..aa44efedd 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
@@ -34,7 +34,6 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.http.client.HttpClient;
import org.apache.http.client.protocol.HttpClientContext;
import org.apache.http.impl.client.BasicCredentialsProvider;
-import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.calendar.Appointment;
@@ -111,8 +110,6 @@ public class CalendarPanel extends UserBasePanel {
private AppointmentManager apptManager;
@SpringBean
private UserDao userDao;
- @SpringBean
- private ConfigurationDao cfgDao;
public CalendarPanel(String id) {
super(id);
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingResourceReference.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingResourceReference.java
index 92d0a6e77..a3f0c0d8e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingResourceReference.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingResourceReference.java
@@ -23,7 +23,6 @@ import static org.apache.openmeetings.web.app.WebSession.getUserId;
import org.apache.openmeetings.db.dao.record.RecordingDao;
import org.apache.openmeetings.db.dao.user.GroupUserDao;
-import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.basic.Client;
import org.apache.openmeetings.db.entity.file.BaseFileItem.Type;
import org.apache.openmeetings.db.entity.record.Recording;
@@ -44,8 +43,6 @@ public abstract class RecordingResourceReference extends FileItemResourceReferen
private ClientManager cm;
@SpringBean
private GroupUserDao groupUserDao;
- @SpringBean
- private UserDao userDao;
protected RecordingResourceReference(String name) {
super(name);
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java
index 775b979a1..84433323c 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java
@@ -20,7 +20,6 @@ package org.apache.openmeetings.web.user.record;
import static org.apache.openmeetings.web.app.WebSession.getDateFormat;
-import org.apache.openmeetings.db.dao.record.RecordingChunkDao;
import org.apache.openmeetings.db.dao.room.RoomDao;
import org.apache.openmeetings.db.entity.file.BaseFileItem;
import org.apache.openmeetings.db.entity.record.Recording;
@@ -40,8 +39,6 @@ public class VideoInfo extends Panel {
private final Label roomNameLbl = new Label("roomName", Model.of(""));
@SpringBean
private RoomDao roomDao;
- @SpringBean
- private RecordingChunkDao chunkDao;
public VideoInfo(String id) {
super(id);