Repository: openmeetings Updated Branches: refs/heads/master 5c24b1abc -> 8a3ccd5ec
[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/8a3ccd5e Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/8a3ccd5e Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/8a3ccd5e Branch: refs/heads/master Commit: 8a3ccd5ec055a1d978d08587228af7404890c41b Parents: 5c24b1a Author: Maxim Solodovnik <[email protected]> Authored: Thu Sep 28 13:18:09 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Thu Sep 28 13:18:09 2017 +0700 ---------------------------------------------------------------------- .../core/converter/BaseConverter.java | 29 ++++++++++---------- .../AppointmentReminderTypeConverter.java | 2 +- .../openmeetings/backup/BackupImport.java | 13 +++++---- .../backup/OmCalendarConverter.java | 2 +- .../apache/openmeetings/backup/OmConverter.java | 4 +-- .../openmeetings/backup/PollTypeConverter.java | 2 +- .../backup/RecordingStatusConverter.java | 6 ++++ .../openmeetings/backup/RoomTypeConverter.java | 2 +- .../backup/SalutationConverter.java | 2 +- .../java/org/apache/openmeetings/cli/Admin.java | 4 +-- .../cli/ConnectionPropertiesPatcher.java | 4 +-- .../org/apache/openmeetings/cli/OmOption.java | 3 +- 12 files changed, 39 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8a3ccd5e/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 6709508..d2d6e1d 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 @@ -115,13 +115,14 @@ public abstract class BaseConverter { } protected String formatMillis(long millis) { - long hours = TimeUnit.MILLISECONDS.toHours(millis); - millis -= TimeUnit.HOURS.toMillis(hours); - long minutes = TimeUnit.MILLISECONDS.toMinutes(millis); - millis -= TimeUnit.MINUTES.toMillis(minutes); - long seconds = TimeUnit.MILLISECONDS.toSeconds(millis); - millis -= TimeUnit.SECONDS.toMillis(seconds); - return String.format("%02d:%02d:%02d.%03d", hours, minutes, seconds, millis); + long m = millis; + long hours = TimeUnit.MILLISECONDS.toHours(m); + m -= TimeUnit.HOURS.toMillis(hours); + long minutes = TimeUnit.MILLISECONDS.toMinutes(m); + m -= TimeUnit.MINUTES.toMillis(minutes); + long seconds = TimeUnit.MILLISECONDS.toSeconds(m); + m -= TimeUnit.SECONDS.toMillis(seconds); + return String.format("%02d:%02d:%02d.%03d", hours, minutes, seconds, m); } protected void updateDuration(Recording r) { @@ -157,13 +158,11 @@ public abstract class BaseConverter { private String[] addSoxPad(List<ConverterProcessResult> returnLog, String job, double length, double position, File inFile, File outFile) throws IOException { //FIXME need to check this if (length < 0 || position < 0) { - log.debug("::addSoxPad " + job + " Invalid parameters: " - + " length = " + length + "; position = " + position + "; inFile = " + inFile); + log.debug("::addSoxPad {} Invalid parameters: length = {}; position = {}; inFile = {}", job, length, position, inFile); } - length = length < 0 ? 0 : length; - position = position < 0 ? 0 : position; - - String[] argv = new String[] { getPathToSoX(), inFile.getCanonicalPath(), outFile.getCanonicalPath(), "pad", "" + length, "" + position }; + String[] argv = new String[] { getPathToSoX(), inFile.getCanonicalPath(), outFile.getCanonicalPath(), "pad" + , String.valueOf(length < 0 ? 0 : length) + , String.valueOf(position < 0 ? 0 : position) }; returnLog.add(ProcessHelper.executeScript(job, argv)); return argv; @@ -394,7 +393,7 @@ public abstract class BaseConverter { , "-frames:v", "1" // , png.getCanonicalPath() }; - logs.add(ProcessHelper.executeScript(String.format("generate preview PNG :: ", f.getHash()), argv)); + logs.add(ProcessHelper.executeScript(String.format("generate preview PNG :: %s", f.getHash()), argv)); } protected static Dimension getDimension(String txt) { @@ -403,7 +402,7 @@ public abstract class BaseConverter { while (matcher.find()) { String foundResolution = txt.substring(matcher.start(), matcher.end()); String[] resultions = foundResolution.split("x"); - return new Dimension(Integer.valueOf(resultions[0]).intValue(), Integer.valueOf(resultions[1]).intValue()); + return new Dimension(Integer.parseInt(resultions[0]), Integer.parseInt(resultions[1])); } return new Dimension(100, 100); // will return 100x100 for non-video to be able to play http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8a3ccd5e/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentReminderTypeConverter.java ---------------------------------------------------------------------- diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentReminderTypeConverter.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentReminderTypeConverter.java index 0dbb940..9e7020b 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentReminderTypeConverter.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/AppointmentReminderTypeConverter.java @@ -34,6 +34,6 @@ public class AppointmentReminderTypeConverter extends OmConverter<Reminder> { @Override public void write(OutputNode node, Reminder value) throws Exception { node.setData(true); - node.setValue(value == null ? "0" : "" + value.getId()); + node.setValue(value == null ? "0" : String.valueOf(value.getId())); } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8a3ccd5e/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 c420923..8a39317 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 @@ -321,13 +321,13 @@ public class BackupImport { USERS, ORGANISATIONS, CALENDARS, APPOINTMENTS, ROOMS, MESSAGEFOLDERS, USERCONTACTS }; - private static File validate(String zipname, File intended) throws IOException { + private static File validate(String _ename, File intended) throws IOException { final String intendedPath = intended.getCanonicalPath(); - if (File.pathSeparatorChar != '\\' && zipname.indexOf('\\') > -1) { - zipname = zipname.replace('\\', '/'); - } + String ename = File.pathSeparatorChar != '\\' && _ename.indexOf('\\') > -1 + ? _ename.replace('\\', '/') + : _ename; // for each entry to be extracted - File fentry = new File(intended, zipname); + File fentry = new File(intended, ename); final String canonicalPath = fentry.getCanonicalPath(); if (canonicalPath.startsWith(intendedPath)) { @@ -404,7 +404,7 @@ public class BackupImport { if (type != null) { c.setType(type); if (Configuration.Type.bool == type) { - if ("1".equals(c.getValue()) || "yes".equals(c.getValue()) || "yes".equals(c.getValue()) || "true".equals(c.getValue())) { + if ("1".equals(c.getValue()) || "yes".equals(c.getValue()) || "true".equals(c.getValue())) { c.setValue("true"); } else { c.setValue("false"); @@ -424,6 +424,7 @@ public class BackupImport { Class<?> clazz = Class.forName(c.getValue()); clazz.newInstance(); } catch (Exception e) { + log.warn("Not existing Crypt class found {}, replacing with SCryptImplementation", c.getValue()); c.setValue(SCryptImplementation.class.getCanonicalName()); } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8a3ccd5e/openmeetings-install/src/main/java/org/apache/openmeetings/backup/OmCalendarConverter.java ---------------------------------------------------------------------- diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/OmCalendarConverter.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/OmCalendarConverter.java index 6c74d75..2cef48b 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/OmCalendarConverter.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/OmCalendarConverter.java @@ -50,6 +50,6 @@ public class OmCalendarConverter extends OmConverter<OmCalendar> { @Override public void write(OutputNode node, OmCalendar value) throws Exception { node.setData(true); - node.setValue(value == null ? "0" : "" + value.getId()); + node.setValue(value == null ? "0" : String.valueOf(value.getId())); } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8a3ccd5e/openmeetings-install/src/main/java/org/apache/openmeetings/backup/OmConverter.java ---------------------------------------------------------------------- diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/OmConverter.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/OmConverter.java index 6fd9912..310e7e3 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/OmConverter.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/OmConverter.java @@ -33,7 +33,7 @@ public abstract class OmConverter<T> implements Converter<T> { static long getLong(String value, long def) { long result = def; try { - result = Long.valueOf(value).longValue(); + result = Long.parseLong(value); } catch (Exception e) { //no op } @@ -47,7 +47,7 @@ public abstract class OmConverter<T> implements Converter<T> { static int getInt(String value, int def) { int result = def; try { - result = Integer.valueOf(value).intValue(); + result = Integer.parseInt(value); } catch (Exception e) { //no op } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8a3ccd5e/openmeetings-install/src/main/java/org/apache/openmeetings/backup/PollTypeConverter.java ---------------------------------------------------------------------- diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/PollTypeConverter.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/PollTypeConverter.java index d627139..8de2fe9 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/PollTypeConverter.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/PollTypeConverter.java @@ -33,6 +33,6 @@ public class PollTypeConverter extends OmConverter<RoomPoll.Type> { @Override public void write(OutputNode node, RoomPoll.Type value) throws Exception { node.setData(true); - node.setValue(value == null ? "0" : "" + value.getId()); + node.setValue(value == null ? "0" : String.valueOf(value.getId())); } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8a3ccd5e/openmeetings-install/src/main/java/org/apache/openmeetings/backup/RecordingStatusConverter.java ---------------------------------------------------------------------- diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/RecordingStatusConverter.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/RecordingStatusConverter.java index 128ee13..c0ffb8b 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/RecordingStatusConverter.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/RecordingStatusConverter.java @@ -18,12 +18,17 @@ */ package org.apache.openmeetings.backup; +import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; + import org.apache.openmeetings.db.entity.record.Recording; import org.apache.openmeetings.db.entity.record.Recording.Status; +import org.red5.logging.Red5LoggerFactory; import org.simpleframework.xml.stream.InputNode; import org.simpleframework.xml.stream.OutputNode; +import org.slf4j.Logger; public class RecordingStatusConverter extends OmConverter<Recording.Status> { + private static final Logger log = Red5LoggerFactory.getLogger(RecordingStatusConverter.class, webAppRootKey); private static final String PROCESSING = "PROCESSING"; public RecordingStatusConverter() {} @@ -34,6 +39,7 @@ public class RecordingStatusConverter extends OmConverter<Recording.Status> { try { result = Recording.Status.valueOf(val); } catch (Exception e) { + log.warn("Failed to read recording status out of {}", val); result = PROCESSING.equals(val) ? Status.CONVERTING : Status.NONE; } return result; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8a3ccd5e/openmeetings-install/src/main/java/org/apache/openmeetings/backup/RoomTypeConverter.java ---------------------------------------------------------------------- diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/RoomTypeConverter.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/RoomTypeConverter.java index b5f3543..1aad991 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/RoomTypeConverter.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/RoomTypeConverter.java @@ -33,6 +33,6 @@ public class RoomTypeConverter extends OmConverter<Type> { @Override public void write(OutputNode node, Type value) throws Exception { node.setData(true); - node.setValue(value == null ? "0" : "" + value.getId()); + node.setValue(value == null ? "0" : String.valueOf(value.getId())); } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8a3ccd5e/openmeetings-install/src/main/java/org/apache/openmeetings/backup/SalutationConverter.java ---------------------------------------------------------------------- diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/SalutationConverter.java b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/SalutationConverter.java index 7824802..b6fc93d 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/backup/SalutationConverter.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/backup/SalutationConverter.java @@ -31,6 +31,6 @@ public class SalutationConverter extends OmConverter<Salutation> { @Override public void write(OutputNode node, Salutation value) throws Exception { node.setData(true); - node.setValue(value == null ? "0" : "" + value.getId()); + node.setValue(value == null ? "0" : String.valueOf(value.getId())); } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8a3ccd5e/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java ---------------------------------------------------------------------- diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java index f1c80c2..7243980 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java @@ -248,7 +248,7 @@ public class Admin { if (cmdl.hasOption("default-language")) { cfg.defaultLangId = cmdl.getOptionValue("default-language"); } - ConnectionProperties connectionProperties = new ConnectionProperties(); + ConnectionProperties connectionProperties; File conf = OmFileHelper.getPersistence(); if (!conf.exists() || cmdl.hasOption("db-type") || cmdl.hasOption("db-host") || cmdl.hasOption("db-port") || cmdl.hasOption("db-name") || cmdl.hasOption("db-user") || cmdl.hasOption("db-pass")) { String dbType = cmdl.getOptionValue("db-type", "derby"); @@ -294,7 +294,7 @@ public class Admin { f = new File(file); } boolean includeFiles = !cmdl.hasOption("exclude-files"); - File backup_dir = new File(OmFileHelper.getUploadBackupDir(), "" + System.currentTimeMillis()); + File backup_dir = new File(OmFileHelper.getUploadBackupDir(), String.valueOf(System.currentTimeMillis())); backup_dir.mkdirs(); BackupExport export = getApplicationContext().getBean(BackupExport.class); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8a3ccd5e/openmeetings-install/src/main/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java ---------------------------------------------------------------------- diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java index 9a4cf8b..c6ccca5 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/ConnectionPropertiesPatcher.java @@ -49,7 +49,7 @@ public abstract class ConnectionPropertiesPatcher { protected ConnectionProperties props; public static ConnectionPropertiesPatcher getPatcher(ConnectionProperties props) { - ConnectionPropertiesPatcher patcher = null; + ConnectionPropertiesPatcher patcher; switch (props.getDbType()) { case db2: patcher = new Db2Patcher(); @@ -181,7 +181,7 @@ public abstract class ConnectionPropertiesPatcher { String prop = tokens[idx].trim(); if (prop.startsWith(name)) { //From "Username=root" getting only "root" - return prop.substring(prop.indexOf("=") + 1); + return prop.substring(prop.indexOf('=') + 1); } return null; } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8a3ccd5e/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OmOption.java ---------------------------------------------------------------------- diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OmOption.java b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OmOption.java index ec91285..e256532 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OmOption.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/OmOption.java @@ -19,14 +19,13 @@ package org.apache.openmeetings.cli; import java.util.HashMap; -import java.util.Map; import org.apache.commons.cli.Option; public class OmOption extends Option { private static final long serialVersionUID = 1L; private String group = null; - private Map<String, Boolean> optional = null; + private HashMap<String, Boolean> optional = null; private int order = 0; private String helpPrefix = "";
