This is an automated email from the ASF dual-hosted git repository.

ilgrosso pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git


The following commit(s) were added to refs/heads/2_1_X by this push:
     new c1bd72b  Passing AjaxWizard.Mode upwards to make PlainAttrs and 
VirAttrs behave correctly as templates
c1bd72b is described below

commit c1bd72b7e7bb660b683f710d7bda5d7edc384b7f
Author: Francesco Chicchiriccò <[email protected]>
AuthorDate: Wed Jan 29 18:11:47 2020 +0100

    Passing AjaxWizard.Mode upwards to make PlainAttrs and VirAttrs behave 
correctly as templates
---
 .../client/console/wizards/any/AbstractAttrs.java  |  3 +-
 .../client/console/wizards/any/DerAttrs.java       |  3 +-
 .../client/console/wizards/any/PlainAttrs.java     | 12 ++----
 .../wizards/any/UserTemplateWizardBuilder.java     |  2 +-
 .../client/console/wizards/any/VirAttrs.java       |  2 +-
 .../console/wizards/OIDCProviderMappingPanel.java  | 15 +++-----
 .../console/wizards/OIDCProviderWizardBuilder.java | 43 ++++++++++------------
 .../console/wizards/SAML2IdPMappingPanel.java      | 15 +++-----
 .../console/wizards/SAML2IdPWizardBuilder.java     |  4 +-
 9 files changed, 43 insertions(+), 56 deletions(-)

diff --git 
a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrs.java
 
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrs.java
index c544e77..63edeab 100644
--- 
a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrs.java
+++ 
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrs.java
@@ -51,10 +51,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/console/src/main/java/org/apache/syncope/client/console/wizards/any/DerAttrs.java
 
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/DerAttrs.java
index a977029..38ac6f0 100644
--- 
a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/DerAttrs.java
+++ 
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/DerAttrs.java
@@ -28,6 +28,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.syncope.client.console.SyncopeConsoleSession;
 import 
org.apache.syncope.client.console.wicket.markup.html.bootstrap.tabs.Accordion;
 import 
org.apache.syncope.client.console.wicket.markup.html.form.AjaxTextFieldPanel;
+import org.apache.syncope.client.console.wizards.AjaxWizard;
 import org.apache.syncope.common.lib.EntityTOUtils;
 import org.apache.syncope.common.lib.to.AnyTO;
 import org.apache.syncope.common.lib.to.AttrTO;
