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 e6adbd152 [OPENMEETINGS-2733] more Sonar issues are fixed e6adbd152 is described below commit e6adbd15294a328c75f5bf477f62f1c8fe646260 Author: Maxim Solodovnik <solomax...@gmail.com> AuthorDate: Wed May 18 23:47:29 2022 +0700 [OPENMEETINGS-2733] more Sonar issues are fixed --- .../src/main/java/org/apache/openmeetings/web/common/MainPanel.java | 2 +- .../src/main/java/org/apache/openmeetings/web/pages/BasePage.java | 2 +- .../main/java/org/apache/openmeetings/web/util/OmUrlFragment.java | 6 +++--- .../src/test/java/org/apache/openmeetings/web/TestMainAreas.java | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) 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 bf83b3ed2..9c590c7cf 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().area(), f.getType()); + uf.set(f.getArea().zone(), 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 0438b7067..6e4890f33 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.area()); + StringValue type = params.getParameterValue(key.zone()); 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 f7bcf4946..02f8ff709 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 @@ -94,7 +94,7 @@ public class OmUrlFragment implements Serializable { , ROOM , ROOMS; - public String area() { + public String zone() { return name().toLowerCase(Locale.ROOT); } @@ -230,7 +230,7 @@ public class OmUrlFragment implements Serializable { String[] arr = Application.get().getBean(ConfigurationDao.class).getString(CONFIG_DEFAULT_LANDING_ZONE, "").split("/"); if (arr != null && arr.length == 2) { try { - return new OmUrlFragment(AreaKeys.valueOf(arr[0]), arr[1]); + return new OmUrlFragment(AreaKeys.of(arr[0]), arr[1]); } catch (Exception e) { // no-op } @@ -333,7 +333,7 @@ public class OmUrlFragment implements Serializable { } public String getLink() { - return getBaseUrl() + "#" + getArea().area() + "/" + getType(); + return getBaseUrl() + "#" + getArea().zone() + "/" + getType(); } private static void moveToServer(Room r) { diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestMainAreas.java b/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestMainAreas.java index 128d2ec42..09855380c 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestMainAreas.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/web/TestMainAreas.java @@ -91,7 +91,7 @@ class TestMainAreas extends AbstractWicketTesterTest { for (String user : users) { log.debug("Positive test:: area: {}, type: {} for user: {}", area, type, user); testArea(user, p -> { - tester.getRequest().setParameter(area.name(), type); + tester.getRequest().setParameter(area.zone(), type); tester.executeBehavior((AbstractAjaxBehavior)p.getBehaviorById(0)); tester.assertComponent(PATH_CHILD, clazz); if (consumer != null) { @@ -105,7 +105,7 @@ class TestMainAreas extends AbstractWicketTesterTest { for (String user : users) { log.debug("Positive test:: area: {}, type: {} for user: {}", area, type, user); testArea(user, p -> { - tester.getRequest().setParameter(area.name(), type); + tester.getRequest().setParameter(area.zone(), type); AbstractAjaxBehavior authBehavior = (AbstractAjaxBehavior)p.getBehaviorById(0); try { tester.executeBehavior(authBehavior);