diff --git a/redisson-spring-data/redisson-spring-data-17/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java b/redisson-spring-data/redisson-spring-data-17/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java
index 89324ecc2..8139879d2 100644
--- a/redisson-spring-data/redisson-spring-data-17/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java
+++ b/redisson-spring-data/redisson-spring-data-17/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java
@@ -16,11 +16,7 @@
 package org.redisson.spring.data.connection;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.EnumSet;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 import org.redisson.client.handler.State;
 import org.redisson.client.protocol.Decoder;
@@ -55,7 +51,7 @@ public class RedisClusterNodeDecoder implements Decoder<List<RedisClusterNode>>
             String flagsStr = params[2];
             Set<Flag> flags = EnumSet.noneOf(Flag.class);
             for (String flag : flagsStr.split(",")) {
-                String flagValue = flag.toUpperCase().replaceAll("\\?", "");
+                String flagValue = flag.toUpperCase(Locale.ENGLISH).replaceAll("\\?", "");
                 flags.add(Flag.valueOf(flagValue));
             }
             
@@ -73,7 +69,7 @@ public class RedisClusterNodeDecoder implements Decoder<List<RedisClusterNode>>
             Set<Integer> slotsCollection = new HashSet<Integer>();
             LinkState linkState = null;
             if (params.length >= 8 && params[7] != null) {
-                linkState = LinkState.valueOf(params[7].toUpperCase());
+                linkState = LinkState.valueOf(params[7].toUpperCase(Locale.ENGLISH));
             }
             if (params.length > 8) {
                 for (int i = 0; i < params.length - 8; i++) {
diff --git a/redisson-spring-data/redisson-spring-data-18/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java b/redisson-spring-data/redisson-spring-data-18/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java
index 89324ecc2..8139879d2 100644
--- a/redisson-spring-data/redisson-spring-data-18/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java
+++ b/redisson-spring-data/redisson-spring-data-18/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java
@@ -16,11 +16,7 @@
 package org.redisson.spring.data.connection;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.EnumSet;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 import org.redisson.client.handler.State;
 import org.redisson.client.protocol.Decoder;
@@ -55,7 +51,7 @@ public class RedisClusterNodeDecoder implements Decoder<List<RedisClusterNode>>
             String flagsStr = params[2];
             Set<Flag> flags = EnumSet.noneOf(Flag.class);
             for (String flag : flagsStr.split(",")) {
-                String flagValue = flag.toUpperCase().replaceAll("\\?", "");
+                String flagValue = flag.toUpperCase(Locale.ENGLISH).replaceAll("\\?", "");
                 flags.add(Flag.valueOf(flagValue));
             }
             
@@ -73,7 +69,7 @@ public class RedisClusterNodeDecoder implements Decoder<List<RedisClusterNode>>
             Set<Integer> slotsCollection = new HashSet<Integer>();
             LinkState linkState = null;
             if (params.length >= 8 && params[7] != null) {
-                linkState = LinkState.valueOf(params[7].toUpperCase());
+                linkState = LinkState.valueOf(params[7].toUpperCase(Locale.ENGLISH));
             }
             if (params.length > 8) {
                 for (int i = 0; i < params.length - 8; i++) {
diff --git a/redisson-spring-data/redisson-spring-data-20/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java b/redisson-spring-data/redisson-spring-data-20/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java
index 89324ecc2..8139879d2 100644
--- a/redisson-spring-data/redisson-spring-data-20/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java
+++ b/redisson-spring-data/redisson-spring-data-20/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java
@@ -16,11 +16,7 @@
 package org.redisson.spring.data.connection;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.EnumSet;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 import org.redisson.client.handler.State;
 import org.redisson.client.protocol.Decoder;
@@ -55,7 +51,7 @@ public class RedisClusterNodeDecoder implements Decoder<List<RedisClusterNode>>
             String flagsStr = params[2];
             Set<Flag> flags = EnumSet.noneOf(Flag.class);
             for (String flag : flagsStr.split(",")) {
-                String flagValue = flag.toUpperCase().replaceAll("\\?", "");
+                String flagValue = flag.toUpperCase(Locale.ENGLISH).replaceAll("\\?", "");
                 flags.add(Flag.valueOf(flagValue));
             }
             
@@ -73,7 +69,7 @@ public class RedisClusterNodeDecoder implements Decoder<List<RedisClusterNode>>
             Set<Integer> slotsCollection = new HashSet<Integer>();
             LinkState linkState = null;
             if (params.length >= 8 && params[7] != null) {
-                linkState = LinkState.valueOf(params[7].toUpperCase());
+                linkState = LinkState.valueOf(params[7].toUpperCase(Locale.ENGLISH));
             }
             if (params.length > 8) {
                 for (int i = 0; i < params.length - 8; i++) {
diff --git a/redisson-spring-data/redisson-spring-data-21/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java b/redisson-spring-data/redisson-spring-data-21/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java
index 89324ecc2..8139879d2 100644
--- a/redisson-spring-data/redisson-spring-data-21/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java
+++ b/redisson-spring-data/redisson-spring-data-21/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java
@@ -16,11 +16,7 @@
 package org.redisson.spring.data.connection;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.EnumSet;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 import org.redisson.client.handler.State;
 import org.redisson.client.protocol.Decoder;
@@ -55,7 +51,7 @@ public class RedisClusterNodeDecoder implements Decoder<List<RedisClusterNode>>
             String flagsStr = params[2];
             Set<Flag> flags = EnumSet.noneOf(Flag.class);
             for (String flag : flagsStr.split(",")) {
-                String flagValue = flag.toUpperCase().replaceAll("\\?", "");
+                String flagValue = flag.toUpperCase(Locale.ENGLISH).replaceAll("\\?", "");
                 flags.add(Flag.valueOf(flagValue));
             }
             
@@ -73,7 +69,7 @@ public class RedisClusterNodeDecoder implements Decoder<List<RedisClusterNode>>
             Set<Integer> slotsCollection = new HashSet<Integer>();
             LinkState linkState = null;
             if (params.length >= 8 && params[7] != null) {
-                linkState = LinkState.valueOf(params[7].toUpperCase());
+                linkState = LinkState.valueOf(params[7].toUpperCase(Locale.ENGLISH));
             }
             if (params.length > 8) {
                 for (int i = 0; i < params.length - 8; i++) {
diff --git a/redisson-spring-data/redisson-spring-data-22/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java b/redisson-spring-data/redisson-spring-data-22/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java
index 89324ecc2..8139879d2 100644
--- a/redisson-spring-data/redisson-spring-data-22/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java
+++ b/redisson-spring-data/redisson-spring-data-22/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java
@@ -16,11 +16,7 @@
 package org.redisson.spring.data.connection;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.EnumSet;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 import org.redisson.client.handler.State;
 import org.redisson.client.protocol.Decoder;
@@ -55,7 +51,7 @@ public class RedisClusterNodeDecoder implements Decoder<List<RedisClusterNode>>
             String flagsStr = params[2];
             Set<Flag> flags = EnumSet.noneOf(Flag.class);
             for (String flag : flagsStr.split(",")) {
-                String flagValue = flag.toUpperCase().replaceAll("\\?", "");
+                String flagValue = flag.toUpperCase(Locale.ENGLISH).replaceAll("\\?", "");
                 flags.add(Flag.valueOf(flagValue));
             }
             
@@ -73,7 +69,7 @@ public class RedisClusterNodeDecoder implements Decoder<List<RedisClusterNode>>
             Set<Integer> slotsCollection = new HashSet<Integer>();
             LinkState linkState = null;
             if (params.length >= 8 && params[7] != null) {
-                linkState = LinkState.valueOf(params[7].toUpperCase());
+                linkState = LinkState.valueOf(params[7].toUpperCase(Locale.ENGLISH));
             }
             if (params.length > 8) {
                 for (int i = 0; i < params.length - 8; i++) {
diff --git a/redisson-spring-data/redisson-spring-data-23/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java b/redisson-spring-data/redisson-spring-data-23/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java
index 89324ecc2..8139879d2 100644
--- a/redisson-spring-data/redisson-spring-data-23/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java
+++ b/redisson-spring-data/redisson-spring-data-23/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java
@@ -16,11 +16,7 @@
 package org.redisson.spring.data.connection;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.EnumSet;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 import org.redisson.client.handler.State;
 import org.redisson.client.protocol.Decoder;
@@ -55,7 +51,7 @@ public class RedisClusterNodeDecoder implements Decoder<List<RedisClusterNode>>
             String flagsStr = params[2];
             Set<Flag> flags = EnumSet.noneOf(Flag.class);
             for (String flag : flagsStr.split(",")) {
-                String flagValue = flag.toUpperCase().replaceAll("\\?", "");
+                String flagValue = flag.toUpperCase(Locale.ENGLISH).replaceAll("\\?", "");
                 flags.add(Flag.valueOf(flagValue));
             }
             
@@ -73,7 +69,7 @@ public class RedisClusterNodeDecoder implements Decoder<List<RedisClusterNode>>
             Set<Integer> slotsCollection = new HashSet<Integer>();
             LinkState linkState = null;
             if (params.length >= 8 && params[7] != null) {
-                linkState = LinkState.valueOf(params[7].toUpperCase());
+                linkState = LinkState.valueOf(params[7].toUpperCase(Locale.ENGLISH));
             }
             if (params.length > 8) {
                 for (int i = 0; i < params.length - 8; i++) {
diff --git a/redisson-spring-data/redisson-spring-data-24/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java b/redisson-spring-data/redisson-spring-data-24/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java
index 89324ecc2..8139879d2 100644
--- a/redisson-spring-data/redisson-spring-data-24/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java
+++ b/redisson-spring-data/redisson-spring-data-24/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java
@@ -16,11 +16,7 @@
 package org.redisson.spring.data.connection;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.EnumSet;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 import org.redisson.client.handler.State;
 import org.redisson.client.protocol.Decoder;
@@ -55,7 +51,7 @@ public class RedisClusterNodeDecoder implements Decoder<List<RedisClusterNode>>
             String flagsStr = params[2];
             Set<Flag> flags = EnumSet.noneOf(Flag.class);
             for (String flag : flagsStr.split(",")) {
-                String flagValue = flag.toUpperCase().replaceAll("\\?", "");
+                String flagValue = flag.toUpperCase(Locale.ENGLISH).replaceAll("\\?", "");
                 flags.add(Flag.valueOf(flagValue));
             }
             
@@ -73,7 +69,7 @@ public class RedisClusterNodeDecoder implements Decoder<List<RedisClusterNode>>
             Set<Integer> slotsCollection = new HashSet<Integer>();
             LinkState linkState = null;
             if (params.length >= 8 && params[7] != null) {
-                linkState = LinkState.valueOf(params[7].toUpperCase());
+                linkState = LinkState.valueOf(params[7].toUpperCase(Locale.ENGLISH));
             }
             if (params.length > 8) {
                 for (int i = 0; i < params.length - 8; i++) {
diff --git a/redisson-spring-data/redisson-spring-data-25/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java b/redisson-spring-data/redisson-spring-data-25/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java
index 89324ecc2..8139879d2 100644
--- a/redisson-spring-data/redisson-spring-data-25/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java
+++ b/redisson-spring-data/redisson-spring-data-25/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java
@@ -16,11 +16,7 @@
 package org.redisson.spring.data.connection;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.EnumSet;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 import org.redisson.client.handler.State;
 import org.redisson.client.protocol.Decoder;
@@ -55,7 +51,7 @@ public class RedisClusterNodeDecoder implements Decoder<List<RedisClusterNode>>
             String flagsStr = params[2];
             Set<Flag> flags = EnumSet.noneOf(Flag.class);
             for (String flag : flagsStr.split(",")) {
-                String flagValue = flag.toUpperCase().replaceAll("\\?", "");
+                String flagValue = flag.toUpperCase(Locale.ENGLISH).replaceAll("\\?", "");
                 flags.add(Flag.valueOf(flagValue));
             }
             
@@ -73,7 +69,7 @@ public class RedisClusterNodeDecoder implements Decoder<List<RedisClusterNode>>
             Set<Integer> slotsCollection = new HashSet<Integer>();
             LinkState linkState = null;
             if (params.length >= 8 && params[7] != null) {
-                linkState = LinkState.valueOf(params[7].toUpperCase());
+                linkState = LinkState.valueOf(params[7].toUpperCase(Locale.ENGLISH));
             }
             if (params.length > 8) {
                 for (int i = 0; i < params.length - 8; i++) {
diff --git a/redisson-spring-data/redisson-spring-data-26/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java b/redisson-spring-data/redisson-spring-data-26/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java
index 89324ecc2..8139879d2 100644
--- a/redisson-spring-data/redisson-spring-data-26/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java
+++ b/redisson-spring-data/redisson-spring-data-26/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java
@@ -16,11 +16,7 @@
 package org.redisson.spring.data.connection;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.EnumSet;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 import org.redisson.client.handler.State;
 import org.redisson.client.protocol.Decoder;
@@ -55,7 +51,7 @@ public class RedisClusterNodeDecoder implements Decoder<List<RedisClusterNode>>
             String flagsStr = params[2];
             Set<Flag> flags = EnumSet.noneOf(Flag.class);
             for (String flag : flagsStr.split(",")) {
-                String flagValue = flag.toUpperCase().replaceAll("\\?", "");
+                String flagValue = flag.toUpperCase(Locale.ENGLISH).replaceAll("\\?", "");
                 flags.add(Flag.valueOf(flagValue));
             }
             
@@ -73,7 +69,7 @@ public class RedisClusterNodeDecoder implements Decoder<List<RedisClusterNode>>
             Set<Integer> slotsCollection = new HashSet<Integer>();
             LinkState linkState = null;
             if (params.length >= 8 && params[7] != null) {
-                linkState = LinkState.valueOf(params[7].toUpperCase());
+                linkState = LinkState.valueOf(params[7].toUpperCase(Locale.ENGLISH));
             }
             if (params.length > 8) {
                 for (int i = 0; i < params.length - 8; i++) {
diff --git a/redisson-spring-data/redisson-spring-data-27/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java b/redisson-spring-data/redisson-spring-data-27/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java
index 89324ecc2..8139879d2 100644
--- a/redisson-spring-data/redisson-spring-data-27/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java
+++ b/redisson-spring-data/redisson-spring-data-27/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java
@@ -16,11 +16,7 @@
 package org.redisson.spring.data.connection;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.EnumSet;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 import org.redisson.client.handler.State;
 import org.redisson.client.protocol.Decoder;
@@ -55,7 +51,7 @@ public class RedisClusterNodeDecoder implements Decoder<List<RedisClusterNode>>
             String flagsStr = params[2];
             Set<Flag> flags = EnumSet.noneOf(Flag.class);
             for (String flag : flagsStr.split(",")) {
-                String flagValue = flag.toUpperCase().replaceAll("\\?", "");
+                String flagValue = flag.toUpperCase(Locale.ENGLISH).replaceAll("\\?", "");
                 flags.add(Flag.valueOf(flagValue));
             }
             
@@ -73,7 +69,7 @@ public class RedisClusterNodeDecoder implements Decoder<List<RedisClusterNode>>
             Set<Integer> slotsCollection = new HashSet<Integer>();
             LinkState linkState = null;
             if (params.length >= 8 && params[7] != null) {
-                linkState = LinkState.valueOf(params[7].toUpperCase());
+                linkState = LinkState.valueOf(params[7].toUpperCase(Locale.ENGLISH));
             }
             if (params.length > 8) {
                 for (int i = 0; i < params.length - 8; i++) {
diff --git a/redisson-spring-data/redisson-spring-data-30/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java b/redisson-spring-data/redisson-spring-data-30/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java
index b158382fc..c4ff762b8 100644
--- a/redisson-spring-data/redisson-spring-data-30/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java
+++ b/redisson-spring-data/redisson-spring-data-30/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java
@@ -16,11 +16,7 @@
 package org.redisson.spring.data.connection;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.EnumSet;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 import org.redisson.client.handler.State;
 import org.redisson.client.protocol.Decoder;
@@ -56,7 +52,7 @@ public class RedisClusterNodeDecoder implements Decoder<List<RedisClusterNode>>
             Set<Flag> flags = EnumSet.noneOf(Flag.class);
             for (String flag : flagsStr.split(",")) {
                 String flagValue = flag.replace("slave", "replica")
-                                        .toUpperCase().replaceAll("\\?", "");
+                                        .toUpperCase(Locale.ENGLISH).replaceAll("\\?", "");
                 flags.add(Flag.valueOf(flagValue));
             }
             
@@ -74,7 +70,7 @@ public class RedisClusterNodeDecoder implements Decoder<List<RedisClusterNode>>
             Set<Integer> slotsCollection = new HashSet<Integer>();
             LinkState linkState = null;
             if (params.length >= 8 && params[7] != null) {
-                linkState = LinkState.valueOf(params[7].toUpperCase());
+                linkState = LinkState.valueOf(params[7].toUpperCase(Locale.ENGLISH));
             }
             if (params.length > 8) {
                 for (int i = 0; i < params.length - 8; i++) {
diff --git a/redisson-spring-data/redisson-spring-data-31/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java b/redisson-spring-data/redisson-spring-data-31/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java
index b158382fc..c4ff762b8 100644
--- a/redisson-spring-data/redisson-spring-data-31/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java
+++ b/redisson-spring-data/redisson-spring-data-31/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java
@@ -16,11 +16,7 @@
 package org.redisson.spring.data.connection;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.EnumSet;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 import org.redisson.client.handler.State;
 import org.redisson.client.protocol.Decoder;
@@ -56,7 +52,7 @@ public class RedisClusterNodeDecoder implements Decoder<List<RedisClusterNode>>
             Set<Flag> flags = EnumSet.noneOf(Flag.class);
             for (String flag : flagsStr.split(",")) {
                 String flagValue = flag.replace("slave", "replica")
-                                        .toUpperCase().replaceAll("\\?", "");
+                                        .toUpperCase(Locale.ENGLISH).replaceAll("\\?", "");
                 flags.add(Flag.valueOf(flagValue));
             }
             
@@ -74,7 +70,7 @@ public class RedisClusterNodeDecoder implements Decoder<List<RedisClusterNode>>
             Set<Integer> slotsCollection = new HashSet<Integer>();
             LinkState linkState = null;
             if (params.length >= 8 && params[7] != null) {
-                linkState = LinkState.valueOf(params[7].toUpperCase());
+                linkState = LinkState.valueOf(params[7].toUpperCase(Locale.ENGLISH));
             }
             if (params.length > 8) {
                 for (int i = 0; i < params.length - 8; i++) {
diff --git a/redisson-spring-data/redisson-spring-data-32/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java b/redisson-spring-data/redisson-spring-data-32/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java
index 696917ccd..580a5d562 100644
--- a/redisson-spring-data/redisson-spring-data-32/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java
+++ b/redisson-spring-data/redisson-spring-data-32/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java
@@ -58,7 +58,7 @@ public class RedisClusterNodeDecoder implements Decoder<List<RedisClusterNode>>
             Set<Flag> flags = EnumSet.noneOf(Flag.class);
             for (String flag : flagsStr.split(",")) {
                 String flagValue = flag.replace("slave", "replica")
-                                        .toUpperCase().replaceAll("\\?", "");
+                                        .toUpperCase(Locale.ENGLISH).replaceAll("\\?", "");
                 flags.add(Flag.valueOf(flagValue));
             }
             
@@ -83,7 +83,7 @@ public class RedisClusterNodeDecoder implements Decoder<List<RedisClusterNode>>
             Set<Integer> slotsCollection = new HashSet<Integer>();
             LinkState linkState = null;
             if (params.length >= 8 && params[7] != null) {
-                linkState = LinkState.valueOf(params[7].toUpperCase());
+                linkState = LinkState.valueOf(params[7].toUpperCase(Locale.ENGLISH));
             }
             if (params.length > 8) {
                 for (int i = 0; i < params.length - 8; i++) {
diff --git a/redisson-spring-data/redisson-spring-data-33/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java b/redisson-spring-data/redisson-spring-data-33/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java
index 696917ccd..580a5d562 100644
--- a/redisson-spring-data/redisson-spring-data-33/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java
+++ b/redisson-spring-data/redisson-spring-data-33/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java
@@ -58,7 +58,7 @@ public class RedisClusterNodeDecoder implements Decoder<List<RedisClusterNode>>
             Set<Flag> flags = EnumSet.noneOf(Flag.class);
             for (String flag : flagsStr.split(",")) {
                 String flagValue = flag.replace("slave", "replica")
-                                        .toUpperCase().replaceAll("\\?", "");
+                                        .toUpperCase(Locale.ENGLISH).replaceAll("\\?", "");
                 flags.add(Flag.valueOf(flagValue));
             }
             
@@ -83,7 +83,7 @@ public class RedisClusterNodeDecoder implements Decoder<List<RedisClusterNode>>
             Set<Integer> slotsCollection = new HashSet<Integer>();
             LinkState linkState = null;
             if (params.length >= 8 && params[7] != null) {
-                linkState = LinkState.valueOf(params[7].toUpperCase());
+                linkState = LinkState.valueOf(params[7].toUpperCase(Locale.ENGLISH));
             }
             if (params.length > 8) {
                 for (int i = 0; i < params.length - 8; i++) {
diff --git a/redisson-spring-data/redisson-spring-data-34/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java b/redisson-spring-data/redisson-spring-data-34/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java
index 696917ccd..580a5d562 100644
--- a/redisson-spring-data/redisson-spring-data-34/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java
+++ b/redisson-spring-data/redisson-spring-data-34/src/main/java/org/redisson/spring/data/connection/RedisClusterNodeDecoder.java
@@ -58,7 +58,7 @@ public class RedisClusterNodeDecoder implements Decoder<List<RedisClusterNode>>
             Set<Flag> flags = EnumSet.noneOf(Flag.class);
             for (String flag : flagsStr.split(",")) {
                 String flagValue = flag.replace("slave", "replica")
-                                        .toUpperCase().replaceAll("\\?", "");
+                                        .toUpperCase(Locale.ENGLISH).replaceAll("\\?", "");
                 flags.add(Flag.valueOf(flagValue));
             }
             
@@ -83,7 +83,7 @@ public class RedisClusterNodeDecoder implements Decoder<List<RedisClusterNode>>
             Set<Integer> slotsCollection = new HashSet<Integer>();
             LinkState linkState = null;
             if (params.length >= 8 && params[7] != null) {
-                linkState = LinkState.valueOf(params[7].toUpperCase());
+                linkState = LinkState.valueOf(params[7].toUpperCase(Locale.ENGLISH));
             }
             if (params.length > 8) {
                 for (int i = 0; i < params.length - 8; i++) {
diff --git a/redisson/src/main/java/org/redisson/client/protocol/RedisCommands.java b/redisson/src/main/java/org/redisson/client/protocol/RedisCommands.java
index 28716d4bc..b13a1b395 100644
--- a/redisson/src/main/java/org/redisson/client/protocol/RedisCommands.java
+++ b/redisson/src/main/java/org/redisson/client/protocol/RedisCommands.java
@@ -429,7 +429,7 @@ public interface RedisCommands {
                             String functionName = (String) parts.get(1);
                             String functionDescription = (String) parts.get(3);
                             List<FunctionLibrary.Flag> functionFlags = ((List<String>) parts.get(5)).stream()
-                                    .map(s -> FunctionLibrary.Flag.valueOf(s.toUpperCase().replace("-", "_")))
+                                    .map(s -> FunctionLibrary.Flag.valueOf(s.toUpperCase(Locale.ENGLISH).replace("-", "_")))
                                     .collect(Collectors.toList());
                             return new FunctionLibrary.Function(functionName, functionDescription, functionFlags);
                         }
diff --git a/redisson/src/main/java/org/redisson/client/protocol/convertor/JsonTypeConvertor.java b/redisson/src/main/java/org/redisson/client/protocol/convertor/JsonTypeConvertor.java
index 0c7e1b926..f26b1c6fe 100644
--- a/redisson/src/main/java/org/redisson/client/protocol/convertor/JsonTypeConvertor.java
+++ b/redisson/src/main/java/org/redisson/client/protocol/convertor/JsonTypeConvertor.java
@@ -17,6 +17,8 @@ package org.redisson.client.protocol.convertor;
 
 import org.redisson.api.JsonType;
 
+import java.util.Locale;
+
 /**
  * Json data type convertor
  *
@@ -30,6 +32,6 @@ public class JsonTypeConvertor implements Convertor<JsonType> {
         if (obj == null) {
             return null;
         }
-        return JsonType.valueOf(obj.toString().toUpperCase());
+        return JsonType.valueOf(obj.toString().toUpperCase(Locale.ENGLISH));
     }
 }
diff --git a/redisson/src/main/java/org/redisson/client/protocol/pubsub/PubSubStatusDecoder.java b/redisson/src/main/java/org/redisson/client/protocol/pubsub/PubSubStatusDecoder.java
index d14613287..feaf0f8d8 100644
--- a/redisson/src/main/java/org/redisson/client/protocol/pubsub/PubSubStatusDecoder.java
+++ b/redisson/src/main/java/org/redisson/client/protocol/pubsub/PubSubStatusDecoder.java
@@ -20,6 +20,7 @@ import org.redisson.client.handler.State;
 import org.redisson.client.protocol.decoder.MultiDecoder;
 
 import java.util.List;
+import java.util.Locale;
 
 /**
  * 
@@ -30,7 +31,7 @@ public class PubSubStatusDecoder implements MultiDecoder<Object> {
 
     @Override
     public PubSubStatusMessage decode(List<Object> parts, State state) {
-        PubSubType type = PubSubType.valueOf(parts.get(0).toString().toUpperCase());
+        PubSubType type = PubSubType.valueOf(parts.get(0).toString().toUpperCase(Locale.ENGLISH));
         ChannelName name = new ChannelName((byte[]) parts.get(1));
         return new PubSubStatusMessage(type, name);
     }
diff --git a/redisson/src/main/java/org/redisson/config/PropertiesConvertor.java b/redisson/src/main/java/org/redisson/config/PropertiesConvertor.java
index 4236f75c8..aa5cd1f21 100644
--- a/redisson/src/main/java/org/redisson/config/PropertiesConvertor.java
+++ b/redisson/src/main/java/org/redisson/config/PropertiesConvertor.java
@@ -74,7 +74,7 @@ public class PropertiesConvertor {
         StringBuilder builder = new StringBuilder();
         builder.append(parts[0]);
         for (int i = 1; i < parts.length; i++) {
-            builder.append(parts[i].substring(0, 1).toUpperCase())
+            builder.append(parts[i].substring(0, 1).toUpperCase(Locale.ENGLISH))
                     .append(parts[i].substring(1));
         }
         return builder.toString();
diff --git a/redisson/src/main/java/org/redisson/liveobject/core/FieldAccessorInterceptor.java b/redisson/src/main/java/org/redisson/liveobject/core/FieldAccessorInterceptor.java
index 0418b8348..c6ed97190 100644
--- a/redisson/src/main/java/org/redisson/liveobject/core/FieldAccessorInterceptor.java
+++ b/redisson/src/main/java/org/redisson/liveobject/core/FieldAccessorInterceptor.java
@@ -16,6 +16,7 @@
 package org.redisson.liveobject.core;
 
 import java.lang.reflect.Method;
+import java.util.Locale;
 
 import org.redisson.api.RMap;
 import org.redisson.liveobject.misc.ClassUtils;
@@ -40,7 +41,7 @@ public class FieldAccessorInterceptor {
             @FieldValue("liveObjectLiveMap") RMap<?, ?> map
     ) throws Exception {
         if (args.length >= 1 && String.class.isAssignableFrom(args[0].getClass())) {
-            String name = ((String) args[0]).substring(0, 1).toUpperCase() + ((String) args[0]).substring(1);
+            String name = ((String) args[0]).substring(0, 1).toUpperCase(Locale.ENGLISH) + ((String) args[0]).substring(1);
             if ("get".equals(method.getName()) && args.length == 1) {
                 try {
                     return me.getClass().getMethod("get" + name).invoke(me);