diff --git a/jans-auth-server/client/src/main/java/io/jans/as/client/GluuConfigurationClient.java b/jans-auth-server/client/src/main/java/io/jans/as/client/GluuConfigurationClient.java
index f4a716cdfb6..fa4afb5f7b2 100644
--- a/jans-auth-server/client/src/main/java/io/jans/as/client/GluuConfigurationClient.java
+++ b/jans-auth-server/client/src/main/java/io/jans/as/client/GluuConfigurationClient.java
@@ -120,7 +120,7 @@ private Map<Integer, Set<String>> mapJsonToAuthLevelMapping(JSONObject jsonObjec
     }
 
     private Map<String, Set<String>> mapJsonToScopeToClaimsMapping(JSONObject jsonObject) {
-        Map<String, Set<String>> scopeToClaimsMapping = new HashMap<String, Set<String>>();
+        Map<String, Set<String>> scopeToClaimsMapping = new HashMap<>();
         Iterator<?> keys = jsonObject.keys();
         while (keys.hasNext()) {
             try {
diff --git a/jans-core/cache/src/main/java/io/jans/service/cache/RedisClusterProvider.java b/jans-core/cache/src/main/java/io/jans/service/cache/RedisClusterProvider.java
index 75c26c7547d..5fc6749d8f4 100644
--- a/jans-core/cache/src/main/java/io/jans/service/cache/RedisClusterProvider.java
+++ b/jans-core/cache/src/main/java/io/jans/service/cache/RedisClusterProvider.java
@@ -64,7 +64,7 @@ public void create() {
     public static Set<HostAndPort> hosts(String servers) {
         final String[] serverWithPorts = StringUtils.split(servers.trim(), ",");
 
-        Set<HostAndPort> set = new HashSet<HostAndPort>();
+        Set<HostAndPort> set = new HashSet<>();
         for (String serverWithPort : serverWithPorts) {
             final String[] split = serverWithPort.trim().split(":");
             String host = split[0];
diff --git a/jans-fido2/model/src/main/java/io/jans/fido2/ctap/TokenBindingSupport.java b/jans-fido2/model/src/main/java/io/jans/fido2/ctap/TokenBindingSupport.java
index feccabb27a7..cec2c1a1156 100644
--- a/jans-fido2/model/src/main/java/io/jans/fido2/ctap/TokenBindingSupport.java
+++ b/jans-fido2/model/src/main/java/io/jans/fido2/ctap/TokenBindingSupport.java
@@ -20,7 +20,7 @@ public enum TokenBindingSupport {
 
     private final String status;
 
-    private static Map<String, TokenBindingSupport> KEY_MAPPINGS = new HashMap<String, TokenBindingSupport>();
+    private static Map<String, TokenBindingSupport> KEY_MAPPINGS = new HashMap<>();
 
     static {
         for (TokenBindingSupport enumType : values()) {