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 74936b8b2 [OPENMEETINGS-2783] some issues are addressed
74936b8b2 is described below
commit 74936b8b2bf2f73cad89fefc01a63e96970a010a
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Fri Mar 1 16:23:22 2024 +0700
[OPENMEETINGS-2783] some issues are addressed
---
.../java/org/apache/openmeetings/core/ldap/LdapLoginManager.java | 4 ++--
.../java/org/apache/openmeetings/mediaserver/KTestStream.java | 2 +-
.../org/apache/openmeetings/mediaserver/TestStreamProcessor.java | 2 +-
.../java/org/apache/openmeetings/web/admin/users/UserForm.java | 2 +-
.../src/main/java/org/apache/openmeetings/web/pages/HashPage.java | 8 ++++----
.../java/org/apache/openmeetings/web/pages/auth/SignInDialog.java | 4 ++--
.../apache/openmeetings/web/user/dashboard/StartWidgetView.java | 4 ++--
.../apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java | 6 +++---
.../openmeetings/web/user/profile/MessagesContactsPanel.java | 2 +-
9 files changed, 17 insertions(+), 17 deletions(-)
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManager.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManager.java
index 5baa5f2d7..a1b4d6ad0 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManager.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManager.java
@@ -352,7 +352,7 @@ public class LdapLoginManager {
conn = new LdapNetworkConnection(options.host,
options.port, options.secure);
}
- private User updatePic(User inUser, InputStream is, StoredFile
sf) {
+ private User updatePic(User inUser, InputStream is) {
User u = inUser;
Path tempImage = null;
try {
@@ -383,7 +383,7 @@ public class LdapLoginManager {
InputStream is = new
ByteArrayInputStream(val.getBytes());
StoredFile sf = new
StoredFile("picture", is);
if (sf.isImage()) {
- u = updatePic(inUser,
is, sf);
+ u = updatePic(inUser,
is);
} else {
u.setPictureUri(val.getString());
}
diff --git
a/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/KTestStream.java
b/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/KTestStream.java
index 3875c590a..8cad9f011 100644
---
a/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/KTestStream.java
+++
b/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/KTestStream.java
@@ -259,7 +259,7 @@ public class KTestStream extends AbstractStream {
releasePlayer();
releaseRecorder();
if (remove) {
- processor.release(this, true);
+ processor.release(this);
}
}
}
diff --git
a/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/TestStreamProcessor.java
b/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/TestStreamProcessor.java
index 42ce6fd1e..99800faa4 100644
---
a/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/TestStreamProcessor.java
+++
b/openmeetings-mediaserver/src/main/java/org/apache/openmeetings/mediaserver/TestStreamProcessor.java
@@ -102,7 +102,7 @@ class TestStreamProcessor {
}
}
- public void release(AbstractStream stream, boolean releaseStream) {
+ public void release(AbstractStream stream) {
streamByUid.remove(stream.getUid());
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
index 2f38131f2..be1278515 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
@@ -339,7 +339,7 @@ public class UserForm extends AdminBaseForm<User> {
}
}
domainId.setChoices(ids);
- domainId.setChoiceRenderer(new LambdaChoiceRenderer<>(id ->
values.get(id), String::valueOf));
+ domainId.setChoiceRenderer(new
LambdaChoiceRenderer<>(values::get, String::valueOf));
domain.setVisible(u.getType() == Type.LDAP || u.getType() ==
Type.OAUTH);
if (target != null) {
target.add(domain);
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
index 88b95e896..8c354380f 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
@@ -59,10 +59,10 @@ import jakarta.inject.Inject;
public class HashPage extends BaseInitedPage implements IUpdatable {
private static final long serialVersionUID = 1L;
- public static final String APP = "app";
+ public static final String APP_KEY = "app";
public static final String APP_TYPE_NETWORK = "network";
public static final String APP_TYPE_SETTINGS = "settings";
- public static final String SWF = "swf";
+ public static final String SWF_KEY = "swf";
public static final String PANEL_MAIN = "panel-main";
public static final String PANEL_RECORDING = "panel-recording";
public static final String INVITATION_HASH = "invitation";
@@ -87,8 +87,8 @@ public class HashPage extends BaseInitedPage implements
IUpdatable {
public HashPage(PageParameters p) {
secure = p.get(HASH);
invitation = p.get(INVITATION_HASH);
- swf = p.get(SWF);
- app = swf.isEmpty() ? p.get(APP) : swf;
+ swf = p.get(SWF_KEY);
+ app = swf.isEmpty() ? p.get(APP_KEY) : swf;
WebSession ws = WebSession.get();
ws.checkHashes(secure, invitation);
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 51b94b59e..8ecdff561 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
@@ -20,7 +20,7 @@ package org.apache.openmeetings.web.pages.auth;
import static
org.apache.openmeetings.web.app.Application.getAuthenticationStrategy;
import static org.apache.openmeetings.web.app.UserManager.showAuth;
-import static org.apache.openmeetings.web.pages.HashPage.APP;
+import static org.apache.openmeetings.web.pages.HashPage.APP_KEY;
import static org.apache.openmeetings.web.pages.HashPage.APP_TYPE_NETWORK;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_LDAP_ID;
import static org.apache.openmeetings.util.OpenmeetingsVariables.isOtpEnabled;
@@ -178,7 +178,7 @@ public class SignInDialog extends Modal<String> {
}
});
add(new
WebMarkupContainer("netTest").add(AttributeModifier.append("href"
- ,
RequestCycle.get().urlFor(HashPage.class, new PageParameters().add(APP,
APP_TYPE_NETWORK)).toString())));
+ ,
RequestCycle.get().urlFor(HashPage.class, new PageParameters().add(APP_KEY,
APP_TYPE_NETWORK)).toString())));
add(new BookmarkablePageLink<>("privacy",
PrivacyPage.class));
final boolean showOauth =
((SignInPage)getPage()).allowOAuthLogin();
add(new WebMarkupContainer("oauth").add(
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java
index c00317d0c..009722231 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java
@@ -19,7 +19,7 @@
package org.apache.openmeetings.web.user.dashboard;
import static org.apache.openmeetings.web.common.BasePanel.EVT_CLICK;
-import static org.apache.openmeetings.web.pages.HashPage.APP;
+import static org.apache.openmeetings.web.pages.HashPage.APP_KEY;
import static org.apache.openmeetings.web.pages.HashPage.APP_TYPE_SETTINGS;
import static org.apache.openmeetings.web.util.OmUrlFragment.CALENDAR;
import static org.apache.openmeetings.web.util.OmUrlFragment.ROOMS_PUBLIC;
@@ -54,7 +54,7 @@ public class StartWidgetView extends WidgetView {
add(new WebMarkupContainer("step1").add(new
PublicRoomsEventBehavior()));
add(new WebMarkupContainer("step2").add(new
PublicRoomsEventBehavior()));
add(new WebMarkupContainer("step3").add(new
WebMarkupContainer("avTest").add(AttributeModifier.append("href"
- , RequestCycle.get().urlFor(HashPage.class, new
PageParameters().add(APP, APP_TYPE_SETTINGS)).toString()))));
+ , RequestCycle.get().urlFor(HashPage.class, new
PageParameters().add(APP_KEY, APP_TYPE_SETTINGS)).toString()))));
add(new WebMarkupContainer("step4").add(new
PublicRoomsEventBehavior()));
add(new Label("123msg",
Application.getString("widget.start.desc")) //Application here is used to
substitute {0}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java
index cab5c17a4..f8681a3b6 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.java
@@ -20,7 +20,7 @@ package org.apache.openmeetings.web.user.dashboard;
import static
org.apache.openmeetings.db.entity.user.PrivateMessage.INBOX_FOLDER_ID;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
-import static org.apache.openmeetings.web.pages.HashPage.APP;
+import static org.apache.openmeetings.web.pages.HashPage.APP_KEY;
import static org.apache.openmeetings.web.pages.HashPage.APP_TYPE_NETWORK;
import static org.apache.openmeetings.web.pages.HashPage.APP_TYPE_SETTINGS;
import static org.apache.openmeetings.web.util.OmUrlFragment.PROFILE_EDIT;
@@ -79,8 +79,8 @@ public class WelcomeWidgetView extends WidgetView {
}
});
add(new
WebMarkupContainer("netTest").add(AttributeModifier.append("href"
- , RequestCycle.get().urlFor(HashPage.class, new
PageParameters().add(APP, APP_TYPE_NETWORK)).toString())));
+ , RequestCycle.get().urlFor(HashPage.class, new
PageParameters().add(APP_KEY, APP_TYPE_NETWORK)).toString())));
add(new
WebMarkupContainer("avTest").add(AttributeModifier.append("href"
- , RequestCycle.get().urlFor(HashPage.class, new
PageParameters().add(APP, APP_TYPE_SETTINGS)).toString())));
+ , RequestCycle.get().urlFor(HashPage.class, new
PageParameters().add(APP_KEY, APP_TYPE_SETTINGS)).toString())));
}
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
index a44951231..d96cd08c8 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
@@ -120,7 +120,7 @@ public class MessagesContactsPanel extends UserBasePanel {
private final DropDownChoice<String> selectDropDown = new
DropDownChoice<>(
"msgSelect", Model.of(SELECT_CHOOSE)
, List.of(SELECT_CHOOSE, SELECT_ALL, SELECT_NONE,
SELECT_UNREAD, SELECT_READ)
- , new LambdaChoiceRenderer<>(str -> Application.getString(str),
str -> str));
+ , new LambdaChoiceRenderer<>(Application::getString, str ->
str));
private final PrivateMessageFolder notMoveFolder = new
PrivateMessageFolder();
private final DropDownChoice<PrivateMessageFolder> moveDropDown = new
DropDownChoice<>("msgMove", Model.of(notMoveFolder)
, List.of(notMoveFolder)
