This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 202fed7 [OPENMEETINGS-1856] sonar should be more happy
202fed7 is described below
commit 202fed7bed6d480e1cff0df0d416c2d3acc35a32
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Wed Mar 6 11:08:56 2019 +0700
[OPENMEETINGS-1856] sonar should be more happy
---
.../openmeetings/core/remote/StreamProcessor.java | 3 +++
.../core/remote/TestSetupFlowMocked.java | 1 +
.../installation/ImportInitvalues.java | 3 ++-
.../service/calendar/AppointmentLogic.java | 2 +-
.../mail/template/AbstractTemplatePanel.java | 9 +------
.../openmeetings/web/room/activities/activities.js | 4 ++-
.../org/apache/openmeetings/web/room/raw-room.js | 9 +++----
.../calendar/TestAppointmentSchedulerTask.java | 31 +++++++++++++++++++++-
8 files changed, 45 insertions(+), 17 deletions(-)
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/StreamProcessor.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/StreamProcessor.java
index 6314592..f1ea84d 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/StreamProcessor.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/StreamProcessor.java
@@ -158,6 +158,9 @@ public class StreamProcessor implements IStreamProcessor {
case "errorSharing":
errorSharing(c);
break;
+ default:
+ // no-op
+ break;
}
}
diff --git
a/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/TestSetupFlowMocked.java
b/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/TestSetupFlowMocked.java
index 303a759..26956f4 100644
---
a/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/TestSetupFlowMocked.java
+++
b/openmeetings-core/src/test/java/org/apache/openmeetings/core/remote/TestSetupFlowMocked.java
@@ -92,6 +92,7 @@ public class TestSetupFlowMocked extends BaseMockedTest {
handler.onMessage(c, new JSONObject(MSG_BASE.toString())
.put("id", "play")
.put("sdpOffer", "sdpOffer"));
+ testProcessor.destroy();
}
@Test
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 c26eff0..9fd1476 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
@@ -95,6 +95,7 @@ import static
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SMTP_USE
import static
org.apache.openmeetings.util.OpenmeetingsVariables.DEFAULT_APP_NAME;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.DEFAULT_CHROME_EXT_URL;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.DEFAULT_MAX_UPLOAD_SIZE;
+import static
org.apache.openmeetings.util.OpenmeetingsVariables.DEFAULT_MINUTES_REMINDER_SEND;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.HEADER_CSP_SELF;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.HEADER_XFRAME_SELF;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.USER_LOGIN_MINIMUM_LENGTH;
@@ -293,7 +294,7 @@ public class ImportInitvalues {
addCfg(list, CONFIG_MAX_UPLOAD_SIZE,
String.valueOf(DEFAULT_MAX_UPLOAD_SIZE), Configuration.Type.number,
"Maximum size of upload file (bytes)", VER_1_8);
- addCfg(list, CONFIG_APPOINTMENT_REMINDER_MINUTES, "15",
Configuration.Type.number,
+ addCfg(list, CONFIG_APPOINTMENT_REMINDER_MINUTES,
String.valueOf(DEFAULT_MINUTES_REMINDER_SEND), Configuration.Type.number,
"The number of minutes before reminder emails
are send. Set to 0 to disable reminder emails", VER_1_9);
addCfg(list, CONFIG_LOGIN_MIN_LENGTH,
String.valueOf(USER_LOGIN_MINIMUM_LENGTH), Configuration.Type.number,
diff --git
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java
index ce6805c..ba872e4 100644
---
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java
+++
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java
@@ -125,7 +125,7 @@ public class AppointmentLogic {
}
// Iterate through all MeetingMembers
for (MeetingMember mm : members) {
- log.debug("doScheduledMeetingReminder : Member
" + mm.getUser().getAddress().getEmail());
+ log.debug("doScheduledMeetingReminder : Member
{}", mm.getUser().getAddress().getEmail());
Invitation inv = mm.getInvitation();
diff --git
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java
index b556835..e46786d 100644
---
a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java
+++
b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java
@@ -18,13 +18,10 @@
*/
package org.apache.openmeetings.service.mail.template;
-import static
org.apache.openmeetings.util.OpenmeetingsVariables.getDefaultLang;
-
import java.util.Locale;
import org.apache.openmeetings.IApplication;
import org.apache.openmeetings.IWebSession;
-import org.apache.openmeetings.db.dao.label.LabelDao;
import org.apache.openmeetings.db.util.FormatHelper;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.markup.html.TransparentWebMarkupContainer;
@@ -42,7 +39,7 @@ public abstract class AbstractTemplatePanel extends Panel {
protected AbstractTemplatePanel(Locale locale) {
super(COMP_ID);
- this.locale = locale == null ? getDefault() : locale;
+ this.locale = locale;
add(new
TransparentWebMarkupContainer("container").add(AttributeModifier.append("dir",
FormatHelper.isRtlLanguage(this.locale.toLanguageTag()) ? "rtl" : "ltr")));
}
@@ -50,10 +47,6 @@ public abstract class AbstractTemplatePanel extends Panel {
return (IWebSession)WebSession.get();
}
- private static Locale getDefault() {
- return LabelDao.getLocale(getDefaultLang());
- }
-
public String getString(String id, Locale locale, String... params) {
return app.getOmString(id, locale, params);
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js
index 3582777..80eba34 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js
@@ -96,7 +96,9 @@ var Activities = function() {
}
}
function _updateCount() {
- if (!inited) return;
+ if (!inited) {
+ return;
+ }
$('.control.block .badge',
activities).text(modArea.find('.activity').length);
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-room.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-room.js
index 0f39a73..ccf3de4 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-room.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-room.js
@@ -60,11 +60,10 @@ var Room = (function() {
if (e.target.isContentEditable === true || base.is('textarea,
input:not([readonly]):not([type=radio]):not([type=checkbox])')) {
return;
}
- switch (e.which) {
- case 8: // backspace
- e.preventDefault();
- e.stopImmediatePropagation();
- return false;
+ if (e.which === 8) { // backspace
+ e.preventDefault();
+ e.stopImmediatePropagation();
+ return false;
}
}
function _keyHandler(e) {
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestAppointmentSchedulerTask.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestAppointmentSchedulerTask.java
index 5451c56..c3932a9 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestAppointmentSchedulerTask.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/calendar/TestAppointmentSchedulerTask.java
@@ -18,9 +18,13 @@
*/
package org.apache.openmeetings.calendar;
+import static
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_APPOINTMENT_REMINDER_MINUTES;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.getBaseUrl;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.setBaseUrl;
import static org.junit.Assert.assertTrue;
import org.apache.openmeetings.AbstractJUnitDefaults;
+import org.apache.openmeetings.db.entity.basic.Configuration;
import org.apache.openmeetings.service.calendar.AppointmentLogic;
import org.junit.Test;
import org.slf4j.Logger;
@@ -34,9 +38,34 @@ public class TestAppointmentSchedulerTask extends
AbstractJUnitDefaults {
private AppointmentLogic appointmentLogic;
@Test
+ public void noBaseUrl() {
+ final String origBaseUrl = getBaseUrl();
+ try {
+ for (String url : new String[] {null, ""}) {
+ setBaseUrl(url);
+ doIt();
+ }
+ } finally {
+ setBaseUrl(origBaseUrl);
+ }
+ }
+
+ @Test
+ public void turnedOff() {
+ final Configuration origCfg =
cfgDao.get(CONFIG_APPOINTMENT_REMINDER_MINUTES);
+ try {
+ Configuration cfg = cfgDao.get(origCfg.getId());
+ cfg.setValueN(0L);
+ cfgDao.update(cfg, null);
+ doIt();
+ } finally {
+ cfgDao.update(origCfg, null);
+ }
+ }
+
+ @Test
public void doIt() {
log.debug("- 1 MeetingReminderJob.execute");
- log.warn("- 2 MeetingReminderJob.execute");
try {
appointmentLogic.doScheduledMeetingReminder();
