diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/AssertionType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/AssertionType.java
index df21155909..49cf7bd6f6 100755
--- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/AssertionType.java
+++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/AssertionType.java
@@ -221,7 +221,7 @@ public class AssertionType extends CommonAssertionType {
     }
 
     public Set<AttributeStatementType> getAttributeStatements() {
-        Set<AttributeStatementType> attributeStatements = new HashSet<AttributeStatementType>();
+        Set<AttributeStatementType> attributeStatements = new HashSet<>();
         Set<StatementAbstractType> statements = getStatements();
 
         if (statements != null) {
diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/AttributeStatementType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/AttributeStatementType.java
index d064219d2e..a0d2ed3e39 100755
--- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/AttributeStatementType.java
+++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/AttributeStatementType.java
@@ -44,7 +44,7 @@ import java.util.List;
  */
 public class AttributeStatementType extends StatementAbstractType {
 
-    protected List<ASTChoiceType> attributes = new ArrayList<ASTChoiceType>();
+    protected List<ASTChoiceType> attributes = new ArrayList<>();
 
     /**
      * Add an attribute
diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/AttributeType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/AttributeType.java
index 2c159dd35d..e21728ab2b 100755
--- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/AttributeType.java
+++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/AttributeType.java
@@ -49,11 +49,11 @@ import java.util.Map;
  */
 public class AttributeType implements Serializable {
 
-    protected List<Object> attributeValue = new ArrayList<Object>();
+    protected List<Object> attributeValue = new ArrayList<>();
     protected String name;
     protected String nameFormat;
     protected String friendlyName;
-    private Map<QName, String> otherAttributes = new HashMap<QName, String>();
+    private Map<QName, String> otherAttributes = new HashMap<>();
 
     public AttributeType(String name) {
         this.name = name;
diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/AudienceRestrictionType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/AudienceRestrictionType.java
index 06da933888..9635d5534c 100755
--- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/AudienceRestrictionType.java
+++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/AudienceRestrictionType.java
@@ -43,7 +43,7 @@ import java.util.List;
  */
 public class AudienceRestrictionType extends ConditionAbstractType implements Serializable {
 
-    protected List<URI> audience = new ArrayList<URI>();
+    protected List<URI> audience = new ArrayList<>();
 
     /**
      * Add an audience
diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/AuthnContextType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/AuthnContextType.java
index 13df0dd8cb..3dccd3c14a 100755
--- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/AuthnContextType.java
+++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/AuthnContextType.java
@@ -59,11 +59,11 @@ import java.util.Set;
  */
 public class AuthnContextType implements Serializable {
 
-    private final Set<URI> authenticatingAuthority = new LinkedHashSet<URI>();
+    private final Set<URI> authenticatingAuthority = new LinkedHashSet<>();
 
     private AuthnContextTypeSequence sequence;
 
-    private final Set<URIType> URITypes = new HashSet<URIType>();
+    private final Set<URIType> URITypes = new HashSet<>();
 
     /**
      * Add an authenticating authority
diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/AuthzDecisionStatementType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/AuthzDecisionStatementType.java
index 8a0483687c..d648c4afa8 100755
--- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/AuthzDecisionStatementType.java
+++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/AuthzDecisionStatementType.java
@@ -44,7 +44,7 @@ import java.util.List;
  */
 public class AuthzDecisionStatementType extends StatementAbstractType {
 
-    protected List<ActionType> action = new ArrayList<ActionType>();
+    protected List<ActionType> action = new ArrayList<>();
     protected EvidenceType evidence;
     protected String resource;
     protected DecisionType decision;
diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/ConditionsType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/ConditionsType.java
index 692423c9e7..85e8f38ce1 100755
--- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/ConditionsType.java
+++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/ConditionsType.java
@@ -49,7 +49,7 @@ import java.util.List;
  */
 public class ConditionsType extends CommonConditionsType implements Serializable {
 
-    protected List<ConditionAbstractType> conditions = new ArrayList<ConditionAbstractType>();
+    protected List<ConditionAbstractType> conditions = new ArrayList<>();
 
     /**
      * Add a condition
diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/EvidenceType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/EvidenceType.java
index 0eb40611a4..1914112478 100755
--- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/EvidenceType.java
+++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/EvidenceType.java
@@ -47,7 +47,7 @@ import java.util.List;
  */
 public class EvidenceType implements Serializable {
 
-    protected List<ChoiceType> evidences = new ArrayList<ChoiceType>();
+    protected List<ChoiceType> evidences = new ArrayList<>();
 
     /**
      * Add an evidence
diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/ProxyRestrictionType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/ProxyRestrictionType.java
index 482793b2f3..016057d1b0 100755
--- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/ProxyRestrictionType.java
+++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/ProxyRestrictionType.java
@@ -44,7 +44,7 @@ import java.util.List;
  */
 public class ProxyRestrictionType extends ConditionAbstractType {
 
-    protected List<URI> audience = new ArrayList<URI>();
+    protected List<URI> audience = new ArrayList<>();
 
     protected BigInteger count;
 
diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/SubjectConfirmationDataType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/SubjectConfirmationDataType.java
index 1b1fce27f4..1c2ef81ff4 100755
--- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/SubjectConfirmationDataType.java
+++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/SubjectConfirmationDataType.java
@@ -59,7 +59,7 @@ public class SubjectConfirmationDataType implements Serializable {
 
     protected String address;
 
-    private final Map<QName, String> otherAttributes = new HashMap<QName, String>();
+    private final Map<QName, String> otherAttributes = new HashMap<>();
 
     private Object anyType;
 
diff --git a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/SubjectType.java b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/SubjectType.java
index dcb77ac45f..b188b1c76f 100755
--- a/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/SubjectType.java
+++ b/saml-core-api/src/main/java/org/keycloak/dom/saml/v2/assertion/SubjectType.java
@@ -51,7 +51,7 @@ import java.util.List;
  */
 public class SubjectType implements Serializable {
 
-    protected List<SubjectConfirmationType> subjectConfirmation = new ArrayList<SubjectConfirmationType>();
+    protected List<SubjectConfirmationType> subjectConfirmation = new ArrayList<>();
 
     protected STSubType subType;