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 304e5c6 [OPENMEETINGS-2176] some sonar issues are addressed
304e5c6 is described below
commit 304e5c62fbab47223e4e7b6bb8381a3c42048b24
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Tue Mar 17 13:58:47 2020 +0700
[OPENMEETINGS-2176] some sonar issues are addressed
---
.../java/org/apache/openmeetings/db/dao/label/LabelDao.java | 3 ++-
.../java/org/apache/openmeetings/db/dto/room/Whiteboard.java | 2 +-
.../main/java/org/apache/openmeetings/db/util/XmlHelper.java | 12 +++++++++++-
.../apache/openmeetings/screenshare/RTMPSScreenShare.java | 2 +-
.../org/apache/openmeetings/screenshare/RTMPScreenShare.java | 2 +-
.../apache/openmeetings/screenshare/RTMPTSScreenShare.java | 2 +-
.../apache/openmeetings/screenshare/RTMPTScreenShare.java | 2 +-
.../org/apache/openmeetings/web/app/WhiteboardManager.java | 1 +
.../java/org/apache/openmeetings/web/common/Captcha.java | 1 +
.../apache/openmeetings/web/pages/auth/RegisterDialog.java | 1 +
.../org/apache/openmeetings/web/pages/auth/SignInDialog.java | 1 +
.../java/org/apache/openmeetings/web/room/wb/raw-wb-board.js | 2 +-
.../openmeetings/web/user/profile/ChangePasswordDialog.java | 1 +
.../openmeetings/web/user/profile/EditProfileForm.java | 1 +
14 files changed, 25 insertions(+), 8 deletions(-)
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 35566b1..8929616 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
@@ -50,6 +50,7 @@ import org.apache.commons.collections4.CollectionUtils;
import org.apache.openmeetings.db.dao.IDataProviderDao;
import org.apache.openmeetings.db.entity.label.OmLanguage;
import org.apache.openmeetings.db.entity.label.StringLabel;
+import org.apache.openmeetings.db.util.XmlHelper;
import org.apache.openmeetings.util.OmFileHelper;
import org.apache.openmeetings.util.XmlExport;
import org.apache.wicket.extensions.markup.html.repeater.util.SortParam;
@@ -106,8 +107,8 @@ public class LabelDao implements
IDataProviderDao<StringLabel>{
}
public static void initLanguageMap() {
- SAXReader reader = new SAXReader();
try {
+ SAXReader reader = XmlHelper.createSaxReader();
appClass = getAppClass();
Document document = reader.read(getLangFile());
Element root = document.getRootElement();
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java
index 1be4c5b..7893062 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java
@@ -214,7 +214,7 @@ public class Whiteboard implements Serializable {
for (Entry<String, String> e : roomItems.entrySet()) {
JSONObject o = new JSONObject(e.getValue());
//filtering
- if ("Clipart".equals(o.opt("omType"))) {
+ if ("Clipart".equals(o.opt(ATTR_OMTYPE))) {
if (o.has(PARAM__SRC)) {
o.put(PARAM_SRC, o.get(PARAM__SRC));
}
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/XmlHelper.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/XmlHelper.java
index 0835c31..1ca63ab 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/XmlHelper.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/util/XmlHelper.java
@@ -29,14 +29,18 @@ import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.stream.XMLInputFactory;
+import org.dom4j.io.SAXReader;
+import org.xml.sax.SAXException;
+
public class XmlHelper {
+ private static final String NO_DOCTYPE =
"http://apache.org/xml/features/disallow-doctype-decl";;
private XmlHelper() {
//no access
}
public static DocumentBuilder createBuilder() throws
ParserConfigurationException {
DocumentBuilderFactory dbFactory =
DocumentBuilderFactory.newInstance();
-
dbFactory.setFeature("http://apache.org/xml/features/disallow-doctype-decl";,
true);
+ dbFactory.setFeature(NO_DOCTYPE, true);
dbFactory.setFeature("http://xml.org/sax/features/external-general-entities";,
false);
dbFactory.setFeature("http://xml.org/sax/features/external-parameter-entities";,
false);
dbFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd";,
false);
@@ -54,4 +58,10 @@ public class XmlHelper {
factory.setProperty(SUPPORT_DTD, false);
return factory;
}
+
+ public static SAXReader createSaxReader() throws SAXException {
+ SAXReader reader = new SAXReader();
+ reader.setFeature(NO_DOCTYPE, true);
+ return reader;
+ }
}
diff --git
a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPSScreenShare.java
b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPSScreenShare.java
index b431c79..ddbc84f 100644
---
a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPSScreenShare.java
+++
b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPSScreenShare.java
@@ -61,7 +61,7 @@ public class RTMPSScreenShare extends RTMPSClient implements
IScreenShare {
@Override
public void handleException(Throwable throwable) {
Throwable cause = throwable.getCause();
- log.error("{}", new Object[] { cause });
+ log.error("Error", cause);
core.handleException(cause);
}
}
diff --git
a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPScreenShare.java
b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPScreenShare.java
index 1539721..7aa7ccb 100644
---
a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPScreenShare.java
+++
b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPScreenShare.java
@@ -61,7 +61,7 @@ public class RTMPScreenShare extends RTMPClient implements
IScreenShare {
@Override
public void handleException(Throwable throwable) {
Throwable cause = throwable.getCause();
- log.error("{}", new Object[] { cause });
+ log.error("Error", cause);
core.handleException(cause);
}
}
diff --git
a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPTSScreenShare.java
b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPTSScreenShare.java
index 89e2b73..bcda9a9 100644
---
a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPTSScreenShare.java
+++
b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPTSScreenShare.java
@@ -61,7 +61,7 @@ public class RTMPTSScreenShare extends RTMPTSClient
implements IScreenShare {
@Override
public void handleException(Throwable throwable) {
Throwable cause = throwable.getCause();
- log.error("{}", new Object[] { cause });
+ log.error("Error", cause);
core.handleException(cause);
}
}
diff --git
a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPTScreenShare.java
b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPTScreenShare.java
index e190281..04453c3 100644
---
a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPTScreenShare.java
+++
b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPTScreenShare.java
@@ -61,7 +61,7 @@ public class RTMPTScreenShare extends RTMPTClient implements
IScreenShare {
@Override
public void handleException(Throwable throwable) {
Throwable cause = throwable.getCause();
- log.error("{}", new Object[] { cause });
+ log.error("Error", cause);
core.handleException(cause);
}
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WhiteboardManager.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WhiteboardManager.java
index 2ed9fee..ae46130 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WhiteboardManager.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WhiteboardManager.java
@@ -119,6 +119,7 @@ public class WhiteboardManager implements
IWhiteboardManager {
}).start();
} catch (InterruptedException e) {
log.warn("Unexpected exception while map clean-up", e);
+ Thread.currentThread().interrupt();
}
}
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 48297c1..953bfde 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
@@ -97,6 +97,7 @@ public class Captcha extends Panel {
target.add(captcha);
}
+ @Override
protected Icon newIcon(String markupId) {
return new Icon(markupId,
FontAwesome5IconType.sync_s);
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
index 461da2a..890c76c 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
@@ -224,6 +224,7 @@ public class RegisterDialog extends Modal<String> {
Thread.sleep((long)(10 * Math.random()
* 1000));
} catch (InterruptedException e) {
log.error("Unexpected exception while
sleeting", e);
+ Thread.currentThread().interrupt();
}
}
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
index 5da1e55..f8eb929 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
@@ -268,6 +268,7 @@ public class SignInDialog extends Modal<String> {
Thread.sleep(6 + (long)(10 *
Math.random() * 1000));
} catch (InterruptedException e) {
log.error("Unexpected exception while
sleeping", e);
+ Thread.currentThread().interrupt();
}
strategy.remove();
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-board.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-board.js
index 96f7c60..3329722 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-board.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-board.js
@@ -3,7 +3,7 @@ var Wb = function() {
const ACTIVE = 'active', BUMPER = 100, wb = {id: -1, name: ''},
canvases = []
, area = $('.room-block .wb-block .wb-area .tabs'), bar =
area.find('.wb-tabbar')
, extraProps = ['uid', 'fileId', 'fileType', 'count', 'slide',
'omType', '_src', 'formula'];
- let tools, zoomBar, settings, math, mode, slide = 0, width = 0, height
= 0
+ let wbEl, tools, zoomBar, settings, math, mode, slide = 0, width = 0,
height = 0
, zoom = 1., zoomMode = 'PAGE_WIDTH', role = null,
scrollTimeout = null;
function _getBtn(m) {
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ChangePasswordDialog.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ChangePasswordDialog.java
index ff6aa5d..ce67c86 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ChangePasswordDialog.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ChangePasswordDialog.java
@@ -58,6 +58,7 @@ public class ChangePasswordDialog extends Modal<String> {
Thread.sleep(6 + (long)(10 *
Math.random() * 1000));
} catch (InterruptedException e) {
log.error("Unexpected exception while
sleeping", e);
+ Thread.currentThread().interrupt();
}
}
String p1 = pass.getConvertedInput();
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/EditProfileForm.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/EditProfileForm.java
index a9424eb..45cba85 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/EditProfileForm.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/EditProfileForm.java
@@ -146,6 +146,7 @@ public class EditProfileForm extends Form<User> {
Thread.sleep(6 + (long)(10 *
Math.random() * 1000));
} catch (InterruptedException e) {
log.error("Unexpected exception while
sleeping", e);
+ Thread.currentThread().interrupt();
}
}
}
