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 53f2d769a [OPENMEETINGS-2770] jetty; code clean-up
53f2d769a is described below
commit 53f2d769aef9ce0b56f54dda1bf17520a5f23f13
Author: Maxim Solodovnik <solo...@apache.org>
AuthorDate: Fri Sep 1 12:46:05 2023 +0700
[OPENMEETINGS-2770] jetty; code clean-up
---
.../web/admin/configurations/ConfigForm.java | 29 +++------------------
.../openmeetings/web/admin/labels/LangForm.java | 16 ++----------
.../openmeetings/web/admin/rooms/RoomForm.java | 16 ++----------
.../openmeetings/web/admin/users/UserForm.java | 16 ++----------
.../apache/openmeetings/web/app/UserManager.java | 1 +
.../openmeetings/web/common/GeneralUserForm.java | 16 ++----------
.../openmeetings/web/common/LanguageDropDown.java | 16 ++----------
.../web/pages/install/InstallWizard.java | 30 +++-------------------
.../web/room/poll/CreatePollDialog.java | 16 ++----------
.../web/user/calendar/AppointmentDialog.java | 27 +++----------------
.../web/user/profile/MessagesContactsPanel.java | 30 +++-------------------
.../openmeetings/web/util/CountryDropDown.java | 26 ++-----------------
.../openmeetings/web/util/RoomTypeDropDown.java | 27 ++-----------------
pom.xml | 2 +-
14 files changed, 32 insertions(+), 236 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
index ba7a9c245..a89d614c4 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
@@ -45,12 +45,11 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.CheckBox;
import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.form.IChoiceRenderer;
+import org.apache.wicket.markup.html.form.LambdaChoiceRenderer;
import org.apache.wicket.markup.html.form.RequiredTextField;
import org.apache.wicket.markup.html.form.TextArea;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.model.CompoundPropertyModel;
-import org.apache.wicket.model.IModel;
import org.apache.wicket.model.ResourceModel;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.wicket.spring.injection.annot.SpringBean;
@@ -124,29 +123,9 @@ public class ConfigForm extends
AdminBaseForm<Configuration> {
add(new TextArea<String>("comment"));
update(null);
- add(new DropDownChoice<>("type", List.of(Type.values()), new
IChoiceRenderer<Type>() {
- private static final long serialVersionUID = 1L;
-
- @Override
- public String getIdValue(Type rt, int index) {
- return rt.name();
- }
-
- @Override
- public Object getDisplayValue(Type rt) {
- return rt.name();
- }
-
- @Override
- public Type getObject(String id, IModel<? extends
List<? extends Type>> choices) {
- for (Type rt : choices.getObject()) {
- if (rt.name().equals(id)) {
- return rt;
- }
- }
- return null;
- }
- }).setLabel(new
ResourceModel("45")).add(AjaxFormComponentUpdatingBehavior.onUpdate(EVT_CHANGE,
this::update)));
+ add(new DropDownChoice<>("type", List.of(Type.values()), new
LambdaChoiceRenderer<>(Type::name, Type::name))
+ .setLabel(new ResourceModel("45"))
+
.add(AjaxFormComponentUpdatingBehavior.onUpdate(EVT_CHANGE, this::update)));
add(new RequiredTextField<String>("key").setLabel(new
ResourceModel("265")).add(new IValidator<String>(){
private static final long serialVersionUID = 1L;
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangForm.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangForm.java
index b8b7ab48b..c13af7e4c 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangForm.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangForm.java
@@ -30,9 +30,9 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormValidatingBehavior;
import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;
import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.form.ChoiceRenderer;
import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.LambdaChoiceRenderer;
import org.apache.wicket.model.PropertyModel;
/**
@@ -59,19 +59,7 @@ public class LangForm extends Form<Void> {
languages = new DropDownChoice<>("language"
, new PropertyModel<>(langPanel, "language")
, getLanguages()
- , new ChoiceRenderer<Map.Entry<Long, Locale>>()
{
- private static final long
serialVersionUID = 1L;
-
- @Override
- public Object
getDisplayValue(Map.Entry<Long, Locale> object) {
- return
object.getValue().getDisplayName();
- }
-
- @Override
- public String
getIdValue(Map.Entry<Long, Locale> object, int index) {
- return "" + object.getKey();
- }
- });
+ , new LambdaChoiceRenderer<>(e ->
e.getValue().getDisplayName(), e -> "" + e.getKey()));
languages.add(new OnChangeAjaxBehavior() {
private static final long serialVersionUID = 1L;
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
index 32db3737d..b54565194 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
@@ -58,9 +58,9 @@ import org.apache.wicket.ajax.markup.html.form.AjaxCheckBox;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.CheckBox;
-import org.apache.wicket.markup.html.form.ChoiceRenderer;
import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.LambdaChoiceRenderer;
import org.apache.wicket.markup.html.form.RequiredTextField;
import org.apache.wicket.markup.html.form.TextArea;
import org.apache.wicket.markup.html.form.TextField;
@@ -150,19 +150,7 @@ public class RoomForm extends AdminBaseForm<Room> {
add(new DropDownChoice<>("capacity", //
DROPDOWN_NUMBER_OF_PARTICIPANTS, //
- new ChoiceRenderer<Long>() {
- private static final long
serialVersionUID = 1L;
-
- @Override
- public Object getDisplayValue(Long id) {
- return id;
- }
-
- @Override
- public String getIdValue(Long id, int
index) {
- return "" + id;
- }
- }));
+ new LambdaChoiceRenderer<>(num -> num,
String::valueOf)));
add(new RoomTypeDropDown("type").setRequired(true).setLabel(new
ResourceModel("45")));
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 afabc5061..c0f83a8b1 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
@@ -58,9 +58,9 @@ import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.CheckBox;
-import org.apache.wicket.markup.html.form.ChoiceRenderer;
import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.LambdaChoiceRenderer;
import org.apache.wicket.markup.html.form.PasswordTextField;
import org.apache.wicket.markup.html.form.RequiredTextField;
import org.apache.wicket.markup.html.panel.IMarkupSourcingStrategy;
@@ -338,19 +338,7 @@ public class UserForm extends AdminBaseForm<User> {
}
}
domainId.setChoices(ids);
- domainId.setChoiceRenderer(new ChoiceRenderer<Long>() {
- private static final long serialVersionUID = 1L;
-
- @Override
- public Object getDisplayValue(Long object) {
- return values.get(object);
- }
-
- @Override
- public String getIdValue(Long object, int index) {
- return "" + object;
- }
- });
+ domainId.setChoiceRenderer(new LambdaChoiceRenderer<>(id ->
values.get(id), 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/app/UserManager.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/UserManager.java
index 36b6b8ec8..830063a12 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/UserManager.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/UserManager.java
@@ -344,6 +344,7 @@ public class UserManager implements IUserManager {
Map<String, String> params = new HashMap<>();
params.put("{$client_id}", s.getClientId());
params.put("{$redirect_uri}", getRedirectUri(s));
+ params.put("{$state}", randomUUID().toString());
return params;
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
index 33cf6bac6..3eb84407c 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
@@ -37,9 +37,9 @@ import
org.apache.openmeetings.web.common.datetime.AjaxOmDatePicker;
import org.apache.openmeetings.web.util.CountryDropDown;
import org.apache.openmeetings.web.util.RestrictiveChoiceProvider;
import
org.apache.wicket.extensions.validation.validator.RfcCompliantEmailAddressValidator;
-import org.apache.wicket.markup.html.form.ChoiceRenderer;
import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.LambdaChoiceRenderer;
import org.apache.wicket.markup.html.form.RequiredTextField;
import org.apache.wicket.markup.html.form.TextArea;
import org.apache.wicket.markup.html.form.TextField;
@@ -78,19 +78,7 @@ public class GeneralUserForm extends Form<User> {
email.add(RfcCompliantEmailAddressValidator.getInstance());
add(new DropDownChoice<>("salutation"
, List.of(Salutation.values())
- , new ChoiceRenderer<Salutation>() {
- private static final long
serialVersionUID = 1L;
-
- @Override
- public Object
getDisplayValue(Salutation object) {
- return
getString("user.salutation." + object.name());
- }
-
- @Override
- public String getIdValue(Salutation
object, int index) {
- return object.name();
- }
- }));
+ , new LambdaChoiceRenderer<>(s ->
getString("user.salutation." + s.name()), Salutation::name)));
add(new TextField<String>("firstname"));
add(new TextField<String>("lastname"));
add(new TextField<String>("displayName").setEnabled(isAdminForm
|| isDisplayNameEditable()));
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/LanguageDropDown.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/LanguageDropDown.java
index 8dd688c86..e94d7c03e 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/LanguageDropDown.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/LanguageDropDown.java
@@ -24,8 +24,8 @@ import java.util.Locale;
import java.util.Map;
import org.apache.openmeetings.db.dao.label.LabelDao;
-import org.apache.wicket.markup.html.form.ChoiceRenderer;
import org.apache.wicket.markup.html.form.DropDownChoice;
+import org.apache.wicket.markup.html.form.LambdaChoiceRenderer;
import org.apache.wicket.model.IModel;
public class LanguageDropDown extends DropDownChoice<Long> {
@@ -47,18 +47,6 @@ public class LanguageDropDown extends DropDownChoice<Long> {
languages.add(e.getKey());
}
setChoices(languages);
- setChoiceRenderer(new ChoiceRenderer<Long>() {
- private static final long serialVersionUID = 1L;
-
- @Override
- public Object getDisplayValue(Long object) {
- return
LabelDao.getLocale(object).getDisplayName();
- }
-
- @Override
- public String getIdValue(Long object, int index) {
- return "" + object;
- }
- });
+ setChoiceRenderer(new LambdaChoiceRenderer<>(id ->
LabelDao.getLocale(id).getDisplayName(), String::valueOf));
}
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
index ebe162ea6..ab4e1e3ba 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
@@ -76,6 +76,7 @@ import org.apache.wicket.markup.html.form.CheckBox;
import org.apache.wicket.markup.html.form.ChoiceRenderer;
import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.LambdaChoiceRenderer;
import org.apache.wicket.markup.html.form.PasswordTextField;
import org.apache.wicket.markup.html.form.RequiredTextField;
import org.apache.wicket.markup.html.form.TextField;
@@ -275,19 +276,8 @@ public class InstallWizard extends BootstrapWizard {
private final TextField<String> pass = new
TextField<>("password");
private final Form<ConnectionProperties> form = new
Form<>("form", new CompoundPropertyModel<>(getProps(null))) {
private static final long serialVersionUID = 1L;
- private final DropDownChoice<DbType> db = new
DropDownChoice<>("dbType", List.of(DbType.values()), new
ChoiceRenderer<DbType>() {
- private static final long serialVersionUID = 1L;
-
- @Override
- public Object getDisplayValue(DbType object) {
- return
getString(String.format("install.wizard.db.step.%s.name", object.dbName()));
- }
-
- @Override
- public String getIdValue(DbType object, int
index) {
- return object.name();
- }
- });
+ private final DropDownChoice<DbType> db = new
DropDownChoice<>("dbType", List.of(DbType.values())
+ , new LambdaChoiceRenderer<>(db ->
getString("install.wizard.db.step." + db.dbName() + ".name"), DbType::name));
@Override
protected void onInitialize() {
@@ -880,19 +870,7 @@ public class InstallWizard extends BootstrapWizard {
public TzDropDown(String id) {
super(id);
setChoices(AVAILABLE_TIMEZONES);
- setChoiceRenderer(new ChoiceRenderer<String>() {
- private static final long serialVersionUID = 1L;
-
- @Override
- public Object getDisplayValue(String object) {
- return object;
- }
-
- @Override
- public String getIdValue(String object, int
index) {
- return object;
- }
- });
+ setChoiceRenderer(new LambdaChoiceRenderer<>(str ->
str, str -> str));
}
public void setOption() {
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java
index bd2b1c03d..1085c75cd 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java
@@ -32,9 +32,9 @@ import org.apache.openmeetings.db.util.ws.RoomMessage;
import org.apache.openmeetings.web.common.MainPanel;
import org.apache.openmeetings.web.common.OmModalCloseButton;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.markup.html.form.ChoiceRenderer;
import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.LambdaChoiceRenderer;
import org.apache.wicket.markup.html.form.RequiredTextField;
import org.apache.wicket.markup.html.form.TextArea;
import org.apache.wicket.model.CompoundPropertyModel;
@@ -118,19 +118,7 @@ public class CreatePollDialog extends Modal<RoomPoll> {
add(new RequiredTextField<String>("name").setLabel(new
ResourceModel("1410")));
add(new TextArea<String>("question"));
add(new DropDownChoice<>("type",
List.of(RoomPoll.Type.values())
- , new ChoiceRenderer<RoomPoll.Type>() {
- private static final long
serialVersionUID = 1L;
-
- @Override
- public Object
getDisplayValue(RoomPoll.Type pt) {
- return
getString("poll.type." + pt.name());
- }
-
- @Override
- public String
getIdValue(RoomPoll.Type pt, int index) {
- return pt.name();
- }
- })
+ , new LambdaChoiceRenderer<>(pt ->
getString("poll.type." + pt.name()), RoomPoll.Type::name))
.setRequired(true).setLabel(new
ResourceModel("21")));
add(feedback.setOutputMarkupId(true));
super.onInitialize();
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
index b0354dc9a..a77932c6c 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
@@ -70,7 +70,7 @@ import org.apache.wicket.markup.html.form.CheckBox;
import org.apache.wicket.markup.html.form.ChoiceRenderer;
import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.form.IChoiceRenderer;
+import org.apache.wicket.markup.html.form.LambdaChoiceRenderer;
import org.apache.wicket.markup.html.form.PasswordTextField;
import org.apache.wicket.markup.html.form.Radio;
import org.apache.wicket.markup.html.form.RadioGroup;
@@ -421,29 +421,8 @@ public class AppointmentDialog extends Modal<Appointment> {
add(new DropDownChoice<>(
"reminder"
, List.of(Reminder.values())
- , new IChoiceRenderer<Reminder>() {
- private static final long
serialVersionUID = 1L;
-
- @Override
- public Object
getDisplayValue(Reminder art) {
- return
getString("appointment.reminder." + art.name());
- }
-
- @Override
- public String
getIdValue(Reminder art, int index) {
- return art.name();
- }
-
- @Override
- public Reminder
getObject(String id, IModel<? extends List<? extends Reminder>> choices) {
- for (Reminder art :
choices.getObject()) {
- if
(art.name().equals(id)) {
- return
art;
- }
- }
- return null;
- }
- }));
+ , new
LambdaChoiceRenderer<>(Reminder::name, art -> getString("appointment.reminder."
+ art.name()))
+ ));
add(new AjaxCheckBox("passwordProtected") {
private static final long serialVersionUID = 1L;
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 6533fd6dc..4ee480534 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
@@ -66,8 +66,8 @@ import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Button;
-import org.apache.wicket.markup.html.form.ChoiceRenderer;
import org.apache.wicket.markup.html.form.DropDownChoice;
+import org.apache.wicket.markup.html.form.LambdaChoiceRenderer;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.markup.repeater.Item;
@@ -119,35 +119,11 @@ 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 ChoiceRenderer<String>() {
- private static final long serialVersionUID = 1L;
-
- @Override
- public Object getDisplayValue(String object) {
- return Application.getString(object);
- }
-
- @Override
- public String getIdValue(String object, int index) {
- return object;
- }
- });
+ , new LambdaChoiceRenderer<>(str -> Application.getString(str),
str -> str));
private final PrivateMessageFolder notMoveFolder = new
PrivateMessageFolder();
private final DropDownChoice<PrivateMessageFolder> moveDropDown = new
DropDownChoice<>("msgMove", Model.of(notMoveFolder)
, List.of(notMoveFolder)
- , new ChoiceRenderer<PrivateMessageFolder>() {
- private static final long serialVersionUID = 1L;
-
- @Override
- public Object getDisplayValue(PrivateMessageFolder
object) {
- return object.getFolderName();
- }
-
- @Override
- public String getIdValue(PrivateMessageFolder object,
int index) {
- return "" + object.getId();
- }
- });
+ , new
LambdaChoiceRenderer<>(PrivateMessageFolder::getFolderName, f -> "" +
f.getId()));
private WebMarkupContainer selectedFolder;
@SpringBean
private PrivateMessageDao msgDao;
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CountryDropDown.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CountryDropDown.java
index 472fe6422..f9eb681ba 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CountryDropDown.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CountryDropDown.java
@@ -25,7 +25,7 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.wicket.markup.html.form.DropDownChoice;
-import org.apache.wicket.markup.html.form.IChoiceRenderer;
+import org.apache.wicket.markup.html.form.LambdaChoiceRenderer;
import org.apache.wicket.model.IModel;
public class CountryDropDown extends DropDownChoice<String> {
@@ -41,28 +41,6 @@ public class CountryDropDown extends DropDownChoice<String>
{
List<String> countries = new ArrayList<>(getCountries());
countries.sort((c1, c2) -> getCountryName(c1,
getLocale()).compareTo(getCountryName(c2, getLocale())));
setChoices(countries);
- setChoiceRenderer(new IChoiceRenderer<String>() {
- private static final long serialVersionUID = 1L;
-
- @Override
- public String getIdValue(String code, int index) {
- return code;
- }
-
- @Override
- public Object getDisplayValue(String code) {
- return getCountryName(code, getLocale());
- }
-
- @Override
- public String getObject(String id, IModel<? extends
List<? extends String>> choices) {
- for (String code : choices.getObject()) {
- if (code.equals(id)) {
- return code;
- }
- }
- return null;
- }
- });
+ setChoiceRenderer(new LambdaChoiceRenderer<>(code ->
getCountryName(code, getLocale()), code -> code));
}
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RoomTypeDropDown.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RoomTypeDropDown.java
index e8d721e89..009c156a3 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RoomTypeDropDown.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/RoomTypeDropDown.java
@@ -22,8 +22,7 @@ import java.util.List;
import org.apache.openmeetings.db.entity.room.Room.Type;
import org.apache.wicket.markup.html.form.DropDownChoice;
-import org.apache.wicket.markup.html.form.IChoiceRenderer;
-import org.apache.wicket.model.IModel;
+import org.apache.wicket.markup.html.form.LambdaChoiceRenderer;
public class RoomTypeDropDown extends DropDownChoice<Type> {
private static final long serialVersionUID = 1L;
@@ -31,28 +30,6 @@ public class RoomTypeDropDown extends DropDownChoice<Type> {
public RoomTypeDropDown(String id) {
super(id);
setChoices(List.of(Type.values()));
- setChoiceRenderer(new IChoiceRenderer<Type>() {
- private static final long serialVersionUID = 1L;
-
- @Override
- public String getIdValue(Type rt, int index) {
- return rt.name();
- }
-
- @Override
- public Object getDisplayValue(Type rt) {
- return getString("room.type." + rt.name());
- }
-
- @Override
- public Type getObject(String id, IModel<? extends
List<? extends Type>> choices) {
- for (Type rt : choices.getObject()) {
- if (rt.name().equals(id)) {
- return rt;
- }
- }
- return null;
- }
- });
+ setChoiceRenderer(new LambdaChoiceRenderer<>(rt ->
getString("room.type." + rt.name()), Type::name));
}
}
diff --git a/pom.xml b/pom.xml
index 9290d4da5..78dc8a1d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -122,7 +122,7 @@
<tika-parsers.version>2.8.0</tika-parsers.version>
<slf4j.version>2.0.7</slf4j.version>
<logback.version>1.4.11</logback.version>
- <jetty.version>9.4.51.v20230217</jetty.version>
+ <jetty.version>9.4.52.v20230823</jetty.version>
<license.excludedScopes>test</license.excludedScopes>
<bcprov.version>1.76</bcprov.version>
<mockito.version>5.2.0</mockito.version>