@@ -57,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/console/src/main/java/org/apache/syncope/client/console/wizards/any/PlainAttrs.java
 
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/PlainAttrs.java
index 7827483..488e40e 100644
--- 
a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/PlainAttrs.java
+++ 
b/client/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;
@@ -65,7 +64,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();
@@ -226,10 +225,8 @@ public class PlainAttrs extends 
AbstractAttrs<PlainSchemaTO> {
 
             super(id, schemas, attributableTO);
 
-            add(new ListView<AttrTO>("schemas",
-                    new ListModel<AttrTO>(new ArrayList<AttrTO>(
-                            
attributableTO.getObject().getPlainAttrs().stream().sorted(attrComparator).
-                                    collect(Collectors.toList())))) {
+            add(new ListView<AttrTO>("schemas", new 
ListModel<AttrTO>(attributableTO.getObject().
+                    
getPlainAttrs().stream().sorted(attrComparator).collect(Collectors.toList()))) {
 
                 private static final long serialVersionUID = 
5306618783986001008L;
 
@@ -239,8 +236,7 @@ public class PlainAttrs extends 
AbstractAttrs<PlainSchemaTO> {
                     AttrTO 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/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserTemplateWizardBuilder.java
 
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserTemplateWizardBuilder.java
index 9cbf928..e5e2f0d 100644
--- 
a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserTemplateWizardBuilder.java
+++ 
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserTemplateWizardBuilder.java
@@ -48,7 +48,6 @@ public class UserTemplateWizardBuilder extends 
UserWizardBuilder implements Temp
         } else {
             setItem(new UserWrapper(template));
         }
-
     }
 
     public UserTemplateWizardBuilder(
@@ -56,6 +55,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/console/src/main/java/org/apache/syncope/client/console/wizards/any/VirAttrs.java
 
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/VirAttrs.java
index 4738c51..c1f6266 100644
--- 
a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/VirAttrs.java
+++ 
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/VirAttrs.java
@@ -65,7 +65,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/OIDCProviderMappingPanel.java
 
b/ext/oidcclient/client-console/src/main/java/org/apache/syncope/client/console/wizards/OIDCProviderMappingPanel.java
index 3308992..25c8dfa 100644
--- 
a/ext/oidcclient/client-console/src/main/java/org/apache/syncope/client/console/wizards/OIDCProviderMappingPanel.java
+++ 
b/ext/oidcclient/client-console/src/main/java/org/apache/syncope/client/console/wizards/OIDCProviderMappingPanel.java
@@ -25,7 +25,6 @@ import 
org.apache.syncope.client.console.init.ClassPathScanImplementationLookup;
 import 
org.apache.syncope.client.console.wicket.markup.html.form.AjaxTextFieldPanel;
 import 
org.apache.syncope.client.console.wizards.resources.ItemTransformersTogglePanel;
 import 
org.apache.syncope.client.console.wizards.resources.JEXLTransformersTogglePanel;
-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/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 680746d..dd20496 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
@@ -113,42 +113,42 @@ public class OIDCProviderWizardBuilder extends 
AjaxWizardBuilder<OIDCProviderTO>
 
         public OP(final OIDCProviderTO opTO) {
             AjaxTextFieldPanel name = new AjaxTextFieldPanel(
-                    "name", "name", new PropertyModel<String>(opTO, "name"), 
false);
+                    "name", "name", new PropertyModel<>(opTO, "name"), false);
             name.addRequiredLabel();
             name.setEnabled(true);
             add(name);
 
             AjaxTextFieldPanel clientID = new AjaxTextFieldPanel(
-                    "clientID", "clientID", new PropertyModel<String>(opTO, 
"clientID"), false);
+                    "clientID", "clientID", new PropertyModel<>(opTO, 
"clientID"), false);
             clientID.addRequiredLabel();
             clientID.setEnabled(true);
             add(clientID);
 
             AjaxTextFieldPanel clientSecret = new AjaxTextFieldPanel(
-                    "clientSecret", "clientSecret", new 
PropertyModel<String>(opTO, "clientSecret"), false);
+                    "clientSecret", "clientSecret", new PropertyModel<>(opTO, 
"clientSecret"), false);
             clientSecret.addRequiredLabel();
             clientSecret.setEnabled(true);
             add(clientSecret);
 
             AjaxCheckBoxPanel createUnmatching = new AjaxCheckBoxPanel(
-                    "createUnmatching", "createUnmatching", new 
PropertyModel<Boolean>(opTO, "createUnmatching"),
+                    "createUnmatching", "createUnmatching", new 
PropertyModel<>(opTO, "createUnmatching"),
                     false);
             add(createUnmatching);
 
             AjaxCheckBoxPanel selfRegUnmatching = new AjaxCheckBoxPanel(
-                    "selfRegUnmatching", "selfRegUnmatching", new 
PropertyModel<Boolean>(opTO, "selfRegUnmatching"),
+                    "selfRegUnmatching", "selfRegUnmatching", new 
PropertyModel<>(opTO, "selfRegUnmatching"),
                     false);
             add(selfRegUnmatching);
 
             AjaxCheckBoxPanel updateMatching = new AjaxCheckBoxPanel(
-                    "updateMatching", "updateMatching", new 
PropertyModel<Boolean>(opTO, "updateMatching"), false);
+                    "updateMatching", "updateMatching", new 
PropertyModel<>(opTO, "updateMatching"), false);
             add(updateMatching);
 
             AjaxPalettePanel<String> actionsClassNames = new 
AjaxPalettePanel.Builder<String>().
                     setAllowMoveAll(true).setAllowOrder(true).
                     setName(new StringResourceModel("actionsClassNames", 
directoryPanel).getString()).
                     build("actionsClassNames",
-                            new PropertyModel<List<String>>(opTO, 
"actionsClassNames"),
+                            new PropertyModel<>(opTO, "actionsClassNames"),
                             new ListModel<>(actionsClasses.getObject()));
             actionsClassNames.setOutputMarkupId(true);
             add(actionsClassNames);
@@ -160,7 +160,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);
@@ -168,40 +167,40 @@ public class OIDCProviderWizardBuilder extends 
AjaxWizardBuilder<OIDCProviderTO>
 
             UrlValidator urlValidator = new UrlValidator();
             final AjaxTextFieldPanel issuer = new AjaxTextFieldPanel(
-                    "issuer", "issuer", new PropertyModel<String>(opTO, 
"issuer"));
+                    "issuer", "issuer", new PropertyModel<>(opTO, "issuer"));
             issuer.addValidator(urlValidator);
             issuer.addRequiredLabel();
             content.add(issuer);
 
             final AjaxCheckBoxPanel hasDiscovery = new AjaxCheckBoxPanel(
-                    "hasDiscovery", "hasDiscovery", new 
PropertyModel<Boolean>(opTO, "hasDiscovery"));
+                    "hasDiscovery", "hasDiscovery", new PropertyModel<>(opTO, 
"hasDiscovery"));
             content.add(hasDiscovery);
 
             final AjaxTextFieldPanel authorizationEndpoint = new 
