[SYNCOPE-938] Applying all Netbeans hints for upgrade to JDK 8
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/5be24a03 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/5be24a03 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/5be24a03 Branch: refs/heads/master Commit: 5be24a033334a8a15b0c12dfaef1e5326d813ced Parents: a02779a Author: Francesco Chicchiriccò <ilgro...@apache.org> Authored: Fri Aug 25 17:36:06 2017 +0200 Committer: Francesco Chicchiriccò <ilgro...@apache.org> Committed: Fri Aug 25 17:36:06 2017 +0200 ---------------------------------------------------------------------- .../client/console/approvals/Approval.java | 2 +- .../approvals/ApprovalDirectoryPanel.java | 14 +- .../MailTemplateDirectoryPanel.java | 2 +- .../NotificationDirectoryPanel.java | 12 +- .../console/notifications/TemplateModal.java | 2 +- .../syncope/client/console/pages/Login.java | 11 +- .../console/pages/MustChangePassword.java | 4 +- .../panels/AbstractSchemaDetailsPanel.java | 4 +- .../panels/AccessTokenDirectoryPanel.java | 6 +- .../console/panels/ActionDataTablePanel.java | 2 +- .../console/panels/AjaxDataTablePanel.java | 15 +- .../console/panels/AnyTypeClassesPanel.java | 4 +- .../console/panels/AnyTypeDetailsPanel.java | 4 +- .../client/console/panels/AnyTypesPanel.java | 4 +- .../ConnInstanceHistoryConfDirectoryPanel.java | 6 +- .../client/console/panels/DerSchemaDetails.java | 2 +- .../client/console/panels/DirectoryPanel.java | 4 +- .../console/panels/DynRealmDirectoryPanel.java | 2 +- .../console/panels/FailureMessageModal.java | 2 +- .../console/panels/NewWorkflowProcess.java | 2 +- .../console/panels/PlainSchemaDetails.java | 22 +-- .../panels/RelationshipTypeDetailsPanel.java | 6 +- .../console/panels/RelationshipTypesPanel.java | 4 +- .../ResourceHistoryConfDirectoryPanel.java | 6 +- .../console/panels/RoleDirectoryPanel.java | 8 +- .../client/console/panels/SchemaModalPanel.java | 2 +- .../panels/SecurityQuestionDetailsPanel.java | 2 +- .../console/panels/SecurityQuestionsPanel.java | 4 +- .../panels/TypeExtensionDirectoryPanel.java | 13 +- .../console/panels/WorkflowDirectoryPanel.java | 6 +- .../policies/AccountPolicyDirectoryPanel.java | 6 +- .../policies/PasswordPolicyDirectoryPanel.java | 4 +- .../console/policies/PolicyDirectoryPanel.java | 10 +- .../console/reports/ReportDirectoryPanel.java | 18 +- .../reports/ReportTemplateDirectoryPanel.java | 2 +- .../console/status/AnyStatusDirectoryPanel.java | 32 ++-- .../console/status/ChangePasswordModal.java | 4 +- .../status/ResourceStatusDirectoryPanel.java | 4 +- .../client/console/tasks/CrontabPanel.java | 6 +- .../console/tasks/ExecutionsDirectoryPanel.java | 8 +- .../tasks/NotificationTaskDirectoryPanel.java | 14 +- .../tasks/PropagationTaskDirectoryPanel.java | 16 +- .../tasks/ProvisioningTaskDirectoryPanel.java | 18 +- .../client/console/tasks/PushTaskFilters.java | 3 +- .../console/tasks/SchedTaskDirectoryPanel.java | 12 +- .../client/console/topology/Topology.java | 66 ++++--- .../data/table/AjaxFallbackDataTable.java | 29 +-- .../markup/html/form/AjaxDateFieldPanel.java | 2 +- .../html/form/AjaxDateTimeFieldPanel.java | 4 +- .../markup/html/form/BinaryFieldPanel.java | 2 +- .../wicket/markup/html/form/FieldPanel.java | 4 +- .../html/form/IndicatingOnConfirmAjaxLink.java | 2 +- .../html/list/ConnConfPropertyListView.java | 11 +- .../client/console/widgets/JobWidget.java | 22 +-- .../ReconciliationDetailsModalPanel.java | 2 +- .../console/wizards/AbstractMappingPanel.java | 93 +++++----- .../console/wizards/any/AnyObjectDetails.java | 4 +- .../console/wizards/any/GroupDetails.java | 3 +- .../client/console/wizards/any/Ownership.java | 11 +- .../console/wizards/any/PasswordPanel.java | 8 +- .../client/console/wizards/any/UserDetails.java | 3 +- .../client/console/wizards/any/VirAttrs.java | 18 +- .../resources/JEXLTransformersTogglePanel.java | 4 +- .../ResourceConnCapabilitiesPanel.java | 5 +- .../resources/ResourceConnConfPanel.java | 29 ++- .../wizards/resources/ResourceDetailsPanel.java | 16 +- .../resources/ResourceSecurityPanel.java | 19 +- .../enduser/SyncopeEnduserApplication.java | 18 +- .../client/enduser/SyncopeEnduserSession.java | 12 +- .../enduser/resources/BaseUserSelfResource.java | 42 ++--- .../client/enduser/resources/InfoResource.java | 2 +- .../enduser/resources/SchemaResource.java | 56 +++--- .../resources/UserSelfCreateResource.java | 128 ++++++-------- .../enduser/resources/UserSelfReadResource.java | 44 ++--- .../resources/UserSelfUpdateResource.java | 154 +++++++--------- .../enduser/util/UserRequestValidator.java | 32 ++-- .../rest/api/beans/ConnObjectTOListQuery.java | 4 +- .../common/rest/api/beans/SchemaQuery.java | 6 +- .../syncope/core/logic/UserWorkflowLogic.java | 7 +- .../core/logic/cocoon/XSLTTransformer.java | 11 +- .../core/logic/init/EntitlementLoader.java | 10 +- .../syncope/core/logic/init/LoggerLoader.java | 57 +++--- .../core/logic/init/LogicInitializer.java | 15 +- .../api/search/SearchCondVisitor.java | 1 + .../provisioning/api/EntitlementsHolder.java | 2 +- .../provisioning/java/AsyncConnectorFacade.java | 13 +- .../java/ConnIdBundleManagerImpl.java | 21 +-- .../provisioning/java/ConnectorFacadeProxy.java | 16 +- .../java/DefaultUserProvisioningManager.java | 2 +- .../provisioning/java/job/AfterHandlingJob.java | 18 +- .../java/job/SetUMembershipsJob.java | 54 +++--- .../core/provisioning/java/job/TaskJob.java | 34 ++-- .../java/job/notification/NotificationJob.java | 20 +-- .../provisioning/java/job/report/ReportJob.java | 22 +-- .../security/JWTAuthenticationProvider.java | 15 +- .../core/spring/security/SecureRandomUtils.java | 25 +-- .../UsernamePasswordAuthenticationProvider.java | 98 ++++------- .../panels/CamelRoutesDirectoryPanel.java | 2 +- .../console/widgets/CamelMetricsWidget.java | 22 +-- .../syncope/core/logic/CamelRouteLogic.java | 12 +- .../camel/CamelUserProvisioningManager.java | 4 +- .../camel/producer/SuspendProducer.java | 2 +- .../client/console/panels/ImportMetadata.java | 2 +- .../console/panels/SAML2IdPsDirectoryPanel.java | 12 +- .../console/panels/SAMLSSOLoginFormPanel.java | 11 +- .../console/wizards/SAML2IdPWizardBuilder.java | 20 +-- .../syncope/core/logic/saml2/SAML2IdPCache.java | 3 +- .../fit/buildtools/ServiceTimeoutServlet.java | 5 +- .../fit/buildtools/cxf/ProvisioningImpl.java | 175 +++++++++---------- .../core/reference/ITImplementationLookup.java | 20 +-- .../fit/console/AbstractConsoleITCase.java | 40 ++--- .../apache/syncope/fit/console/LogsITCase.java | 19 +- .../syncope/installer/utilities/HttpUtils.java | 13 +- 113 files changed, 861 insertions(+), 1131 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/5be24a03/client/console/src/main/java/org/apache/syncope/client/console/approvals/Approval.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/approvals/Approval.java b/client/console/src/main/java/org/apache/syncope/client/console/approvals/Approval.java index d56dab8..18bf9a3 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/approvals/Approval.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/approvals/Approval.java @@ -171,7 +171,7 @@ public abstract class Approval extends Panel { case String: default: - field = new AjaxTextFieldPanel("value", label, new PropertyModel<String>(prop, "value"), false); + field = new AjaxTextFieldPanel("value", label, new PropertyModel<>(prop, "value"), false); break; } http://git-wip-us.apache.org/repos/asf/syncope/blob/5be24a03/client/console/src/main/java/org/apache/syncope/client/console/approvals/ApprovalDirectoryPanel.java ---------------------------------------------------------------------- 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 f40d7c6..29ea4aa 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 @@ -88,17 +88,17 @@ public class ApprovalDirectoryPanel protected List<IColumn<WorkflowFormTO, String>> getColumns() { List<IColumn<WorkflowFormTO, String>> columns = new ArrayList<>(); - columns.add(new PropertyColumn<WorkflowFormTO, String>( + columns.add(new PropertyColumn<>( new ResourceModel("taskId"), "taskId", "taskId")); - columns.add(new PropertyColumn<WorkflowFormTO, String>( + columns.add(new PropertyColumn<>( new ResourceModel("key"), "key", "key")); - columns.add(new PropertyColumn<WorkflowFormTO, String>( + columns.add(new PropertyColumn<>( new ResourceModel("username"), "username", "username")); - columns.add(new DatePropertyColumn<WorkflowFormTO>( + columns.add(new DatePropertyColumn<>( new ResourceModel("createTime"), "createTime", "createTime")); - columns.add(new DatePropertyColumn<WorkflowFormTO>( + columns.add(new DatePropertyColumn<>( new ResourceModel("dueDate"), "dueDate", "dueDate")); - columns.add(new PropertyColumn<WorkflowFormTO, String>(new ResourceModel("owner"), "owner", "owner")); + columns.add(new PropertyColumn<>(new ResourceModel("owner"), "owner", "owner")); return columns; } @@ -150,7 +150,7 @@ public class ApprovalDirectoryPanel } })); - + modal.header(new Model<>(getString("approval.edit", new Model<>(model.getObject())))); modal.show(true); } http://git-wip-us.apache.org/repos/asf/syncope/blob/5be24a03/client/console/src/main/java/org/apache/syncope/client/console/notifications/MailTemplateDirectoryPanel.java ---------------------------------------------------------------------- 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 355e001..11091c3 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 @@ -111,7 +111,7 @@ public class MailTemplateDirectoryPanel @Override protected List<IColumn<MailTemplateTO, String>> getColumns() { List<IColumn<MailTemplateTO, String>> columns = new ArrayList<>(); - columns.add(new PropertyColumn<MailTemplateTO, String>(new StringResourceModel("key", this), "key", "key")); + columns.add(new PropertyColumn<>(new StringResourceModel("key", this), "key", "key")); return columns; } http://git-wip-us.apache.org/repos/asf/syncope/blob/5be24a03/client/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationDirectoryPanel.java ---------------------------------------------------------------------- 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 740a36d..cb33f80 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 @@ -85,16 +85,16 @@ public class NotificationDirectoryPanel @Override protected List<IColumn<NotificationTO, String>> getColumns() { List<IColumn<NotificationTO, String>> columns = new ArrayList<>(); - columns.add(new KeyPropertyColumn<NotificationTO>(new StringResourceModel("key", this), "key")); - columns.add(new PropertyColumn<NotificationTO, String>( + columns.add(new KeyPropertyColumn<>(new StringResourceModel("key", this), "key")); + columns.add(new PropertyColumn<>( new StringResourceModel("sender", this), "sender", "sender")); - columns.add(new PropertyColumn<NotificationTO, String>( + columns.add(new PropertyColumn<>( new StringResourceModel("subject", this), "subject", "subject")); - columns.add(new PropertyColumn<NotificationTO, String>( + columns.add(new PropertyColumn<>( new StringResourceModel("template", this), "template", "template")); - columns.add(new CollectionPropertyColumn<NotificationTO>( + columns.add(new CollectionPropertyColumn<>( new StringResourceModel("events", this), "events")); - columns.add(new BooleanPropertyColumn<NotificationTO>( + columns.add(new BooleanPropertyColumn<>( new StringResourceModel("active", this), "active", "active")); return columns; } http://git-wip-us.apache.org/repos/asf/syncope/blob/5be24a03/client/console/src/main/java/org/apache/syncope/client/console/notifications/TemplateModal.java ---------------------------------------------------------------------- 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 69ac0eb..d6cfce0 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 @@ -51,7 +51,7 @@ public class TemplateModal<T extends EntityTO, F> extends AbstractModalPanel<T> this.templateTO = templateTO; AjaxTextFieldPanel key = new AjaxTextFieldPanel( - "key", "key", new PropertyModel<String>(templateTO, "key"), false); + "key", "key", new PropertyModel<>(templateTO, "key"), false); key.setOutputMarkupPlaceholderTag(true); add(key.setRenderBodyOnly(true)); } http://git-wip-us.apache.org/repos/asf/syncope/blob/5be24a03/client/console/src/main/java/org/apache/syncope/client/console/pages/Login.java ---------------------------------------------------------------------- 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 4c7364f..b17d61e 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 @@ -29,7 +29,6 @@ import org.apache.syncope.client.console.commons.Constants; import org.apache.syncope.client.console.init.ClassPathScanImplementationLookup; import org.apache.syncope.client.console.init.ConsoleInitializer; import org.apache.syncope.client.console.panels.NotificationPanel; -import org.apache.syncope.client.console.panels.SSOLoginFormPanel; import org.apache.syncope.common.lib.SyncopeConstants; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.markup.html.form.AjaxButton; @@ -88,11 +87,11 @@ public class Login extends WebPage { form = new StatelessForm<>("login"); - usernameField = new TextField<>("username", new Model<String>()); + usernameField = new TextField<>("username", new Model<>()); usernameField.setMarkupId("username"); form.add(usernameField); - passwordField = new PasswordTextField("password", new Model<String>()); + passwordField = new PasswordTextField("password", new Model<>()); passwordField.setMarkupId("password"); form.add(passwordField); @@ -137,15 +136,13 @@ public class Login extends WebPage { (ClassPathScanImplementationLookup) SyncopeConsoleApplication.get(). getServletContext().getAttribute(ConsoleInitializer.CLASSPATH_LOOKUP); List<Panel> ssoLoginFormPanels = new ArrayList<>(); - for (Class<? extends SSOLoginFormPanel> ssoLoginFormPanel : classPathScanImplementationLookup. - getSSOLoginFormPanels()) { - + classPathScanImplementationLookup.getSSOLoginFormPanels().forEach(ssoLoginFormPanel -> { try { ssoLoginFormPanels.add(ssoLoginFormPanel.getConstructor(String.class).newInstance("ssoLogin")); } catch (Exception e) { LOG.error("Could not initialize the provided SSO login form panel", e); } - } + }); ListView<Panel> ssoLogins = new ListView<Panel>("ssoLogins", ssoLoginFormPanels) { private static final long serialVersionUID = -9180479401817023838L; http://git-wip-us.apache.org/repos/asf/syncope/blob/5be24a03/client/console/src/main/java/org/apache/syncope/client/console/pages/MustChangePassword.java ---------------------------------------------------------------------- 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 b8d2dd1..f613d54 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 @@ -67,14 +67,14 @@ public class MustChangePassword extends WebPage { usernameField.setEnabled(false); form.add(usernameField); - passwordField = new AjaxPasswordFieldPanel("password", "password", new Model<String>()); + passwordField = new AjaxPasswordFieldPanel("password", "password", new Model<>()); passwordField.setRequired(true); passwordField.setMarkupId("password"); passwordField.setPlaceholder("password"); ((PasswordTextField) passwordField.getField()).setResetPassword(true); form.add(passwordField); - confirmPasswordField = new AjaxPasswordFieldPanel("confirmPassword", "confirmPassword", new Model<String>()); + confirmPasswordField = new AjaxPasswordFieldPanel("confirmPassword", "confirmPassword", new Model<>()); confirmPasswordField.setRequired(true); confirmPasswordField.setMarkupId("confirmPassword"); confirmPasswordField.setPlaceholder("confirmPassword"); http://git-wip-us.apache.org/repos/asf/syncope/blob/5be24a03/client/console/src/main/java/org/apache/syncope/client/console/panels/AbstractSchemaDetailsPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/AbstractSchemaDetailsPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/AbstractSchemaDetailsPanel.java index ebddc5b..36fb95a 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/AbstractSchemaDetailsPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/AbstractSchemaDetailsPanel.java @@ -35,7 +35,7 @@ public abstract class AbstractSchemaDetailsPanel extends Panel { protected static final Logger LOG = LoggerFactory.getLogger(AbstractSchemaDetailsPanel.class); protected static final String FORM = "form"; - + protected final Form<AbstractSchemaTO> schemaForm; protected final AbstractSchemaTO schemaTO; @@ -53,7 +53,7 @@ public abstract class AbstractSchemaDetailsPanel extends Panel { schemaForm.setOutputMarkupId(true); final AjaxTextFieldPanel name = - new AjaxTextFieldPanel("key", getString("key"), new PropertyModel<String>(schemaTO, "key")); + new AjaxTextFieldPanel("key", getString("key"), new PropertyModel<>(schemaTO, "key")); name.addRequiredLabel(); name.setEnabled(schemaTO == null || schemaTO.getKey() == null || schemaTO.getKey().isEmpty()); http://git-wip-us.apache.org/repos/asf/syncope/blob/5be24a03/client/console/src/main/java/org/apache/syncope/client/console/panels/AccessTokenDirectoryPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/AccessTokenDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/AccessTokenDirectoryPanel.java index 86714ee..082b860 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/AccessTokenDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/AccessTokenDirectoryPanel.java @@ -83,12 +83,12 @@ public class AccessTokenDirectoryPanel @Override protected List<IColumn<AccessTokenTO, String>> getColumns() { List<IColumn<AccessTokenTO, String>> columns = new ArrayList<>(); - columns.add(new KeyPropertyColumn<AccessTokenTO>( + columns.add(new KeyPropertyColumn<>( new StringResourceModel(Constants.KEY_FIELD_NAME, this), Constants.KEY_FIELD_NAME, Constants.KEY_FIELD_NAME)); - columns.add(new PropertyColumn<AccessTokenTO, String>(new ResourceModel("owner"), "owner", "owner")); + columns.add(new PropertyColumn<>(new ResourceModel("owner"), "owner", "owner")); columns.add(new AbstractColumn<AccessTokenTO, String>(new ResourceModel("issuedAt", "")) { @@ -107,7 +107,7 @@ public class AccessTokenDirectoryPanel } }); - columns.add(new DatePropertyColumn<AccessTokenTO>(new ResourceModel("expiryTime"), "expiryTime", "expiryTime")); + columns.add(new DatePropertyColumn<>(new ResourceModel("expiryTime"), "expiryTime", "expiryTime")); return columns; } http://git-wip-us.apache.org/repos/asf/syncope/blob/5be24a03/client/console/src/main/java/org/apache/syncope/client/console/panels/ActionDataTablePanel.java ---------------------------------------------------------------------- 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 9aa2a69..4574544 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 @@ -80,7 +80,7 @@ public class ActionDataTablePanel<T extends Serializable, S> extends DataTablePa }); bulkActionForm.add(group); - columns.add(0, new CheckGroupColumn<T, S>(group)); + columns.add(0, new CheckGroupColumn<>(group)); dataTable = new AjaxFallbackDataTable<>("dataTable", columns, dataProvider, rowsPerPage, this); group.add(dataTable); http://git-wip-us.apache.org/repos/asf/syncope/blob/5be24a03/client/console/src/main/java/org/apache/syncope/client/console/panels/AjaxDataTablePanel.java ---------------------------------------------------------------------- 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 9204aa1..001de67 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 @@ -51,8 +51,6 @@ import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.panel.Fragment; import org.apache.wicket.model.IModel; import org.apache.wicket.model.ResourceModel; -import org.apache.wicket.util.visit.IVisit; -import org.apache.wicket.util.visit.IVisitor; public final class AjaxDataTablePanel<T extends Serializable, S> extends DataTablePanel<T, S> { @@ -206,21 +204,16 @@ public final class AjaxDataTablePanel<T extends Serializable, S> extends DataTab @Override protected void onUpdate(final AjaxRequestTarget target) { - group.visitChildren( - CheckGroupSelector.class, new IVisitor<CheckGroupSelector, List<CheckGroupSelector>>() { - - @Override - public void component(final CheckGroupSelector t, final IVisit<List<CheckGroupSelector>> ivisit) { - target.focusComponent(t); - ivisit.stop(); - } + group.visitChildren(CheckGroupSelector.class, (selector, ivisit) -> { + target.focusComponent(selector); + ivisit.stop(); }); } }); bulkActionForm.add(group); if (builder.checkBoxEnabled) { - builder.columns.add(0, new CheckGroupColumn<T, S>(group)); + builder.columns.add(0, new CheckGroupColumn<>(group)); } dataTable = new AjaxFallbackDataTable<T, S>( http://git-wip-us.apache.org/repos/asf/syncope/blob/5be24a03/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyTypeClassesPanel.java ---------------------------------------------------------------------- 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 0e489f3..af1f72e 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 @@ -126,10 +126,10 @@ public class AnyTypeClassesPanel extends TypesDirectoryPanel< || Collection.class.isAssignableFrom(field.getType()) || Map.class.isAssignableFrom(field.getType())) { - columns.add(new PropertyColumn<AnyTypeClassTO, String>( + columns.add(new PropertyColumn<>( new ResourceModel(field.getName()), field.getName())); } else if (field.getType().equals(boolean.class) || field.getType().equals(Boolean.class)) { - columns.add(new BooleanPropertyColumn<AnyTypeClassTO>( + columns.add(new BooleanPropertyColumn<>( new ResourceModel(field.getName()), field.getName(), field.getName())); } else { columns.add(new PropertyColumn<AnyTypeClassTO, String>( http://git-wip-us.apache.org/repos/asf/syncope/blob/5be24a03/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyTypeDetailsPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyTypeDetailsPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyTypeDetailsPanel.java index 582dc9f..0e31a67 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyTypeDetailsPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyTypeDetailsPanel.java @@ -51,13 +51,13 @@ public class AnyTypeDetailsPanel extends Panel { container.add(form); final AjaxTextFieldPanel key = - new AjaxTextFieldPanel("key", getString("key"), new PropertyModel<String>(anyTypeTO, "key")); + new AjaxTextFieldPanel("key", getString("key"), new PropertyModel<>(anyTypeTO, "key")); key.addRequiredLabel(); key.setEnabled(key.getModelObject() == null || key.getModelObject().isEmpty()); form.add(key); final AjaxDropDownChoicePanel<AnyTypeKind> kind = new AjaxDropDownChoicePanel<>( - "kind", getString("kind"), new PropertyModel<AnyTypeKind>(anyTypeTO, "kind")); + "kind", getString("kind"), new PropertyModel<>(anyTypeTO, "kind")); kind.setChoices(Arrays.asList(AnyTypeKind.values())); kind.setOutputMarkupId(true); if (anyTypeTO.getKind() == null) { http://git-wip-us.apache.org/repos/asf/syncope/blob/5be24a03/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyTypesPanel.java ---------------------------------------------------------------------- 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 1d0e1d8..736bb7d 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 @@ -125,10 +125,10 @@ public class AnyTypesPanel extends TypesDirectoryPanel<AnyTypeTO, AnyTypesPanel. || Collection.class.isAssignableFrom(field.getType()) || Map.class.isAssignableFrom(field.getType())) { - columns.add(new PropertyColumn<AnyTypeTO, String>( + columns.add(new PropertyColumn<>( new ResourceModel(field.getName()), field.getName())); } else if (field.getType().equals(boolean.class) || field.getType().equals(Boolean.class)) { - columns.add(new BooleanPropertyColumn<AnyTypeTO>( + columns.add(new BooleanPropertyColumn<>( new ResourceModel(field.getName()), field.getName(), field.getName())); } else { columns.add(new PropertyColumn<AnyTypeTO, String>( http://git-wip-us.apache.org/repos/asf/syncope/blob/5be24a03/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnInstanceHistoryConfDirectoryPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnInstanceHistoryConfDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnInstanceHistoryConfDirectoryPanel.java index 836c12b..2e836ba 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnInstanceHistoryConfDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnInstanceHistoryConfDirectoryPanel.java @@ -87,13 +87,13 @@ public abstract class ConnInstanceHistoryConfDirectoryPanel extends DirectoryPan protected List<IColumn<ConnInstanceHistoryConfTO, String>> getColumns() { final List<IColumn<ConnInstanceHistoryConfTO, String>> columns = new ArrayList<>(); - columns.add(new KeyPropertyColumn<ConnInstanceHistoryConfTO>( + columns.add(new KeyPropertyColumn<>( new StringResourceModel("key", this), "key")); - columns.add(new PropertyColumn<ConnInstanceHistoryConfTO, String>(new StringResourceModel( + columns.add(new PropertyColumn<>(new StringResourceModel( "creator", this), "creator", "creator")); - columns.add(new DatePropertyColumn<ConnInstanceHistoryConfTO>( + columns.add(new DatePropertyColumn<>( new StringResourceModel("creation", this), "creation", "creation")); return columns; http://git-wip-us.apache.org/repos/asf/syncope/blob/5be24a03/client/console/src/main/java/org/apache/syncope/client/console/panels/DerSchemaDetails.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/DerSchemaDetails.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/DerSchemaDetails.java index d9f8b17..52fbfe5 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/DerSchemaDetails.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/DerSchemaDetails.java @@ -34,7 +34,7 @@ public class DerSchemaDetails extends AbstractSchemaDetailsPanel { final AbstractSchemaTO schemaTO) { super(id, pageReference, schemaTO); - TextField<String> expression = new TextField<>("expression", new PropertyModel<String>(schemaTO, "expression")); + TextField<String> expression = new TextField<>("expression", new PropertyModel<>(schemaTO, "expression")); expression.setRequired(true); schemaForm.add(expression); http://git-wip-us.apache.org/repos/asf/syncope/blob/5be24a03/client/console/src/main/java/org/apache/syncope/client/console/panels/DirectoryPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/DirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/DirectoryPanel.java index 9bc33d6..22c104e 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/DirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/DirectoryPanel.java @@ -215,7 +215,7 @@ public abstract class DirectoryPanel< container.add(paginatorForm); DropDownChoice<Integer> rowsChooser = new DropDownChoice<>( - "rowsChooser", new PropertyModel<Integer>(this, "rows"), prefMan.getPaginatorChoices()); + "rowsChooser", new PropertyModel<>(this, "rows"), prefMan.getPaginatorChoices()); rowsChooser.add(new IndicatorAjaxFormComponentUpdatingBehavior(Constants.ON_CHANGE) { private static final long serialVersionUID = -1107858522700306810L; @@ -353,7 +353,7 @@ public abstract class DirectoryPanel< } protected ActionsPanel<T> getActions(final IModel<T> model) { - return model == null ? new ActionsPanel<>("actions", new Model<T>()) : new ActionsPanel<>("actions", model); + return model == null ? new ActionsPanel<>("actions", new Model<>()) : new ActionsPanel<>("actions", model); } protected ActionLinksTogglePanel<T> getTogglePanel() { http://git-wip-us.apache.org/repos/asf/syncope/blob/5be24a03/client/console/src/main/java/org/apache/syncope/client/console/panels/DynRealmDirectoryPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/DynRealmDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/DynRealmDirectoryPanel.java index c20efb5..d1c15e6 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/DynRealmDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/DynRealmDirectoryPanel.java @@ -108,7 +108,7 @@ public class DynRealmDirectoryPanel extends protected List<IColumn<DynRealmTO, String>> getColumns() { final List<IColumn<DynRealmTO, String>> columns = new ArrayList<>(); - columns.add(new PropertyColumn<DynRealmTO, String>(new ResourceModel("key"), "key", "key")); + columns.add(new PropertyColumn<>(new ResourceModel("key"), "key", "key")); return columns; } http://git-wip-us.apache.org/repos/asf/syncope/blob/5be24a03/client/console/src/main/java/org/apache/syncope/client/console/panels/FailureMessageModal.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/FailureMessageModal.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/FailureMessageModal.java index 5aac8b3..f548bfe 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/FailureMessageModal.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/FailureMessageModal.java @@ -33,7 +33,7 @@ public class FailureMessageModal<T extends Serializable> extends Panel implement super(BaseModal.CONTENT_ID); final Label executionFailureMessage; if (!failureMessage.isEmpty()) { - executionFailureMessage = new Label("failureMessage", new Model<String>(failureMessage)); + executionFailureMessage = new Label("failureMessage", new Model<>(failureMessage)); } else { executionFailureMessage = new Label("failureMessage"); } http://git-wip-us.apache.org/repos/asf/syncope/blob/5be24a03/client/console/src/main/java/org/apache/syncope/client/console/panels/NewWorkflowProcess.java ---------------------------------------------------------------------- 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 ab4bda3..be021c7 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 @@ -49,7 +49,7 @@ public class NewWorkflowProcess extends TogglePanel<Serializable> { form = new Form<>("form"); addInnerObject(form); - final TextField<String> key = new TextField<>("key", new Model<String>()); + final TextField<String> key = new TextField<>("key", new Model<>()); key.setRequired(true); form.add(key); http://git-wip-us.apache.org/repos/asf/syncope/blob/5be24a03/client/console/src/main/java/org/apache/syncope/client/console/panels/PlainSchemaDetails.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/PlainSchemaDetails.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/PlainSchemaDetails.java index 4cd80b7..795b8df 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/PlainSchemaDetails.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/PlainSchemaDetails.java @@ -69,7 +69,7 @@ public class PlainSchemaDetails extends AbstractSchemaDetailsPanel { super(id, pageReference, schemaTO); final AjaxDropDownChoicePanel<AttrSchemaType> type = new AjaxDropDownChoicePanel<>( - "type", getString("type"), new PropertyModel<AttrSchemaType>(schemaTO, "type")); + "type", getString("type"), new PropertyModel<>(schemaTO, "type")); type.setChoices(Arrays.asList(AttrSchemaType.values())); type.setEnabled(schemaTO == null || schemaTO.getKey() == null || schemaTO.getKey().isEmpty()); @@ -79,7 +79,7 @@ public class PlainSchemaDetails extends AbstractSchemaDetailsPanel { // long, double, date final AjaxTextFieldPanel conversionPattern = new AjaxTextFieldPanel("conversionPattern", - getString("conversionPattern"), new PropertyModel<String>(schemaTO, "conversionPattern")); + getString("conversionPattern"), new PropertyModel<>(schemaTO, "conversionPattern")); schemaForm.add(conversionPattern); @@ -94,8 +94,8 @@ public class PlainSchemaDetails extends AbstractSchemaDetailsPanel { typeParams.setOutputMarkupPlaceholderTag(true); // enum - final AjaxTextFieldPanel enumerationValuesPanel = new AjaxTextFieldPanel("panel", "enumerationValues", - new Model<String>(null)); + final AjaxTextFieldPanel enumerationValuesPanel = new AjaxTextFieldPanel("panel", + "enumerationValues", new Model<>(null)); enumerationValues = new MultiFieldPanel.Builder<String>( new PropertyModel<List<String>>(schemaTO, "enumerationValues") { @@ -183,11 +183,11 @@ public class PlainSchemaDetails extends AbstractSchemaDetailsPanel { // encrypted final AjaxTextFieldPanel secretKey = new AjaxTextFieldPanel("secretKey", - getString("secretKey"), new PropertyModel<String>(schemaTO, "secretKey")); + getString("secretKey"), new PropertyModel<>(schemaTO, "secretKey")); final AjaxDropDownChoicePanel<CipherAlgorithm> cipherAlgorithm = new AjaxDropDownChoicePanel<>( "cipherAlgorithm", getString("cipherAlgorithm"), - new PropertyModel<CipherAlgorithm>(schemaTO, "cipherAlgorithm")); + new PropertyModel<>(schemaTO, "cipherAlgorithm")); cipherAlgorithm.setChoices(Arrays.asList(CipherAlgorithm.values())); @@ -200,7 +200,7 @@ public class PlainSchemaDetails extends AbstractSchemaDetailsPanel { // binary final AjaxTextFieldPanel mimeType = new AjaxTextFieldPanel("mimeType", - getString("mimeType"), new PropertyModel<String>(schemaTO, "mimeType")); + getString("mimeType"), new PropertyModel<>(schemaTO, "mimeType")); final WebMarkupContainer binaryParams = new WebMarkupContainer("binaryParams"); binaryParams.setOutputMarkupPlaceholderTag(true); @@ -242,7 +242,7 @@ public class PlainSchemaDetails extends AbstractSchemaDetailsPanel { } }; final AjaxDropDownChoicePanel<String> validatorClass = new AjaxDropDownChoicePanel<>("validatorClass", - getString("validatorClass"), new PropertyModel<String>(schemaTO, "validatorClass")); + getString("validatorClass"), new PropertyModel<>(schemaTO, "validatorClass")); ((DropDownChoice) validatorClass.getField()).setNullValid(true); validatorClass.setChoices(validatorsList.getObject()); schemaForm.add(validatorClass); @@ -279,13 +279,13 @@ public class PlainSchemaDetails extends AbstractSchemaDetailsPanel { schemaForm.add(Constants.getJEXLPopover(this, TooltipConfig.Placement.right)); schemaForm.add(new AjaxCheckBoxPanel( - "multivalue", getString("multivalue"), new PropertyModel<Boolean>(schemaTO, "multivalue"))); + "multivalue", getString("multivalue"), new PropertyModel<>(schemaTO, "multivalue"))); schemaForm.add(new AjaxCheckBoxPanel( - "readonly", getString("readonly"), new PropertyModel<Boolean>(schemaTO, "readonly"))); + "readonly", getString("readonly"), new PropertyModel<>(schemaTO, "readonly"))); schemaForm.add(new AjaxCheckBoxPanel("uniqueConstraint", - getString("uniqueConstraint"), new PropertyModel<Boolean>(schemaTO, "uniqueConstraint"))); + getString("uniqueConstraint"), new PropertyModel<>(schemaTO, "uniqueConstraint"))); } http://git-wip-us.apache.org/repos/asf/syncope/blob/5be24a03/client/console/src/main/java/org/apache/syncope/client/console/panels/RelationshipTypeDetailsPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/RelationshipTypeDetailsPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/RelationshipTypeDetailsPanel.java index ef53d05..068ce5b 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/RelationshipTypeDetailsPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/RelationshipTypeDetailsPanel.java @@ -43,14 +43,14 @@ public class RelationshipTypeDetailsPanel extends Panel { form.setModel(new CompoundPropertyModel<>(relationshipTypeTO)); container.add(form); - final AjaxTextFieldPanel key = new AjaxTextFieldPanel("key", getString("key"), new PropertyModel<String>( - relationshipTypeTO, "key")); + final AjaxTextFieldPanel key = new AjaxTextFieldPanel("key", getString("key"), + new PropertyModel<>(relationshipTypeTO, "key")); key.addRequiredLabel(); key.setEnabled(key.getModelObject() == null || key.getModelObject().isEmpty()); form.add(key); final AjaxTextFieldPanel description = new AjaxTextFieldPanel("description", - getString("description"), new PropertyModel<String>(relationshipTypeTO, "description")); + getString("description"), new PropertyModel<>(relationshipTypeTO, "description")); description.addRequiredLabel(); form.add(description); } http://git-wip-us.apache.org/repos/asf/syncope/blob/5be24a03/client/console/src/main/java/org/apache/syncope/client/console/panels/RelationshipTypesPanel.java ---------------------------------------------------------------------- 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 a83c440..56d92ec 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 @@ -129,10 +129,10 @@ public class RelationshipTypesPanel extends TypesDirectoryPanel< || Collection.class.isAssignableFrom(field.getType()) || Map.class.isAssignableFrom(field.getType())) { - columns.add(new PropertyColumn<RelationshipTypeTO, String>( + columns.add(new PropertyColumn<>( new ResourceModel(field.getName()), field.getName())); } else if (field.getType().equals(boolean.class) || field.getType().equals(Boolean.class)) { - columns.add(new BooleanPropertyColumn<RelationshipTypeTO>( + columns.add(new BooleanPropertyColumn<>( new ResourceModel(field.getName()), field.getName(), field.getName())); } else { columns.add(new PropertyColumn<RelationshipTypeTO, String>( http://git-wip-us.apache.org/repos/asf/syncope/blob/5be24a03/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceHistoryConfDirectoryPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceHistoryConfDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceHistoryConfDirectoryPanel.java index d212d9d..c666313 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceHistoryConfDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceHistoryConfDirectoryPanel.java @@ -90,13 +90,13 @@ public abstract class ResourceHistoryConfDirectoryPanel extends DirectoryPanel< protected List<IColumn<ResourceHistoryConfTO, String>> getColumns() { final List<IColumn<ResourceHistoryConfTO, String>> columns = new ArrayList<>(); - columns.add(new KeyPropertyColumn<ResourceHistoryConfTO>( + columns.add(new KeyPropertyColumn<>( new StringResourceModel("key", this), "key")); - columns.add(new PropertyColumn<ResourceHistoryConfTO, String>(new StringResourceModel( + columns.add(new PropertyColumn<>(new StringResourceModel( "creator", this), "creator", "creator")); - columns.add(new DatePropertyColumn<ResourceHistoryConfTO>( + columns.add(new DatePropertyColumn<>( new StringResourceModel("creation", this), "creation", "creation")); return columns; http://git-wip-us.apache.org/repos/asf/syncope/blob/5be24a03/client/console/src/main/java/org/apache/syncope/client/console/panels/RoleDirectoryPanel.java ---------------------------------------------------------------------- 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 bb7d9d9..5644e85 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 @@ -109,13 +109,13 @@ public class RoleDirectoryPanel extends DirectoryPanel<RoleTO, RoleWrapper, Role protected List<IColumn<RoleTO, String>> getColumns() { final List<IColumn<RoleTO, String>> columns = new ArrayList<>(); - columns.add(new PropertyColumn<RoleTO, String>( + columns.add(new PropertyColumn<>( new ResourceModel("key"), "key", "key")); - columns.add(new PropertyColumn<RoleTO, String>( + columns.add(new PropertyColumn<>( new ResourceModel("entitlements", "Entitlements"), null, "entitlements")); - columns.add(new PropertyColumn<RoleTO, String>( + columns.add(new PropertyColumn<>( new ResourceModel("realms"), null, "realms")); - columns.add(new PropertyColumn<RoleTO, String>( + columns.add(new PropertyColumn<>( new ResourceModel("dynRealms"), null, "dynRealms")); return columns; http://git-wip-us.apache.org/repos/asf/syncope/blob/5be24a03/client/console/src/main/java/org/apache/syncope/client/console/panels/SchemaModalPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/SchemaModalPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/SchemaModalPanel.java index dabeb85..c49dc36 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/SchemaModalPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/SchemaModalPanel.java @@ -47,7 +47,7 @@ public class SchemaModalPanel extends AbstractModalPanel<AbstractSchemaTO> { add(kindForm); final AjaxDropDownChoicePanel<SchemaType> kind = new AjaxDropDownChoicePanel<>( - "kind", getString("kind"), new Model<SchemaType>()); + "kind", getString("kind"), new Model<>()); kind.setChoices(Arrays.asList(SchemaType.values())); kind.setOutputMarkupId(true); http://git-wip-us.apache.org/repos/asf/syncope/blob/5be24a03/client/console/src/main/java/org/apache/syncope/client/console/panels/SecurityQuestionDetailsPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/SecurityQuestionDetailsPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/SecurityQuestionDetailsPanel.java index 3f632fb..d75c483 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/SecurityQuestionDetailsPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/SecurityQuestionDetailsPanel.java @@ -44,7 +44,7 @@ public class SecurityQuestionDetailsPanel extends Panel { container.add(form); final AjaxTextFieldPanel content = new AjaxTextFieldPanel( - "content", getString("content"), new PropertyModel<String>(securityQuestionTO, "content")); + "content", getString("content"), new PropertyModel<>(securityQuestionTO, "content")); content.addRequiredLabel(); form.add(content); } http://git-wip-us.apache.org/repos/asf/syncope/blob/5be24a03/client/console/src/main/java/org/apache/syncope/client/console/panels/SecurityQuestionsPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/SecurityQuestionsPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/SecurityQuestionsPanel.java index fb14b54..3a12a82 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/SecurityQuestionsPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/SecurityQuestionsPanel.java @@ -126,9 +126,9 @@ public class SecurityQuestionsPanel extends DirectoryPanel< protected List<IColumn<SecurityQuestionTO, String>> getColumns() { List<IColumn<SecurityQuestionTO, String>> columns = new ArrayList<>(); - columns.add(new KeyPropertyColumn<SecurityQuestionTO>( + columns.add(new KeyPropertyColumn<>( new StringResourceModel("key", this), "key")); - columns.add(new PropertyColumn<SecurityQuestionTO, String>( + columns.add(new PropertyColumn<>( new StringResourceModel("content", this), "content", "content")); return columns; http://git-wip-us.apache.org/repos/asf/syncope/blob/5be24a03/client/console/src/main/java/org/apache/syncope/client/console/panels/TypeExtensionDirectoryPanel.java ---------------------------------------------------------------------- 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 a5a0a66..818ef7d 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 @@ -24,6 +24,7 @@ import java.util.Collection; import java.util.Collections; import java.util.Iterator; import java.util.List; +import java.util.Optional; import org.apache.commons.lang3.StringUtils; import org.apache.syncope.client.console.SyncopeConsoleSession; import org.apache.syncope.client.console.commons.Constants; @@ -125,9 +126,9 @@ public class TypeExtensionDirectoryPanel protected List<IColumn<TypeExtensionTO, String>> getColumns() { List<IColumn<TypeExtensionTO, String>> columns = new ArrayList<>(); - columns.add(new PropertyColumn<TypeExtensionTO, String>( + columns.add(new PropertyColumn<>( Model.of("Any Type"), "anyType", "anyType")); - columns.add(new PropertyColumn<TypeExtensionTO, String>( + columns.add(new PropertyColumn<>( new StringResourceModel("auxClasses", this), "auxClasses", "auxClasses")); return columns; @@ -154,9 +155,11 @@ public class TypeExtensionDirectoryPanel @Override public void onClick(final AjaxRequestTarget target, final TypeExtensionTO ignore) { - groupTO.getTypeExtensions().remove( - groupTO.getTypeExtension(typeExtension.getAnyType())); - target.add(container); + Optional<TypeExtensionTO> typeExt = groupTO.getTypeExtension(typeExtension.getAnyType()); + if (typeExt.isPresent()) { + groupTO.getTypeExtensions().remove(typeExt.get()); + target.add(container); + } } }, ActionLink.ActionType.DELETE, StringUtils.EMPTY, true); return panel; http://git-wip-us.apache.org/repos/asf/syncope/blob/5be24a03/client/console/src/main/java/org/apache/syncope/client/console/panels/WorkflowDirectoryPanel.java ---------------------------------------------------------------------- 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 2217da0..1a0e26a 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 @@ -154,9 +154,9 @@ public class WorkflowDirectoryPanel extends DirectoryPanel< protected List<IColumn<WorkflowDefinitionTO, String>> getColumns() { List<IColumn<WorkflowDefinitionTO, String>> columns = new ArrayList<>(); - columns.add(new KeyPropertyColumn<WorkflowDefinitionTO>(new ResourceModel("key"), "key")); - columns.add(new PropertyColumn<WorkflowDefinitionTO, String>(new ResourceModel("name"), "name", "name")); - columns.add(new BooleanPropertyColumn<WorkflowDefinitionTO>(new ResourceModel("main"), null, "main")); + columns.add(new KeyPropertyColumn<>(new ResourceModel("key"), "key")); + columns.add(new PropertyColumn<>(new ResourceModel("name"), "name", "name")); + columns.add(new BooleanPropertyColumn<>(new ResourceModel("main"), null, "main")); return columns; } http://git-wip-us.apache.org/repos/asf/syncope/blob/5be24a03/client/console/src/main/java/org/apache/syncope/client/console/policies/AccountPolicyDirectoryPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/policies/AccountPolicyDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/policies/AccountPolicyDirectoryPanel.java index 5b0f2f1..a2535d9 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/policies/AccountPolicyDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/policies/AccountPolicyDirectoryPanel.java @@ -53,13 +53,13 @@ public class AccountPolicyDirectoryPanel extends PolicyDirectoryPanel<AccountPol @Override protected void addCustomColumnFields(final List<IColumn<AccountPolicyTO, String>> columns) { - columns.add(new CollectionPropertyColumn<AccountPolicyTO>(new StringResourceModel( + columns.add(new CollectionPropertyColumn<>(new StringResourceModel( "passthroughResources", this), "passthroughResources")); - columns.add(new PropertyColumn<AccountPolicyTO, String>(new StringResourceModel( + columns.add(new PropertyColumn<>(new StringResourceModel( "maxAuthenticationAttempts", this), "maxAuthenticationAttempts", "maxAuthenticationAttempts")); - columns.add(new BooleanPropertyColumn<AccountPolicyTO>(new StringResourceModel( + columns.add(new BooleanPropertyColumn<>(new StringResourceModel( "propagateSuspension", this), "propagateSuspension", "propagateSuspension")); } http://git-wip-us.apache.org/repos/asf/syncope/blob/5be24a03/client/console/src/main/java/org/apache/syncope/client/console/policies/PasswordPolicyDirectoryPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/policies/PasswordPolicyDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/policies/PasswordPolicyDirectoryPanel.java index 59fe831..8e3663d 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/policies/PasswordPolicyDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/policies/PasswordPolicyDirectoryPanel.java @@ -53,10 +53,10 @@ public class PasswordPolicyDirectoryPanel extends PolicyDirectoryPanel<PasswordP @Override protected void addCustomColumnFields(final List<IColumn<PasswordPolicyTO, String>> columns) { - columns.add(new PropertyColumn<PasswordPolicyTO, String>(new StringResourceModel( + columns.add(new PropertyColumn<>(new StringResourceModel( "historyLength", this), "historyLength", "historyLength")); - columns.add(new BooleanPropertyColumn<PasswordPolicyTO>(new StringResourceModel( + columns.add(new BooleanPropertyColumn<>(new StringResourceModel( "allowNullPassword", this), "allowNullPassword", "allowNullPassword")); } http://git-wip-us.apache.org/repos/asf/syncope/blob/5be24a03/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyDirectoryPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyDirectoryPanel.java index 166b9e2..22fccf7 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyDirectoryPanel.java @@ -109,7 +109,7 @@ public abstract class PolicyDirectoryPanel<T extends AbstractPolicyTO> setFooterVisibility(true); modal.addSubmitButton(); modal.size(Modal.Size.Large); - + disableCheckBoxes(); } @@ -117,13 +117,13 @@ public abstract class PolicyDirectoryPanel<T extends AbstractPolicyTO> protected List<IColumn<T, String>> getColumns() { final List<IColumn<T, String>> columns = new ArrayList<>(); - columns.add(new KeyPropertyColumn<T>( + columns.add(new KeyPropertyColumn<>( new StringResourceModel("key", this), "key")); - columns.add(new PropertyColumn<T, String>( + columns.add(new PropertyColumn<>( new StringResourceModel("description", this), "description", "description")); - columns.add(new CollectionPropertyColumn<T>( + columns.add(new CollectionPropertyColumn<>( new StringResourceModel("usedByResources", this), "usedByResources")); - columns.add(new CollectionPropertyColumn<T>( + columns.add(new CollectionPropertyColumn<>( new StringResourceModel("usedByRealms", this), "usedByRealms")); addCustomColumnFields(columns); http://git-wip-us.apache.org/repos/asf/syncope/blob/5be24a03/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportDirectoryPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportDirectoryPanel.java index 01f77db..4d1c1c2 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportDirectoryPanel.java @@ -84,27 +84,25 @@ public abstract class ReportDirectoryPanel protected List<IColumn<ReportTO, String>> getColumns() { final List<IColumn<ReportTO, String>> columns = new ArrayList<>(); - columns.add(new KeyPropertyColumn<ReportTO>(new StringResourceModel( - "key", this), "key")); - columns.add(new PropertyColumn<ReportTO, String>(new StringResourceModel( - "name", this), "name", "name")); + columns.add(new KeyPropertyColumn<>(new StringResourceModel("key", this), "key")); + columns.add(new PropertyColumn<>(new StringResourceModel("name", this), "name", "name")); - columns.add(new DatePropertyColumn<ReportTO>( + columns.add(new DatePropertyColumn<>( new StringResourceModel("lastExec", this), "lastExec", "lastExec")); - columns.add(new DatePropertyColumn<ReportTO>( + columns.add(new DatePropertyColumn<>( new StringResourceModel("nextExec", this), "nextExec", "nextExec")); - columns.add(new DatePropertyColumn<ReportTO>( + columns.add(new DatePropertyColumn<>( new StringResourceModel("start", this), "start", "start")); - columns.add(new DatePropertyColumn<ReportTO>( + columns.add(new DatePropertyColumn<>( new StringResourceModel("end", this), "end", "end")); - columns.add(new PropertyColumn<ReportTO, String>( + columns.add(new PropertyColumn<>( new StringResourceModel("latestExecStatus", this), "latestExecStatus", "latestExecStatus")); - columns.add(new BooleanPropertyColumn<ReportTO>( + columns.add(new BooleanPropertyColumn<>( new StringResourceModel("active", this), "active", "active")); return columns; http://git-wip-us.apache.org/repos/asf/syncope/blob/5be24a03/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel.java ---------------------------------------------------------------------- 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 2d3c2c6..6aa57d3 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 @@ -112,7 +112,7 @@ public class ReportTemplateDirectoryPanel @Override protected List<IColumn<ReportTemplateTO, String>> getColumns() { List<IColumn<ReportTemplateTO, String>> columns = new ArrayList<>(); - columns.add(new PropertyColumn<ReportTemplateTO, String>(new StringResourceModel("key", this), "key", "key")); + columns.add(new PropertyColumn<>(new StringResourceModel("key", this), "key", "key")); return columns; } http://git-wip-us.apache.org/repos/asf/syncope/blob/5be24a03/client/console/src/main/java/org/apache/syncope/client/console/status/AnyStatusDirectoryPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/status/AnyStatusDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/status/AnyStatusDirectoryPanel.java index c5a90e8..124a3c4 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/status/AnyStatusDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/status/AnyStatusDirectoryPanel.java @@ -43,7 +43,6 @@ import org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.Bas import org.apache.syncope.client.console.wicket.markup.html.form.ActionLink; import org.apache.syncope.client.console.wicket.markup.html.form.ActionsPanel; import org.apache.syncope.common.lib.to.AnyTO; -import org.apache.syncope.common.lib.to.ResourceTO; import org.apache.syncope.common.lib.to.GroupTO; import org.apache.syncope.common.lib.to.UserTO; import org.apache.syncope.common.lib.types.StandardEntitlement; @@ -137,7 +136,7 @@ public class AnyStatusDirectoryPanel } }); - columns.add(new PropertyColumn<StatusBean, String>( + columns.add(new PropertyColumn<>( new StringResourceModel("connObjectLink", this), "connObjectLink", "connObjectLink")); columns.add(new AbstractColumn<StatusBean, String>(new StringResourceModel("status", this)) { @@ -233,15 +232,15 @@ public class AnyStatusDirectoryPanel final AnyTO actual = restClient.read(anyTO.getKey()); final List<String> resources = new ArrayList<>(); - for (ResourceTO resourceTO : new ResourceRestClient().list()) { + new ResourceRestClient().list().forEach(resourceTO -> { resources.add(resourceTO.getKey()); - } + }); final List<ConnObjectWrapper> connObjects = statusUtils.getConnectorObjects(actual); final List<StatusBean> statusBeans = new ArrayList<>(connObjects.size() + 1); - for (ConnObjectWrapper entry : connObjects) { + connObjects.forEach(entry -> { final StatusBean statusBean = statusUtils.getStatusBean(actual, entry.getResourceName(), entry.getConnObjectTO(), @@ -249,7 +248,7 @@ public class AnyStatusDirectoryPanel statusBeans.add(statusBean); resources.remove(entry.getResourceName()); - } + }); if (statusOnly) { final StatusBean syncope = new StatusBean(actual, "Syncope"); @@ -268,15 +267,18 @@ public class AnyStatusDirectoryPanel statusBeans.add(syncope); } else { - for (String resource : resources) { - final StatusBean statusBean = statusUtils.getStatusBean(actual, - resource, - null, - actual instanceof GroupTO); - - statusBean.setLinked(false); - statusBeans.add(statusBean); - } + resources.stream(). + map(resource -> statusUtils.getStatusBean(actual, + resource, + null, + actual instanceof GroupTO)). + map(statusBean -> { + statusBean.setLinked(false); + return statusBean; + }). + forEachOrdered(statusBean -> { + statusBeans.add(statusBean); + }); } return statusBeans; http://git-wip-us.apache.org/repos/asf/syncope/blob/5be24a03/client/console/src/main/java/org/apache/syncope/client/console/status/ChangePasswordModal.java ---------------------------------------------------------------------- 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 336f4d1..43d9282 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 @@ -63,7 +63,7 @@ public class ChangePasswordModal extends AbstractModalPanel<AnyWrapper<UserTO>> passwordPanel.setOutputMarkupId(true); add(passwordPanel); - statusModel = new ListModel<>(new ArrayList<StatusBean>()); + statusModel = new ListModel<>(new ArrayList<>()); StatusPanel statusPanel = new StatusPanel("status", wrapper.getInnerObject(), statusModel, pageReference); statusPanel.setCheckAvailability(ListViewPanel.CheckAvailability.AVAILABLE); add(statusPanel.setRenderBodyOnly(true)); @@ -77,7 +77,7 @@ public class ChangePasswordModal extends AbstractModalPanel<AnyWrapper<UserTO>> if (StringUtils.isBlank(inner.getPassword()) || statusModel.getObject().isEmpty()) { SyncopeConsoleSession.get().error(getString(Constants.OPERATION_ERROR)); } else { - final List<String> resources = new ArrayList<String>(); + final List<String> resources = new ArrayList<>(); boolean isOnSyncope = false; for (StatusBean sb : statusModel.getObject()) { if (sb.getResource().equals(Constants.SYNCOPE)) { http://git-wip-us.apache.org/repos/asf/syncope/blob/5be24a03/client/console/src/main/java/org/apache/syncope/client/console/status/ResourceStatusDirectoryPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/status/ResourceStatusDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/status/ResourceStatusDirectoryPanel.java index 041305e..3d50d63 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/status/ResourceStatusDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/status/ResourceStatusDirectoryPanel.java @@ -89,10 +89,10 @@ public class ResourceStatusDirectoryPanel protected List<IColumn<StatusBean, String>> getColumns() { final List<IColumn<StatusBean, String>> columns = new ArrayList<>(); - columns.add(new PropertyColumn<StatusBean, String>( + columns.add(new PropertyColumn<>( new StringResourceModel("key", this), "key", "key")); - columns.add(new PropertyColumn<StatusBean, String>( + columns.add(new PropertyColumn<>( new StringResourceModel("connObjectLink", this), "connObjectLink", "connObjectLink")); columns.add(new AbstractColumn<StatusBean, String>(new StringResourceModel("status", this)) { http://git-wip-us.apache.org/repos/asf/syncope/blob/5be24a03/client/console/src/main/java/org/apache/syncope/client/console/tasks/CrontabPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/CrontabPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/CrontabPanel.java index 34b005c..a44b6de 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/CrontabPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/CrontabPanel.java @@ -62,8 +62,8 @@ public class CrontabPanel extends Panel { new SelectOption(getString("selOpt6"), "0 0 0 ? * 2") }; - final AjaxDropDownChoicePanel<SelectOption> cronTemplateChooser = new AjaxDropDownChoicePanel<SelectOption>( - "cronTemplateChooser", "cronTemplateChooser", new Model<SelectOption>()); + final AjaxDropDownChoicePanel<SelectOption> cronTemplateChooser = new AjaxDropDownChoicePanel<>( + "cronTemplateChooser", "cronTemplateChooser", new Model<>()); cronTemplateChooser.setNullValid(false); cronTemplateChooser.setPlaceholder("chooseForTemplate"); @@ -97,7 +97,7 @@ public class CrontabPanel extends Panel { } }); cronTemplateChooser.setChoices(Arrays.asList(cronTemplates)); - cronTemplateChooser.setChoiceRenderer(new SelectChoiceRenderer<SelectOption>()); + cronTemplateChooser.setChoiceRenderer(new SelectChoiceRenderer<>()); add(cronTemplateChooser); seconds = new AjaxTextFieldPanel("seconds", "seconds", new Model<>(getCronField(cronExpression, 0))); http://git-wip-us.apache.org/repos/asf/syncope/blob/5be24a03/client/console/src/main/java/org/apache/syncope/client/console/tasks/ExecutionsDirectoryPanel.java ---------------------------------------------------------------------- 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 3642529..3e26514 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 @@ -97,13 +97,13 @@ public abstract class ExecutionsDirectoryPanel protected List<IColumn<ExecTO, String>> getColumns() { final List<IColumn<ExecTO, String>> columns = new ArrayList<>(); - columns.add(new KeyPropertyColumn<ExecTO>(new StringResourceModel("key", this), "key", "key")); + columns.add(new KeyPropertyColumn<>(new StringResourceModel("key", this), "key", "key")); - columns.add(new DatePropertyColumn<ExecTO>(new StringResourceModel("start", this), "start", "start")); + columns.add(new DatePropertyColumn<>(new StringResourceModel("start", this), "start", "start")); - columns.add(new DatePropertyColumn<ExecTO>(new StringResourceModel("end", this), "end", "end")); + columns.add(new DatePropertyColumn<>(new StringResourceModel("end", this), "end", "end")); - columns.add(new PropertyColumn<ExecTO, String>(new StringResourceModel("status", this), "status", "status")); + columns.add(new PropertyColumn<>(new StringResourceModel("status", this), "status", "status")); return columns; } http://git-wip-us.apache.org/repos/asf/syncope/blob/5be24a03/client/console/src/main/java/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel.java index eb859a6..fd73ab0 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel.java @@ -80,25 +80,25 @@ public abstract class NotificationTaskDirectoryPanel protected List<IColumn<NotificationTaskTO, String>> getColumns() { final List<IColumn<NotificationTaskTO, String>> columns = new ArrayList<>(); - columns.add(new KeyPropertyColumn<NotificationTaskTO>( + columns.add(new KeyPropertyColumn<>( new StringResourceModel("key", this), "key")); - columns.add(new PropertyColumn<NotificationTaskTO, String>( + columns.add(new PropertyColumn<>( new StringResourceModel("sender", this), "sender", "sender")); - columns.add(new PropertyColumn<NotificationTaskTO, String>( + columns.add(new PropertyColumn<>( new StringResourceModel("subject", this), "subject", "subject")); - columns.add(new CollectionPropertyColumn<NotificationTaskTO>( + columns.add(new CollectionPropertyColumn<>( new StringResourceModel("recipients", this), "recipients")); - columns.add(new DatePropertyColumn<NotificationTaskTO>( + columns.add(new DatePropertyColumn<>( new StringResourceModel("start", this), "start", "start")); - columns.add(new DatePropertyColumn<NotificationTaskTO>( + columns.add(new DatePropertyColumn<>( new StringResourceModel("end", this), "end", "end")); - columns.add(new PropertyColumn<NotificationTaskTO, String>( + columns.add(new PropertyColumn<>( new StringResourceModel("latestExecStatus", this), "latestExecStatus", "latestExecStatus")); return columns; } http://git-wip-us.apache.org/repos/asf/syncope/blob/5be24a03/client/console/src/main/java/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.java index 0db71d5..5d37b79 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.java @@ -70,14 +70,14 @@ public abstract class PropagationTaskDirectoryPanel protected List<IColumn<PropagationTaskTO, String>> getColumns() { final List<IColumn<PropagationTaskTO, String>> columns = new ArrayList<>(); - columns.add(new KeyPropertyColumn<PropagationTaskTO>( + columns.add(new KeyPropertyColumn<>( new StringResourceModel("key", this), "key")); - columns.add(new PropertyColumn<PropagationTaskTO, String>( + columns.add(new PropertyColumn<>( new StringResourceModel("operation", this), "operation", "operation")); if (resource == null) { - columns.add(new PropertyColumn<PropagationTaskTO, String>( + columns.add(new PropertyColumn<>( new StringResourceModel("resource", this), "resource", "resource")); } else { columns.add(new PropertyColumn<PropagationTaskTO, String>( @@ -96,19 +96,19 @@ public abstract class PropagationTaskDirectoryPanel }); } - columns.add(new PropertyColumn<PropagationTaskTO, String>( + columns.add(new PropertyColumn<>( new StringResourceModel("entityKey", this), "entityKey", "entityKey")); - columns.add(new PropertyColumn<PropagationTaskTO, String>( + columns.add(new PropertyColumn<>( new StringResourceModel("connObjectKey", this), "connObjectKey", "connObjectKey")); - columns.add(new DatePropertyColumn<PropagationTaskTO>( + columns.add(new DatePropertyColumn<>( new StringResourceModel("start", this), "start", "start")); - columns.add(new DatePropertyColumn<PropagationTaskTO>( + columns.add(new DatePropertyColumn<>( new StringResourceModel("end", this), "end", "end")); - columns.add(new PropertyColumn<PropagationTaskTO, String>( + columns.add(new PropertyColumn<>( new StringResourceModel("latestExecStatus", this), "latestExecStatus", "latestExecStatus")); return columns; } http://git-wip-us.apache.org/repos/asf/syncope/blob/5be24a03/client/console/src/main/java/org/apache/syncope/client/console/tasks/ProvisioningTaskDirectoryPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/ProvisioningTaskDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/ProvisioningTaskDirectoryPanel.java index 0fa0f7b..2ce9887 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/ProvisioningTaskDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/ProvisioningTaskDirectoryPanel.java @@ -72,33 +72,33 @@ public abstract class ProvisioningTaskDirectoryPanel<T extends AbstractProvision protected List<IColumn<T, String>> getFieldColumns() { List<IColumn<T, String>> columns = new ArrayList<>(); - columns.add(new KeyPropertyColumn<T>( + columns.add(new KeyPropertyColumn<>( new StringResourceModel("key", this), "key")); - columns.add(new PropertyColumn<T, String>( + columns.add(new PropertyColumn<>( new StringResourceModel("name", this), "name", "name")); - columns.add(new PropertyColumn<T, String>( + columns.add(new PropertyColumn<>( new StringResourceModel("description", this), "description", "description")); if (reference == PullTaskTO.class) { - columns.add(new PropertyColumn<T, String>( + columns.add(new PropertyColumn<>( new StringResourceModel("destinationRealm", this), "destinationRealm", "destinationRealm")); } else if (reference == PushTaskTO.class) { - columns.add(new PropertyColumn<T, String>( + columns.add(new PropertyColumn<>( new StringResourceModel("sourceRealm", this), "sourceRealm", "sourceRealm")); } - columns.add(new DatePropertyColumn<T>( + columns.add(new DatePropertyColumn<>( new StringResourceModel("lastExec", this), "lastExec", "lastExec")); - columns.add(new DatePropertyColumn<T>( + columns.add(new DatePropertyColumn<>( new StringResourceModel("nextExec", this), "nextExec", "nextExec")); - columns.add(new PropertyColumn<T, String>( + columns.add(new PropertyColumn<>( new StringResourceModel("latestExecStatus", this), "latestExecStatus", "latestExecStatus")); - columns.add(new BooleanPropertyColumn<T>( + columns.add(new BooleanPropertyColumn<>( new StringResourceModel("active", this), "active", "active")); return columns; http://git-wip-us.apache.org/repos/asf/syncope/blob/5be24a03/client/console/src/main/java/org/apache/syncope/client/console/tasks/PushTaskFilters.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/PushTaskFilters.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/PushTaskFilters.java index af40248..5feba57 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/PushTaskFilters.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/PushTaskFilters.java @@ -23,7 +23,6 @@ import java.util.List; import org.apache.commons.lang3.StringUtils; import org.apache.syncope.client.console.panels.search.AnyObjectSearchPanel; import org.apache.syncope.client.console.panels.search.MapOfListModel; -import org.apache.syncope.client.console.panels.search.SearchClause; import org.apache.syncope.client.console.rest.AnyTypeRestClient; import org.apache.syncope.client.console.wicket.markup.html.bootstrap.tabs.Accordion; import org.apache.syncope.common.lib.to.AnyTypeTO; @@ -70,7 +69,7 @@ public class PushTaskFilters extends WizardStep { @Override public Panel getPanel(final String panelId) { return new AnyObjectSearchPanel.Builder( - key, new MapOfListModel<SearchClause>(pushTaskWrapper, "filterClauses", key)). + key, new MapOfListModel<>(pushTaskWrapper, "filterClauses", key)). required(false).build(panelId); } }), Model.of(StringUtils.isBlank(pushTaskWrapper.getFilters().get(key)) ? -1 : 0)) http://git-wip-us.apache.org/repos/asf/syncope/blob/5be24a03/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel.java index 7663235..ca540b6 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel.java @@ -129,10 +129,10 @@ public abstract class SchedTaskDirectoryPanel<T extends SchedTaskTO> protected List<IColumn<T, String>> getFieldColumns() { final List<IColumn<T, String>> columns = new ArrayList<>(); - columns.add(new KeyPropertyColumn<T>( + columns.add(new KeyPropertyColumn<>( new StringResourceModel("key", this), "key")); - columns.add(new PropertyColumn<T, String>( + columns.add(new PropertyColumn<>( new StringResourceModel("name", this), "name", "name")); columns.add(new PropertyColumn<T, String>(new StringResourceModel( @@ -158,16 +158,16 @@ public abstract class SchedTaskDirectoryPanel<T extends SchedTaskTO> }); - columns.add(new DatePropertyColumn<T>( + columns.add(new DatePropertyColumn<>( new StringResourceModel("lastExec", this), "lastExec", "lastExec")); - columns.add(new DatePropertyColumn<T>( + columns.add(new DatePropertyColumn<>( new StringResourceModel("nextExec", this), "nextExec", "nextExec")); - columns.add(new PropertyColumn<T, String>( + columns.add(new PropertyColumn<>( new StringResourceModel("latestExecStatus", this), "latestExecStatus", "latestExecStatus")); - columns.add(new BooleanPropertyColumn<T>( + columns.add(new BooleanPropertyColumn<>( new StringResourceModel("active", this), "active", "active")); return columns;
