[SYNCOPE-1323] Upgraded to Wicket 8

apache · Jun 13, 2018 · 3e48002 · 3e48002
1 parent 1f69db6
commit 3e48002
Show file tree

Hide file tree

Showing 70 changed files with 589 additions and 609 deletions.
diff --git a/client/console/pom.xml b/client/console/pom.xml
@@ -59,7 +59,7 @@ under the License.
       <artifactId>wicket-extensions</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.wicket</groupId>
+      <groupId>org.wicketstuff</groupId>
       <artifactId>wicket-datetime</artifactId>
     </dependency>
     <dependency>

diff --git a/...e/src/main/java/org/apache/syncope/client/console/SyncopeConsoleRequestCycleListener.java b/...e/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/...ole/src/main/java/org/apache/syncope/client/console/approvals/ApprovalDirectoryPanel.java b/...ole/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<WorkflowFormTO> model(final WorkflowFormTO form) {
-            return new AbstractReadOnlyModel<WorkflowFormTO>() {
+            return new IModel<WorkflowFormTO>() {
 
                 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
@@ -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,15 +63,15 @@ 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);
         SyncopeConsoleSession.get().info(getString(Constants.OPERATION_SUCCEEDED));
     }
 
     @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
@@ -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<A> 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<AjaxRequestTarget> 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<AjaxRequestTarget> target = RequestCycle.get().find(AjaxRequestTarget.class);
+            if (target.isPresent()) {
+                ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target.get());
+            }
         }
 
         return result;

diff --git a/...rc/main/java/org/apache/syncope/client/console/commons/SortableAnyProviderComparator.java b/...rc/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<T extends AnyTO> extends SortableDataProviderComparator<T> {
 
@@ -49,7 +49,7 @@ public int compare(final T any1, final T any2) {
     }
 
     @SuppressWarnings("rawtypes")
-    private class AttrModel extends AbstractReadOnlyModel<Comparable> {
+    private class AttrModel implements IModel<Comparable> {
 
         private static final long serialVersionUID = -7856686374020091808L;
 

diff --git a/...ain/java/org/apache/syncope/client/console/commons/status/AbstractStatusBeanProvider.java b/...ain/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<StatusBean> {
@@ -51,7 +50,7 @@ public long size() {
 
     @Override
     public IModel<StatusBean> model(final StatusBean statusBean) {
-        return new AbstractReadOnlyModel<StatusBean>() {
+        return new IModel<StatusBean>() {
 
             private static final long serialVersionUID = -7802635613997243712L;
 

diff --git a/...main/java/org/apache/syncope/client/console/notifications/MailTemplateDirectoryPanel.java b/...main/java/org/apache/syncope/client/console/notifications/MailTemplateDirectoryPanel.java
@@ -48,15 +48,13 @@
 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;
 import org.apache.syncope.client.console.panels.WizardModalPanel;
 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<MailTemplateTO> model(final MailTemplateTO mailTemplateTO) {
-            return new AbstractReadOnlyModel<MailTemplateTO>() {
+            return new IModel<MailTemplateTO>() {
 
                 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/...main/java/org/apache/syncope/client/console/notifications/NotificationDirectoryPanel.java b/...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<NotificationTO> model(final NotificationTO notification) {
-            return new AbstractReadOnlyModel<NotificationTO>() {
+            return new IModel<NotificationTO>() {
 
                 private static final long serialVersionUID = 774694801558497248L;
 

diff --git a/.../console/src/main/java/org/apache/syncope/client/console/notifications/TemplateModal.java b/.../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<T extends EntityTO, F> extends AbstractModalPanel<T> {
@@ -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
@@ -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
@@ -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/...nt/console/src/main/java/org/apache/syncope/client/console/panels/AbstractModalPanel.java b/...nt/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/.../console/src/main/java/org/apache/syncope/client/console/panels/ActionDataTablePanel.java b/.../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/...nt/console/src/main/java/org/apache/syncope/client/console/panels/AjaxDataTablePanel.java b/...nt/console/src/main/java/org/apache/syncope/client/console/panels/AjaxDataTablePanel.java
@@ -242,7 +242,7 @@ protected ActionLinksTogglePanel<T> 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/...t/console/src/main/java/org/apache/syncope/client/console/panels/AnyTypeClassesPanel.java b/...t/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<AnyTypeClassTO> 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
@@ -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<AnyTypeTO> 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/...console/src/main/java/org/apache/syncope/client/console/panels/ApplicationModalPanel.java b/...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<ApplicationTO> {
@@ -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);