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 5a448885e2..208bbee604 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<Object> advices = new ArrayList<Object>();
+    protected List<Object> 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 cda93cbd54..f955ff3374 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<Object> any = new ArrayList<Object>();
+    protected List<Object> 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 7b757c6906..77be8c7cc8 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<SAML11StatementAbstractType> statements = new ArrayList<SAML11StatementAbstractType>();
+    protected List<SAML11StatementAbstractType> 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 9b9bd08a71..816a431d43 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<SAML11AttributeType> attribute = new ArrayList<SAML11AttributeType>();
+    protected List<SAML11AttributeType> 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 7402f55a0a..5820caec41 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<Object> attributeValues = new ArrayList<Object>();
+    protected List<Object> 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 2c612d2f5d..21dcb76305 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<URI> audience = new ArrayList<URI>();
+    protected List<URI> 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 fd98b248c8..8746cac4a4 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<SAML11AuthorityBindingType> authorityBinding = new ArrayList<SAML11AuthorityBindingType>();
+    protected List<SAML11AuthorityBindingType> 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 26d1ed1f9b..a715b126ba 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<SAML11ActionType> actions = new ArrayList<SAML11ActionType>();
+    protected List<SAML11ActionType> 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 140544f72e..70766f609b 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<SAML11ConditionAbstractType> conditions = new ArrayList<SAML11ConditionAbstractType>();
+    public List<SAML11ConditionAbstractType> 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 ff8dd0620b..7a32a8e432 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<String> assertionIDReference = new ArrayList<String>();
+    protected List<String> assertionIDReference = new ArrayList<>();
 
-    protected List<SAML11AssertionType> assertions = new ArrayList<SAML11AssertionType>();
+    protected List<SAML11AssertionType> 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 b404fe79bf..36aa53c565 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<URI> confirmationMethod = new ArrayList<URI>();
+    protected List<URI> 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 2a927ccba7..4dfeee0f87 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<SAML11AttributeDesignatorType> attributeDesignator = new ArrayList<SAML11AttributeDesignatorType>();
+    protected List<SAML11AttributeDesignatorType> 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 73abe04058..71379f5f07 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<SAML11ActionType> action = new ArrayList<SAML11ActionType>();
+    protected List<SAML11ActionType> 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 cf34344e08..7bd388b89c 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<QName> respondWith = new ArrayList<QName>();
+    protected List<QName> 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 1bd5b8276a..a9e34eb691 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<String> assertionIDRef = new ArrayList<String>();
+    protected List<String> assertionIDRef = new ArrayList<>();
 
-    protected List<String> assertionArtifact = new ArrayList<String>();
+    protected List<String> 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 fc78cebe81..7cde86221c 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<SAML11AssertionType> assertions = new ArrayList<SAML11AssertionType>();
+    protected List<SAML11AssertionType> assertions = new ArrayList<>();
 
     protected SAML11StatusType status;