This is an automated email from the ASF dual-hosted git repository. ilgrosso pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push: new f23abe8648 Upgrading Swagger UI f23abe8648 is described below commit f23abe8648efc30c21df752cf1a184747d96e64a Author: Francesco Chicchiriccò <ilgro...@apache.org> AuthorDate: Thu Mar 16 08:16:49 2023 +0100 Upgrading Swagger UI --- .../client/console/authprofiles/AuthProfileWizardBuilder.java | 2 +- .../clientapps/UsernameAttributeProviderModalPanelBuilder.java | 1 - .../syncope/client/console/policies/AccessPolicyModalPanel.java | 2 +- .../apache/syncope/client/console/wizards/AttrRepoWizardBuilder.java | 3 +-- .../syncope/client/console/wizards/AuthModuleWizardBuilder.java | 5 ++--- .../java/org/apache/syncope/client/console/panels/BeanPanel.java | 3 +-- .../syncope/client/console/policies/PolicyRuleWizardBuilder.java | 2 +- .../apache/syncope/client/console/reports/ReportWizardBuilder.java | 2 +- .../syncope/client/console/tasks/CommandComposeWizardBuilder.java | 2 +- .../apache/syncope/client/console/wizards/CommandWizardBuilder.java | 2 +- pom.xml | 2 +- 11 files changed, 11 insertions(+), 15 deletions(-) diff --git a/client/am/console/src/main/java/org/apache/syncope/client/console/authprofiles/AuthProfileWizardBuilder.java b/client/am/console/src/main/java/org/apache/syncope/client/console/authprofiles/AuthProfileWizardBuilder.java index 08475c4110..ae9bf98a3b 100644 --- a/client/am/console/src/main/java/org/apache/syncope/client/console/authprofiles/AuthProfileWizardBuilder.java +++ b/client/am/console/src/main/java/org/apache/syncope/client/console/authprofiles/AuthProfileWizardBuilder.java @@ -66,7 +66,7 @@ public abstract class AuthProfileWizardBuilder<T extends BaseBean> extends BaseA Step(final T modelObject) { model.setObject(modelObject); model.setInitialModelObject(modelObject); - add(new BeanPanel<>("bean", model, pageRef).setRenderBodyOnly(true)); + add(new BeanPanel<>("bean", model).setRenderBodyOnly(true)); } } } diff --git a/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/UsernameAttributeProviderModalPanelBuilder.java b/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/UsernameAttributeProviderModalPanelBuilder.java index c70d211529..e077d0bdc5 100644 --- a/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/UsernameAttributeProviderModalPanelBuilder.java +++ b/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/UsernameAttributeProviderModalPanelBuilder.java @@ -102,7 +102,6 @@ public class UsernameAttributeProviderModalPanelBuilder<T extends ClientAppTO> e BeanPanel<UsernameAttributeProviderConf> bean = new BeanPanel<>( "bean", beanPanelModel, - pageRef, Constants.NAME_FIELD_NAME, "reportlet"); add(bean.setRenderBodyOnly(false)); diff --git a/client/am/console/src/main/java/org/apache/syncope/client/console/policies/AccessPolicyModalPanel.java b/client/am/console/src/main/java/org/apache/syncope/client/console/policies/AccessPolicyModalPanel.java index abb8ec28f5..1be9541818 100644 --- a/client/am/console/src/main/java/org/apache/syncope/client/console/policies/AccessPolicyModalPanel.java +++ b/client/am/console/src/main/java/org/apache/syncope/client/console/policies/AccessPolicyModalPanel.java @@ -46,7 +46,7 @@ public class AccessPolicyModalPanel extends AbstractModalPanel<AccessPolicyTO> { super(modal, pageRef); this.model = model; - add(new BeanPanel<>("bean", new PropertyModel<>(model, "conf"), pageRef).setRenderBodyOnly(true)); + add(new BeanPanel<>("bean", new PropertyModel<>(model, "conf")).setRenderBodyOnly(true)); } @Override diff --git a/client/am/console/src/main/java/org/apache/syncope/client/console/wizards/AttrRepoWizardBuilder.java b/client/am/console/src/main/java/org/apache/syncope/client/console/wizards/AttrRepoWizardBuilder.java index 784b04d5db..1423d08680 100644 --- a/client/am/console/src/main/java/org/apache/syncope/client/console/wizards/AttrRepoWizardBuilder.java +++ b/client/am/console/src/main/java/org/apache/syncope/client/console/wizards/AttrRepoWizardBuilder.java @@ -53,7 +53,6 @@ public class AttrRepoWizardBuilder extends BaseAjaxWizardBuilder<AttrRepoTO> { protected Model<Class<? extends AttrRepoConf>> attrRepoConfClass = Model.of(); public AttrRepoWizardBuilder(final AttrRepoTO defaultItem, final PageReference pageRef) { - super(defaultItem, pageRef); attrRepoConfs = new LoadableDetachableModel<>() { @@ -160,7 +159,7 @@ public class AttrRepoWizardBuilder extends BaseAjaxWizardBuilder<AttrRepoTO> { private static final long serialVersionUID = -785981096328637758L; Configuration(final AttrRepoTO attrRepo) { - add(new BeanPanel<>("bean", new PropertyModel<>(attrRepo, "conf"), pageRef).setRenderBodyOnly(true)); + add(new BeanPanel<>("bean", new PropertyModel<>(attrRepo, "conf")).setRenderBodyOnly(true)); } } diff --git a/client/am/console/src/main/java/org/apache/syncope/client/console/wizards/AuthModuleWizardBuilder.java b/client/am/console/src/main/java/org/apache/syncope/client/console/wizards/AuthModuleWizardBuilder.java index b07475b0a4..ca48c4d3bc 100644 --- a/client/am/console/src/main/java/org/apache/syncope/client/console/wizards/AuthModuleWizardBuilder.java +++ b/client/am/console/src/main/java/org/apache/syncope/client/console/wizards/AuthModuleWizardBuilder.java @@ -162,8 +162,7 @@ public class AuthModuleWizardBuilder extends BaseAjaxWizardBuilder<AuthModuleTO> private static final long serialVersionUID = -785981096328637758L; Configuration(final AuthModuleTO authModule) { - add(new BeanPanel<>( - "bean", new PropertyModel<>(authModule, "conf"), pageRef, "ldap").setRenderBodyOnly(true)); + add(new BeanPanel<>("bean", new PropertyModel<>(authModule, "conf"), "ldap").setRenderBodyOnly(true)); } } @@ -211,7 +210,7 @@ public class AuthModuleWizardBuilder extends BaseAjaxWizardBuilder<AuthModuleTO> }); add(enable); - add(new BeanPanel<>("bean", beanPanelModel, pageRef).setRenderBodyOnly(true)); + add(new BeanPanel<>("bean", beanPanelModel).setRenderBodyOnly(true)); setOutputMarkupId(true); } diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/BeanPanel.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/BeanPanel.java index bdbb57d963..d15cfa0649 100644 --- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/BeanPanel.java +++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/panels/BeanPanel.java @@ -50,7 +50,6 @@ import org.apache.syncope.client.ui.commons.markup.html.form.AjaxTextFieldPanel; import org.apache.syncope.client.ui.commons.markup.html.form.FieldPanel; import org.apache.syncope.common.lib.to.SchemaTO; import org.apache.syncope.common.lib.types.SchemaType; -import org.apache.wicket.PageReference; import org.apache.wicket.core.util.lang.PropertyResolver; import org.apache.wicket.core.util.lang.PropertyResolverConverter; import org.apache.wicket.markup.html.basic.Label; @@ -77,7 +76,7 @@ public class BeanPanel<T extends Serializable> extends Panel { private final List<String> excluded; - public BeanPanel(final String id, final IModel<T> bean, final PageReference pageRef, final String... excluded) { + public BeanPanel(final String id, final IModel<T> bean, final String... excluded) { super(id, bean); setOutputMarkupId(true); diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/policies/PolicyRuleWizardBuilder.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/policies/PolicyRuleWizardBuilder.java index b4fa3e11c5..91420306ad 100644 --- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/policies/PolicyRuleWizardBuilder.java +++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/policies/PolicyRuleWizardBuilder.java @@ -183,7 +183,7 @@ public class PolicyRuleWizardBuilder extends BaseAjaxWizardBuilder<PolicyRuleWra return rule.getConf(); } }; - add(new BeanPanel<>("bean", bean, pageRef).setRenderBodyOnly(true)); + add(new BeanPanel<>("bean", bean).setRenderBodyOnly(true)); } } } diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/reports/ReportWizardBuilder.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/reports/ReportWizardBuilder.java index 5d20aa83e4..b0e5e86798 100644 --- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/reports/ReportWizardBuilder.java +++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/reports/ReportWizardBuilder.java @@ -185,7 +185,7 @@ public class ReportWizardBuilder extends BaseAjaxWizardBuilder<ReportTO> { private static final long serialVersionUID = -785981096328637758L; public Configuration() { - add(new BeanPanel<>("bean", conf, pageRef).setRenderBodyOnly(true)); + add(new BeanPanel<>("bean", conf).setRenderBodyOnly(true)); } @Override diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/tasks/CommandComposeWizardBuilder.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/tasks/CommandComposeWizardBuilder.java index 93a24e40f9..da1e927685 100644 --- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/tasks/CommandComposeWizardBuilder.java +++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/tasks/CommandComposeWizardBuilder.java @@ -155,7 +155,7 @@ public class CommandComposeWizardBuilder extends BaseAjaxWizardBuilder<CommandWr return command.getCommand().getArgs(); } }; - add(new BeanPanel<>("bean", bean, pageRef).setRenderBodyOnly(true)); + add(new BeanPanel<>("bean", bean).setRenderBodyOnly(true)); } } } diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/CommandWizardBuilder.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/CommandWizardBuilder.java index cd27db62e6..15fc94d243 100644 --- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/CommandWizardBuilder.java +++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/CommandWizardBuilder.java @@ -60,7 +60,7 @@ public class CommandWizardBuilder extends BaseAjaxWizardBuilder<CommandTO> { return command.getArgs(); } }; - add(new BeanPanel<>("bean", bean, pageRef).setRenderBodyOnly(true)); + add(new BeanPanel<>("bean", bean).setRenderBodyOnly(true)); } } } diff --git a/pom.xml b/pom.xml index b383263f1d..41f2190208 100644 --- a/pom.xml +++ b/pom.xml @@ -445,7 +445,7 @@ under the License. <h2.version>2.1.214</h2.version> <swagger-core.version>2.2.8</swagger-core.version> - <swagger-ui.version>4.17.1</swagger-ui.version> + <swagger-ui.version>4.18.1</swagger-ui.version> <jquery-slimscroll.version>1.3.8</jquery-slimscroll.version> <jquery-cookie.version>1.4.1-1</jquery-cookie.version>