You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2020/01/29 17:24:29 UTC
[syncope] branch master updated: Passing AjaxWizard.Mode upwards to
make PlainAttrs and VirAttrs behave correctly as templates
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 5bba19c Passing AjaxWizard.Mode upwards to make PlainAttrs and VirAttrs behave correctly as templates
5bba19c is described below
commit 5bba19c8062202cf57fc38bef33936b15fe2b1a0
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Wed Jan 29 18:11:47 2020 +0100
Passing AjaxWizard.Mode upwards to make PlainAttrs and VirAttrs behave correctly as templates
---
.../syncope/client/console/wizards/any/AbstractAttrs.java | 3 ++-
.../syncope/client/console/wizards/any/DerAttrs.java | 2 +-
.../syncope/client/console/wizards/any/PlainAttrs.java | 12 ++++--------
.../console/wizards/any/UserTemplateWizardBuilder.java | 2 +-
.../syncope/client/console/wizards/any/VirAttrs.java | 2 +-
.../client/console/wizards/OIDCProviderWizardBuilder.java | 1 -
.../wizards/resources/OIDCProviderMappingPanel.java | 15 ++++++---------
.../client/console/wizards/SAML2IdPWizardBuilder.java | 2 --
.../console/wizards/resources/SAML2IdPMappingPanel.java | 15 ++++++---------
9 files changed, 21 insertions(+), 33 deletions(-)
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrs.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrs.java
index fcf7672..a326681 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrs.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrs.java
@@ -52,10 +52,11 @@ public abstract class AbstractAttrs<S extends SchemaTO> extends AbstractAttrsWiz
public AbstractAttrs(
final AnyWrapper<?> modelObject,
+ final AjaxWizard.Mode mode,
final List<String> anyTypeClasses,
final List<String> whichAttrs) {
- super(modelObject.getInnerObject(), AjaxWizard.Mode.CREATE, anyTypeClasses, whichAttrs, null);
+ super(modelObject.getInnerObject(), mode, anyTypeClasses, whichAttrs, null);
this.memberships = new ListModel<>(Collections.<MembershipTO>emptyList());
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/DerAttrs.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/DerAttrs.java
index 7b7b3d6..9f65714 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/DerAttrs.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/DerAttrs.java
@@ -58,7 +58,7 @@ public class DerAttrs extends AbstractAttrs<DerSchemaTO> {
final List<String> anyTypeClasses,
final List<String> whichDerAttrs) {
- super(modelObject, anyTypeClasses, whichDerAttrs);
+ super(modelObject, AjaxWizard.Mode.CREATE, anyTypeClasses, whichDerAttrs);
setTitleModel(new ResourceModel("attributes.derived"));
add(new Accordion("derSchemas", Collections.<ITab>singletonList(new AbstractTab(
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/PlainAttrs.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/PlainAttrs.java
index d77e25c..127923d 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/PlainAttrs.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/PlainAttrs.java
@@ -18,7 +18,6 @@
*/
package org.apache.syncope.client.console.wizards.any;
-import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
@@ -67,7 +66,7 @@ public class PlainAttrs extends AbstractAttrs<PlainSchemaTO> {
final List<String> anyTypeClasses,
final List<String> whichPlainAttrs) throws IllegalArgumentException {
- super(modelObject, anyTypeClasses, whichPlainAttrs);
+ super(modelObject, mode, anyTypeClasses, whichPlainAttrs);
if (modelObject.getInnerObject() instanceof UserTO) {
fileKey = UserTO.class.cast(modelObject.getInnerObject()).getUsername();
@@ -228,10 +227,8 @@ public class PlainAttrs extends AbstractAttrs<PlainSchemaTO> {
super(id, schemas, attributableTO);
- add(new ListView<Attr>("schemas",
- new ListModel<Attr>(new ArrayList<Attr>(
- attributableTO.getObject().getPlainAttrs().stream().sorted(attrComparator).
- collect(Collectors.toList())))) {
+ add(new ListView<Attr>("schemas", new ListModel<Attr>(attributableTO.getObject().
+ getPlainAttrs().stream().sorted(attrComparator).collect(Collectors.toList()))) {
private static final long serialVersionUID = 5306618783986001008L;
@@ -241,8 +238,7 @@ public class PlainAttrs extends AbstractAttrs<PlainSchemaTO> {
Attr attrTO = item.getModelObject();
AbstractFieldPanel<?> panel = getFieldPanel(schemas.get(attrTO.getSchema()));
- if (mode == AjaxWizard.Mode.TEMPLATE
- || !schemas.get(attrTO.getSchema()).isMultivalue()) {
+ if (mode == AjaxWizard.Mode.TEMPLATE || !schemas.get(attrTO.getSchema()).isMultivalue()) {
FieldPanel.class.cast(panel).setNewModel(attributableTO.getObject(), attrTO.getSchema());
} else {
// SYNCOPE-1476 set form as multipart to properly manage membership attributes
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserTemplateWizardBuilder.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserTemplateWizardBuilder.java
index 4ce27b9..e88f9ff 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserTemplateWizardBuilder.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserTemplateWizardBuilder.java
@@ -50,7 +50,6 @@ public class UserTemplateWizardBuilder extends UserWizardBuilder implements Temp
} else {
setItem(new UserWrapper(template));
}
-
}
public UserTemplateWizardBuilder(
@@ -58,6 +57,7 @@ public class UserTemplateWizardBuilder extends UserWizardBuilder implements Temp
final List<String> anyTypeClasses,
final UserFormLayoutInfo formLayoutInfo,
final PageReference pageRef) {
+
super(anyTypeClasses, formLayoutInfo, pageRef);
this.templatable = templatable;
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/VirAttrs.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/VirAttrs.java
index ded7b5d..8f356d5 100644
--- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/VirAttrs.java
+++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/VirAttrs.java
@@ -67,7 +67,7 @@ public class VirAttrs extends AbstractAttrs<VirSchemaTO> {
final List<String> anyTypeClasses,
final List<String> whichVirAttrs) {
- super(modelObject, anyTypeClasses, whichVirAttrs);
+ super(modelObject, mode, anyTypeClasses, whichVirAttrs);
this.mode = mode;
this.modelObject = modelObject;
diff --git a/ext/oidcclient/client-console/src/main/java/org/apache/syncope/client/console/wizards/OIDCProviderWizardBuilder.java b/ext/oidcclient/client-console/src/main/java/org/apache/syncope/client/console/wizards/OIDCProviderWizardBuilder.java
index 0e5574e..ec9d4b8 100644
--- a/ext/oidcclient/client-console/src/main/java/org/apache/syncope/client/console/wizards/OIDCProviderWizardBuilder.java
+++ b/ext/oidcclient/client-console/src/main/java/org/apache/syncope/client/console/wizards/OIDCProviderWizardBuilder.java
@@ -190,7 +190,6 @@ public class OIDCProviderWizardBuilder extends AjaxWizardBuilder<OIDCProviderTO>
private static final long serialVersionUID = -7087008312629522790L;
public OPContinue(final OIDCProviderTO opTO) {
-
final WebMarkupContainer content = new WebMarkupContainer("content");
this.setOutputMarkupId(true);
content.setOutputMarkupId(true);
diff --git a/ext/oidcclient/client-console/src/main/java/org/apache/syncope/client/console/wizards/resources/OIDCProviderMappingPanel.java b/ext/oidcclient/client-console/src/main/java/org/apache/syncope/client/console/wizards/resources/OIDCProviderMappingPanel.java
index 8eca021..ebb33d1 100644
--- a/ext/oidcclient/client-console/src/main/java/org/apache/syncope/client/console/wizards/resources/OIDCProviderMappingPanel.java
+++ b/ext/oidcclient/client-console/src/main/java/org/apache/syncope/client/console/wizards/resources/OIDCProviderMappingPanel.java
@@ -25,7 +25,6 @@ import org.apache.syncope.client.console.init.ClassPathScanImplementationLookup;
import org.apache.syncope.client.console.rest.AnyTypeClassRestClient;
import org.apache.syncope.client.console.rest.AnyTypeRestClient;
import org.apache.syncope.client.ui.commons.markup.html.form.AjaxTextFieldPanel;
-import org.apache.syncope.common.lib.to.AnyTypeClassTO;
import org.apache.syncope.common.lib.to.ItemTO;
import org.apache.syncope.common.lib.to.OIDCProviderTO;
import org.apache.syncope.common.lib.types.AnyTypeKind;
@@ -90,16 +89,14 @@ public class OIDCProviderMappingPanel extends AbstractMappingPanel {
List<String> choices = new ArrayList<>(ClassPathScanImplementationLookup.USER_FIELD_NAMES);
- for (AnyTypeClassTO anyTypeClassTO : AnyTypeClassRestClient.list(
- AnyTypeRestClient.read(AnyTypeKind.USER.name()).getClasses())) {
-
- choices.addAll(anyTypeClassTO.getPlainSchemas());
- choices.addAll(anyTypeClassTO.getDerSchemas());
- choices.addAll(anyTypeClassTO.getVirSchemas());
- }
+ AnyTypeClassRestClient.list(AnyTypeRestClient.read(AnyTypeKind.USER.name()).getClasses()).
+ forEach(anyTypeClassTO -> {
+ choices.addAll(anyTypeClassTO.getPlainSchemas());
+ choices.addAll(anyTypeClassTO.getDerSchemas());
+ choices.addAll(anyTypeClassTO.getVirSchemas());
+ });
Collections.sort(choices);
toBeUpdated.setChoices(choices);
}
-
}
diff --git a/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/wizards/SAML2IdPWizardBuilder.java b/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/wizards/SAML2IdPWizardBuilder.java
index d30a593..f073f0e 100644
--- a/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/wizards/SAML2IdPWizardBuilder.java
+++ b/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/wizards/SAML2IdPWizardBuilder.java
@@ -197,7 +197,6 @@ public class SAML2IdPWizardBuilder extends AjaxWizardBuilder<SAML2IdPTO> {
protected void populateItem(final ListItem<Component> item) {
item.add(item.getModelObject());
}
-
});
}
}
@@ -226,5 +225,4 @@ public class SAML2IdPWizardBuilder extends AjaxWizardBuilder<SAML2IdPTO> {
SAML2IdPsRestClient.update(modelObject);
return modelObject;
}
-
}
diff --git a/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/wizards/resources/SAML2IdPMappingPanel.java b/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/wizards/resources/SAML2IdPMappingPanel.java
index 09dc692..d848bef 100644
--- a/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/wizards/resources/SAML2IdPMappingPanel.java
+++ b/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/wizards/resources/SAML2IdPMappingPanel.java
@@ -25,7 +25,6 @@ import org.apache.syncope.client.console.init.ClassPathScanImplementationLookup;
import org.apache.syncope.client.console.rest.AnyTypeClassRestClient;
import org.apache.syncope.client.console.rest.AnyTypeRestClient;
import org.apache.syncope.client.ui.commons.markup.html.form.AjaxTextFieldPanel;
-import org.apache.syncope.common.lib.to.AnyTypeClassTO;
import org.apache.syncope.common.lib.to.ItemTO;
import org.apache.syncope.common.lib.to.SAML2IdPTO;
import org.apache.syncope.common.lib.types.AnyTypeKind;
@@ -73,16 +72,14 @@ public class SAML2IdPMappingPanel extends AbstractMappingPanel {
List<String> choices = new ArrayList<>(ClassPathScanImplementationLookup.USER_FIELD_NAMES);
- for (AnyTypeClassTO anyTypeClassTO : AnyTypeClassRestClient.list(
- AnyTypeRestClient.read(AnyTypeKind.USER.name()).getClasses())) {
-
- choices.addAll(anyTypeClassTO.getPlainSchemas());
- choices.addAll(anyTypeClassTO.getDerSchemas());
- choices.addAll(anyTypeClassTO.getVirSchemas());
- }
+ AnyTypeClassRestClient.list(AnyTypeRestClient.read(AnyTypeKind.USER.name()).getClasses()).
+ forEach(anyTypeClassTO -> {
+ choices.addAll(anyTypeClassTO.getPlainSchemas());
+ choices.addAll(anyTypeClassTO.getDerSchemas());
+ choices.addAll(anyTypeClassTO.getVirSchemas());
+ });
Collections.sort(choices);
toBeUpdated.setChoices(choices);
}
-
}