This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 3_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/3_0_X by this push:
new 62d1a5774c Missing REST clients as Spring beans
62d1a5774c is described below
commit 62d1a5774c8abc28f4b516bd6d7339ac9e112037
Author: Francesco Chicchiriccò <[email protected]>
AuthorDate: Fri Jun 9 13:00:33 2023 +0200
Missing REST clients as Spring beans
---
.../console/clientapps/CASSPDirectoryPanel.java | 11 +++++++--
.../clientapps/ClientAppDirectoryPanel.java | 14 ++++++++++-
.../clientapps/ClientAppModalPanelBuilder.java | 27 +++++++++++++---------
.../console/clientapps/OIDCRPDirectoryPanel.java | 11 +++++++--
.../console/clientapps/SAML2SPDirectoryPanel.java | 11 +++++++--
...UsernameAttributeProviderModalPanelBuilder.java | 13 +++++++----
6 files changed, 64 insertions(+), 23 deletions(-)
diff --git
a/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/CASSPDirectoryPanel.java
b/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/CASSPDirectoryPanel.java
index 1b924dc3a0..64d4900d19 100644
---
a/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/CASSPDirectoryPanel.java
+++
b/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/CASSPDirectoryPanel.java
@@ -38,8 +38,15 @@ public class CASSPDirectoryPanel extends
ClientAppDirectoryPanel<CASSPClientAppT
CASSPClientAppTO defaultItem = new CASSPClientAppTO();
- this.addNewItemPanelBuilder(
- new ClientAppModalPanelBuilder<>(ClientAppType.CASSP,
defaultItem, modal, pageRef), true);
+ addNewItemPanelBuilder(new ClientAppModalPanelBuilder<>(
+ ClientAppType.CASSP,
+ defaultItem,
+ modal,
+ policyRestClient,
+ clientAppRestClient,
+ realmRestClient,
+ pageRef),
+ true);
MetaDataRoleAuthorizationStrategy.authorize(addAjaxLink, RENDER,
AMEntitlement.CLIENTAPP_CREATE);
initResultTable();
diff --git
a/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel.java
b/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel.java
index c424d5ae77..bb275b8e0c 100644
---
a/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel.java
+++
b/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel.java
@@ -34,6 +34,8 @@ import
org.apache.syncope.client.console.panels.DirectoryPanel;
import org.apache.syncope.client.console.panels.ModalDirectoryPanel;
import org.apache.syncope.client.console.rest.AuditRestClient;
import org.apache.syncope.client.console.rest.ClientAppRestClient;
+import org.apache.syncope.client.console.rest.PolicyRestClient;
+import org.apache.syncope.client.console.rest.RealmRestClient;
import
org.apache.syncope.client.console.wicket.extensions.markup.html.repeater.data.table.KeyPropertyColumn;
import
org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal;
import org.apache.syncope.client.console.wicket.markup.html.form.ActionLink;
@@ -66,6 +68,15 @@ public abstract class ClientAppDirectoryPanel<T extends
ClientAppTO>
private static final long serialVersionUID = 4100100988730985059L;
+ @SpringBean
+ protected PolicyRestClient policyRestClient;
+
+ @SpringBean
+ protected ClientAppRestClient clientAppRestClient;
+
+ @SpringBean
+ protected RealmRestClient realmRestClient;
+
@SpringBean
protected AuditRestClient auditRestClient;
@@ -157,7 +168,8 @@ public abstract class ClientAppDirectoryPanel<T extends
ClientAppTO>
public void onClick(final AjaxRequestTarget target, final
ClientAppTO ignore) {
model.setObject(restClient.read(type,
model.getObject().getKey()));
modal.setContent(new
UsernameAttributeProviderModalPanelBuilder<>(
- type, model.getObject(), modal,
pageRef).build(actualId, 1, AjaxWizard.Mode.EDIT));
+ type, model.getObject(), modal, clientAppRestClient,
pageRef).
+ build(actualId, 1, AjaxWizard.Mode.EDIT));
modal.header(new
Model<>(getString("usernameAttributeProviderConf.title", model)));
modal.show(true);
target.add(modal);
diff --git
a/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/ClientAppModalPanelBuilder.java
b/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/ClientAppModalPanelBuilder.java
index bff2422c8d..4e15aaec1c 100644
---
a/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/ClientAppModalPanelBuilder.java
+++
b/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/ClientAppModalPanelBuilder.java
@@ -73,22 +73,12 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
import org.apache.wicket.model.util.ListModel;
-import org.apache.wicket.spring.injection.annot.SpringBean;
import org.apache.wicket.validation.validator.UrlValidator;
public class ClientAppModalPanelBuilder<T extends ClientAppTO> extends
AbstractModalPanelBuilder<T> {
private static final long serialVersionUID = 5945391813567245081L;
- @SpringBean
- protected PolicyRestClient policyRestClient;
-
- @SpringBean
- protected ClientAppRestClient clientAppRestClient;
-
- @SpringBean
- protected RealmRestClient realmRestClient;
-
protected final IModel<Map<String, String>> accessPolicies = new
LoadableDetachableModel<>() {
private static final long serialVersionUID = -2012833443695917883L;
@@ -137,12 +127,27 @@ public class ClientAppModalPanelBuilder<T extends
ClientAppTO> extends AbstractM
protected final ClientAppType type;
+ protected final PolicyRestClient policyRestClient;
+
+ protected final ClientAppRestClient clientAppRestClient;
+
+ protected final RealmRestClient realmRestClient;
+
public ClientAppModalPanelBuilder(
- final ClientAppType type, final T defaultItem, final BaseModal<T>
modal, final PageReference pageRef) {
+ final ClientAppType type,
+ final T defaultItem,
+ final BaseModal<T> modal,
+ final PolicyRestClient policyRestClient,
+ final ClientAppRestClient clientAppRestClient,
+ final RealmRestClient realmRestClient,
+ final PageReference pageRef) {
super(defaultItem, pageRef);
this.type = type;
this.modal = modal;
+ this.policyRestClient = policyRestClient;
+ this.clientAppRestClient = clientAppRestClient;
+ this.realmRestClient = realmRestClient;
}
@Override
diff --git
a/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/OIDCRPDirectoryPanel.java
b/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/OIDCRPDirectoryPanel.java
index 871e4021e1..14c20ddfb8 100644
---
a/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/OIDCRPDirectoryPanel.java
+++
b/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/OIDCRPDirectoryPanel.java
@@ -41,8 +41,15 @@ public class OIDCRPDirectoryPanel extends
ClientAppDirectoryPanel<OIDCRPClientAp
OIDCRPClientAppTO defaultItem = new OIDCRPClientAppTO();
- this.addNewItemPanelBuilder(
- new ClientAppModalPanelBuilder<>(ClientAppType.OIDCRP,
defaultItem, modal, pageRef), true);
+ addNewItemPanelBuilder(new ClientAppModalPanelBuilder<>(
+ ClientAppType.OIDCRP,
+ defaultItem,
+ modal,
+ policyRestClient,
+ clientAppRestClient,
+ realmRestClient,
+ pageRef),
+ true);
MetaDataRoleAuthorizationStrategy.authorize(addAjaxLink, RENDER,
AMEntitlement.CLIENTAPP_CREATE);
initResultTable();
diff --git
a/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/SAML2SPDirectoryPanel.java
b/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/SAML2SPDirectoryPanel.java
index 5d4c03c36d..6b2b2be34f 100644
---
a/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/SAML2SPDirectoryPanel.java
+++
b/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/SAML2SPDirectoryPanel.java
@@ -39,8 +39,15 @@ public class SAML2SPDirectoryPanel extends
ClientAppDirectoryPanel<SAML2SPClient
SAML2SPClientAppTO defaultItem = new SAML2SPClientAppTO();
- this.addNewItemPanelBuilder(
- new ClientAppModalPanelBuilder<>(ClientAppType.SAML2SP,
defaultItem, modal, pageRef), true);
+ addNewItemPanelBuilder(new ClientAppModalPanelBuilder<>(
+ ClientAppType.SAML2SP,
+ defaultItem,
+ modal,
+ policyRestClient,
+ clientAppRestClient,
+ realmRestClient,
+ pageRef),
+ true);
MetaDataRoleAuthorizationStrategy.authorize(addAjaxLink, RENDER,
AMEntitlement.CLIENTAPP_CREATE);
initResultTable();
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 78ec9f623e..9b2b4fe28f 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
@@ -42,16 +42,12 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
-import org.apache.wicket.spring.injection.annot.SpringBean;
import org.springframework.util.ClassUtils;
public class UsernameAttributeProviderModalPanelBuilder<T extends ClientAppTO>
extends AbstractModalPanelBuilder<T> {
private static final long serialVersionUID = -4106998301911573852L;
- @SpringBean
- protected ClientAppRestClient clientAppRestClient;
-
protected final LoadableDetachableModel<List<String>>
usernameAttributeProviderConfs =
new LoadableDetachableModel<>() {
@@ -68,12 +64,19 @@ public class UsernameAttributeProviderModalPanelBuilder<T
extends ClientAppTO> e
protected final ClientAppType type;
+ protected final ClientAppRestClient clientAppRestClient;
+
public UsernameAttributeProviderModalPanelBuilder(
- final ClientAppType type, final T defaultItem, final BaseModal<T>
modal, final PageReference pageRef) {
+ final ClientAppType type,
+ final T defaultItem,
+ final BaseModal<T> modal,
+ final ClientAppRestClient clientAppRestClient,
+ final PageReference pageRef) {
super(defaultItem, pageRef);
this.type = type;
this.modal = modal;
+ this.clientAppRestClient = clientAppRestClient;
}
@Override
