You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2021/03/03 04:51:35 UTC
[openmeetings] branch master updated: [OPENMEETINGS-2520] sonar
should be more happy
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 e367a06 [OPENMEETINGS-2520] sonar should be more happy
e367a06 is described below
commit e367a06d0918a766791f3476a545764b5091e94f
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Wed Mar 3 11:51:22 2021 +0700
[OPENMEETINGS-2520] sonar should be more happy
---
.../apache/openmeetings/core/remote/KStream.java | 5 ++--
.../apache/openmeetings/core/sip/SipManager.java | 2 +-
.../java/org/apache/openmeetings/cli/OmOption.java | 18 ++++++------
.../openmeetings/util/OMContextListener.java | 32 +++++++++++++---------
.../web/util/logging/TomcatGenericExports.java | 6 ++--
5 files changed, 34 insertions(+), 29 deletions(-)
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
index 694fc1f..aaef0ca 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
@@ -237,7 +237,7 @@ public class KStream extends AbstractStream implements ISipCallbacks {
public void addListener(String sid, String uid, String sdpOffer) {
final boolean self = uid.equals(this.uid);
- log.info("USER: have started, sid {}, uid {} in kRoom {}", sid, uid, self ? "broadcasting" : "receiving", getRoomId());
+ log.info("USER: have started, sid {}, uid {}, mode {} in kRoom {}", sid, uid, self ? "broadcasting" : "receiving", getRoomId());
log.trace("USER {}: SdpOffer is {}", uid, sdpOffer);
if (!self && outgoingMedia == null) {
log.warn("Trying to add listener too early, sid {}, uid {}", sid, uid);
@@ -323,8 +323,7 @@ public class KStream extends AbstractStream implements ISipCallbacks {
// sender candidates
if (recv && !candidatesQueue.isEmpty()) {
log.trace("addIceCandidate iceCandidate reply from not ready, uid: {}", uid);
- candidatesQueue.stream()
- .forEach(candidate -> endpoint.addIceCandidate(candidate));
+ candidatesQueue.stream().forEach(endpoint::addIceCandidate);
candidatesQueue.clear();
}
}
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/SipManager.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/SipManager.java
index 976f790..5d23437 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/SipManager.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/sip/SipManager.java
@@ -201,7 +201,7 @@ public class SipManager implements ISipManager {
ResponseEvents r = execEvent(da);
if (r != null) {
long count = r.getEvents().stream()
- .filter(evt -> evt instanceof ConfbridgeListEvent)
+ .filter(ConfbridgeListEvent.class::isInstance)
.filter(evt -> !omSipUser.equals(evt.getCallerIdName()))
.count();
log.trace("SipManager::countUsers == {}", count);
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 4262cf1..e872095 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
@@ -18,14 +18,17 @@
*/
package org.apache.openmeetings.cli;
-import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
import org.apache.commons.cli.Option;
public class OmOption extends Option {
private static final long serialVersionUID = 1L;
private String group = null;
- private HashMap<String, Boolean> optional = null;
+ private Map<String, Boolean> optional = null;
private int order = 0;
private String helpPrefix = "";
@@ -65,8 +68,8 @@ public class OmOption extends Option {
boolean result = false;
if (optional != null) {
String[] grps = group.split(",");
- for(String g : grps) {
- result |= optional.containsKey(g) ? optional.get(g) : false;
+ for (String g : grps) {
+ result |= optional.getOrDefault(g, false);
}
}
return result;
@@ -77,11 +80,8 @@ public class OmOption extends Option {
}
public void setOptional(String group, boolean val) {
- String[] grps = group.split(",");
- optional = new HashMap<>(grps.length);
- for(String g : grps) {
- optional.put(g, val);
- }
+ optional = Stream.of(group.split(","))
+ .collect(Collectors.toMap(Function.identity(), s -> val));
}
public int getOrder() {
diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OMContextListener.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OMContextListener.java
index ef6de1e..c89ee9c 100644
--- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OMContextListener.java
+++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OMContextListener.java
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.util;
+import java.io.IOException;
import java.io.InputStream;
import javax.servlet.ServletContextEvent;
@@ -28,6 +29,7 @@ import org.slf4j.LoggerFactory;
import ch.qos.logback.classic.LoggerContext;
import ch.qos.logback.classic.joran.JoranConfigurator;
+import ch.qos.logback.core.joran.spi.JoranException;
public class OMContextListener implements ServletContextListener {
private static final String LOG_DIR_PROP = "current_openmeetings_log_dir";
@@ -46,23 +48,27 @@ public class OMContextListener implements ServletContextListener {
JoranConfigurator configurator = new JoranConfigurator();
configurator.setContext(context);
context.reset();
- boolean configured = false;
- try (InputStream cfgIs = getClass().getResourceAsStream("/logback-test.xml")) {
- if (cfgIs != null) {
- configurator.doConfigure(cfgIs);
- configured = true;
- }
- } catch (Exception e) {
- // no-op
- }
- if (!configured) {
- try (InputStream cfgIs = getClass().getResourceAsStream("/logback-config.xml")) {
- configurator.doConfigure(cfgIs);
- }
+ tryConfigure(configurator);
+ } catch (Exception e) {
+ // no-op
+ }
+ }
+
+ private void tryConfigure(JoranConfigurator configurator) throws JoranException, IOException {
+ boolean configured = false;
+ try (InputStream cfgIs = getClass().getResourceAsStream("/logback-test.xml")) {
+ if (cfgIs != null) {
+ configurator.doConfigure(cfgIs);
+ configured = true;
}
} catch (Exception e) {
// no-op
}
+ if (!configured) {
+ try (InputStream cfgIs = getClass().getResourceAsStream("/logback-config.xml")) {
+ configurator.doConfigure(cfgIs);
+ }
+ }
}
private static String pathToName(ServletContextEvent event) {
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/logging/TomcatGenericExports.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/logging/TomcatGenericExports.java
index 20a049e..8865859 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/logging/TomcatGenericExports.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/logging/TomcatGenericExports.java
@@ -73,7 +73,7 @@ import io.prometheus.client.GaugeMetricFamily;
*/
public class TomcatGenericExports extends Collector {
private static final Logger log = LoggerFactory.getLogger(TomcatGenericExports.class);
- private static final String labelName = "name";
+ private static final String LABEL_NAME = "name";
private String jmxDomain = "Catalina";
public TomcatGenericExports(boolean embedded) {
@@ -89,7 +89,7 @@ public class TomcatGenericExports extends Collector {
Set<ObjectInstance> mBeans = server.queryMBeans(filterName, null);
if (!mBeans.isEmpty()) {
- List<String> labelNameList = List.of(labelName);
+ List<String> labelNameList = List.of(LABEL_NAME);
GaugeMetricFamily requestProcessorBytesReceivedGauge = new GaugeMetricFamily(
"tomcat_requestprocessor_received_bytes", "Number of bytes received by this request processor",
@@ -226,7 +226,7 @@ public class TomcatGenericExports extends Collector {
Set<ObjectInstance> mBeans = server.queryMBeans(filterName, null);
if (!mBeans.isEmpty()) {
- List<String> labelList = List.of(labelName);
+ List<String> labelList = List.of(LABEL_NAME);
GaugeMetricFamily threadPoolCurrentCountGauge = new GaugeMetricFamily("tomcat_threads_total",
"Number threads in this pool.", labelList);