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
commit 7fb6ca2e9ea0379781d12f84b312771234bfd83e Author: Maxim Solodovnik <solomax...@gmail.com> AuthorDate: Wed May 18 21:35:45 2022 +0700 [OPENMEETINGS-2733] some Sonar issues are addressed --- .../java/org/apache/openmeetings/core/remote/KurentoHandler.java | 9 +++++---- .../main/java/org/apache/openmeetings/web/common/MainPanel.java | 2 +- .../main/java/org/apache/openmeetings/web/pages/BasePage.java | 2 +- .../java/org/apache/openmeetings/web/util/OmUrlFragment.java | 1 + 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KurentoHandler.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KurentoHandler.java index ab8b144b5..3c3d1300e 100644 --- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KurentoHandler.java +++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KurentoHandler.java @@ -509,13 +509,14 @@ public class KurentoHandler { @Override public void onEvent(ObjectCreatedEvent evt) { - log.debug("Kurento::ObjectCreated -> {}, source {}", evt.getObject(), evt.getSource()); - if (evt.getObject() instanceof MediaPipeline) { + MediaObject obj = evt.getObject(); + log.debug("Kurento::ObjectCreated -> {}, source {}", obj, evt.getSource()); + if (obj instanceof MediaPipeline) { // room created - final String roid = evt.getObject().getId(); + final String roid = obj.getId(); checkPipeline(roid); - } else if (evt.getObject() instanceof Endpoint curPoint) { + } else if (obj instanceof Endpoint curPoint) { // endpoint created final String eoid = curPoint.getId(); final Class<? extends Endpoint> clazz = getEndpointClass(curPoint); diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java index ca2132bd2..bf83b3ed2 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java @@ -423,7 +423,7 @@ public class MainPanel extends Panel { } if (updateFragment) { UrlFragment uf = new UrlFragment(handler); - uf.set(f.getArea().name(), f.getType()); + uf.set(f.getArea().area(), f.getType()); } } } diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java index 92350d31e..0438b7067 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java @@ -104,7 +104,7 @@ public abstract class BasePage extends AsyncUrlFragmentAwarePage { protected OmUrlFragment getUrlFragment(IRequestParameters params) { for (AreaKeys key : AreaKeys.values()) { - StringValue type = params.getParameterValue(key.name()); + StringValue type = params.getParameterValue(key.area()); if (!type.isEmpty()) { return new OmUrlFragment(key, type.toString()); } diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OmUrlFragment.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OmUrlFragment.java index 4d89c4841..f7bcf4946 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OmUrlFragment.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/OmUrlFragment.java @@ -97,6 +97,7 @@ public class OmUrlFragment implements Serializable { public String area() { return name().toLowerCase(Locale.ROOT); } + public static AreaKeys of(String val) { return val == null ? null : AreaKeys.valueOf(val.toUpperCase(Locale.ROOT)); }