From 3e48002cb048cc2e500fd3faf133caf8d96950b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francesco=20Chicchiricc=C3=B2?= Date: Wed, 13 Jun 2018 15:21:38 +0200 Subject: [PATCH] [SYNCOPE-1323] Upgraded to Wicket 8 --- client/console/pom.xml | 2 +- .../SyncopeConsoleRequestCycleListener.java | 6 +- .../approvals/ApprovalDirectoryPanel.java | 8 +- .../console/approvals/ApprovalModal.java | 5 +- .../console/commons/AnyDataProvider.java | 13 +- .../SortableAnyProviderComparator.java | 4 +- .../status/AbstractStatusBeanProvider.java | 3 +- .../MailTemplateDirectoryPanel.java | 6 +- .../NotificationDirectoryPanel.java | 3 +- .../console/notifications/TemplateModal.java | 3 +- .../syncope/client/console/pages/Login.java | 13 +- .../console/pages/MustChangePassword.java | 5 +- .../console/panels/AbstractModalPanel.java | 5 +- .../console/panels/ActionDataTablePanel.java | 4 +- .../console/panels/AjaxDataTablePanel.java | 2 +- .../console/panels/AnyTypeClassesPanel.java | 3 +- .../client/console/panels/AnyTypesPanel.java | 3 +- .../console/panels/ApplicationModalPanel.java | 3 +- .../panels/DisplayAttributesModalPanel.java | 5 +- .../console/panels/DynRealmModalPanel.java | 3 +- .../console/panels/HistoryConfDetails.java | 4 +- .../panels/ImplementationDirectoryPanel.java | 3 +- .../ImplementationEngineTogglePanel.java | 4 +- .../panels/ImplementationModalPanel.java | 3 +- .../client/console/panels/ListViewPanel.java | 23 +- .../console/panels/MembersTogglePanel.java | 4 +- .../console/panels/NewWorkflowProcess.java | 4 +- .../console/panels/NotificationPanel.java | 13 +- .../ParametersCreateWizardAttrStep.java | 4 +- .../panels/ParametersEditModalPanel.java | 3 +- .../panels/RelationshipTypesPanel.java | 3 +- .../panels/RemediationDirectoryPanel.java | 3 +- .../console/panels/RoleDirectoryPanel.java | 3 +- .../console/panels/SchemaTypePanel.java | 3 +- .../client/console/panels/SchemasPanel.java | 4 +- .../panels/SecurityQuestionsModalPanel.java | 3 +- .../console/panels/StartAtTogglePanel.java | 4 +- .../console/panels/SubmitableModalPanel.java | 5 +- .../panels/TypeExtensionDirectoryPanel.java | 5 +- .../panels/WorkflowDirectoryPanel.java | 3 +- .../panels/search/SearchClausePanel.java | 7 +- .../policies/PolicyModalPanelBuilder.java | 3 +- .../policies/PullPolicyModalPanel.java | 3 +- .../reports/ReportTemplateDirectoryPanel.java | 6 +- .../console/status/ChangePasswordModal.java | 5 +- .../client/console/status/ReconTaskPanel.java | 2 +- .../tasks/ExecutionsDirectoryPanel.java | 3 +- .../tasks/TaskAttributesDetailsView.java | 3 +- .../console/tasks/TaskStartAtTogglePanel.java | 5 +- .../console/tasks/TemplatesTogglePanel.java | 4 +- .../html/bootstrap/dialog/BaseModal.java | 8 +- .../markup/html/form/AbstractMultiPanel.java | 12 +- .../markup/html/form/AjaxPalettePanel.java | 4 +- .../markup/html/form/BinaryFieldPanel.java | 7 +- .../form/preview/AbstractBinaryPreviewer.java | 4 +- .../client/console/widgets/LoadWidget.java | 4 +- .../client/console/widgets/NumberWidget.java | 2 +- .../console/wizards/AbstractMappingPanel.java | 3 +- .../client/console/wizards/AjaxWizard.java | 13 +- .../resources/AbstractConnConfPanel.java | 3 +- .../ItemTransformersTogglePanel.java | 2 +- .../JEXLTransformersTogglePanel.java | 2 +- .../resources/ObjectTypeTogglePanel.java | 4 +- .../resources/ResourceProvisionPanel.java | 3 +- .../client/enduser/util/SaltGenerator.java | 4 +- .../panels/CamelRoutesDirectoryPanel.java | 3 +- .../client/console/panels/ImportMetadata.java | 4 +- .../panels/SAML2IdPsDirectoryPanel.java | 4 +- .../syncope/fit/console/LogsITCase.java | 11 +- pom.xml | 860 +++++++++--------- 70 files changed, 589 insertions(+), 609 deletions(-) diff --git a/client/console/pom.xml b/client/console/pom.xml index d3103e9b20..aaa8627849 100644 --- a/client/console/pom.xml +++ b/client/console/pom.xml @@ -59,7 +59,7 @@ under the License. wicket-extensions - org.apache.wicket + org.wicketstuff wicket-datetime diff --git a/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleRequestCycleListener.java b/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleRequestCycleListener.java index 50c5748184..5d18bda7f5 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleRequestCycleListener.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleRequestCycleListener.java @@ -31,13 +31,13 @@ import org.apache.wicket.protocol.http.PageExpiredException; import org.apache.wicket.request.IRequestHandler; import org.apache.wicket.request.component.IRequestablePage; -import org.apache.wicket.request.cycle.AbstractRequestCycleListener; +import org.apache.wicket.request.cycle.IRequestCycleListener; import org.apache.wicket.request.cycle.RequestCycle; import org.apache.wicket.request.mapper.parameter.PageParameters; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class SyncopeConsoleRequestCycleListener extends AbstractRequestCycleListener { +public class SyncopeConsoleRequestCycleListener implements IRequestCycleListener { private static final Logger LOG = LoggerFactory.getLogger(SyncopeConsoleRequestCycleListener.class); @@ -66,7 +66,7 @@ public IRequestHandler onException(final RequestCycle cycle, final Exception e) PageParameters errorParameters = new PageParameters(); - IRequestablePage errorPage = null; + IRequestablePage errorPage; if (instanceOf(e, UnauthorizedInstantiationException.class) != null) { errorParameters.add("errorMessage", MISSING_AUTHORIZATION); errorPage = new Login(errorParameters); diff --git a/client/console/src/main/java/org/apache/syncope/client/console/approvals/ApprovalDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/approvals/ApprovalDirectoryPanel.java index 10e4fa5497..81783cda57 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/approvals/ApprovalDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/approvals/ApprovalDirectoryPanel.java @@ -61,8 +61,6 @@ import org.apache.wicket.extensions.markup.html.repeater.data.sort.SortOrder; import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn; import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn; -import org.apache.wicket.markup.html.form.Form; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.CompoundPropertyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; @@ -163,9 +161,9 @@ public void onClick(final AjaxRequestTarget target, final WorkflowFormTO ignore) private static final long serialVersionUID = 5546519445061007248L; @Override - public void onSubmit(final AjaxRequestTarget target, final Form form) { + public void onSubmit(final AjaxRequestTarget target) { try { - super.onSubmit(target, form); + super.onSubmit(target); ApprovalDirectoryPanel.this.getTogglePanel().close(target); } catch (SyncopeClientException e) { @@ -278,7 +276,7 @@ public long size() { @Override public IModel model(final WorkflowFormTO form) { - return new AbstractReadOnlyModel() { + return new IModel() { private static final long serialVersionUID = -2566070996511906708L; diff --git a/client/console/src/main/java/org/apache/syncope/client/console/approvals/ApprovalModal.java b/client/console/src/main/java/org/apache/syncope/client/console/approvals/ApprovalModal.java index 16048dd31d..1b1ce481ab 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/approvals/ApprovalModal.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/approvals/ApprovalModal.java @@ -27,7 +27,6 @@ import org.apache.syncope.common.lib.to.WorkflowFormTO; import org.apache.wicket.PageReference; import org.apache.wicket.ajax.AjaxRequestTarget; -import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.panel.Panel; import org.apache.syncope.client.console.panels.SubmitableModalPanel; import org.apache.syncope.client.console.panels.WizardModalPanel; @@ -64,7 +63,7 @@ protected void viewDetails(final AjaxRequestTarget target) { } @Override - public void onSubmit(final AjaxRequestTarget target, final Form form) { + public void onSubmit(final AjaxRequestTarget target) { this.restClient.submitForm(formTO); this.modal.show(false); this.modal.close(target); @@ -72,7 +71,7 @@ public void onSubmit(final AjaxRequestTarget target, final Form form) { } @Override - public void onError(final AjaxRequestTarget target, final Form form) { + public void onError(final AjaxRequestTarget target) { ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target); } diff --git a/client/console/src/main/java/org/apache/syncope/client/console/commons/AnyDataProvider.java b/client/console/src/main/java/org/apache/syncope/client/console/commons/AnyDataProvider.java index 0eca3738a8..a13927b2d9 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/commons/AnyDataProvider.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/commons/AnyDataProvider.java @@ -21,6 +21,7 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; +import java.util.Optional; import org.apache.syncope.client.console.SyncopeConsoleSession; import org.apache.syncope.client.console.pages.BasePage; import org.apache.syncope.client.console.rest.AbstractAnyRestClient; @@ -107,8 +108,10 @@ public Iterator iterator(final long first, final long count) { LOG.error("While searching with FIQL {}", fiql, e); SyncopeConsoleSession.get().error(e.getMessage()); - ((BasePage) pageRef.getPage()).getNotificationPanel().refresh( - RequestCycle.get().find(AjaxRequestTarget.class)); + Optional target = RequestCycle.get().find(AjaxRequestTarget.class); + if (target.isPresent()) { + ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target.get()); + } } Collections.sort(result, comparator); @@ -129,8 +132,10 @@ public long size() { LOG.error("While requesting for size() with FIQL {}", fiql, e); SyncopeConsoleSession.get().error(e.getMessage()); - ((BasePage) pageRef.getPage()).getNotificationPanel().refresh( - RequestCycle.get().find(AjaxRequestTarget.class)); + Optional target = RequestCycle.get().find(AjaxRequestTarget.class); + if (target.isPresent()) { + ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target.get()); + } } return result; diff --git a/client/console/src/main/java/org/apache/syncope/client/console/commons/SortableAnyProviderComparator.java b/client/console/src/main/java/org/apache/syncope/client/console/commons/SortableAnyProviderComparator.java index e4059216a9..9a5d86ab01 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/commons/SortableAnyProviderComparator.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/commons/SortableAnyProviderComparator.java @@ -26,7 +26,7 @@ import org.apache.syncope.common.lib.to.AttrTO; import org.apache.syncope.common.lib.types.SchemaType; import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider; -import org.apache.wicket.model.AbstractReadOnlyModel; +import org.apache.wicket.model.IModel; public class SortableAnyProviderComparator extends SortableDataProviderComparator { @@ -49,7 +49,7 @@ public int compare(final T any1, final T any2) { } @SuppressWarnings("rawtypes") - private class AttrModel extends AbstractReadOnlyModel { + private class AttrModel implements IModel { private static final long serialVersionUID = -7856686374020091808L; diff --git a/client/console/src/main/java/org/apache/syncope/client/console/commons/status/AbstractStatusBeanProvider.java b/client/console/src/main/java/org/apache/syncope/client/console/commons/status/AbstractStatusBeanProvider.java index 50619e5b80..93303b8b7e 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/commons/status/AbstractStatusBeanProvider.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/commons/status/AbstractStatusBeanProvider.java @@ -23,7 +23,6 @@ import org.apache.syncope.client.console.commons.DirectoryDataProvider; import org.apache.syncope.client.console.commons.SortableDataProviderComparator; import org.apache.wicket.extensions.markup.html.repeater.data.sort.SortOrder; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; public abstract class AbstractStatusBeanProvider extends DirectoryDataProvider { @@ -51,7 +50,7 @@ public long size() { @Override public IModel model(final StatusBean statusBean) { - return new AbstractReadOnlyModel() { + return new IModel() { private static final long serialVersionUID = -7802635613997243712L; diff --git a/client/console/src/main/java/org/apache/syncope/client/console/notifications/MailTemplateDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/notifications/MailTemplateDirectoryPanel.java index 11091c3f69..95137d1f98 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/notifications/MailTemplateDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/notifications/MailTemplateDirectoryPanel.java @@ -48,7 +48,6 @@ import org.apache.wicket.extensions.markup.html.repeater.data.sort.SortOrder; import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn; import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.ResourceModel; import org.apache.wicket.model.StringResourceModel; @@ -56,7 +55,6 @@ import org.apache.syncope.client.console.wicket.markup.html.form.ActionsPanel; import org.apache.syncope.client.console.wicket.markup.html.form.XMLEditorPanel; import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow; -import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.model.PropertyModel; public class MailTemplateDirectoryPanel @@ -218,7 +216,7 @@ public long size() { @Override public IModel model(final MailTemplateTO mailTemplateTO) { - return new AbstractReadOnlyModel() { + return new IModel() { private static final long serialVersionUID = 774694801558497248L; @@ -245,7 +243,7 @@ private class TemplateContentEditorPanel extends XMLEditorPanel { } @Override - public void onSubmit(final AjaxRequestTarget target, final Form form) { + public void onSubmit(final AjaxRequestTarget target) { if (StringUtils.isBlank(content.getContent())) { SyncopeConsoleSession.get().error("No content to save"); } else { diff --git a/client/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationDirectoryPanel.java index bdc9269d36..a27a6506cd 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationDirectoryPanel.java @@ -51,7 +51,6 @@ import org.apache.wicket.extensions.markup.html.repeater.data.sort.SortOrder; import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn; import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.StringResourceModel; @@ -193,7 +192,7 @@ public long size() { @Override public IModel model(final NotificationTO notification) { - return new AbstractReadOnlyModel() { + return new IModel() { private static final long serialVersionUID = 774694801558497248L; diff --git a/client/console/src/main/java/org/apache/syncope/client/console/notifications/TemplateModal.java b/client/console/src/main/java/org/apache/syncope/client/console/notifications/TemplateModal.java index d6cfce0141..b2e3bff2ea 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/notifications/TemplateModal.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/notifications/TemplateModal.java @@ -30,7 +30,6 @@ import org.apache.syncope.common.lib.to.EntityTO; import org.apache.wicket.PageReference; import org.apache.wicket.ajax.AjaxRequestTarget; -import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.model.PropertyModel; public class TemplateModal extends AbstractModalPanel { @@ -62,7 +61,7 @@ public T getItem() { } @Override - public void onSubmit(final AjaxRequestTarget target, final Form form) { + public void onSubmit(final AjaxRequestTarget target) { try { restClient.createTemplate(templateTO); SyncopeConsoleSession.get().info(getString(Constants.OPERATION_SUCCEEDED)); diff --git a/client/console/src/main/java/org/apache/syncope/client/console/pages/Login.java b/client/console/src/main/java/org/apache/syncope/client/console/pages/Login.java index b17d61ea72..796408e4c5 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/pages/Login.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/pages/Login.java @@ -38,7 +38,6 @@ import org.apache.wicket.markup.html.basic.Label; 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.PasswordTextField; import org.apache.wicket.markup.html.form.StatelessForm; import org.apache.wicket.markup.html.form.TextField; @@ -109,7 +108,7 @@ public Login(final PageParameters parameters) { private static final long serialVersionUID = 429178684321093953L; @Override - protected void onSubmit(final AjaxRequestTarget target, final Form form) { + protected void onSubmit(final AjaxRequestTarget target) { if (SyncopeConsoleApplication.get().getAnonymousUser().equals(usernameField.getRawInput())) { throw new AccessControlException("Illegal username"); } @@ -201,11 +200,6 @@ public void detach() { // set default value to English getModel().setObject(Locale.ENGLISH); } - - @Override - protected boolean wantOnSelectionChangedNotifications() { - return true; - } } /** @@ -241,10 +235,5 @@ public void detach() { // set default value to Master Domain getModel().setObject(SyncopeConstants.MASTER_DOMAIN); } - - @Override - protected boolean wantOnSelectionChangedNotifications() { - return true; - } } } diff --git a/client/console/src/main/java/org/apache/syncope/client/console/pages/MustChangePassword.java b/client/console/src/main/java/org/apache/syncope/client/console/pages/MustChangePassword.java index f613d5490f..4fcca5bb31 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/pages/MustChangePassword.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/pages/MustChangePassword.java @@ -27,7 +27,6 @@ import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.markup.html.form.AjaxButton; import org.apache.wicket.markup.html.WebPage; -import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.form.PasswordTextField; import org.apache.wicket.markup.html.form.StatelessForm; import org.apache.wicket.markup.html.form.TextField; @@ -88,7 +87,7 @@ public MustChangePassword(final PageParameters parameters) { private static final long serialVersionUID = 429178684321093953L; @Override - protected void onSubmit(final AjaxRequestTarget target, final Form form) { + protected void onSubmit(final AjaxRequestTarget target) { try { restClient.changePassword(passwordField.getModelObject()); @@ -105,7 +104,7 @@ protected void onSubmit(final AjaxRequestTarget target, final Form form) { } @Override - protected void onError(final AjaxRequestTarget target, final Form form) { + protected void onError(final AjaxRequestTarget target) { notificationPanel.refresh(target); } diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/AbstractModalPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/AbstractModalPanel.java index 415751f0eb..9179854c11 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/AbstractModalPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/AbstractModalPanel.java @@ -27,7 +27,6 @@ import org.apache.wicket.markup.head.HeaderItem; import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.markup.head.PriorityHeaderItem; -import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.panel.Panel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -66,12 +65,12 @@ public void renderHead(final IHeaderResponse response) { } @Override - public void onSubmit(final AjaxRequestTarget target, final Form form) { + public void onSubmit(final AjaxRequestTarget target) { ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target); } @Override - public void onError(final AjaxRequestTarget target, final Form form) { + public void onError(final AjaxRequestTarget target) { ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target); } diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/ActionDataTablePanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/ActionDataTablePanel.java index 4574544aa9..7ea7baa876 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/ActionDataTablePanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/ActionDataTablePanel.java @@ -99,7 +99,7 @@ protected void onUpdate(final AjaxRequestTarget target) { private static final long serialVersionUID = -2341391430136818025L; @Override - protected void onSubmit(final AjaxRequestTarget target, final Form form) { + protected void onSubmit(final AjaxRequestTarget target) { // ignore } }.setVisible(false).setEnabled(false)); @@ -117,7 +117,7 @@ public void addCancelButton(final BaseModal modal) { private static final long serialVersionUID = -4804368561204623354L; @Override - protected void onSubmit(final AjaxRequestTarget target, final Form form) { + protected void onSubmit(final AjaxRequestTarget target) { modal.close(target); } }; diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/AjaxDataTablePanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/AjaxDataTablePanel.java index aa7b19f2c3..885a3d529a 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/AjaxDataTablePanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/AjaxDataTablePanel.java @@ -242,7 +242,7 @@ protected ActionLinksTogglePanel getTogglePanel() { private static final long serialVersionUID = 382302811235019988L; @Override - protected void onSubmit(final AjaxRequestTarget target, final Form form) { + protected void onSubmit(final AjaxRequestTarget target) { // send event to close eventually opened actions toggle panel if (builder.getTogglePanel() != null) { builder.getTogglePanel().close(target); diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyTypeClassesPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyTypeClassesPanel.java index af1f72e4e7..fcfe82d6ea 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyTypeClassesPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyTypeClassesPanel.java @@ -46,7 +46,6 @@ import org.apache.wicket.event.Broadcast; import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn; import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn; -import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.model.CompoundPropertyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.ResourceModel; @@ -74,7 +73,7 @@ public WizardModalPanel build( private static final long serialVersionUID = -6227956682141146095L; @Override - public void onSubmit(final AjaxRequestTarget target, final Form form) { + public void onSubmit(final AjaxRequestTarget target) { try { if (getOriginalItem() == null || StringUtils.isBlank(getOriginalItem().getKey())) { restClient.create(modelObject); diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyTypesPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyTypesPanel.java index 030be025b8..22cdb725aa 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyTypesPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyTypesPanel.java @@ -46,7 +46,6 @@ import org.apache.wicket.event.Broadcast; import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn; import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn; -import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.model.CompoundPropertyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.ResourceModel; @@ -72,7 +71,7 @@ public WizardModalPanel build(final String id, final int index, final private static final long serialVersionUID = -6227956682141146095L; @Override - public void onSubmit(final AjaxRequestTarget target, final Form form) { + public void onSubmit(final AjaxRequestTarget target) { try { if (getOriginalItem() == null || StringUtils.isBlank(getOriginalItem().getKey())) { restClient.create(modelObject); diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/ApplicationModalPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/ApplicationModalPanel.java index 6f9c1f2866..72aec89fe1 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/ApplicationModalPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/ApplicationModalPanel.java @@ -28,7 +28,6 @@ import org.apache.syncope.common.lib.to.ApplicationTO; import org.apache.wicket.PageReference; import org.apache.wicket.ajax.AjaxRequestTarget; -import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.model.PropertyModel; public class ApplicationModalPanel extends AbstractModalPanel { @@ -71,7 +70,7 @@ public ApplicationTO getItem() { } @Override - public void onSubmit(final AjaxRequestTarget target, final Form form) { + public void onSubmit(final AjaxRequestTarget target) { try { if (create) { restClient.create(application); diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/DisplayAttributesModalPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/DisplayAttributesModalPanel.java index 2b36dc26c6..af6867aabe 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/DisplayAttributesModalPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/DisplayAttributesModalPanel.java @@ -38,7 +38,6 @@ import org.apache.wicket.PageReference; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.markup.html.WebMarkupContainer; -import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.model.IModel; import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.model.PropertyModel; @@ -160,10 +159,10 @@ protected List load() { } @Override - public void onSubmit(final AjaxRequestTarget target, final Form form) { + public void onSubmit(final AjaxRequestTarget target) { if (selectedDetails.size() + selectedPlainSchemas.size() + selectedDerSchemas.size() > MAX_SELECTIONS) { SyncopeConsoleSession.get().error(getString("tooManySelections")); - onError(target, form); + onError(target); } else { final Map> prefs = new HashMap<>(); diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/DynRealmModalPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/DynRealmModalPanel.java index b373274b85..7f260e0684 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/DynRealmModalPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/DynRealmModalPanel.java @@ -39,7 +39,6 @@ import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.extensions.markup.html.tabs.AbstractTab; import org.apache.wicket.extensions.markup.html.tabs.ITab; -import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.list.ListItem; import org.apache.wicket.markup.html.list.ListView; import org.apache.wicket.markup.html.panel.Panel; @@ -131,7 +130,7 @@ public DynRealmWrapper getItem() { } @Override - public void onSubmit(final AjaxRequestTarget target, final Form form) { + public void onSubmit(final AjaxRequestTarget target) { try { dynRealmWrapper.fillDynamicConditions(); if (create) { diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/HistoryConfDetails.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/HistoryConfDetails.java index 563641c986..7afb0c6476 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/HistoryConfDetails.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/HistoryConfDetails.java @@ -86,7 +86,7 @@ private void showConfigurationSinglePanel() { private static final long serialVersionUID = -8927036362466990179L; @Override - public void onSubmit(final AjaxRequestTarget target, final Form form) { + public void onSubmit(final AjaxRequestTarget target) { modal.close(target); } }; @@ -107,7 +107,7 @@ private void showConfigurationDiffPanel(final List historyConfTOs) { private static final long serialVersionUID = -8927036362466990179L; @Override - public void onSubmit(final AjaxRequestTarget target, final Form form) { + public void onSubmit(final AjaxRequestTarget target) { modal.close(target); } }; diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/ImplementationDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/ImplementationDirectoryPanel.java index 4aaea7860f..174526cc35 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/ImplementationDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/ImplementationDirectoryPanel.java @@ -50,7 +50,6 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn; import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn; import org.apache.wicket.markup.html.WebMarkupContainer; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.model.StringResourceModel; @@ -217,7 +216,7 @@ public long size() { @Override public IModel model(final ImplementationTO implementation) { - return new AbstractReadOnlyModel() { + return new IModel() { private static final long serialVersionUID = 999513782683391483L; diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/ImplementationEngineTogglePanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/ImplementationEngineTogglePanel.java index 49819d538b..7e588d8dd0 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/ImplementationEngineTogglePanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/ImplementationEngineTogglePanel.java @@ -59,7 +59,7 @@ public ImplementationEngineTogglePanel( private static final long serialVersionUID = -7978723352517770644L; @Override - protected void onSubmit(final AjaxRequestTarget target, final Form form) { + protected void onSubmit(final AjaxRequestTarget target) { ImplementationEngineTogglePanel.this.onSubmit(engineModel.getObject(), target); target.add(form); toggle(target, false); @@ -68,7 +68,7 @@ protected void onSubmit(final AjaxRequestTarget target, final Form form) { } @Override - protected void onError(final AjaxRequestTarget target, final Form form) { + protected void onError(final AjaxRequestTarget target) { ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target); } }); diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/ImplementationModalPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/ImplementationModalPanel.java index 0e23e1bd0b..f1b3f5b58a 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/ImplementationModalPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/ImplementationModalPanel.java @@ -47,7 +47,6 @@ import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.markup.head.OnLoadHeaderItem; import org.apache.wicket.markup.html.WebMarkupContainer; -import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.form.TextArea; import org.apache.wicket.model.Model; import org.apache.wicket.model.PropertyModel; @@ -317,7 +316,7 @@ public void renderHead(final IHeaderResponse response) { } @Override - public void onSubmit(final AjaxRequestTarget target, final Form form) { + public void onSubmit(final AjaxRequestTarget target) { try { if (create) { restClient.create(implementation); diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/ListViewPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/ListViewPanel.java index 06729c9997..fc056a07c4 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/ListViewPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/ListViewPanel.java @@ -25,6 +25,7 @@ import java.util.Collection; import java.util.Collections; import java.util.List; +import java.util.Optional; import org.apache.commons.lang3.StringUtils; import org.apache.syncope.client.console.commons.Constants; import org.apache.syncope.client.console.wicket.ajax.form.IndicatorAjaxFormChoiceComponentUpdatingBehavior; @@ -128,10 +129,10 @@ protected void onUpdate(final AjaxRequestTarget target) { addInnerObject(checkGroup); groupSelector = new CheckGroupSelector("groupselector", checkGroup); - addInnerObject(groupSelector.setOutputMarkupId(true) - .setOutputMarkupPlaceholderTag(true) - .setVisible(this.check.getObject() == CheckAvailability.AVAILABLE) - .setEnabled(this.check.getObject() == CheckAvailability.AVAILABLE)); + addInnerObject(groupSelector.setOutputMarkupId(true). + setOutputMarkupPlaceholderTag(true). + setVisible(this.check.getObject() == CheckAvailability.AVAILABLE). + setEnabled(this.check.getObject() == CheckAvailability.AVAILABLE)); final List toBeIncluded; if (includes == null || includes.isEmpty()) { @@ -235,12 +236,14 @@ public void setCheckAvailability(final CheckAvailability check) { // used to perform selectable enabling check condition this.check.setObject(check); - final AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class); - - // reload group selector - target.add(groupSelector.setVisible(check == CheckAvailability.AVAILABLE)); - // reload the list view panel - target.add(ListViewPanel.this); + Optional target = RequestCycle.get().find(AjaxRequestTarget.class); + if (target.isPresent()) { + // reload group selector + target.get().add( + groupSelector.setVisible(check == CheckAvailability.AVAILABLE), groupSelector.getMarkupId()); + // reload the list view panel + target.get().add(ListViewPanel.this, getMarkupId()); + } } protected abstract Component getValueComponent(final String key, final T bean); diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/MembersTogglePanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/MembersTogglePanel.java index 81167d8629..9fc398e3f0 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/MembersTogglePanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/MembersTogglePanel.java @@ -77,7 +77,7 @@ public MembersTogglePanel(final PageReference pageRef) { private static final long serialVersionUID = -7978723352517770644L; @Override - protected void onSubmit(final AjaxRequestTarget target, final Form form) { + protected void onSubmit(final AjaxRequestTarget target) { try { onApplyInternal(groupTO, typeModel.getObject(), target); toggle(target, false); @@ -91,7 +91,7 @@ protected void onSubmit(final AjaxRequestTarget target, final Form form) { } @Override - protected void onError(final AjaxRequestTarget target, final Form form) { + protected void onError(final AjaxRequestTarget target) { ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target); } }); diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/NewWorkflowProcess.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/NewWorkflowProcess.java index be021c7357..f0971c6cb1 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/NewWorkflowProcess.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/NewWorkflowProcess.java @@ -58,7 +58,7 @@ public NewWorkflowProcess(final String id, final WebMarkupContainer container, f private static final long serialVersionUID = 4947613489823025052L; @Override - protected void onSubmit(final AjaxRequestTarget target, final Form form) { + protected void onSubmit(final AjaxRequestTarget target) { try { restClient.setDefinition(MediaType.APPLICATION_XML_TYPE, key.getModelObject(), IOUtils.toString( @@ -79,7 +79,7 @@ protected void onSubmit(final AjaxRequestTarget target, final Form form) { } @Override - protected void onError(final AjaxRequestTarget target, final Form form) { + protected void onError(final AjaxRequestTarget target) { ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target); } }); diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/NotificationPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/NotificationPanel.java index 221ae41e28..ec2fdc27da 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/NotificationPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/NotificationPanel.java @@ -31,7 +31,8 @@ import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.model.IModel; -public class NotificationPanel extends Panel implements IFeedback, IGenericComponent> { +public class NotificationPanel extends Panel + implements IFeedback, IGenericComponent, NotificationPanel> { private static final long serialVersionUID = 5895940553202128621L; @@ -63,7 +64,7 @@ public StyledNotificationBehavior newWidgetBehavior(final String selector) { } public final void refresh(final IPartialPageRequestHandler handler) { - for (FeedbackMessage message : this.getModelObject()) { + this.getModelObject().forEach(message -> { if (message.isError()) { this.notification.error(handler, message.getMessage()); } else if (message.isWarning()) { @@ -76,7 +77,7 @@ public final void refresh(final IPartialPageRequestHandler handler) { this.notification.warn(handler, message.getMessage()); } message.markRendered(); - } + }); } @Override @@ -91,13 +92,15 @@ public IModel> getModel() { } @Override - public void setModel(final IModel> model) { + public NotificationPanel setModel(final IModel> model) { this.setDefaultModel(model); + return this; } @Override - public void setModelObject(final List object) { + public NotificationPanel setModelObject(final List object) { this.setDefaultModelObject(object); + return this; } @Override diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/ParametersCreateWizardAttrStep.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/ParametersCreateWizardAttrStep.java index 7d6847cfd5..7fa1774729 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/ParametersCreateWizardAttrStep.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/ParametersCreateWizardAttrStep.java @@ -169,12 +169,12 @@ public String getObject( case Long: panel = new AjaxSpinnerFieldPanel.Builder() - .build(id, valueHeaderName, Long.class, new Model()); + .build(id, valueHeaderName, Long.class, new Model<>()); break; case Double: panel = new AjaxSpinnerFieldPanel.Builder() - .build(id, valueHeaderName, Double.class, new Model()); + .build(id, valueHeaderName, Double.class, new Model<>()); break; case Binary: diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/ParametersEditModalPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/ParametersEditModalPanel.java index e85a39e619..335091abc3 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/ParametersEditModalPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/ParametersEditModalPanel.java @@ -27,7 +27,6 @@ import org.apache.syncope.common.lib.to.AttrTO; import org.apache.wicket.PageReference; import org.apache.wicket.ajax.AjaxRequestTarget; -import org.apache.wicket.markup.html.form.Form; public class ParametersEditModalPanel extends AbstractModalPanel { @@ -53,7 +52,7 @@ public final AttrTO getItem() { } @Override - public void onSubmit(final AjaxRequestTarget target, final Form form) { + public void onSubmit(final AjaxRequestTarget target) { try { restClient.set(attrTO); modal.close(target); diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/RelationshipTypesPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/RelationshipTypesPanel.java index 56d92ecb8b..1f3505685c 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/RelationshipTypesPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/RelationshipTypesPanel.java @@ -47,7 +47,6 @@ import org.apache.wicket.event.Broadcast; import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn; import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn; -import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.model.CompoundPropertyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.ResourceModel; @@ -77,7 +76,7 @@ public WizardModalPanel build( private static final long serialVersionUID = -6227956682141146094L; @Override - public void onSubmit(final AjaxRequestTarget target, final Form form) { + public void onSubmit(final AjaxRequestTarget target) { try { if (getOriginalItem() == null || StringUtils.isBlank(getOriginalItem().getKey())) { restClient.create(modelObject); diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/RemediationDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/RemediationDirectoryPanel.java index 691ac5ce5b..242c4221ac 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/RemediationDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/RemediationDirectoryPanel.java @@ -74,7 +74,6 @@ import org.apache.wicket.extensions.markup.html.repeater.data.sort.SortOrder; import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn; import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.CompoundPropertyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.ResourceModel; @@ -336,7 +335,7 @@ public long size() { @Override public IModel model(final RemediationTO remediation) { - return new AbstractReadOnlyModel() { + return new IModel() { private static final long serialVersionUID = -2566070996511906708L; diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/RoleDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/RoleDirectoryPanel.java index a410833a2b..1301f0dc07 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/RoleDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/RoleDirectoryPanel.java @@ -59,7 +59,6 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn; import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn; import org.apache.wicket.markup.html.WebPage; -import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.model.CompoundPropertyModel; import org.apache.wicket.model.IModel; @@ -219,7 +218,7 @@ public void onClick(final AjaxRequestTarget target, final RoleTO ignore) { private static final long serialVersionUID = -8927036362466990179L; @Override - public void onSubmit(final AjaxRequestTarget target, final Form form) { + public void onSubmit(final AjaxRequestTarget target) { try { restClient.setConsoleLayoutInfo(info.getKey(), info.getContent()); SyncopeConsoleSession.get().info(getString(Constants.OPERATION_SUCCEEDED)); diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/SchemaTypePanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/SchemaTypePanel.java index 6e8ec7670f..654fec9506 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/SchemaTypePanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/SchemaTypePanel.java @@ -55,7 +55,6 @@ import org.apache.wicket.extensions.markup.html.repeater.data.sort.SortOrder; import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn; import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn; -import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.model.CompoundPropertyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.ResourceModel; @@ -106,7 +105,7 @@ public WizardModalPanel build( private static final long serialVersionUID = -6227956682141146095L; @Override - public void onSubmit(final AjaxRequestTarget target, final Form form) { + public void onSubmit(final AjaxRequestTarget target) { try { if (getOriginalItem() == null || StringUtils.isBlank(getOriginalItem().getKey())) { restClient.create(schemaType, modelObject); diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/SchemasPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/SchemasPanel.java index 62cd9072ce..e45a58a675 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/SchemasPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/SchemasPanel.java @@ -70,8 +70,8 @@ public SchemasPanel(final String id, final PageReference pageRef) { private static final long serialVersionUID = -1765773642975892072L; @Override - protected void onAfterSubmit(final AjaxRequestTarget target, final Form form) { - super.onAfterSubmit(target, form); + protected void onAfterSubmit(final AjaxRequestTarget target) { + super.onAfterSubmit(target); send(SchemasPanel.this, Broadcast.DEPTH, new SchemaTypePanel.SchemaSearchEvent(target, keywordModel.getObject())); diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/SecurityQuestionsModalPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/SecurityQuestionsModalPanel.java index a639035967..8043a01f19 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/SecurityQuestionsModalPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/SecurityQuestionsModalPanel.java @@ -27,7 +27,6 @@ import org.apache.syncope.common.lib.to.SecurityQuestionTO; import org.apache.wicket.PageReference; import org.apache.wicket.ajax.AjaxRequestTarget; -import org.apache.wicket.markup.html.form.Form; public class SecurityQuestionsModalPanel extends AbstractModalPanel { @@ -53,7 +52,7 @@ public final SecurityQuestionTO getItem() { } @Override - public void onSubmit(final AjaxRequestTarget target, final Form form) { + public void onSubmit(final AjaxRequestTarget target) { try { if (securityQuestionTO.getKey() == null) { restClient.create(securityQuestionTO); diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/StartAtTogglePanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/StartAtTogglePanel.java index 18c35cda5d..1faf3e10d6 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/StartAtTogglePanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/StartAtTogglePanel.java @@ -79,7 +79,7 @@ protected void onUpdate(final AjaxRequestTarget target) { private static final long serialVersionUID = -7978723352517770644L; @Override - protected void onSubmit(final AjaxRequestTarget target, final Form form) { + protected void onSubmit(final AjaxRequestTarget target) { try { getRestClient().startExecution(key, startAtDateModel.getObject()); SyncopeConsoleSession.get().info(getString(Constants.OPERATION_SUCCEEDED)); @@ -94,7 +94,7 @@ protected void onSubmit(final AjaxRequestTarget target, final Form form) { } @Override - protected void onError(final AjaxRequestTarget target, final Form form) { + protected void onError(final AjaxRequestTarget target) { ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target); } }); diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/SubmitableModalPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/SubmitableModalPanel.java index e3f2b170ca..b008980157 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/SubmitableModalPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/SubmitableModalPanel.java @@ -19,11 +19,10 @@ package org.apache.syncope.client.console.panels; import org.apache.wicket.ajax.AjaxRequestTarget; -import org.apache.wicket.markup.html.form.Form; public interface SubmitableModalPanel extends ModalPanel { - void onSubmit(AjaxRequestTarget target, Form form); + void onSubmit(AjaxRequestTarget target); - void onError(AjaxRequestTarget target, Form form); + void onError(AjaxRequestTarget target); } diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/TypeExtensionDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/TypeExtensionDirectoryPanel.java index 08a314726d..511fbfcac5 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/TypeExtensionDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/TypeExtensionDirectoryPanel.java @@ -46,7 +46,6 @@ import org.apache.wicket.extensions.markup.html.repeater.data.sort.SortOrder; import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn; import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn; -import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.model.CompoundPropertyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; @@ -85,7 +84,7 @@ protected TypeExtensionDirectoryPanel( } @Override - public void onSubmit(final AjaxRequestTarget target, final Form form) { + public void onSubmit(final AjaxRequestTarget target) { GroupPatch patch = new GroupPatch(); patch.setKey(groupTO.getKey()); patch.getTypeExtensions().addAll(groupTO.getTypeExtensions()); @@ -106,7 +105,7 @@ public void onSubmit(final AjaxRequestTarget target, final Form form) { } @Override - public void onError(final AjaxRequestTarget target, final Form form) { + public void onError(final AjaxRequestTarget target) { SyncopeConsoleSession.get().error(getString(Constants.OPERATION_ERROR)); ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target); } diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/WorkflowDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/WorkflowDirectoryPanel.java index 980fe4ce90..a8303110f2 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/WorkflowDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/WorkflowDirectoryPanel.java @@ -61,7 +61,6 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn; import org.apache.wicket.extensions.wizard.WizardModel; import org.apache.wicket.markup.html.WebMarkupContainer; -import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.model.CompoundPropertyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; @@ -185,7 +184,7 @@ public void onClick(final AjaxRequestTarget target, final WorkflowDefinitionTO i private static final long serialVersionUID = -7688359318035249200L; @Override - public void onSubmit(final AjaxRequestTarget target, final Form form) { + public void onSubmit(final AjaxRequestTarget target) { if (StringUtils.isNotBlank(wfDefinition.getObject())) { try { restClient.setDefinition(MediaType.APPLICATION_XML_TYPE, diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/search/SearchClausePanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/search/SearchClausePanel.java index 47e3545368..01566191fe 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/search/SearchClausePanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/search/SearchClausePanel.java @@ -57,7 +57,6 @@ import org.apache.wicket.extensions.markup.html.repeater.util.SortParam; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.form.CheckBox; -import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.form.FormComponent; import org.apache.wicket.markup.html.form.IChoiceRenderer; import org.apache.wicket.markup.html.list.ListItem; @@ -134,7 +133,7 @@ public SearchClausePanel( private static final long serialVersionUID = 5538299138211283825L; @Override - protected void onSubmit(final AjaxRequestTarget target, final Form form) { + protected void onSubmit(final AjaxRequestTarget target) { if (resultContainer == null) { send(this, Broadcast.BUBBLE, new SearchEvent(target)); } else { @@ -252,7 +251,7 @@ public void enableSearch(final IEventSink resultContainer) { "onkeydown", Model.of("if(event.keyCode == 13) {event.preventDefault();}"))); - field.add(new AjaxEventBehavior("onkeydown") { + field.add(new AjaxEventBehavior("keydown") { private static final long serialVersionUID = -7133385027739964990L; @@ -462,7 +461,7 @@ protected void onUpdate(final AjaxRequestTarget target) { "onkeydown", Model.of("if(event.keyCode == 13) {event.preventDefault();}"))); - value.getField().add(new IndicatorAjaxEventBehavior("onkeydown") { + value.getField().add(new IndicatorAjaxEventBehavior("keydown") { private static final long serialVersionUID = -7133385027739964990L; diff --git a/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyModalPanelBuilder.java b/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyModalPanelBuilder.java index 0eac09cadc..1be997648e 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyModalPanelBuilder.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyModalPanelBuilder.java @@ -50,7 +50,6 @@ import org.apache.wicket.Component; import org.apache.wicket.PageReference; import org.apache.wicket.ajax.AjaxRequestTarget; -import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.list.ListItem; import org.apache.wicket.markup.html.list.ListView; import org.apache.wicket.model.LoadableDetachableModel; @@ -159,7 +158,7 @@ protected void populateItem(final ListItem item) { } @Override - public void onSubmit(final AjaxRequestTarget target, final Form form) { + public void onSubmit(final AjaxRequestTarget target) { try { if (policyTO.getKey() == null) { restClient.createPolicy(type, policyTO); diff --git a/client/console/src/main/java/org/apache/syncope/client/console/policies/PullPolicyModalPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/policies/PullPolicyModalPanel.java index b265cafc37..da0efd938b 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/policies/PullPolicyModalPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/policies/PullPolicyModalPanel.java @@ -51,7 +51,6 @@ import org.apache.syncope.common.lib.types.SchemaType; import org.apache.wicket.PageReference; import org.apache.wicket.ajax.AjaxRequestTarget; -import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.list.ListItem; import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.model.IModel; @@ -133,7 +132,7 @@ protected CorrelationRulePanel getItemPanel(final ListItem item } @Override - public void onSubmit(final AjaxRequestTarget target, final Form form) { + public void onSubmit(final AjaxRequestTarget target) { try { getItem().getCorrelationRules().clear(); model.getObject().forEach(rule -> { diff --git a/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel.java index 6aa57d3f8d..04a37a2a5e 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel.java @@ -46,7 +46,6 @@ import org.apache.wicket.extensions.markup.html.repeater.data.sort.SortOrder; import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn; import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.ResourceModel; import org.apache.wicket.model.StringResourceModel; @@ -57,7 +56,6 @@ import org.apache.syncope.client.console.wicket.markup.html.form.XMLEditorPanel; import org.apache.syncope.common.lib.types.ReportTemplateFormat; import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow; -import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.model.PropertyModel; public class ReportTemplateDirectoryPanel @@ -238,7 +236,7 @@ public long size() { @Override public IModel model(final ReportTemplateTO reportTemplateTO) { - return new AbstractReadOnlyModel() { + return new IModel() { private static final long serialVersionUID = 774694801558497248L; @@ -265,7 +263,7 @@ private class TemplateContentEditorPanel extends XMLEditorPanel { } @Override - public void onSubmit(final AjaxRequestTarget target, final Form form) { + public void onSubmit(final AjaxRequestTarget target) { if (StringUtils.isBlank(content.getContent())) { SyncopeConsoleSession.get().error("No content to save"); } else { diff --git a/client/console/src/main/java/org/apache/syncope/client/console/status/ChangePasswordModal.java b/client/console/src/main/java/org/apache/syncope/client/console/status/ChangePasswordModal.java index 43d9282d92..55e3381f26 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/status/ChangePasswordModal.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/status/ChangePasswordModal.java @@ -37,7 +37,6 @@ import org.apache.syncope.common.lib.to.UserTO; import org.apache.wicket.PageReference; import org.apache.wicket.ajax.AjaxRequestTarget; -import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.model.IModel; import org.apache.wicket.model.util.ListModel; @@ -70,7 +69,7 @@ public ChangePasswordModal( } @Override - public void onSubmit(final AjaxRequestTarget target, final Form form) { + public void onSubmit(final AjaxRequestTarget target) { final UserTO inner = wrapper.getInnerObject(); try { @@ -105,6 +104,6 @@ public void onSubmit(final AjaxRequestTarget target, final Form form) { ? e.getClass().getName() : e.getMessage()); } - super.onSubmit(target, form); + super.onSubmit(target); } } diff --git a/client/console/src/main/java/org/apache/syncope/client/console/status/ReconTaskPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/status/ReconTaskPanel.java index 3dadb56715..ba08b8d5fb 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/status/ReconTaskPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/status/ReconTaskPanel.java @@ -139,7 +139,7 @@ public ReconTaskPanel( private static final long serialVersionUID = -817438685948164787L; @Override - protected void onSubmit(final AjaxRequestTarget target, final Form form) { + protected void onSubmit(final AjaxRequestTarget target) { try { if (taskTO instanceof PushTaskTO) { restClient.push(anyTypeKind, anyKey, resource, (PushTaskTO) form.getModelObject()); diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/ExecutionsDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/ExecutionsDirectoryPanel.java index 345a1ebfb9..f9203811c7 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/ExecutionsDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/ExecutionsDirectoryPanel.java @@ -46,7 +46,6 @@ import org.apache.wicket.extensions.markup.html.repeater.data.sort.SortOrder; import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn; import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn; -import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.StringResourceModel; @@ -200,7 +199,7 @@ public long size() { @Override public IModel model(final ExecTO taskExecution) { - return new AbstractReadOnlyModel() { + return new IModel() { private static final long serialVersionUID = 7485475149862342421L; diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/TaskAttributesDetailsView.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/TaskAttributesDetailsView.java index 6ad4079caa..dacbde90e6 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/TaskAttributesDetailsView.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/TaskAttributesDetailsView.java @@ -28,7 +28,6 @@ import org.apache.syncope.common.lib.to.PropagationTaskTO; import org.apache.wicket.PageReference; import org.apache.wicket.ajax.AjaxRequestTarget; -import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.model.PropertyModel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -56,7 +55,7 @@ public TaskAttributesDetailsView(final BaseModal baseModal, final Propagation private static final long serialVersionUID = -8927036362466990179L; @Override - public void onSubmit(final AjaxRequestTarget target, final Form form) { + public void onSubmit(final AjaxRequestTarget target) { modal.close(target); } }; diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/TaskStartAtTogglePanel.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/TaskStartAtTogglePanel.java index ff71adefa0..9440e196f0 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/TaskStartAtTogglePanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/TaskStartAtTogglePanel.java @@ -29,7 +29,6 @@ import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink; import org.apache.wicket.markup.html.WebMarkupContainer; -import org.apache.wicket.markup.html.form.Form; public class TaskStartAtTogglePanel extends StartAtTogglePanel { @@ -43,7 +42,7 @@ public TaskStartAtTogglePanel(final WebMarkupContainer container, final PageRefe private static final long serialVersionUID = -7978723352517770644L; @Override - protected void onSubmit(final AjaxRequestTarget target, final Form form) { + protected void onSubmit(final AjaxRequestTarget target) { try { getRestClient().startExecution(key, startAtDateModel.getObject(), true); SyncopeConsoleSession.get().info(getString(Constants.OPERATION_SUCCEEDED)); @@ -59,7 +58,7 @@ protected void onSubmit(final AjaxRequestTarget target, final Form form) { } @Override - protected void onError(final AjaxRequestTarget target, final Form form) { + protected void onError(final AjaxRequestTarget target) { ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target); } diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/TemplatesTogglePanel.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/TemplatesTogglePanel.java index 625506c716..802b34c697 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/TemplatesTogglePanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/TemplatesTogglePanel.java @@ -93,7 +93,7 @@ public TemplatesTogglePanel(final String targetId, final MarkupContainer contain private static final long serialVersionUID = -7978723352517770644L; @Override - protected void onSubmit(final AjaxRequestTarget target, final Form form) { + protected void onSubmit(final AjaxRequestTarget target) { try { final AjaxWizard.NewItemActionEvent payload = new AjaxWizard.NewItemActionEvent<>(null, target); @@ -170,7 +170,7 @@ protected Serializable onApplyInternal(final AnyWrapper modelObject } @Override - protected void onError(final AjaxRequestTarget target, final Form form) { + protected void onError(final AjaxRequestTarget target) { ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target); } }); diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/bootstrap/dialog/BaseModal.java b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/bootstrap/dialog/BaseModal.java index 6948aca196..69ede94261 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/bootstrap/dialog/BaseModal.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/bootstrap/dialog/BaseModal.java @@ -200,13 +200,13 @@ public AjaxSubmitLink addSubmitButton() { private static final long serialVersionUID = -5783994974426198290L; @Override - protected void onSubmit(final AjaxRequestTarget target, final Form form) { - SubmitableModalPanel.class.cast(BaseModal.this.getContent()).onSubmit(target, form); + protected void onSubmit(final AjaxRequestTarget target) { + SubmitableModalPanel.class.cast(BaseModal.this.getContent()).onSubmit(target); } @Override - protected void onError(final AjaxRequestTarget target, final Form form) { - SubmitableModalPanel.class.cast(BaseModal.this.getContent()).onError(target, form); + protected void onError(final AjaxRequestTarget target) { + SubmitableModalPanel.class.cast(BaseModal.this.getContent()).onError(target); } }; diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AbstractMultiPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AbstractMultiPanel.java index 19f112b3a2..6d3be21817 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AbstractMultiPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AbstractMultiPanel.java @@ -92,7 +92,7 @@ private Fragment getPlusFragment(final IModel> model, final String l private static final long serialVersionUID = -7978723352517770644L; @Override - protected void onSubmit(final AjaxRequestTarget target, final Form form) { + protected void onSubmit(final AjaxRequestTarget target) { //Add current component model.getObject().add(newModelObject()); @@ -104,9 +104,9 @@ protected void onSubmit(final AjaxRequestTarget target, final Form form) { } @Override - protected void onError(final AjaxRequestTarget target, final Form form) { + protected void onError(final AjaxRequestTarget target) { SyncopeConsoleSession.get().error(getString(Constants.OPERATION_ERROR)); - super.onError(target, form); + super.onError(target); ((BasePage) getPage()).getNotificationPanel().refresh(target); } @@ -157,7 +157,7 @@ protected void populateItem(final ListItem item) { private static final long serialVersionUID = -7978723352517770644L; @Override - protected void onSubmit(final AjaxRequestTarget target, final Form form) { + protected void onSubmit(final AjaxRequestTarget target) { //Drop current component model.getObject().remove(item.getModelObject()); clearInput(panel); @@ -170,8 +170,8 @@ protected void onSubmit(final AjaxRequestTarget target, final Form form) { } @Override - protected void onError(final AjaxRequestTarget target, final Form form) { - onSubmit(target, form); + protected void onError(final AjaxRequestTarget target) { + onSubmit(target); } }; diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxPalettePanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxPalettePanel.java index e5fafb0eac..59478b542e 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxPalettePanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxPalettePanel.java @@ -175,8 +175,8 @@ public List getSelectedList() { private static final long serialVersionUID = -1765773642975892072L; @Override - protected void onAfterSubmit(final AjaxRequestTarget target, final Form form) { - super.onAfterSubmit(target, form); + protected void onAfterSubmit(final AjaxRequestTarget target) { + super.onAfterSubmit(target); target.add(palette); } }); diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/BinaryFieldPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/BinaryFieldPanel.java index 631496cee7..38676f2f3a 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/BinaryFieldPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/BinaryFieldPanel.java @@ -26,8 +26,8 @@ import de.agilecoders.wicket.jquery.JQuery; import de.agilecoders.wicket.jquery.function.IFunction; import java.io.ByteArrayInputStream; -import java.nio.charset.StandardCharsets; import java.util.ArrayList; +import java.util.Base64; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import org.apache.commons.lang3.StringUtils; @@ -55,7 +55,6 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.model.util.ListModel; -import org.apache.wicket.util.crypt.Base64; import org.apache.wicket.util.lang.Bytes; public class BinaryFieldPanel extends FieldPanel { @@ -198,7 +197,7 @@ protected void onSubmit(final AjaxRequestTarget target) { ((BasePage) getPageReference().getPage()).getNotificationPanel().refresh(target); } else { final byte[] uploadedBytes = uploadedFile.getBytes(); - final String uploaded = new String(Base64.encodeBase64(uploadedBytes), StandardCharsets.UTF_8); + final String uploaded = Base64.getEncoder().encodeToString(uploadedBytes); field.setModelObject(uploaded); target.add(field); @@ -245,7 +244,7 @@ public String getAjaxIndicatorMarkupId() { } private Response buildResponse() { - return Response.ok(new ByteArrayInputStream(Base64.decodeBase64(getModelObject()))). + return Response.ok(new ByteArrayInputStream(Base64.getMimeDecoder().decode(getModelObject()))). type(StringUtils.isBlank(mimeType) ? MediaType.APPLICATION_OCTET_STREAM : mimeType).build(); } diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/preview/AbstractBinaryPreviewer.java b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/preview/AbstractBinaryPreviewer.java index 796c82510f..9958a69a80 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/preview/AbstractBinaryPreviewer.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/preview/AbstractBinaryPreviewer.java @@ -18,9 +18,9 @@ */ package org.apache.syncope.client.console.wicket.markup.html.form.preview; +import java.util.Base64; import org.apache.wicket.Component; import org.apache.wicket.markup.html.panel.Panel; -import org.apache.wicket.util.crypt.Base64; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,7 +38,7 @@ public AbstractBinaryPreviewer(final String id, final String mimeType) { } public Component preview(final String uploaded) { - return preview(Base64.decodeBase64(uploaded)); + return preview(Base64.getMimeDecoder().decode(uploaded)); } public abstract Component preview(final byte[] uploadedBytes); diff --git a/client/console/src/main/java/org/apache/syncope/client/console/widgets/LoadWidget.java b/client/console/src/main/java/org/apache/syncope/client/console/widgets/LoadWidget.java index a06f589537..8a8a15ed95 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/widgets/LoadWidget.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/widgets/LoadWidget.java @@ -53,13 +53,13 @@ private Line build(final SystemInfo systeminfo) { line.getOptions().setShowScale(false); line.getOptions().setMultiTooltipTemplate("<%= datasetLabel %>"); - for (SystemInfo.LoadInstant instant : systeminfo.getLoad()) { + systeminfo.getLoad().forEach(instant -> { line.getData().getLabels().add(DateFormatUtils.ISO_8601_EXTENDED_DATETIME_FORMAT. format(systeminfo.getStartTime() + instant.getUptime())); cpuValues.add(instant.getSystemLoadAverage() * 1000); memValues.add(instant.getTotalMemory()); - } + }); LineDataSet cpuDataSet = new LineDataSet(cpuValues); cpuDataSet.setLabel("CPU"); diff --git a/client/console/src/main/java/org/apache/syncope/client/console/widgets/NumberWidget.java b/client/console/src/main/java/org/apache/syncope/client/console/widgets/NumberWidget.java index 36cf21b04b..023596b05c 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/widgets/NumberWidget.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/widgets/NumberWidget.java @@ -106,7 +106,7 @@ public NumberWidget(final String id, final String bg, final int number, final St responsePage = Realms.class; } - AjaxEventBehavior clickToRealms = new AjaxEventBehavior("onmousedown") { + AjaxEventBehavior clickToRealms = new AjaxEventBehavior("mousedown") { private static final long serialVersionUID = -7133385027739964990L; diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/AbstractMappingPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/AbstractMappingPanel.java index 1d1dc2d609..18170d7147 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/AbstractMappingPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/AbstractMappingPanel.java @@ -47,7 +47,6 @@ import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxButton; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; -import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.list.ListItem; import org.apache.wicket.markup.html.list.ListView; import org.apache.wicket.markup.html.panel.Panel; @@ -371,7 +370,7 @@ protected void onUpdate(final AjaxRequestTarget target) { private static final long serialVersionUID = -4804368561204623354L; @Override - protected void onSubmit(final AjaxRequestTarget target, final Form form) { + protected void onSubmit(final AjaxRequestTarget target) { model.getObject().add(new ItemTO()); target.add(AbstractMappingPanel.this); } diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizard.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizard.java index 1f14d8f193..2552b4c11d 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizard.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/AjaxWizard.java @@ -41,7 +41,6 @@ import org.apache.wicket.extensions.wizard.Wizard; import org.apache.wicket.extensions.wizard.WizardModel; import org.apache.wicket.extensions.wizard.WizardStep; -import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.model.CompoundPropertyModel; import org.apache.wicket.request.cycle.RequestCycle; import org.slf4j.Logger; @@ -172,7 +171,7 @@ protected Component newButtonBar(final String id) { */ @Override public final void onCancel() { - final AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class); + AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class).orElse(null); try { onCancelInternal(); if (eventSink == null) { @@ -193,18 +192,18 @@ public final void onCancel() { */ @Override public final void onFinish() { - final AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class); + AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class).orElse(null); try { final Serializable res = onApply(target); if (eventSink == null) { - send(AjaxWizard.this, Broadcast.BUBBLE, new NewItemFinishEvent<>(item, target).setResult(res)); + send(this, Broadcast.BUBBLE, new NewItemFinishEvent<>(item, target).setResult(res)); } else { send(eventSink, Broadcast.EXACT, new NewItemFinishEvent<>(item, target).setResult(res)); } } catch (TimeoutException te) { LOG.warn("Operation applying took to long", te); if (eventSink == null) { - send(AjaxWizard.this, Broadcast.BUBBLE, new NewItemCancelEvent<>(item, target)); + send(this, Broadcast.BUBBLE, new NewItemCancelEvent<>(item, target)); } else { send(eventSink, Broadcast.EXACT, new NewItemCancelEvent<>(item, target)); } @@ -361,7 +360,7 @@ public Serializable getResult() { } @Override - public void onSubmit(final AjaxRequestTarget target, final Form form) { + public void onSubmit(final AjaxRequestTarget target) { try { onApply(target); } catch (TimeoutException te) { @@ -373,7 +372,7 @@ public void onSubmit(final AjaxRequestTarget target, final Form form) { } @Override - public void onError(final AjaxRequestTarget target, final Form form) { + public void onError(final AjaxRequestTarget target) { ((BasePage) getPage()).getNotificationPanel().refresh(target); } diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/AbstractConnConfPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/AbstractConnConfPanel.java index c93d6b0bd4..662272f4ed 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/AbstractConnConfPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/AbstractConnConfPanel.java @@ -32,7 +32,6 @@ import org.apache.wicket.extensions.wizard.WizardModel.ICondition; import org.apache.wicket.extensions.wizard.WizardStep; import org.apache.wicket.markup.html.WebMarkupContainer; -import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.model.IModel; import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.model.ResourceModel; @@ -63,7 +62,7 @@ public AbstractConnConfPanel(final T model) { private static final long serialVersionUID = -7978723352517770644L; @Override - public void onSubmit(final AjaxRequestTarget target, final Form form) { + public void onSubmit(final AjaxRequestTarget target) { final Pair result = check(target); if (result.getLeft()) { SyncopeConsoleSession.get().info(getString(Constants.OPERATION_SUCCEEDED)); diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ItemTransformersTogglePanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ItemTransformersTogglePanel.java index 1aa783f1c6..ca5b038938 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ItemTransformersTogglePanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ItemTransformersTogglePanel.java @@ -104,7 +104,7 @@ public String getObject(final String id, final IModel form) { + public void onSubmit(final AjaxRequestTarget target) { toggle(target, false); target.add(container); } diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/JEXLTransformersTogglePanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/JEXLTransformersTogglePanel.java index 6a85d96983..fdbab7157b 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/JEXLTransformersTogglePanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/JEXLTransformersTogglePanel.java @@ -62,7 +62,7 @@ public JEXLTransformersTogglePanel(final WebMarkupContainer container, final Pag private static final long serialVersionUID = 4617041491286858973L; @Override - public void onSubmit(final AjaxRequestTarget target, final Form form) { + public void onSubmit(final AjaxRequestTarget target) { toggle(target, false); target.add(container); } diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ObjectTypeTogglePanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ObjectTypeTogglePanel.java index d1f72ec131..46b99b3baa 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ObjectTypeTogglePanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ObjectTypeTogglePanel.java @@ -59,7 +59,7 @@ public abstract class ObjectTypeTogglePanel extends TogglePanel { private static final long serialVersionUID = -7978723352517770644L; @Override - protected void onSubmit(final AjaxRequestTarget target, final Form form) { + protected void onSubmit(final AjaxRequestTarget target) { ObjectTypeTogglePanel.this.onSubmit(typeModel.getObject(), target); target.add(form); toggle(target, false); @@ -68,7 +68,7 @@ protected void onSubmit(final AjaxRequestTarget target, final Form form) { } @Override - protected void onError(final AjaxRequestTarget target, final Form form) { + protected void onError(final AjaxRequestTarget target) { ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target); } }); diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ResourceProvisionPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ResourceProvisionPanel.java index 4976641561..b3c8b33da0 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ResourceProvisionPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ResourceProvisionPanel.java @@ -46,7 +46,6 @@ import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.markup.html.AjaxLink; import org.apache.wicket.event.Broadcast; -import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.model.Model; import org.apache.wicket.model.StringResourceModel; @@ -276,7 +275,7 @@ private void checkConnObjectKeyCount(final String anyType, final List it } @Override - public void onSubmit(final AjaxRequestTarget target, final Form form) { + public void onSubmit(final AjaxRequestTarget target) { try { if (resourceTO.getOrgUnit() != null) { checkConnObjectKeyCount(SyncopeConstants.REALM_ANYTYPE, resourceTO.getOrgUnit().getItems()); diff --git a/client/enduser/src/main/java/org/apache/syncope/client/enduser/util/SaltGenerator.java b/client/enduser/src/main/java/org/apache/syncope/client/enduser/util/SaltGenerator.java index d1ab28e561..00d784d09b 100644 --- a/client/enduser/src/main/java/org/apache/syncope/client/enduser/util/SaltGenerator.java +++ b/client/enduser/src/main/java/org/apache/syncope/client/enduser/util/SaltGenerator.java @@ -21,8 +21,8 @@ import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; +import java.util.Base64; import javax.xml.bind.DatatypeConverter; -import org.apache.wicket.util.crypt.Base64; public final class SaltGenerator { @@ -36,7 +36,7 @@ public static String generate(final String input) { try { md = MessageDigest.getInstance("MD2"); return DatatypeConverter.printHexBinary( - md.digest((input + Base64.encodeBase64String(salt)).getBytes())); + md.digest((input + Base64.getMimeEncoder().encodeToString(salt)).getBytes())); } catch (final NoSuchAlgorithmException e) { throw new IllegalArgumentException(e); } diff --git a/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/panels/CamelRoutesDirectoryPanel.java b/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/panels/CamelRoutesDirectoryPanel.java index 6b32959e05..cddb413edd 100644 --- a/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/panels/CamelRoutesDirectoryPanel.java +++ b/ext/camel/client-console/src/main/java/org/apache/syncope/client/console/panels/CamelRoutesDirectoryPanel.java @@ -42,7 +42,6 @@ import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn; import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn; -import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.model.CompoundPropertyModel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; @@ -124,7 +123,7 @@ public void onClick(final AjaxRequestTarget target, final CamelRouteTO ignore) { private static final long serialVersionUID = 5488080606102212554L; @Override - public void onSubmit(final AjaxRequestTarget target, final Form form) { + public void onSubmit(final AjaxRequestTarget target) { try { restClient.update(anyTypeKind, route); info(getString(Constants.OPERATION_SUCCEEDED)); diff --git a/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/panels/ImportMetadata.java b/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/panels/ImportMetadata.java index 857948be92..cbc8234cce 100644 --- a/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/panels/ImportMetadata.java +++ b/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/panels/ImportMetadata.java @@ -81,7 +81,7 @@ protected void onSubmit(final AjaxRequestTarget target) { private static final long serialVersionUID = -7978723352517770644L; @Override - protected void onSubmit(final AjaxRequestTarget target, final Form form) { + protected void onSubmit(final AjaxRequestTarget target) { if (ArrayUtils.isNotEmpty(metadata.getObject())) { try { restClient.importIdPs(new ByteArrayInputStream(metadata.getObject())); @@ -101,7 +101,7 @@ protected void onSubmit(final AjaxRequestTarget target, final Form form) { } @Override - protected void onError(final AjaxRequestTarget target, final Form form) { + protected void onError(final AjaxRequestTarget target) { ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target); } }); diff --git a/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/panels/SAML2IdPsDirectoryPanel.java b/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/panels/SAML2IdPsDirectoryPanel.java index f46a5f8cc2..e4dd9fd467 100644 --- a/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/panels/SAML2IdPsDirectoryPanel.java +++ b/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/panels/SAML2IdPsDirectoryPanel.java @@ -21,6 +21,7 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.dialog.Modal; import java.io.Serializable; import java.util.ArrayList; +import java.util.Base64; import java.util.Collection; import java.util.Collections; import java.util.Iterator; @@ -67,7 +68,6 @@ import org.apache.wicket.model.Model; import org.apache.wicket.model.ResourceModel; import org.apache.wicket.model.StringResourceModel; -import org.apache.wicket.util.crypt.Base64; public class SAML2IdPsDirectoryPanel extends DirectoryPanel< SAML2IdPTO, SAML2IdPTO, SAML2IdPsProvider, SAML2IdPsRestClient> { @@ -214,7 +214,7 @@ public void onClick(final AjaxRequestTarget target, final SAML2IdPTO ignore) { metadataModal.header(Model.of(object.getName() + " - Metadata")); metadataModal.setContent(new XMLEditorPanel( metadataModal, - Model.of(new String(Base64.decodeBase64(object.getMetadata()))), + Model.of(new String(Base64.getMimeDecoder().decode(object.getMetadata()))), true, pageRef)); metadataModal.show(true); diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/LogsITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/LogsITCase.java index 9d8beaf1d6..e318a57e1b 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/LogsITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/LogsITCase.java @@ -21,6 +21,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import java.lang.reflect.InvocationTargetException; +import org.apache.syncope.client.console.commons.Constants; import org.apache.syncope.client.console.pages.Logs; import org.apache.syncope.common.lib.log.LoggerTO; import org.apache.wicket.Component; @@ -64,7 +65,8 @@ public void updateCoreLogs() { result.getPageRelativePath() + ":fields:1:field:dropDownChoiceField", "6"); TESTER.assertComponent( result.getPageRelativePath() + ":fields:1:field:dropDownChoiceField", DropDownChoice.class); - TESTER.executeAjaxEvent(result.getPageRelativePath() + ":fields:1:field:dropDownChoiceField", "onchange"); + TESTER.executeAjaxEvent( + result.getPageRelativePath() + ":fields:1:field:dropDownChoiceField", Constants.ON_CHANGE); TESTER.assertInfoMessages("Operation executed successfully"); } @@ -75,7 +77,7 @@ public void readConsoleLogs() { TESTER.clickLink("body:content:tabbedPanel:tabs-container:tabs:1:link"); TESTER.assertComponent(CONTAINER_PATH, WebMarkupContainer.class); - assertNotNull(searchLog(KEY, CONTAINER_PATH, "org.apache.syncope.fit")); + assertNotNull(searchLog(KEY, CONTAINER_PATH, "org.apache.wicket")); } @Test @@ -83,12 +85,13 @@ public void updateConsoleLogs() { TESTER.clickLink("body:content:tabbedPanel:tabs-container:tabs:1:link"); TESTER.assertComponent(CONTAINER_PATH, WebMarkupContainer.class); - Component result = searchLog(KEY, CONTAINER_PATH, "org.apache.syncope.fit"); + Component result = searchLog(KEY, CONTAINER_PATH, "org.apache.wicket"); assertNotNull(result); TESTER.getRequest().addParameter( result.getPageRelativePath() + ":fields:1:field:dropDownChoiceField", "6"); - TESTER.executeAjaxEvent(result.getPageRelativePath() + ":fields:1:field:dropDownChoiceField", "onchange"); + TESTER.executeAjaxEvent( + result.getPageRelativePath() + ":fields:1:field:dropDownChoiceField", Constants.ON_CHANGE); TESTER.assertInfoMessages("Operation executed successfully"); } diff --git a/pom.xml b/pom.xml index 98b668b646..9c9b83d6b8 100644 --- a/pom.xml +++ b/pom.xml @@ -441,9 +441,9 @@ under the License. 2.0.7 1.0.2 - 7.10.0 - 7.10.2 - 0.10.17 + 8.0.0 + 8.0.0 + 2.0.2 1.7.0 0.3.2 @@ -1157,7 +1157,7 @@ under the License. ${wicket.version} - org.apache.wicket + org.wicketstuff wicket-datetime ${wicket.version} @@ -1195,12 +1195,30 @@ under the License. de.agilecoders.wicket wicket-bootstrap-core ${wicket-bootstrap.version} + + + org.apache.wicket + wicket-request + + + org.apache.wicket + wicket-util + + de.agilecoders.wicket wicket-bootstrap-extensions ${wicket-bootstrap.version} + + org.apache.wicket + wicket-request + + + org.apache.wicket + wicket-util + com.google.javascript closure-compiler @@ -1218,428 +1236,428 @@ under the License. momentjs - - - - - org.slf4j - slf4j-api - ${slf4j.version} - - - org.apache.logging.log4j - log4j-api - ${log4j.version} - - - org.apache.logging.log4j - log4j-core - ${log4j.version} - - - com.lmax - disruptor - ${disruptor.version} - - - org.apache.logging.log4j - log4j-slf4j-impl - ${log4j.version} - - - commons-logging - commons-logging - ${commons-logging.version} - provided - - - org.slf4j - jcl-over-slf4j - ${slf4j.version} + - - org.apache.pdfbox - pdfbox - 2.0.9 - + + org.slf4j + slf4j-api + ${slf4j.version} + + + org.apache.logging.log4j + log4j-api + ${log4j.version} + + + org.apache.logging.log4j + log4j-core + ${log4j.version} + + + com.lmax + disruptor + ${disruptor.version} + + + org.apache.logging.log4j + log4j-slf4j-impl + ${log4j.version} + + + commons-logging + commons-logging + ${commons-logging.version} + provided + + + org.slf4j + jcl-over-slf4j + ${slf4j.version} + - - org.webjars - jquery - ${jquery.version} - - - org.webjars - jquery-ui - ${jquery-ui.version} - - - org.webjars - jquery-ui-themes - ${jquery-ui.version} - - - org.webjars - jQuery-slimScroll - ${jquery-slimscroll.version} - - - org.webjars - bootstrap - ${bootstrap.version} - - - org.webjars - bootstrap-select - ${bootstrap-select.version} - - - org.webjars.bower - bootstrap-fileinput - ${bootstrap-fileinput.version} - - - org.webjars.bower - jquery - - - org.webjars.bower - bootstrap - - - - - org.webjars - font-awesome - ${font-awesome.version} - - - org.webjars - bootbox - ${bootbox.version} - - - org.webjars - ionicons - ${ionicons.version} - - - org.webjars - highlightjs - ${highlightjs.version} - - - org.webjars - codemirror - ${codemirror.version} - - - org.webjars - google-diff-match-patch - ${googlediffmatchpath.version} - - - org.webjars - jsplumb - ${jsplumb.version} - - - org.webjars.bower - chart.js - ${chartjs.version} - - - org.webjars - jquery-cookie - ${jquery-cookie.version} - - - org.webjars.bower - angular - ${angular.version} - - - org.webjars.bower - angular-resource - ${angular.version} - - - org.webjars.bower - angular-cookies - ${angular.version} - - - org.webjars.bower - angular-ui-router - ${angular-ui-router.version} - - - org.webjars - angularjs - - - - - org.webjars.bower - angular-animate - ${angular.version} - - - org.webjars - angular-ui-bootstrap - ${angular-ui-bootstrap.version} - - - org.webjars - angularjs - - - - - org.webjars - angular-ui-select - ${angular-ui-select.version} - - - org.webjars - angularjs - - - - - org.webjars.bower - angular-sanitize - ${angular.version} - - - org.webjars.bower - angular-treasure-overlay-spinner - ${angular-treasure-overlay-spinner.version} - - - org.webjars.bower - angular-translate - ${angular-translate.version} - - - org.webjars.bower - angular-translate-loader-partial - ${angular-translate.version} - - - org.webjars.bower - angular-translate-storage-cookie - ${angular-translate.version} - - - - org.webjars.bower - ng-password-strength - ${ng-password-strength.version} - - - org.webjars.bower - lodash - - - - - org.webjars - lodash - ${lodash.version} - - - org.webjars - kendo-ui-core - ${kendo-ui-core.version} - - - org.webjars.bower - select2 - ${select2.version} - - - org.webjars.bower - jquery - - - - - org.webjars.bower - FileSaver.js - ${fileSaver.version} - - - - org.codehaus.izpack - izpack-compiler - ${izpack.version} - - - org.codehaus.izpack - izpack-panel - ${izpack.version} - - - org.icepdf.os - icepdf-core - - - org.icepdf.os - icepdf-viewer - - - + + org.apache.pdfbox + pdfbox + 2.0.9 + - - org.apache.maven.shared - maven-invoker - ${maven-invoker.version} - + + org.webjars + jquery + ${jquery.version} + + + org.webjars + jquery-ui + ${jquery-ui.version} + + + org.webjars + jquery-ui-themes + ${jquery-ui.version} + + + org.webjars + jQuery-slimScroll + ${jquery-slimscroll.version} + + + org.webjars + bootstrap + ${bootstrap.version} + + + org.webjars + bootstrap-select + ${bootstrap-select.version} + + + org.webjars.bower + bootstrap-fileinput + ${bootstrap-fileinput.version} + + + org.webjars.bower + jquery + + + org.webjars.bower + bootstrap + + + + + org.webjars + font-awesome + ${font-awesome.version} + + + org.webjars + bootbox + ${bootbox.version} + + + org.webjars + ionicons + ${ionicons.version} + + + org.webjars + highlightjs + ${highlightjs.version} + + + org.webjars + codemirror + ${codemirror.version} + + + org.webjars + google-diff-match-patch + ${googlediffmatchpath.version} + + + org.webjars + jsplumb + ${jsplumb.version} + + + org.webjars.bower + chart.js + ${chartjs.version} + + + org.webjars + jquery-cookie + ${jquery-cookie.version} + + + org.webjars.bower + angular + ${angular.version} + + + org.webjars.bower + angular-resource + ${angular.version} + + + org.webjars.bower + angular-cookies + ${angular.version} + + + org.webjars.bower + angular-ui-router + ${angular-ui-router.version} + + + org.webjars + angularjs + + + + + org.webjars.bower + angular-animate + ${angular.version} + + + org.webjars + angular-ui-bootstrap + ${angular-ui-bootstrap.version} + + + org.webjars + angularjs + + + + + org.webjars + angular-ui-select + ${angular-ui-select.version} + + + org.webjars + angularjs + + + + + org.webjars.bower + angular-sanitize + ${angular.version} + + + org.webjars.bower + angular-treasure-overlay-spinner + ${angular-treasure-overlay-spinner.version} + + + org.webjars.bower + angular-translate + ${angular-translate.version} + + + org.webjars.bower + angular-translate-loader-partial + ${angular-translate.version} + + + org.webjars.bower + angular-translate-storage-cookie + ${angular-translate.version} + + + + org.webjars.bower + ng-password-strength + ${ng-password-strength.version} + + + org.webjars.bower + lodash + + + + + org.webjars + lodash + ${lodash.version} + + + org.webjars + kendo-ui-core + ${kendo-ui-core.version} + + + org.webjars.bower + select2 + ${select2.version} + + + org.webjars.bower + jquery + + + + + org.webjars.bower + FileSaver.js + ${fileSaver.version} + + + + org.codehaus.izpack + izpack-compiler + ${izpack.version} + + + org.codehaus.izpack + izpack-panel + ${izpack.version} + + + org.icepdf.os + icepdf-core + + + org.icepdf.os + icepdf-viewer + + + - - org.apache.httpcomponents - httpclient - ${httpclient.version} - - - org.apache.httpcomponents - httpmime - ${httpclient.version} - + + org.apache.maven.shared + maven-invoker + ${maven-invoker.version} + - - org.netbeans.api - org-netbeans-api-annotations-common - ${netbeans.version} - - - org.netbeans.api - org-openide-windows - ${netbeans.version} - - - org.netbeans.api - org-openide-util - ${netbeans.version} - - - org.netbeans.api - org-openide-util-ui - ${netbeans.version} - - - org.netbeans.api - org-openide-util-lookup - ${netbeans.version} - - - org.netbeans.api - org-openide-awt - ${netbeans.version} - - - org.netbeans.api - org-netbeans-modules-settings - ${netbeans.version} - - - org.netbeans.api - org-openide-io - ${netbeans.version} - - - org.netbeans.api - org-openide-nodes - ${netbeans.version} - - - org.netbeans.api - org-openide-text - ${netbeans.version} - - - org.netbeans.api - org-openide-filesystems - ${netbeans.version} - - - org.netbeans.api - org-openide-loaders - ${netbeans.version} - - - org.netbeans.api - org-netbeans-core-multiview - ${netbeans.version} - jar - - - org.netbeans.api - org-netbeans-modules-editor-lib2 - ${netbeans.version} - jar - - - org.netbeans.api - org-netbeans-api-progress - ${netbeans.version} - - - org.netbeans.api - org-netbeans-api-progress-nb - ${netbeans.version} - - - org.netbeans.external - asm-all-5.0.1 - ${netbeans.version} - - - - org.antlr - antlr4-runtime - ${antlr4.version} - - - - - com.github.detro - phantomjsdriver - ${phantomjs.driver.version} - test - - - com.icegreen - greenmail - 1.5.7 - test - - - junit - junit - - - - - org.bouncycastle - bcpkix-jdk15on - 1.59 - test - - - org.springframework - spring-test - ${spring.version} - test - - - org.junit.jupiter - junit-jupiter-engine - ${junit.version} - test - + + org.apache.httpcomponents + httpclient + ${httpclient.version} + + + org.apache.httpcomponents + httpmime + ${httpclient.version} + + + + org.netbeans.api + org-netbeans-api-annotations-common + ${netbeans.version} + + + org.netbeans.api + org-openide-windows + ${netbeans.version} + + + org.netbeans.api + org-openide-util + ${netbeans.version} + + + org.netbeans.api + org-openide-util-ui + ${netbeans.version} + + + org.netbeans.api + org-openide-util-lookup + ${netbeans.version} + + + org.netbeans.api + org-openide-awt + ${netbeans.version} + + + org.netbeans.api + org-netbeans-modules-settings + ${netbeans.version} + + + org.netbeans.api + org-openide-io + ${netbeans.version} + + + org.netbeans.api + org-openide-nodes + ${netbeans.version} + + + org.netbeans.api + org-openide-text + ${netbeans.version} + + + org.netbeans.api + org-openide-filesystems + ${netbeans.version} + + + org.netbeans.api + org-openide-loaders + ${netbeans.version} + + + org.netbeans.api + org-netbeans-core-multiview + ${netbeans.version} + jar + + + org.netbeans.api + org-netbeans-modules-editor-lib2 + ${netbeans.version} + jar + + + org.netbeans.api + org-netbeans-api-progress + ${netbeans.version} + + + org.netbeans.api + org-netbeans-api-progress-nb + ${netbeans.version} + + + org.netbeans.external + asm-all-5.0.1 + ${netbeans.version} + + + + org.antlr + antlr4-runtime + ${antlr4.version} + + + + + com.github.detro + phantomjsdriver + ${phantomjs.driver.version} + test + + + com.icegreen + greenmail + 1.5.7 + test + + + junit + junit + + + + + org.bouncycastle + bcpkix-jdk15on + 1.59 + test + + + org.springframework + spring-test + ${spring.version} + test + + + org.junit.jupiter + junit-jupiter-engine + ${junit.version} + test + @@ -2268,7 +2286,7 @@ under the License. http://fasterxml.github.io/jackson-datatype-joda/javadoc/2.9/ http://www.javadoc.io/doc/org.apache.camel/camel-core/2.21.1/ http://www.javadoc.io/doc/org.apache.camel/camel-spring/2.21.1/ - https://ci.apache.org/projects/wicket/apidocs/7.x/ + https://ci.apache.org/projects/wicket/apidocs/8.x/ https://commons.apache.org/proper/commons-lang/javadocs/api-release/ https://commons.apache.org/proper/commons-io/javadocs/api-2.6/ https://commons.apache.org/proper/commons-jexl/apidocs/