AjaxTextFieldPanel("authorizationEndpoint",
-                    "authorizationEndpoint", new PropertyModel<String>(opTO, 
"authorizationEndpoint"));
+                    "authorizationEndpoint", new PropertyModel<>(opTO, 
"authorizationEndpoint"));
             authorizationEndpoint.addRequiredLabel();
             authorizationEndpoint.addValidator(urlValidator);
             content.add(authorizationEndpoint);
 
             final AjaxTextFieldPanel userinfoEndpoint = new 
AjaxTextFieldPanel("userinfoEndpoint",
-                    "userinfoEndpoint", new PropertyModel<String>(opTO, 
"userinfoEndpoint"));
+                    "userinfoEndpoint", new PropertyModel<>(opTO, 
"userinfoEndpoint"));
             userinfoEndpoint.addValidator(urlValidator);
             content.add(userinfoEndpoint);
 
             final AjaxTextFieldPanel tokenEndpoint = new 
AjaxTextFieldPanel("tokenEndpoint",
-                    "tokenEndpoint", new PropertyModel<String>(opTO, 
"tokenEndpoint"));
+                    "tokenEndpoint", new PropertyModel<>(opTO, 
"tokenEndpoint"));
             tokenEndpoint.addRequiredLabel();
             tokenEndpoint.addValidator(urlValidator);
             content.add(tokenEndpoint);
 
             final AjaxTextFieldPanel jwksUri = new 
AjaxTextFieldPanel("jwksUri",
-                    "jwksUri", new PropertyModel<String>(opTO, "jwksUri"));
+                    "jwksUri", new PropertyModel<>(opTO, "jwksUri"));
             jwksUri.addRequiredLabel();
             jwksUri.addValidator(urlValidator);
             content.add(jwksUri);
 
             final AjaxTextFieldPanel endSessionEndpoint = new 
AjaxTextFieldPanel("endSessionEndpoint",
-                    "endSessionEndpoint", new PropertyModel<String>(opTO, 
"endSessionEndpoint"));
+                    "endSessionEndpoint", new PropertyModel<>(opTO, 
"endSessionEndpoint"));
             endSessionEndpoint.addValidator(urlValidator);
             content.add(endSessionEndpoint);
 
@@ -226,7 +225,6 @@ public class OIDCProviderWizardBuilder extends 
AjaxWizardBuilder<OIDCProviderTO>
                     target.add(visibleParam);
                 }
             });
-
         }
 
         public OPContinue(final OIDCProviderTO opTO, final boolean readOnly) {
@@ -237,32 +235,32 @@ public class OIDCProviderWizardBuilder extends 
AjaxWizardBuilder<OIDCProviderTO>
             add(content);
 
             final AjaxTextFieldPanel issuer = new AjaxTextFieldPanel(
-                    "issuer", "issuer", new PropertyModel<String>(opTO, 
"issuer"));
+                    "issuer", "issuer", new PropertyModel<>(opTO, "issuer"));
             issuer.setReadOnly(readOnly);
             content.add(issuer);
 
             final AjaxCheckBoxPanel hasDiscovery = new AjaxCheckBoxPanel(
-                    "hasDiscovery", "hasDiscovery", new 
PropertyModel<Boolean>(opTO, "hasDiscovery"));
+                    "hasDiscovery", "hasDiscovery", new PropertyModel<>(opTO, 
"hasDiscovery"));
             hasDiscovery.setReadOnly(readOnly);
             content.add(hasDiscovery);
 
             final AjaxTextFieldPanel authorizationEndpoint = new 
