Repository: openmeetings Updated Branches: refs/heads/master a1d8c0d65 -> e077ef366
[OPENMEETINGS-1714] more issues are fixed Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/e077ef36 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/e077ef36 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/e077ef36 Branch: refs/heads/master Commit: e077ef36611a2ca8013326ee029e97484ba36aad Parents: a1d8c0d Author: Maxim Solodovnik <[email protected]> Authored: Sun Oct 8 00:20:18 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Sun Oct 8 00:20:18 2017 +0700 ---------------------------------------------------------------------- .../core/converter/ImageConverter.java | 4 ++-- .../db/dao/basic/MailMessageDao.java | 7 +++--- .../openmeetings/db/dao/label/LabelDao.java | 2 +- .../openmeetings/db/dao/room/RoomGroupDao.java | 4 ++-- .../db/dao/room/RoomModeratorDao.java | 4 ++-- .../openmeetings/db/dao/user/GroupUserDao.java | 4 ---- .../db/dao/user/PrivateMessageDao.java | 2 +- .../db/entity/record/Recording.java | 4 ++-- .../openmeetings/backup/BackupImport.java | 16 ++++++------- .../apache/openmeetings/cli/CleanupHelper.java | 4 ++-- .../apache/openmeetings/screenshare/Core.java | 7 +----- .../screenshare/RTMPSScreenShare.java | 2 +- .../screenshare/RTMPScreenShare.java | 2 +- .../screenshare/RTMPTSScreenShare.java | 2 +- .../screenshare/RTMPTScreenShare.java | 2 +- .../service/calendar/caldav/iCalUtils.java | 10 +++----- .../apache/openmeetings/util/OmFileHelper.java | 25 ++++++++++---------- .../openmeetings/web/admin/email/EmailForm.java | 3 +-- .../web/admin/groups/GroupUsersPanel.java | 2 +- .../web/room/RedirectMessageDialog.java | 4 ++-- .../org/apache/openmeetings/web/room/room.js | 5 ---- .../web/user/calendar/CalendarPanel.java | 6 ++--- .../record/Mp4RecordingResourceReference.java | 4 ++-- .../record/PngRecordingResourceReference.java | 4 ++-- .../openmeetings/AbstractWicketTester.java | 2 +- .../openmeetings/backup/TestOldBackups.java | 6 +---- .../calendar/TestAppointmentAddAppointment.java | 3 --- .../TestDatabaseStructureGetUserStart.java | 5 ---- .../TestDatabaseStructureUsersSearch.java | 6 +---- .../openmeetings/calendar/TestOmCalendar.java | 3 --- .../openmeetings/domain/TestAddGroup.java | 3 --- .../domain/TestUserGroupAggregation.java | 5 ---- .../invitiation/TestInvitation.java | 3 --- .../openmeetings/smoke/TestSmokeBasic.java | 5 ---- .../openmeetings/user/TestUserContact.java | 3 --- .../apache/openmeetings/user/TestUserCount.java | 5 ---- .../apache/openmeetings/user/TestUserGroup.java | 5 +--- .../apache/openmeetings/userdata/TestLogin.java | 5 ---- .../webservice/TestCalendarService.java | 3 --- .../webservice/TestInfoService.java | 2 -- 40 files changed, 58 insertions(+), 135 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e077ef36/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/ImageConverter.java ---------------------------------------------------------------------- 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 dbf1cac..fa657ec 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 @@ -25,7 +25,7 @@ import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_PNG; import static org.apache.openmeetings.util.OmFileHelper.JPG_MIME_TYPE; import static org.apache.openmeetings.util.OmFileHelper.PNG_MIME_TYPE; import static org.apache.openmeetings.util.OmFileHelper.getUploadProfilesUserDir; -import static org.apache.openmeetings.util.OmFileHelper.profileFileName; +import static org.apache.openmeetings.util.OmFileHelper.PROFILE_FILE_NAME; import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DOCUMENT_DPI; import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DOCUMENT_QUALITY; import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; @@ -93,7 +93,7 @@ public class ImageConverter extends BaseConverter { } } - File destinationFile = OmFileHelper.getNewFile(getUploadProfilesUserDir(userId), profileFileName, EXTENSION_JPG); + File destinationFile = OmFileHelper.getNewFile(getUploadProfilesUserDir(userId), PROFILE_FILE_NAME, EXTENSION_JPG); if (!skipConvertion) { returnMap.addItem("processJPG", convertSingleJpg(file, destinationFile)); } else { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e077ef36/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/MailMessageDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/MailMessageDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/MailMessageDao.java index cc3a912..f995dc5 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/MailMessageDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/MailMessageDao.java @@ -34,7 +34,7 @@ import org.springframework.transaction.annotation.Transactional; @Repository @Transactional -public class MailMessageDao implements IDataProviderDao<MailMessage> { +public class MailMessageDao implements IDataProviderDao<MailMessage> { @PersistenceContext private EntityManager em; @@ -121,15 +121,14 @@ public class MailMessageDao implements IDataProviderDao<MailMessage> { @Override public void delete(MailMessage m, Long userId) { if (m != null) { - delete(m.getId(), userId); + delete(m.getId()); } } /** * @param id - entity id - * @param userId - unused */ - public void delete(Long id, Long userId) { + public void delete(Long id) { if (id != null) { em.remove(get(id)); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e077ef36/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java ---------------------------------------------------------------------- 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 04ba58b..6b4d78b 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 @@ -94,7 +94,7 @@ public class LabelDao implements IDataProviderDao<StringLabel>{ } private static File getLangFile() { - return new File(OmFileHelper.getLanguagesDir(), OmFileHelper.nameOfLanguageFile); + return new File(OmFileHelper.getLanguagesDir(), OmFileHelper.LANG_FILE_NAME); } public static synchronized Class<?> getAppClass() throws ClassNotFoundException { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e077ef36/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomGroupDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomGroupDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomGroupDao.java index b9f318e..18a6a3f 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomGroupDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomGroupDao.java @@ -39,9 +39,9 @@ public class RoomGroupDao { } /** - * @param userId unused + * @param entity to be updated */ - public RoomGroup update(RoomGroup entity, Long userId) { + public RoomGroup update(RoomGroup entity) { if (entity.getId() == null) { entity.setInserted(new Date()); em.persist(entity); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e077ef36/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomModeratorDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomModeratorDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomModeratorDao.java index 7a14d1b..f447dd5 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomModeratorDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/room/RoomModeratorDao.java @@ -53,9 +53,9 @@ public class RoomModeratorDao { } /** - * @param userId unused + * @param rm moderator to be updated */ - public RoomModerator update(RoomModerator rm, Long userId) { + public RoomModerator update(RoomModerator rm) { if (rm.getId() == null) { rm.setInserted(new Date()); em.persist(rm); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e077ef36/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupUserDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupUserDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupUserDao.java index 54fc299..1b195ce 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupUserDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/GroupUserDao.java @@ -93,10 +93,6 @@ public class GroupUserDao implements IDataProviderDao<GroupUser> { @Override public long count(String search) { - throw UNSUPPORTED; - } - - public long count(long groupId, String search) { TypedQuery<Long> q = em.createQuery(DaoHelper.getSearchQuery(GroupUser.class.getSimpleName(), "ou", search, false, true, null, searchFields), Long.class); return q.getSingleResult(); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e077ef36/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java index 5bd33ae..9422c59 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/PrivateMessageDao.java @@ -130,7 +130,7 @@ public class PrivateMessageDao implements IDataProviderDao<PrivateMessage> { return hql.toString(); } - private <T> void setSearch(TypedQuery<T> query, String search) { + private static <T> void setSearch(TypedQuery<T> query, String search) { if (!Strings.isEmpty(search)) { query.setParameter("search", getStringParam(search)); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e077ef36/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java index 5564103..ef4ea7f 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/record/Recording.java @@ -19,7 +19,7 @@ package org.apache.openmeetings.db.entity.record; import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_MP4; -import static org.apache.openmeetings.util.OmFileHelper.recordingFileName; +import static org.apache.openmeetings.util.OmFileHelper.RECORDING_FILE_NAME; import java.util.Date; import java.util.List; @@ -228,6 +228,6 @@ public class Recording extends BaseFileItem { @Override public String getFileName(String ext) { - return String.format("%s%s.%s", recordingFileName, getId(), ext == null ? EXTENSION_MP4 : ext); + return String.format("%s%s.%s", RECORDING_FILE_NAME, getId(), ext == null ? EXTENSION_MP4 : ext); } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e077ef36/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java ---------------------------------------------------------------------- diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java index d685292..a7bbff2 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/BackupImport.java @@ -37,9 +37,9 @@ import static org.apache.openmeetings.util.OmFileHelper.getUploadDir; import static org.apache.openmeetings.util.OmFileHelper.getUploadFilesDir; import static org.apache.openmeetings.util.OmFileHelper.getUploadProfilesUserDir; import static org.apache.openmeetings.util.OmFileHelper.getUploadRoomDir; -import static org.apache.openmeetings.util.OmFileHelper.profilesPrefix; -import static org.apache.openmeetings.util.OmFileHelper.recordingFileName; -import static org.apache.openmeetings.util.OmFileHelper.thumbImagePrefix; +import static org.apache.openmeetings.util.OmFileHelper.PROFILES_PREFIX; +import static org.apache.openmeetings.util.OmFileHelper.RECORDING_FILE_NAME; +import static org.apache.openmeetings.util.OmFileHelper.THUMB_IMG_PREFIX; import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_APPOINTMENT_REMINDER_MINUTES; import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_CALENDAR_FIRST_DAY; import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_CALENDAR_ROOM_CAPACITY; @@ -599,7 +599,7 @@ public class BackupImport { if (!ro.isDeleted() && ro.getRoom() != null && ro.getRoom().getId() != null && ro.getGroup() != null && ro.getGroup().getId() != null) { // We need to reset this as openJPA reject to store them otherwise ro.setId(null); - roomGroupDao.update(ro, null); + roomGroupDao.update(ro); } } } @@ -717,7 +717,7 @@ public class BackupImport { meta.setRecording(r); } } - if (!Strings.isEmpty(r.getHash()) && r.getHash().startsWith(recordingFileName)) { + if (!Strings.isEmpty(r.getHash()) && r.getHash().startsWith(RECORDING_FILE_NAME)) { String name = getFileName(r.getHash()); r.setHash(UUID.randomUUID().toString()); fileMap.put(String.format(FILE_NAME_FMT, name, EXTENSION_JPG), String.format(FILE_NAME_FMT, r.getHash(), EXTENSION_PNG)); @@ -1384,8 +1384,8 @@ public class BackupImport { private static Long getProfileId(File f) { String n = f.getName(); - if (n.indexOf(profilesPrefix) > -1) { - return importLongType(n.substring(profilesPrefix.length())); + if (n.indexOf(PROFILES_PREFIX) > -1) { + return importLongType(n.substring(PROFILES_PREFIX.length())); } return null; } @@ -1451,7 +1451,7 @@ public class BackupImport { } private static File getImgDir(String name) { - int start = name.startsWith(thumbImagePrefix) ? thumbImagePrefix.length() : 0; + int start = name.startsWith(THUMB_IMG_PREFIX) ? THUMB_IMG_PREFIX.length() : 0; String hash = name.substring(start, name.length() - EXTENSION_JPG.length() - 1); return new File(getUploadFilesDir(), hash); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e077ef36/openmeetings-install/src/main/java/org/apache/openmeetings/cli/CleanupHelper.java ---------------------------------------------------------------------- diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/CleanupHelper.java b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/CleanupHelper.java index b67c1e0..3d1ea16 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/CleanupHelper.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/CleanupHelper.java @@ -151,9 +151,9 @@ public class CleanupHelper { private static long getUserIdByProfile(String name) { long result = -1; - if (name.startsWith(OmFileHelper.profilesPrefix)) { + if (name.startsWith(OmFileHelper.PROFILES_PREFIX)) { try { - result = Long.parseLong(name.substring(OmFileHelper.profilesPrefix.length())); + result = Long.parseLong(name.substring(OmFileHelper.PROFILES_PREFIX.length())); } catch (Exception e) { //noop } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e077ef36/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java ---------------------------------------------------------------------- diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java index fa17aff..3a4b846 100644 --- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java +++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java @@ -50,10 +50,8 @@ import org.red5.server.api.event.IEvent; import org.red5.server.api.service.IPendingServiceCall; import org.red5.server.api.service.IPendingServiceCallback; import org.red5.server.net.ICommand; -import org.red5.server.net.rtmp.Channel; import org.red5.server.net.rtmp.RTMPConnection; import org.red5.server.net.rtmp.event.Notify; -import org.red5.server.net.rtmp.message.Header; import org.red5.server.net.rtmp.status.StatusCodes; import org.slf4j.Logger; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; @@ -391,12 +389,9 @@ public class Core implements IPendingServiceCallback, INetStreamEventHandler { } /** - * @param conn - unused - * @param channel - unused - * @param source - unused * @param command - command to be processed */ - protected void onCommand(RTMPConnection conn, Channel channel, Header source, ICommand command) { + protected void onCommand(ICommand command) { if (!(command instanceof Notify)) { return; } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e077ef36/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPSScreenShare.java ---------------------------------------------------------------------- diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPSScreenShare.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPSScreenShare.java index 3458821..068a417 100644 --- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPSScreenShare.java +++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPSScreenShare.java @@ -55,7 +55,7 @@ public class RTMPSScreenShare extends RTMPSClient implements IScreenShare { @Override protected void onCommand(RTMPConnection conn, Channel channel, Header source, ICommand command) { super.onCommand(conn, channel, source, command); - core.onCommand(conn, channel, source, command); + core.onCommand(command); } @Override http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e077ef36/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPScreenShare.java ---------------------------------------------------------------------- diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPScreenShare.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPScreenShare.java index d28ea9c..1539721 100644 --- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPScreenShare.java +++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPScreenShare.java @@ -55,7 +55,7 @@ public class RTMPScreenShare extends RTMPClient implements IScreenShare { @Override protected void onCommand(RTMPConnection conn, Channel channel, Header source, ICommand command) { super.onCommand(conn, channel, source, command); - core.onCommand(conn, channel, source, command); + core.onCommand(command); } @Override http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e077ef36/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPTSScreenShare.java ---------------------------------------------------------------------- diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPTSScreenShare.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPTSScreenShare.java index 6301e48..11431f4 100644 --- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPTSScreenShare.java +++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPTSScreenShare.java @@ -55,7 +55,7 @@ public class RTMPTSScreenShare extends RTMPTSClient implements IScreenShare { @Override protected void onCommand(RTMPConnection conn, Channel channel, Header source, ICommand command) { super.onCommand(conn, channel, source, command); - core.onCommand(conn, channel, source, command); + core.onCommand(command); } @Override http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e077ef36/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPTScreenShare.java ---------------------------------------------------------------------- diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPTScreenShare.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPTScreenShare.java index 4a3ccca..5b4bee8 100644 --- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPTScreenShare.java +++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPTScreenShare.java @@ -55,7 +55,7 @@ public class RTMPTScreenShare extends RTMPTClient implements IScreenShare { @Override protected void onCommand(RTMPConnection conn, Channel channel, Header source, ICommand command) { super.onCommand(conn, channel, source, command); - core.onCommand(conn, channel, source, command); + core.onCommand(command); } @Override http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e077ef36/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/iCalUtils.java ---------------------------------------------------------------------- diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/iCalUtils.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/iCalUtils.java index a667136..526d077 100644 --- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/iCalUtils.java +++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/iCalUtils.java @@ -119,7 +119,6 @@ public class iCalUtils { List<Appointment> appointments = new ArrayList<>(); ComponentList<CalendarComponent> events = calendar.getComponents(Component.VEVENT); User owner = userDao.get(ownerId); - TimeZone tz = parseTimeZone(calendar, owner); for (CalendarComponent event : events) { Appointment a = new Appointment(); @@ -127,7 +126,7 @@ public class iCalUtils { a.setDeleted(false); a.setRoom(createDefaultRoom()); a.setReminder(Appointment.Reminder.none); - a = addVEventPropertiestoAppointment(a, event, tz); + a = addVEventPropertiestoAppointment(a, event); appointments.add(a); } return appointments; @@ -149,10 +148,8 @@ public class iCalUtils { } CalendarComponent event = calendar.getComponent(Component.VEVENT); if (event != null) { - TimeZone tz = parseTimeZone(calendar, a.getOwner()); - a.setEtag(etag); - a = addVEventPropertiestoAppointment(a, event, tz); + a = addVEventPropertiestoAppointment(a, event); } return a; } @@ -162,10 +159,9 @@ public class iCalUtils { * * @param a Appointment to which the properties are to be added * @param event VEvent to parse properties from. - * @param tz Timezone of the Event * @return Updated Appointment */ - private Appointment addVEventPropertiestoAppointment(Appointment a, CalendarComponent event, TimeZone tz) { + private Appointment addVEventPropertiestoAppointment(Appointment a, CalendarComponent event) { DateProperty dtstart = (DateProperty)event.getProperty(Property.DTSTART) , dtend = (DateProperty)event.getProperty(Property.DTEND) , dtstamp = (DateProperty)event.getProperty(Property.DTSTAMP) http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e077ef36/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java ---------------------------------------------------------------------- diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java index a0b109f..33b628e 100644 --- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java +++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java @@ -50,17 +50,16 @@ public class OmFileHelper { public static final String HIBERNATE = "hibernate"; public static final String PERSISTENCE_NAME = "classes/META-INF/persistence.xml"; public static final String DB_PERSISTENCE_NAME = "classes/META-INF/%s_persistence.xml"; - public static final String profilesPrefix = "profile_"; - public static final String nameOfLanguageFile = "languages.xml"; - public static final String libraryFileName = "library.xml"; - public static final String defaultProfileImageName = "profile.jpg"; - public static final String profileFileName = "profile"; - public static final String recordingFileName = "flvRecording_"; - public static final String profileImagePrefix = "_profile_"; - public static final String thumbImagePrefix = "_thumb_"; + public static final String PROFILES_PREFIX = "profile_"; + public static final String LANG_FILE_NAME = "languages.xml"; + public static final String LIBRARY_FILE_NAME = "library.xml"; + public static final String PROFILE_IMG_NAME = "profile.jpg"; + public static final String PROFILE_FILE_NAME = "profile"; + public static final String RECORDING_FILE_NAME = "flvRecording_"; + public static final String THUMB_IMG_PREFIX = "_thumb_"; public static final String DOC_PAGE_PREFIX = "page"; public static final String TEST_SETUP_PREFIX = "TEST_SETUP_"; - public static final String dashboardFile = "dashboard.xml"; + public static final String DASHBOARD_FILE = "dashboard.xml"; public static final String EXTENSION_WML = "wml"; public static final String EXTENSION_FLV = "flv"; public static final String EXTENSION_MP4 = "mp4"; @@ -118,11 +117,11 @@ public class OmFileHelper { } public static File getUploadProfilesUserDir(Long userId) { - return getDir(getUploadProfilesDir(), profilesPrefix + userId); + return getDir(getUploadProfilesDir(), PROFILES_PREFIX + userId); } public static File getUploadProfilesUserDir(String userId) { - return getDir(getUploadProfilesDir(), profilesPrefix + userId); + return getDir(getUploadProfilesDir(), PROFILES_PREFIX + userId); } public static File getGroupLogoDir() { @@ -138,7 +137,7 @@ public class OmFileHelper { } public static File getDefaultProfilePicture() { - return new File(getImagesDir(), defaultProfileImageName); + return new File(getImagesDir(), PROFILE_IMG_NAME); } public static File getUserProfilePicture(Long userId, String uri) { @@ -155,7 +154,7 @@ public class OmFileHelper { } public static File getUserDashboard(Long userId) { - return new File(getUploadProfilesUserDir(userId), dashboardFile); + return new File(getUploadProfilesUserDir(userId), DASHBOARD_FILE); } public static File getUploadImportDir() { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e077ef36/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailForm.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailForm.java index 87d977d..3269cc5 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailForm.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailForm.java @@ -20,7 +20,6 @@ package org.apache.openmeetings.web.admin.email; import static org.apache.openmeetings.util.OpenmeetingsVariables.WEB_DATE_PATTERN; import static org.apache.openmeetings.web.app.Application.getBean; -import static org.apache.openmeetings.web.app.WebSession.getUserId; import static org.apache.wicket.datetime.markup.html.basic.DateLabel.forDatePattern; import java.util.Date; @@ -79,7 +78,7 @@ public class EmailForm extends Form<MailMessage> { @Override protected void onSubmit(AjaxRequestTarget target) { - getBean(MailMessageDao.class).delete(getModelObject().getId(), getUserId()); + getBean(MailMessageDao.class).delete(getModelObject().getId()); setModelObject(new MailMessage()); target.add(list, EmailForm.this); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e077ef36/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java index c9a1d9b..6685fbf 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java @@ -142,7 +142,7 @@ public class GroupUsersPanel extends Panel { @Override public long size() { - return users2add.size() + (search == null ? getDao().count(groupId) : getDao().count(groupId, search)); + return users2add.size() + (search == null ? getDao().count(groupId) : getDao().count(search)); } @Override http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e077ef36/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RedirectMessageDialog.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RedirectMessageDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RedirectMessageDialog.java index 26b9f82..10b9aaa 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RedirectMessageDialog.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RedirectMessageDialog.java @@ -36,7 +36,7 @@ import com.googlecode.wicket.jquery.ui.widget.dialog.DialogIcon; public class RedirectMessageDialog extends NonClosableMessageDialog { private static final long serialVersionUID = 1L; - private static final int delay = 5; + private static final int DELAY = 5; private final String labelId; private final String url; private final boolean autoOpen; @@ -58,7 +58,7 @@ public class RedirectMessageDialog extends NonClosableMessageDialog { } private void startTimer(IPartialPageRequestHandler handler) { - label.add(new OmRedirectTimerBehavior(delay, labelId) { + label.add(new OmRedirectTimerBehavior(DELAY, labelId) { private static final long serialVersionUID = 1L; @Override http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e077ef36/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js index 930e381..54e3b43 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js @@ -63,29 +63,24 @@ var VideoUtil = (function() { this.bottom = t + h; } }; - //console.log("Area " + JSON.stringify(area)); let minY = area.bottom, posFound; do { posFound = true - //console.log("Checking RECT " + JSON.stringify(rectNew)); for (let i = 0; i < list.length; ++i) { const rect = list[i]; minY = Math.min(minY, rect.bottom); if (rectNew.left < rect.right && rectNew.right > rect.left && rectNew.top < rect.bottom && rectNew.bottom > rect.top) { rectNew.left = rect.right + offsetX; - //console.log("Intersecting with " + JSON.stringify(rect) + ", new RECT " + JSON.stringify(rectNew)); posFound = false; } if (rectNew.right >= area.right) { rectNew.left = area.left; rectNew.top = minY + offsetY; - //console.log("End of the row, new RECT " + JSON.stringify(rectNew)); posFound = false; } if (rectNew.bottom >= area.bottom) { rectNew.top = area.top; - //console.log("Bottom of the area, new RECT " + JSON.stringify(rectNew)); posFound = true; break; } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e077ef36/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java ---------------------------------------------------------------------- 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 b776adf..4bc7cb3 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 @@ -72,7 +72,7 @@ import com.googlecode.wicket.jquery.ui.form.button.Button; public class CalendarPanel extends UserBasePanel { private static final Logger log = Red5LoggerFactory.getLogger(CalendarPanel.class, getWebAppRootKey()); private static final long serialVersionUID = 1L; - private static final String javaScriptMarkup = "setCalendarHeight();"; + private static final String JS_MARKUP = "setCalendarHeight();"; private final String javaScriptAddDatepicker; private final AbstractAjaxTimerBehavior refreshTimer = new AbstractAjaxTimerBehavior(Duration.seconds(10)) { private static final long serialVersionUID = 1L; @@ -350,10 +350,10 @@ public class CalendarPanel extends UserBasePanel { Optional<AjaxRequestTarget> target = getRequestCycle().find(AjaxRequestTarget.class); if (target.isPresent()) { - target.get().appendJavaScript(javaScriptMarkup); + target.get().appendJavaScript(JS_MARKUP); target.get().appendJavaScript(javaScriptAddDatepicker); } else { - response.render(JavaScriptHeaderItem.forScript(javaScriptMarkup, this.getId())); + response.render(JavaScriptHeaderItem.forScript(JS_MARKUP, this.getId())); } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e077ef36/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/Mp4RecordingResourceReference.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/Mp4RecordingResourceReference.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/Mp4RecordingResourceReference.java index 3008d81..3eb006d 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/Mp4RecordingResourceReference.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/Mp4RecordingResourceReference.java @@ -20,7 +20,7 @@ package org.apache.openmeetings.web.user.record; import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_MP4; import static org.apache.openmeetings.util.OmFileHelper.MP4_MIME_TYPE; -import static org.apache.openmeetings.util.OmFileHelper.recordingFileName; +import static org.apache.openmeetings.util.OmFileHelper.RECORDING_FILE_NAME; import java.io.File; @@ -41,7 +41,7 @@ public class Mp4RecordingResourceReference extends RecordingResourceReference { @Override protected String getFileName(Recording r) { - return String.format("%s%s.%s", recordingFileName, r.getId(), EXTENSION_MP4); + return String.format("%s%s.%s", RECORDING_FILE_NAME, r.getId(), EXTENSION_MP4); } @Override http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e077ef36/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/PngRecordingResourceReference.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/PngRecordingResourceReference.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/PngRecordingResourceReference.java index 181d6f6..4b200f7 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/PngRecordingResourceReference.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/PngRecordingResourceReference.java @@ -20,7 +20,7 @@ package org.apache.openmeetings.web.user.record; import static org.apache.openmeetings.util.OmFileHelper.EXTENSION_PNG; import static org.apache.openmeetings.util.OmFileHelper.PNG_MIME_TYPE; -import static org.apache.openmeetings.util.OmFileHelper.recordingFileName; +import static org.apache.openmeetings.util.OmFileHelper.RECORDING_FILE_NAME; import java.io.File; @@ -41,7 +41,7 @@ public class PngRecordingResourceReference extends RecordingResourceReference { @Override protected String getFileName(Recording r) { - return String.format("%s%s.%s", recordingFileName, r.getId(), EXTENSION_PNG); + return String.format("%s%s.%s", RECORDING_FILE_NAME, r.getId(), EXTENSION_PNG); } @Override http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e077ef36/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractWicketTester.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractWicketTester.java b/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractWicketTester.java index 69a9a50..d68cbe6 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractWicketTester.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/AbstractWicketTester.java @@ -109,7 +109,7 @@ public class AbstractWicketTester extends AbstractJUnitDefaults { assertTrue("Web session is not signed in for user: " + (login != null ? login : adminUsername), s.isSignedIn()); } - public <T extends Serializable> ButtonAjaxBehavior getButtonBehavior(String path, String name) { + public ButtonAjaxBehavior getButtonBehavior(String path, String name) { return getButtonBehavior(tester, path, name); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e077ef36/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestOldBackups.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestOldBackups.java b/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestOldBackups.java index 45509b3..8b2bf7b 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestOldBackups.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/backup/TestOldBackups.java @@ -29,13 +29,11 @@ import java.io.FileInputStream; import java.io.InputStream; import org.apache.openmeetings.AbstractJUnitDefaults; -import org.apache.openmeetings.backup.BackupImport; import org.apache.openmeetings.db.dao.calendar.AppointmentDao; import org.apache.openmeetings.db.dao.calendar.MeetingMemberDao; import org.apache.openmeetings.db.dao.room.RoomDao; import org.apache.openmeetings.db.dao.room.RoomGroupDao; import org.apache.openmeetings.db.dao.user.GroupDao; -import org.apache.openmeetings.db.dao.user.UserDao; import org.apache.openmeetings.db.entity.basic.Configuration; import org.junit.After; import org.junit.Test; @@ -45,14 +43,13 @@ import org.springframework.beans.factory.annotation.Autowired; public class TestOldBackups extends AbstractJUnitDefaults { private static final Logger log = Red5LoggerFactory.getLogger(TestOldBackups.class, getWebAppRootKey()); + private String cryptClass = null; @Autowired private BackupImport backupController; @Autowired private GroupDao groupDao; @Autowired - private UserDao userDao; - @Autowired private RoomDao roomDao; @Autowired private AppointmentDao appointmentDao; @@ -60,7 +57,6 @@ public class TestOldBackups extends AbstractJUnitDefaults { private MeetingMemberDao meetingMemberDao; @Autowired private RoomGroupDao roomGroupDao; - private String cryptClass = null; @Override public void setUp() throws Exception { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e077ef36/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestAppointmentAddAppointment.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestAppointmentAddAppointment.java b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestAppointmentAddAppointment.java index 6339b9c..8190c71 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestAppointmentAddAppointment.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestAppointmentAddAppointment.java @@ -32,7 +32,6 @@ import java.util.UUID; import org.apache.openmeetings.AbstractWicketTester; 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.Appointment.Reminder; import org.apache.openmeetings.db.entity.calendar.MeetingMember; @@ -53,8 +52,6 @@ public class TestAppointmentAddAppointment extends AbstractWicketTester { private AppointmentLogic appointmentLogic; @Autowired private AppointmentDao appointmentDao; - @Autowired - private UserDao userDao; private static void setTime(Appointment a) { a.setStart(Date.from(LocalDateTime.now().atZone(ZoneId.systemDefault()).toInstant())); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e077ef36/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureGetUserStart.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureGetUserStart.java b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureGetUserStart.java index 6c7b50c..98ac88e 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureGetUserStart.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureGetUserStart.java @@ -21,18 +21,13 @@ package org.apache.openmeetings.calendar; import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; import org.apache.openmeetings.AbstractJUnitDefaults; -import org.apache.openmeetings.db.dao.user.UserDao; import org.junit.Test; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; public class TestDatabaseStructureGetUserStart extends AbstractJUnitDefaults { private static final Logger log = Red5LoggerFactory.getLogger(TestDatabaseStructureGetUserStart.class, getWebAppRootKey()); - @Autowired - private UserDao userDao; - @Test public void testAddingGroup() { try { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e077ef36/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureUsersSearch.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureUsersSearch.java b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureUsersSearch.java index cb6d228..f6196e9 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureUsersSearch.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestDatabaseStructureUsersSearch.java @@ -19,22 +19,18 @@ package org.apache.openmeetings.calendar; import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKey; + import java.util.List; import org.apache.openmeetings.AbstractJUnitDefaults; -import org.apache.openmeetings.db.dao.user.UserDao; import org.apache.openmeetings.db.entity.user.User; import org.junit.Test; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; public class TestDatabaseStructureUsersSearch extends AbstractJUnitDefaults { private static final Logger log = Red5LoggerFactory.getLogger(TestDatabaseStructureUsersSearch.class, getWebAppRootKey()); - @Autowired - private UserDao userDao; - @Test public void testAddingGroup(){ try { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e077ef36/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestOmCalendar.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestOmCalendar.java b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestOmCalendar.java index dbaf91c..668308b 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestOmCalendar.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestOmCalendar.java @@ -23,7 +23,6 @@ import static org.junit.Assert.assertTrue; import org.apache.openmeetings.AbstractJUnitDefaults; import org.apache.openmeetings.db.dao.calendar.OmCalendarDao; -import org.apache.openmeetings.db.dao.user.UserDao; import org.apache.openmeetings.db.entity.calendar.OmCalendar; import org.apache.openmeetings.db.entity.user.User; import org.junit.Test; @@ -32,8 +31,6 @@ import org.springframework.beans.factory.annotation.Autowired; public class TestOmCalendar extends AbstractJUnitDefaults { @Autowired private OmCalendarDao calendarDao; - @Autowired - private UserDao userDao; @Test public void saveCalendar() { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e077ef36/openmeetings-web/src/test/java/org/apache/openmeetings/domain/TestAddGroup.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/domain/TestAddGroup.java b/openmeetings-web/src/test/java/org/apache/openmeetings/domain/TestAddGroup.java index 552b900..5375365 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/domain/TestAddGroup.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/domain/TestAddGroup.java @@ -23,7 +23,6 @@ import static org.junit.Assert.assertNotNull; import org.apache.openmeetings.AbstractJUnitDefaults; import org.apache.openmeetings.db.dao.user.GroupDao; -import org.apache.openmeetings.db.dao.user.UserDao; import org.apache.openmeetings.db.entity.user.Group; import org.apache.openmeetings.db.entity.user.GroupUser; import org.apache.openmeetings.db.entity.user.User; @@ -37,8 +36,6 @@ public class TestAddGroup extends AbstractJUnitDefaults { @Autowired private GroupDao groupDao; - @Autowired - private UserDao userDao; @Test public void testAddingGroup() { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e077ef36/openmeetings-web/src/test/java/org/apache/openmeetings/domain/TestUserGroupAggregation.java ---------------------------------------------------------------------- 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 accdcd0..c0ab4eb 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 @@ -23,20 +23,15 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import org.apache.openmeetings.AbstractJUnitDefaults; -import org.apache.openmeetings.db.dao.user.UserDao; import org.apache.openmeetings.db.entity.user.GroupUser; import org.apache.openmeetings.db.entity.user.User; import org.junit.Test; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; public class TestUserGroupAggregation extends AbstractJUnitDefaults { private static final Logger log = Red5LoggerFactory.getLogger(TestUserGroupAggregation.class, getWebAppRootKey()); - @Autowired - private UserDao userDao; - @Test public void testitNow() { User u = userDao.get(1L); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e077ef36/openmeetings-web/src/test/java/org/apache/openmeetings/invitiation/TestInvitation.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/invitiation/TestInvitation.java b/openmeetings-web/src/test/java/org/apache/openmeetings/invitiation/TestInvitation.java index a8daaf0..b9c1f99 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/invitiation/TestInvitation.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/invitiation/TestInvitation.java @@ -24,7 +24,6 @@ import java.time.LocalDateTime; import org.apache.openmeetings.AbstractWicketTester; import org.apache.openmeetings.db.dao.room.RoomDao; -import org.apache.openmeetings.db.dao.user.UserDao; import org.apache.openmeetings.db.entity.room.Invitation; import org.apache.openmeetings.db.entity.room.Invitation.MessageType; import org.apache.openmeetings.db.entity.room.Invitation.Valid; @@ -37,8 +36,6 @@ public class TestInvitation extends AbstractWicketTester { @Autowired private InvitationManager invitationManager; @Autowired - private UserDao userDao; - @Autowired private RoomDao roomDao; @Test http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e077ef36/openmeetings-web/src/test/java/org/apache/openmeetings/smoke/TestSmokeBasic.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/smoke/TestSmokeBasic.java b/openmeetings-web/src/test/java/org/apache/openmeetings/smoke/TestSmokeBasic.java index 9a8b2cc..a612af0 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/smoke/TestSmokeBasic.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/smoke/TestSmokeBasic.java @@ -21,14 +21,9 @@ package org.apache.openmeetings.smoke; import static org.junit.Assert.assertNotNull; import org.apache.openmeetings.AbstractJUnitDefaults; -import org.apache.openmeetings.db.dao.user.UserDao; import org.junit.Test; -import org.springframework.beans.factory.annotation.Autowired; public class TestSmokeBasic extends AbstractJUnitDefaults { - @Autowired - private UserDao userDao; - @Test public void createErrorValueAndTest() { assertNotNull(userDao.get(1L)); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e077ef36/openmeetings-web/src/test/java/org/apache/openmeetings/user/TestUserContact.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/user/TestUserContact.java b/openmeetings-web/src/test/java/org/apache/openmeetings/user/TestUserContact.java index d5c8343..e48811e 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/user/TestUserContact.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/user/TestUserContact.java @@ -29,7 +29,6 @@ import java.util.UUID; import org.apache.openmeetings.AbstractWicketTester; import org.apache.openmeetings.db.dao.user.GroupDao; -import org.apache.openmeetings.db.dao.user.UserDao; import org.apache.openmeetings.db.entity.user.GroupUser; import org.apache.openmeetings.db.entity.user.User; import org.junit.Test; @@ -37,8 +36,6 @@ import org.springframework.beans.factory.annotation.Autowired; public class TestUserContact extends AbstractWicketTester { @Autowired - private UserDao userDao; - @Autowired private GroupDao groupDao; @Test http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e077ef36/openmeetings-web/src/test/java/org/apache/openmeetings/user/TestUserCount.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/user/TestUserCount.java b/openmeetings-web/src/test/java/org/apache/openmeetings/user/TestUserCount.java index 1a539fb..db32a41 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/user/TestUserCount.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/user/TestUserCount.java @@ -22,15 +22,10 @@ import static org.apache.openmeetings.web.app.WebSession.getUserId; import static org.junit.Assert.assertTrue; import org.apache.openmeetings.AbstractWicketTester; -import org.apache.openmeetings.db.dao.user.UserDao; import org.apache.openmeetings.db.entity.user.User; import org.junit.Test; -import org.springframework.beans.factory.annotation.Autowired; public class TestUserCount extends AbstractWicketTester { - @Autowired - private UserDao userDao; - @Test public void testCountSearchUsers() throws Exception { User u = createUser(); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e077ef36/openmeetings-web/src/test/java/org/apache/openmeetings/user/TestUserGroup.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/user/TestUserGroup.java b/openmeetings-web/src/test/java/org/apache/openmeetings/user/TestUserGroup.java index 82bdd36..fcf756c 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/user/TestUserGroup.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/user/TestUserGroup.java @@ -28,7 +28,6 @@ import java.util.UUID; import org.apache.openmeetings.AbstractJUnitDefaults; import org.apache.openmeetings.db.dao.user.GroupDao; import org.apache.openmeetings.db.dao.user.GroupUserDao; -import org.apache.openmeetings.db.dao.user.UserDao; import org.apache.openmeetings.db.entity.user.Group; import org.apache.openmeetings.db.entity.user.GroupUser; import org.apache.openmeetings.db.entity.user.User; @@ -39,13 +38,11 @@ import org.junit.experimental.categories.Category; import org.springframework.beans.factory.annotation.Autowired; public class TestUserGroup extends AbstractJUnitDefaults { + public static final String GROUP_NAME = "Test Group"; @Autowired private GroupUserDao groupUserDao; @Autowired private GroupDao groupDao; - @Autowired - private UserDao userDao; - public static final String GROUP_NAME = "Test Group"; private User getValidUser() { for (User u : userDao.getAllBackupUsers()) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e077ef36/openmeetings-web/src/test/java/org/apache/openmeetings/userdata/TestLogin.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/userdata/TestLogin.java b/openmeetings-web/src/test/java/org/apache/openmeetings/userdata/TestLogin.java index 559217e..a849033 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/userdata/TestLogin.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/userdata/TestLogin.java @@ -21,16 +21,11 @@ package org.apache.openmeetings.userdata; import static org.junit.Assert.assertNotNull; import org.apache.openmeetings.AbstractJUnitDefaults; -import org.apache.openmeetings.db.dao.user.UserDao; import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.util.OmException; import org.junit.Test; -import org.springframework.beans.factory.annotation.Autowired; public class TestLogin extends AbstractJUnitDefaults { - @Autowired - private UserDao userDao; - @Test public void testTestLogin() throws OmException { User us = userDao.login(adminUsername, userpass); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e077ef36/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestCalendarService.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestCalendarService.java b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestCalendarService.java index 44618a1..f7c780e 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestCalendarService.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestCalendarService.java @@ -36,7 +36,6 @@ import org.apache.openmeetings.db.dao.calendar.MeetingMemberDao; import org.apache.openmeetings.db.dao.room.InvitationDao; import org.apache.openmeetings.db.dao.room.RoomDao; import org.apache.openmeetings.db.dao.user.GroupDao; -import org.apache.openmeetings.db.dao.user.UserDao; import org.apache.openmeetings.db.dto.basic.ServiceResult; import org.apache.openmeetings.db.dto.calendar.AppointmentDTO; import org.apache.openmeetings.db.dto.calendar.MeetingMemberDTO; @@ -62,8 +61,6 @@ public class TestCalendarService extends AbstractWebServiceTest { private MeetingMemberDao mmDao; @Autowired private InvitationDao invitationDao; - @Autowired - private UserDao userDao; private void actualTest(Room r) throws Exception { String uuid = UUID.randomUUID().toString(); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e077ef36/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestInfoService.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestInfoService.java b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestInfoService.java index 1ea7d94..e975e76 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestInfoService.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestInfoService.java @@ -24,8 +24,6 @@ import org.apache.openmeetings.db.dto.basic.Info; import org.junit.Test; public class TestInfoService extends AbstractWebServiceTest { - public static final String INFO_SERVICE_URL = BASE_SERVICES_URL + "/info"; - @Test public void infoTest() { Info info = getClient(INFO_SERVICE_URL).path("/version").get(Info.class);
