Repository: openmeetings Updated Branches: refs/heads/master 8a3ccd5ec -> 396c931b7
[OPENMEETINGS-1714] some issues reported by sonar are addressed Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/396c931b Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/396c931b Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/396c931b Branch: refs/heads/master Commit: 396c931b7cf8f54577f6f744e4cbb24e9274675b Parents: 8a3ccd5 Author: Maxim Solodovnik <[email protected]> Authored: Thu Sep 28 15:09:56 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Thu Sep 28 15:09:56 2017 +0700 ---------------------------------------------------------------------- .../core/converter/BaseConverter.java | 22 +++++++++ .../core/converter/InterviewConverter.java | 50 +++++++------------- .../core/converter/RecordingConverter.java | 41 +++++----------- .../core/data/whiteboard/WhiteboardCache.java | 12 ++--- .../core/ldap/LdapLoginManagement.java | 8 ++-- .../openmeetings/core/mail/MailHandler.java | 2 +- .../db/dao/calendar/AppointmentDao.java | 4 +- .../openmeetings/db/dao/label/LabelDao.java | 6 +-- .../db/dao/record/RecordingMetaDataDao.java | 4 +- .../db/dao/server/SessiondataDao.java | 14 +++--- .../openmeetings/db/dao/user/GroupUserDao.java | 4 +- .../db/dao/user/UserContactDao.java | 4 +- .../openmeetings/db/dao/user/UserDao.java | 4 +- .../db/entity/basic/Configuration.java | 2 +- .../installation/ImportInitvalues.java | 26 +++++----- .../InstallationDocumentHandler.java | 4 +- .../screenshare/ScreenV1Encoder.java | 6 +-- .../openmeetings/screenshare/job/RemoteJob.java | 2 +- .../openmeetings/screenshare/job/SendJob.java | 2 +- .../calendar/caldav/AppointmentManager.java | 2 +- .../service/calendar/caldav/iCalUtils.java | 17 ++++--- .../subject/RecordingExpiringTemplate.java | 2 +- .../service/room/InvitationManager.java | 5 +- .../openmeetings/service/user/UserManager.java | 7 ++- .../openmeetings/util/CalendarHelper.java | 16 ++----- .../openmeetings/util/CalendarPatterns.java | 6 +-- .../util/OpenmeetingsVariables.java | 2 +- .../openmeetings/util/mail/IcalHandler.java | 12 ++--- .../util/process/ProcessHelper.java | 2 +- .../openmeetings/web/admin/users/UserForm.java | 4 +- .../openmeetings/web/app/Application.java | 3 +- .../apache/openmeetings/web/app/WebSession.java | 2 +- .../apache/openmeetings/web/common/Captcha.java | 5 +- .../openmeetings/web/common/IUpdatable.java | 4 +- .../openmeetings/web/common/InvitationForm.java | 2 +- .../openmeetings/web/pages/auth/SignInPage.java | 10 ++-- .../web/pages/install/InstallWizard.java | 6 +-- .../apache/openmeetings/web/room/RoomPanel.java | 2 +- .../web/room/RoomResourceReference.java | 2 +- 39 files changed, 151 insertions(+), 177 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/396c931b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java index d2d6e1d..7096ed4 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java @@ -40,6 +40,7 @@ import java.util.regex.Pattern; import org.apache.directory.api.util.Strings; import org.apache.openmeetings.db.dao.basic.ConfigurationDao; +import org.apache.openmeetings.db.dao.file.FileItemLogDao; import org.apache.openmeetings.db.dao.record.RecordingMetaDataDao; import org.apache.openmeetings.db.dao.record.RecordingMetaDeltaDao; import org.apache.openmeetings.db.entity.file.BaseFileItem; @@ -66,6 +67,8 @@ public abstract class BaseConverter { private RecordingMetaDataDao metaDataDao; @Autowired private RecordingMetaDeltaDao metaDeltaDao; + @Autowired + protected FileItemLogDao logDao; protected static class Dimension { public int width = 0; @@ -407,4 +410,23 @@ public abstract class BaseConverter { return new Dimension(100, 100); // will return 100x100 for non-video to be able to play } + + protected void postProcess(Recording r, String mp4path, List<ConverterProcessResult> logs, List<File> waveFiles) throws IOException { + convertToPng(r, mp4path, logs); + + updateDuration(r); + r.setStatus(Recording.Status.PROCESSED); + + logDao.delete(r); + for (ConverterProcessResult returnMap : logs) { + logDao.add("generateFFMPEG", r, returnMap); + } + + // Delete Wave Files + for (File audio : waveFiles) { + if (audio.exists()) { + audio.delete(); + } + } + } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/396c931b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java index 8b7628a..86c917a 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java @@ -29,7 +29,6 @@ import java.util.ArrayList; import java.util.List; import java.util.UUID; -import org.apache.openmeetings.db.dao.file.FileItemLogDao; import org.apache.openmeetings.db.dao.record.RecordingDao; import org.apache.openmeetings.db.dao.record.RecordingMetaDataDao; import org.apache.openmeetings.db.entity.record.Recording; @@ -60,8 +59,6 @@ public class InterviewConverter extends BaseConverter implements IRecordingConve private RecordingDao recordingDao; @Autowired private RecordingMetaDataDao metaDataDao; - @Autowired - private FileItemLogDao logDao; private String[] mergeAudioToWaves(List<File> waveFiles, File wav, List<RecordingMetaData> metaDataList, ReConverterParams rcv) throws IOException { @@ -120,21 +117,10 @@ public class InterviewConverter extends BaseConverter implements IRecordingConve // Merge Wave to Full Length File streamFolderGeneral = getStreamsHibernateDir(); - File wav = new File(streamFolder, "INTERVIEW_" + r.getId() + "_FINAL_WAVE.wav"); + File wav = new File(streamFolder, String.format("INTERVIEW_%s_FINAL_WAVE.wav", r.getId())); deleteFileIfExists(wav); - if (waveFiles.size() == 1) { - wav = waveFiles.get(0); - } else if (waveFiles.size() > 0) { - String[] argv_full_sox; - if (reconversion) { - argv_full_sox = mergeAudioToWaves(waveFiles, wav, metaDataList, rcv); - } else { - argv_full_sox = mergeAudioToWaves(waveFiles, wav); - } - - logs.add(ProcessHelper.executeScript("mergeAudioToWaves", argv_full_sox)); - } else { + if (waveFiles.isEmpty()) { // create default Audio to merge it. // strip to content length File outputWav = new File(streamFolderGeneral, "one_second.wav"); @@ -142,9 +128,20 @@ public class InterviewConverter extends BaseConverter implements IRecordingConve // Calculate delta at beginning double deltaPadding = diffSeconds(r.getRecordEnd(), r.getRecordStart()); - String[] cmdSox = new String[] { getPathToSoX(), outputWav.getCanonicalPath(), wav.getCanonicalPath(), "pad", "0", "" + deltaPadding }; + String[] cmdSox = new String[] { getPathToSoX(), outputWav.getCanonicalPath(), wav.getCanonicalPath(), "pad", "0", String.valueOf(deltaPadding) }; logs.add(ProcessHelper.executeScript("generateSampleAudio", cmdSox)); + } else if (waveFiles.size() == 1) { + wav = waveFiles.get(0); + } else { + String[] argv_full_sox; + if (reconversion) { + argv_full_sox = mergeAudioToWaves(waveFiles, wav, metaDataList, rcv); + } else { + argv_full_sox = mergeAudioToWaves(waveFiles, wav); + } + + logs.add(ProcessHelper.executeScript("mergeAudioToWaves", argv_full_sox)); } // Default Image for empty interview video pods final File defaultInterviewImageFile = new File(streamFolderGeneral, "default_interview_image.png"); @@ -183,7 +180,7 @@ public class InterviewConverter extends BaseConverter implements IRecordingConve if (diff != 0L) { // stub to add // ffmpeg -y -loop 1 -i /home/solomax/work/openmeetings/branches/3.0.x/dist/red5/webapps/openmeetings/streams/hibernate/default_interview_image.jpg -filter_complex '[0:0]scale=320:260' -c:v libx264 -t 00:00:29.059 -pix_fmt yuv420p out.flv - File podFB = new File(streamFolder, meta.getStreamName() + "_pod_" + pod + "_blank.flv"); + File podFB = new File(streamFolder, String.format("%s_pod_%s_blank.flv", meta.getStreamName(), pod)); String podPB = podFB.getCanonicalPath(); String[] argsPodB = new String[] { getPathToFFMPEG(), "-y" // , "-loop", "1", "-i", defaultInterviewImageFile.getCanonicalPath() // @@ -258,22 +255,7 @@ public class InterviewConverter extends BaseConverter implements IRecordingConve String mp4path = convertToMp4(r, args, logs); - convertToPng(r, mp4path, logs); - - updateDuration(r); - r.setStatus(Recording.Status.PROCESSED); - - logDao.delete(r); - for (ConverterProcessResult returnMap : logs) { - logDao.add("generateFFMPEG", r, returnMap); - } - - // Delete Wave Files - for (File audio : waveFiles) { - if (audio.exists()) { - audio.delete(); - } - } + postProcess(r, mp4path, logs, waveFiles); } catch (Exception err) { log.error("[startConversion]", err); r.setStatus(Recording.Status.ERROR); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/396c931b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/RecordingConverter.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/RecordingConverter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/RecordingConverter.java index 232ff97..cccf647 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/RecordingConverter.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/RecordingConverter.java @@ -28,7 +28,6 @@ import java.util.Arrays; import java.util.List; import java.util.UUID; -import org.apache.openmeetings.db.dao.file.FileItemLogDao; import org.apache.openmeetings.db.dao.record.RecordingDao; import org.apache.openmeetings.db.dao.record.RecordingMetaDataDao; import org.apache.openmeetings.db.entity.record.Recording; @@ -52,8 +51,6 @@ public class RecordingConverter extends BaseConverter implements IRecordingConve private RecordingDao recordingDao; @Autowired private RecordingMetaDataDao metaDataDao; - @Autowired - private FileItemLogDao logDao; @Override public void startConversion(Long id) { @@ -91,22 +88,22 @@ public class RecordingConverter extends BaseConverter implements IRecordingConve // Merge Wave to Full Length File wav = new File(streamFolder, screenMetaData.getStreamName() + "_FINAL_WAVE.wav"); - if (waveFiles.size() == 1) { - wav = waveFiles.get(0); - } else if (waveFiles.size() > 0) { - String[] argv_full_sox = mergeAudioToWaves(waveFiles, wav); - - logs.add(ProcessHelper.executeScript("mergeAudioToWaves", argv_full_sox)); - } else { + if (waveFiles.isEmpty()) { // create default Audio to merge it. strip to content length String oneSecWav = new File(getStreamsHibernateDir(), "one_second.wav").getCanonicalPath(); // Calculate delta at beginning double duration = diffSeconds(r.getRecordEnd(), r.getRecordStart()); - String[] cmd = new String[] { getPathToSoX(), oneSecWav, wav.getCanonicalPath(), "pad", "0", "" + duration }; + String[] cmd = new String[] { getPathToSoX(), oneSecWav, wav.getCanonicalPath(), "pad", "0", String.valueOf(duration) }; logs.add(ProcessHelper.executeScript("generateSampleAudio", cmd)); + } else if (waveFiles.size() == 1) { + wav = waveFiles.get(0); + } else { + String[] argv_full_sox = mergeAudioToWaves(waveFiles, wav); + + logs.add(ProcessHelper.executeScript("mergeAudioToWaves", argv_full_sox)); } screenMetaData.setFullWavAudioData(wav.getName()); metaDataDao.update(screenMetaData); @@ -126,8 +123,8 @@ public class RecordingConverter extends BaseConverter implements IRecordingConve log.debug("flvWidth -1- " + flvWidth); log.debug("flvHeight -1- " + flvHeight); - flvWidth = Double.valueOf((Math.floor(flvWidth / 16)) * 16).intValue(); - flvHeight = Double.valueOf((Math.floor(flvHeight / 16)) * 16).intValue(); + flvWidth = (int)(16. * flvWidth / 16); + flvHeight = (int)(16. * flvHeight / 16); log.debug("flvWidth -2- " + flvWidth); log.debug("flvHeight -2- " + flvHeight); @@ -140,23 +137,7 @@ public class RecordingConverter extends BaseConverter implements IRecordingConve "-i", inputScreenFullFlv, "-i", wav.getCanonicalPath() ), logs); - convertToPng(r, mp4path, logs); - - updateDuration(r); - r.setStatus(Recording.Status.PROCESSED); - - logDao.delete(r); - for (ConverterProcessResult returnMap : logs) { - logDao.add("generateFFMPEG", r, returnMap); - } - - // Delete Wave Files - for (File audio : waveFiles) { - if (audio.exists()) { - audio.delete(); - } - } - + postProcess(r, mp4path, logs, waveFiles); } catch (Exception err) { log.error("[startConversion]", err); r.setStatus(Recording.Status.ERROR); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/396c931b/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardCache.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardCache.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardCache.java index 60a09d0..666a57c 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardCache.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardCache.java @@ -75,7 +75,7 @@ public class WhiteboardCache { return wbs; } - public static Set<Entry<Long, Whiteboard>> list(Long roomId, Long langId) { + public static Set<Entry<Long, Whiteboard>> list(long roomId, Long langId) { Whiteboards wbs = get(roomId); if (wbs.getWhiteboards().isEmpty()) { Whiteboard wb = add(wbs, langId); @@ -85,7 +85,7 @@ public class WhiteboardCache { return wbs.getWhiteboards().entrySet(); } - public static Whiteboard add(Long roomId, Long langId) { + public static Whiteboard add(long roomId, Long langId) { Whiteboards wbs = get(roomId); Whiteboard wb = add(wbs, langId); update(wbs); @@ -98,7 +98,7 @@ public class WhiteboardCache { return wb; } - public static Whiteboard clear(Long roomId, Long wbId) { + public static Whiteboard clear(long roomId, Long wbId) { Whiteboards wbs = get(roomId); Whiteboard wb = wbs.get(wbId); if (wb != null) { @@ -108,20 +108,20 @@ public class WhiteboardCache { return wb; } - public static Whiteboard remove(Long roomId, Long wbId) { + public static Whiteboard remove(long roomId, Long wbId) { Whiteboards wbs = get(roomId); Whiteboard wb = wbs.getWhiteboards().remove(wbId); update(wbs); return wb; } - public static void activate(Long roomId, Long wbId) { + public static void activate(long roomId, Long wbId) { Whiteboards wbs = get(roomId); wbs.setActiveWb(wbId); update(wbs); } - public static void update(Long roomId, Whiteboard wb) { + public static void update(long roomId, Whiteboard wb) { Whiteboards wbs = get(roomId); wbs.update(wb); update(wbs); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/396c931b/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java index 2a15343..3f191a0 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java @@ -167,18 +167,16 @@ public class LdapLoginManagement { * Connection Data is retrieved from ConfigurationFile * */ - public User login(String login, String passwd, Long domainId) throws OmException { + public User login(String _login, String passwd, Long domainId) throws OmException { log.debug("LdapLoginmanagement.doLdapLogin"); - if (!userDao.validLogin(login)) { + if (!userDao.validLogin(_login)) { log.error("Invalid login provided"); return null; } User u = null; try (LdapWorker w = new LdapWorker(domainId)) { - if (w.options.useLowerCase) { - login = login.toLowerCase(); - } + String login = w.options.useLowerCase ? _login.toLowerCase() : _login; boolean authenticated = true; Dn userDn = null; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/396c931b/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java ---------------------------------------------------------------------- diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java index d1f6a12..a07c96a 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/MailHandler.java @@ -184,7 +184,7 @@ public class MailHandler { props.put("mail.smtp.timeout", smtpTimeOut); // Check for Authentication - Session session = null; + Session session; if (!Strings.isEmpty(mailAuthUser) && !Strings.isEmpty(mailAuthPass)) { // use SMTP Authentication props.put("mail.smtp.auth", "true"); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/396c931b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java index 9449ebc..912c1e0 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/calendar/AppointmentDao.java @@ -251,7 +251,7 @@ public class AppointmentDao { .setParameter("roomId", roomId) .getResultList(); - return list.size() > 0 ? list.get(0) : null; + return list.isEmpty() ? null : list.get(0); } catch (Exception e) { log.error("[getByRoom]", e); return null; @@ -263,7 +263,7 @@ public class AppointmentDao { .setParameter("roomId", roomId) .getResultList(); - Appointment a = list.size() > 0 ? list.get(0) : null; + Appointment a = list.isEmpty() ? null : list.get(0); if (a != null && !a.getRoom().isAppointment()) { throw new RuntimeException("Room " + a.getRoom().getName() + " isnt part of an appointed meeting"); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/396c931b/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 299ee15..d9257f9 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 @@ -181,9 +181,7 @@ public class LabelDao implements IDataProviderDao<StringLabel>{ private static List<StringLabel> getLabels(Locale l, final String search) { if (!labelCache.containsKey(l)) { List<StringLabel> ll = getLabels(l); - if (ll != null) { - labelCache.putIfAbsent(l, ll); - } + labelCache.putIfAbsent(l, ll); } List<StringLabel> result = new ArrayList<>(labelCache.containsKey(l) ? labelCache.get(l) : new ArrayList<StringLabel>()); if (!Strings.isEmpty(search)) { @@ -303,7 +301,7 @@ public class LabelDao implements IDataProviderDao<StringLabel>{ @Override public int compare(StringLabel o1, StringLabel o2) { - int val = 0; + int val; if (KEY_ATTR.equals(sort.getProperty())) { try { int i1 = Integer.parseInt(o1.getKey()), i2 = Integer.parseInt(o2.getKey()); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/396c931b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDataDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDataDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDataDao.java index 3394597..7131f5a 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDataDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/record/RecordingMetaDataDao.java @@ -87,9 +87,7 @@ public class RecordingMetaDataDao { List<RecordingMetaData> metaDatas = query.getResultList(); - if (metaDatas.size() > 0) { - return metaDatas.get(0); - } + return metaDatas.isEmpty() ? null : metaDatas.get(0); } catch (Exception ex2) { log.error("[getScreenMetaDataByRecording]: ", ex2); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/396c931b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java index 4eff9dd..9d07538 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/server/SessiondataDao.java @@ -20,6 +20,7 @@ package org.apache.openmeetings.db.dao.server; import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; +import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.UUID; @@ -102,11 +103,12 @@ public class SessiondataDao { .setParameter("sessionId", String.format("%%%s%%", SID)).getResultList(); Sessiondata sd = null; - if (sessions != null && sessions.size() > 0) { - sd = sessions.get(0); - if (sd == null || sd.getUserId() == null || sd.getUserId().equals(new Long(0))) { - return null; - } + if (sessions == null || sessions.isEmpty()) { + return null; + } + sd = sessions.get(0); + if (sd == null || sd.getUserId() == null || sd.getUserId().equals(new Long(0))) { + return null; } return sd; } @@ -184,7 +186,7 @@ public class SessiondataDao { } catch (Exception ex2) { log.error("[getSessionToDelete]: ", ex2); } - return null; + return new ArrayList<>(); } /** http://git-wip-us.apache.org/repos/asf/openmeetings/blob/396c931b/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 1262804..67b53dc 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 @@ -89,8 +89,8 @@ public class GroupUserDao implements IDataProviderDao<GroupUser> { } public boolean isUserInGroup(long groupId, long userId) { - return em.createNamedQuery("isUserInGroup", GroupUser.class) - .setParameter("groupId", groupId).setParameter("userId", userId).getResultList().size() > 0; + return !em.createNamedQuery("isUserInGroup", GroupUser.class) + .setParameter("groupId", groupId).setParameter("userId", userId).getResultList().isEmpty(); } @Override http://git-wip-us.apache.org/repos/asf/openmeetings/blob/396c931b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java index e25ec5f..bb35727 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserContactDao.java @@ -125,9 +125,7 @@ public class UserContactDao { query.setParameter("userId", userId); query.setParameter("shareCalendar", shareCalendar); List<UserContact> ll = query.getResultList(); - if (ll.size() > 0) { - return ll.get(0); - } + return ll.isEmpty() ? null : ll.get(0); } catch (Exception e) { log.error("[getUserContactByShareCalendar]", e); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/396c931b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/user/UserDao.java ---------------------------------------------------------------------- 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 b2f48f6..8d7fcb4 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 @@ -384,8 +384,8 @@ public class UserDao implements IGroupAdminDataProviderDao<User> { return u == null || u.getId().equals(id); } catch (Exception e) { //exception is thrown in case of non-unique result - return false; } + return false; } public boolean validLogin(String login) { @@ -643,7 +643,7 @@ public class UserDao implements IGroupAdminDataProviderDao<User> { log.debug("login:: {} users were found", users.size()); - if (users.size() == 0) { + if (users.isEmpty()) { log.debug("No users was found: {}", userOrEmail); return null; } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/396c931b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java index 12f7aa0..2e36c3b 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java @@ -203,7 +203,7 @@ public class Configuration implements IDataProviderEntity { } public void setValueB(boolean value) { - this.value = "" + value; + this.value = String.valueOf(value); } public String getFromVersion() { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/396c931b/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java ---------------------------------------------------------------------- diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java b/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java index f5a1600..3070f27 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java @@ -171,7 +171,7 @@ public class ImportInitvalues { + "for more Information see http://openmeetings.apache.org/CustomCryptMechanism.html"; , "1.9.x"); - addCfg(list, CONFIG_REGISTER_FRONTEND, "" + cfg.allowFrontendRegister, Configuration.Type.bool + addCfg(list, CONFIG_REGISTER_FRONTEND, String.valueOf(cfg.allowFrontendRegister), Configuration.Type.bool , "Is user register available on login screen", "1.8.x"); addCfg(list, CONFIG_REGISTER_SOAP, "true", Configuration.Type.bool, "Is user register available via SOAP/REST", "3.0.x"); addCfg(list, CONFIG_REGISTER_OAUTH, "true", Configuration.Type.bool, "Is user register available via OAuth", "3.0.x"); @@ -180,7 +180,7 @@ public class ImportInitvalues { addCfg(list, CONFIG_SMTP_SERVER, cfg.smtpServer, Configuration.Type.string, "this is the smtp server to send messages", "1.9.x"); - addCfg(list, CONFIG_SMTP_PORT, "" + cfg.smtpPort, Configuration.Type.number, "this is the smtp server port normally 25", "1.9.x"); + addCfg(list, CONFIG_SMTP_PORT, String.valueOf(cfg.smtpPort), Configuration.Type.number, "this is the smtp server port normally 25", "1.9.x"); addCfg(list, CONFIG_SMTP_SYSTEM_EMAIL, cfg.mailReferer, Configuration.Type.string, "all send e-mails by the system will have this address", "1.9.x"); @@ -188,7 +188,7 @@ public class ImportInitvalues { addCfg(list, CONFIG_SMTP_PASS, cfg.mailAuthPass, Configuration.Type.string, "System auth email password", "1.9.x"); - addCfg(list, CONFIG_SMTP_TLS, "" + cfg.mailUseTls, Configuration.Type.bool, "Enable TLS", "1.9.x"); + addCfg(list, CONFIG_SMTP_TLS, String.valueOf(cfg.mailUseTls), Configuration.Type.bool, "Enable TLS", "1.9.x"); addCfg(list, CONFIG_SMTP_TIMEOUT_CON, "30000", Configuration.Type.number, "Socket connection timeout value in milliseconds. Default is 30 seconds (30000).", "1.9.x"); @@ -201,10 +201,10 @@ public class ImportInitvalues { // "1" == "EN" addCfg(list, CONFIG_DEFAULT_LANG, cfg.defaultLangId, Configuration.Type.number, "Default System Language ID see languages.xml", "1.8.x"); - addCfg(list, CONFIG_DOCUMENT_DPI, "" + cfg.docDpi, Configuration.Type.number, + addCfg(list, CONFIG_DOCUMENT_DPI, String.valueOf(cfg.docDpi), Configuration.Type.number, "dpi for conversion of PDF to images (should be an integer between 50 and 600 with a default value of 150 dpi)", "2.0.x"); - addCfg(list, CONFIG_DOCUMENT_QUALITY, "" + cfg.docQuality, Configuration.Type.number, + addCfg(list, CONFIG_DOCUMENT_QUALITY, String.valueOf(cfg.docQuality), Configuration.Type.number, "compression quality for conversion of PDF to images (should be an integer between 1 and 100, with a default value of 90)", "2.0.x"); addCfg(list, CONFIG_PATH_IMAGEMAGIC, cfg.imageMagicPath, Configuration.Type.string, "Path to ImageMagick tools", "2.0.x"); @@ -219,7 +219,7 @@ public class ImportInitvalues { addCfg(list, CONFIG_DASHBOARD_RSS_FEED2, cfg.urlFeed2, Configuration.Type.string, "Feed URL 2", "1.9.x"); - addCfg(list, CONFIG_EMAIL_AT_REGISTER, "" + cfg.sendEmailAtRegister, Configuration.Type.bool, + addCfg(list, CONFIG_EMAIL_AT_REGISTER, String.valueOf(cfg.sendEmailAtRegister), Configuration.Type.bool, "User get a EMail with their Account data.", "2.0.x"); addCfg(list, CONFIG_EMAIL_VERIFICATION, cfg.sendEmailWithVerficationCode, Configuration.Type.bool, @@ -235,7 +235,7 @@ public class ImportInitvalues { // SIP Integration Coniguration Values // *************************************** - addCfg(list, CONFIG_SIP_ENABLED, "" + cfg.sipEnable, Configuration.Type.bool, "Enable to enable the red5SIP integration ", "1.9.x"); + addCfg(list, CONFIG_SIP_ENABLED, String.valueOf(cfg.sipEnable), Configuration.Type.bool, "Enable to enable the red5SIP integration ", "1.9.x"); addCfg(list, CONFIG_SIP_ROOM_PREFIX, cfg.sipRoomPrefix, Configuration.Type.string, "Numerical prefix for OM rooms created inside the SIP", "1.9.x"); addCfg(list, CONFIG_SIP_EXTEN_CONTEXT, cfg.sipExtenContext, Configuration.Type.string, "Enable to enable the red5SIP integration ", "1.9.x"); @@ -265,16 +265,16 @@ public class ImportInitvalues { addCfg(list, CONFIG_DASHBOARD_SHOW_RSS, "false", Configuration.Type.bool, "Show RSS widget on dashboard", "1.9.x"); - addCfg(list, CONFIG_MAX_UPLOAD_SIZE, "" + DEFAULT_MAX_UPLOAD_SIZE, Configuration.Type.number, + addCfg(list, CONFIG_MAX_UPLOAD_SIZE, String.valueOf(DEFAULT_MAX_UPLOAD_SIZE), Configuration.Type.number, "Maximum size of upload file (bytes)", "1.8.x"); addCfg(list, CONFIG_APPOINTMENT_REMINDER_MINUTES, "15", Configuration.Type.number, "The number of minutes before reminder emails are send. Set to 0 to disable reminder emails", "1.9.x"); - addCfg(list, CONFIG_LOGIN_MIN_LENGTH, "" + USER_LOGIN_MINIMUM_LENGTH, Configuration.Type.number, + addCfg(list, CONFIG_LOGIN_MIN_LENGTH, String.valueOf(USER_LOGIN_MINIMUM_LENGTH), Configuration.Type.number, "Number of chars needed in a user login", "1.9.x"); - addCfg(list, CONFIG_PASS_MIN_LENGTH, "" + USER_PASSWORD_MINIMUM_LENGTH, Configuration.Type.number, + addCfg(list, CONFIG_PASS_MIN_LENGTH, String.valueOf(USER_PASSWORD_MINIMUM_LENGTH), Configuration.Type.number, "Number of chars needed in a user password", "1.9.x"); addCfg(list, CONFIG_CALENDAR_ROOM_CAPACITY, "50", Configuration.Type.number, @@ -291,7 +291,7 @@ public class ImportInitvalues { addCfg(list, CONFIG_DEFAULT_LDAP_ID, "0", Configuration.Type.number, "Ldap domain selected by default in the login screen", "1.9.x"); // set inviter's email address as ReplyTo in email invitations - addCfg(list, CONFIG_REPLY_TO_ORGANIZER, "" + cfg.replyToOrganizer, Configuration.Type.bool, + addCfg(list, CONFIG_REPLY_TO_ORGANIZER, String.valueOf(cfg.replyToOrganizer), Configuration.Type.bool, "Set inviter's email address as ReplyTo in email invitations", "2.0.x"); addCfg(list, CONFIG_DEFAULT_LANDING_ZONE, "user/dashboard", Configuration.Type.string @@ -317,8 +317,8 @@ public class ImportInitvalues { addCfg(list, CONFIG_FLASH_ECHO_PATH, "128", Configuration.Type.number, "Specifies the echo path length (in milliseconds). A longer echo path means better echo cancellation but also introduces longer delays and requires more processing power. The default value is 128; the only other possible value is 256. To disable AEC please specify 0.", "4.0.0"); addCfg(list, CONFIG_HEADER_XFRAME, HEADER_XFRAME_SAMEORIGIN, Configuration.Type.string, "Value for 'X-Frame-Options' header (default: DENY), more info: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Frame-Options";, "3.3.0"); addCfg(list, CONFIG_HEADER_CSP, HEADER_CSP_SELF, Configuration.Type.string, "Value for 'Content-Security-Policy' header (default: default-src 'self'; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline' 'unsafe-eval';), have to be modified to enable Google analytics site: https://content-security-policy.com/";, "3.3.0"); - addCfg(list, CONFIG_EXT_PROCESS_TTL, "" + EXT_PROCESS_TTL, Configuration.Type.number, String.format("Time to live in minutes for external processes such as conversion via ffmpeg (default %s minutes)", EXT_PROCESS_TTL), "3.3.0"); - addCfg(list, CONFIG_MYROOMS_ENABLED, "" + true, Configuration.Type.bool, "Users are allowed to create personal rooms", "3.3.2"); + addCfg(list, CONFIG_EXT_PROCESS_TTL, String.valueOf(EXT_PROCESS_TTL), Configuration.Type.number, String.format("Time to live in minutes for external processes such as conversion via ffmpeg (default %s minutes)", EXT_PROCESS_TTL), "3.3.0"); + addCfg(list, CONFIG_MYROOMS_ENABLED, String.valueOf(true), Configuration.Type.bool, "Users are allowed to create personal rooms", "3.3.2"); addCfg(list, CONFIG_REMINDER_MESSAGE, null, Configuration.Type.string, "Reminder message to notify about upcoming appointment, generated message will be used if not set", "2.0.x"); return list; } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/396c931b/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationDocumentHandler.java ---------------------------------------------------------------------- diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationDocumentHandler.java b/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationDocumentHandler.java index 069f28e..4540e92 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationDocumentHandler.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationDocumentHandler.java @@ -39,7 +39,7 @@ public class InstallationDocumentHandler { Element root = document.addElement("install"); Element step = root.addElement("step"); - step.addElement("stepnumber").addText("" + stepNo); + step.addElement("stepnumber").addText(String.valueOf(stepNo)); step.addElement("stepname").addText("Step " + stepNo); try (OutputStream os = new FileOutputStream(OmFileHelper.getInstallFile())) { @@ -55,6 +55,6 @@ public class InstallationDocumentHandler { Node node = document.selectSingleNode("//install/step/stepnumber"); - return Integer.valueOf(node.getText()).intValue(); + return Integer.parseInt(node.getText()); } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/396c931b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/ScreenV1Encoder.java ---------------------------------------------------------------------- diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/ScreenV1Encoder.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/ScreenV1Encoder.java index 899e628..144cc85 100644 --- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/ScreenV1Encoder.java +++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/ScreenV1Encoder.java @@ -140,7 +140,7 @@ public class ScreenV1Encoder extends BaseScreenEncoder { prev = new Rectangle(0, Math.max(0, img.height - blockSize), blockSize, blockSize); } else { prev = new Rectangle(_prev); - if (prev.x + prev.width == img.getWidth()) { + if (Double.compare(prev.x + prev.width, img.getWidth()) == 0) { if (prev.y == 0) return new Rectangle(); //the end of the image //next row prev.x = 0; //reset position @@ -181,12 +181,12 @@ public class ScreenV1Encoder extends BaseScreenEncoder { } public int getTag(final int frame, final int codec) { - return ((frame & 0x0F) << 4) + ((codec & 0x0F) << 0); + return ((frame & 0x0F) << 4) + (codec & 0x0F); } private static void writeShort(OutputStream os, final int n) throws IOException { os.write((n >> 8) & 0xFF); - os.write((n >> 0) & 0xFF); + os.write( n & 0xFF); } public static int[][] getImage(Rectangle screen, Robot robot) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/396c931b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/RemoteJob.java ---------------------------------------------------------------------- diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/RemoteJob.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/RemoteJob.java index cd6b8f8..39f1357 100644 --- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/RemoteJob.java +++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/RemoteJob.java @@ -72,7 +72,7 @@ public class RemoteJob implements Job { JobDataMap data = context.getJobDetail().getJobDataMap(); Core core = (Core)data.get(CORE_KEY); try { - Map<String, Object> obj = null; + Map<String, Object> obj; while ((obj = core.getRemoteEvents().poll(1, TimeUnit.MILLISECONDS)) != null) { String action = String.valueOf(obj.get("action")); log.trace("Action polled:: {}, count: {}", action, core.getRemoteEvents().size()); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/396c931b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/SendJob.java ---------------------------------------------------------------------- diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/SendJob.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/SendJob.java index 142b8c8..26f2a3c 100644 --- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/SendJob.java +++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/SendJob.java @@ -58,7 +58,7 @@ public class SendJob implements Job { log.trace(String.format("send: new timestamp: %s", capture.getTimestamp())); } } else if (log.isTraceEnabled()) { - log.trace(String.format("send: nothing to send")); + log.trace("send: nothing to send"); } capture.setSendFrameGuard(false); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/396c931b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/AppointmentManager.java ---------------------------------------------------------------------- diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/AppointmentManager.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/AppointmentManager.java index 2993d6c..aea0cf7 100644 --- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/AppointmentManager.java +++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/AppointmentManager.java @@ -355,7 +355,7 @@ public class AppointmentManager { if (o instanceof Element) { Element e = (Element) o; String name = DomUtil.getAttribute(e, "name", null); - if (name.equals("VEVENT")) { + if ("VEVENT".equals(name)) { isVevent = true; } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/396c931b/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 ff3fb4d..0583e5b 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 @@ -38,6 +38,7 @@ import org.apache.openmeetings.db.entity.room.Room; import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.db.util.TimezoneUtil; import org.apache.wicket.protocol.http.WebSession; +import org.apache.wicket.util.string.Strings; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -226,7 +227,7 @@ public class iCalUtils { URI uri = URI.create(organizer.getValue()); //If the value of the organizer is an email - if (uri.getScheme().equals("mailto")) { + if ("mailto".equals(uri.getScheme())) { String email = uri.getSchemeSpecificPart(); //Contact or exist and owner User org = userDao.getByEmail(email); @@ -242,7 +243,7 @@ public class iCalUtils { if (attendees != null && !attendees.isEmpty()) { for (Property attendee : attendees) { URI uri = URI.create(attendee.getValue()); - if (uri.getScheme().equals("mailto")) { + if ("mailto".equals(uri.getScheme())) { String email = uri.getSchemeSpecificPart(); User u = userDao.getByEmail(email); if (u == null) { @@ -307,7 +308,7 @@ public class iCalUtils { * @return {@link java.util.Date} representation of the iCalendar value. */ public Date parseDate(Property dt, TimeZone timeZone) { - if (dt == null || dt.getValue().equals("")) { + if (dt == null || Strings.isEmpty(dt.getValue())) { return null; } @@ -330,13 +331,11 @@ public class iCalUtils { * @return <code>java.util.Date</code> representation of string or * <code>null</code> if the Date could not be parsed. */ - public Date parseDate(String str, String[] patterns, TimeZone timeZone) { - FastDateFormat parser = null; + public Date parseDate(String str, String[] patterns, TimeZone _timeZone) { + FastDateFormat parser; Locale locale = WebSession.get().getLocale(); - if (str.endsWith("Z")) { - timeZone = TimeZone.getTimeZone("UTC"); - } + TimeZone timeZone = str.endsWith("Z") ? TimeZone.getTimeZone("UTC") : _timeZone; ParsePosition pos = new ParsePosition(0); for (String pattern : patterns) { @@ -416,7 +415,7 @@ public class iCalUtils { meeting.getProperties().add(Transp.OPAQUE); String uid = appointment.getIcalId(); - Uid ui = null; + Uid ui; if (uid == null || uid.length() < 1) { UUID uuid = UUID.randomUUID(); appointment.setIcalId(uuid.toString()); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/396c931b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/RecordingExpiringTemplate.java ---------------------------------------------------------------------- diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/RecordingExpiringTemplate.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/RecordingExpiringTemplate.java index 7dbba8d..d3ba618 100644 --- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/RecordingExpiringTemplate.java +++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/RecordingExpiringTemplate.java @@ -53,7 +53,7 @@ public class RecordingExpiringTemplate extends AbstractSubjectEmailTemplate { super.onInitialize(); final String app = getBean(ConfigurationDao.class).getAppName(); add(new Label("greetings", getString("template.recording.expiring.greetings", locale, u.getFirstname()))); - add(new Label("body", getString("template.recording.expiring.body", locale, app, "" + remainingDays))); + add(new Label("body", getString("template.recording.expiring.body", locale, app, String.valueOf(remainingDays)))); add(new Label("footer", getString("template.recording.expiring.footer", locale, app)).setEscapeModelStrings(false)); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/396c931b/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java ---------------------------------------------------------------------- diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java index ebc0a5e..9120324 100644 --- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java +++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java @@ -85,7 +85,7 @@ public class InvitationManager implements IInvitationManager { User owner = a.getOwner(); String invitorName = owner.getFirstname() + " " + owner.getLastname(); TimeZone tz = timezoneUtil.getTimeZone(mm.getUser()); - AbstractSubjectEmailTemplate t = null; + AbstractSubjectEmailTemplate t; switch (type) { case Cancel: t = CanceledAppointmentTemplate.get(mm.getUser(), a, tz, invitorName); @@ -127,8 +127,7 @@ public class InvitationManager implements IInvitationManager { // Defining Organizer - Map<String, String> organizerAttendee = handler.getAttendeeData(email, username, isOwner); - organizerAttendee = handler.getAttendeeData(replyToEmail, owner.getLogin(), isOwner); + Map<String, String> organizerAttendee = handler.getAttendeeData(replyToEmail, owner.getLogin(), isOwner); Appointment a = i.getAppointment(); // Create ICal Message http://git-wip-us.apache.org/repos/asf/openmeetings/blob/396c931b/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java ---------------------------------------------------------------------- diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java index 4b5b0af..6453e17 100644 --- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java +++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java @@ -121,15 +121,18 @@ public class UserManager implements IUserManager { String firstname, String email, Date age, String street, String additionalname, String fax, String zip, String country, String town, long languageId, String phone, boolean sendSMS, - boolean generateSipUserData, String jNameTimeZone, Boolean sendConfirmation) { + boolean generateSipUserData, String jNameTimeZone, Boolean _sendConfirmation) { try { // Checks if FrontEndUsers can register if (cfgDao.getBool(CONFIG_REGISTER_SOAP, false)) { - if (sendConfirmation == null) { + boolean sendConfirmation; + if (_sendConfirmation == null) { String baseURL = cfgDao.getBaseUrl(); sendConfirmation = baseURL != null && !baseURL.isEmpty() && cfgDao.getBool(CONFIG_EMAIL_VERIFICATION, false); + } else { + sendConfirmation = _sendConfirmation.booleanValue(); } // TODO: Read and generate SIP-Data via RPC-Interface Issue 1098 http://git-wip-us.apache.org/repos/asf/openmeetings/blob/396c931b/openmeetings-util/src/main/java/org/apache/openmeetings/util/CalendarHelper.java ---------------------------------------------------------------------- diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/CalendarHelper.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/CalendarHelper.java index e479fd1..7828fc8 100644 --- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/CalendarHelper.java +++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/CalendarHelper.java @@ -39,23 +39,15 @@ public class CalendarHelper { } public static ZonedDateTime getZoneDateTime(Date d, String tzId) { - if (d == null) { - d = new Date(); - } - return Instant.ofEpochMilli(d.getTime()).atZone(getZoneId(tzId)); + long milli = (d == null ? new Date() : d).getTime(); + return Instant.ofEpochMilli(milli).atZone(getZoneId(tzId)); } public static LocalDate getDate(Date d, String tzId) { - if (d == null) { - d = new Date(); - } - return getZoneDateTime(d, tzId).toLocalDate(); + return getZoneDateTime(d == null ? new Date() : d, tzId).toLocalDate(); } public static LocalDateTime getDateTime(Date d, String tzId) { - if (d == null) { - d = new Date(); - } - return getZoneDateTime(d, tzId).toLocalDateTime(); + return getZoneDateTime(d == null ? new Date() : d, tzId).toLocalDateTime(); } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/396c931b/openmeetings-util/src/main/java/org/apache/openmeetings/util/CalendarPatterns.java ---------------------------------------------------------------------- diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/CalendarPatterns.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/CalendarPatterns.java index 84da5df..b03b348 100644 --- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/CalendarPatterns.java +++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/CalendarPatterns.java @@ -65,15 +65,13 @@ public class CalendarPatterns { if (t == null) { return ""; } - return "" + t.getTime(); + return String.valueOf(t.getTime()); } public static Date parseImportDate(String dateString) { try { - Date resultDate = null; - - resultDate = validDate(dateFormat__ddMMyyyyHHmmss, dateString); + Date resultDate = validDate(dateFormat__ddMMyyyyHHmmss, dateString); if (resultDate != null) { return resultDate; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/396c931b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java ---------------------------------------------------------------------- diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java index 7fa53a5..dc0556f 100644 --- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java +++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java @@ -94,7 +94,7 @@ public class OpenmeetingsVariables { public static final int USER_LOGIN_MINIMUM_LENGTH = 4; public static final int USER_PASSWORD_MINIMUM_LENGTH = 8; public static final String DEFAULT_APP_NAME = "OpenMeetings"; - public static final long DEFAULT_MAX_UPLOAD_SIZE = 100 * 1024 * 1024; // 100MB + public static final long DEFAULT_MAX_UPLOAD_SIZE = 100 * 1024 * 1024L; // 100MB public static final String FLASH_SECURE = "secure"; public static final String FLASH_NATIVE_SSL = "native"; public static final String FLASH_PORT = "rtmpPort"; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/396c931b/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java ---------------------------------------------------------------------- diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java index 0a5592d..84b5a35 100644 --- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java +++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java @@ -29,6 +29,7 @@ import java.util.List; import java.util.Map; import java.util.UUID; +import org.apache.wicket.util.string.Strings; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; @@ -134,8 +135,8 @@ public class IcalHandler { meeting.getProperties().add(Transp.OPAQUE); // generate unique identifier (if not submitted) - Uid ui = null; - if (uid == null || uid.length() < 1) { + Uid ui; + if (Strings.isEmpty(uid)) { ui = new Uid(UUID.randomUUID().toString()); log.debug("Generating Meeting UID : " + ui.getValue()); } else { @@ -180,10 +181,9 @@ public class IcalHandler { /** * Write iCal to File */ - public void writeDataToFile(String filerPath) throws Exception { - if (!filerPath.endsWith(".ics")) { - filerPath = filerPath + ".ics"; - } + public void writeDataToFile(String _filerPath) throws Exception { + String filerPath = _filerPath.endsWith(".ics") ? _filerPath + : String.format("%s.ics", _filerPath); try (FileOutputStream fout = new FileOutputStream(filerPath)) { CalendarOutputter outputter = new CalendarOutputter(); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/396c931b/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java ---------------------------------------------------------------------- diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java index b31d3ad..9fc76fe 100644 --- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java +++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java @@ -48,7 +48,7 @@ public class ProcessHelper { } private static String getCommand(String[] argv) { - StringBuffer tString = new StringBuffer(); + StringBuilder tString = new StringBuilder(); for (int i = 0; i < argv.length; i++) { tString.append(argv[i]).append(" "); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/396c931b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java index a1efce0..44ca452 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java @@ -32,7 +32,7 @@ import static org.apache.wicket.validation.validator.StringValidator.minimumLeng import java.util.ArrayList; import java.util.Arrays; -import java.util.Hashtable; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.UUID; @@ -234,7 +234,7 @@ public class UserForm extends AdminBaseForm<User> { public void updateDomain(AjaxRequestTarget target) { User u = getModelObject(); - final Map<Long, String> values = new Hashtable<>(); + final Map<Long, String> values = new HashMap<>(); List<Long> ids = new ArrayList<>(); if (u.getType() == Type.ldap) { for (LdapConfig c : getBean(LdapConfigDao.class).getActive()) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/396c931b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java index a75895e..4185c6b 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java @@ -718,10 +718,11 @@ public class Application extends AuthenticatedWebApplication implements IApplica return getString(key, getLocale(languageId)); } - public static String getString(String key, final Locale loc, String... params) { + public static String getString(String key, final Locale loc, String... _params) { if (!exists()) { ThreadContext.setApplication(org.apache.wicket.Application.get(appName)); } + String[] params = _params; if ((params == null || params.length == 0) && STRINGS_WITH_APP.contains(key)) { params = new String[]{getBean(ConfigurationDao.class).getAppName()}; } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/396c931b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java index 3c1aaf5..e936cad 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java @@ -319,7 +319,7 @@ public class WebSession extends AbstractAuthenticatedWebSession implements IWebS } public boolean signIn(String login, String password, Type type, Long domainId) throws OmException { - User u = null; + User u; switch (type) { case ldap: u = getBean(LdapLoginManagement.class).login(login, password, domainId); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/396c931b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/Captcha.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/Captcha.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/Captcha.java index 47aa8a7..4dfd288 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/Captcha.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/Captcha.java @@ -20,6 +20,8 @@ package org.apache.openmeetings.web.common; import static java.nio.charset.StandardCharsets.UTF_8; +import java.util.Random; + import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.core.request.handler.IPartialPageRequestHandler; import org.apache.wicket.extensions.markup.html.captcha.CaptchaImageResource; @@ -38,6 +40,7 @@ import com.googlecode.wicket.jquery.ui.markup.html.link.AjaxLink; public class Captcha extends Panel { private static final long serialVersionUID = 1L; + private static Random rnd = new Random(); private String randomText; private final CaptchaImageResource captchaImageResource = new CaptchaImageResource() { private static final long serialVersionUID = 1L; @@ -89,7 +92,7 @@ public class Captcha extends Panel { } private static int randomInt(int min, int max) { - return (int)(Math.random() * (max - min) + min); + return rnd.nextInt(max - min) + min; } private static String randomString(int min, int max) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/396c931b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/IUpdatable.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/IUpdatable.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/IUpdatable.java index a498761..84b5a94 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/IUpdatable.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/IUpdatable.java @@ -18,8 +18,10 @@ */ package org.apache.openmeetings.web.common; +import java.io.Serializable; + import org.apache.wicket.ajax.AjaxRequestTarget; -public interface IUpdatable { +public interface IUpdatable extends Serializable { void update(AjaxRequestTarget target); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/396c931b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java index f2a51d8..e181997 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java @@ -139,7 +139,7 @@ public abstract class InvitationForm extends Form<Invitation> { protected void updateButtons(AjaxRequestTarget target) { Collection<User> to = recipients.getModelObject(); - dialog.send.setEnabled(to.size() > 0, target); + dialog.send.setEnabled(!to.isEmpty(), target); dialog.generate.setEnabled(to.size() == 1, target); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/396c931b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java ---------------------------------------------------------------------- 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 5fe6734..e8f60b8 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 @@ -82,7 +82,7 @@ public class SignInPage extends BaseInitedPage { } static boolean allowOAuthLogin() { - return getBean(OAuth2Dao.class).getActive().size() > 0; + return !getBean(OAuth2Dao.class).getActive().isEmpty(); } public SignInPage(PageParameters p) { @@ -105,9 +105,7 @@ public class SignInPage extends BaseInitedPage { if (authInfo == null) return; log.debug("OAuthInfo=" + authInfo); Map<String, String> authParams = getAuthParams(authInfo.accessToken, code, server); - if (authParams != null) { - loginViaOAuth2(authParams, serverId); - } + loginViaOAuth2(authParams, serverId); } else { // redirect to get code String redirectUrl = prepareUrlParams(server.getRequestKeyUrl(), server.getClientId(), null, null, getRedirectUri(server, this), null); @@ -257,7 +255,7 @@ public class SignInPage extends BaseInitedPage { String sourceResponse = IOUtils.toString(urlConnection.getInputStream(), UTF_8); // parse json result AuthInfo result = new AuthInfo(); - JSONObject jsonResult = new JSONObject(sourceResponse.toString()); + JSONObject jsonResult = new JSONObject(sourceResponse); if (jsonResult.has("access_token")) { result.accessToken = jsonResult.getString("access_token"); } @@ -272,7 +270,7 @@ public class SignInPage extends BaseInitedPage { } // access token must be specified if (result.accessToken == null) { - log.error("Response doesn't contain access_token field:\n" + sourceResponse.toString()); + log.error("Response doesn't contain access_token field:\n {}", sourceResponse); return null; } return result; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/396c931b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java ---------------------------------------------------------------------- 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 c0efd4d..6d83427 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 @@ -763,7 +763,7 @@ public class InstallWizard extends AbstractWizard<InstallationConfig> { } } - private abstract class WizardDropDown<T> extends DropDownChoice<T> { + private abstract class WizardDropDown<T extends Serializable> extends DropDownChoice<T> { private static final long serialVersionUID = 1L; T option; IModel<Object> propModel; @@ -797,12 +797,12 @@ public class InstallWizard extends AbstractWizard<InstallationConfig> { @Override public Object getDisplayValue(String object) { - return object.toString(); + return object; } @Override public String getIdValue(String object, int index) { - return object.toString(); + return object; } }); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/396c931b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java index f147c7e..a6eb17c 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java @@ -735,7 +735,7 @@ public class RoomPanel extends BasePanel { public void requestRight(Right right, IPartialPageRequestHandler handler) { RoomMessage.Type reqType = null; List<Client> mods = Application.getRoomClients(r.getId(), c -> c.hasRight(Room.Right.moderator)); - if (mods.size() == 0) { + if (mods.isEmpty()) { if (r.isModerated()) { //dialog waitForModerator.open(handler); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/396c931b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java index 6495f22..54d3e4e 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomResourceReference.java @@ -60,7 +60,7 @@ public class RoomResourceReference extends FileItemResourceReference<FileItem> { @Override protected String getMimeType(FileItem r) { - String mime = null; + String mime; switch (r.getType()) { case WmlFile: mime = "application/xml";
