From de307847ff6bd5310ff5805fd8ca4b80856ef4e9 Mon Sep 17 00:00:00 2001 From: Andrei Arlou Date: Fri, 22 Nov 2019 22:23:34 +0300 Subject: [PATCH] KEYCLOAK-12204 Use diamond operator for collections in packages "common" and "v1" from module "saml-core-api" --- .../java/org/keycloak/dom/saml/common/CommonAdviceType.java | 2 +- .../org/keycloak/dom/saml/common/CommonStatusDetailType.java | 2 +- .../keycloak/dom/saml/v1/assertion/SAML11AssertionType.java | 2 +- .../dom/saml/v1/assertion/SAML11AttributeStatementType.java | 2 +- .../keycloak/dom/saml/v1/assertion/SAML11AttributeType.java | 2 +- .../saml/v1/assertion/SAML11AudienceRestrictionCondition.java | 2 +- .../saml/v1/assertion/SAML11AuthenticationStatementType.java | 2 +- .../assertion/SAML11AuthorizationDecisionStatementType.java | 2 +- .../keycloak/dom/saml/v1/assertion/SAML11ConditionsType.java | 2 +- .../keycloak/dom/saml/v1/assertion/SAML11EvidenceType.java | 4 ++-- .../dom/saml/v1/assertion/SAML11SubjectConfirmationType.java | 2 +- .../dom/saml/v1/protocol/SAML11AttributeQueryType.java | 2 +- .../v1/protocol/SAML11AuthorizationDecisionQueryType.java | 2 +- .../dom/saml/v1/protocol/SAML11RequestAbstractType.java | 2 +- .../org/keycloak/dom/saml/v1/protocol/SAML11RequestType.java | 4 ++-- .../org/keycloak/dom/saml/v1/protocol/SAML11ResponseType.java | 2 +- 16 files changed, 18 insertions(+), 18 deletions(-) diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/common/CommonAdviceType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/common/CommonAdviceType.java index 5a448885e22..208bbee6045 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/common/CommonAdviceType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/common/CommonAdviceType.java @@ -29,7 +29,7 @@ import java.util.List; */ public class CommonAdviceType implements Serializable { - protected List advices = new ArrayList(); + protected List advices = new ArrayList<>(); /** * Add an advice diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/common/CommonStatusDetailType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/common/CommonStatusDetailType.java index cda93cbd541..f955ff3374a 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/common/CommonStatusDetailType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/common/CommonStatusDetailType.java @@ -42,7 +42,7 @@ import java.util.List; */ public class CommonStatusDetailType implements Serializable { - protected List any = new ArrayList(); + protected List any = new ArrayList<>(); /** * Add status detail diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/assertion/SAML11AssertionType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/assertion/SAML11AssertionType.java index 7b757c6906e..77be8c7cc8a 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/assertion/SAML11AssertionType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/assertion/SAML11AssertionType.java @@ -53,7 +53,7 @@ public class SAML11AssertionType extends CommonAssertionType { protected SAML11AdviceType advice; - protected List statements = new ArrayList(); + protected List statements = new ArrayList<>(); protected Element signature; diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/assertion/SAML11AttributeStatementType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/assertion/SAML11AttributeStatementType.java index 9b9bd08a71a..816a431d43b 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/assertion/SAML11AttributeStatementType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/assertion/SAML11AttributeStatementType.java @@ -32,7 +32,7 @@ import java.util.List; */ public class SAML11AttributeStatementType extends SAML11SubjectStatementType { - protected List attribute = new ArrayList(); + protected List attribute = new ArrayList<>(); public void add(SAML11AttributeType aAttribute) { this.attribute.add(aAttribute); diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/assertion/SAML11AttributeType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/assertion/SAML11AttributeType.java index 7402f55a0a6..5820caec417 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/assertion/SAML11AttributeType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/assertion/SAML11AttributeType.java @@ -33,7 +33,7 @@ import java.util.List; */ public class SAML11AttributeType extends SAML11AttributeDesignatorType { - protected List attributeValues = new ArrayList(); + protected List attributeValues = new ArrayList<>(); public SAML11AttributeType(String attributeName, URI attributeNamespace) { super(attributeName, attributeNamespace); diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/assertion/SAML11AudienceRestrictionCondition.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/assertion/SAML11AudienceRestrictionCondition.java index 2c612d2f5d4..21dcb763055 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/assertion/SAML11AudienceRestrictionCondition.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/assertion/SAML11AudienceRestrictionCondition.java @@ -32,7 +32,7 @@ import java.util.List; */ public class SAML11AudienceRestrictionCondition extends SAML11ConditionAbstractType { - protected List audience = new ArrayList(); + protected List audience = new ArrayList<>(); public void add(URI advice) { this.audience.add(advice); diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/assertion/SAML11AuthenticationStatementType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/assertion/SAML11AuthenticationStatementType.java index fd98b248c8e..8746cac4a40 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/assertion/SAML11AuthenticationStatementType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/assertion/SAML11AuthenticationStatementType.java @@ -40,7 +40,7 @@ public class SAML11AuthenticationStatementType extends SAML11SubjectStatementTyp protected SAML11SubjectLocalityType subjectLocality; - protected List authorityBinding = new ArrayList(); + protected List authorityBinding = new ArrayList<>(); public SAML11AuthenticationStatementType(URI authenticationMethod, XMLGregorianCalendar authenticationInstant) { this.authenticationMethod = authenticationMethod; diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/assertion/SAML11AuthorizationDecisionStatementType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/assertion/SAML11AuthorizationDecisionStatementType.java index 26d1ed1f9b6..a715b126ba4 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/assertion/SAML11AuthorizationDecisionStatementType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/assertion/SAML11AuthorizationDecisionStatementType.java @@ -35,7 +35,7 @@ import java.util.List; */ public class SAML11AuthorizationDecisionStatementType extends SAML11SubjectStatementType { - protected List actions = new ArrayList(); + protected List actions = new ArrayList<>(); protected SAML11EvidenceType evidence; diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/assertion/SAML11ConditionsType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/assertion/SAML11ConditionsType.java index 140544f72e5..70766f609b1 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/assertion/SAML11ConditionsType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/assertion/SAML11ConditionsType.java @@ -35,7 +35,7 @@ import java.util.List; */ public class SAML11ConditionsType extends CommonConditionsType { - public List conditions = new ArrayList(); + public List conditions = new ArrayList<>(); public void add(SAML11ConditionAbstractType condition) { this.conditions.add(condition); diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/assertion/SAML11EvidenceType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/assertion/SAML11EvidenceType.java index ff8dd0620bb..7a32a8e432c 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/assertion/SAML11EvidenceType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/assertion/SAML11EvidenceType.java @@ -30,9 +30,9 @@ import java.util.List; */ public class SAML11EvidenceType { - protected List assertionIDReference = new ArrayList(); + protected List assertionIDReference = new ArrayList<>(); - protected List assertions = new ArrayList(); + protected List assertions = new ArrayList<>(); public void add(String condition) { this.assertionIDReference.add(condition); diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/assertion/SAML11SubjectConfirmationType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/assertion/SAML11SubjectConfirmationType.java index b404fe79bf7..36aa53c5652 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/assertion/SAML11SubjectConfirmationType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/assertion/SAML11SubjectConfirmationType.java @@ -35,7 +35,7 @@ import java.util.List; */ public class SAML11SubjectConfirmationType { - protected List confirmationMethod = new ArrayList(); + protected List confirmationMethod = new ArrayList<>(); protected Object subjectConfirmationData; diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/protocol/SAML11AttributeQueryType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/protocol/SAML11AttributeQueryType.java index 2a927ccba72..4dfeee0f87b 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/protocol/SAML11AttributeQueryType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/protocol/SAML11AttributeQueryType.java @@ -35,7 +35,7 @@ import java.util.List; */ public class SAML11AttributeQueryType extends SAML11SubjectQueryAbstractType { - protected List attributeDesignator = new ArrayList(); + protected List attributeDesignator = new ArrayList<>(); protected URI resource; diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/protocol/SAML11AuthorizationDecisionQueryType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/protocol/SAML11AuthorizationDecisionQueryType.java index 73abe04058f..71379f5f07f 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/protocol/SAML11AuthorizationDecisionQueryType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/protocol/SAML11AuthorizationDecisionQueryType.java @@ -38,7 +38,7 @@ import java.util.List; */ public class SAML11AuthorizationDecisionQueryType extends SAML11SubjectQueryAbstractType { - protected List action = new ArrayList(); + protected List action = new ArrayList<>(); protected SAML11EvidenceType evidence; diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/protocol/SAML11RequestAbstractType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/protocol/SAML11RequestAbstractType.java index cf34344e088..7bd388b89cf 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/protocol/SAML11RequestAbstractType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/protocol/SAML11RequestAbstractType.java @@ -42,7 +42,7 @@ public abstract class SAML11RequestAbstractType extends CommonRequestAbstractTyp protected int minorVersion = 1; - protected List respondWith = new ArrayList(); + protected List respondWith = new ArrayList<>(); public SAML11RequestAbstractType(String id, XMLGregorianCalendar issueInstant) { super(id, issueInstant); diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/protocol/SAML11RequestType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/protocol/SAML11RequestType.java index 1bd5b8276a9..a9e34eb6913 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/protocol/SAML11RequestType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/protocol/SAML11RequestType.java @@ -37,9 +37,9 @@ public class SAML11RequestType extends SAML11RequestAbstractType { protected SAML11QueryAbstractType query; - protected List assertionIDRef = new ArrayList(); + protected List assertionIDRef = new ArrayList<>(); - protected List assertionArtifact = new ArrayList(); + protected List assertionArtifact = new ArrayList<>(); public SAML11RequestType(String id, XMLGregorianCalendar issueInstant) { super(id, issueInstant); diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/protocol/SAML11ResponseType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/protocol/SAML11ResponseType.java index fc78cebe81a..7cde86221cb 100755 --- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/protocol/SAML11ResponseType.java +++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v1/protocol/SAML11ResponseType.java @@ -34,7 +34,7 @@ import java.util.List; */ public class SAML11ResponseType extends SAML11ResponseAbstractType { - protected List assertions = new ArrayList(); + protected List assertions = new ArrayList<>(); protected SAML11StatusType status;