AjaxTextFieldPanel("authorizationEndpoint",
-                    "authorizationEndpoint", new PropertyModel<String>(opTO, 
"authorizationEndpoint"));
+                    "authorizationEndpoint", new PropertyModel<>(opTO, 
"authorizationEndpoint"));
             authorizationEndpoint.setReadOnly(readOnly);
             content.add(authorizationEndpoint);
 
             final AjaxTextFieldPanel userinfoEndpoint = new 
AjaxTextFieldPanel("userinfoEndpoint",
-                    "userinfoEndpoint", new PropertyModel<String>(opTO, 
"userinfoEndpoint"));
+                    "userinfoEndpoint", new PropertyModel<>(opTO, 
"userinfoEndpoint"));
             userinfoEndpoint.setReadOnly(readOnly);
             content.add(userinfoEndpoint);
 
             final AjaxTextFieldPanel tokenEndpoint = new 
AjaxTextFieldPanel("tokenEndpoint",
-                    "tokenEndpoint", new PropertyModel<String>(opTO, 
"tokenEndpoint"));
+                    "tokenEndpoint", new PropertyModel<>(opTO, 
"tokenEndpoint"));
             tokenEndpoint.setReadOnly(readOnly);
             content.add(tokenEndpoint);
 
             final AjaxTextFieldPanel jwksUri = new 
AjaxTextFieldPanel("jwksUri",
-                    "jwksUri", new PropertyModel<String>(opTO, "jwksUri"));
+                    "jwksUri", new PropertyModel<>(opTO, "jwksUri"));
             jwksUri.setReadOnly(readOnly);
             content.add(jwksUri);
 
@@ -302,5 +300,4 @@ public class OIDCProviderWizardBuilder extends 
AjaxWizardBuilder<OIDCProviderTO>
             setSummaryModel(Model.of(StringUtils.EMPTY));
         }
     }
-
 }
diff --git 
a/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/wizards/SAML2IdPMappingPanel.java
 
b/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/wizards/SAML2IdPMappingPanel.java
index 21e80a6..84a067a 100644
--- 
a/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/wizards/SAML2IdPMappingPanel.java
+++ 
b/ext/saml2sp/client-console/src/main/java/org/apache/syncope/client/console/wizards/SAML2IdPMappingPanel.java
@@ -25,7 +25,6 @@ import 
org.apache.syncope.client.console.init.ClassPathScanImplementationLookup;
 import 
org.apache.syncope.client.console.wicket.markup.html.form.AjaxTextFieldPanel;
 import 
org.apache.syncope.client.console.wizards.resources.JEXLTransformersTogglePanel;
 import 
org.apache.syncope.client.console.wizards.resources.ItemTransformersTogglePanel;
-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);
     }
-
 }
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 3d6fc14..0ba5fff 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
@@ -133,7 +133,7 @@ public class SAML2IdPWizardBuilder extends 
AjaxWizardBuilder<SAML2IdPTO> {
 
             AjaxTextFieldPanel requestedAuthnContextProviderClassName = new 
AjaxTextFieldPanel(
                     "field", "requestedAuthnContextProviderClassName",
-                    new PropertyModel<String>(idpTO, 
"requestedAuthnContextProviderClassName"));
+                    new PropertyModel<>(idpTO, 
"requestedAuthnContextProviderClassName"));
             requestedAuthnContextProviderClassName.setChoices(
                     new 
ArrayList<>(restClient.getRequestedAuthnContextProviderClasses()));
             fields.add(requestedAuthnContextProviderClassName);
@@ -155,7 +155,6 @@ public class SAML2IdPWizardBuilder extends 
AjaxWizardBuilder<SAML2IdPTO> {
                 protected void populateItem(final ListItem<Component> item) {
                     item.add(item.getModelObject());
                 }
-
             });
         }
     }
@@ -184,5 +183,4 @@ public class SAML2IdPWizardBuilder extends 
AjaxWizardBuilder<SAML2IdPTO> {
         restClient.update(modelObject);
         return modelObject;
     }
-
 }

Reply via email to